Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx

1 files changed, 266 insertions, 266 deletions

diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 93fa62aa..c7254405 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -4,7 +4,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 	ld c, CH0
 .loop
 	ld b, $0
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -12,18 +12,18 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 	ld a, c
 	cp CH4
 	jr nc, .applyAffects ; if sfx channel
-	ld a, [wc002]
+	ld a, [wMuteAudioAndPauseMusic]
 	and a
 	jr z, .applyAffects
 	bit 7, a
 	jr nz, .nextChannel
 	set 7, a
-	ld [wc002], a
+	ld [wMuteAudioAndPauseMusic], a
 	xor a
-	ld [$ff25], a
-	ld [$ff1a], a
+	ld [rNR51], a
+	ld [rNR30], a
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	jr .nextChannel
 .applyAffects
 	call Audio3_ApplyMusicAffects
@@ -36,7 +36,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
-; known flags for wc02e:
+; known flags for wChannelFlags1:
 ;	0: toggleperfectpitch has been used
 ;	1: call has been used
 ;	3: a toggle used only by this routine for vibrato
@@ -44,7 +44,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 ;	6: dutycycle flag
 Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	ld b, $0
-	ld hl, wc0b6 ; delay until next note
+	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if delay is 1, play next note
@@ -54,36 +54,36 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	ld a, c
 	cp CH4
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr z, .startChecks
 	ret
 .startChecks
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 6, [hl] ; dutycycle
 	jr z, .checkForExecuteMusic
 	call Audio3_ApplyDutyCycle
 .checkForExecuteMusic
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
 	jr nz, .checkForPitchBend
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 2, [hl]
 	jr nz, .disablePitchBendVibrato
 .checkForPitchBend
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 4, [hl] ; pitchbend
 	jr z, .checkVibratoDelay
 	jp Audio3_ApplyPitchBend
 .checkVibratoDelay
-	ld hl, wc04e ; vibrato delay
+	ld hl, wChannelVibratoDelayCounters ; vibrato delay
 	add hl, bc
 	ld a, [hl]
 	and a ; check if delay is over
@@ -92,7 +92,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 .disablePitchBendVibrato
 	ret
 .checkForVibrato
-	ld hl, wc056 ; vibrato rate
+	ld hl, wChannelVibratoExtents ; vibrato rate
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -100,7 +100,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	ret ; no vibrato
 .vibrato
 	ld d, a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, bc
 	ld a, [hl]
 	and $f
@@ -113,10 +113,10 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	swap [hl]
 	or [hl]
 	ld [hl], a ; reset the vibrato value and start again
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld e, [hl] ; get note pitch
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 3, [hl] ; this is the only code that sets/resets bit three so
 	jr z, .unset ; it continuously alternates which path it takes
@@ -149,13 +149,13 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
 Audio3_PlayNextNote: ; 7d244 (1f:5244)
-	ld hl, wc06e
+	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
-	ld hl, wc04e
+	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
@@ -168,7 +168,7 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 	cp $ff ; is this command an endchannel?
 	jp nz, Audio3_callchannel ; no
 	ld b, $0 ; yes
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 1, [hl]
 	jr nz, .returnFromCall
@@ -178,22 +178,22 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 	jr .asm_7d2b3
 .noiseOrSfxChannel
 	res 2, [hl]
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	res 0, [hl]
 	cp CH6
 	jr nz, .notSfxChannel3
 	ld a, $0
-	ld [$ff1a], a
+	ld [rNR30], a
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 .notSfxChannel3
 	jr nz, .asm_7d296
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr z, .asm_7d296
 	xor a
-	ld [wc003], a
+	ld [wDisableChannelOutputWhenSfxEnds], a
 	jr .asm_7d2b3
 .asm_7d296
 	jr .asm_7d2bc
@@ -203,10 +203,10 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	push hl ; store current channel address
-	ld hl, wc016
+	ld hl, wChannelReturnAddresses
 	add hl, de
 	ld e, l
 	ld d, h
@@ -220,16 +220,16 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 .asm_7d2b3
 	ld hl, Unknown_7db93
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a
 .asm_7d2bc
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_7d2c5
 	jr .asm_7d2e2
 .asm_7d2c5
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $86
 	jr z, .asm_7d2e2
 	jr c, .asm_7d2d0
@@ -241,12 +241,12 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 	call Audio3_7d73b
 	ret c
 .asm_7d2d9
-	ld a, [wc005]
-	ld [$ff24], a
+	ld a, [wSavedVolume]
+	ld [rNR50], a
 	xor a
-	ld [wc005], a
+	ld [wSavedVolume], a
 .asm_7d2e2
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld [hl], b
 	ret
@@ -265,10 +265,10 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8)
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	push hl
-	ld hl, wc016
+	ld hl, wChannelReturnAddresses
 	add hl, de
 	ld e, l
 	ld d, h
@@ -283,7 +283,7 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8)
 	inc hl
 	ld [hl], d ; overwrite current address with pointer
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 1, [hl] ; set the call flag
 	jp Audio3_endchannel
@@ -296,7 +296,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d)
 	and a
 	jr z, .infiniteLoop
 	ld b, $0
-	ld hl, wc0be
+	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
 	cp e
@@ -319,7 +319,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d)
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	pop af
 	ld [hli], a
@@ -333,7 +333,7 @@ Audio3_notetype: ; 7d358 (1f:5358)
 	ld a, d ; yes
 	and $f
 	ld b, $0
-	ld hl, wc0c6
+	ld hl, wChannelNoteSpeeds
 	add hl, bc
 	ld [hl], a ; store low nibble as speed
 	ld a, c
@@ -346,10 +346,10 @@ Audio3_notetype: ; 7d358 (1f:5358)
 	jr z, .musicChannel3
 	cp CH6
 	jr nz, .notChannel3
-	ld hl, wc0e7
+	ld hl, wSfxWaveInstrument
 	jr .sfxChannel3
 .musicChannel3
-	ld hl, wc0e6
+	ld hl, wMusicWaveInstrument
 .sfxChannel3
 	ld a, d
 	and $f
@@ -364,7 +364,7 @@ Audio3_notetype: ; 7d358 (1f:5358)
 	; else, store volume (high nibble) and fade (low nibble)
 .notChannel3
 	ld b, $0
-	ld hl, wc0de
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld [hl], d
 .noiseChannel
@@ -375,11 +375,11 @@ Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio3_vibrato ; no
 	ld b, $0 ; yes
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	ld a, [hl]
 	xor $1
-	ld [hl], a ; flip bit 0 of wc02e
+	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio3_endchannel
 
 Audio3_vibrato: ; 7d3a9 (1f:53a9)
@@ -387,10 +387,10 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	jr nz, Audio3_pitchbend ; no
 	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
-	ld hl, wc04e
+	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a ; store delay
-	ld hl, wc06e
+	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld [hl], a ; store delay
 	call Audio3_GetNextMusicByte
@@ -398,7 +398,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	and $f0
 	swap a
 	ld b, $0
-	ld hl, wc056
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
 	ld e, a
@@ -409,7 +409,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	ld a, d
 	and $f
 	ld d, a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, bc
 	swap a
 	or d
@@ -421,7 +421,7 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1)
 	jr nz, Audio3_duty ; no
 	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
 	ld [hl], a ; store first param
 	call Audio3_GetNextMusicByte
@@ -433,14 +433,14 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1)
 	and $f
 	call Audio3_7d8cc
 	ld b, $0
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
 	ld [hl], d ; store unknown part of second param
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld [hl], e ; store unknown part of second param
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 4, [hl] ; set pitchbend flag
 	call Audio3_GetNextMusicByte
@@ -455,7 +455,7 @@ Audio3_duty: ; 7d419 (1f:5419)
 	rrca
 	and $c0
 	ld b, $0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld [hl], a ; store duty
 	jp Audio3_endchannel
@@ -467,25 +467,25 @@ Audio3_tempo: ; 7d42e (1f:542e)
 	cp CH4
 	jr nc, .sfxChannel
 	call Audio3_GetNextMusicByte
-	ld [wc0e8], a ; store first param
+	ld [wMusicTempo], a ; store first param
 	call Audio3_GetNextMusicByte
-	ld [wc0e9], a ; store second param
+	ld [wMusicTempo + 1], a ; store second param
 	xor a
-	ld [wc0ce], a ; clear RAM
-	ld [wc0cf], a
-	ld [wc0d0], a
-	ld [wc0d1], a
+	ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM
+	ld [wChannelNoteDelayCountersFractionalPart + 1], a
+	ld [wChannelNoteDelayCountersFractionalPart + 2], a
+	ld [wChannelNoteDelayCountersFractionalPart + 3], a
 	jr .musicChannelDone
 .sfxChannel
 	call Audio3_GetNextMusicByte
-	ld [wc0ea], a ; store first param
+	ld [wSfxTempo], a ; store first param
 	call Audio3_GetNextMusicByte
-	ld [wc0eb], a ; store second param
+	ld [wSfxTempo + 1], a ; store second param
 	xor a
-	ld [wc0d2], a ; clear RAM
-	ld [wc0d3], a
-	ld [wc0d4], a
-	ld [wc0d5], a
+	ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM
+	ld [wChannelNoteDelayCountersFractionalPart + 5], a
+	ld [wChannelNoteDelayCountersFractionalPart + 6], a
+	ld [wChannelNoteDelayCountersFractionalPart + 7], a
 .musicChannelDone
 	jp Audio3_endchannel
 
@@ -493,7 +493,7 @@ Audio3_stereopanning: ; 7d46e (1f:546e)
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio3_unknownmusic0xef ; no
 	call Audio3_GetNextMusicByte ; yes
-	ld [wc004], a ; store panning
+	ld [wStereoPanning], a ; store panning
 	jp Audio3_endchannel
 
 ; this appears to never be used
@@ -502,15 +502,15 @@ Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
 	jr nz, Audio3_dutycycle ; no
 	call Audio3_GetNextMusicByte ; yes
 	push bc
-	call Audio3_7d8ea
+	call Audio3_PlaySound
 	pop bc
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .skip
-	ld a, [wc02d]
-	ld [wc003], a
+	ld a, [wChannelSoundIDs + CH7]
+	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wc02d], a
+	ld [wChannelSoundIDs + CH7], a
 .skip
 	jp Audio3_endchannel
 
@@ -519,14 +519,14 @@ Audio3_dutycycle: ; 7d49a (1f:549a)
 	jr nz, Audio3_volume ; no
 	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld [hl], a ; store full cycle
 	and $c0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld [hl], a ; store first duty
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 6, [hl] ; set duty flag
 	jp Audio3_endchannel
@@ -535,14 +535,14 @@ Audio3_volume: ; 7d4b8 (1f:54b8)
 	cp $f0 ; is this command a volume?
 	jr nz, Audio3_executemusic ; no
 	call Audio3_GetNextMusicByte ; yes
-	ld [$ff24], a ; store volume
+	ld [rNR50], a ; store volume
 	jp Audio3_endchannel
 
 Audio3_executemusic: ; 7d4c4 (1f:54c4)
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio3_octave ; no
 	ld b, $0 ; yes
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	set 0, [hl]
 	jp Audio3_endchannel
@@ -551,7 +551,7 @@ Audio3_octave: ; 7d4d3 (1f:54d3)
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio3_unknownsfx0x20 ; no
-	ld hl, wc0d6 ; yes
+	ld hl, wChannelOctaves ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
@@ -566,14 +566,14 @@ Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
 	cp CH3 ; is this a noise or sfx channel?
 	jr c, Audio3_unknownsfx0x10 ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
 	jr nz, Audio3_unknownsfx0x10 ; no
 	call Audio3_notelength ; yes
 	ld d, a
 	ld b, $0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
@@ -612,12 +612,12 @@ Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
 	cp $10 ; is this command an unknownsfx0x10?
 	jr nz, Audio3_note ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
 	jr nz, Audio3_note ; no
 	call Audio3_GetNextMusicByte ; yes
-	ld [$ff10], a
+	ld [rNR10], a
 	jp Audio3_endchannel
 
 Audio3_note: ; 7d54f (1f:554f)
@@ -647,11 +647,11 @@ Audio3_dnote: ; 7d569 (1f:5569)
 	call Audio3_GetNextMusicByte ; get dnote instrument
 asm_7d571
 	ld d, a
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .asm_7d57c
 	ld a, d
-	call Audio3_7d8ea
+	call Audio3_PlaySound
 .asm_7d57c
 	pop bc
 	pop de
@@ -664,7 +664,7 @@ Audio3_notelength: ; 7d57e (1f:557e)
 	ld b, $0
 	ld e, a  ; store note length (in 16ths)
 	ld d, b
-	ld hl, wc0c6
+	ld hl, wChannelNoteSpeeds
 	add hl, bc
 	ld a, [hl]
 	ld l, b
@@ -672,9 +672,9 @@ Audio3_notelength: ; 7d57e (1f:557e)
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
-	ld a, [wc0e8]
+	ld a, [wMusicTempo]
 	ld d, a
-	ld a, [wc0e9]
+	ld a, [wMusicTempo + 1]
 	ld e, a
 	jr .skip
 .sfxChannel
@@ -683,31 +683,31 @@ Audio3_notelength: ; 7d57e (1f:557e)
 	cp CH7
 	jr z, .skip ; if noise channel
 	call Audio3_7d707
-	ld a, [wc0ea]
+	ld a, [wSfxTempo]
 	ld d, a
-	ld a, [wc0eb]
+	ld a, [wSfxTempo + 1]
 	ld e, a
 .skip
 	ld a, l
 	ld b, $0
-	ld hl, wc0ce
+	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld l, [hl]
 	call Audio3_7d8bb
 	ld e, l
 	ld d, h
-	ld hl, wc0ce
+	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld [hl], e
 	ld a, d
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld [hl], a
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
 	jr nz, Audio3_notepitch
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 2, [hl]
 	jr z, Audio3_notepitch
@@ -722,7 +722,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -738,9 +738,9 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	ld b, $0
 	ld hl, Unknown_7db93
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a
 	jr .quit
 .notSfxChannel3
 	ld b, $2
@@ -755,12 +755,12 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 .notRest
 	swap a
 	ld b, $0
-	ld hl, wc0d6
+	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
 	call Audio3_7d8cc
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_7d62c
@@ -770,7 +770,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	ld a, c
 	cp CH4
 	jr nc, .skip ; if sfx Channel
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -783,7 +783,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	ret
 .skip
 	ld b, $0
-	ld hl, wc0de
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
@@ -793,7 +793,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	call Audio3_7d66c
 	pop de
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 0, [hl]   ; has toggleperfectpitch been used?
 	jr z, .skip2
@@ -801,7 +801,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	jr nc, .skip2
 	inc d
 .skip2
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
 	call Audio3_7d6bf
@@ -811,7 +811,7 @@ Audio3_7d66c: ; 7d66c (1f:566c)
 	ld b, $0
 	ld hl, Unknown_7db9b
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	or [hl]
 	ld d, a
 	ld a, c
@@ -819,18 +819,18 @@ Audio3_7d66c: ; 7d66c (1f:566c)
 	jr z, .sfxNoiseChannel
 	cp CH4
 	jr nc, .skip ; if sfx channel
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .skip
 .sfxNoiseChannel
-	ld a, [wc004]
+	ld a, [wStereoPanning]
 	ld hl, Unknown_7db9b
 	add hl, bc
 	and [hl]
 	ld d, a
-	ld a, [$ff25]
+	ld a, [rNR51]
 	ld hl, Unknown_7db93
 	add hl, bc
 	and [hl]
@@ -838,12 +838,12 @@ Audio3_7d66c: ; 7d66c (1f:566c)
 	ld d, a
 .skip
 	ld a, d
-	ld [$ff25], a
+	ld [rNR51], a
 	ret
 
 Audio3_7d69d: ; 7d69d (1f:569d)
 	ld b, $0
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld d, [hl]
 	ld a, c
@@ -854,7 +854,7 @@ Audio3_7d69d: ; 7d69d (1f:569d)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
@@ -874,10 +874,10 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	; fall through
 .channel3
 	push de
-	ld de, wc0e6
+	ld de, wMusicWaveInstrument
 	cp CH2
 	jr z, .musicChannel3
-	ld de, wc0e7
+	ld de, wSfxWaveInstrument
 .musicChannel3
 	ld a, [de]
 	add a
@@ -891,7 +891,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	ld hl, $ff30
 	ld b, $f
 	ld a, $0
-	ld [$ff1a], a
+	ld [rNR30], a
 .loop
 	ld a, [de]
 	inc de
@@ -901,7 +901,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	and a
 	jr nz, .loop
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	pop de
 .notSfxChannel3
 	ld a, d
@@ -920,27 +920,27 @@ Audio3_7d707: ; 7d707 (1f:5707)
 	call Audio3_7d759
 	jr nc, .asm_7d71f
 	ld d, $0
-	ld a, [wc0f2]
+	ld a, [wTempoModifier]
 	add $80
 	jr nc, .asm_7d716
 	inc d
 .asm_7d716
-	ld [wc0eb], a
+	ld [wSfxTempo + 1], a
 	ld a, d
-	ld [wc0ea], a
+	ld [wSfxTempo], a
 	jr .asm_7d728
 .asm_7d71f
 	xor a
-	ld [wc0eb], a
+	ld [wSfxTempo + 1], a
 	ld a, $1
-	ld [wc0ea], a
+	ld [wSfxTempo], a
 .asm_7d728
 	ret
 
 Audio3_7d729: ; 7d729 (1f:5729)
 	call Audio3_7d759
 	jr nc, .asm_7d73a
-	ld a, [wc0f1]
+	ld a, [wFrequencyModifier]
 	add e
 	jr nc, .asm_7d735
 	inc d
@@ -956,7 +956,7 @@ Audio3_7d729: ; 7d729 (1f:5729)
 Audio3_7d73b: ; 7d73b (1f:573b)
 	call Audio3_7d759
 	jr nc, .asm_7d756
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	ld e, c
 	ld d, $0
 	sla e
@@ -977,7 +977,7 @@ Audio3_7d73b: ; 7d73b (1f:573b)
 	ret
 
 Audio3_7d759: ; 7d759 (1f:5759)
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_7d762
 	jr .asm_7d768
@@ -994,27 +994,27 @@ Audio3_7d759: ; 7d759 (1f:5759)
 	ret
 
 Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
 	jp nz, .asm_7d7b4
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wc07e
+	ld hl, wChannelPitchBendFrequencySteps
 	add hl, bc
 	ld l, [hl]
 	ld h, b
 	add hl, de
 	ld d, h
 	ld e, l
-	ld hl, wc08e
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
 	add hl, bc
 	push hl
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	pop hl
@@ -1026,26 +1026,26 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	ld a, $0
 	adc d
 	ld d, a
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	cp d
 	jp c, .asm_7d7fa
 	jr nz, .asm_7d7e7
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jp c, .asm_7d7fa
 	jr .asm_7d7e7
 .asm_7d7b4
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wc07e
+	ld hl, wChannelPitchBendFrequencySteps
 	add hl, bc
 	ld e, [hl]
 	sub e
@@ -1053,7 +1053,7 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1064,22 +1064,22 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
 	ld a, d
 	cp [hl]
 	jr c, .asm_7d7fa
 	jr nz, .asm_7d7e7
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
 	jr c, .asm_7d7fa
 .asm_7d7e7
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
 	ld b, $3
@@ -1089,54 +1089,54 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	ld [hl], d
 	ret
 .asm_7d7fa
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
 	ret
 
 Audio3_7d803: ; 7d803 (1f:5803)
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld a, [hl]
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
 	sub [hl]
 	jr nc, .asm_7d81b
 	ld a, $1
 .asm_7d81b
 	ld [hl], a
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	sub [hl]
 	ld e, a
 	ld a, d
 	sbc b
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
 	sub [hl]
 	jr c, .asm_7d837
 	ld d, a
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 5, [hl]
 	jr .asm_7d85a
 .asm_7d837
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	sub e
@@ -1144,17 +1144,17 @@ Audio3_7d803: ; 7d803 (1f:5803)
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	sub d
 	ld d, a
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	res 5, [hl]
 .asm_7d85a
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
 .asm_7d85e
 	inc b
@@ -1173,20 +1173,20 @@ Audio3_7d803: ; 7d803 (1f:5803)
 	add [hl]
 	ld d, b
 	ld b, $0
-	ld hl, wc07e
+	ld hl, wChannelPitchBendFrequencySteps
 	add hl, bc
 	ld [hl], d
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
 	ld [hl], a
-	ld hl, wc08e
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
 	add hl, bc
 	ld [hl], a
 	ret
 
 Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
 	ld b, $0
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1207,7 +1207,7 @@ Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	ld a, [hli]
 	ld e, a
@@ -1274,8 +1274,8 @@ Audio3_7d8cc: ; 7d8cc (1f:58cc)
 	ld d, a
 	ret
 
-Audio3_7d8ea:: ; 7d8ea (1f:58ea)
-	ld [wc001], a
+Audio3_PlaySound:: ; 7d8ea (1f:58ea)
+	ld [wSoundID], a
 	cp $ff
 	jp z, Audio3_7daa8
 	cp $c2
@@ -1286,75 +1286,75 @@ Audio3_7d8ea:: ; 7d8ea (1f:58ea)
 	jp nc, Audio3_7d9c2
 .asm_7d901
 	xor a
-	ld [wc000], a
-	ld [wc003], a
-	ld [wc0e9], a
-	ld [wc0e6], a
-	ld [wc0e7], a
+	ld [wUnusedC000], a
+	ld [wDisableChannelOutputWhenSfxEnds], a
+	ld [wMusicTempo + 1], a
+	ld [wMusicWaveInstrument], a
+	ld [wSfxWaveInstrument], a
 	ld d, $8
-	ld hl, wc016
+	ld hl, wChannelReturnAddresses
 	call FillAudioRAM3
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	call FillAudioRAM3
 	ld d, $4
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	call FillAudioRAM3
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	call FillAudioRAM3
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	call FillAudioRAM3
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	call FillAudioRAM3
-	ld hl, wc04e
+	ld hl, wChannelVibratoDelayCounters
 	call FillAudioRAM3
-	ld hl, wc056
+	ld hl, wChannelVibratoExtents
 	call FillAudioRAM3
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	call FillAudioRAM3
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	call FillAudioRAM3
-	ld hl, wc06e
+	ld hl, wChannelVibratoDelayCounterReloadValues
 	call FillAudioRAM3
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	call FillAudioRAM3
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	call FillAudioRAM3
-	ld hl, wc07e
+	ld hl, wChannelPitchBendFrequencySteps
 	call FillAudioRAM3
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	call FillAudioRAM3
-	ld hl, wc08e
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
 	call FillAudioRAM3
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	call FillAudioRAM3
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	call FillAudioRAM3
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	call FillAudioRAM3
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	call FillAudioRAM3
 	ld a, $1
-	ld hl, wc0be
+	ld hl, wChannelLoopCounters
 	call FillAudioRAM3
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	call FillAudioRAM3
-	ld hl, wc0c6
+	ld hl, wChannelNoteSpeeds
 	call FillAudioRAM3
-	ld [wc0e8], a
+	ld [wMusicTempo], a
 	ld a, $ff
-	ld [wc004], a
+	ld [wStereoPanning], a
 	xor a
-	ld [$ff24], a
+	ld [rNR50], a
 	ld a, $8
-	ld [$ff10], a
+	ld [rNR10], a
 	ld a, $0
-	ld [$ff25], a
+	ld [rNR51], a
 	xor a
-	ld [$ff1a], a
+	ld [rNR30], a
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	ld a, $77
-	ld [$ff24], a
+	ld [rNR50], a
 	jp Audio3_7db03
 
 Audio3_7d9c2: ; 7d9c2 (1f:59c2)
@@ -1367,9 +1367,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	ld de, SFX_Headers_3
 	add hl, de
 	ld a, h
-	ld [wc0ec], a
+	ld [wSfxHeaderPointer], a
 	ld a, l
-	ld [wc0ed], a
+	ld [wSfxHeaderPointer + 1], a
 	ld a, [hl]
 	and $c0
 	rlca
@@ -1382,9 +1382,9 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	add c
 	ld c, a
 	ld b, $0
-	ld a, [wc0ec]
+	ld a, [wSfxHeaderPointer]
 	ld h, a
-	ld a, [wc0ed]
+	ld a, [wSfxHeaderPointer + 1]
 	ld l, a
 	add hl, bc
 	ld c, d
@@ -1392,7 +1392,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	and $f
 	ld e, a
 	ld d, $0
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, de
 	ld a, [hl]
 	and a
@@ -1400,7 +1400,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	ld a, e
 	cp $7
 	jr nz, .asm_7da0e
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $14
 	jr nc, .asm_7da07
 	ret
@@ -1410,7 +1410,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	jr z, .asm_7da17
 	jr c, .asm_7da17
 .asm_7da0e
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp [hl]
 	jr z, .asm_7da17
 	jr c, .asm_7da17
@@ -1423,84 +1423,84 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, wc016
+	ld hl, wChannelReturnAddresses
 	add hl, de
 	ld [hli], a
 	ld [hl], a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	ld [hli], a
 	ld [hl], a
 	pop de
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, de
 	ld [hl], a
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, de
 	ld [hl], a
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, de
 	ld [hl], a
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	add hl, de
 	ld [hl], a
-	ld hl, wc04e
+	ld hl, wChannelVibratoDelayCounters
 	add hl, de
 	ld [hl], a
-	ld hl, wc056
+	ld hl, wChannelVibratoExtents
 	add hl, de
 	ld [hl], a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, de
 	ld [hl], a
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wc06e
+	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, de
 	ld [hl], a
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, de
 	ld [hl], a
-	ld hl, wc07e
+	ld hl, wChannelPitchBendFrequencySteps
 	add hl, de
 	ld [hl], a
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wc08e
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wc09e
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wc0a6
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, de
 	ld [hl], a
 	ld a, $1
-	ld hl, wc0be
+	ld hl, wChannelLoopCounters
 	add hl, de
 	ld [hl], a
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, de
 	ld [hl], a
-	ld hl, wc0c6
+	ld hl, wChannelNoteSpeeds
 	add hl, de
 	ld [hl], a
 	ld a, e
 	cp $4
 	jr nz, .asm_7da9f
 	ld a, $8
-	ld [$ff10], a
+	ld [rNR10], a
 .asm_7da9f
 	ld a, c
 	and a
@@ -1510,41 +1510,41 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 
 Audio3_7daa8: ; 7daa8 (1f:5aa8)
 	ld a, $80
-	ld [$ff26], a
-	ld [$ff1a], a
+	ld [rNR52], a
+	ld [rNR30], a
 	xor a
-	ld [$ff25], a
-	ld [$ff1c], a
+	ld [rNR51], a
+	ld [rNR32], a
 	ld a, $8
-	ld [$ff10], a
-	ld [$ff12], a
-	ld [$ff17], a
-	ld [$ff21], a
+	ld [rNR10], a
+	ld [rNR12], a
+	ld [rNR22], a
+	ld [rNR42], a
 	ld a, $40
-	ld [$ff14], a
-	ld [$ff19], a
-	ld [$ff23], a
+	ld [rNR14], a
+	ld [rNR24], a
+	ld [rNR44], a
 	ld a, $77
-	ld [$ff24], a
+	ld [rNR50], a
 	xor a
-	ld [wc000], a
-	ld [wc003], a
-	ld [wc002], a
-	ld [wc0e9], a
-	ld [wc0eb], a
-	ld [wc0e6], a
-	ld [wc0e7], a
+	ld [wUnusedC000], a
+	ld [wDisableChannelOutputWhenSfxEnds], a
+	ld [wMuteAudioAndPauseMusic], a
+	ld [wMusicTempo + 1], a
+	ld [wSfxTempo + 1], a
+	ld [wMusicWaveInstrument], a
+	ld [wSfxWaveInstrument], a
 	ld d, $a0
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	call FillAudioRAM3
 	ld a, $1
 	ld d, $18
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	call FillAudioRAM3
-	ld [wc0e8], a
-	ld [wc0ea], a
+	ld [wMusicTempo], a
+	ld [wSfxTempo], a
 	ld a, $ff
-	ld [wc004], a
+	ld [wStereoPanning], a
 	ret
 
 ; fills d bytes at hl with a
@@ -1557,7 +1557,7 @@ FillAudioRAM3: ; 7dafd (1f:5afd)
 	ret
 
 Audio3_7db03: ; 7db03 (1f:5b03)
-	ld a, [wc001]
+	ld a, [wSoundID]
 	ld l, a
 	ld e, a
 	ld h, $0
@@ -1568,7 +1568,7 @@ Audio3_7db03: ; 7db03 (1f:5b03)
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	ld a, [de] ; get channel number
 	ld b, a
 	rlca
@@ -1594,14 +1594,14 @@ Audio3_7db03: ; 7db03 (1f:5b03)
 	push af
 	ld b, $0
 	ld c, a
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, bc
-	ld a, [wc001]
+	ld a, [wSoundID]
 	ld [hl], a
 	pop af
 	cp $3
 	jr c, .asm_7db46
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 2, [hl]
 .asm_7db46
@@ -1620,34 +1620,34 @@ Audio3_7db03: ; 7db03 (1f:5b03)
 	ld a, [de]
 	inc de
 	jr nz, .asm_7db25
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $14
 	jr nc, .asm_7db5f
 	jr .asm_7db89
 .asm_7db5f
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $86
 	jr z, .asm_7db89
 	jr c, .asm_7db6a
 	jr .asm_7db89
 .asm_7db6a
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wc012 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer
 	ld de, Noise3_endchannel
 	ld [hl], e
 	inc hl
 	ld [hl], d ; overwrite pointer to point to endchannel
-	ld a, [wc005]
+	ld a, [wSavedVolume]
 	and a
 	jr nz, .asm_7db89
-	ld a, [$ff24]
-	ld [wc005], a
+	ld a, [rNR50]
+	ld [wSavedVolume], a
 	ld a, $77
-	ld [$ff24], a
+	ld [rNR50], a
 .asm_7db89
 	ret