418 files changed, 4241 insertions, 4579 deletions

diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 8343074a..c729fa7e 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,32 +1,32 @@
 ; The first of three duplicated sound engines.
 
-Music2_UpdateMusic:: ; 0x9103
+Audio1_UpdateMusic:: ; 0x9103
 	ld c, CH0
 .loop
-	ld b, $0
-	ld hl, wc026
+	ld b, 0
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr z, .nextChannel
 	ld a, c
 	cp CH4
-	jr nc, .asm_912e ; if sfx channel
-	ld a, [wc002]
+	jr nc, .applyAffects ; if sfx channel
+	ld a, [wMuteAudioAndPauseMusic]
 	and a
-	jr z, .asm_912e
+	jr z, .applyAffects
 	bit 7, a
 	jr nz, .nextChannel
 	set 7, a
-	ld [wc002], a
-	xor a
-	ld [$ff25], a
-	ld [$ff1a], a
+	ld [wMuteAudioAndPauseMusic], a
+	xor a ; disable all channels' output
+	ld [rNR51], a
+	ld [rNR30], a
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	jr .nextChannel
-.asm_912e
-	call Music2_ApplyMusicAffects
+.applyAffects
+	call Audio1_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
@@ -36,63 +36,57 @@ Music2_UpdateMusic:: ; 0x9103
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
-; known flags for wc02e:
-;	0: toggleperfectpitch has been used
-;	1: call has been used
-;	3: a toggle used only by this routine for vibrato
-;	4: pitchbend flag
-;	6: dutycycle flag
-Music2_ApplyMusicAffects: ; 0x9138
+Audio1_ApplyMusicAffects: ; 0x9138
 	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 the delay is 1, play next note
-	jp z, Music2_PlayNextNote
+	jp z, Audio1_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	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
+	bit BIT_ROTATE_DUTY, [hl]
 	jr z, .checkForExecuteMusic
-	call Music2_ApplyDutyCycle
+	call Audio1_ApplyDutyCycle
 .checkForExecuteMusic
-	ld b, $0
-	ld hl, wc036
+	ld b, 0
+	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
+	bit BIT_EXECUTE_MUSIC, [hl]
 	jr nz, .checkForPitchBend
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr nz, .disablePitchBendVibrato
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr nz, .skipPitchBendVibrato
 .checkForPitchBend
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 4, [hl] ; pitchbend
+	bit BIT_PITCH_BEND_ON, [hl]
 	jr z, .checkVibratoDelay
-	jp Music2_ApplyPitchBend
+	jp Audio1_ApplyPitchBend
 .checkVibratoDelay
-	ld hl, wc04e ; vibrato delay
+	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld a, [hl]
 	and a ; check if delay is over
 	jr z, .checkForVibrato
 	dec [hl] ; otherwise, dec delay
-.disablePitchBendVibrato
+.skipPitchBendVibrato
 	ret
 .checkForVibrato
-	ld hl, wc056 ; vibrato rate
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -100,38 +94,40 @@ Music2_ApplyMusicAffects: ; 0x9138
 	ret ; no vibrato
 .vibrato
 	ld d, a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, bc
 	ld a, [hl]
 	and $f
 	and a
-	jr z, .vibratoAlreadyDone
-	dec [hl] ; apply vibrato pitch change
+	jr z, .applyVibrato
+	dec [hl] ; decrement counter
 	ret
-.vibratoAlreadyDone
+.applyVibrato
 	ld a, [hl]
 	swap [hl]
 	or [hl]
-	ld [hl], a ; reset the vibrato value and start again
-	ld hl, wc066
+	ld [hl], a ; reload the counter
+	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
-	res 3, [hl]
+; This is the only code that sets/resets the vibrato direction bit, so it
+; continuously alternates which path it takes.
+	bit BIT_VIBRATO_DIRECTION, [hl]
+	jr z, .unset
+	res BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f
 	ld d, a
 	ld a, e
 	sub d
 	jr nc, .noCarry
-	ld a, $0
+	ld a, 0
 .noCarry
 	jr .done
 .unset
-	set 3, [hl]
+	set BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f0
 	swap a
@@ -140,61 +136,64 @@ Music2_ApplyMusicAffects: ; 0x9138
 	ld a, $ff
 .done
 	ld d, a
-	ld b, $3
-	call Func_9838
+	ld b, REG_FREQUENCY_LO
+	call Audio1_GetRegisterPointer
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music2_PlayNextNote ; 0x91d0
-	ld hl, wc06e
+Audio1_PlayNextNote: ; 0x91d0
+; reload the vibrato delay counter
+	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]
-	call Music2_endchannel
+	res BIT_PITCH_BEND_ON, [hl]
+	res BIT_PITCH_BEND_DECREASING, [hl]
+	call Audio1_endchannel
 	ret
 
-Music2_endchannel: ; 0x91e6
-	call Music2_GetNextMusicByte
+Audio1_endchannel: ; 0x91e6
+	call Audio1_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music2_callchannel ; no
-	ld b, $0 ; yes
-	ld hl, wc02e
+	jp nz, Audio1_callchannel ; no
+	ld b, 0
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 1, [hl]
+	bit BIT_CHANNEL_CALL, [hl]
 	jr nz, .returnFromCall
 	ld a, c
 	cp CH3
 	jr nc, .noiseOrSfxChannel
-	jr .asm_923f
+	jr .disableChannelOutput
 .noiseOrSfxChannel
-	res 2, [hl]
-	ld hl, wc036
+	res BIT_NOISE_OR_SFX, [hl]
+	ld hl, wChannelFlags2
 	add hl, bc
-	res 0, [hl]
+	res BIT_EXECUTE_MUSIC, [hl]
 	cp CH6
-	jr nz, .notSfxChannel3
+	jr nz, .skipSfxChannel3
+; restart hardware channel 3 (wave channel) output
 	ld a, $0
-	ld [$ff1a], a
+	ld [rNR30], a
 	ld a, $80
-	ld [$ff1a], a
-.notSfxChannel3
+	ld [rNR30], a
+.skipSfxChannel3
 	jr nz, .asm_9222
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr z, .asm_9222
 	xor a
-	ld [wc003], a
-	jr .asm_923f
+	ld [wDisableChannelOutputWhenSfxEnds], a
+	jr .disableChannelOutput
 .asm_9222
 	jr .asm_9248
 .returnFromCall
@@ -203,10 +202,10 @@ Music2_endchannel: ; 0x91e6
 	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
@@ -216,47 +215,47 @@ Music2_endchannel: ; 0x91e6
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music2_endchannel
-.asm_923f
-	ld hl, Unknown_9b1f
+	jp Audio1_endchannel
+.disableChannelOutput
+	ld hl, Audio1_HWChannelDisableMasks
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a
 .asm_9248
-	ld a, [wc02a]
-	cp $14
+	ld a, [wChannelSoundIDs + CH4]
+	cp CRY_SFX_START
 	jr nc, .asm_9251
-	jr .asm_926e
+	jr .skipCry
 .asm_9251
-	ld a, [wc02a]
-	cp $86
-	jr z, .asm_926e
-	jr c, .asm_925c
-	jr .asm_926e
-.asm_925c
+	ld a, [wChannelSoundIDs + CH4]
+	cp CRY_SFX_END
+	jr z, .skipCry
+	jr c, .cry
+	jr .skipCry
+.cry
 	ld a, c
 	cp CH4
 	jr z, .asm_9265
-	call Func_96c7
+	call Audio1_GoBackOneCommandIfCry
 	ret c
 .asm_9265
-	ld a, [wc005]
-	ld [$ff24], a
+	ld a, [wSavedVolume]
+	ld [rNR50], a
 	xor a
-	ld [wc005], a
-.asm_926e
-	ld hl, wc026
+	ld [wSavedVolume], a
+.skipCry
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld [hl], b
 	ret
 
-Music2_callchannel: ; 0x9274
+Audio1_callchannel: ; 0x9274
 	cp $fd ; is this command a callchannel?
-	jp nz, Music2_loopchannel ; no
-	call Music2_GetNextMusicByte ; yes
+	jp nz, Audio1_loopchannel ; no
+	call Audio1_GetNextMusicByte
 	push af
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -265,10 +264,10 @@ Music2_callchannel: ; 0x9274
 	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,77 +282,77 @@ Music2_callchannel: ; 0x9274
 	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 Music2_endchannel
+	set BIT_CHANNEL_CALL, [hl] ; set the call flag
+	jp Audio1_endchannel
 
-Music2_loopchannel: ; 0x92a9
+Audio1_loopchannel: ; 0x92a9
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music2_notetype ; no
-	call Music2_GetNextMusicByte ; yes
+	jp nz, Audio1_notetype ; no
+	call Audio1_GetNextMusicByte
 	ld e, a
 	and a
 	jr z, .infiniteLoop
-	ld b, $0
-	ld hl, wc0be
+	ld b, 0
+	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make,
 	ld [hl], a
-	call Music2_GetNextMusicByte ; skip pointer
-	call Music2_GetNextMusicByte
-	jp Music2_endchannel
+	call Audio1_GetNextMusicByte ; skip pointer
+	call Audio1_GetNextMusicByte
+	jp Audio1_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	push af
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_notetype: ; 0x92e4
+Audio1_notetype: ; 0x92e4
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music2_toggleperfectpitch ; no
-	ld a, d ; yes
+	jp nz, Audio1_toggleperfectpitch ; no
+	ld a, d
 	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
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
 	jr z, .musicChannel3
 	cp CH6
-	jr nz, .notChannel3
-	ld hl, wc0e7
-	jr .sfxChannel3
+	jr nz, .skipChannel3
+	ld hl, wSfxWaveInstrument
+	jr .channel3
 .musicChannel3
-	ld hl, wc0e6
-.sfxChannel3
+	ld hl, wMusicWaveInstrument
+.channel3
 	ld a, d
 	and $f
-	ld [hl], a ; store low nibble of param as duty
+	ld [hl], a ; store low nibble of param as wave instrument
 	ld a, d
 	and $30
 	sla a
@@ -362,273 +361,294 @@ Music2_notetype: ; 0x92e4
 
 	; if channel 3, store high nibble as volume
 	; else, store volume (high nibble) and fade (low nibble)
-.notChannel3
-	ld b, $0
-	ld hl, wc0de
+.skipChannel3
+	ld b, 0
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_toggleperfectpitch: ; 0x9323
+Audio1_toggleperfectpitch: ; 0x9323
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music2_vibrato ; no
-	ld b, $0 ; yes
-	ld hl, wc02e
+	jr nz, Audio1_vibrato ; no
+	ld b, 0
+	ld hl, wChannelFlags1
 	add hl, bc
 	ld a, [hl]
 	xor $1
-	ld [hl], a ; flip bit 0 of wc02e
-	jp Music2_endchannel
+	ld [hl], a ; flip bit 0 of wChannelFlags1
+	jp Audio1_endchannel
 
-Music2_vibrato: ; 0x9335
+Audio1_vibrato: ; 0x9335
 	cp $ea ; is this command a vibrato?
-	jr nz, Music2_pitchbend ; no
-	call Music2_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wc04e
+	jr nz, Audio1_pitchbend ; no
+	call Audio1_GetNextMusicByte
+	ld b, 0
+	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 Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
+
+; The high nybble of the command byte is the extent of the vibrato.
+; Let n be the extent.
+; The upper nybble of the channel's byte in the wChannelVibratoExtents
+; array will store the extent above the note: (n / 2) + (n % 2).
+; The lower nybble will store the extent below the note: (n / 2).
+; These two values add to the total extent, n.
 	and $f0
 	swap a
-	ld b, $0
-	ld hl, wc056
+	ld b, 0
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
 	ld e, a
 	adc b
 	swap a
 	or e
-	ld [hl], a ; store rate as both high and low nibbles
+	ld [hl], a
+
+; The low nybble of the command byte is the rate of the vibrato.
+; The high and low nybbles of the channel's byte in the wChannelVibratoRates
+; array are both initialised to this value because the high nybble is the
+; counter reload value and the low nybble is the counter itself, which should
+; start at its value upon reload.
 	ld a, d
 	and $f
 	ld d, a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, bc
 	swap a
 	or d
-	ld [hl], a ; store depth as both high and low nibbles
-	jp Music2_endchannel
+	ld [hl], a
+
+	jp Audio1_endchannel
 
-Music2_pitchbend: ; 0x936d
+Audio1_pitchbend: ; 0x936d
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music2_duty ; no
-	call Music2_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wc076
+	jr nz, Audio1_duty ; no
+	call Audio1_GetNextMusicByte
+	ld b, 0
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
-	ld [hl], a ; store first param
-	call Music2_GetNextMusicByte
+	ld [hl], a
+	call Audio1_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Func_9858
-	ld b, $0
-	ld hl, wc0a6
+	call Audio1_CalculateFrequency
+	ld b, 0
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
 	add hl, bc
-	ld [hl], d ; store unknown part of second param
-	ld hl, wc0ae
+	ld [hl], d
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
-	ld [hl], e ; store unknown part of second param
-	ld b, $0
-	ld hl, wc02e
+	ld [hl], e
+	ld b, 0
+	ld hl, wChannelFlags1
 	add hl, bc
-	set 4, [hl] ; set pitchbend flag
-	call Music2_GetNextMusicByte
+	set BIT_PITCH_BEND_ON, [hl]
+	call Audio1_GetNextMusicByte
 	ld d, a
-	jp Music2_notelength
+	jp Audio1_notelength
 
-Music2_duty: ; 0x93a5
+Audio1_duty: ; 0x93a5
 	cp $ec ; is this command a duty?
-	jr nz, Music2_tempo ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_tempo ; no
+	call Audio1_GetNextMusicByte
 	rrca
 	rrca
 	and $c0
-	ld b, $0
-	ld hl, wc03e
+	ld b, 0
+	ld hl, wChannelDuties
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_tempo: ; 0x93ba
+Audio1_tempo: ; 0x93ba
 	cp $ed ; is this command a tempo?
-	jr nz, Music2_stereopanning ; no
-	ld a, c ; yes
+	jr nz, Audio1_stereopanning ; no
+	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
-	call Music2_GetNextMusicByte
-	ld [wc0e8], a ; store first param
-	call Music2_GetNextMusicByte
-	ld [wc0e9], a ; store second param
+	call Audio1_GetNextMusicByte
+	ld [wMusicTempo], a ; store first param
+	call Audio1_GetNextMusicByte
+	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 Music2_GetNextMusicByte
-	ld [wc0ea], a ; store first param
-	call Music2_GetNextMusicByte
-	ld [wc0eb], a ; store second param
+	call Audio1_GetNextMusicByte
+	ld [wSfxTempo], a ; store first param
+	call Audio1_GetNextMusicByte
+	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 Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_stereopanning: ; 0x93fa
+Audio1_stereopanning: ; 0x93fa
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music2_unknownmusic0xef ; no
-	call Music2_GetNextMusicByte ; yes
-	ld [wc004], a ; store panning
-	jp Music2_endchannel
+	jr nz, Audio1_unknownmusic0xef ; no
+	call Audio1_GetNextMusicByte
+	ld [wStereoPanning], a ; store panning
+	jp Audio1_endchannel
 
 ; this appears to never be used
-Music2_unknownmusic0xef ; 0x9407
+Audio1_unknownmusic0xef: ; 0x9407
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music2_dutycycle ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_dutycycle ; no
+	call Audio1_GetNextMusicByte
 	push bc
-	call Func_9876
+	call Audio1_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 Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_dutycycle: ; 0x9426
+Audio1_dutycycle: ; 0x9426
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music2_volume ; no
-	call Music2_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wc046
+	jr nz, Audio1_volume ; no
+	call Audio1_GetNextMusicByte
+	ld b, 0
+	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 dutycycle flag
-	jp Music2_endchannel
+	set BIT_ROTATE_DUTY, [hl]
+	jp Audio1_endchannel
 
-Music2_volume: ; 0x9444
+Audio1_volume: ; 0x9444
 	cp $f0 ; is this command a volume?
-	jr nz, Music2_executemusic ; no
-	call Music2_GetNextMusicByte ; yes
-	ld [$ff24], a ; store volume
-	jp Music2_endchannel
+	jr nz, Audio1_executemusic ; no
+	call Audio1_GetNextMusicByte
+	ld [rNR50], a ; store volume
+	jp Audio1_endchannel
 
-Music2_executemusic: ; 0x9450
+Audio1_executemusic: ; 0x9450
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music2_octave ; no
-	ld b, $0 ; yes
-	ld hl, wc036
+	jr nz, Audio1_octave ; no
+	ld b, $0
+	ld hl, wChannelFlags2
 	add hl, bc
-	set 0, [hl]
-	jp Music2_endchannel
+	set BIT_EXECUTE_MUSIC, [hl]
+	jp Audio1_endchannel
 
-Music2_octave: ; 0x945f
+Audio1_octave: ; 0x945f
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music2_unknownsfx0x20 ; no
-	ld hl, wc0d6 ; yes
-	ld b, $0
+	jr nz, Audio1_unknownsfx0x20 ; no
+	ld hl, wChannelOctaves
+	ld b, 0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_unknownsfx0x20: ; 0x9472
+Audio1_unknownsfx0x20: ; 0x9472
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music2_unknownsfx0x10 ; no
+	jr nz, Audio1_unknownsfx0x10
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music2_unknownsfx0x10 ; no
-	ld b, $0
-	ld hl, wc036
+	jr c, Audio1_unknownsfx0x10 ; no
+	ld b, 0
+	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Music2_unknownsfx0x10 ; no
-	call Music2_notelength ; yes
+	bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used?
+	jr nz, Audio1_unknownsfx0x10 ; yes
+	call Audio1_notelength
+
+; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength
+; does below.
 	ld d, a
-	ld b, $0
-	ld hl, wc03e
+	ld b, 0
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-	ld b, $1
-	call Func_9838
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio1_GetRegisterPointer
 	ld [hl], d
-	call Music2_GetNextMusicByte
+
+	call Audio1_GetNextMusicByte
 	ld d, a
-	ld b, $2
-	call Func_9838
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio1_GetRegisterPointer
 	ld [hl], d
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
-	ld a, $0
-	jr z, .sfxNoiseChannel ; only two params for noise channel
+	ld a, 0
+	jr z, .skip
+; Channels 1 through 3 have 2 registers that control frequency, but the noise
+; channel a single register (the polynomial counter) that controls frequency,
+; so this command has one less byte on the noise channel.
 	push de
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	pop de
-.sfxNoiseChannel
+.skip
 	ld d, a
 	push de
-	call Func_9629
-	call Func_95f8
+	call Audio1_ApplyDutyAndSoundLength
+	call Audio1_EnableChannelOutput
 	pop de
-	call Func_964b
+	call Audio1_ApplyWavePatternAndFrequency
 	ret
 
-Music2_unknownsfx0x10:
+Audio1_unknownsfx0x10:
 	ld a, c
 	cp CH4
-	jr c, Music2_note ; if not a sfx
+	jr c, Audio1_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
-	jr nz, Music2_note ; no
+	jr nz, Audio1_note ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Music2_note ; no
-	call Music2_GetNextMusicByte ; yes
-	ld [$ff10], a
-	jp Music2_endchannel
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, Audio1_note ; no
+	call Audio1_GetNextMusicByte
+	ld [rNR10], a
+	jp Audio1_endchannel
 
-Music2_note:
+Audio1_note:
 	ld a, c
 	cp CH3
-	jr nz, Music2_notelength ; if not noise channel
+	jr nz, Audio1_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music2_dnote ; yes
-	jr nc, Music2_notelength ; no
+	jr z, Audio1_dnote
+	jr nc, Audio1_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -639,42 +659,42 @@ Music2_note:
 	push bc
 	jr asm_94fd
 
-Music2_dnote:
+Audio1_dnote:
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music2_GetNextMusicByte ; get dnote instrument
+	call Audio1_GetNextMusicByte ; get dnote instrument
 asm_94fd
 	ld d, a
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .asm_9508
 	ld a, d
-	call Func_9876
+	call Audio1_PlaySound
 .asm_9508
 	pop bc
 	pop de
 
-Music2_notelength: ; 0x950a
+Audio1_notelength: ; 0x950a
 	ld a, d
 	push af
 	and $f
 	inc a
-	ld b, $0
+	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
-	call Func_9847
+	call Audio1_MultiplyAdd
 	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
@@ -682,216 +702,222 @@ Music2_notelength: ; 0x950a
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Func_9693
-	ld a, [wc0ea]
+	call Audio1_SetSfxTempo
+	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 a, l ; a = note_length * note_speed
+	ld b, 0
+	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld l, [hl]
-	call Func_9847
+	call Audio1_MultiplyAdd
 	ld e, l
-	ld d, h
-	ld hl, wc0ce
+	ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo)
+	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, Music2_notepitch
-	ld hl, wc02e
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, Audio1_notepitch
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr z, Music2_notepitch
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr z, Audio1_notepitch
 	pop hl
 	ret
 
-Music2_notepitch: ; 0x9568
+Audio1_notepitch: ; 0x9568
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
 	cp CH4
-	jr nc, .sfxChannel
-	ld hl, wc02a
+	jr nc, .next
+; If this isn't an SFX channel, try the corresponding SFX channel.
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .done
 	; fall through
-.sfxChannel
+.next
 	ld a, c
 	cp CH2
-	jr z, .musicChannel3
+	jr z, .channel3
 	cp CH6
-	jr nz, .notSfxChannel3
-.musicChannel3
-	ld b, $0
-	ld hl, Unknown_9b1f
+	jr nz, .notChannel3
+.channel3
+	ld b, 0
+	ld hl, Audio1_HWChannelDisableMasks
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a ; disable hardware channel 3's output
 	jr .done
-.notSfxChannel3
-	ld b, $2
-	call Func_9838
-	ld a, $8
+.notChannel3
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio1_GetRegisterPointer
+	ld a, $8 ; fade in sound
 	ld [hli], a
 	inc hl
-	ld a, $80
+	ld a, $80 ; restart sound
 	ld [hl], a
 .done
 	ret
 .notRest
 	swap a
-	ld b, $0
-	ld hl, wc0d6
+	ld b, 0
+	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
-	call Func_9858
-	ld b, $0
-	ld hl, wc02e
-	add hl, bc
-	bit 4, [hl]
-	jr z, .asm_95b8
-	call Func_978f
-.asm_95b8
+	call Audio1_CalculateFrequency
+	ld b, 0
+	ld hl, wChannelFlags1
+	add hl, bc
+	bit BIT_PITCH_BEND_ON, [hl]
+	jr z, .skipPitchBend
+	call Audio1_InitPitchBendVars
+.skipPitchBend
 	push de
 	ld a, c
 	cp CH4
-	jr nc, .skip ; if sfx channel
-	ld hl, wc02a
-	ld d, $0
+	jr nc, .sfxChannel ; if sfx channel
+; If this isn't an SFX channel, try the corresponding SFX channel.
+	ld hl, wChannelSoundIDs + CH4
+	ld d, 0
 	ld e, a
 	add hl, de
 	ld a, [hl]
 	and a
-	jr nz, .asm_95cb
-	jr .skip
-.asm_95cb
+	jr nz, .noSfx
+	jr .sfxChannel
+.noSfx
 	pop de
 	ret
-.skip
-	ld b, $0
-	ld hl, wc0de
+.sfxChannel
+	ld b, 0
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
-	ld b, $2
-	call Func_9838
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio1_GetRegisterPointer
 	ld [hl], d
-	call Func_9629
-	call Func_95f8
+	call Audio1_ApplyDutyAndSoundLength
+	call Audio1_EnableChannelOutput
 	pop de
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 0, [hl]   ; has toggleperfectpitch been used?
-	jr z, .skip2
-	inc e         ; if yes, increment the pitch by 1
-	jr nc, .skip2
+	bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used?
+	jr z, .skipFrequencyInc
+	inc e                       ; if yes, increment the frequency by 1
+	jr nc, .skipFrequencyInc
 	inc d
-.skip2
-	ld hl, wc066
+.skipFrequencyInc
+	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	call Func_964b
+	call Audio1_ApplyWavePatternAndFrequency
 	ret
 
-Func_95f8: ; 0x95f8
-	ld b, $0
-	ld hl, Unknown_9b27
+Audio1_EnableChannelOutput: ; 0x95f8
+	ld b, 0
+	ld hl, Audio1_HWChannelEnableMasks
 	add hl, bc
-	ld a, [$ff25]
-	or [hl]
+	ld a, [rNR51]
+	or [hl] ; set this channel's bits
 	ld d, a
 	ld a, c
 	cp CH7
-	jr z, .sfxNoiseChannel
+	jr z, .noiseChannelOrNoSfx
 	cp CH4
 	jr nc, .skip ; if sfx channel
-	ld hl, wc02a
+; If this isn't an SFX channel, try the corresponding SFX channel.
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .skip
-.sfxNoiseChannel
-	ld a, [wc004]
-	ld hl, Unknown_9b27
+.noiseChannelOrNoSfx
+; If this is the SFX noise channel or a music channel whose corresponding
+; SFX channel is off, apply stereo panning.
+	ld a, [wStereoPanning]
+	ld hl, Audio1_HWChannelEnableMasks
 	add hl, bc
 	and [hl]
 	ld d, a
-	ld a, [$ff25]
-	ld hl, Unknown_9b1f
+	ld a, [rNR51]
+	ld hl, Audio1_HWChannelDisableMasks
 	add hl, bc
-	and [hl]
-	or d
+	and [hl] ; reset this channel's output bits
+	or d ; set this channel's output bits that enabled in [wStereoPanning]
 	ld d, a
 .skip
 	ld a, d
-	ld [$ff25], a
+	ld [rNR51], a
 	ret
 
-Func_9629: ; 0x9629
-	ld b, $0
-	ld hl, wc0b6
+Audio1_ApplyDutyAndSoundLength: ; 0x9629
+	ld b, 0
+	ld hl, wChannelNoteDelayCounters ; use the note delay as sound length
 	add hl, bc
 	ld d, [hl]
 	ld a, c
 	cp CH2
-	jr z, .channel3 ; if music channel 3
+	jr z, .skipDuty ; if music channel 3
 	cp CH6
-	jr z, .channel3 ; if sfx channel 3
+	jr z, .skipDuty ; if sfx channel 3
+; include duty (except on channel 3 which doesn't have it)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-.channel3
-	ld b, $1
-	call Func_9838
+.skipDuty
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio1_GetRegisterPointer
 	ld [hl], d
 	ret
 
-Func_964b: ; 0x964b
+Audio1_ApplyWavePatternAndFrequency: ; 0x964b
 	ld a, c
 	cp CH2
 	jr z, .channel3
 	cp CH6
-	jr nz, .notSfxChannel3
+	jr nz, .notChannel3
 	; fall through
 .channel3
 	push de
-	ld de, wc0e6
+	ld de, wMusicWaveInstrument
 	cp CH2
-	jr z, .musicChannel3
-	ld de, wc0e7
-.musicChannel3
+	jr z, .next
+	ld de, wSfxWaveInstrument
+.next
 	ld a, [de]
 	add a
-	ld d, $0
+	ld d, 0
 	ld e, a
-	ld hl, Music2_WavePointers
+	ld hl, Audio1_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, $ff30
+	ld hl, $ff30 ; wave pattern RAM
 	ld b, $f
-	ld a, $0
-	ld [$ff1a], a
+	ld a, $0 ; stop hardware channel 3
+	ld [rNR30], a
 .loop
 	ld a, [de]
 	inc de
@@ -900,152 +926,155 @@ Func_964b: ; 0x964b
 	dec b
 	and a
 	jr nz, .loop
-	ld a, $80
-	ld [$ff1a], a
+	ld a, $80 ; start hardware channel 3
+	ld [rNR30], a
 	pop de
-.notSfxChannel3
+.notChannel3
 	ld a, d
-	or $80
-	and $c7
+	or $80 ; use counter mode (i.e. disable output when the counter reaches 0)
+	and $c7 ; zero the unused bits in the register
 	ld d, a
-	ld b, $3
-	call Func_9838
-	ld [hl], e
+	ld b, REG_FREQUENCY_LO
+	call Audio1_GetRegisterPointer
+	ld [hl], e ; store frequency low byte
 	inc hl
-	ld [hl], d
-	call Func_96b5
+	ld [hl], d ; store frequency high byte
+	call Audio1_ApplyFrequencyModifier
 	ret
 
-Func_9693: ; 0x9693
-	call Func_96e5
-	jr nc, .asm_96ab
-	ld d, $0
-	ld a, [wc0f2]
+Audio1_SetSfxTempo: ; 0x9693
+	call Audio1_IsCry
+	jr nc, .notCry
+	ld d, 0
+	ld a, [wTempoModifier]
 	add $80
-	jr nc, .asm_96a2
+	jr nc, .next
 	inc d
-.asm_96a2
-	ld [wc0eb], a
+.next
+	ld [wSfxTempo + 1], a
 	ld a, d
-	ld [wc0ea], a
-	jr .asm_96b4
-.asm_96ab
+	ld [wSfxTempo], a
+	jr .done
+.notCry
 	xor a
-	ld [wc0eb], a
+	ld [wSfxTempo + 1], a
 	ld a, $1
-	ld [wc0ea], a
-.asm_96b4
+	ld [wSfxTempo], a
+.done
 	ret
 
-Func_96b5: ; 0x96b5
-	call Func_96e5
-	jr nc, .asm_96c6
-	ld a, [wc0f1]
+Audio1_ApplyFrequencyModifier: ; 0x96b5
+	call Audio1_IsCry
+	jr nc, .done
+; if playing a cry, add the cry's frequency modifier
+	ld a, [wFrequencyModifier]
 	add e
-	jr nc, .asm_96c1
+	jr nc, .noCarry
 	inc d
-.asm_96c1
+.noCarry
 	dec hl
 	ld e, a
 	ld [hl], e
 	inc hl
 	ld [hl], d
-.asm_96c6
+.done
 	ret
 
-Func_96c7: ; 0x96c7
-	call Func_96e5
-	jr nc, .asm_96e2
-	ld hl, wc006
+Audio1_GoBackOneCommandIfCry: ; 0x96c7
+	call Audio1_IsCry
+	jr nc, .done
+	ld hl, wChannelCommandPointers
 	ld e, c
-	ld d, $0
+	ld d, 0
 	sla e
 	rl d
 	add hl, de
 	ld a, [hl]
-	sub $1
+	sub 1
 	ld [hl], a
 	inc hl
 	ld a, [hl]
-	sbc $0
+	sbc 0
 	ld [hl], a
 	scf
 	ret
-.asm_96e2
+.done
 	scf
 	ccf
 	ret
 
-Func_96e5: ; 0x96e5
-	ld a, [wc02a]
-	cp $14
-	jr nc, .asm_96ee
-	jr .asm_96f4
-.asm_96ee
-	cp $86
-	jr z, .asm_96f4
-	jr c, .asm_96f7
-.asm_96f4
+Audio1_IsCry: ; 0x96e5
+; Returns whether the currently playing audio is a cry in carry.
+	ld a, [wChannelSoundIDs + CH4]
+	cp CRY_SFX_START
+	jr nc, .next
+	jr .no
+.next
+	cp CRY_SFX_END
+	jr z, .no
+	jr c, .yes
+.no
 	scf
 	ccf
 	ret
-.asm_96f7
+.yes
 	scf
 	ret
 
-Music2_ApplyPitchBend: ; 0x96f9
-	ld hl, wc02e
+Audio1_ApplyPitchBend: ; 0x96f9
+	ld hl, wChannelFlags1
 	add hl, bc
-	bit 5, [hl]
-	jp nz, .asm_9740
-	ld hl, wc09e
+	bit BIT_PITCH_BEND_DECREASING, [hl]
+	jp nz, .frequencyDecreasing
+; frequency increasing
+	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
 	add [hl]
 	ld [hl], a
-	ld a, $0
+	ld a, 0
 	adc e
 	ld e, a
-	ld a, $0
+	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_9786
-	jr nz, .asm_9773
-	ld hl, wc0ae
+	jp c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
-	jp c, .asm_9786
-	jr .asm_9773
-.asm_9740
-	ld hl, wc09e
+	jp c, .reachedTargetFrequency
+	jr .applyUpdatedFrequency
+.frequencyDecreasing
+	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 +1082,7 @@ Music2_ApplyPitchBend: ; 0x96f9
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1064,129 +1093,140 @@ Music2_ApplyPitchBend: ; 0x96f9
 	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_9786
-	jr nz, .asm_9773
-	ld hl, wc0ae
+	jr c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
-	jr c, .asm_9786
-.asm_9773
-	ld hl, wc09e
+	jr c, .reachedTargetFrequency
+.applyUpdatedFrequency
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wc096
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld b, $3
-	call Func_9838
+	ld b, REG_FREQUENCY_LO
+	call Audio1_GetRegisterPointer
 	ld a, e
 	ld [hli], a
 	ld [hl], d
 	ret
-.asm_9786
-	ld hl, wc02e
+.reachedTargetFrequency
+; Turn off pitch bend when the target frequency has been reached.
+	ld hl, wChannelFlags1
 	add hl, bc
-	res 4, [hl]
-	res 5, [hl]
+	res BIT_PITCH_BEND_ON, [hl]
+	res BIT_PITCH_BEND_DECREASING, [hl]
 	ret
 
-Func_978f: ; 0x978f
-	ld hl, wc096
+Audio1_InitPitchBendVars: ; 0x978f
+	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_97a7
-	ld a, $1
-.asm_97a7
+	jr nc, .next
+	ld a, 1
+.next
 	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_97c3
+	jr c, .targetFrequencyGreater
 	ld d, a
-	ld b, $0
-	ld hl, wc02e
+	ld b, 0
+	ld hl, wChannelFlags1
 	add hl, bc
-	set 5, [hl]
-	jr .asm_97e6
-.asm_97c3
-	ld hl, wc096
+	set BIT_PITCH_BEND_DECREASING, [hl]
+	jr .next2
+.targetFrequencyGreater
+; If the target frequency is greater, subtract the current frequency from
+; the target frequency to get the absolute difference.
+	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
 	ld e, a
+
+; Bug. Instead of borrowing from the high byte of the target frequency as it
+; should, it borrows from the high byte of the current frequency instead.
+; This means that the result will be 0x200 greater than it should be if the
+; low byte of the current frequency is greater than the low byte of the
+; target frequency.
 	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 b, 0
+	ld hl, wChannelFlags1
 	add hl, bc
-	res 5, [hl]
-.asm_97e6
-	ld hl, wc076
+	res BIT_PITCH_BEND_DECREASING, [hl]
+
+.next2
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
-.asm_97ea
+.divideLoop
 	inc b
 	ld a, e
 	sub [hl]
 	ld e, a
-	jr nc, .asm_97ea
+	jr nc, .divideLoop
 	ld a, d
 	and a
-	jr z, .asm_97f8
+	jr z, .doneDividing
 	dec a
 	ld d, a
-	jr .asm_97ea
-.asm_97f8
-	ld a, e
+	jr .divideLoop
+.doneDividing
+	ld a, e ; a = remainder - dividend
 	add [hl]
-	ld d, b
-	ld b, $0
-	ld hl, wc07e
+	ld d, b ; d = quotient + 1
+	ld b, 0
+	ld hl, wChannelPitchBendFrequencySteps
 	add hl, bc
-	ld [hl], d
-	ld hl, wc086
+	ld [hl], d ; store quotient + 1
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
-	ld [hl], a
-	ld hl, wc08e
+	ld [hl], a ; store remainder - dividend
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
 	add hl, bc
-	ld [hl], a
+	ld [hl], a ; store remainder - dividend
 	ret
 
-Music2_ApplyDutyCycle: ; 0x980d
-	ld b, $0
-	ld hl, wc046
+Audio1_ApplyDutyCycle: ; 0x980d
+	ld b, 0
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1194,20 +1234,20 @@ Music2_ApplyDutyCycle: ; 0x980d
 	ld [hl], a
 	and $c0
 	ld d, a
-	ld b, $1
-	call Func_9838
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio1_GetRegisterPointer
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music2_GetNextMusicByte: ; 0x9825
-	ld d, $0
+Audio1_GetNextMusicByte: ; 0x9825
+	ld d, 0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	ld a, [hli]
 	ld e, a
@@ -1220,9 +1260,10 @@ Music2_GetNextMusicByte: ; 0x9825
 	ld [hl], d
 	ret
 
-Func_9838: ; 0x9838
+Audio1_GetRegisterPointer: ; 0x9838
+; hl = address of hardware sound register b for software channel c
 	ld a, c
-	ld hl, Unknown_9b17
+	ld hl, Audio1_HWChannelBaseAddresses
 	add l
 	jr nc, .noCarry
 	inc h
@@ -1234,13 +1275,14 @@ Func_9838: ; 0x9838
 	ld h, $ff
 	ret
 
-Func_9847: ; 0x9847
-	ld h, $0
+Audio1_MultiplyAdd: ; 0x9847
+; hl = l + (a * de)
+	ld h, 0
 .loop
 	srl a
-	jr nc, .noCarry
+	jr nc, .skipAdd
 	add hl, de
-.noCarry
+.skipAdd
 	sla e
 	rl d
 	and a
@@ -1249,150 +1291,152 @@ Func_9847: ; 0x9847
 .done
 	ret
 
-Func_9858: ; 0x9858
-	ld h, $0
+Audio1_CalculateFrequency: ; 0x9858
+; return the frequency for note a, octave b in de
+	ld h, 0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music2_Pitches
+	ld hl, Audio1_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	ld a, b
 .loop
-	cp $7
+	cp 7
 	jr z, .done
 	sra d
 	rr e
 	inc a
 	jr .loop
 .done
-	ld a, $8
+	ld a, 8
 	add d
 	ld d, a
 	ret
 
-Func_9876:: ; 0x9876
-	ld [wc001], a
+Audio1_PlaySound:: ; 0x9876
+	ld [wSoundID], a
 	cp $ff
-	jp z, Func_9a34
-	cp $b9
-	jp z, Func_994e
-	jp c, Func_994e
+	jp z, .stopAllAudio
+	cp MAX_SFX_ID
+	jp z, .playSfx
+	jp c, .playSfx
 	cp $fe
-	jr z, .asm_988d
-	jp nc, Func_994e
-.asm_988d
+	jr z, .playMusic
+	jp nc, .playSfx
+
+.playMusic
 	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
-	call FillMusicRAM2
-	ld hl, wc006
-	call FillMusicRAM2
+	ld hl, wChannelReturnAddresses
+	call .FillMem
+	ld hl, wChannelCommandPointers
+	call .FillMem
 	ld d, $4
-	ld hl, wc026
-	call FillMusicRAM2
-	ld hl, wc02e
-	call FillMusicRAM2
-	ld hl, wc03e
-	call FillMusicRAM2
-	ld hl, wc046
-	call FillMusicRAM2
-	ld hl, wc04e
-	call FillMusicRAM2
-	ld hl, wc056
-	call FillMusicRAM2
-	ld hl, wc05e
-	call FillMusicRAM2
-	ld hl, wc066
-	call FillMusicRAM2
-	ld hl, wc06e
-	call FillMusicRAM2
-	ld hl, wc036
-	call FillMusicRAM2
-	ld hl, wc076
-	call FillMusicRAM2
-	ld hl, wc07e
-	call FillMusicRAM2
-	ld hl, wc086
-	call FillMusicRAM2
-	ld hl, wc08e
-	call FillMusicRAM2
-	ld hl, wc096
-	call FillMusicRAM2
-	ld hl, wc09e
-	call FillMusicRAM2
-	ld hl, wc0a6
-	call FillMusicRAM2
-	ld hl, wc0ae
-	call FillMusicRAM2
+	ld hl, wChannelSoundIDs
+	call .FillMem
+	ld hl, wChannelFlags1
+	call .FillMem
+	ld hl, wChannelDuties
+	call .FillMem
+	ld hl, wChannelDutyCycles
+	call .FillMem
+	ld hl, wChannelVibratoDelayCounters
+	call .FillMem
+	ld hl, wChannelVibratoExtents
+	call .FillMem
+	ld hl, wChannelVibratoRates
+	call .FillMem
+	ld hl, wChannelFrequencyLowBytes
+	call .FillMem
+	ld hl, wChannelVibratoDelayCounterReloadValues
+	call .FillMem
+	ld hl, wChannelFlags2
+	call .FillMem
+	ld hl, wChannelPitchBendLengthModifiers
+	call .FillMem
+	ld hl, wChannelPitchBendFrequencySteps
+	call .FillMem
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	call .FillMem
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	call .FillMem
 	ld a, $1
-	ld hl, wc0be
-	call FillMusicRAM2
-	ld hl, wc0b6
-	call FillMusicRAM2
-	ld hl, wc0c6
-	call FillMusicRAM2
-	ld [wc0e8], a
+	ld hl, wChannelLoopCounters
+	call .FillMem
+	ld hl, wChannelNoteDelayCounters
+	call .FillMem
+	ld hl, wChannelNoteSpeeds
+	call .FillMem
+	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 a, $0
-	ld [$ff25], a
+	ld [rNR10], a
+	ld a, 0
+	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
-	jp Func_9a8f
+	ld [rNR50], a
+	jp .playSoundCommon
 
-Func_994e: ; 0x994e
+.playSfx
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_02
+	ld de, SFX_Headers_1
 	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
 	rlca
 	ld c, a
-.asm_9967
+.sfxChannelLoop
 	ld d, c
 	ld a, c
 	add a
 	add c
 	ld c, a
-	ld b, $0
-	ld a, [wc0ec]
+	ld b, 0
+	ld a, [wSfxHeaderPointer]
 	ld h, a
-	ld a, [wc0ed]
+	ld a, [wSfxHeaderPointer + 1]
 	ld l, a
 	add hl, bc
 	ld c, d
 	ld a, [hl]
 	and $f
-	ld e, a
-	ld d, $0
-	ld hl, wc026
+	ld e, a ; software channel ID
+	ld d, 0
+	ld hl, wChannelSoundIDs
 	add hl, de
 	ld a, [hl]
 	and a
@@ -1400,7 +1444,7 @@ Func_994e: ; 0x994e
 	ld a, e
 	cp $7
 	jr nz, .asm_999a
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $14
 	jr nc, .asm_9993
 	ret
@@ -1410,7 +1454,7 @@ Func_994e: ; 0x994e
 	jr z, .asm_99a3
 	jr c, .asm_99a3
 .asm_999a
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp [hl]
 	jr z, .asm_99a3
 	jr c, .asm_99a3
@@ -1423,132 +1467,132 @@ Func_994e: ; 0x994e
 	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
+	cp CH4
 	jr nz, .asm_9a2b
 	ld a, $8
-	ld [$ff10], a
+	ld [rNR10], a ; sweep off
 .asm_9a2b
 	ld a, c
 	and a
-	jp z, Func_9a8f
+	jp z, .playSoundCommon
 	dec c
-	jp .asm_9967
+	jp .sfxChannelLoop
 
-Func_9a34: ; 0x9a34
+.stopAllAudio
 	ld a, $80
-	ld [$ff26], a
-	ld [$ff1a], a
+	ld [rNR52], a ; sound hardware on
+	ld [rNR30], a ; wave playback on
 	xor a
-	ld [$ff25], a
-	ld [$ff1c], a
+	ld [rNR51], a ; no sound output
+	ld [rNR32], a ; mute channel 3 (wave channel)
 	ld a, $8
-	ld [$ff10], a
-	ld [$ff12], a
-	ld [$ff17], a
-	ld [$ff21], a
+	ld [rNR10], a ; sweep off
+	ld [rNR12], a ; mute channel 1 (pulse channel 1)
+	ld [rNR22], a ; mute channel 2 (pulse channel 2)
+	ld [rNR42], a ; mute channel 4 (noise channel)
 	ld a, $40
-	ld [$ff14], a
-	ld [$ff19], a
-	ld [$ff23], a
+	ld [rNR14], a ; counter mode
+	ld [rNR24], a
+	ld [rNR44], a
 	ld a, $77
-	ld [$ff24], a
+	ld [rNR50], a ; full volume
 	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
-	call FillMusicRAM2
+	ld hl, wChannelCommandPointers
+	call .FillMem
 	ld a, $1
 	ld d, $18
-	ld hl, wc0b6
-	call FillMusicRAM2
-	ld [wc0e8], a
-	ld [wc0ea], a
+	ld hl, wChannelNoteDelayCounters
+	call .FillMem
+	ld [wMusicTempo], a
+	ld [wSfxTempo], a
 	ld a, $ff
-	ld [wc004], a
+	ld [wStereoPanning], a
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM2: ; 0x9a89
+.FillMem
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,19 +1600,19 @@ FillMusicRAM2: ; 0x9a89
 	jr nz, .loop
 	ret
 
-Func_9a8f: ; 0x9a8f
-	ld a, [wc001]
+.playSoundCommon
+	ld a, [wSoundID]
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_02
+	ld de, SFX_Headers_1
 	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
@@ -1580,31 +1624,31 @@ Func_9a8f: ; 0x9a8f
 	ld b, c
 	inc b
 	inc de
-	ld c, $0
-.asm_9ab1
+	ld c, 0
+.commandPointerLoop
 	cp c
-	jr z, .asm_9ab9
+	jr z, .next
 	inc c
 	inc hl
 	inc hl
-	jr .asm_9ab1
-.asm_9ab9
+	jr .commandPointerLoop
+.next
 	push hl
 	push bc
 	push af
-	ld b, $0
+	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_9ad2
-	ld hl, wc02e
+	cp CH3
+	jr c, .skipSettingFlag
+	ld hl, wChannelFlags1
 	add hl, bc
-	set 2, [hl]
-.asm_9ad2
+	set BIT_NOISE_OR_SFX, [hl]
+.skipSettingFlag
 	pop bc
 	pop hl
 	ld a, [de] ; get channel pointer
@@ -1619,54 +1663,55 @@ Func_9a8f: ; 0x9a8f
 	and a
 	ld a, [de]
 	inc de
-	jr nz, .asm_9ab1
-	ld a, [wc001]
-	cp $14
+	jr nz, .commandPointerLoop
+	ld a, [wSoundID]
+	cp CRY_SFX_START
 	jr nc, .asm_9aeb
-	jr .asm_9b15
+	jr .done
 .asm_9aeb
-	ld a, [wc001]
-	cp $86
-	jr z, .asm_9b15
-	jr c, .asm_9af6
-	jr .asm_9b15
-.asm_9af6
-	ld hl, wc02a
+	ld a, [wSoundID]
+	cp CRY_SFX_END
+	jr z, .done
+	jr c, .cry
+	jr .done
+.cry
+	ld hl, wChannelSoundIDs + CH4
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wc012 ; sfx noise channel pointer
-	ld de, Noise2_endchannel
+	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer
+	ld de, Audio1_CryEndchannel
 	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_9b15
-	ld a, [$ff24]
-	ld [wc005], a
+	jr nz, .done
+	ld a, [rNR50]
+	ld [wSavedVolume], a
 	ld a, $77
-	ld [$ff24], a
-.asm_9b15
+	ld [rNR50], a ; full volume
+.done
 	ret
 
-Noise2_endchannel: ; 0x9b16
+Audio1_CryEndchannel: ; 0x9b16
 	endchannel
 
-Unknown_9b17: ; 0x9b17
-	db $10, $15, $1A, $1F ; channels 0-3
-	db $10, $15, $1A, $1F ; channels 4-7
+Audio1_HWChannelBaseAddresses: ; 0x9b17
+; the low bytes of each HW channel's base address
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7
 
-Unknown_9b1f: ; 0x9b1f
-	db $EE, $DD, $BB, $77 ; channels 0-3
-	db $EE, $DD, $BB, $77 ; channels 4-7
+Audio1_HWChannelDisableMasks: ; 0x9b1f
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7
 
-Unknown_9b27: ; 0x9b27
-	db $11, $22, $44, $88 ; channels 0-3
-	db $11, $22, $44, $88 ; channels 4-7
+Audio1_HWChannelEnableMasks: ; 0x9b27
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
 
-Music2_Pitches: ; 0x9b2f
+Audio1_Pitches: ; 0x9b2f
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 067ecc0c..e70a305f 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,10 +1,10 @@
 ; The second of three duplicated sound engines.
 
-Music8_UpdateMusic:: ; 21879 (8:5879)
+Audio2_UpdateMusic:: ; 21879 (8:5879)
 	ld c, CH0
 .loop
 	ld b, $0
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -12,21 +12,21 @@ Music8_UpdateMusic:: ; 21879 (8:5879)
 	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 Music8_ApplyMusicAffects
+	call Audio2_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c
@@ -36,54 +36,54 @@ Music8_UpdateMusic:: ; 21879 (8:5879)
 
 ; 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
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music8_ApplyMusicAffects: ; 218ae (8:58ae)
+Audio2_ApplyMusicAffects: ; 218ae (8:58ae)
 	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 the delay is 1, play next note
-	jp z, Music8_PlayNextNote
+	jp z, Audio2_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	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 Music8_ApplyDutyCycle
+	call Audio2_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 Music8_ApplyPitchBend
+	jp Audio2_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 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 .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 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 	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 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 	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
@@ -141,21 +141,21 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 .done
 	ld d, a
 	ld b, $3
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music8_PlayNextNote: ; 21946 (8:5946)
-	ld hl, wc06e
+Audio2_PlayNextNote: ; 21946 (8:5946)
+	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]
@@ -166,16 +166,16 @@ Music8_PlayNextNote: ; 21946 (8:5946)
 	bit 7, a
 	ret nz
 .beginChecks
-	call Music8_endchannel
+	call Audio2_endchannel
 	ret
 
-Music8_endchannel: ; 21967 (8:5967)
-	call Music8_GetNextMusicByte
+Audio2_endchannel: ; 21967 (8:5967)
+	call Audio2_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music8_callchannel ; no
+	jp nz, Audio2_callchannel ; no
 	ld b, $0 ; yes
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 1, [hl]
 	jr nz, .returnFromCall
@@ -185,22 +185,22 @@ Music8_endchannel: ; 21967 (8:5967)
 	jr .asm_219c0
 .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_219a3
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr z, .asm_219a3
 	xor a
-	ld [wc003], a
+	ld [wDisableChannelOutputWhenSfxEnds], a
 	jr .asm_219c0
 .asm_219a3
 	jr .asm_219c9
@@ -210,10 +210,10 @@ Music8_endchannel: ; 21967 (8:5967)
 	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
@@ -223,20 +223,20 @@ Music8_endchannel: ; 21967 (8:5967)
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music8_endchannel
+	jp Audio2_endchannel
 .asm_219c0
 	ld hl, Unknown_222de
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a
 .asm_219c9
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_219d2
 	jr .asm_219ef
 .asm_219d2
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $86
 	jr z, .asm_219ef
 	jr c, .asm_219dd
@@ -245,25 +245,25 @@ Music8_endchannel: ; 21967 (8:5967)
 	ld a, c
 	cp CH4
 	jr z, .asm_219e6
-	call Func_21e6d
+	call Audio2_21e6d
 	ret c
 .asm_219e6
-	ld a, [wc005]
-	ld [$ff24], a
+	ld a, [wSavedVolume]
+	ld [rNR50], a
 	xor a
-	ld [wc005], a
+	ld [wSavedVolume], a
 .asm_219ef
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld [hl], b
 	ret
 
-Music8_callchannel: ; 219f5 (8:59f5)
+Audio2_callchannel: ; 219f5 (8:59f5)
 	cp $fd ; is this command a callchannel?
-	jp nz, Music8_loopchannel ; no
-	call Music8_GetNextMusicByte ; yes
+	jp nz, Audio2_loopchannel ; no
+	call Audio2_GetNextMusicByte ; yes
 	push af
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -272,10 +272,10 @@ Music8_callchannel: ; 219f5 (8:59f5)
 	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
@@ -290,73 +290,73 @@ Music8_callchannel: ; 219f5 (8:59f5)
 	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 Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_loopchannel: ; 21a2a (8:5a2a)
+Audio2_loopchannel: ; 21a2a (8:5a2a)
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music8_notetype ; no
-	call Music8_GetNextMusicByte ; yes
+	jp nz, Audio2_notetype ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld e, a
 	and a
 	jr z, .infiniteLoop
 	ld b, $0
-	ld hl, wc0be
+	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make,
 	ld [hl], a
-	call Music8_GetNextMusicByte ; skip pointer
-	call Music8_GetNextMusicByte
-	jp Music8_endchannel
+	call Audio2_GetNextMusicByte ; skip pointer
+	call Audio2_GetNextMusicByte
+	jp Audio2_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	push af
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_notetype: ; 21a65 (8:5a65)
+Audio2_notetype: ; 21a65 (8:5a65)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music8_toggleperfectpitch ; no
+	jp nz, Audio2_toggleperfectpitch ; no
 	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
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
 	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
@@ -371,41 +371,41 @@ Music8_notetype: ; 21a65 (8:5a65)
 	; 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
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_toggleperfectpitch: ; 21aa4 (8:5aa4)
+Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4)
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music8_vibrato ; no
+	jr nz, Audio2_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
-	jp Music8_endchannel
+	ld [hl], a ; flip bit 0 of wChannelFlags1
+	jp Audio2_endchannel
 
-Music8_vibrato: ; 21ab6 (8:5ab6)
+Audio2_vibrato: ; 21ab6 (8:5ab6)
 	cp $ea ; is this command a vibrato?
-	jr nz, Music8_pitchbend ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_pitchbend ; no
+	call Audio2_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 Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, $0
-	ld hl, wc056
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
 	ld e, a
@@ -416,226 +416,226 @@ Music8_vibrato: ; 21ab6 (8:5ab6)
 	ld a, d
 	and $f
 	ld d, a
-	ld hl, wc05e
+	ld hl, wChannelVibratoRates
 	add hl, bc
 	swap a
 	or d
 	ld [hl], a ; store depth as both high and low nibbles
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_pitchbend: ; 21aee (8:5aee)
+Audio2_pitchbend: ; 21aee (8:5aee)
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music8_duty ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_duty ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld b, $0
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
 	ld [hl], a ; store first param
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Func_22017
+	call Audio2_22017
 	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 Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
-	jp Music8_notelength
+	jp Audio2_notelength
 
-Music8_duty: ; 21b26 (8:5b26)
+Audio2_duty: ; 21b26 (8:5b26)
 	cp $ec ; is this command a duty?
-	jr nz, Music8_tempo ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_tempo ; no
+	call Audio2_GetNextMusicByte ; yes
 	rrca
 	rrca
 	and $c0
 	ld b, $0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_tempo: ; 21b3b (8:5b3b)
+Audio2_tempo: ; 21b3b (8:5b3b)
 	cp $ed ; is this command a tempo?
-	jr nz, Music8_stereopanning ; no
+	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
-	call Music8_GetNextMusicByte
-	ld [wc0e8], a ; store first param
-	call Music8_GetNextMusicByte
-	ld [wc0e9], a ; store second param
+	call Audio2_GetNextMusicByte
+	ld [wMusicTempo], a ; store first param
+	call Audio2_GetNextMusicByte
+	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 Music8_GetNextMusicByte
-	ld [wc0ea], a ; store first param
-	call Music8_GetNextMusicByte
-	ld [wc0eb], a ; store second param
+	call Audio2_GetNextMusicByte
+	ld [wSfxTempo], a ; store first param
+	call Audio2_GetNextMusicByte
+	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 Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_stereopanning: ; 21b7b (8:5b7b)
+Audio2_stereopanning: ; 21b7b (8:5b7b)
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music8_unknownmusic0xef ; no
-	call Music8_GetNextMusicByte ; yes
-	ld [wc004], a ; store panning
-	jp Music8_endchannel
+	jr nz, Audio2_unknownmusic0xef ; no
+	call Audio2_GetNextMusicByte ; yes
+	ld [wStereoPanning], a ; store panning
+	jp Audio2_endchannel
 
 ; this appears to never be used
-Music8_unknownmusic0xef: ; 21b88 (8:5b88)
+Audio2_unknownmusic0xef: ; 21b88 (8:5b88)
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music8_dutycycle ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_dutycycle ; no
+	call Audio2_GetNextMusicByte ; yes
 	push bc
-	call Func_22035
+	call Audio2_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 Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_dutycycle: ; 21ba7 (8:5ba7)
+Audio2_dutycycle: ; 21ba7 (8:5ba7)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music8_volume ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_volume ; no
+	call Audio2_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 dutycycle flag
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_volume: ; 21bc5 (8:5bc5)
+Audio2_volume: ; 21bc5 (8:5bc5)
 	cp $f0 ; is this command a volume?
-	jr nz, Music8_executemusic ; no
-	call Music8_GetNextMusicByte ; yes
-	ld [$ff24], a ; store volume
-	jp Music8_endchannel
+	jr nz, Audio2_executemusic ; no
+	call Audio2_GetNextMusicByte ; yes
+	ld [rNR50], a ; store volume
+	jp Audio2_endchannel
 
-Music8_executemusic: ; 21bd1 (8:5bd1)
+Audio2_executemusic: ; 21bd1 (8:5bd1)
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music8_octave ; no
+	jr nz, Audio2_octave ; no
 	ld b, $0 ; yes
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	set 0, [hl]
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_octave: ; 21be0 (8:5be0)
+Audio2_octave: ; 21be0 (8:5be0)
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music8_unknownsfx0x20 ; no
-	ld hl, wc0d6 ; yes
+	jr nz, Audio2_unknownsfx0x20 ; no
+	ld hl, wChannelOctaves ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_unknownsfx0x20: ; 21bf3
+Audio2_unknownsfx0x20: ; 21bf3
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music8_unknownsfx0x10 ; no
+	jr nz, Audio2_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music8_unknownsfx0x10 ; no
+	jr c, Audio2_unknownsfx0x10 ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music8_unknownsfx0x10 ; no
-	call Music8_notelength
+	jr nz, Audio2_unknownsfx0x10 ; no
+	call Audio2_notelength
 	ld d, a
 	ld b, $0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
 	ld b, $1
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	ld b, $2
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	pop de
 .sfxNoiseChannel
 	ld d, a
 	push de
-	call Func_21daa
-	call Func_21d79
+	call Audio2_21daa
+	call Audio2_21d79
 	pop de
-	call Func_21dcc
+	call Audio2_21dcc
 	ret
 
-Music8_unknownsfx0x10: ; 21c40 (8:5c40)
+Audio2_unknownsfx0x10: ; 21c40 (8:5c40)
 	ld a, c
 	cp CH4
-	jr c, Music8_note ; if not a sfx
+	jr c, Audio2_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
-	jr nz, Music8_note ; no
+	jr nz, Audio2_note ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music8_note ; no
-	call Music8_GetNextMusicByte ; yes
-	ld [$ff10], a
-	jp Music8_endchannel
+	jr nz, Audio2_note ; no
+	call Audio2_GetNextMusicByte ; yes
+	ld [rNR10], a
+	jp Audio2_endchannel
 
-Music8_note: ; 21c5c (8:5c5c)
+Audio2_note: ; 21c5c (8:5c5c)
 	ld a, c
 	cp CH3
-	jr nz, Music8_notelength ; if not noise channel
+	jr nz, Audio2_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music8_dnote ; yes
-	jr nc, Music8_notelength ; no
+	jr z, Audio2_dnote ; yes
+	jr nc, Audio2_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -646,24 +646,24 @@ Music8_note: ; 21c5c (8:5c5c)
 	push bc
 	jr asm_21c7e
 
-Music8_dnote: ; 21c76 (8:5c76)
+Audio2_dnote: ; 21c76 (8:5c76)
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music8_GetNextMusicByte ; get dnote instrument
+	call Audio2_GetNextMusicByte ; get dnote instrument
 asm_21c7e
 	ld d, a
-	ld a, [wc003]
+	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .asm_21c89
 	ld a, d
-	call Func_22035
+	call Audio2_PlaySound
 .asm_21c89
 	pop bc
 	pop de
 
-Music8_notelength: ; 21c8b (8:5c8b)
+Audio2_notelength: ; 21c8b (8:5c8b)
 	ld a, d
 	push af
 	and $f
@@ -671,17 +671,17 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	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
-	call Func_22006
+	call Audio2_22006
 	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
@@ -689,39 +689,39 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Func_21e2f
-	ld a, [wc0ea]
+	call Audio2_21e2f
+	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 Func_22006
+	call Audio2_22006
 	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, Music8_notepitch
-	ld hl, wc02e
+	jr nz, Audio2_notepitch
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 2, [hl]
-	jr z, Music8_notepitch
+	jr z, Audio2_notepitch
 	pop hl
 	ret
 
-Music8_notepitch: ; 21ce9 (8:5ce9)
+Audio2_notepitch: ; 21ce9 (8:5ce9)
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -729,7 +729,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
-	ld hl, wc02a
+	ld hl, wChannelSoundIDs + CH4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -745,13 +745,13 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ld b, $0
 	ld hl, Unknown_222de
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	and [hl]
-	ld [$ff25], a
+	ld [rNR51], a
 	jr .done
 .notSfxChannel3
 	ld b, $2
-	call Func_21ff7
+	call Audio2_21ff7
 	ld a, $8
 	ld [hli], a
 	inc hl
@@ -762,22 +762,22 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 .notRest
 	swap a
 	ld b, $0
-	ld hl, wc0d6
+	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
-	call Func_22017
+	call Audio2_22017
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_21d39
-	call Func_21f4e
+	call Audio2_21f4e
 .asm_21d39
 	push de
 	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
@@ -790,17 +790,17 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ret
 .skip
 	ld b, $0
-	ld hl, wc0de
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Func_21daa
-	call Func_21d79
+	call Audio2_21daa
+	call Audio2_21d79
 	pop de
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 0, [hl]   ; has toggleperfectpitch been used?
 	jr z, .skip2
@@ -808,17 +808,17 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	jr nc, .skip2
 	inc d
 .skip2
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	call Func_21dcc
+	call Audio2_21dcc
 	ret
 
-Func_21d79: ; 21d79 (8:5d79)
+Audio2_21d79: ; 21d79 (8:5d79)
 	ld b, $0
 	ld hl, Unknown_222e6
 	add hl, bc
-	ld a, [$ff25]
+	ld a, [rNR51]
 	or [hl]
 	ld d, a
 	ld a, c
@@ -826,18 +826,18 @@ Func_21d79: ; 21d79 (8:5d79)
 	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_222e6
 	add hl, bc
 	and [hl]
 	ld d, a
-	ld a, [$ff25]
+	ld a, [rNR51]
 	ld hl, Unknown_222de
 	add hl, bc
 	and [hl]
@@ -845,12 +845,12 @@ Func_21d79: ; 21d79 (8:5d79)
 	ld d, a
 .skip
 	ld a, d
-	ld [$ff25], a
+	ld [rNR51], a
 	ret
 
-Func_21daa: ; 21daa (8:5daa)
+Audio2_21daa: ; 21daa (8:5daa)
 	ld b, $0
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld d, [hl]
 	ld a, c
@@ -861,18 +861,18 @@ Func_21daa: ; 21daa (8:5daa)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
 .channel3
 	ld b, $1
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], d
 	ret
 
-Func_21dcc: ; 21dcc (8:5dcc)
+Audio2_21dcc: ; 21dcc (8:5dcc)
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -881,16 +881,16 @@ Func_21dcc: ; 21dcc (8:5dcc)
 	; 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
 	ld d, $0
 	ld e, a
-	ld hl, Music8_WavePointers
+	ld hl, Audio2_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -898,7 +898,7 @@ Func_21dcc: ; 21dcc (8:5dcc)
 	ld hl, $ff30
 	ld b, $f
 	ld a, $0
-	ld [$ff1a], a
+	ld [rNR30], a
 .loop
 	ld a, [de]
 	inc de
@@ -908,7 +908,7 @@ Func_21dcc: ; 21dcc (8:5dcc)
 	and a
 	jr nz, .loop
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	pop de
 .notSfxChannel3
 	ld a, d
@@ -916,18 +916,18 @@ Func_21dcc: ; 21dcc (8:5dcc)
 	and $c7
 	ld d, a
 	ld b, $3
-	call Func_21ff7
+	call Audio2_21ff7
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ld a, c
 	cp CH4
 	jr c, .musicChannel
-	call Func_21e56
+	call Audio2_21e56
 .musicChannel
 	ret
 
-Func_21e19: ; 21e19 (8:5e19)
+Audio2_21e19: ; 21e19 (8:5e19)
 	ld a, c
 	cp CH4
 	jr nz, .asm_21e2e
@@ -935,43 +935,43 @@ Func_21e19: ; 21e19 (8:5e19)
 	bit 7, a
 	jr z, .asm_21e2e
 	xor a
-	ld [wc0f1], a
+	ld [wFrequencyModifier], a
 	ld a, $80
-	ld [wc0f2], a
+	ld [wTempoModifier], a
 .asm_21e2e
 	ret
 
-Func_21e2f: ; 21e2f (8:5e2f)
-	call Func_21e8b
+Audio2_21e2f: ; 21e2f (8:5e2f)
+	call Audio2_21e8b
 	jr c, .asm_21e39
-	call Func_21e9f
+	call Audio2_21e9f
 	jr nc, .asm_21e4c
 .asm_21e39
 	ld d, $0
-	ld a, [wc0f2]
+	ld a, [wTempoModifier]
 	add $80
 	jr nc, .asm_21e43
 	inc d
 .asm_21e43
-	ld [wc0eb], a
+	ld [wSfxTempo + 1], a
 	ld a, d
-	ld [wc0ea], a
+	ld [wSfxTempo], a
 	jr .asm_21e55
 .asm_21e4c
 	xor a
-	ld [wc0eb], a
+	ld [wSfxTempo + 1], a
 	ld a, $1
-	ld [wc0ea], a
+	ld [wSfxTempo], a
 .asm_21e55
 	ret
 
-Func_21e56: ; 21e56 (8:5e56)
-	call Func_21e8b
+Audio2_21e56: ; 21e56 (8:5e56)
+	call Audio2_21e8b
 	jr c, .asm_21e60
-	call Func_21e9f
+	call Audio2_21e9f
 	jr nc, .asm_21e6c
 .asm_21e60
-	ld a, [wc0f1]
+	ld a, [wFrequencyModifier]
 	add e
 	jr nc, .asm_21e67
 	inc d
@@ -984,10 +984,10 @@ Func_21e56: ; 21e56 (8:5e56)
 .asm_21e6c
 	ret
 
-Func_21e6d: ; 21e6d (8:5e6d)
-	call Func_21e8b
+Audio2_21e6d: ; 21e6d (8:5e6d)
+	call Audio2_21e8b
 	jr nc, .asm_21e88
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	ld e, c
 	ld d, $0
 	sla e
@@ -1007,8 +1007,8 @@ Func_21e6d: ; 21e6d (8:5e6d)
 	ccf
 	ret
 
-Func_21e8b: ; 21e8b (8:5e8b)
-	ld a, [wc02a]
+Audio2_21e8b: ; 21e8b (8:5e8b)
+	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_21e94
 	jr .asm_21e9a
@@ -1024,10 +1024,10 @@ Func_21e8b: ; 21e8b (8:5e8b)
 	scf
 	ret
 
-Func_21e9f: ; 21e9f (8:5e9f)
-	ld a, [wc02d]
+Audio2_21e9f: ; 21e9f (8:5e9f)
+	ld a, [wChannelSoundIDs + CH7]
 	ld b, a
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	or b
 	cp $9d
 	jr nc, .asm_21ead
@@ -1044,28 +1044,28 @@ Func_21e9f: ; 21e9f (8:5e9f)
 	scf
 	ret
 
-Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
-	ld hl, wc02e
+Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8)
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
 	jp nz, .asm_21eff
-	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
@@ -1077,26 +1077,26 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	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_21f45
 	jr nz, .asm_21f32
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jp c, .asm_21f45
 	jr .asm_21f32
 .asm_21eff
-	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
@@ -1104,7 +1104,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wc086
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1115,79 +1115,79 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	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_21f45
 	jr nz, .asm_21f32
-	ld hl, wc0ae
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
 	jr c, .asm_21f45
 .asm_21f32
-	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
-	call Func_21ff7
+	call Audio2_21ff7
 	ld a, e
 	ld [hli], a
 	ld [hl], d
 	ret
 .asm_21f45
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
 	ret
 
-Func_21f4e: ; 21f4e (8:5f4e)
-	ld hl, wc096
+Audio2_21f4e: ; 21f4e (8:5f4e)
+	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_21f66
 	ld a, $1
 .asm_21f66
 	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_21f82
 	ld d, a
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 5, [hl]
 	jr .asm_21fa5
 .asm_21f82
-	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
@@ -1195,17 +1195,17 @@ Func_21f4e: ; 21f4e (8:5f4e)
 	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_21fa5
-	ld hl, wc076
+	ld hl, wChannelPitchBendLengthModifiers
 	add hl, bc
 .asm_21fa9
 	inc b
@@ -1224,20 +1224,20 @@ Func_21f4e: ; 21f4e (8:5f4e)
 	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
 
-Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
+Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc)
 	ld b, $0
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1246,19 +1246,19 @@ Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
 	and $c0
 	ld d, a
 	ld b, $1
-	call Func_21ff7
+	call Audio2_21ff7
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
+Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4)
 	ld d, $0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	ld a, [hli]
 	ld e, a
@@ -1271,7 +1271,7 @@ Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
 	ld [hl], d
 	ret
 
-Func_21ff7: ; 21ff7 (8:5ff7)
+Audio2_21ff7: ; 21ff7 (8:5ff7)
 	ld a, c
 	ld hl, Unknown_222d6
 	add l
@@ -1285,7 +1285,7 @@ Func_21ff7: ; 21ff7 (8:5ff7)
 	ld h, $ff
 	ret
 
-Func_22006: ; 22006 (8:6006)
+Audio2_22006: ; 22006 (8:6006)
 	ld h, $0
 .loop
 	srl a
@@ -1300,13 +1300,13 @@ Func_22006: ; 22006 (8:6006)
 .done
 	ret
 
-Func_22017: ; 22017 (8:6017)
+Audio2_22017: ; 22017 (8:6017)
 	ld h, $0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music8_Pitches
+	ld hl, Audio2_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1325,102 +1325,102 @@ Func_22017: ; 22017 (8:6017)
 	ld d, a
 	ret
 
-Func_22035:: ; 22035 (8:6035)
-	ld [wc001], a
+Audio2_PlaySound:: ; 22035 (8:6035)
+	ld [wSoundID], a
 	cp $ff
-	jp z, Func_221f3
+	jp z, Audio2_221f3
 	cp $e9
-	jp z, Func_2210d
-	jp c, Func_2210d
+	jp z, Audio2_2210d
+	jp c, Audio2_2210d
 	cp $fe
 	jr z, .asm_2204c
-	jp nc, Func_2210d
+	jp nc, Audio2_2210d
 .asm_2204c
 	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
-	call FillMusicRAM8
-	ld hl, wc006
-	call FillMusicRAM8
+	ld hl, wChannelReturnAddresses
+	call FillAudioRAM2
+	ld hl, wChannelCommandPointers
+	call FillAudioRAM2
 	ld d, $4
-	ld hl, wc026
-	call FillMusicRAM8
-	ld hl, wc02e
-	call FillMusicRAM8
-	ld hl, wc03e
-	call FillMusicRAM8
-	ld hl, wc046
-	call FillMusicRAM8
-	ld hl, wc04e
-	call FillMusicRAM8
-	ld hl, wc056
-	call FillMusicRAM8
-	ld hl, wc05e
-	call FillMusicRAM8
-	ld hl, wc066
-	call FillMusicRAM8
-	ld hl, wc06e
-	call FillMusicRAM8
-	ld hl, wc036
-	call FillMusicRAM8
-	ld hl, wc076
-	call FillMusicRAM8
-	ld hl, wc07e
-	call FillMusicRAM8
-	ld hl, wc086
-	call FillMusicRAM8
-	ld hl, wc08e
-	call FillMusicRAM8
-	ld hl, wc096
-	call FillMusicRAM8
-	ld hl, wc09e
-	call FillMusicRAM8
-	ld hl, wc0a6
-	call FillMusicRAM8
-	ld hl, wc0ae
-	call FillMusicRAM8
+	ld hl, wChannelSoundIDs
+	call FillAudioRAM2
+	ld hl, wChannelFlags1
+	call FillAudioRAM2
+	ld hl, wChannelDuties
+	call FillAudioRAM2
+	ld hl, wChannelDutyCycles
+	call FillAudioRAM2
+	ld hl, wChannelVibratoDelayCounters
+	call FillAudioRAM2
+	ld hl, wChannelVibratoExtents
+	call FillAudioRAM2
+	ld hl, wChannelVibratoRates
+	call FillAudioRAM2
+	ld hl, wChannelFrequencyLowBytes
+	call FillAudioRAM2
+	ld hl, wChannelVibratoDelayCounterReloadValues
+	call FillAudioRAM2
+	ld hl, wChannelFlags2
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendLengthModifiers
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendFrequencySteps
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	call FillAudioRAM2
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	call FillAudioRAM2
 	ld a, $1
-	ld hl, wc0be
-	call FillMusicRAM8
-	ld hl, wc0b6
-	call FillMusicRAM8
-	ld hl, wc0c6
-	call FillMusicRAM8
-	ld [wc0e8], a
+	ld hl, wChannelLoopCounters
+	call FillAudioRAM2
+	ld hl, wChannelNoteDelayCounters
+	call FillAudioRAM2
+	ld hl, wChannelNoteSpeeds
+	call FillAudioRAM2
+	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
-	jp Func_2224e
+	ld [rNR50], a
+	jp Audio2_2224e
 
-Func_2210d: ; 2210d (8:610d)
+Audio2_2210d: ; 2210d (8:610d)
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_08
+	ld de, SFX_Headers_2
 	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
@@ -1433,9 +1433,9 @@ Func_2210d: ; 2210d (8:610d)
 	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
@@ -1443,7 +1443,7 @@ Func_2210d: ; 2210d (8:610d)
 	and $f
 	ld e, a
 	ld d, $0
-	ld hl, wc026
+	ld hl, wChannelSoundIDs
 	add hl, de
 	ld a, [hl]
 	and a
@@ -1451,7 +1451,7 @@ Func_2210d: ; 2210d (8:610d)
 	ld a, e
 	cp $7
 	jr nz, .asm_22159
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $14
 	jr nc, .asm_22152
 	ret
@@ -1461,7 +1461,7 @@ Func_2210d: ; 2210d (8:610d)
 	jr z, .asm_22162
 	jr c, .asm_22162
 .asm_22159
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp [hl]
 	jr z, .asm_22162
 	jr c, .asm_22162
@@ -1474,132 +1474,132 @@ Func_2210d: ; 2210d (8:610d)
 	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_221ea
 	ld a, $8
-	ld [$ff10], a
+	ld [rNR10], a
 .asm_221ea
 	ld a, c
 	and a
-	jp z, Func_2224e
+	jp z, Audio2_2224e
 	dec c
 	jp .asm_22126
 
-Func_221f3: ; 221f3 (8:61f3)
+Audio2_221f3: ; 221f3 (8:61f3)
 	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
-	call FillMusicRAM8
+	ld hl, wChannelCommandPointers
+	call FillAudioRAM2
 	ld a, $1
 	ld d, $18
-	ld hl, wc0b6
-	call FillMusicRAM8
-	ld [wc0e8], a
-	ld [wc0ea], a
+	ld hl, wChannelNoteDelayCounters
+	call FillAudioRAM2
+	ld [wMusicTempo], a
+	ld [wSfxTempo], a
 	ld a, $ff
-	ld [wc004], a
+	ld [wStereoPanning], a
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM8: ; 22248 (8:6248)
+FillAudioRAM2: ; 22248 (8:6248)
 	ld b, d
 .loop
 	ld [hli], a
@@ -1607,19 +1607,19 @@ FillMusicRAM8: ; 22248 (8:6248)
 	jr nz, .loop
 	ret
 
-Func_2224e: ; 2224e (8:624e)
-	ld a, [wc001]
+Audio2_2224e: ; 2224e (8:624e)
+	ld a, [wSoundID]
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_08
+	ld de, SFX_Headers_2
 	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
@@ -1645,14 +1645,14 @@ Func_2224e: ; 2224e (8:624e)
 	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_22291
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	set 2, [hl]
 .asm_22291
@@ -1671,38 +1671,38 @@ Func_2224e: ; 2224e (8:624e)
 	ld a, [de]
 	inc de
 	jr nz, .asm_22270
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $14
 	jr nc, .asm_222aa
 	jr .asm_222d4
 .asm_222aa
-	ld a, [wc001]
+	ld a, [wSoundID]
 	cp $86
 	jr z, .asm_222d4
 	jr c, .asm_222b5
 	jr .asm_222d4
 .asm_222b5
-	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 de, Noise8_endchannel
+	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer
+	ld de, Noise2_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_222d4
-	ld a, [$ff24]
-	ld [wc005], a
+	ld a, [rNR50]
+	ld [wSavedVolume], a
 	ld a, $77
-	ld [$ff24], a
+	ld [rNR50], a
 .asm_222d4
 	ret
 
-Noise8_endchannel: ; 222d5 (8:62d5)
+Noise2_endchannel: ; 222d5 (8:62d5)
 	endchannel
 
 Unknown_222d6: ; 222d6 (8:62d6)
@@ -1717,7 +1717,7 @@ Unknown_222e6: ; 222e6 (8:62e6)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Music8_Pitches: ; 222ee (8:62ee)
+Audio2_Pitches: ; 222ee (8:62ee)
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index fabdecef..c7254405 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,10 +1,10 @@
 ; The third of three duplicated sound engines.
 
-Music1f_UpdateMusic:: ; 7d177 (1f:5177)
+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,21 +12,21 @@ Music1f_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 Music1f_ApplyMusicAffects
+	call Audio3_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
@@ -36,54 +36,54 @@ Music1f_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
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
+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
-	jp z, Music1f_PlayNextNote
+	jp z, Audio3_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	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 Music1f_ApplyDutyCycle
+	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 Music1f_ApplyPitchBend
+	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 @@ Music1f_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 @@ Music1f_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 @@ Music1f_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
@@ -141,34 +141,34 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 .done
 	ld d, a
 	ld b, $3
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music1f_PlayNextNote: ; 7d244 (1f:5244)
-	ld hl, wc06e
+Audio3_PlayNextNote: ; 7d244 (1f:5244)
+	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]
-	call Music1f_endchannel
+	call Audio3_endchannel
 	ret
 
-Music1f_endchannel: ; 7d25a (1f:525a)
-	call Music1f_GetNextMusicByte
+Audio3_endchannel: ; 7d25a (1f:525a)
+	call Audio3_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music1f_callchannel ; no
+	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 @@ Music1f_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 @@ Music1f_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
@@ -216,20 +216,20 @@ Music1f_endchannel: ; 7d25a (1f:525a)
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 .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
@@ -238,25 +238,25 @@ Music1f_endchannel: ; 7d25a (1f:525a)
 	ld a, c
 	cp CH4
 	jr z, .asm_7d2d9
-	call Func_7d73b
+	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
 
-Music1f_callchannel: ; 7d2e8 (1f:52e8)
+Audio3_callchannel: ; 7d2e8 (1f:52e8)
 	cp $fd ; is this command a callchannel?
-	jp nz, Music1f_loopchannel ; no
-	call Music1f_GetNextMusicByte ; yes
+	jp nz, Audio3_loopchannel ; no
+	call Audio3_GetNextMusicByte ; yes
 	push af
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -265,10 +265,10 @@ Music1f_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,73 +283,73 @@ Music1f_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 Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_loopchannel: ; 7d31d (1f:531d)
+Audio3_loopchannel: ; 7d31d (1f:531d)
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music1f_notetype ; no
-	call Music1f_GetNextMusicByte ; yes
+	jp nz, Audio3_notetype ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld e, a
 	and a
 	jr z, .infiniteLoop
 	ld b, $0
-	ld hl, wc0be
+	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make
 	ld [hl], a
-	call Music1f_GetNextMusicByte ; skip pointer
-	call Music1f_GetNextMusicByte
-	jp Music1f_endchannel
+	call Audio3_GetNextMusicByte ; skip pointer
+	call Audio3_GetNextMusicByte
+	jp Audio3_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	push af
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_notetype: ; 7d358 (1f:5358)
+Audio3_notetype: ; 7d358 (1f:5358)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music1f_toggleperfectpitch ; no
+	jp nz, Audio3_toggleperfectpitch ; no
 	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
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
 	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,41 +364,41 @@ Music1f_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
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_toggleperfectpitch: ; 7d397 (1f:5397)
+Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music1f_vibrato ; no
+	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
-	jp Music1f_endchannel
+	ld [hl], a ; flip bit 0 of wChannelFlags1
+	jp Audio3_endchannel
 
-Music1f_vibrato: ; 7d3a9 (1f:53a9)
+Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	cp $ea ; is this command a vibrato?
-	jr nz, Music1f_pitchbend ; no
-	call Music1f_GetNextMusicByte ; yes
+	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 Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, $0
-	ld hl, wc056
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
 	ld e, a
@@ -409,226 +409,226 @@ Music1f_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
 	ld [hl], a ; store depth as both high and low nibbles
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_pitchbend: ; 7d3e1 (1f:53e1)
+Audio3_pitchbend: ; 7d3e1 (1f:53e1)
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music1f_duty ; no
-	call Music1f_GetNextMusicByte ; yes
+	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 Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Func_7d8cc
+	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 Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
-	jp Music1f_notelength
+	jp Audio3_notelength
 
-Music1f_duty: ; 7d419 (1f:5419)
+Audio3_duty: ; 7d419 (1f:5419)
 	cp $ec ; is this command a duty?
-	jr nz, Music1f_tempo ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_tempo ; no
+	call Audio3_GetNextMusicByte ; yes
 	rrca
 	rrca
 	and $c0
 	ld b, $0
-	ld hl, wc03e
+	ld hl, wChannelDuties
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_tempo: ; 7d42e (1f:542e)
+Audio3_tempo: ; 7d42e (1f:542e)
 	cp $ed ; is this command a tempo?
-	jr nz, Music1f_stereopanning ; no
+	jr nz, Audio3_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
-	call Music1f_GetNextMusicByte
-	ld [wc0e8], a ; store first param
-	call Music1f_GetNextMusicByte
-	ld [wc0e9], a ; store second param
+	call Audio3_GetNextMusicByte
+	ld [wMusicTempo], a ; store first param
+	call Audio3_GetNextMusicByte
+	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 Music1f_GetNextMusicByte
-	ld [wc0ea], a ; store first param
-	call Music1f_GetNextMusicByte
-	ld [wc0eb], a ; store second param
+	call Audio3_GetNextMusicByte
+	ld [wSfxTempo], a ; store first param
+	call Audio3_GetNextMusicByte
+	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 Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_stereopanning: ; 7d46e (1f:546e)
+Audio3_stereopanning: ; 7d46e (1f:546e)
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music1f_unknownmusic0xef ; no
-	call Music1f_GetNextMusicByte ; yes
-	ld [wc004], a ; store panning
-	jp Music1f_endchannel
+	jr nz, Audio3_unknownmusic0xef ; no
+	call Audio3_GetNextMusicByte ; yes
+	ld [wStereoPanning], a ; store panning
+	jp Audio3_endchannel
 
 ; this appears to never be used
-Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
+Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music1f_dutycycle ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_dutycycle ; no
+	call Audio3_GetNextMusicByte ; yes
 	push bc
-	call Func_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 Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_dutycycle: ; 7d49a (1f:549a)
+Audio3_dutycycle: ; 7d49a (1f:549a)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music1f_volume ; no
-	call Music1f_GetNextMusicByte ; yes
+	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 Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_volume: ; 7d4b8 (1f:54b8)
+Audio3_volume: ; 7d4b8 (1f:54b8)
 	cp $f0 ; is this command a volume?
-	jr nz, Music1f_executemusic ; no
-	call Music1f_GetNextMusicByte ; yes
-	ld [$ff24], a ; store volume
-	jp Music1f_endchannel
+	jr nz, Audio3_executemusic ; no
+	call Audio3_GetNextMusicByte ; yes
+	ld [rNR50], a ; store volume
+	jp Audio3_endchannel
 
-Music1f_executemusic: ; 7d4c4 (1f:54c4)
+Audio3_executemusic: ; 7d4c4 (1f:54c4)
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music1f_octave ; no
+	jr nz, Audio3_octave ; no
 	ld b, $0 ; yes
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	set 0, [hl]
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_octave: ; 7d4d3 (1f:54d3)
+Audio3_octave: ; 7d4d3 (1f:54d3)
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music1f_unknownsfx0x20 ; no
-	ld hl, wc0d6 ; yes
+	jr nz, Audio3_unknownsfx0x20 ; no
+	ld hl, wChannelOctaves ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
+Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music1f_unknownsfx0x10 ; no
+	jr nz, Audio3_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music1f_unknownsfx0x10 ; no
+	jr c, Audio3_unknownsfx0x10 ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music1f_unknownsfx0x10 ; no
-	call Music1f_notelength ; yes
+	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
 	ld d, a
 	ld b, $1
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	ld b, $2
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	pop de
 .sfxNoiseChannel
 	ld d, a
 	push de
-	call Func_7d69d
-	call Func_7d66c
+	call Audio3_7d69d
+	call Audio3_7d66c
 	pop de
-	call Func_7d6bf
+	call Audio3_7d6bf
 	ret
 
-Music1f_unknownsfx0x10 ; 7d533 (1f:5533)
+Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
 	ld a, c
 	cp CH4
-	jr c, Music1f_note ; if not a sfx
+	jr c, Audio3_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command an unknownsfx0x10?
-	jr nz, Music1f_note ; no
+	jr nz, Audio3_note ; no
 	ld b, $0
-	ld hl, wc036
+	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music1f_note ; no
-	call Music1f_GetNextMusicByte ; yes
-	ld [$ff10], a
-	jp Music1f_endchannel
+	jr nz, Audio3_note ; no
+	call Audio3_GetNextMusicByte ; yes
+	ld [rNR10], a
+	jp Audio3_endchannel
 
-Music1f_note: ; 7d54f (1f:554f)
+Audio3_note: ; 7d54f (1f:554f)
 	ld a, c
 	cp CH3
-	jr nz, Music1f_notelength ; if not noise channel
+	jr nz, Audio3_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music1f_dnote ; yes
-	jr nc, Music1f_notelength ; no
+	jr z, Audio3_dnote ; yes
+	jr nc, Audio3_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -639,24 +639,24 @@ Music1f_note: ; 7d54f (1f:554f)
 	push bc
 	jr asm_7d571
 
-Music1f_dnote: ; 7d569 (1f:5569)
+Audio3_dnote: ; 7d569 (1f:5569)
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music1f_GetNextMusicByte ; get dnote instrument
+	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 Func_7d8ea
+	call Audio3_PlaySound
 .asm_7d57c
 	pop bc
 	pop de
 
-Music1f_notelength: ; 7d57e (1f:557e)
+Audio3_notelength: ; 7d57e (1f:557e)
 	ld a, d
 	push af
 	and $f
@@ -664,17 +664,17 @@ Music1f_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
-	call Func_7d8bb
+	call Audio3_7d8bb
 	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
@@ -682,39 +682,39 @@ Music1f_notelength: ; 7d57e (1f:557e)
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Func_7d707
-	ld a, [wc0ea]
+	call Audio3_7d707
+	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 Func_7d8bb
+	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, Music1f_notepitch
-	ld hl, wc02e
+	jr nz, Audio3_notepitch
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 2, [hl]
-	jr z, Music1f_notepitch
+	jr z, Audio3_notepitch
 	pop hl
 	ret
 
-Music1f_notepitch: ; 7d5dc (1f:55dc)
+Audio3_notepitch: ; 7d5dc (1f:55dc)
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -722,7 +722,7 @@ Music1f_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,13 +738,13 @@ Music1f_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
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld a, $8
 	ld [hli], a
 	inc hl
@@ -755,22 +755,22 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 .notRest
 	swap a
 	ld b, $0
-	ld hl, wc0d6
+	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
-	call Func_7d8cc
+	call Audio3_7d8cc
 	ld b, $0
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_7d62c
-	call Func_7d803
+	call Audio3_7d803
 .asm_7d62c
 	push de
 	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,17 +783,17 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	ret
 .skip
 	ld b, $0
-	ld hl, wc0de
+	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Func_7d69d
-	call Func_7d66c
+	call Audio3_7d69d
+	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,17 +801,17 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	jr nc, .skip2
 	inc d
 .skip2
-	ld hl, wc066
+	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	call Func_7d6bf
+	call Audio3_7d6bf
 	ret
 
-Func_7d66c: ; 7d66c (1f:566c)
+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 @@ Func_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 @@ Func_7d66c: ; 7d66c (1f:566c)
 	ld d, a
 .skip
 	ld a, d
-	ld [$ff25], a
+	ld [rNR51], a
 	ret
 
-Func_7d69d: ; 7d69d (1f:569d)
+Audio3_7d69d: ; 7d69d (1f:569d)
 	ld b, $0
-	ld hl, wc0b6
+	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld d, [hl]
 	ld a, c
@@ -854,18 +854,18 @@ Func_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
 	ld d, a
 .channel3
 	ld b, $1
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
 	ret
 
-Func_7d6bf: ; 7d6bf (1f:56bf)
+Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -874,16 +874,16 @@ Func_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
 	ld d, $0
 	ld e, a
-	ld hl, Music1f_WavePointers
+	ld hl, Audio3_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -891,7 +891,7 @@ Func_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 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
 	and a
 	jr nz, .loop
 	ld a, $80
-	ld [$ff1a], a
+	ld [rNR30], a
 	pop de
 .notSfxChannel3
 	ld a, d
@@ -909,38 +909,38 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
 	and $c7
 	ld d, a
 	ld b, $3
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	call Func_7d729
+	call Audio3_7d729
 	ret
 
-Func_7d707: ; 7d707 (1f:5707)
-	call Func_7d759
+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
 
-Func_7d729: ; 7d729 (1f:5729)
-	call Func_7d759
+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
@@ -953,10 +953,10 @@ Func_7d729: ; 7d729 (1f:5729)
 .asm_7d73a
 	ret
 
-Func_7d73b: ; 7d73b (1f:573b)
-	call Func_7d759
+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
@@ -976,8 +976,8 @@ Func_7d73b: ; 7d73b (1f:573b)
 	ccf
 	ret
 
-Func_7d759: ; 7d759 (1f:5759)
-	ld a, [wc02a]
+Audio3_7d759: ; 7d759 (1f:5759)
+	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_7d762
 	jr .asm_7d768
@@ -993,28 +993,28 @@ Func_7d759: ; 7d759 (1f:5759)
 	scf
 	ret
 
-Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
-	ld hl, wc02e
+Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
+	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 @@ Music1f_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 @@ Music1f_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,79 +1064,79 @@ Music1f_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
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld a, e
 	ld [hli], a
 	ld [hl], d
 	ret
 .asm_7d7fa
-	ld hl, wc02e
+	ld hl, wChannelFlags1
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
 	ret
 
-Func_7d803: ; 7d803 (1f:5803)
-	ld hl, wc096
+Audio3_7d803: ; 7d803 (1f:5803)
+	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 @@ Func_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 @@ Func_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
 
-Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
+Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
 	ld b, $0
-	ld hl, wc046
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1195,19 +1195,19 @@ Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
 	and $c0
 	ld d, a
 	ld b, $1
-	call Func_7d8ac
+	call Audio3_7d8ac
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
+Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld d, $0
 	ld a, c
 	add a
 	ld e, a
-	ld hl, wc006
+	ld hl, wChannelCommandPointers
 	add hl, de
 	ld a, [hli]
 	ld e, a
@@ -1220,7 +1220,7 @@ Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld [hl], d
 	ret
 
-Func_7d8ac: ; 7d8ac (1f:58ac)
+Audio3_7d8ac: ; 7d8ac (1f:58ac)
 	ld a, c
 	ld hl, Unknown_7db8b
 	add l
@@ -1234,7 +1234,7 @@ Func_7d8ac: ; 7d8ac (1f:58ac)
 	ld h, $ff
 	ret
 
-Func_7d8bb: ; 7d8bb (1f:58bb)
+Audio3_7d8bb: ; 7d8bb (1f:58bb)
 	ld h, $0
 .loop
 	srl a
@@ -1249,13 +1249,13 @@ Func_7d8bb: ; 7d8bb (1f:58bb)
 .done
 	ret
 
-Func_7d8cc: ; 7d8cc (1f:58cc)
+Audio3_7d8cc: ; 7d8cc (1f:58cc)
 	ld h, $0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music1f_Pitches
+	ld hl, Audio3_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1274,102 +1274,102 @@ Func_7d8cc: ; 7d8cc (1f:58cc)
 	ld d, a
 	ret
 
-Func_7d8ea:: ; 7d8ea (1f:58ea)
-	ld [wc001], a
+Audio3_PlaySound:: ; 7d8ea (1f:58ea)
+	ld [wSoundID], a
 	cp $ff
-	jp z, Func_7daa8
+	jp z, Audio3_7daa8
 	cp $c2
-	jp z, Func_7d9c2
-	jp c, Func_7d9c2
+	jp z, Audio3_7d9c2
+	jp c, Audio3_7d9c2
 	cp $fe
 	jr z, .asm_7d901
-	jp nc, Func_7d9c2
+	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
-	call FillMusicRAM1f
-	ld hl, wc006
-	call FillMusicRAM1f
+	ld hl, wChannelReturnAddresses
+	call FillAudioRAM3
+	ld hl, wChannelCommandPointers
+	call FillAudioRAM3
 	ld d, $4
-	ld hl, wc026
-	call FillMusicRAM1f
-	ld hl, wc02e
-	call FillMusicRAM1f
-	ld hl, wc03e
-	call FillMusicRAM1f
-	ld hl, wc046
-	call FillMusicRAM1f
-	ld hl, wc04e
-	call FillMusicRAM1f
-	ld hl, wc056
-	call FillMusicRAM1f
-	ld hl, wc05e
-	call FillMusicRAM1f
-	ld hl, wc066
-	call FillMusicRAM1f
-	ld hl, wc06e
-	call FillMusicRAM1f
-	ld hl, wc036
-	call FillMusicRAM1f
-	ld hl, wc076
-	call FillMusicRAM1f
-	ld hl, wc07e
-	call FillMusicRAM1f
-	ld hl, wc086
-	call FillMusicRAM1f
-	ld hl, wc08e
-	call FillMusicRAM1f
-	ld hl, wc096
-	call FillMusicRAM1f
-	ld hl, wc09e
-	call FillMusicRAM1f
-	ld hl, wc0a6
-	call FillMusicRAM1f
-	ld hl, wc0ae
-	call FillMusicRAM1f
+	ld hl, wChannelSoundIDs
+	call FillAudioRAM3
+	ld hl, wChannelFlags1
+	call FillAudioRAM3
+	ld hl, wChannelDuties
+	call FillAudioRAM3
+	ld hl, wChannelDutyCycles
+	call FillAudioRAM3
+	ld hl, wChannelVibratoDelayCounters
+	call FillAudioRAM3
+	ld hl, wChannelVibratoExtents
+	call FillAudioRAM3
+	ld hl, wChannelVibratoRates
+	call FillAudioRAM3
+	ld hl, wChannelFrequencyLowBytes
+	call FillAudioRAM3
+	ld hl, wChannelVibratoDelayCounterReloadValues
+	call FillAudioRAM3
+	ld hl, wChannelFlags2
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendLengthModifiers
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendFrequencySteps
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	call FillAudioRAM3
+	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	call FillAudioRAM3
 	ld a, $1
-	ld hl, wc0be
-	call FillMusicRAM1f
-	ld hl, wc0b6
-	call FillMusicRAM1f
-	ld hl, wc0c6
-	call FillMusicRAM1f
-	ld [wc0e8], a
+	ld hl, wChannelLoopCounters
+	call FillAudioRAM3
+	ld hl, wChannelNoteDelayCounters
+	call FillAudioRAM3
+	ld hl, wChannelNoteSpeeds
+	call FillAudioRAM3
+	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
-	jp Func_7db03
+	ld [rNR50], a
+	jp Audio3_7db03
 
-Func_7d9c2: ; 7d9c2 (1f:59c2)
+Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_1f
+	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 @@ Func_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 @@ Func_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 @@ Func_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 @@ Func_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,132 +1423,132 @@ Func_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
-	jp z, Func_7db03
+	jp z, Audio3_7db03
 	dec c
 	jp .asm_7d9db
 
-Func_7daa8: ; 7daa8 (1f:5aa8)
+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
-	call FillMusicRAM1f
+	ld hl, wChannelCommandPointers
+	call FillAudioRAM3
 	ld a, $1
 	ld d, $18
-	ld hl, wc0b6
-	call FillMusicRAM1f
-	ld [wc0e8], a
-	ld [wc0ea], a
+	ld hl, wChannelNoteDelayCounters
+	call FillAudioRAM3
+	ld [wMusicTempo], a
+	ld [wSfxTempo], a
 	ld a, $ff
-	ld [wc004], a
+	ld [wStereoPanning], a
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM1f: ; 7dafd (1f:5afd)
+FillAudioRAM3: ; 7dafd (1f:5afd)
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,19 +1556,19 @@ FillMusicRAM1f: ; 7dafd (1f:5afd)
 	jr nz, .loop
 	ret
 
-Func_7db03: ; 7db03 (1f:5b03)
-	ld a, [wc001]
+Audio3_7db03: ; 7db03 (1f:5b03)
+	ld a, [wSoundID]
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_1f
+	ld de, SFX_Headers_3
 	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 @@ Func_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,38 +1620,38 @@ Func_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 de, Noise1f_endchannel
+	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
 
-Noise1f_endchannel: ; 7db8a (1f:5b8a)
+Noise3_endchannel: ; 7db8a (1f:5b8a)
 	endchannel
 
 Unknown_7db8b: ; 7db8b (1f:5b8b)
@@ -1666,7 +1666,7 @@ Unknown_7db9b: ; 7db9b (1f:5b9b)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Music1f_Pitches: ; 7dba3 (1f:5ba3)
+Audio3_Pitches: ; 7dba3 (1f:5ba3)
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders1.asm
index 82342c81..a6449436 100755..100644
--- a/audio/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders1.asm
@@ -182,5 +182,3 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1)
 	dw Music_IndigoPlateau_Ch3
 	db CH3
 	dw Music_IndigoPlateau_Ch4
-
-; 0x82fd
diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders2.asm
index 85cf2825..85cf2825 100755..100644
--- a/audio/headers/musicheaders08.asm
+++ b/audio/headers/musicheaders2.asm
diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders3.asm
index 97b81d45..7846e48f 100755..100644
--- a/audio/headers/musicheaders1f.asm
+++ b/audio/headers/musicheaders3.asm
@@ -156,5 +156,3 @@ Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
 	dw Music_MeetMaleTrainer_Ch2
 	db CH2
 	dw Music_MeetMaleTrainer_Ch3
-
-; 0x7c2fd
diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
deleted file mode 100755
index 22ccb1d7..00000000
--- a/audio/headers/sfxheaders02.asm
+++ /dev/null
@@ -1,564 +0,0 @@
-SFX_Headers_02::
-	db $ff, $ff, $ff ; padding
-
-SFX_02_01:: ; 8003 (2:4003)
-	db CH7
-	dw SFX_02_01_Ch1
-
-SFX_02_02:: ; 8006 (2:4006)
-	db CH7
-	dw SFX_02_02_Ch1
-
-SFX_02_03:: ; 8009 (2:4009)
-	db CH7
-	dw SFX_02_03_Ch1
-
-SFX_02_04:: ; 800c (2:400c)
-	db CH7
-	dw SFX_02_04_Ch1
-
-SFX_02_05:: ; 800f (2:400f)
-	db CH7
-	dw SFX_02_05_Ch1
-
-SFX_02_06:: ; 8012 (2:4012)
-	db CH7
-	dw SFX_02_06_Ch1
-
-SFX_02_07:: ; 8015 (2:4015)
-	db CH7
-	dw SFX_02_07_Ch1
-
-SFX_02_08:: ; 8018 (2:4018)
-	db CH7
-	dw SFX_02_08_Ch1
-
-SFX_02_09:: ; 801b (2:401b)
-	db CH7
-	dw SFX_02_09_Ch1
-
-SFX_02_0a:: ; 801e (2:401e)
-	db CH7
-	dw SFX_02_0a_Ch1
-
-SFX_02_0b:: ; 8021 (2:4021)
-	db CH7
-	dw SFX_02_0b_Ch1
-
-SFX_02_0c:: ; 8024 (2:4024)
-	db CH7
-	dw SFX_02_0c_Ch1
-
-SFX_02_0d:: ; 8027 (2:4027)
-	db CH7
-	dw SFX_02_0d_Ch1
-
-SFX_02_0e:: ; 802a (2:402a)
-	db CH7
-	dw SFX_02_0e_Ch1
-
-SFX_02_0f:: ; 802d (2:402d)
-	db CH7
-	dw SFX_02_0f_Ch1
-
-SFX_02_10:: ; 8030 (2:4030)
-	db CH7
-	dw SFX_02_10_Ch1
-
-SFX_02_11:: ; 8033 (2:4033)
-	db CH7
-	dw SFX_02_11_Ch1
-
-SFX_02_12:: ; 8036 (2:4036)
-	db CH7
-	dw SFX_02_12_Ch1
-
-SFX_02_13:: ; 8039 (2:4039)
-	db CH7
-	dw SFX_02_13_Ch1
-
-SFX_02_14:: ; 803c (2:403c)
-	db ( $80 | CH4 )
-	dw SFX_02_14_Ch1
-	db CH5
-	dw SFX_02_14_Ch2
-	db CH7
-	dw SFX_02_14_Ch3
-
-SFX_02_15:: ; 8045 (2:4045)
-	db ( $80 | CH4 )
-	dw SFX_02_15_Ch1
-	db CH5
-	dw SFX_02_15_Ch2
-	db CH7
-	dw SFX_02_15_Ch3
-
-SFX_02_16:: ; 804e (2:404e)
-	db ( $80 | CH4 )
-	dw SFX_02_16_Ch1
-	db CH5
-	dw SFX_02_16_Ch2
-	db CH7
-	dw SFX_02_16_Ch3
-
-SFX_02_17:: ; 8057 (2:4057)
-	db ( $80 | CH4 )
-	dw SFX_02_17_Ch1
-	db CH5
-	dw SFX_02_17_Ch2
-	db CH7
-	dw SFX_02_17_Ch3
-
-SFX_02_18:: ; 8060 (2:4060)
-	db ( $80 | CH4 )
-	dw SFX_02_18_Ch1
-	db CH5
-	dw SFX_02_18_Ch2
-	db CH7
-	dw SFX_02_18_Ch3
-
-SFX_02_19:: ; 8069 (2:4069)
-	db ( $80 | CH4 )
-	dw SFX_02_19_Ch1
-	db CH5
-	dw SFX_02_19_Ch2
-	db CH7
-	dw SFX_02_19_Ch3
-
-SFX_02_1a:: ; 8072 (2:4072)
-	db ( $80 | CH4 )
-	dw SFX_02_1a_Ch1
-	db CH5
-	dw SFX_02_1a_Ch2
-	db CH7
-	dw SFX_02_1a_Ch3
-
-SFX_02_1b:: ; 807b (2:407b)
-	db ( $80 | CH4 )
-	dw SFX_02_1b_Ch1
-	db CH5
-	dw SFX_02_1b_Ch2
-	db CH7
-	dw SFX_02_1b_Ch3
-
-SFX_02_1c:: ; 8084 (2:4084)
-	db ( $80 | CH4 )
-	dw SFX_02_1c_Ch1
-	db CH5
-	dw SFX_02_1c_Ch2
-	db CH7
-	dw SFX_02_1c_Ch3
-
-SFX_02_1d:: ; 808d (2:408d)
-	db ( $80 | CH4 )
-	dw SFX_02_1d_Ch1
-	db CH5
-	dw SFX_02_1d_Ch2
-	db CH7
-	dw SFX_02_1d_Ch3
-
-SFX_02_1e:: ; 8096 (2:4096)
-	db ( $80 | CH4 )
-	dw SFX_02_1e_Ch1
-	db CH5
-	dw SFX_02_1e_Ch2
-	db CH7
-	dw SFX_02_1e_Ch3
-
-SFX_02_1f:: ; 809f (2:409f)
-	db ( $80 | CH4 )
-	dw SFX_02_1f_Ch1
-	db CH5
-	dw SFX_02_1f_Ch2
-	db CH7
-	dw SFX_02_1f_Ch3
-
-SFX_02_20:: ; 80a8 (2:40a8)
-	db ( $80 | CH4 )
-	dw SFX_02_20_Ch1
-	db CH5
-	dw SFX_02_20_Ch2
-	db CH7
-	dw SFX_02_20_Ch3
-
-SFX_02_21:: ; 80b1 (2:40b1)
-	db ( $80 | CH4 )
-	dw SFX_02_21_Ch1
-	db CH5
-	dw SFX_02_21_Ch2
-	db CH7
-	dw SFX_02_21_Ch3
-
-SFX_02_22:: ; 80ba (2:40ba)
-	db ( $80 | CH4 )
-	dw SFX_02_22_Ch1
-	db CH5
-	dw SFX_02_22_Ch2
-	db CH7
-	dw SFX_02_22_Ch3
-
-SFX_02_23:: ; 80c3 (2:40c3)
-	db ( $80 | CH4 )
-	dw SFX_02_23_Ch1
-	db CH5
-	dw SFX_02_23_Ch2
-	db CH7
-	dw SFX_02_23_Ch3
-
-SFX_02_24:: ; 80cc (2:40cc)
-	db ( $80 | CH4 )
-	dw SFX_02_24_Ch1
-	db CH5
-	dw SFX_02_24_Ch2
-	db CH7
-	dw SFX_02_24_Ch3
-
-SFX_02_25:: ; 80d5 (2:40d5)
-	db ( $80 | CH4 )
-	dw SFX_02_25_Ch1
-	db CH5
-	dw SFX_02_25_Ch2
-	db CH7
-	dw SFX_02_25_Ch3
-
-SFX_02_26:: ; 80de (2:40de)
-	db ( $80 | CH4 )
-	dw SFX_02_26_Ch1
-	db CH5
-	dw SFX_02_26_Ch2
-	db CH7
-	dw SFX_02_26_Ch3
-
-SFX_02_27:: ; 80e7 (2:40e7)
-	db ( $80 | CH4 )
-	dw SFX_02_27_Ch1
-	db CH5
-	dw SFX_02_27_Ch2
-	db CH7
-	dw SFX_02_27_Ch3
-
-SFX_02_28:: ; 80f0 (2:40f0)
-	db ( $80 | CH4 )
-	dw SFX_02_28_Ch1
-	db CH5
-	dw SFX_02_28_Ch2
-	db CH7
-	dw SFX_02_28_Ch3
-
-SFX_02_29:: ; 80f9 (2:40f9)
-	db ( $80 | CH4 )
-	dw SFX_02_29_Ch1
-	db CH5
-	dw SFX_02_29_Ch2
-	db CH7
-	dw SFX_02_29_Ch3
-
-SFX_02_2a:: ; 8102 (2:4102)
-	db ( $80 | CH4 )
-	dw SFX_02_2a_Ch1
-	db CH5
-	dw SFX_02_2a_Ch2
-	db CH7
-	dw SFX_02_2a_Ch3
-
-SFX_02_2b:: ; 810b (2:410b)
-	db ( $80 | CH4 )
-	dw SFX_02_2b_Ch1
-	db CH5
-	dw SFX_02_2b_Ch2
-	db CH7
-	dw SFX_02_2b_Ch3
-
-SFX_02_2c:: ; 8114 (2:4114)
-	db ( $80 | CH4 )
-	dw SFX_02_2c_Ch1
-	db CH5
-	dw SFX_02_2c_Ch2
-	db CH7
-	dw SFX_02_2c_Ch3
-
-SFX_02_2d:: ; 811d (2:411d)
-	db ( $80 | CH4 )
-	dw SFX_02_2d_Ch1
-	db CH5
-	dw SFX_02_2d_Ch2
-	db CH7
-	dw SFX_02_2d_Ch3
-
-SFX_02_2e:: ; 8126 (2:4126)
-	db ( $80 | CH4 )
-	dw SFX_02_2e_Ch1
-	db CH5
-	dw SFX_02_2e_Ch2
-	db CH7
-	dw SFX_02_2e_Ch3
-
-SFX_02_2f:: ; 812f (2:412f)
-	db ( $80 | CH4 )
-	dw SFX_02_2f_Ch1
-	db CH5
-	dw SFX_02_2f_Ch2
-	db CH7
-	dw SFX_02_2f_Ch3
-
-SFX_02_30:: ; 8138 (2:4138)
-	db ( $80 | CH4 )
-	dw SFX_02_30_Ch1
-	db CH5
-	dw SFX_02_30_Ch2
-	db CH7
-	dw SFX_02_30_Ch3
-
-SFX_02_31:: ; 8141 (2:4141)
-	db ( $80 | CH4 )
-	dw SFX_02_31_Ch1
-	db CH5
-	dw SFX_02_31_Ch2
-	db CH7
-	dw SFX_02_31_Ch3
-
-SFX_02_32:: ; 814a (2:414a)
-	db ( $80 | CH4 )
-	dw SFX_02_32_Ch1
-	db CH5
-	dw SFX_02_32_Ch2
-	db CH7
-	dw SFX_02_32_Ch3
-
-SFX_02_33:: ; 8153 (2:4153)
-	db ( $80 | CH4 )
-	dw SFX_02_33_Ch1
-	db CH5
-	dw SFX_02_33_Ch2
-	db CH7
-	dw SFX_02_33_Ch3
-
-SFX_02_34:: ; 815c (2:415c)
-	db ( $80 | CH4 )
-	dw SFX_02_34_Ch1
-	db CH5
-	dw SFX_02_34_Ch2
-	db CH7
-	dw SFX_02_34_Ch3
-
-SFX_02_35:: ; 8165 (2:4165)
-	db ( $80 | CH4 )
-	dw SFX_02_35_Ch1
-	db CH5
-	dw SFX_02_35_Ch2
-	db CH7
-	dw SFX_02_35_Ch3
-
-SFX_02_36:: ; 816e (2:416e)
-	db ( $80 | CH4 )
-	dw SFX_02_36_Ch1
-	db CH5
-	dw SFX_02_36_Ch2
-	db CH7
-	dw SFX_02_36_Ch3
-
-SFX_02_37:: ; 8177 (2:4177)
-	db ( $80 | CH4 )
-	dw SFX_02_37_Ch1
-	db CH5
-	dw SFX_02_37_Ch2
-	db CH7
-	dw SFX_02_37_Ch3
-
-SFX_02_38:: ; 8180 (2:4180)
-	db ( $80 | CH4 )
-	dw SFX_02_38_Ch1
-	db CH5
-	dw SFX_02_38_Ch2
-	db CH7
-	dw SFX_02_38_Ch3
-
-SFX_02_39:: ; 8189 (2:4189)
-	db ( $80 | CH4 )
-	dw SFX_02_39_Ch1
-	db CH5
-	dw SFX_02_39_Ch2
-	db CH7
-	dw SFX_02_39_Ch3
-
-SFX_02_3a:: ; 8192 (2:4192)
-	db ( $80 | CH4 )
-	dw SFX_02_3a_Ch1
-	db CH5
-	dw SFX_02_3a_Ch2
-	db CH6
-	dw SFX_02_3a_Ch3
-
-SFX_02_3b:: ; 819b (2:419b)
-	db ( $80 | CH4 )
-	dw SFX_02_3b_Ch1
-	db CH5
-	dw SFX_02_3b_Ch2
-	db CH6
-	dw SFX_02_3b_Ch3
-
-SFX_02_3c:: ; 81a4 (2:41a4)
-	db CH4
-	dw SFX_02_3c_Ch1
-
-SFX_02_3d:: ; 81a7 (2:41a7)
-	db CH4
-	dw SFX_02_3d_Ch1
-
-SFX_02_3e:: ; 81aa (2:41aa)
-	db CH4
-	dw SFX_02_3e_Ch1
-
-SFX_02_3f:: ; 81ad (2:41ad)
-	db CH7
-	dw SFX_02_3f_Ch1
-
-SFX_02_40:: ; 81b0 (2:41b0)
-	db CH4
-	dw SFX_02_40_Ch1
-
-SFX_02_41:: ; 81b3 (2:41b3)
-	db ( $80 | CH4 )
-	dw SFX_02_41_Ch1
-	db CH5
-	dw SFX_02_41_Ch2
-	db CH6
-	dw SFX_02_41_Ch3
-
-SFX_02_42:: ; 81bc (2:41bc)
-	db ( $80 | CH4 )
-	dw SFX_02_42_Ch1
-	db CH5
-	dw SFX_02_42_Ch2
-	db CH6
-	dw SFX_02_42_Ch3
-
-SFX_02_43:: ; 81c5 (2:41c5)
-	db CH4
-	dw SFX_02_43_Ch1
-
-SFX_02_44:: ; 81c8 (2:41c8)
-	db CH4
-	dw SFX_02_44_Ch1
-
-SFX_02_45:: ; 81cb (2:41cb)
-	db CH4
-	dw SFX_02_45_Ch1
-
-SFX_02_46:: ; 81ce (2:41ce)
-	db CH4
-	dw SFX_02_46_Ch1
-
-SFX_02_47:: ; 81d1 (2:41d1)
-	db CH4
-	dw SFX_02_47_Ch1
-
-SFX_02_48:: ; 81d4 (2:41d4)
-	db CH4
-	dw SFX_02_48_Ch1
-
-SFX_02_49:: ; 81d7 (2:41d7)
-	db CH4
-	dw SFX_02_49_Ch1
-
-SFX_02_4a:: ; 81da (2:41da)
-	db CH4
-	dw SFX_02_4a_Ch1
-
-SFX_02_4b:: ; 81dd (2:41dd)
-	db CH4
-	dw SFX_02_4b_Ch1
-
-SFX_02_4c:: ; 81e0 (2:41e0)
-	db CH4
-	dw SFX_02_4c_Ch1
-
-SFX_02_4d:: ; 81e3 (2:41e3)
-	db CH4
-	dw SFX_02_4d_Ch1
-
-SFX_02_4e:: ; 81e6 (2:41e6)
-	db CH4
-	dw SFX_02_4e_Ch1
-
-SFX_02_4f:: ; 81e9 (2:41e9)
-	db CH7
-	dw SFX_02_4f_Ch1
-
-SFX_02_50:: ; 81ec (2:41ec)
-	db CH7
-	dw SFX_02_50_Ch1
-
-SFX_02_51:: ; 81ef (2:41ef)
-	db ( $40 | CH4 )
-	dw SFX_02_51_Ch1
-	db CH5
-	dw SFX_02_51_Ch2
-
-SFX_02_52:: ; 81f5 (2:41f5)
-	db CH4
-	dw SFX_02_52_Ch1
-
-SFX_02_53:: ; 81f8 (2:41f8)
-	db CH7
-	dw SFX_02_53_Ch1
-
-SFX_02_54:: ; 81fb (2:41fb)
-	db ( $40 | CH4 )
-	dw SFX_02_54_Ch1
-	db CH5
-	dw SFX_02_54_Ch2
-
-SFX_02_55:: ; 8201 (2:4201)
-	db CH4
-	dw SFX_02_55_Ch1
-
-SFX_02_56:: ; 8204 (2:4204)
-	db CH7
-	dw SFX_02_56_Ch1
-
-SFX_02_57:: ; 8207 (2:4207)
-	db CH7
-	dw SFX_02_57_Ch1
-
-SFX_02_58:: ; 820a (2:420a)
-	db ( $40 | CH4 )
-	dw SFX_02_58_Ch1
-	db CH5
-	dw SFX_02_58_Ch2
-
-SFX_02_59:: ; 8210 (2:4210)
-	db ( $40 | CH4 )
-	dw SFX_02_59_Ch1
-	db CH5
-	dw SFX_02_59_Ch2
-
-SFX_02_5a:: ; 8216 (2:4216)
-	db ( $40 | CH4 )
-	dw SFX_02_5a_Ch1
-	db CH5
-	dw SFX_02_5a_Ch2
-
-SFX_02_5b:: ; 821c (2:421c)
-	db CH4
-	dw SFX_02_5b_Ch1
-
-SFX_02_5c:: ; 821f (2:421f)
-	db CH7
-	dw SFX_02_5c_Ch1
-
-SFX_02_5d:: ; 8222 (2:4222)
-	db ( $40 | CH4 )
-	dw SFX_02_5d_Ch1
-	db CH5
-	dw SFX_02_5d_Ch2
-
-SFX_02_5e:: ; 8228 (2:4228)
-	db CH2
-	dw SFX_02_5e_Ch1
-
-SFX_02_5f:: ; 822b (2:422b)
-	db CH4
-	dw SFX_02_5f_Ch1
-
-; 0x822e
diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm
deleted file mode 100755
index 6ee61953..00000000
--- a/audio/headers/sfxheaders08.asm
+++ /dev/null
@@ -1,708 +0,0 @@
-SFX_Headers_08::
-	db $ff, $ff, $ff ; padding
-
-SFX_08_01:: ; 20003 (8:4003)
-	db CH7
-	dw SFX_08_01_Ch1
-
-SFX_08_02:: ; 20006 (8:4006)
-	db CH7
-	dw SFX_08_02_Ch1
-
-SFX_08_03:: ; 20009 (8:4009)
-	db CH7
-	dw SFX_08_03_Ch1
-
-SFX_08_04:: ; 2000c (8:400c)
-	db CH7
-	dw SFX_08_04_Ch1
-
-SFX_08_05:: ; 2000f (8:400f)
-	db CH7
-	dw SFX_08_05_Ch1
-
-SFX_08_06:: ; 20012 (8:4012)
-	db CH7
-	dw SFX_08_06_Ch1
-
-SFX_08_07:: ; 20015 (8:4015)
-	db CH7
-	dw SFX_08_07_Ch1
-
-SFX_08_08:: ; 20018 (8:4018)
-	db CH7
-	dw SFX_08_08_Ch1
-
-SFX_08_09:: ; 2001b (8:401b)
-	db CH7
-	dw SFX_08_09_Ch1
-
-SFX_08_0a:: ; 2001e (8:401e)
-	db CH7
-	dw SFX_08_0a_Ch1
-
-SFX_08_0b:: ; 20021 (8:4021)
-	db CH7
-	dw SFX_08_0b_Ch1
-
-SFX_08_0c:: ; 20024 (8:4024)
-	db CH7
-	dw SFX_08_0c_Ch1
-
-SFX_08_0d:: ; 20027 (8:4027)
-	db CH7
-	dw SFX_08_0d_Ch1
-
-SFX_08_0e:: ; 2002a (8:402a)
-	db CH7
-	dw SFX_08_0e_Ch1
-
-SFX_08_0f:: ; 2002d (8:402d)
-	db CH7
-	dw SFX_08_0f_Ch1
-
-SFX_08_10:: ; 20030 (8:4030)
-	db CH7
-	dw SFX_08_10_Ch1
-
-SFX_08_11:: ; 20033 (8:4033)
-	db CH7
-	dw SFX_08_11_Ch1
-
-SFX_08_12:: ; 20036 (8:4036)
-	db CH7
-	dw SFX_08_12_Ch1
-
-SFX_08_13:: ; 20039 (8:4039)
-	db CH7
-	dw SFX_08_13_Ch1
-
-SFX_08_14:: ; 2003c (8:403c)
-	db ( $80 | CH4 )
-	dw SFX_08_14_Ch1
-	db CH5
-	dw SFX_08_14_Ch2
-	db CH7
-	dw SFX_08_14_Ch3
-
-SFX_08_15:: ; 20045 (8:4045)
-	db ( $80 | CH4 )
-	dw SFX_08_15_Ch1
-	db CH5
-	dw SFX_08_15_Ch2
-	db CH7
-	dw SFX_08_15_Ch3
-
-SFX_08_16:: ; 2004e (8:404e)
-	db ( $80 | CH4 )
-	dw SFX_08_16_Ch1
-	db CH5
-	dw SFX_08_16_Ch2
-	db CH7
-	dw SFX_08_16_Ch3
-
-SFX_08_17:: ; 20057 (8:4057)
-	db ( $80 | CH4 )
-	dw SFX_08_17_Ch1
-	db CH5
-	dw SFX_08_17_Ch2
-	db CH7
-	dw SFX_08_17_Ch3
-
-SFX_08_18:: ; 20060 (8:4060)
-	db ( $80 | CH4 )
-	dw SFX_08_18_Ch1
-	db CH5
-	dw SFX_08_18_Ch2
-	db CH7
-	dw SFX_08_18_Ch3
-
-SFX_08_19:: ; 20069 (8:4069)
-	db ( $80 | CH4 )
-	dw SFX_08_19_Ch1
-	db CH5
-	dw SFX_08_19_Ch2
-	db CH7
-	dw SFX_08_19_Ch3
-
-SFX_08_1a:: ; 20072 (8:4072)
-	db ( $80 | CH4 )
-	dw SFX_08_1a_Ch1
-	db CH5
-	dw SFX_08_1a_Ch2
-	db CH7
-	dw SFX_08_1a_Ch3
-
-SFX_08_1b:: ; 2007b (8:407b)
-	db ( $80 | CH4 )
-	dw SFX_08_1b_Ch1
-	db CH5
-	dw SFX_08_1b_Ch2
-	db CH7
-	dw SFX_08_1b_Ch3
-
-SFX_08_1c:: ; 20084 (8:4084)
-	db ( $80 | CH4 )
-	dw SFX_08_1c_Ch1
-	db CH5
-	dw SFX_08_1c_Ch2
-	db CH7
-	dw SFX_08_1c_Ch3
-
-SFX_08_1d:: ; 2008d (8:408d)
-	db ( $80 | CH4 )
-	dw SFX_08_1d_Ch1
-	db CH5
-	dw SFX_08_1d_Ch2
-	db CH7
-	dw SFX_08_1d_Ch3
-
-SFX_08_1e:: ; 20096 (8:4096)
-	db ( $80 | CH4 )
-	dw SFX_08_1e_Ch1
-	db CH5
-	dw SFX_08_1e_Ch2
-	db CH7
-	dw SFX_08_1e_Ch3
-
-SFX_08_1f:: ; 2009f (8:409f)
-	db ( $80 | CH4 )
-	dw SFX_08_1f_Ch1
-	db CH5
-	dw SFX_08_1f_Ch2
-	db CH7
-	dw SFX_08_1f_Ch3
-
-SFX_08_20:: ; 200a8 (8:40a8)
-	db ( $80 | CH4 )
-	dw SFX_08_20_Ch1
-	db CH5
-	dw SFX_08_20_Ch2
-	db CH7
-	dw SFX_08_20_Ch3
-
-SFX_08_21:: ; 200b1 (8:40b1)
-	db ( $80 | CH4 )
-	dw SFX_08_21_Ch1
-	db CH5
-	dw SFX_08_21_Ch2
-	db CH7
-	dw SFX_08_21_Ch3
-
-SFX_08_22:: ; 200ba (8:40ba)
-	db ( $80 | CH4 )
-	dw SFX_08_22_Ch1
-	db CH5
-	dw SFX_08_22_Ch2
-	db CH7
-	dw SFX_08_22_Ch3
-
-SFX_08_23:: ; 200c3 (8:40c3)
-	db ( $80 | CH4 )
-	dw SFX_08_23_Ch1
-	db CH5
-	dw SFX_08_23_Ch2
-	db CH7
-	dw SFX_08_23_Ch3
-
-SFX_08_24:: ; 200cc (8:40cc)
-	db ( $80 | CH4 )
-	dw SFX_08_24_Ch1
-	db CH5
-	dw SFX_08_24_Ch2
-	db CH7
-	dw SFX_08_24_Ch3
-
-SFX_08_25:: ; 200d5 (8:40d5)
-	db ( $80 | CH4 )
-	dw SFX_08_25_Ch1
-	db CH5
-	dw SFX_08_25_Ch2
-	db CH7
-	dw SFX_08_25_Ch3
-
-SFX_08_26:: ; 200de (8:40de)
-	db ( $80 | CH4 )
-	dw SFX_08_26_Ch1
-	db CH5
-	dw SFX_08_26_Ch2
-	db CH7
-	dw SFX_08_26_Ch3
-
-SFX_08_27:: ; 200e7 (8:40e7)
-	db ( $80 | CH4 )
-	dw SFX_08_27_Ch1
-	db CH5
-	dw SFX_08_27_Ch2
-	db CH7
-	dw SFX_08_27_Ch3
-
-SFX_08_28:: ; 200f0 (8:40f0)
-	db ( $80 | CH4 )
-	dw SFX_08_28_Ch1
-	db CH5
-	dw SFX_08_28_Ch2
-	db CH7
-	dw SFX_08_28_Ch3
-
-SFX_08_29:: ; 200f9 (8:40f9)
-	db ( $80 | CH4 )
-	dw SFX_08_29_Ch1
-	db CH5
-	dw SFX_08_29_Ch2
-	db CH7
-	dw SFX_08_29_Ch3
-
-SFX_08_2a:: ; 20102 (8:4102)
-	db ( $80 | CH4 )
-	dw SFX_08_2a_Ch1
-	db CH5
-	dw SFX_08_2a_Ch2
-	db CH7
-	dw SFX_08_2a_Ch3
-
-SFX_08_2b:: ; 2010b (8:410b)
-	db ( $80 | CH4 )
-	dw SFX_08_2b_Ch1
-	db CH5
-	dw SFX_08_2b_Ch2
-	db CH7
-	dw SFX_08_2b_Ch3
-
-SFX_08_2c:: ; 20114 (8:4114)
-	db ( $80 | CH4 )
-	dw SFX_08_2c_Ch1
-	db CH5
-	dw SFX_08_2c_Ch2
-	db CH7
-	dw SFX_08_2c_Ch3
-
-SFX_08_2d:: ; 2011d (8:411d)
-	db ( $80 | CH4 )
-	dw SFX_08_2d_Ch1
-	db CH5
-	dw SFX_08_2d_Ch2
-	db CH7
-	dw SFX_08_2d_Ch3
-
-SFX_08_2e:: ; 20126 (8:4126)
-	db ( $80 | CH4 )
-	dw SFX_08_2e_Ch1
-	db CH5
-	dw SFX_08_2e_Ch2
-	db CH7
-	dw SFX_08_2e_Ch3
-
-SFX_08_2f:: ; 2012f (8:412f)
-	db ( $80 | CH4 )
-	dw SFX_08_2f_Ch1
-	db CH5
-	dw SFX_08_2f_Ch2
-	db CH7
-	dw SFX_08_2f_Ch3
-
-SFX_08_30:: ; 20138 (8:4138)
-	db ( $80 | CH4 )
-	dw SFX_08_30_Ch1
-	db CH5
-	dw SFX_08_30_Ch2
-	db CH7
-	dw SFX_08_30_Ch3
-
-SFX_08_31:: ; 20141 (8:4141)
-	db ( $80 | CH4 )
-	dw SFX_08_31_Ch1
-	db CH5
-	dw SFX_08_31_Ch2
-	db CH7
-	dw SFX_08_31_Ch3
-
-SFX_08_32:: ; 2014a (8:414a)
-	db ( $80 | CH4 )
-	dw SFX_08_32_Ch1
-	db CH5
-	dw SFX_08_32_Ch2
-	db CH7
-	dw SFX_08_32_Ch3
-
-SFX_08_33:: ; 20153 (8:4153)
-	db ( $80 | CH4 )
-	dw SFX_08_33_Ch1
-	db CH5
-	dw SFX_08_33_Ch2
-	db CH7
-	dw SFX_08_33_Ch3
-
-SFX_08_34:: ; 2015c (8:415c)
-	db ( $80 | CH4 )
-	dw SFX_08_34_Ch1
-	db CH5
-	dw SFX_08_34_Ch2
-	db CH7
-	dw SFX_08_34_Ch3
-
-SFX_08_35:: ; 20165 (8:4165)
-	db ( $80 | CH4 )
-	dw SFX_08_35_Ch1
-	db CH5
-	dw SFX_08_35_Ch2
-	db CH7
-	dw SFX_08_35_Ch3
-
-SFX_08_36:: ; 2016e (8:416e)
-	db ( $80 | CH4 )
-	dw SFX_08_36_Ch1
-	db CH5
-	dw SFX_08_36_Ch2
-	db CH7
-	dw SFX_08_36_Ch3
-
-SFX_08_37:: ; 20177 (8:4177)
-	db ( $80 | CH4 )
-	dw SFX_08_37_Ch1
-	db CH5
-	dw SFX_08_37_Ch2
-	db CH7
-	dw SFX_08_37_Ch3
-
-SFX_08_38:: ; 20180 (8:4180)
-	db ( $80 | CH4 )
-	dw SFX_08_38_Ch1
-	db CH5
-	dw SFX_08_38_Ch2
-	db CH7
-	dw SFX_08_38_Ch3
-
-SFX_08_39:: ; 20189 (8:4189)
-	db ( $80 | CH4 )
-	dw SFX_08_39_Ch1
-	db CH5
-	dw SFX_08_39_Ch2
-	db CH7
-	dw SFX_08_39_Ch3
-
-SFX_08_3a:: ; 20192 (8:4192)
-	db ( $80 | CH4 )
-	dw SFX_08_3a_Ch1
-	db CH5
-	dw SFX_08_3a_Ch2
-	db CH6
-	dw SFX_08_3a_Ch3
-
-SFX_08_3b:: ; 2019b (8:419b)
-	db ( $80 | CH4 )
-	dw SFX_08_3b_Ch1
-	db CH5
-	dw SFX_08_3b_Ch2
-	db CH6
-	dw SFX_08_3b_Ch3
-
-SFX_08_3c:: ; 201a4 (8:41a4)
-	db CH4
-	dw SFX_08_3c_Ch1
-
-SFX_08_3d:: ; 201a7 (8:41a7)
-	db CH4
-	dw SFX_08_3d_Ch1
-
-SFX_08_3e:: ; 201aa (8:41aa)
-	db CH4
-	dw SFX_08_3e_Ch1
-
-SFX_08_3f:: ; 201ad (8:41ad)
-	db CH7
-	dw SFX_08_3f_Ch1
-
-SFX_08_40:: ; 201b0 (8:41b0)
-	db CH4
-	dw SFX_08_40_Ch1
-
-SFX_08_41:: ; 201b3 (8:41b3)
-	db ( $40 | CH4 )
-	dw SFX_08_41_Ch1
-	db CH5
-	dw SFX_08_41_Ch2
-
-SFX_08_42:: ; 201b9 (8:41b9)
-	db ( $40 | CH4 )
-	dw SFX_08_42_Ch1
-	db CH7
-	dw SFX_08_42_Ch2
-
-SFX_08_43:: ; 201bf (8:41bf)
-	db ( $40 | CH4 )
-	dw SFX_08_43_Ch1
-	db CH7
-	dw SFX_08_43_Ch2
-
-SFX_08_44:: ; 201c5 (8:41c5)
-	db CH7
-	dw SFX_08_44_Ch1
-
-SFX_08_45:: ; 201c8 (8:41c8)
-	db ( $40 | CH4 )
-	dw SFX_08_45_Ch1
-	db CH5
-	dw SFX_08_45_Ch2
-
-SFX_08_46:: ; 201ce (8:41ce)
-	db ( $80 | CH4 )
-	dw SFX_08_46_Ch1
-	db CH5
-	dw SFX_08_46_Ch2
-	db CH6
-	dw SFX_08_46_Ch3
-
-SFX_08_47:: ; 201d7 (8:41d7)
-	db CH7
-	dw SFX_08_47_Ch1
-
-SFX_08_48:: ; 201da (8:41da)
-	db CH4
-	dw SFX_08_48_Ch1
-
-SFX_08_49:: ; 201dd (8:41dd)
-	db CH4
-	dw SFX_08_49_Ch1
-
-SFX_08_4a:: ; 201e0 (8:41e0)
-	db CH7
-	dw SFX_08_4a_Ch1
-
-SFX_08_4b:: ; 201e3 (8:41e3)
-	db CH7
-	dw SFX_08_4b_Ch1
-
-SFX_08_4c:: ; 201e6 (8:41e6)
-	db CH7
-	dw SFX_08_4c_Ch1
-
-SFX_08_4d:: ; 201e9 (8:41e9)
-	db CH7
-	dw SFX_08_4d_Ch1
-
-SFX_08_4e:: ; 201ec (8:41ec)
-	db CH7
-	dw SFX_08_4e_Ch1
-
-SFX_08_4f:: ; 201ef (8:41ef)
-	db CH7
-	dw SFX_08_4f_Ch1
-
-SFX_08_50:: ; 201f2 (8:41f2)
-	db CH7
-	dw SFX_08_50_Ch1
-
-SFX_08_51:: ; 201f5 (8:41f5)
-	db CH7
-	dw SFX_08_51_Ch1
-
-SFX_08_52:: ; 201f8 (8:41f8)
-	db CH7
-	dw SFX_08_52_Ch1
-
-SFX_08_53:: ; 201fb (8:41fb)
-	db CH7
-	dw SFX_08_53_Ch1
-
-SFX_08_54:: ; 201fe (8:41fe)
-	db CH7
-	dw SFX_08_54_Ch1
-
-SFX_08_55:: ; 20201 (8:4201)
-	db CH7
-	dw SFX_08_55_Ch1
-
-SFX_08_56:: ; 20204 (8:4204)
-	db CH7
-	dw SFX_08_56_Ch1
-
-SFX_08_57:: ; 20207 (8:4207)
-	db CH7
-	dw SFX_08_57_Ch1
-
-SFX_08_58:: ; 2020a (8:420a)
-	db CH7
-	dw SFX_08_58_Ch1
-
-SFX_08_59:: ; 2020d (8:420d)
-	db CH7
-	dw SFX_08_59_Ch1
-
-SFX_08_5a:: ; 20210 (8:4210)
-	db CH7
-	dw SFX_08_5a_Ch1
-
-SFX_08_5b:: ; 20213 (8:4213)
-	db CH7
-	dw SFX_08_5b_Ch1
-
-SFX_08_5c:: ; 20216 (8:4216)
-	db CH7
-	dw SFX_08_5c_Ch1
-
-SFX_08_5d:: ; 20219 (8:4219)
-	db CH7
-	dw SFX_08_5d_Ch1
-
-SFX_08_5e:: ; 2021c (8:421c)
-	db ( $40 | CH4 )
-	dw SFX_08_5e_Ch1
-	db CH7
-	dw SFX_08_5e_Ch2
-
-SFX_08_5f:: ; 20222 (8:4222)
-	db CH7
-	dw SFX_08_5f_Ch1
-
-SFX_08_60:: ; 20225 (8:4225)
-	db CH7
-	dw SFX_08_60_Ch1
-
-SFX_08_61:: ; 20228 (8:4228)
-	db CH7
-	dw SFX_08_61_Ch1
-
-SFX_08_62:: ; 2022b (8:422b)
-	db CH7
-	dw SFX_08_62_Ch1
-
-SFX_08_63:: ; 2022e (8:422e)
-	db CH7
-	dw SFX_08_63_Ch1
-
-SFX_08_64:: ; 20231 (8:4231)
-	db ( $40 | CH4 )
-	dw SFX_08_64_Ch1
-	db CH7
-	dw SFX_08_64_Ch2
-
-SFX_08_65:: ; 20237 (8:4237)
-	db CH7
-	dw SFX_08_65_Ch1
-
-SFX_08_66:: ; 2023a (8:423a)
-	db CH7
-	dw SFX_08_66_Ch1
-
-SFX_08_67:: ; 2023d (8:423d)
-	db ( $80 | CH4 )
-	dw SFX_08_67_Ch1
-	db CH5
-	dw SFX_08_67_Ch2
-	db CH7
-	dw SFX_08_67_Ch3
-
-SFX_08_68:: ; 20246 (8:4246)
-	db ( $80 | CH4 )
-	dw SFX_08_68_Ch1
-	db CH5
-	dw SFX_08_68_Ch2
-	db CH7
-	dw SFX_08_68_Ch3
-
-SFX_08_69:: ; 2024f (8:424f)
-	db ( $40 | CH4 )
-	dw SFX_08_69_Ch1
-	db CH7
-	dw SFX_08_69_Ch2
-
-SFX_08_6a:: ; 20255 (8:4255)
-	db ( $80 | CH4 )
-	dw SFX_08_6a_Ch1
-	db CH5
-	dw SFX_08_6a_Ch2
-	db CH7
-	dw SFX_08_6a_Ch3
-
-SFX_08_6b:: ; 2025e (8:425e)
-	db ( $40 | CH4 )
-	dw SFX_08_6b_Ch1
-	db CH7
-	dw SFX_08_6b_Ch2
-
-SFX_08_6c:: ; 20264 (8:4264)
-	db ( $80 | CH4 )
-	dw SFX_08_6c_Ch1
-	db CH5
-	dw SFX_08_6c_Ch2
-	db CH7
-	dw SFX_08_6c_Ch3
-
-SFX_08_6d:: ; 2026d (8:426d)
-	db ( $80 | CH4 )
-	dw SFX_08_6d_Ch1
-	db CH5
-	dw SFX_08_6d_Ch2
-	db CH7
-	dw SFX_08_6d_Ch3
-
-SFX_08_6e:: ; 20276 (8:4276)
-	db ( $80 | CH4 )
-	dw SFX_08_6e_Ch1
-	db CH5
-	dw SFX_08_6e_Ch2
-	db CH7
-	dw SFX_08_6e_Ch3
-
-SFX_08_6f:: ; 2027f (8:427f)
-	db ( $80 | CH4 )
-	dw SFX_08_6f_Ch1
-	db CH5
-	dw SFX_08_6f_Ch2
-	db CH7
-	dw SFX_08_6f_Ch3
-
-SFX_08_70:: ; 20288 (8:4288)
-	db ( $80 | CH4 )
-	dw SFX_08_70_Ch1
-	db CH5
-	dw SFX_08_70_Ch2
-	db CH7
-	dw SFX_08_70_Ch3
-
-SFX_08_71:: ; 20291 (8:4291)
-	db ( $40 | CH4 )
-	dw SFX_08_71_Ch1
-	db CH5
-	dw SFX_08_71_Ch2
-
-SFX_08_72:: ; 20297 (8:4297)
-	db ( $40 | CH4 )
-	dw SFX_08_72_Ch1
-	db CH5
-	dw SFX_08_72_Ch2
-
-SFX_08_73:: ; 2029d (8:429d)
-	db ( $40 | CH4 )
-	dw SFX_08_73_Ch1
-	db CH5
-	dw SFX_08_73_Ch2
-
-SFX_08_74:: ; 202a3 (8:42a3)
-	db ( $80 | CH4 )
-	dw SFX_08_74_Ch1
-	db CH5
-	dw SFX_08_74_Ch2
-	db CH7
-	dw SFX_08_74_Ch3
-
-SFX_08_75:: ; 202ac (8:42ac)
-	db ( $40 | CH4 )
-	dw SFX_08_75_Ch1
-	db CH5
-	dw SFX_08_75_Ch2
-
-SFX_08_76:: ; 202b2 (8:42b2)
-	db ( $80 | CH4 )
-	dw SFX_08_76_Ch1
-	db CH5
-	dw SFX_08_76_Ch2
-	db CH7
-	dw SFX_08_76_Ch3
-
-SFX_08_77:: ; 202bb (8:42bb)
-	db CH4
-	dw SFX_08_77_Ch1
-
-; 0x202be
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
new file mode 100644
index 00000000..49370aa4
--- /dev/null
+++ b/audio/headers/sfxheaders1.asm
@@ -0,0 +1,562 @@
+SFX_Headers_1::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_1:: ; 8003 (2:4003)
+	db CH7
+	dw SFX_Snare1_1_Ch1
+
+SFX_Snare2_1:: ; 8006 (2:4006)
+	db CH7
+	dw SFX_Snare2_1_Ch1
+
+SFX_Snare3_1:: ; 8009 (2:4009)
+	db CH7
+	dw SFX_Snare3_1_Ch1
+
+SFX_Snare4_1:: ; 800c (2:400c)
+	db CH7
+	dw SFX_Snare4_1_Ch1
+
+SFX_Snare5_1:: ; 800f (2:400f)
+	db CH7
+	dw SFX_Snare5_1_Ch1
+
+SFX_Triangle1_1:: ; 8012 (2:4012)
+	db CH7
+	dw SFX_Triangle1_1_Ch1
+
+SFX_Triangle2_1:: ; 8015 (2:4015)
+	db CH7
+	dw SFX_Triangle2_1_Ch1
+
+SFX_Snare6_1:: ; 8018 (2:4018)
+	db CH7
+	dw SFX_Snare6_1_Ch1
+
+SFX_Snare7_1:: ; 801b (2:401b)
+	db CH7
+	dw SFX_Snare7_1_Ch1
+
+SFX_Snare8_1:: ; 801e (2:401e)
+	db CH7
+	dw SFX_Snare8_1_Ch1
+
+SFX_Snare9_1:: ; 8021 (2:4021)
+	db CH7
+	dw SFX_Snare9_1_Ch1
+
+SFX_Cymbal1_1:: ; 8024 (2:4024)
+	db CH7
+	dw SFX_Cymbal1_1_Ch1
+
+SFX_Cymbal2_1:: ; 8027 (2:4027)
+	db CH7
+	dw SFX_Cymbal2_1_Ch1
+
+SFX_Cymbal3_1:: ; 802a (2:402a)
+	db CH7
+	dw SFX_Cymbal3_1_Ch1
+
+SFX_Muted_Snare1_1:: ; 802d (2:402d)
+	db CH7
+	dw SFX_Muted_Snare1_1_Ch1
+
+SFX_Triangle3_1:: ; 8030 (2:4030)
+	db CH7
+	dw SFX_Triangle3_1_Ch1
+
+SFX_Muted_Snare2_1:: ; 8033 (2:4033)
+	db CH7
+	dw SFX_Muted_Snare2_1_Ch1
+
+SFX_Muted_Snare3_1:: ; 8036 (2:4036)
+	db CH7
+	dw SFX_Muted_Snare3_1_Ch1
+
+SFX_Muted_Snare4_1:: ; 8039 (2:4039)
+	db CH7
+	dw SFX_Muted_Snare4_1_Ch1
+
+SFX_Cry00_1:: ; 803c (2:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_1_Ch1
+	db CH5
+	dw SFX_Cry00_1_Ch2
+	db CH7
+	dw SFX_Cry00_1_Ch3
+
+SFX_Cry01_1:: ; 8045 (2:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_1_Ch1
+	db CH5
+	dw SFX_Cry01_1_Ch2
+	db CH7
+	dw SFX_Cry01_1_Ch3
+
+SFX_Cry02_1:: ; 804e (2:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_1_Ch1
+	db CH5
+	dw SFX_Cry02_1_Ch2
+	db CH7
+	dw SFX_Cry02_1_Ch3
+
+SFX_Cry03_1:: ; 8057 (2:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_1_Ch1
+	db CH5
+	dw SFX_Cry03_1_Ch2
+	db CH7
+	dw SFX_Cry03_1_Ch3
+
+SFX_Cry04_1:: ; 8060 (2:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_1_Ch1
+	db CH5
+	dw SFX_Cry04_1_Ch2
+	db CH7
+	dw SFX_Cry04_1_Ch3
+
+SFX_Cry05_1:: ; 8069 (2:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_1_Ch1
+	db CH5
+	dw SFX_Cry05_1_Ch2
+	db CH7
+	dw SFX_Cry05_1_Ch3
+
+SFX_Cry06_1:: ; 8072 (2:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_1_Ch1
+	db CH5
+	dw SFX_Cry06_1_Ch2
+	db CH7
+	dw SFX_Cry06_1_Ch3
+
+SFX_Cry07_1:: ; 807b (2:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_1_Ch1
+	db CH5
+	dw SFX_Cry07_1_Ch2
+	db CH7
+	dw SFX_Cry07_1_Ch3
+
+SFX_Cry08_1:: ; 8084 (2:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_1_Ch1
+	db CH5
+	dw SFX_Cry08_1_Ch2
+	db CH7
+	dw SFX_Cry08_1_Ch3
+
+SFX_Cry09_1:: ; 808d (2:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_1_Ch1
+	db CH5
+	dw SFX_Cry09_1_Ch2
+	db CH7
+	dw SFX_Cry09_1_Ch3
+
+SFX_Cry0A_1:: ; 8096 (2:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_1_Ch1
+	db CH5
+	dw SFX_Cry0A_1_Ch2
+	db CH7
+	dw SFX_Cry0A_1_Ch3
+
+SFX_Cry0B_1:: ; 809f (2:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_1_Ch1
+	db CH5
+	dw SFX_Cry0B_1_Ch2
+	db CH7
+	dw SFX_Cry0B_1_Ch3
+
+SFX_Cry0C_1:: ; 80a8 (2:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_1_Ch1
+	db CH5
+	dw SFX_Cry0C_1_Ch2
+	db CH7
+	dw SFX_Cry0C_1_Ch3
+
+SFX_Cry0D_1:: ; 80b1 (2:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_1_Ch1
+	db CH5
+	dw SFX_Cry0D_1_Ch2
+	db CH7
+	dw SFX_Cry0D_1_Ch3
+
+SFX_Cry0E_1:: ; 80ba (2:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_1_Ch1
+	db CH5
+	dw SFX_Cry0E_1_Ch2
+	db CH7
+	dw SFX_Cry0E_1_Ch3
+
+SFX_Cry0F_1:: ; 80c3 (2:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_1_Ch1
+	db CH5
+	dw SFX_Cry0F_1_Ch2
+	db CH7
+	dw SFX_Cry0F_1_Ch3
+
+SFX_Cry10_1:: ; 80cc (2:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_1_Ch1
+	db CH5
+	dw SFX_Cry10_1_Ch2
+	db CH7
+	dw SFX_Cry10_1_Ch3
+
+SFX_Cry11_1:: ; 80d5 (2:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_1_Ch1
+	db CH5
+	dw SFX_Cry11_1_Ch2
+	db CH7
+	dw SFX_Cry11_1_Ch3
+
+SFX_Cry12_1:: ; 80de (2:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_1_Ch1
+	db CH5
+	dw SFX_Cry12_1_Ch2
+	db CH7
+	dw SFX_Cry12_1_Ch3
+
+SFX_Cry13_1:: ; 80e7 (2:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_1_Ch1
+	db CH5
+	dw SFX_Cry13_1_Ch2
+	db CH7
+	dw SFX_Cry13_1_Ch3
+
+SFX_Cry14_1:: ; 80f0 (2:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_1_Ch1
+	db CH5
+	dw SFX_Cry14_1_Ch2
+	db CH7
+	dw SFX_Cry14_1_Ch3
+
+SFX_Cry15_1:: ; 80f9 (2:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_1_Ch1
+	db CH5
+	dw SFX_Cry15_1_Ch2
+	db CH7
+	dw SFX_Cry15_1_Ch3
+
+SFX_Cry16_1:: ; 8102 (2:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_1_Ch1
+	db CH5
+	dw SFX_Cry16_1_Ch2
+	db CH7
+	dw SFX_Cry16_1_Ch3
+
+SFX_Cry17_1:: ; 810b (2:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_1_Ch1
+	db CH5
+	dw SFX_Cry17_1_Ch2
+	db CH7
+	dw SFX_Cry17_1_Ch3
+
+SFX_Cry18_1:: ; 8114 (2:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_1_Ch1
+	db CH5
+	dw SFX_Cry18_1_Ch2
+	db CH7
+	dw SFX_Cry18_1_Ch3
+
+SFX_Cry19_1:: ; 811d (2:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_1_Ch1
+	db CH5
+	dw SFX_Cry19_1_Ch2
+	db CH7
+	dw SFX_Cry19_1_Ch3
+
+SFX_Cry1A_1:: ; 8126 (2:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_1_Ch1
+	db CH5
+	dw SFX_Cry1A_1_Ch2
+	db CH7
+	dw SFX_Cry1A_1_Ch3
+
+SFX_Cry1B_1:: ; 812f (2:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_1_Ch1
+	db CH5
+	dw SFX_Cry1B_1_Ch2
+	db CH7
+	dw SFX_Cry1B_1_Ch3
+
+SFX_Cry1C_1:: ; 8138 (2:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_1_Ch1
+	db CH5
+	dw SFX_Cry1C_1_Ch2
+	db CH7
+	dw SFX_Cry1C_1_Ch3
+
+SFX_Cry1D_1:: ; 8141 (2:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_1_Ch1
+	db CH5
+	dw SFX_Cry1D_1_Ch2
+	db CH7
+	dw SFX_Cry1D_1_Ch3
+
+SFX_Cry1E_1:: ; 814a (2:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_1_Ch1
+	db CH5
+	dw SFX_Cry1E_1_Ch2
+	db CH7
+	dw SFX_Cry1E_1_Ch3
+
+SFX_Cry1F_1:: ; 8153 (2:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_1_Ch1
+	db CH5
+	dw SFX_Cry1F_1_Ch2
+	db CH7
+	dw SFX_Cry1F_1_Ch3
+
+SFX_Cry20_1:: ; 815c (2:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_1_Ch1
+	db CH5
+	dw SFX_Cry20_1_Ch2
+	db CH7
+	dw SFX_Cry20_1_Ch3
+
+SFX_Cry21_1:: ; 8165 (2:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_1_Ch1
+	db CH5
+	dw SFX_Cry21_1_Ch2
+	db CH7
+	dw SFX_Cry21_1_Ch3
+
+SFX_Cry22_1:: ; 816e (2:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_1_Ch1
+	db CH5
+	dw SFX_Cry22_1_Ch2
+	db CH7
+	dw SFX_Cry22_1_Ch3
+
+SFX_Cry23_1:: ; 8177 (2:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_1_Ch1
+	db CH5
+	dw SFX_Cry23_1_Ch2
+	db CH7
+	dw SFX_Cry23_1_Ch3
+
+SFX_Cry24_1:: ; 8180 (2:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_1_Ch1
+	db CH5
+	dw SFX_Cry24_1_Ch2
+	db CH7
+	dw SFX_Cry24_1_Ch3
+
+SFX_Cry25_1:: ; 8189 (2:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_1_Ch1
+	db CH5
+	dw SFX_Cry25_1_Ch2
+	db CH7
+	dw SFX_Cry25_1_Ch3
+
+SFX_Get_Item1_1:: ; 8192 (2:4192)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item1_1_Ch1
+	db CH5
+	dw SFX_Get_Item1_1_Ch2
+	db CH6
+	dw SFX_Get_Item1_1_Ch3
+
+SFX_Get_Item2_1:: ; 819b (2:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_1_Ch1
+	db CH5
+	dw SFX_Get_Item2_1_Ch2
+	db CH6
+	dw SFX_Get_Item2_1_Ch3
+
+SFX_Tink_1:: ; 81a4 (2:41a4)
+	db CH4
+	dw SFX_Tink_1_Ch1
+
+SFX_Heal_HP_1:: ; 81a7 (2:41a7)
+	db CH4
+	dw SFX_Heal_HP_1_Ch1
+
+SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_1_Ch1
+
+SFX_Start_Menu_1:: ; 81ad (2:41ad)
+	db CH7
+	dw SFX_Start_Menu_1_Ch1
+
+SFX_Press_AB_1:: ; 81b0 (2:41b0)
+	db CH4
+	dw SFX_Press_AB_1_Ch1
+
+SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
+	db ( $80 | CH4 )
+	dw SFX_Pokedex_Rating_1_Ch1
+	db CH5
+	dw SFX_Pokedex_Rating_1_Ch2
+	db CH6
+	dw SFX_Pokedex_Rating_1_Ch3
+
+SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
+	db ( $80 | CH4 )
+	dw SFX_Get_Key_Item_1_Ch1
+	db CH5
+	dw SFX_Get_Key_Item_1_Ch2
+	db CH6
+	dw SFX_Get_Key_Item_1_Ch3
+
+SFX_Poisoned_1:: ; 81c5 (2:41c5)
+	db CH4
+	dw SFX_Poisoned_1_Ch1
+
+SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
+	db CH4
+	dw SFX_Trade_Machine_1_Ch1
+
+SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
+	db CH4
+	dw SFX_Turn_On_PC_1_Ch1
+
+SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
+	db CH4
+	dw SFX_Turn_Off_PC_1_Ch1
+
+SFX_Enter_PC_1:: ; 81d1 (2:41d1)
+	db CH4
+	dw SFX_Enter_PC_1_Ch1
+
+SFX_Shrink_1:: ; 81d4 (2:41d4)
+	db CH4
+	dw SFX_Shrink_1_Ch1
+
+SFX_Switch_1:: ; 81d7 (2:41d7)
+	db CH4
+	dw SFX_Switch_1_Ch1
+
+SFX_Healing_Machine_1:: ; 81da (2:41da)
+	db CH4
+	dw SFX_Healing_Machine_1_Ch1
+
+SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
+	db CH4
+	dw SFX_Teleport_Exit1_1_Ch1
+
+SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
+	db CH4
+	dw SFX_Teleport_Enter1_1_Ch1
+
+SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
+	db CH4
+	dw SFX_Teleport_Exit2_1_Ch1
+
+SFX_Ledge_1:: ; 81e6 (2:41e6)
+	db CH4
+	dw SFX_Ledge_1_Ch1
+
+SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
+	db CH7
+	dw SFX_Teleport_Enter2_1_Ch1
+
+SFX_Fly_1:: ; 81ec (2:41ec)
+	db CH7
+	dw SFX_Fly_1_Ch1
+
+SFX_Denied_1:: ; 81ef (2:41ef)
+	db ( $40 | CH4 )
+	dw SFX_Denied_1_Ch1
+	db CH5
+	dw SFX_Denied_1_Ch2
+
+SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
+	db CH4
+	dw SFX_Arrow_Tiles_1_Ch1
+
+SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
+	db CH7
+	dw SFX_Push_Boulder_1_Ch1
+
+SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
+	db ( $40 | CH4 )
+	dw SFX_SS_Anne_Horn_1_Ch1
+	db CH5
+	dw SFX_SS_Anne_Horn_1_Ch2
+
+SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
+	db CH4
+	dw SFX_Withdraw_Deposit_1_Ch1
+
+SFX_Cut_1:: ; 8204 (2:4204)
+	db CH7
+	dw SFX_Cut_1_Ch1
+
+SFX_Go_Inside_1:: ; 8207 (2:4207)
+	db CH7
+	dw SFX_Go_Inside_1_Ch1
+
+SFX_Swap_1:: ; 820a (2:420a)
+	db ( $40 | CH4 )
+	dw SFX_Swap_1_Ch1
+	db CH5
+	dw SFX_Swap_1_Ch2
+
+SFX_59_1:: ; 8210 (2:4210)
+	db ( $40 | CH4 )
+	dw SFX_59_1_Ch1
+	db CH5
+	dw SFX_59_1_Ch2
+
+SFX_Purchase_1:: ; 8216 (2:4216)
+	db ( $40 | CH4 )
+	dw SFX_Purchase_1_Ch1
+	db CH5
+	dw SFX_Purchase_1_Ch2
+
+SFX_Collision_1:: ; 821c (2:421c)
+	db CH4
+	dw SFX_Collision_1_Ch1
+
+SFX_Go_Outside_1:: ; 821f (2:421f)
+	db CH7
+	dw SFX_Go_Outside_1_Ch1
+
+SFX_Save_1:: ; 8222 (2:4222)
+	db ( $40 | CH4 )
+	dw SFX_Save_1_Ch1
+	db CH5
+	dw SFX_Save_1_Ch2
+
+SFX_Pokeflute:: ; 8228 (2:4228)
+	db CH2
+	dw SFX_Pokeflute_Ch1
+
+SFX_Safari_Zone_PA:: ; 822b (2:422b)
+	db CH4
+	dw SFX_Safari_Zone_PA_Ch1
diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
deleted file mode 100755
index aa127123..00000000
--- a/audio/headers/sfxheaders1f.asm
+++ /dev/null
@@ -1,598 +0,0 @@
-SFX_Headers_1f::
-	db $ff, $ff, $ff ; padding
-
-SFX_1f_01:: ; 7c003 (1f:4003)
-	db CH7
-	dw SFX_1f_01_Ch1
-
-SFX_1f_02:: ; 7c006 (1f:4006)
-	db CH7
-	dw SFX_1f_02_Ch1
-
-SFX_1f_03:: ; 7c009 (1f:4009)
-	db CH7
-	dw SFX_1f_03_Ch1
-
-SFX_1f_04:: ; 7c00c (1f:400c)
-	db CH7
-	dw SFX_1f_04_Ch1
-
-SFX_1f_05:: ; 7c00f (1f:400f)
-	db CH7
-	dw SFX_1f_05_Ch1
-
-SFX_1f_06:: ; 7c012 (1f:4012)
-	db CH7
-	dw SFX_1f_06_Ch1
-
-SFX_1f_07:: ; 7c015 (1f:4015)
-	db CH7
-	dw SFX_1f_07_Ch1
-
-SFX_1f_08:: ; 7c018 (1f:4018)
-	db CH7
-	dw SFX_1f_08_Ch1
-
-SFX_1f_09:: ; 7c01b (1f:401b)
-	db CH7
-	dw SFX_1f_09_Ch1
-
-SFX_1f_0a:: ; 7c01e (1f:401e)
-	db CH7
-	dw SFX_1f_0a_Ch1
-
-SFX_1f_0b:: ; 7c021 (1f:4021)
-	db CH7
-	dw SFX_1f_0b_Ch1
-
-SFX_1f_0c:: ; 7c024 (1f:4024)
-	db CH7
-	dw SFX_1f_0c_Ch1
-
-SFX_1f_0d:: ; 7c027 (1f:4027)
-	db CH7
-	dw SFX_1f_0d_Ch1
-
-SFX_1f_0e:: ; 7c02a (1f:402a)
-	db CH7
-	dw SFX_1f_0e_Ch1
-
-SFX_1f_0f:: ; 7c02d (1f:402d)
-	db CH7
-	dw SFX_1f_0f_Ch1
-
-SFX_1f_10:: ; 7c030 (1f:4030)
-	db CH7
-	dw SFX_1f_10_Ch1
-
-SFX_1f_11:: ; 7c033 (1f:4033)
-	db CH7
-	dw SFX_1f_11_Ch1
-
-SFX_1f_12:: ; 7c036 (1f:4036)
-	db CH7
-	dw SFX_1f_12_Ch1
-
-SFX_1f_13:: ; 7c039 (1f:4039)
-	db CH7
-	dw SFX_1f_13_Ch1
-
-SFX_1f_14:: ; 7c03c (1f:403c)
-	db ( $80 | CH4 )
-	dw SFX_1f_14_Ch1
-	db CH5
-	dw SFX_1f_14_Ch2
-	db CH7
-	dw SFX_1f_14_Ch3
-
-SFX_1f_15:: ; 7c045 (1f:4045)
-	db ( $80 | CH4 )
-	dw SFX_1f_15_Ch1
-	db CH5
-	dw SFX_1f_15_Ch2
-	db CH7
-	dw SFX_1f_15_Ch3
-
-SFX_1f_16:: ; 7c04e (1f:404e)
-	db ( $80 | CH4 )
-	dw SFX_1f_16_Ch1
-	db CH5
-	dw SFX_1f_16_Ch2
-	db CH7
-	dw SFX_1f_16_Ch3
-
-SFX_1f_17:: ; 7c057 (1f:4057)
-	db ( $80 | CH4 )
-	dw SFX_1f_17_Ch1
-	db CH5
-	dw SFX_1f_17_Ch2
-	db CH7
-	dw SFX_1f_17_Ch3
-
-SFX_1f_18:: ; 7c060 (1f:4060)
-	db ( $80 | CH4 )
-	dw SFX_1f_18_Ch1
-	db CH5
-	dw SFX_1f_18_Ch2
-	db CH7
-	dw SFX_1f_18_Ch3
-
-SFX_1f_19:: ; 7c069 (1f:4069)
-	db ( $80 | CH4 )
-	dw SFX_1f_19_Ch1
-	db CH5
-	dw SFX_1f_19_Ch2
-	db CH7
-	dw SFX_1f_19_Ch3
-
-SFX_1f_1a:: ; 7c072 (1f:4072)
-	db ( $80 | CH4 )
-	dw SFX_1f_1a_Ch1
-	db CH5
-	dw SFX_1f_1a_Ch2
-	db CH7
-	dw SFX_1f_1a_Ch3
-
-SFX_1f_1b:: ; 7c07b (1f:407b)
-	db ( $80 | CH4 )
-	dw SFX_1f_1b_Ch1
-	db CH5
-	dw SFX_1f_1b_Ch2
-	db CH7
-	dw SFX_1f_1b_Ch3
-
-SFX_1f_1c:: ; 7c084 (1f:4084)
-	db ( $80 | CH4 )
-	dw SFX_1f_1c_Ch1
-	db CH5
-	dw SFX_1f_1c_Ch2
-	db CH7
-	dw SFX_1f_1c_Ch3
-
-SFX_1f_1d:: ; 7c08d (1f:408d)
-	db ( $80 | CH4 )
-	dw SFX_1f_1d_Ch1
-	db CH5
-	dw SFX_1f_1d_Ch2
-	db CH7
-	dw SFX_1f_1d_Ch3
-
-SFX_1f_1e:: ; 7c096 (1f:4096)
-	db ( $80 | CH4 )
-	dw SFX_1f_1e_Ch1
-	db CH5
-	dw SFX_1f_1e_Ch2
-	db CH7
-	dw SFX_1f_1e_Ch3
-
-SFX_1f_1f:: ; 7c09f (1f:409f)
-	db ( $80 | CH4 )
-	dw SFX_1f_1f_Ch1
-	db CH5
-	dw SFX_1f_1f_Ch2
-	db CH7
-	dw SFX_1f_1f_Ch3
-
-SFX_1f_20:: ; 7c0a8 (1f:40a8)
-	db ( $80 | CH4 )
-	dw SFX_1f_20_Ch1
-	db CH5
-	dw SFX_1f_20_Ch2
-	db CH7
-	dw SFX_1f_20_Ch3
-
-SFX_1f_21:: ; 7c0b1 (1f:40b1)
-	db ( $80 | CH4 )
-	dw SFX_1f_21_Ch1
-	db CH5
-	dw SFX_1f_21_Ch2
-	db CH7
-	dw SFX_1f_21_Ch3
-
-SFX_1f_22:: ; 7c0ba (1f:40ba)
-	db ( $80 | CH4 )
-	dw SFX_1f_22_Ch1
-	db CH5
-	dw SFX_1f_22_Ch2
-	db CH7
-	dw SFX_1f_22_Ch3
-
-SFX_1f_23:: ; 7c0c3 (1f:40c3)
-	db ( $80 | CH4 )
-	dw SFX_1f_23_Ch1
-	db CH5
-	dw SFX_1f_23_Ch2
-	db CH7
-	dw SFX_1f_23_Ch3
-
-SFX_1f_24:: ; 7c0cc (1f:40cc)
-	db ( $80 | CH4 )
-	dw SFX_1f_24_Ch1
-	db CH5
-	dw SFX_1f_24_Ch2
-	db CH7
-	dw SFX_1f_24_Ch3
-
-SFX_1f_25:: ; 7c0d5 (1f:40d5)
-	db ( $80 | CH4 )
-	dw SFX_1f_25_Ch1
-	db CH5
-	dw SFX_1f_25_Ch2
-	db CH7
-	dw SFX_1f_25_Ch3
-
-SFX_1f_26:: ; 7c0de (1f:40de)
-	db ( $80 | CH4 )
-	dw SFX_1f_26_Ch1
-	db CH5
-	dw SFX_1f_26_Ch2
-	db CH7
-	dw SFX_1f_26_Ch3
-
-SFX_1f_27:: ; 7c0e7 (1f:40e7)
-	db ( $80 | CH4 )
-	dw SFX_1f_27_Ch1
-	db CH5
-	dw SFX_1f_27_Ch2
-	db CH7
-	dw SFX_1f_27_Ch3
-
-SFX_1f_28:: ; 7c0f0 (1f:40f0)
-	db ( $80 | CH4 )
-	dw SFX_1f_28_Ch1
-	db CH5
-	dw SFX_1f_28_Ch2
-	db CH7
-	dw SFX_1f_28_Ch3
-
-SFX_1f_29:: ; 7c0f9 (1f:40f9)
-	db ( $80 | CH4 )
-	dw SFX_1f_29_Ch1
-	db CH5
-	dw SFX_1f_29_Ch2
-	db CH7
-	dw SFX_1f_29_Ch3
-
-SFX_1f_2a:: ; 7c102 (1f:4102)
-	db ( $80 | CH4 )
-	dw SFX_1f_2a_Ch1
-	db CH5
-	dw SFX_1f_2a_Ch2
-	db CH7
-	dw SFX_1f_2a_Ch3
-
-SFX_1f_2b:: ; 7c10b (1f:410b)
-	db ( $80 | CH4 )
-	dw SFX_1f_2b_Ch1
-	db CH5
-	dw SFX_1f_2b_Ch2
-	db CH7
-	dw SFX_1f_2b_Ch3
-
-SFX_1f_2c:: ; 7c114 (1f:4114)
-	db ( $80 | CH4 )
-	dw SFX_1f_2c_Ch1
-	db CH5
-	dw SFX_1f_2c_Ch2
-	db CH7
-	dw SFX_1f_2c_Ch3
-
-SFX_1f_2d:: ; 7c11d (1f:411d)
-	db ( $80 | CH4 )
-	dw SFX_1f_2d_Ch1
-	db CH5
-	dw SFX_1f_2d_Ch2
-	db CH7
-	dw SFX_1f_2d_Ch3
-
-SFX_1f_2e:: ; 7c126 (1f:4126)
-	db ( $80 | CH4 )
-	dw SFX_1f_2e_Ch1
-	db CH5
-	dw SFX_1f_2e_Ch2
-	db CH7
-	dw SFX_1f_2e_Ch3
-
-SFX_1f_2f:: ; 7c12f (1f:412f)
-	db ( $80 | CH4 )
-	dw SFX_1f_2f_Ch1
-	db CH5
-	dw SFX_1f_2f_Ch2
-	db CH7
-	dw SFX_1f_2f_Ch3
-
-SFX_1f_30:: ; 7c138 (1f:4138)
-	db ( $80 | CH4 )
-	dw SFX_1f_30_Ch1
-	db CH5
-	dw SFX_1f_30_Ch2
-	db CH7
-	dw SFX_1f_30_Ch3
-
-SFX_1f_31:: ; 7c141 (1f:4141)
-	db ( $80 | CH4 )
-	dw SFX_1f_31_Ch1
-	db CH5
-	dw SFX_1f_31_Ch2
-	db CH7
-	dw SFX_1f_31_Ch3
-
-SFX_1f_32:: ; 7c14a (1f:414a)
-	db ( $80 | CH4 )
-	dw SFX_1f_32_Ch1
-	db CH5
-	dw SFX_1f_32_Ch2
-	db CH7
-	dw SFX_1f_32_Ch3
-
-SFX_1f_33:: ; 7c153 (1f:4153)
-	db ( $80 | CH4 )
-	dw SFX_1f_33_Ch1
-	db CH5
-	dw SFX_1f_33_Ch2
-	db CH7
-	dw SFX_1f_33_Ch3
-
-SFX_1f_34:: ; 7c15c (1f:415c)
-	db ( $80 | CH4 )
-	dw SFX_1f_34_Ch1
-	db CH5
-	dw SFX_1f_34_Ch2
-	db CH7
-	dw SFX_1f_34_Ch3
-
-SFX_1f_35:: ; 7c165 (1f:4165)
-	db ( $80 | CH4 )
-	dw SFX_1f_35_Ch1
-	db CH5
-	dw SFX_1f_35_Ch2
-	db CH7
-	dw SFX_1f_35_Ch3
-
-SFX_1f_36:: ; 7c16e (1f:416e)
-	db ( $80 | CH4 )
-	dw SFX_1f_36_Ch1
-	db CH5
-	dw SFX_1f_36_Ch2
-	db CH7
-	dw SFX_1f_36_Ch3
-
-SFX_1f_37:: ; 7c177 (1f:4177)
-	db ( $80 | CH4 )
-	dw SFX_1f_37_Ch1
-	db CH5
-	dw SFX_1f_37_Ch2
-	db CH7
-	dw SFX_1f_37_Ch3
-
-SFX_1f_38:: ; 7c180 (1f:4180)
-	db ( $80 | CH4 )
-	dw SFX_1f_38_Ch1
-	db CH5
-	dw SFX_1f_38_Ch2
-	db CH7
-	dw SFX_1f_38_Ch3
-
-SFX_1f_39:: ; 7c189 (1f:4189)
-	db ( $80 | CH4 )
-	dw SFX_1f_39_Ch1
-	db CH5
-	dw SFX_1f_39_Ch2
-	db CH7
-	dw SFX_1f_39_Ch3
-
-SFX_1f_3a:: ; 7c192 (1f:4192)
-	db ( $80 | CH4 )
-	dw SFX_1f_3a_Ch1
-	db CH5
-	dw SFX_1f_3a_Ch2
-	db CH6
-	dw SFX_1f_3a_Ch3
-
-SFX_1f_3b:: ; 7c19b (1f:419b)
-	db ( $80 | CH4 )
-	dw SFX_1f_3b_Ch1
-	db CH5
-	dw SFX_1f_3b_Ch2
-	db CH6
-	dw SFX_1f_3b_Ch3
-
-SFX_1f_3c:: ; 7c1a4 (1f:41a4)
-	db CH4
-	dw SFX_1f_3c_Ch1
-
-SFX_1f_3d:: ; 7c1a7 (1f:41a7)
-	db CH4
-	dw SFX_1f_3d_Ch1
-
-SFX_1f_3e:: ; 7c1aa (1f:41aa)
-	db CH4
-	dw SFX_1f_3e_Ch1
-
-SFX_1f_3f:: ; 7c1ad (1f:41ad)
-	db CH7
-	dw SFX_1f_3f_Ch1
-
-SFX_1f_40:: ; 7c1b0 (1f:41b0)
-	db CH4
-	dw SFX_1f_40_Ch1
-
-SFX_1f_41:: ; 7c1b3 (1f:41b3)
-	db ( $80 | CH4 )
-	dw SFX_1f_41_Ch1
-	db CH5
-	dw SFX_1f_41_Ch2
-	db CH6
-	dw SFX_1f_41_Ch3
-
-SFX_1f_42:: ; 7c1bc (1f:41bc)
-	db ( $80 | CH4 )
-	dw SFX_1f_42_Ch1
-	db CH5
-	dw SFX_1f_42_Ch2
-	db CH6
-	dw SFX_1f_42_Ch3
-
-SFX_1f_43:: ; 7c1c5 (1f:41c5)
-	db CH4
-	dw SFX_1f_43_Ch1
-
-SFX_1f_44:: ; 7c1c8 (1f:41c8)
-	db CH4
-	dw SFX_1f_44_Ch1
-
-SFX_1f_45:: ; 7c1cb (1f:41cb)
-	db CH4
-	dw SFX_1f_45_Ch1
-
-SFX_1f_46:: ; 7c1ce (1f:41ce)
-	db CH4
-	dw SFX_1f_46_Ch1
-
-SFX_1f_47:: ; 7c1d1 (1f:41d1)
-	db CH4
-	dw SFX_1f_47_Ch1
-
-SFX_1f_48:: ; 7c1d4 (1f:41d4)
-	db CH4
-	dw SFX_1f_48_Ch1
-
-SFX_1f_49:: ; 7c1d7 (1f:41d7)
-	db CH4
-	dw SFX_1f_49_Ch1
-
-SFX_1f_4a:: ; 7c1da (1f:41da)
-	db CH4
-	dw SFX_1f_4a_Ch1
-
-SFX_1f_4b:: ; 7c1dd (1f:41dd)
-	db CH4
-	dw SFX_1f_4b_Ch1
-
-SFX_1f_4c:: ; 7c1e0 (1f:41e0)
-	db CH4
-	dw SFX_1f_4c_Ch1
-
-SFX_1f_4d:: ; 7c1e3 (1f:41e3)
-	db CH4
-	dw SFX_1f_4d_Ch1
-
-SFX_1f_4e:: ; 7c1e6 (1f:41e6)
-	db CH4
-	dw SFX_1f_4e_Ch1
-
-SFX_1f_4f:: ; 7c1e9 (1f:41e9)
-	db CH7
-	dw SFX_1f_4f_Ch1
-
-SFX_1f_50:: ; 7c1ec (1f:41ec)
-	db CH7
-	dw SFX_1f_50_Ch1
-
-SFX_1f_51:: ; 7c1ef (1f:41ef)
-	db ( $40 | CH4 )
-	dw SFX_1f_51_Ch1
-	db CH5
-	dw SFX_1f_51_Ch2
-
-SFX_1f_52:: ; 7c1f5 (1f:41f5)
-	db CH4
-	dw SFX_1f_52_Ch1
-
-SFX_1f_53:: ; 7c1f8 (1f:41f8)
-	db CH7
-	dw SFX_1f_53_Ch1
-
-SFX_1f_54:: ; 7c1fb (1f:41fb)
-	db ( $40 | CH4 )
-	dw SFX_1f_54_Ch1
-	db CH5
-	dw SFX_1f_54_Ch2
-
-SFX_1f_55:: ; 7c201 (1f:4201)
-	db CH4
-	dw SFX_1f_55_Ch1
-
-SFX_1f_56:: ; 7c204 (1f:4204)
-	db CH7
-	dw SFX_1f_56_Ch1
-
-SFX_1f_57:: ; 7c207 (1f:4207)
-	db CH7
-	dw SFX_1f_57_Ch1
-
-SFX_1f_58:: ; 7c20a (1f:420a)
-	db ( $40 | CH4 )
-	dw SFX_1f_58_Ch1
-	db CH5
-	dw SFX_1f_58_Ch2
-
-SFX_1f_59:: ; 7c210 (1f:4210)
-	db ( $40 | CH4 )
-	dw SFX_1f_59_Ch1
-	db CH5
-	dw SFX_1f_59_Ch2
-
-SFX_1f_5a:: ; 7c216 (1f:4216)
-	db ( $40 | CH4 )
-	dw SFX_1f_5a_Ch1
-	db CH5
-	dw SFX_1f_5a_Ch2
-
-SFX_1f_5b:: ; 7c21c (1f:421c)
-	db CH4
-	dw SFX_1f_5b_Ch1
-
-SFX_1f_5c:: ; 7c21f (1f:421f)
-	db CH7
-	dw SFX_1f_5c_Ch1
-
-SFX_1f_5d:: ; 7c222 (1f:4222)
-	db ( $40 | CH4 )
-	dw SFX_1f_5d_Ch1
-	db CH5
-	dw SFX_1f_5d_Ch2
-
-SFX_1f_5e:: ; 7c228 (1f:4228)
-	db CH7
-	dw SFX_1f_5e_Ch1
-
-SFX_1f_5f:: ; 7c22b (1f:422b)
-	db CH4
-	dw SFX_1f_5f_Ch1
-
-SFX_1f_60:: ; 7c22e (1f:422e)
-	db CH4
-	dw SFX_1f_60_Ch1
-
-SFX_1f_61:: ; 7c231 (1f:4231)
-	db CH7
-	dw SFX_1f_61_Ch1
-
-SFX_1f_62:: ; 7c234 (1f:4234)
-	db CH7
-	dw SFX_1f_62_Ch1
-
-SFX_1f_63:: ; 7c237 (1f:4237)
-	db CH7
-	dw SFX_1f_63_Ch1
-
-SFX_1f_64:: ; 7c23a (1f:423a)
-	db CH4
-	dw SFX_1f_64_Ch1
-
-SFX_1f_65:: ; 7c23d (1f:423d)
-	db CH4
-	dw SFX_1f_65_Ch1
-
-SFX_1f_66:: ; 7c240 (1f:4240)
-	db ( $40 | CH4 )
-	dw SFX_1f_66_Ch1
-	db CH5
-	dw SFX_1f_66_Ch2
-
-SFX_1f_67:: ; 7c246 (1f:4246)
-	db CH4
-	dw SFX_1f_67_Ch1
-
-; 0x7c249
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
new file mode 100644
index 00000000..1b30f5cc
--- /dev/null
+++ b/audio/headers/sfxheaders2.asm
@@ -0,0 +1,706 @@
+SFX_Headers_2::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_2:: ; 20003 (8:4003)
+	db CH7
+	dw SFX_Snare1_2_Ch1
+
+SFX_Snare2_2:: ; 20006 (8:4006)
+	db CH7
+	dw SFX_Snare2_2_Ch1
+
+SFX_Snare3_2:: ; 20009 (8:4009)
+	db CH7
+	dw SFX_Snare3_2_Ch1
+
+SFX_Snare4_2:: ; 2000c (8:400c)
+	db CH7
+	dw SFX_Snare4_2_Ch1
+
+SFX_Snare5_2:: ; 2000f (8:400f)
+	db CH7
+	dw SFX_Snare5_2_Ch1
+
+SFX_Triangle1_2:: ; 20012 (8:4012)
+	db CH7
+	dw SFX_Triangle1_2_Ch1
+
+SFX_Triangle2_2:: ; 20015 (8:4015)
+	db CH7
+	dw SFX_Triangle2_2_Ch1
+
+SFX_Snare6_2:: ; 20018 (8:4018)
+	db CH7
+	dw SFX_Snare6_2_Ch1
+
+SFX_Snare7_2:: ; 2001b (8:401b)
+	db CH7
+	dw SFX_Snare7_2_Ch1
+
+SFX_Snare8_2:: ; 2001e (8:401e)
+	db CH7
+	dw SFX_Snare8_2_Ch1
+
+SFX_Snare9_2:: ; 20021 (8:4021)
+	db CH7
+	dw SFX_Snare9_2_Ch1
+
+SFX_Cymbal1_2:: ; 20024 (8:4024)
+	db CH7
+	dw SFX_Cymbal1_2_Ch1
+
+SFX_Cymbal2_2:: ; 20027 (8:4027)
+	db CH7
+	dw SFX_Cymbal2_2_Ch1
+
+SFX_Cymbal3_2:: ; 2002a (8:402a)
+	db CH7
+	dw SFX_Cymbal3_2_Ch1
+
+SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+	db CH7
+	dw SFX_Muted_Snare1_2_Ch1
+
+SFX_Triangle3_2:: ; 20030 (8:4030)
+	db CH7
+	dw SFX_Triangle3_2_Ch1
+
+SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+	db CH7
+	dw SFX_Muted_Snare2_2_Ch1
+
+SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+	db CH7
+	dw SFX_Muted_Snare3_2_Ch1
+
+SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+	db CH7
+	dw SFX_Muted_Snare4_2_Ch1
+
+SFX_Cry00_2:: ; 2003c (8:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_2_Ch1
+	db CH5
+	dw SFX_Cry00_2_Ch2
+	db CH7
+	dw SFX_Cry00_2_Ch3
+
+SFX_Cry01_2:: ; 20045 (8:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_2_Ch1
+	db CH5
+	dw SFX_Cry01_2_Ch2
+	db CH7
+	dw SFX_Cry01_2_Ch3
+
+SFX_Cry02_2:: ; 2004e (8:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_2_Ch1
+	db CH5
+	dw SFX_Cry02_2_Ch2
+	db CH7
+	dw SFX_Cry02_2_Ch3
+
+SFX_Cry03_2:: ; 20057 (8:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_2_Ch1
+	db CH5
+	dw SFX_Cry03_2_Ch2
+	db CH7
+	dw SFX_Cry03_2_Ch3
+
+SFX_Cry04_2:: ; 20060 (8:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_2_Ch1
+	db CH5
+	dw SFX_Cry04_2_Ch2
+	db CH7
+	dw SFX_Cry04_2_Ch3
+
+SFX_Cry05_2:: ; 20069 (8:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_2_Ch1
+	db CH5
+	dw SFX_Cry05_2_Ch2
+	db CH7
+	dw SFX_Cry05_2_Ch3
+
+SFX_Cry06_2:: ; 20072 (8:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_2_Ch1
+	db CH5
+	dw SFX_Cry06_2_Ch2
+	db CH7
+	dw SFX_Cry06_2_Ch3
+
+SFX_Cry07_2:: ; 2007b (8:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_2_Ch1
+	db CH5
+	dw SFX_Cry07_2_Ch2
+	db CH7
+	dw SFX_Cry07_2_Ch3
+
+SFX_Cry08_2:: ; 20084 (8:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_2_Ch1
+	db CH5
+	dw SFX_Cry08_2_Ch2
+	db CH7
+	dw SFX_Cry08_2_Ch3
+
+SFX_Cry09_2:: ; 2008d (8:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_2_Ch1
+	db CH5
+	dw SFX_Cry09_2_Ch2
+	db CH7
+	dw SFX_Cry09_2_Ch3
+
+SFX_Cry0A_2:: ; 20096 (8:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_2_Ch1
+	db CH5
+	dw SFX_Cry0A_2_Ch2
+	db CH7
+	dw SFX_Cry0A_2_Ch3
+
+SFX_Cry0B_2:: ; 2009f (8:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_2_Ch1
+	db CH5
+	dw SFX_Cry0B_2_Ch2
+	db CH7
+	dw SFX_Cry0B_2_Ch3
+
+SFX_Cry0C_2:: ; 200a8 (8:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_2_Ch1
+	db CH5
+	dw SFX_Cry0C_2_Ch2
+	db CH7
+	dw SFX_Cry0C_2_Ch3
+
+SFX_Cry0D_2:: ; 200b1 (8:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_2_Ch1
+	db CH5
+	dw SFX_Cry0D_2_Ch2
+	db CH7
+	dw SFX_Cry0D_2_Ch3
+
+SFX_Cry0E_2:: ; 200ba (8:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_2_Ch1
+	db CH5
+	dw SFX_Cry0E_2_Ch2
+	db CH7
+	dw SFX_Cry0E_2_Ch3
+
+SFX_Cry0F_2:: ; 200c3 (8:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_2_Ch1
+	db CH5
+	dw SFX_Cry0F_2_Ch2
+	db CH7
+	dw SFX_Cry0F_2_Ch3
+
+SFX_Cry10_2:: ; 200cc (8:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_2_Ch1
+	db CH5
+	dw SFX_Cry10_2_Ch2
+	db CH7
+	dw SFX_Cry10_2_Ch3
+
+SFX_Cry11_2:: ; 200d5 (8:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_2_Ch1
+	db CH5
+	dw SFX_Cry11_2_Ch2
+	db CH7
+	dw SFX_Cry11_2_Ch3
+
+SFX_Cry12_2:: ; 200de (8:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_2_Ch1
+	db CH5
+	dw SFX_Cry12_2_Ch2
+	db CH7
+	dw SFX_Cry12_2_Ch3
+
+SFX_Cry13_2:: ; 200e7 (8:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_2_Ch1
+	db CH5
+	dw SFX_Cry13_2_Ch2
+	db CH7
+	dw SFX_Cry13_2_Ch3
+
+SFX_Cry14_2:: ; 200f0 (8:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_2_Ch1
+	db CH5
+	dw SFX_Cry14_2_Ch2
+	db CH7
+	dw SFX_Cry14_2_Ch3
+
+SFX_Cry15_2:: ; 200f9 (8:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_2_Ch1
+	db CH5
+	dw SFX_Cry15_2_Ch2
+	db CH7
+	dw SFX_Cry15_2_Ch3
+
+SFX_Cry16_2:: ; 20102 (8:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_2_Ch1
+	db CH5
+	dw SFX_Cry16_2_Ch2
+	db CH7
+	dw SFX_Cry16_2_Ch3
+
+SFX_Cry17_2:: ; 2010b (8:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_2_Ch1
+	db CH5
+	dw SFX_Cry17_2_Ch2
+	db CH7
+	dw SFX_Cry17_2_Ch3
+
+SFX_Cry18_2:: ; 20114 (8:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_2_Ch1
+	db CH5
+	dw SFX_Cry18_2_Ch2
+	db CH7
+	dw SFX_Cry18_2_Ch3
+
+SFX_Cry19_2:: ; 2011d (8:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_2_Ch1
+	db CH5
+	dw SFX_Cry19_2_Ch2
+	db CH7
+	dw SFX_Cry19_2_Ch3
+
+SFX_Cry1A_2:: ; 20126 (8:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_2_Ch1
+	db CH5
+	dw SFX_Cry1A_2_Ch2
+	db CH7
+	dw SFX_Cry1A_2_Ch3
+
+SFX_Cry1B_2:: ; 2012f (8:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_2_Ch1
+	db CH5
+	dw SFX_Cry1B_2_Ch2
+	db CH7
+	dw SFX_Cry1B_2_Ch3
+
+SFX_Cry1C_2:: ; 20138 (8:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_2_Ch1
+	db CH5
+	dw SFX_Cry1C_2_Ch2
+	db CH7
+	dw SFX_Cry1C_2_Ch3
+
+SFX_Cry1D_2:: ; 20141 (8:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_2_Ch1
+	db CH5
+	dw SFX_Cry1D_2_Ch2
+	db CH7
+	dw SFX_Cry1D_2_Ch3
+
+SFX_Cry1E_2:: ; 2014a (8:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_2_Ch1
+	db CH5
+	dw SFX_Cry1E_2_Ch2
+	db CH7
+	dw SFX_Cry1E_2_Ch3
+
+SFX_Cry1F_2:: ; 20153 (8:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_2_Ch1
+	db CH5
+	dw SFX_Cry1F_2_Ch2
+	db CH7
+	dw SFX_Cry1F_2_Ch3
+
+SFX_Cry20_2:: ; 2015c (8:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_2_Ch1
+	db CH5
+	dw SFX_Cry20_2_Ch2
+	db CH7
+	dw SFX_Cry20_2_Ch3
+
+SFX_Cry21_2:: ; 20165 (8:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_2_Ch1
+	db CH5
+	dw SFX_Cry21_2_Ch2
+	db CH7
+	dw SFX_Cry21_2_Ch3
+
+SFX_Cry22_2:: ; 2016e (8:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_2_Ch1
+	db CH5
+	dw SFX_Cry22_2_Ch2
+	db CH7
+	dw SFX_Cry22_2_Ch3
+
+SFX_Cry23_2:: ; 20177 (8:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_2_Ch1
+	db CH5
+	dw SFX_Cry23_2_Ch2
+	db CH7
+	dw SFX_Cry23_2_Ch3
+
+SFX_Cry24_2:: ; 20180 (8:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_2_Ch1
+	db CH5
+	dw SFX_Cry24_2_Ch2
+	db CH7
+	dw SFX_Cry24_2_Ch3
+
+SFX_Cry25_2:: ; 20189 (8:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_2_Ch1
+	db CH5
+	dw SFX_Cry25_2_Ch2
+	db CH7
+	dw SFX_Cry25_2_Ch3
+
+SFX_Level_Up:: ; 20192 (8:4192)
+	db ( $80 | CH4 )
+	dw SFX_Level_Up_Ch1
+	db CH5
+	dw SFX_Level_Up_Ch2
+	db CH6
+	dw SFX_Level_Up_Ch3
+
+SFX_Get_Item2_2:: ; 2019b (8:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_2_Ch1
+	db CH5
+	dw SFX_Get_Item2_2_Ch2
+	db CH6
+	dw SFX_Get_Item2_2_Ch3
+
+SFX_Tink_2:: ; 201a4 (8:41a4)
+	db CH4
+	dw SFX_Tink_2_Ch1
+
+SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+	db CH4
+	dw SFX_Heal_HP_2_Ch1
+
+SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_2_Ch1
+
+SFX_Start_Menu_2:: ; 201ad (8:41ad)
+	db CH7
+	dw SFX_Start_Menu_2_Ch1
+
+SFX_Press_AB_2:: ; 201b0 (8:41b0)
+	db CH4
+	dw SFX_Press_AB_2_Ch1
+
+SFX_Ball_Toss:: ; 201b3 (8:41b3)
+	db ( $40 | CH4 )
+	dw SFX_Ball_Toss_Ch1
+	db CH5
+	dw SFX_Ball_Toss_Ch2
+
+SFX_Ball_Poof:: ; 201b9 (8:41b9)
+	db ( $40 | CH4 )
+	dw SFX_Ball_Poof_Ch1
+	db CH7
+	dw SFX_Ball_Poof_Ch2
+
+SFX_Faint_Thud:: ; 201bf (8:41bf)
+	db ( $40 | CH4 )
+	dw SFX_Faint_Thud_Ch1
+	db CH7
+	dw SFX_Faint_Thud_Ch2
+
+SFX_Run:: ; 201c5 (8:41c5)
+	db CH7
+	dw SFX_Run_Ch1
+
+SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+	db ( $40 | CH4 )
+	dw SFX_Dex_Page_Added_Ch1
+	db CH5
+	dw SFX_Dex_Page_Added_Ch2
+
+SFX_Caught_Mon:: ; 201ce (8:41ce)
+	db ( $80 | CH4 )
+	dw SFX_Caught_Mon_Ch1
+	db CH5
+	dw SFX_Caught_Mon_Ch2
+	db CH6
+	dw SFX_Caught_Mon_Ch3
+
+SFX_Peck:: ; 201d7 (8:41d7)
+	db CH7
+	dw SFX_Peck_Ch1
+
+SFX_Faint_Fall:: ; 201da (8:41da)
+	db CH4
+	dw SFX_Faint_Fall_Ch1
+
+SFX_Battle_09:: ; 201dd (8:41dd)
+	db CH4
+	dw SFX_Battle_09_Ch1
+
+SFX_Pound:: ; 201e0 (8:41e0)
+	db CH7
+	dw SFX_Pound_Ch1
+
+SFX_Battle_0B:: ; 201e3 (8:41e3)
+	db CH7
+	dw SFX_Battle_0B_Ch1
+
+SFX_Battle_0C:: ; 201e6 (8:41e6)
+	db CH7
+	dw SFX_Battle_0C_Ch1
+
+SFX_Battle_0D:: ; 201e9 (8:41e9)
+	db CH7
+	dw SFX_Battle_0D_Ch1
+
+SFX_Battle_0E:: ; 201ec (8:41ec)
+	db CH7
+	dw SFX_Battle_0E_Ch1
+
+SFX_Battle_0F:: ; 201ef (8:41ef)
+	db CH7
+	dw SFX_Battle_0F_Ch1
+
+SFX_Damage:: ; 201f2 (8:41f2)
+	db CH7
+	dw SFX_Damage_Ch1
+
+SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+	db CH7
+	dw SFX_Not_Very_Effective_Ch1
+
+SFX_Battle_12:: ; 201f8 (8:41f8)
+	db CH7
+	dw SFX_Battle_12_Ch1
+
+SFX_Battle_13:: ; 201fb (8:41fb)
+	db CH7
+	dw SFX_Battle_13_Ch1
+
+SFX_Battle_14:: ; 201fe (8:41fe)
+	db CH7
+	dw SFX_Battle_14_Ch1
+
+SFX_Vine_Whip:: ; 20201 (8:4201)
+	db CH7
+	dw SFX_Vine_Whip_Ch1
+
+SFX_Battle_16:: ; 20204 (8:4204)
+	db CH7
+	dw SFX_Battle_16_Ch1
+
+SFX_Battle_17:: ; 20207 (8:4207)
+	db CH7
+	dw SFX_Battle_17_Ch1
+
+SFX_Battle_18:: ; 2020a (8:420a)
+	db CH7
+	dw SFX_Battle_18_Ch1
+
+SFX_Battle_19:: ; 2020d (8:420d)
+	db CH7
+	dw SFX_Battle_19_Ch1
+
+SFX_Super_Effective:: ; 20210 (8:4210)
+	db CH7
+	dw SFX_Super_Effective_Ch1
+
+SFX_Battle_1B:: ; 20213 (8:4213)
+	db CH7
+	dw SFX_Battle_1B_Ch1
+
+SFX_Battle_1C:: ; 20216 (8:4216)
+	db CH7
+	dw SFX_Battle_1C_Ch1
+
+SFX_Doubleslap:: ; 20219 (8:4219)
+	db CH7
+	dw SFX_Doubleslap_Ch1
+
+SFX_Battle_1E:: ; 2021c (8:421c)
+	db ( $40 | CH4 )
+	dw SFX_Battle_1E_Ch1
+	db CH7
+	dw SFX_Battle_1E_Ch2
+
+SFX_Horn_Drill:: ; 20222 (8:4222)
+	db CH7
+	dw SFX_Horn_Drill_Ch1
+
+SFX_Battle_20:: ; 20225 (8:4225)
+	db CH7
+	dw SFX_Battle_20_Ch1
+
+SFX_Battle_21:: ; 20228 (8:4228)
+	db CH7
+	dw SFX_Battle_21_Ch1
+
+SFX_Battle_22:: ; 2022b (8:422b)
+	db CH7
+	dw SFX_Battle_22_Ch1
+
+SFX_Battle_23:: ; 2022e (8:422e)
+	db CH7
+	dw SFX_Battle_23_Ch1
+
+SFX_Battle_24:: ; 20231 (8:4231)
+	db ( $40 | CH4 )
+	dw SFX_Battle_24_Ch1
+	db CH7
+	dw SFX_Battle_24_Ch2
+
+SFX_Battle_25:: ; 20237 (8:4237)
+	db CH7
+	dw SFX_Battle_25_Ch1
+
+SFX_Battle_26:: ; 2023a (8:423a)
+	db CH7
+	dw SFX_Battle_26_Ch1
+
+SFX_Battle_27:: ; 2023d (8:423d)
+	db ( $80 | CH4 )
+	dw SFX_Battle_27_Ch1
+	db CH5
+	dw SFX_Battle_27_Ch2
+	db CH7
+	dw SFX_Battle_27_Ch3
+
+SFX_Battle_28:: ; 20246 (8:4246)
+	db ( $80 | CH4 )
+	dw SFX_Battle_28_Ch1
+	db CH5
+	dw SFX_Battle_28_Ch2
+	db CH7
+	dw SFX_Battle_28_Ch3
+
+SFX_Battle_29:: ; 2024f (8:424f)
+	db ( $40 | CH4 )
+	dw SFX_Battle_29_Ch1
+	db CH7
+	dw SFX_Battle_29_Ch2
+
+SFX_Battle_2A:: ; 20255 (8:4255)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2A_Ch1
+	db CH5
+	dw SFX_Battle_2A_Ch2
+	db CH7
+	dw SFX_Battle_2A_Ch3
+
+SFX_Battle_2B:: ; 2025e (8:425e)
+	db ( $40 | CH4 )
+	dw SFX_Battle_2B_Ch1
+	db CH7
+	dw SFX_Battle_2B_Ch2
+
+SFX_Battle_2C:: ; 20264 (8:4264)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2C_Ch1
+	db CH5
+	dw SFX_Battle_2C_Ch2
+	db CH7
+	dw SFX_Battle_2C_Ch3
+
+SFX_Psybeam:: ; 2026d (8:426d)
+	db ( $80 | CH4 )
+	dw SFX_Psybeam_Ch1
+	db CH5
+	dw SFX_Psybeam_Ch2
+	db CH7
+	dw SFX_Psybeam_Ch3
+
+SFX_Battle_2E:: ; 20276 (8:4276)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2E_Ch1
+	db CH5
+	dw SFX_Battle_2E_Ch2
+	db CH7
+	dw SFX_Battle_2E_Ch3
+
+SFX_Battle_2F:: ; 2027f (8:427f)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2F_Ch1
+	db CH5
+	dw SFX_Battle_2F_Ch2
+	db CH7
+	dw SFX_Battle_2F_Ch3
+
+SFX_Psychic_M:: ; 20288 (8:4288)
+	db ( $80 | CH4 )
+	dw SFX_Psychic_M_Ch1
+	db CH5
+	dw SFX_Psychic_M_Ch2
+	db CH7
+	dw SFX_Psychic_M_Ch3
+
+SFX_Battle_31:: ; 20291 (8:4291)
+	db ( $40 | CH4 )
+	dw SFX_Battle_31_Ch1
+	db CH5
+	dw SFX_Battle_31_Ch2
+
+SFX_Battle_32:: ; 20297 (8:4297)
+	db ( $40 | CH4 )
+	dw SFX_Battle_32_Ch1
+	db CH5
+	dw SFX_Battle_32_Ch2
+
+SFX_Battle_33:: ; 2029d (8:429d)
+	db ( $40 | CH4 )
+	dw SFX_Battle_33_Ch1
+	db CH5
+	dw SFX_Battle_33_Ch2
+
+SFX_Battle_34:: ; 202a3 (8:42a3)
+	db ( $80 | CH4 )
+	dw SFX_Battle_34_Ch1
+	db CH5
+	dw SFX_Battle_34_Ch2
+	db CH7
+	dw SFX_Battle_34_Ch3
+
+SFX_Battle_35:: ; 202ac (8:42ac)
+	db ( $40 | CH4 )
+	dw SFX_Battle_35_Ch1
+	db CH5
+	dw SFX_Battle_35_Ch2
+
+SFX_Battle_36:: ; 202b2 (8:42b2)
+	db ( $80 | CH4 )
+	dw SFX_Battle_36_Ch1
+	db CH5
+	dw SFX_Battle_36_Ch2
+	db CH7
+	dw SFX_Battle_36_Ch3
+
+SFX_Silph_Scope:: ; 202bb (8:42bb)
+	db CH4
+	dw SFX_Silph_Scope_Ch1
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
new file mode 100644
index 00000000..321a33f5
--- /dev/null
+++ b/audio/headers/sfxheaders3.asm
@@ -0,0 +1,596 @@
+SFX_Headers_3::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_3:: ; 7c003 (1f:4003)
+	db CH7
+	dw SFX_Snare1_3_Ch1
+
+SFX_Snare2_3:: ; 7c006 (1f:4006)
+	db CH7
+	dw SFX_Snare2_3_Ch1
+
+SFX_Snare3_3:: ; 7c009 (1f:4009)
+	db CH7
+	dw SFX_Snare3_3_Ch1
+
+SFX_Snare4_3:: ; 7c00c (1f:400c)
+	db CH7
+	dw SFX_Snare4_3_Ch1
+
+SFX_Snare5_3:: ; 7c00f (1f:400f)
+	db CH7
+	dw SFX_Snare5_3_Ch1
+
+SFX_Triangle1_3:: ; 7c012 (1f:4012)
+	db CH7
+	dw SFX_Triangle1_3_Ch1
+
+SFX_Triangle2_3:: ; 7c015 (1f:4015)
+	db CH7
+	dw SFX_Triangle2_3_Ch1
+
+SFX_Snare6_3:: ; 7c018 (1f:4018)
+	db CH7
+	dw SFX_Snare6_3_Ch1
+
+SFX_Snare7_3:: ; 7c01b (1f:401b)
+	db CH7
+	dw SFX_Snare7_3_Ch1
+
+SFX_Snare8_3:: ; 7c01e (1f:401e)
+	db CH7
+	dw SFX_Snare8_3_Ch1
+
+SFX_Snare9_3:: ; 7c021 (1f:4021)
+	db CH7
+	dw SFX_Snare9_3_Ch1
+
+SFX_Cymbal1_3:: ; 7c024 (1f:4024)
+	db CH7
+	dw SFX_Cymbal1_3_Ch1
+
+SFX_Cymbal2_3:: ; 7c027 (1f:4027)
+	db CH7
+	dw SFX_Cymbal2_3_Ch1
+
+SFX_Cymbal3_3:: ; 7c02a (1f:402a)
+	db CH7
+	dw SFX_Cymbal3_3_Ch1
+
+SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
+	db CH7
+	dw SFX_Muted_Snare1_3_Ch1
+
+SFX_Triangle3_3:: ; 7c030 (1f:4030)
+	db CH7
+	dw SFX_Triangle3_3_Ch1
+
+SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
+	db CH7
+	dw SFX_Muted_Snare2_3_Ch1
+
+SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
+	db CH7
+	dw SFX_Muted_Snare3_3_Ch1
+
+SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
+	db CH7
+	dw SFX_Muted_Snare4_3_Ch1
+
+SFX_Cry00_3:: ; 7c03c (1f:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_3_Ch1
+	db CH5
+	dw SFX_Cry00_3_Ch2
+	db CH7
+	dw SFX_Cry00_3_Ch3
+
+SFX_Cry01_3:: ; 7c045 (1f:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_3_Ch1
+	db CH5
+	dw SFX_Cry01_3_Ch2
+	db CH7
+	dw SFX_Cry01_3_Ch3
+
+SFX_Cry02_3:: ; 7c04e (1f:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_3_Ch1
+	db CH5
+	dw SFX_Cry02_3_Ch2
+	db CH7
+	dw SFX_Cry02_3_Ch3
+
+SFX_Cry03_3:: ; 7c057 (1f:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_3_Ch1
+	db CH5
+	dw SFX_Cry03_3_Ch2
+	db CH7
+	dw SFX_Cry03_3_Ch3
+
+SFX_Cry04_3:: ; 7c060 (1f:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_3_Ch1
+	db CH5
+	dw SFX_Cry04_3_Ch2
+	db CH7
+	dw SFX_Cry04_3_Ch3
+
+SFX_Cry05_3:: ; 7c069 (1f:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_3_Ch1
+	db CH5
+	dw SFX_Cry05_3_Ch2
+	db CH7
+	dw SFX_Cry05_3_Ch3
+
+SFX_Cry06_3:: ; 7c072 (1f:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_3_Ch1
+	db CH5
+	dw SFX_Cry06_3_Ch2
+	db CH7
+	dw SFX_Cry06_3_Ch3
+
+SFX_Cry07_3:: ; 7c07b (1f:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_3_Ch1
+	db CH5
+	dw SFX_Cry07_3_Ch2
+	db CH7
+	dw SFX_Cry07_3_Ch3
+
+SFX_Cry08_3:: ; 7c084 (1f:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_3_Ch1
+	db CH5
+	dw SFX_Cry08_3_Ch2
+	db CH7
+	dw SFX_Cry08_3_Ch3
+
+SFX_Cry09_3:: ; 7c08d (1f:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_3_Ch1
+	db CH5
+	dw SFX_Cry09_3_Ch2
+	db CH7
+	dw SFX_Cry09_3_Ch3
+
+SFX_Cry0A_3:: ; 7c096 (1f:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_3_Ch1
+	db CH5
+	dw SFX_Cry0A_3_Ch2
+	db CH7
+	dw SFX_Cry0A_3_Ch3
+
+SFX_Cry0B_3:: ; 7c09f (1f:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_3_Ch1
+	db CH5
+	dw SFX_Cry0B_3_Ch2
+	db CH7
+	dw SFX_Cry0B_3_Ch3
+
+SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_3_Ch1
+	db CH5
+	dw SFX_Cry0C_3_Ch2
+	db CH7
+	dw SFX_Cry0C_3_Ch3
+
+SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_3_Ch1
+	db CH5
+	dw SFX_Cry0D_3_Ch2
+	db CH7
+	dw SFX_Cry0D_3_Ch3
+
+SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_3_Ch1
+	db CH5
+	dw SFX_Cry0E_3_Ch2
+	db CH7
+	dw SFX_Cry0E_3_Ch3
+
+SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_3_Ch1
+	db CH5
+	dw SFX_Cry0F_3_Ch2
+	db CH7
+	dw SFX_Cry0F_3_Ch3
+
+SFX_Cry10_3:: ; 7c0cc (1f:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_3_Ch1
+	db CH5
+	dw SFX_Cry10_3_Ch2
+	db CH7
+	dw SFX_Cry10_3_Ch3
+
+SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_3_Ch1
+	db CH5
+	dw SFX_Cry11_3_Ch2
+	db CH7
+	dw SFX_Cry11_3_Ch3
+
+SFX_Cry12_3:: ; 7c0de (1f:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_3_Ch1
+	db CH5
+	dw SFX_Cry12_3_Ch2
+	db CH7
+	dw SFX_Cry12_3_Ch3
+
+SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_3_Ch1
+	db CH5
+	dw SFX_Cry13_3_Ch2
+	db CH7
+	dw SFX_Cry13_3_Ch3
+
+SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_3_Ch1
+	db CH5
+	dw SFX_Cry14_3_Ch2
+	db CH7
+	dw SFX_Cry14_3_Ch3
+
+SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_3_Ch1
+	db CH5
+	dw SFX_Cry15_3_Ch2
+	db CH7
+	dw SFX_Cry15_3_Ch3
+
+SFX_Cry16_3:: ; 7c102 (1f:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_3_Ch1
+	db CH5
+	dw SFX_Cry16_3_Ch2
+	db CH7
+	dw SFX_Cry16_3_Ch3
+
+SFX_Cry17_3:: ; 7c10b (1f:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_3_Ch1
+	db CH5
+	dw SFX_Cry17_3_Ch2
+	db CH7
+	dw SFX_Cry17_3_Ch3
+
+SFX_Cry18_3:: ; 7c114 (1f:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_3_Ch1
+	db CH5
+	dw SFX_Cry18_3_Ch2
+	db CH7
+	dw SFX_Cry18_3_Ch3
+
+SFX_Cry19_3:: ; 7c11d (1f:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_3_Ch1
+	db CH5
+	dw SFX_Cry19_3_Ch2
+	db CH7
+	dw SFX_Cry19_3_Ch3
+
+SFX_Cry1A_3:: ; 7c126 (1f:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_3_Ch1
+	db CH5
+	dw SFX_Cry1A_3_Ch2
+	db CH7
+	dw SFX_Cry1A_3_Ch3
+
+SFX_Cry1B_3:: ; 7c12f (1f:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_3_Ch1
+	db CH5
+	dw SFX_Cry1B_3_Ch2
+	db CH7
+	dw SFX_Cry1B_3_Ch3
+
+SFX_Cry1C_3:: ; 7c138 (1f:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_3_Ch1
+	db CH5
+	dw SFX_Cry1C_3_Ch2
+	db CH7
+	dw SFX_Cry1C_3_Ch3
+
+SFX_Cry1D_3:: ; 7c141 (1f:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_3_Ch1
+	db CH5
+	dw SFX_Cry1D_3_Ch2
+	db CH7
+	dw SFX_Cry1D_3_Ch3
+
+SFX_Cry1E_3:: ; 7c14a (1f:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_3_Ch1
+	db CH5
+	dw SFX_Cry1E_3_Ch2
+	db CH7
+	dw SFX_Cry1E_3_Ch3
+
+SFX_Cry1F_3:: ; 7c153 (1f:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_3_Ch1
+	db CH5
+	dw SFX_Cry1F_3_Ch2
+	db CH7
+	dw SFX_Cry1F_3_Ch3
+
+SFX_Cry20_3:: ; 7c15c (1f:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_3_Ch1
+	db CH5
+	dw SFX_Cry20_3_Ch2
+	db CH7
+	dw SFX_Cry20_3_Ch3
+
+SFX_Cry21_3:: ; 7c165 (1f:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_3_Ch1
+	db CH5
+	dw SFX_Cry21_3_Ch2
+	db CH7
+	dw SFX_Cry21_3_Ch3
+
+SFX_Cry22_3:: ; 7c16e (1f:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_3_Ch1
+	db CH5
+	dw SFX_Cry22_3_Ch2
+	db CH7
+	dw SFX_Cry22_3_Ch3
+
+SFX_Cry23_3:: ; 7c177 (1f:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_3_Ch1
+	db CH5
+	dw SFX_Cry23_3_Ch2
+	db CH7
+	dw SFX_Cry23_3_Ch3
+
+SFX_Cry24_3:: ; 7c180 (1f:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_3_Ch1
+	db CH5
+	dw SFX_Cry24_3_Ch2
+	db CH7
+	dw SFX_Cry24_3_Ch3
+
+SFX_Cry25_3:: ; 7c189 (1f:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_3_Ch1
+	db CH5
+	dw SFX_Cry25_3_Ch2
+	db CH7
+	dw SFX_Cry25_3_Ch3
+
+SFX_Get_Item1_3:: ; 7c192 (1f:4192)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item1_3_Ch1
+	db CH5
+	dw SFX_Get_Item1_3_Ch2
+	db CH6
+	dw SFX_Get_Item1_3_Ch3
+
+SFX_Get_Item2_3:: ; 7c19b (1f:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_3_Ch1
+	db CH5
+	dw SFX_Get_Item2_3_Ch2
+	db CH6
+	dw SFX_Get_Item2_3_Ch3
+
+SFX_Tink_3:: ; 7c1a4 (1f:41a4)
+	db CH4
+	dw SFX_Tink_3_Ch1
+
+SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
+	db CH4
+	dw SFX_Heal_HP_3_Ch1
+
+SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_3_Ch1
+
+SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
+	db CH7
+	dw SFX_Start_Menu_3_Ch1
+
+SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
+	db CH4
+	dw SFX_Press_AB_3_Ch1
+
+SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
+	db ( $80 | CH4 )
+	dw SFX_Pokedex_Rating_3_Ch1
+	db CH5
+	dw SFX_Pokedex_Rating_3_Ch2
+	db CH6
+	dw SFX_Pokedex_Rating_3_Ch3
+
+SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
+	db ( $80 | CH4 )
+	dw SFX_Get_Key_Item_3_Ch1
+	db CH5
+	dw SFX_Get_Key_Item_3_Ch2
+	db CH6
+	dw SFX_Get_Key_Item_3_Ch3
+
+SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
+	db CH4
+	dw SFX_Poisoned_3_Ch1
+
+SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
+	db CH4
+	dw SFX_Trade_Machine_3_Ch1
+
+SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
+	db CH4
+	dw SFX_Turn_On_PC_3_Ch1
+
+SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
+	db CH4
+	dw SFX_Turn_Off_PC_3_Ch1
+
+SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
+	db CH4
+	dw SFX_Enter_PC_3_Ch1
+
+SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
+	db CH4
+	dw SFX_Shrink_3_Ch1
+
+SFX_Switch_3:: ; 7c1d7 (1f:41d7)
+	db CH4
+	dw SFX_Switch_3_Ch1
+
+SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
+	db CH4
+	dw SFX_Healing_Machine_3_Ch1
+
+SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
+	db CH4
+	dw SFX_Teleport_Exit1_3_Ch1
+
+SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
+	db CH4
+	dw SFX_Teleport_Enter1_3_Ch1
+
+SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
+	db CH4
+	dw SFX_Teleport_Exit2_3_Ch1
+
+SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
+	db CH4
+	dw SFX_Ledge_3_Ch1
+
+SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
+	db CH7
+	dw SFX_Teleport_Enter2_3_Ch1
+
+SFX_Fly_3:: ; 7c1ec (1f:41ec)
+	db CH7
+	dw SFX_Fly_3_Ch1
+
+SFX_Denied_3:: ; 7c1ef (1f:41ef)
+	db ( $40 | CH4 )
+	dw SFX_Denied_3_Ch1
+	db CH5
+	dw SFX_Denied_3_Ch2
+
+SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
+	db CH4
+	dw SFX_Arrow_Tiles_3_Ch1
+
+SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
+	db CH7
+	dw SFX_Push_Boulder_3_Ch1
+
+SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
+	db ( $40 | CH4 )
+	dw SFX_SS_Anne_Horn_3_Ch1
+	db CH5
+	dw SFX_SS_Anne_Horn_3_Ch2
+
+SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
+	db CH4
+	dw SFX_Withdraw_Deposit_3_Ch1
+
+SFX_Cut_3:: ; 7c204 (1f:4204)
+	db CH7
+	dw SFX_Cut_3_Ch1
+
+SFX_Go_Inside_3:: ; 7c207 (1f:4207)
+	db CH7
+	dw SFX_Go_Inside_3_Ch1
+
+SFX_Swap_3:: ; 7c20a (1f:420a)
+	db ( $40 | CH4 )
+	dw SFX_Swap_3_Ch1
+	db CH5
+	dw SFX_Swap_3_Ch2
+
+SFX_59_3:: ; 7c210 (1f:4210)
+	db ( $40 | CH4 )
+	dw SFX_59_3_Ch1
+	db CH5
+	dw SFX_59_3_Ch2
+
+SFX_Purchase_3:: ; 7c216 (1f:4216)
+	db ( $40 | CH4 )
+	dw SFX_Purchase_3_Ch1
+	db CH5
+	dw SFX_Purchase_3_Ch2
+
+SFX_Collision_3:: ; 7c21c (1f:421c)
+	db CH4
+	dw SFX_Collision_3_Ch1
+
+SFX_Go_Outside_3:: ; 7c21f (1f:421f)
+	db CH7
+	dw SFX_Go_Outside_3_Ch1
+
+SFX_Save_3:: ; 7c222 (1f:4222)
+	db ( $40 | CH4 )
+	dw SFX_Save_3_Ch1
+	db CH5
+	dw SFX_Save_3_Ch2
+
+SFX_Intro_Lunge:: ; 7c228 (1f:4228)
+	db CH7
+	dw SFX_Intro_Lunge_Ch1
+
+SFX_Intro_Hip:: ; 7c22b (1f:422b)
+	db CH4
+	dw SFX_Intro_Hip_Ch1
+
+SFX_Intro_Hop:: ; 7c22e (1f:422e)
+	db CH4
+	dw SFX_Intro_Hop_Ch1
+
+SFX_Intro_Raise:: ; 7c231 (1f:4231)
+	db CH7
+	dw SFX_Intro_Raise_Ch1
+
+SFX_Intro_Crash:: ; 7c234 (1f:4234)
+	db CH7
+	dw SFX_Intro_Crash_Ch1
+
+SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
+	db CH7
+	dw SFX_Intro_Whoosh_Ch1
+
+SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
+	db CH4
+	dw SFX_Slots_Stop_Wheel_Ch1
+
+SFX_Slots_Reward:: ; 7c23d (1f:423d)
+	db CH4
+	dw SFX_Slots_Reward_Ch1
+
+SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
+	db ( $40 | CH4 )
+	dw SFX_Slots_New_Spin_Ch1
+	db CH5
+	dw SFX_Slots_New_Spin_Ch2
+
+SFX_Shooting_Star:: ; 7c246 (1f:4246)
+	db CH4
+	dw SFX_Shooting_Star_Ch1
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 662f2fc8..6da2f9d6 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -702,4 +702,3 @@ Music_BikeRiding_branch_7dec2::
 	triangle3 1
 	triangle3 1
 	endchannel
-; 0x7ded1
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index 77dc2ab8..71758fe4 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -409,4 +409,3 @@ Music_Celadon_branch_b7c1::
 	F# 2
 	E_ 2
 	loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm
index 4fcbe842..f3a12c5e 100644
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -352,4 +352,3 @@ Music_Cinnabar_branch_b93f::
 	C_ 1
 	rest 1
 	loopchannel 0, Music_Cinnabar_branch_b93f
-; 0xb9eb
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index 690fb915..f461ec56 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -170,4 +170,3 @@ Music_CinnabarMansion_branch_7edb5::
 	rest 8
 	cymbal3 8
 	loopchannel 0, Music_CinnabarMansion_branch_7edb5
-; 0x7edda
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index 82754e0e..4b068045 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -655,4 +655,3 @@ Music_Cities1_branch_ad6e::
 	triangle2 2
 	triangle2 2
 	endchannel
-; 0xad77
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index 34297e68..e0e4ab5e 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -414,4 +414,3 @@ Music_Cities2_branch_b64c::
 	E_ 2
 	G# 2
 	loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index 4c3fa487..803e3d02 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -818,4 +818,3 @@ Music_Credits_branch_7ffed::
 	A_ 1
 	rest 3
 	endchannel
-; 0x7fffa
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 96c2b9fc..e3e6a3de 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -605,4 +605,3 @@ Music_DefeatedGymLeader_branch_23e65::
 	G_ 2
 	E_ 2
 	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
-; 0x23f52
diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 624190f6..015aaaf5 100644
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -264,4 +264,3 @@ Music_DefeatedTrainer_branch_23b24::
 	octave 4
 	A_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23b24
-; 0x23b74
diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index 93b4d3ff..6b378400 100644
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -300,4 +300,3 @@ Music_DefeatedWildMon_branch_23c21::
 	octave 4
 	D# 4
 	loopchannel 0, Music_DefeatedWildMon_branch_23c21
-; 0x23cad
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index e73eb707..ac6b3e07 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -673,4 +673,3 @@ Music_Dungeon1_branch_7e202::
 	snare8 4
 	snare9 4
 	endchannel
-; 0x7e20b
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index e65de5be..57e1805c 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -315,4 +315,3 @@ Music_Dungeon2_branch_7e9dd::
 	snare9 4
 	snare7 4
 	loopchannel 0, Music_Dungeon2_branch_7e9dd
-; 0x7e9f1
diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm
index 1bfdb682..796d1e78 100644
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -754,4 +754,3 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
 	rest 16
 	rest 10
 	endchannel
-; 0x7ed0f
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index eabc06ec..7e4eb43b 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1342,4 +1342,3 @@ Music_FinalBattle_branch_2396c::
 	octave 5
 	E_ 2
 	endchannel
-; 0x2397d
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index a80652e3..97ed4e77 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -625,4 +625,3 @@ Music_GameCorner_branch_7e4ab::
 	A_ 1
 	rest 1
 	endchannel
-; 0x7e4c0
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index b4cb2a8d..3ee51100 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -355,4 +355,3 @@ Music_Gym_branch_be4d::
 	F_ 2
 	A# 2
 	endchannel
-; 0xbe56
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index c4e7907e..c4a702e5 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1398,4 +1398,3 @@ Music_GymLeaderBattle_branch_227b1::
 	octave 4
 	G_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_227b1
-; 0x22919
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index d2347aa6..86fff1c8 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -94,4 +94,3 @@ Music_HallOfFame_branch_7fbfe::
 	E_ 4
 	G_ 4
 	loopchannel 0, Music_HallOfFame_Ch3
-; 0x7fc1f
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index 32ce02c2..ab4df7a7 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -319,4 +319,3 @@ Music_IndigoPlateau_branch_a7a8::
 	mutedsnare3 1
 	mutedsnare3 1
 	endchannel
-; 0xa7c5
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index d3464680..ff7d85d8 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -327,4 +327,3 @@ Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
 	rest 16
 	rest 14
 	endchannel
-; 0x7fa19
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 8d676150..e21d331f 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -38,4 +38,3 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
 	G# 4
 	E_ 10
 	endchannel
-; 0x7fbaf
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index b2d36593..b655a488 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -197,4 +197,3 @@ Music_Lavender_branch_bc26::
 	triangle2 8
 	triangle2 8
 	loopchannel 0, Music_Lavender_branch_bc26
-; 0xbc2e
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index af4245ba..77324e5c 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -78,4 +78,3 @@ Music_MeetEvilTrainer_branch_7f6ee::
 	rest 3
 	A# 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
-; 0x7f6f9
diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 35c6ec16..b416987d 100644
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -116,4 +116,3 @@ Music_MeetFemaleTrainer_branch_7f770::
 	F# 1
 	rest 1
 	endchannel
-; 0x7f77b
diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm
index 5ef52491..168b1bdc 100644
--- a/audio/music/meetjessiejames.asm
+++ b/audio/music/meetjessiejames.asm
@@ -307,4 +307,3 @@ Music_MeetJessieJames_branch_83235::
 	rest 1
 	loopchannel 0, Music_MeetJessieJames_branch_83235
 	endchannel
-; 0x832ba
diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index 8a937fc3..0a2e8396 100644
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -188,4 +188,3 @@ Music_MeetMaleTrainer_branch_7f7ea::
 	D# 1
 	rest 1
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
-; 0x7f844
diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index e095557d..a2f0abca 100644
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -421,4 +421,3 @@ Music_MeetProfOak_branch_b101::
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b101
 	loopchannel 0, Music_MeetProfOak_branch_b0bc
-; 0xb119
diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm
index fb138e61..1588e1c7 100644
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -394,4 +394,3 @@ Music_MeetRival_branch_b2b5::
 	G_ 1
 	rest 1
 	loopchannel 0, Music_MeetRival_branch_b24b
-; 0xb2c8
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index 533ac343..2e2b79bf 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -335,4 +335,3 @@ Music_MuseumGuy_branch_aee1::
 	mutedsnare3 1
 	mutedsnare3 1
 	loopchannel 0, Music_MuseumGuy_branch_aee1
-; 0xaf59
diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm
index 51c6cbf6..018a3e92 100644
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -391,4 +391,3 @@ Music_OaksLab_branch_7ef5c::
 	E_ 1
 	rest 3
 	loopchannel 0, Music_OaksLab_branch_7ef5c
-; 0x7f04a
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 71be9eb1..9d64b331 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -312,4 +312,3 @@ Music_PalletTown_branch_a8e3::
 	F# 8
 	loopchannel 0, Music_PalletTown_branch_a8e3
 	endchannel
-; 0xa913
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 24247326..c802f217 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -45,4 +45,3 @@ Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
 	E_ 6
 	rest 2
 	endchannel
-; 0x9bde
diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm
index de6e0873..d0c9ef2c 100644
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -373,4 +373,3 @@ Music_Pokecenter_branch_bfeb::
 	F# 2
 	A_ 2
 	endchannel
-; 0xbff4
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index e04dcb30..9bb7826e 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -456,4 +456,3 @@ Music_PokemonTower_branch_7f1a2::
 	D# 1
 	rest 1
 	loopchannel 0, Music_PokemonTower_branch_7f1a2
-; 0x7f243
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index 9876b0ea..81f138eb 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -402,4 +402,3 @@ Music_Routes1_Ch4:: ; 9d24 (2:5d24)
 	mutedsnare1 2
 	loopchannel 0, Music_Routes1_Ch4
 	endchannel
-; 0x9db9
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index 9ba376ce..3926c8de 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -423,4 +423,3 @@ Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	rest 3
 	loopchannel 0, Music_Routes2_Ch4
 	endchannel
-; 0x9fad
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index e62ca9bd..09a0516f 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -513,4 +513,3 @@ Music_Routes3_branch_a17a::
 	mutedsnare3 1
 	mutedsnare3 1
 	loopchannel 0, Music_Routes3_branch_a17a
-; 0xa26a
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 742244bc..d67411f7 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -679,4 +679,3 @@ Music_Routes4_branch_a4a8::
 	mutedsnare2 2
 	mutedsnare2 2
 	loopchannel 0, Music_Routes4_branch_a4a8
-; 0xa5f0
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 3e0657fd..afa81f17 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -109,4 +109,3 @@ Music_SafariZone_branch_bca5::
 	A_ 2
 	rest 2
 	endchannel
-; 0xbcbb
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index c5cb1675..853d248d 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -998,4 +998,3 @@ Music_SilphCo_branch_7f5c9::
 	E_ 4
 	F_ 4
 	loopchannel 0, Music_SilphCo_branch_7f5c9
-; 0x7f69d
diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm
index db55e3b6..62fd1a02 100644
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -336,4 +336,3 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb)
 	G# 8
 	B_ 8
 	loopchannel 0, Music_SSAnne_Ch3
-; 0xb504
diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm
index 2b829caf..4ee84233 100644
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -333,4 +333,3 @@ Music_Surfing_branch_7fb03::
 	D_ 2
 	E_ 2
 	loopchannel 0, Music_Surfing_branch_7fb03
-; 0x7fb7d
diff --git a/audio/music/surfingpikachu.asm b/audio/music/surfingpikachu.asm
index 1832bb03..466a2c53 100644
--- a/audio/music/surfingpikachu.asm
+++ b/audio/music/surfingpikachu.asm
@@ -688,4 +688,3 @@ Music_SurfingPikachu_branch_82ea0::
 	D# 1
 	rest 1
 	loopchannel 0, Music_SurfingPikachu_branch_82ea0
-; 0x82fbe
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 359ff877..edd3352f 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -675,4 +675,3 @@ Music_TitleScreen_branch_7e842::
 	snare2 1
 	rest 3
 	endchannel
-; 0x7e850
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 52642fdc..ffc17e20 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1855,4 +1855,3 @@ Music_TrainerBattle_branch_22d9c::
 	D_ 2
 	C_ 2
 	loopchannel 0, Music_TrainerBattle_branch_22d9c
-; 0x23099
diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm
index fb51fd15..c2c87891 100644
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -336,4 +336,3 @@ Music_UnusedSong_branch_a9d8::
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a9d8
 	endchannel
-; 0xaa6f
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index 5dfd5702..59ea3e08 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -321,4 +321,3 @@ Music_Vermilion_branch_bb3f::
 	triangle1 1
 	triangle1 1
 	endchannel
-; 0xbb58
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index 70ce7d3f..e37e4b06 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -736,4 +736,3 @@ Music_WildBattle_branch_232d8::
 	C# 2
 	G# 2
 	loopchannel 0, Music_WildBattle_branch_232d8
-; 0x233a6
diff --git a/audio/music/yellowintro.asm b/audio/music/yellowintro.asm
index 4d9cf938..9b0b52ab 100644
--- a/audio/music/yellowintro.asm
+++ b/audio/music/yellowintro.asm
@@ -482,4 +482,3 @@ Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
 	E_ 1
 	rest 15
 	endchannel
-; 0x7f860
diff --git a/audio/music/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm
index e8c2a7ba..86e55ee8 100644
--- a/audio/music/yellowunusedsong.asm
+++ b/audio/music/yellowunusedsong.asm
@@ -324,4 +324,3 @@ Music_YellowUnusedSong_branch_830c3::
 	snare3 4
 	snare3 4
 	loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d
diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/59_1.asm
index 3fdea72a..6cbfdb16 100755..100644
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/59_1.asm
@@ -1,12 +1,11 @@
-SFX_02_59_Ch1: ; 841b (2:441b)
+SFX_59_1_Ch1: ; 841b (2:441b)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_02_59_Ch2: ; 8422 (2:4422)
+SFX_59_1_Ch2: ; 8422 (2:4422)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x842d
diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/59_3.asm
index 45e65572..9c808359 100755..100644
--- a/audio/sfx/sfx_1f_59.asm
+++ b/audio/sfx/59_3.asm
@@ -1,12 +1,11 @@
-SFX_1f_59_Ch1: ; 7c404 (1f:4404)
+SFX_59_3_Ch1: ; 7c404 (1f:4404)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_1f_59_Ch2: ; 7c40b (1f:440b)
+SFX_59_3_Ch2: ; 7c40b (1f:440b)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x7c416
diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/arrow_tiles_1.asm
index 6afe2bef..172907a8 100755..100644
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,7 +1,6 @@
-SFX_02_52_Ch1: ; 8649 (2:4649)
+SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x8654
diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/arrow_tiles_3.asm
index 0ac5e8ee..fd225a5f 100755..100644
--- a/audio/sfx/sfx_1f_52.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_52_Ch1: ; 7c626 (1f:4626)
+SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c631
diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/ball_poof.asm
index fadf0c42..46fb2a07 100755..100644
--- a/audio/sfx/sfx_08_42.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,4 +1,4 @@
-SFX_08_42_Ch1: ; 2043d (8:443d)
+SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,7 +6,6 @@ SFX_08_42_Ch1: ; 2043d (8:443d)
 	endchannel
 
 
-SFX_08_42_Ch2: ; 20448 (8:4448)
+SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
 	unknownnoise0x20 15, 162, 34
 	endchannel
-; 0x2044c
diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/ball_toss.asm
index a4788ad6..fc9f81cc 100755..100644
--- a/audio/sfx/sfx_08_41.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,12 +1,11 @@
-SFX_08_41_Ch1: ; 2042d (8:442d)
+SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
 	endchannel
 
 
-SFX_08_41_Ch2: ; 20436 (8:4436)
+SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
-; 0x2043d
diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/battle_09.asm
index 9d145c09..19e9b9e7 100755..100644
--- a/audio/sfx/sfx_08_49.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,7 +1,6 @@
-SFX_08_49_Ch1: ; 204b9 (8:44b9)
+SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x204c4
diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm
new file mode 100644
index 00000000..1a7e17ec
--- /dev/null
+++ b/audio/sfx/battle_0b.asm
@@ -0,0 +1,3 @@
+SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
+	unknownnoise0x20 8, 241, 84
+	endchannel
diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/battle_0c.asm
index 3b4d0350..b2fdf455 100755..100644
--- a/audio/sfx/sfx_08_4c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,6 +1,5 @@
-SFX_08_4c_Ch1: ; 204cc (8:44cc)
+SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204d6
diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/battle_0d.asm
index 90c2fe6c..c70b281d 100755..100644
--- a/audio/sfx/sfx_08_4d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,6 +1,5 @@
-SFX_08_4d_Ch1: ; 204d6 (8:44d6)
+SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204e0
diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/battle_0e.asm
index 172d245c..20c20628 100755..100644
--- a/audio/sfx/sfx_08_4e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,5 +1,4 @@
-SFX_08_4e_Ch1: ; 204e0 (8:44e0)
+SFX_Battle_0E_Ch1: ; 204e0 (8:44e0)
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
-; 0x204e7
diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/battle_0f.asm
index d8f45c20..d84aed37 100755..100644
--- a/audio/sfx/sfx_08_4f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,7 +1,6 @@
-SFX_08_4f_Ch1: ; 204e7 (8:44e7)
+SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58
 	unknownnoise0x20 6, 241, 52
 	endchannel
-; 0x204f4
diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/battle_12.asm
index 1ffbbd25..324ce9b9 100755..100644
--- a/audio/sfx/sfx_08_52.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,7 +1,6 @@
-SFX_08_52_Ch1: ; 2050b (8:450b)
+SFX_Battle_12_Ch1: ; 2050b (8:450b)
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
-	loopchannel 4, SFX_08_52_Ch1
+	loopchannel 4, SFX_Battle_12_Ch1
 	endchannel
-; 0x20519
diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/battle_13.asm
index aae94ed9..74349bb5 100755..100644
--- a/audio/sfx/sfx_08_53.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,7 +1,6 @@
-SFX_08_53_Ch1: ; 20519 (8:4519)
+SFX_Battle_13_Ch1: ; 20519 (8:4519)
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
 	unknownnoise0x20 15, 242, 34
 	endchannel
-; 0x20526
diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/battle_14.asm
index 92f84454..82234904 100755..100644
--- a/audio/sfx/sfx_08_54.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,7 +1,6 @@
-SFX_08_54_Ch1: ; 20526 (8:4526)
+SFX_Battle_14_Ch1: ; 20526 (8:4526)
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x20533
diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/battle_16.asm
index db106420..a2b5031e 100755..100644
--- a/audio/sfx/sfx_08_56.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,6 +1,5 @@
-SFX_08_56_Ch1: ; 2054c (8:454c)
+SFX_Battle_16_Ch1: ; 2054c (8:454c)
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x20556
diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/battle_17.asm
index d69c0e11..4be1d96b 100755..100644
--- a/audio/sfx/sfx_08_57.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,7 +1,6 @@
-SFX_08_57_Ch1: ; 20556 (8:4556)
+SFX_Battle_17_Ch1: ; 20556 (8:4556)
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68
 	unknownnoise0x20 8, 241, 85
 	endchannel
-; 0x20563
diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/battle_18.asm
index 92a51d59..6c201d38 100755..100644
--- a/audio/sfx/sfx_08_58.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,5 +1,4 @@
-SFX_08_58_Ch1: ; 20563 (8:4563)
+SFX_Battle_18_Ch1: ; 20563 (8:4563)
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x2056a
diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/battle_19.asm
index c8f67cc0..6b54f8cd 100755..100644
--- a/audio/sfx/sfx_08_59.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,6 +1,5 @@
-SFX_08_59_Ch1: ; 2056a (8:456a)
+SFX_Battle_19_Ch1: ; 2056a (8:456a)
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
 	endchannel
-; 0x20574
diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/battle_1b.asm
index 31a58537..3bb451d5 100755..100644
--- a/audio/sfx/sfx_08_5b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,5 +1,4 @@
-SFX_08_5b_Ch1: ; 2057b (8:457b)
+SFX_Battle_1B_Ch1: ; 2057b (8:457b)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
-; 0x20582
diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/battle_1c.asm
index f14c9aab..579e36cc 100755..100644
--- a/audio/sfx/sfx_08_5c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,6 +1,5 @@
-SFX_08_5c_Ch1: ; 20582 (8:4582)
+SFX_Battle_1C_Ch1: ; 20582 (8:4582)
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
 	endchannel
-; 0x2058c
diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/battle_1e.asm
index 366a6410..df556540 100755..100644
--- a/audio/sfx/sfx_08_5e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,4 +1,4 @@
-SFX_08_5e_Ch1: ; 20593 (8:4593)
+SFX_Battle_1E_Ch1: ; 20593 (8:4593)
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,10 +8,9 @@ SFX_08_5e_Ch1: ; 20593 (8:4593)
 	endchannel
 
 
-SFX_08_5e_Ch2: ; 205a4 (8:45a4)
+SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34
 	unknownnoise0x20 6, 161, 50
 	endchannel
-; 0x205b1
diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/battle_20.asm
index a1ae9cdb..142030ee 100755..100644
--- a/audio/sfx/sfx_08_60.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,5 +1,4 @@
-SFX_08_60_Ch1: ; 205be (8:45be)
+SFX_Battle_20_Ch1: ; 205be (8:45be)
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
-; 0x205c5
diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/battle_21.asm
index c930fed6..10ad350e 100755..100644
--- a/audio/sfx/sfx_08_61.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,8 +1,7 @@
-SFX_08_61_Ch1: ; 205c5 (8:45c5)
+SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49
 	unknownnoise0x20 15, 130, 50
 	unknownnoise0x20 8, 241, 52
 	endchannel
-; 0x205d5
diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/battle_22.asm
index 62f178fb..c6b0d972 100755..100644
--- a/audio/sfx/sfx_08_62.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,5 +1,4 @@
-SFX_08_62_Ch1: ; 205d5 (8:45d5)
+SFX_Battle_22_Ch1: ; 205d5 (8:45d5)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x205dc
diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/battle_23.asm
index a69c6976..474e43b6 100755..100644
--- a/audio/sfx/sfx_08_63.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,8 +1,7 @@
-SFX_08_63_Ch1: ; 205dc (8:45dc)
+SFX_Battle_23_Ch1: ; 205dc (8:45dc)
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49
 	unknownnoise0x20 7, 100, 0
 	unknownnoise0x20 15, 242, 85
 	endchannel
-; 0x205ec
diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/battle_24.asm
index ad463435..4fea9cf9 100755..100644
--- a/audio/sfx/sfx_08_64.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,4 +1,4 @@
-SFX_08_64_Ch1: ; 205ec (8:45ec)
+SFX_Battle_24_Ch1: ; 205ec (8:45ec)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,8 +6,7 @@ SFX_08_64_Ch1: ; 205ec (8:45ec)
 	endchannel
 
 
-SFX_08_64_Ch2: ; 205f7 (8:45f7)
+SFX_Battle_24_Ch2: ; 205f7 (8:45f7)
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x205fe
diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/battle_25.asm
index 2e2faa15..18a70f45 100755..100644
--- a/audio/sfx/sfx_08_65.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,8 +1,7 @@
-SFX_08_65_Ch1: ; 205fe (8:45fe)
+SFX_Battle_25_Ch1: ; 205fe (8:45fe)
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65
 	unknownnoise0x20 8, 242, 66
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x2060e
diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/battle_26.asm
index 03e351e7..943078e1 100755..100644
--- a/audio/sfx/sfx_08_66.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,4 +1,4 @@
-SFX_08_66_Ch1: ; 2060e (8:460e)
+SFX_Battle_26_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81
@@ -7,4 +7,3 @@ SFX_08_66_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 242, 84
 	endchannel
-; 0x20624
diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/battle_27.asm
index 89a5cbc7..ddd4e452 100755..100644
--- a/audio/sfx/sfx_08_67.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,28 +1,27 @@
-SFX_08_67_Ch1: ; 20624 (8:4624)
+SFX_Battle_27_Ch1: ; 20624 (8:4624)
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
-SFX_08_67_branch_2062a:
+SFX_Battle_27_branch_2062a:
 	unknownsfx0x20 15, 223, 192, 7
-	loopchannel 4, SFX_08_67_branch_2062a
+	loopchannel 4, SFX_Battle_27_branch_2062a
 	unknownsfx0x20 15, 209, 192, 7
 	endchannel
 
 
-SFX_08_67_Ch2: ; 20637 (8:4637)
+SFX_Battle_27_Ch2: ; 20637 (8:4637)
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
-SFX_08_67_branch_2063d:
+SFX_Battle_27_branch_2063d:
 	unknownsfx0x20 15, 207, 199, 7
-	loopchannel 4, SFX_08_67_branch_2063d
+	loopchannel 4, SFX_Battle_27_branch_2063d
 	unknownsfx0x20 15, 193, 200, 7
 	endchannel
 
 
-SFX_08_67_Ch3: ; 2064a (8:464a)
+SFX_Battle_27_Ch3: ; 2064a (8:464a)
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
-	loopchannel 10, SFX_08_67_Ch3
+	loopchannel 10, SFX_Battle_27_Ch3
 	endchannel
-; 0x20655
diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/battle_28.asm
index e0fd06c5..73855179 100755..100644
--- a/audio/sfx/sfx_08_68.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,22 +1,21 @@
-SFX_08_68_Ch1: ; 20655 (8:4655)
+SFX_Battle_28_Ch1: ; 20655 (8:4655)
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
-	loopchannel 12, SFX_08_68_Ch1
+	loopchannel 12, SFX_Battle_28_Ch1
 	endchannel
 
 
-SFX_08_68_Ch2: ; 20664 (8:4664)
+SFX_Battle_28_Ch2: ; 20664 (8:4664)
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
-	loopchannel 12, SFX_08_68_Ch2
+	loopchannel 12, SFX_Battle_28_Ch2
 	endchannel
 
 
-SFX_08_68_Ch3: ; 20673 (8:4673)
+SFX_Battle_28_Ch3: ; 20673 (8:4673)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 6, SFX_08_68_Ch3
+	loopchannel 6, SFX_Battle_28_Ch3
 	endchannel
-; 0x2067e
diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/battle_29.asm
index 7e1bafae..e766a453 100755..100644
--- a/audio/sfx/sfx_08_69.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,19 +1,18 @@
-SFX_08_69_Ch1: ; 2067e (8:467e)
+SFX_Battle_29_Ch1: ; 2067e (8:467e)
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
-	loopchannel 5, SFX_08_69_Ch1
+	loopchannel 5, SFX_Battle_29_Ch1
 	unknownsfx0x20 8, 227, 48, 1
 	unknownsfx0x20 15, 194, 16, 1
 	endchannel
 
 
-SFX_08_69_Ch2: ; 20695 (8:4695)
+SFX_Battle_29_Ch2: ; 20695 (8:4695)
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
-	loopchannel 4, SFX_08_69_Ch2
+	loopchannel 4, SFX_Battle_29_Ch2
 	unknownnoise0x20 12, 244, 188
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
 	endchannel
-; 0x206a9
diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/battle_2a.asm
index f38948a4..d7334aae 100755..100644
--- a/audio/sfx/sfx_08_6a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,29 +1,28 @@
-SFX_08_6a_Ch1: ; 206a9 (8:46a9)
+SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
 	dutycycle 57
 	unknownsfx0x20 4, 244, 0, 6
 	unknownsfx0x20 3, 196, 0, 5
 	unknownsfx0x20 5, 181, 0, 6
 	unknownsfx0x20 13, 226, 192, 6
-	loopchannel 3, SFX_08_6a_Ch1
+	loopchannel 3, SFX_Battle_2A_Ch1
 	unknownsfx0x20 8, 209, 0, 6
 	endchannel
 
 
-SFX_08_6a_Ch2: ; 206c4 (8:46c4)
+SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
 	dutycycle 141
 	unknownsfx0x20 5, 228, 224, 5
 	unknownsfx0x20 4, 180, 224, 4
 	unknownsfx0x20 6, 165, 232, 5
 	unknownsfx0x20 14, 209, 160, 6
-	loopchannel 3, SFX_08_6a_Ch2
+	loopchannel 3, SFX_Battle_2A_Ch2
 	endchannel
 
 
-SFX_08_6a_Ch3: ; 206db (8:46db)
+SFX_Battle_2A_Ch3: ; 206db (8:46db)
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51
 	unknownnoise0x20 15, 195, 50
-	loopchannel 2, SFX_08_6a_Ch3
+	loopchannel 2, SFX_Battle_2A_Ch3
 	endchannel
-; 0x206ec
diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/battle_2b.asm
index 85226308..276627c3 100755..100644
--- a/audio/sfx/sfx_08_6b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,22 +1,21 @@
-SFX_08_6b_Ch1: ; 206ec (8:46ec)
+SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
 	dutycycle 210
 	unknownsfx0x20 3, 129, 0, 3
 	unknownsfx0x20 3, 193, 0, 4
 	unknownsfx0x20 3, 241, 0, 5
 	unknownsfx0x20 3, 177, 0, 4
 	unknownsfx0x20 3, 113, 0, 3
-	loopchannel 5, SFX_08_6b_Ch1
+	loopchannel 5, SFX_Battle_2B_Ch1
 	unknownsfx0x20 8, 129, 0, 4
 	endchannel
 
 
-SFX_08_6b_Ch2: ; 2070b (8:470b)
+SFX_Battle_2B_Ch2: ; 2070b (8:470b)
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51
 	unknownnoise0x20 3, 146, 35
 	unknownnoise0x20 3, 82, 18
-	loopchannel 5, SFX_08_6b_Ch2
+	loopchannel 5, SFX_Battle_2B_Ch2
 	unknownnoise0x20 8, 129, 18
 	endchannel
-; 0x20722
diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/battle_2c.asm
index 93821db5..22b902f1 100755..100644
--- a/audio/sfx/sfx_08_6c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,26 +1,25 @@
-SFX_08_6c_Ch1: ; 20722 (8:4722)
+SFX_Battle_2C_Ch1: ; 20722 (8:4722)
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
 	unknownsfx0x20 15, 226, 192, 5
-	loopchannel 3, SFX_08_6c_Ch1
+	loopchannel 3, SFX_Battle_2C_Ch1
 	endchannel
 
 
-SFX_08_6c_Ch2: ; 20735 (8:4735)
+SFX_Battle_2C_Ch2: ; 20735 (8:4735)
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
 	unknownsfx0x20 15, 162, 56, 4
-	loopchannel 4, SFX_08_6c_Ch2
+	loopchannel 4, SFX_Battle_2C_Ch2
 	endchannel
 
 
-SFX_08_6c_Ch3: ; 20748 (8:4748)
+SFX_Battle_2C_Ch3: ; 20748 (8:4748)
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66
 	unknownnoise0x20 15, 244, 65
-	loopchannel 3, SFX_08_6c_Ch3
+	loopchannel 3, SFX_Battle_2C_Ch3
 	endchannel
-; 0x20759
diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/battle_2e.asm
index 6a5749c9..91dda605 100755..100644
--- a/audio/sfx/sfx_08_6e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,28 +1,27 @@
-SFX_08_6e_Ch1: ; 20792 (8:4792)
+SFX_Battle_2E_Ch1: ; 20792 (8:4792)
 	duty 0
 	unknownsfx0x20 2, 241, 0, 2
 	unknownsfx0x20 3, 241, 0, 7
 	unknownsfx0x20 4, 241, 0, 5
 	unknownsfx0x20 5, 241, 240, 7
-	loopchannel 8, SFX_08_6e_Ch1
+	loopchannel 8, SFX_Battle_2E_Ch1
 	endchannel
 
 
-SFX_08_6e_Ch2: ; 207a9 (8:47a9)
+SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
 	dutycycle 179
 	unknownsfx0x20 2, 225, 2, 3
 	unknownsfx0x20 3, 225, 242, 7
 	unknownsfx0x20 4, 225, 2, 6
 	unknownsfx0x20 5, 225, 2, 7
-	loopchannel 8, SFX_08_6e_Ch2
+	loopchannel 8, SFX_Battle_2E_Ch2
 	endchannel
 
 
-SFX_08_6e_Ch3: ; 207c0 (8:47c0)
+SFX_Battle_2E_Ch3: ; 207c0 (8:47c0)
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16
 	unknownnoise0x20 5, 210, 18
-	loopchannel 9, SFX_08_6e_Ch3
+	loopchannel 9, SFX_Battle_2E_Ch3
 	endchannel
-; 0x207d1
diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/battle_2f.asm
index c233fd90..4b1d9b2c 100755..100644
--- a/audio/sfx/sfx_08_6f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,22 +1,21 @@
-SFX_08_6f_Ch1: ; 207d1 (8:47d1)
+SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
-	loopchannel 8, SFX_08_6f_Ch1
+	loopchannel 8, SFX_Battle_2F_Ch1
 	endchannel
 
 
-SFX_08_6f_Ch2: ; 207e0 (8:47e0)
+SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
-	loopchannel 9, SFX_08_6f_Ch2
+	loopchannel 9, SFX_Battle_2F_Ch2
 	endchannel
 
 
-SFX_08_6f_Ch3: ; 207ef (8:47ef)
+SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
-	loopchannel 9, SFX_08_6f_Ch3
+	loopchannel 9, SFX_Battle_2F_Ch3
 	endchannel
-; 0x207fa
diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/battle_31.asm
index 92a81006..5d3e2e40 100755..100644
--- a/audio/sfx/sfx_08_71.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,4 +1,4 @@
-SFX_08_71_Ch1: ; 20847 (8:4847)
+SFX_Battle_31_Ch1: ; 20847 (8:4847)
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@ SFX_08_71_Ch1: ; 20847 (8:4847)
 	endchannel
 
 
-SFX_08_71_Ch2: ; 2085e (8:485e)
+SFX_Battle_31_Ch2: ; 2085e (8:485e)
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7
@@ -16,4 +16,3 @@ SFX_08_71_Ch2: ; 2085e (8:485e)
 	unknownsfx0x20 15, 255, 225, 7
 	unknownsfx0x20 15, 242, 226, 7
 	endchannel
-; 0x20875
diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/battle_32.asm
index ba307ca0..c949fb5b 100755..100644
--- a/audio/sfx/sfx_08_72.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,4 +1,4 @@
-SFX_08_72_Ch1: ; 20875 (8:4875)
+SFX_Battle_32_Ch1: ; 20875 (8:4875)
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,8 +6,7 @@ SFX_08_72_Ch1: ; 20875 (8:4875)
 	endchannel
 
 
-SFX_08_72_Ch2: ; 20880 (8:4880)
+SFX_Battle_32_Ch2: ; 20880 (8:4880)
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
-; 0x20887
diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/battle_33.asm
index c1b189fc..8b2bd17d 100755..100644
--- a/audio/sfx/sfx_08_73.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,4 +1,4 @@
-SFX_08_73_Ch1: ; 20887 (8:4887)
+SFX_Battle_33_Ch1: ; 20887 (8:4887)
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@ SFX_08_73_Ch1: ; 20887 (8:4887)
 	endchannel
 
 
-SFX_08_73_Ch2: ; 2089e (8:489e)
+SFX_Battle_33_Ch2: ; 2089e (8:489e)
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5
@@ -16,4 +16,3 @@ SFX_08_73_Ch2: ; 2089e (8:489e)
 	unknownsfx0x20 6, 225, 144, 6
 	unknownsfx0x20 8, 225, 16, 7
 	endchannel
-; 0x208b5
diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/battle_34.asm
index 37332169..ac80eeea 100755..100644
--- a/audio/sfx/sfx_08_74.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,4 +1,4 @@
-SFX_08_74_Ch1: ; 208b5 (8:48b5)
+SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@ SFX_08_74_Ch1: ; 208b5 (8:48b5)
 	endchannel
 
 
-SFX_08_74_Ch2: ; 208c4 (8:48c4)
+SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,10 +14,9 @@ SFX_08_74_Ch2: ; 208c4 (8:48c4)
 	endchannel
 
 
-SFX_08_74_Ch3: ; 208d3 (8:48d3)
+SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85
 	unknownnoise0x20 15, 243, 86
 	endchannel
-; 0x208e0
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/battle_35.asm
index f1513d04..7e64aca9 100755..100644
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,4 +1,4 @@
-SFX_08_75_Ch1: ; 208e0 (8:48e0)
+SFX_Battle_35_Ch1: ; 208e0 (8:48e0)
 	executemusic
 	vibrato 10, 2, 4
 	duty 2
@@ -13,7 +13,7 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0)
 	endchannel
 
 
-SFX_08_75_Ch2: ; 208f0 (8:48f0)
+SFX_Battle_35_Ch2: ; 208f0 (8:48f0)
 	executemusic
 	vibrato 10, 2, 3
 	duty 2
@@ -27,4 +27,3 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0)
 	octave 5
 	G# 8
 	endchannel
-; 0x20902
diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/battle_36.asm
index 1318b1e2..f878a1c8 100755..100644
--- a/audio/sfx/sfx_08_76.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,4 +1,4 @@
-SFX_08_76_Ch1: ; 20902 (8:4902)
+SFX_Battle_36_Ch1: ; 20902 (8:4902)
 	duty 0
 	unknownsfx0x20 2, 241, 128, 7
 	unknownsfx0x20 2, 241, 0, 7
@@ -12,15 +12,15 @@ SFX_08_76_Ch1: ; 20902 (8:4902)
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 208, 7
 
-SFX_08_76_branch_20930:
+SFX_Battle_36_branch_20930:
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 224, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 0, 7
 	endchannel
 
 
-SFX_08_76_Ch2: ; 20941 (8:4941)
+SFX_Battle_36_Ch2: ; 20941 (8:4941)
 	dutycycle 179
 	unknownsfx0x20 2, 241, 129, 7
 	unknownsfx0x20 2, 241, 1, 7
@@ -35,14 +35,13 @@ SFX_08_76_Ch2: ; 20941 (8:4941)
 	unknownsfx0x20 2, 241, 209, 7
 	unknownsfx0x20 2, 241, 1, 7
 	unknownsfx0x20 2, 241, 225, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 1, 7
 	endchannel
 
 
-SFX_08_76_Ch3: ; 20980 (8:4980)
+SFX_Battle_36_Ch3: ; 20980 (8:4980)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 26, SFX_08_76_Ch3
+	loopchannel 26, SFX_Battle_36_Ch3
 	endchannel
-; 0x2098b
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/caught_mon.asm
index 4e4732c5..d841f57a 100755..100644
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,4 +1,4 @@
-SFX_08_46_Ch1: ; 23a13 (8:7a13)
+SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -22,7 +22,7 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13)
 	endchannel
 
 
-SFX_08_46_Ch2: ; 23a2e (8:7a2e)
+SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e)
 	executemusic
 	duty 2
 	notetype 6, 12, 2
@@ -44,7 +44,7 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e)
 	endchannel
 
 
-SFX_08_46_Ch3: ; 23a44 (8:7a44)
+SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44)
 	executemusic
 	notetype 6, 1, 0
 	octave 4
@@ -59,4 +59,3 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44)
 	G_ 2
 	G# 4
 	endchannel
-; 0x23a53
diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/collision_1.asm
index 13144567..4b9c4a7e 100755..100644
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,7 +1,6 @@
-SFX_02_5b_Ch1: ; 8447 (2:4447)
+SFX_Collision_1_Ch1: ; 8447 (2:4447)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x8452
diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/collision_3.asm
index 9921eb88..18806c1f 100755..100644
--- a/audio/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
+SFX_Collision_3_Ch1: ; 7c430 (1f:4430)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x7c43b
diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/cry00_1.asm
index 1d0e647d..f29e29ab 100755..100644
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,4 +1,4 @@
-SFX_02_14_Ch1: ; 8987 (2:4987)
+SFX_Cry00_1_Ch1: ; 8987 (2:4987)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_02_14_Ch1: ; 8987 (2:4987)
 	endchannel
 
 
-SFX_02_14_Ch2: ; 8996 (2:4996)
+SFX_Cry00_1_Ch2: ; 8996 (2:4996)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_02_14_Ch2: ; 8996 (2:4996)
 	endchannel
 
 
-SFX_02_14_Ch3: ; 89a5 (2:49a5)
+SFX_Cry00_1_Ch3: ; 89a5 (2:49a5)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x89af
diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/cry00_2.asm
index c0a7d813..fa069f18 100755..100644
--- a/audio/sfx/sfx_08_14.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,4 +1,4 @@
-SFX_08_14_Ch1: ; 20c2f (8:4c2f)
+SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_08_14_Ch1: ; 20c2f (8:4c2f)
 	endchannel
 
 
-SFX_08_14_Ch2: ; 20c3e (8:4c3e)
+SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_08_14_Ch2: ; 20c3e (8:4c3e)
 	endchannel
 
 
-SFX_08_14_Ch3: ; 20c4d (8:4c4d)
+SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x20c57
diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/cry00_3.asm
index a1c24136..bdeadab5 100755..100644
--- a/audio/sfx/sfx_1f_14.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
+SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
 	endchannel
 
 
-SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
+SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
 	endchannel
 
 
-SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
+SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x7ca24
diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/cry01_1.asm
index 33699792..835d41f7 100755..100644
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,4 +1,4 @@
-SFX_02_15_Ch1: ; 8b97 (2:4b97)
+SFX_Cry01_1_Ch1: ; 8b97 (2:4b97)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_02_15_Ch1: ; 8b97 (2:4b97)
 	endchannel
 
 
-SFX_02_15_Ch2: ; 8baa (2:4baa)
+SFX_Cry01_1_Ch2: ; 8baa (2:4baa)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_02_15_Ch2: ; 8baa (2:4baa)
 	endchannel
 
 
-SFX_02_15_Ch3: ; 8bbd (2:4bbd)
+SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x8bca
diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/cry01_2.asm
index ae20351d..bcafa873 100755..100644
--- a/audio/sfx/sfx_08_15.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,4 +1,4 @@
-SFX_08_15_Ch1: ; 20e3f (8:4e3f)
+SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_08_15_Ch1: ; 20e3f (8:4e3f)
 	endchannel
 
 
-SFX_08_15_Ch2: ; 20e52 (8:4e52)
+SFX_Cry01_2_Ch2: ; 20e52 (8:4e52)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_08_15_Ch2: ; 20e52 (8:4e52)
 	endchannel
 
 
-SFX_08_15_Ch3: ; 20e65 (8:4e65)
+SFX_Cry01_2_Ch3: ; 20e65 (8:4e65)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x20e72
diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/cry01_3.asm
index 3f42e339..1a31c7ca 100755..100644
--- a/audio/sfx/sfx_1f_15.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
+SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
 	endchannel
 
 
-SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
+SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
 	endchannel
 
 
-SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
+SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x7cc3f
diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/cry02_1.asm
index fb1a3755..97cff95e 100755..100644
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,4 +1,4 @@
-SFX_02_16_Ch1: ; 8b0c (2:4b0c)
+SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_02_16_Ch1: ; 8b0c (2:4b0c)
 	endchannel
 
 
-SFX_02_16_Ch2: ; 8b1b (2:4b1b)
+SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_02_16_Ch3: ; 8b29 (2:4b29)
+SFX_Cry02_1_Ch3: ; 8b29 (2:4b29)
 	endchannel
-; 0x8b2a
diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/cry02_2.asm
index d8a126ed..7d67fc4a 100755..100644
--- a/audio/sfx/sfx_08_16.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,4 +1,4 @@
-SFX_08_16_Ch1: ; 20db4 (8:4db4)
+SFX_Cry02_2_Ch1: ; 20db4 (8:4db4)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_08_16_Ch1: ; 20db4 (8:4db4)
 	endchannel
 
 
-SFX_08_16_Ch2: ; 20dc3 (8:4dc3)
+SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_08_16_Ch3: ; 20dd1 (8:4dd1)
+SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1)
 	endchannel
-; 0x20dd2
diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/cry02_3.asm
index a9f0e332..604d084a 100755..100644
--- a/audio/sfx/sfx_1f_16.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
+SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
 	endchannel
 
 
-SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
+SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
+SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e)
 	endchannel
-; 0x7cb9f
diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/cry03_1.asm
index cf19ce38..42f2c5d3 100755..100644
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,4 +1,4 @@
-SFX_02_17_Ch1: ; 88a6 (2:48a6)
+SFX_Cry03_1_Ch1: ; 88a6 (2:48a6)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_02_17_Ch1: ; 88a6 (2:48a6)
 	endchannel
 
 
-SFX_02_17_Ch2: ; 88c5 (2:48c5)
+SFX_Cry03_1_Ch2: ; 88c5 (2:48c5)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_02_17_Ch2: ; 88c5 (2:48c5)
 	endchannel
 
 
-SFX_02_17_Ch3: ; 88e4 (2:48e4)
+SFX_Cry03_1_Ch3: ; 88e4 (2:48e4)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x88f1
diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/cry03_2.asm
index 10143636..92dab482 100755..100644
--- a/audio/sfx/sfx_08_17.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,4 +1,4 @@
-SFX_08_17_Ch1: ; 20b4e (8:4b4e)
+SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_08_17_Ch1: ; 20b4e (8:4b4e)
 	endchannel
 
 
-SFX_08_17_Ch2: ; 20b6d (8:4b6d)
+SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_08_17_Ch2: ; 20b6d (8:4b6d)
 	endchannel
 
 
-SFX_08_17_Ch3: ; 20b8c (8:4b8c)
+SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20b99
diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/cry03_3.asm
index f0f15f40..0161b820 100755..100644
--- a/audio/sfx/sfx_1f_17.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_17_Ch1: ; 7c91b (1f:491b)
+SFX_Cry03_3_Ch1: ; 7c91b (1f:491b)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_1f_17_Ch1: ; 7c91b (1f:491b)
 	endchannel
 
 
-SFX_1f_17_Ch2: ; 7c93a (1f:493a)
+SFX_Cry03_3_Ch2: ; 7c93a (1f:493a)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_1f_17_Ch2: ; 7c93a (1f:493a)
 	endchannel
 
 
-SFX_1f_17_Ch3: ; 7c959 (1f:4959)
+SFX_Cry03_3_Ch3: ; 7c959 (1f:4959)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c966
diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/cry04_1.asm
index a3039556..c80a6bd9 100755..100644
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,4 +1,4 @@
-SFX_02_18_Ch1: ; 8c55 (2:4c55)
+SFX_Cry04_1_Ch1: ; 8c55 (2:4c55)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_02_18_Ch1: ; 8c55 (2:4c55)
 	endchannel
 
 
-SFX_02_18_Ch2: ; 8c74 (2:4c74)
+SFX_Cry04_1_Ch2: ; 8c74 (2:4c74)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_02_18_Ch2: ; 8c74 (2:4c74)
 	endchannel
 
 
-SFX_02_18_Ch3: ; 8c93 (2:4c93)
+SFX_Cry04_1_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -30,4 +30,3 @@ SFX_02_18_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8ca6
diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/cry04_2.asm
index 742edcd0..dcd866da 100755..100644
--- a/audio/sfx/sfx_08_18.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,4 +1,4 @@
-SFX_08_18_Ch1: ; 20efd (8:4efd)
+SFX_Cry04_2_Ch1: ; 20efd (8:4efd)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_08_18_Ch1: ; 20efd (8:4efd)
 	endchannel
 
 
-SFX_08_18_Ch2: ; 20f1c (8:4f1c)
+SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_08_18_Ch2: ; 20f1c (8:4f1c)
 	endchannel
 
 
-SFX_08_18_Ch3: ; 20f3b (8:4f3b)
+SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -30,4 +30,3 @@ SFX_08_18_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x20f4e
diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/cry04_3.asm
index 4496dd9a..5d8c6df9 100755..100644
--- a/audio/sfx/sfx_1f_18.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
+SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
 	endchannel
 
 
-SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
+SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
 	endchannel
 
 
-SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
+SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -30,4 +30,3 @@ SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7cd1b
diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/cry05_1.asm
index 4ddb848d..891cc50e 100755..100644
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,4 +1,4 @@
-SFX_02_19_Ch1: ; 8a35 (2:4a35)
+SFX_Cry05_1_Ch1: ; 8a35 (2:4a35)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_02_19_Ch1: ; 8a35 (2:4a35)
 	endchannel
 
 
-SFX_02_19_Ch2: ; 8a48 (2:4a48)
+SFX_Cry05_1_Ch2: ; 8a48 (2:4a48)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_02_19_Ch3: ; 8a5a (2:4a5a)
+SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a)
 	endchannel
-; 0x8a5b
diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/cry05_2.asm
index af2cab57..98df4c1d 100755..100644
--- a/audio/sfx/sfx_08_19.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,4 +1,4 @@
-SFX_08_19_Ch1: ; 20cdd (8:4cdd)
+SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_08_19_Ch1: ; 20cdd (8:4cdd)
 	endchannel
 
 
-SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
+SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_08_19_Ch3: ; 20d02 (8:4d02)
+SFX_Cry05_2_Ch3: ; 20d02 (8:4d02)
 	endchannel
-; 0x20d03
diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/cry05_3.asm
index 0398340e..a7f88abf 100755..100644
--- a/audio/sfx/sfx_1f_19.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
+SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
 	endchannel
 
 
-SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
+SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
+SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf)
 	endchannel
-; 0x7cad0
diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/cry06_1.asm
index efd16f9b..b26004e2 100755..100644
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1a_Ch1: ; 89df (2:49df)
+SFX_Cry06_1_Ch1: ; 89df (2:49df)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_02_1a_Ch1: ; 89df (2:49df)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_02_1a_Ch2: ; 89f9 (2:49f9)
+SFX_Cry06_1_Ch2: ; 89f9 (2:49f9)
 	endchannel
 
 
-SFX_02_1a_Ch3: ; 89fa (2:49fa)
+SFX_Cry06_1_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -20,4 +20,3 @@ SFX_02_1a_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x8a0d
diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/cry06_2.asm
index 9bd8f231..283c1360 100755..100644
--- a/audio/sfx/sfx_08_1a.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1a_Ch1: ; 20c87 (8:4c87)
+SFX_Cry06_2_Ch1: ; 20c87 (8:4c87)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_08_1a_Ch1: ; 20c87 (8:4c87)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_08_1a_Ch2: ; 20ca1 (8:4ca1)
+SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1)
 	endchannel
 
 
-SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
+SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -20,4 +20,3 @@ SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x20cb5
diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/cry06_3.asm
index 8fca97df..9feecc3b 100755..100644
--- a/audio/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
+SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e)
+SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e)
 	endchannel
 
 
-SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
+SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -20,4 +20,3 @@ SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x7ca82
diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/cry07_1.asm
index b1857d2c..b1346b94 100755..100644
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
+SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
 	endchannel
 
 
-SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
+SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
 	endchannel
 
 
-SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
+SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x8a35
diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/cry07_2.asm
index 3ccfdd05..075b7139 100755..100644
--- a/audio/sfx/sfx_08_1b.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
+SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
 	endchannel
 
 
-SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
+SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
 	endchannel
 
 
-SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
+SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x20cdd
diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/cry07_3.asm
index 307e7b43..4955e115 100755..100644
--- a/audio/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
+SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
 	endchannel
 
 
-SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
+SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
 	endchannel
 
 
-SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
+SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x7caaa
diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/cry08_1.asm
index a880a042..65131766 100755..100644
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1c_Ch1: ; 8c25 (2:4c25)
+SFX_Cry08_1_Ch1: ; 8c25 (2:4c25)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_02_1c_Ch1: ; 8c25 (2:4c25)
 	endchannel
 
 
-SFX_02_1c_Ch2: ; 8c38 (2:4c38)
+SFX_Cry08_1_Ch2: ; 8c38 (2:4c38)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_02_1c_Ch2: ; 8c38 (2:4c38)
 	endchannel
 
 
-SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
+SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8c55
diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/cry08_2.asm
index 75f74f3e..71a0e205 100755..100644
--- a/audio/sfx/sfx_08_1c.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
+SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
 	endchannel
 
 
-SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
+SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
 	endchannel
 
 
-SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
+SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x20efd
diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/cry08_3.asm
index 3767953d..bfda8c3d 100755..100644
--- a/audio/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
+SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
 	endchannel
 
 
-SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
+SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
 	endchannel
 
 
-SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
+SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7ccca
diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/cry09_1.asm
index fa70c67c..29dffdb6 100755..100644
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1d_Ch1: ; 872f (2:472f)
+SFX_Cry09_1_Ch1: ; 872f (2:472f)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_02_1d_Ch1: ; 872f (2:472f)
 	endchannel
 
 
-SFX_02_1d_Ch2: ; 874c (2:474c)
+SFX_Cry09_1_Ch2: ; 874c (2:474c)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1d_Ch2: ; 874c (2:474c)
 	endchannel
 
 
-SFX_02_1d_Ch3: ; 876d (2:476d)
+SFX_Cry09_1_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -33,4 +33,3 @@ SFX_02_1d_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x8786
diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/cry09_2.asm
index 44f9a64f..c0e61ec7 100755..100644
--- a/audio/sfx/sfx_08_1d.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1d_Ch1: ; 209d7 (8:49d7)
+SFX_Cry09_2_Ch1: ; 209d7 (8:49d7)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_08_1d_Ch1: ; 209d7 (8:49d7)
 	endchannel
 
 
-SFX_08_1d_Ch2: ; 209f4 (8:49f4)
+SFX_Cry09_2_Ch2: ; 209f4 (8:49f4)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1d_Ch2: ; 209f4 (8:49f4)
 	endchannel
 
 
-SFX_08_1d_Ch3: ; 20a15 (8:4a15)
+SFX_Cry09_2_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -33,4 +33,3 @@ SFX_08_1d_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x20a2e
diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/cry09_3.asm
index c631f556..c5c0f599 100755..100644
--- a/audio/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
+SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
 	endchannel
 
 
-SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
+SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
 	endchannel
 
 
-SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
+SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -33,4 +33,3 @@ SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x7c7fb
diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/cry0a_1.asm
index 19ccdada..9a8e616b 100755..100644
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1e_Ch1: ; 8bca (2:4bca)
+SFX_Cry0A_1_Ch1: ; 8bca (2:4bca)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_02_1e_Ch1: ; 8bca (2:4bca)
 	endchannel
 
 
-SFX_02_1e_Ch2: ; 8be9 (2:4be9)
+SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1e_Ch2: ; 8be9 (2:4be9)
 	endchannel
 
 
-SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
+SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -33,4 +33,3 @@ SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x8c25
diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/cry0a_2.asm
index 372ecd89..0386099d 100755..100644
--- a/audio/sfx/sfx_08_1e.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1e_Ch1: ; 20e72 (8:4e72)
+SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_08_1e_Ch1: ; 20e72 (8:4e72)
 	endchannel
 
 
-SFX_08_1e_Ch2: ; 20e91 (8:4e91)
+SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1e_Ch2: ; 20e91 (8:4e91)
 	endchannel
 
 
-SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
+SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -33,4 +33,3 @@ SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x20ecd
diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/cry0a_3.asm
index f9df4ca3..4cf59333 100755..100644
--- a/audio/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
+SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
 	endchannel
 
 
-SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
+SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
 	endchannel
 
 
-SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
+SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -33,4 +33,3 @@ SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x7cc9a
diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/cry0b_1.asm
index 0305f8bf..0f0edca7 100755..100644
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
+SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
 	endchannel
 
 
-SFX_02_1f_Ch2: ; 8a86 (2:4a86)
+SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_02_1f_Ch2: ; 8a86 (2:4a86)
 	endchannel
 
 
-SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
+SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -35,4 +35,3 @@ SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x8abe
diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/cry0b_2.asm
index 6ff114ea..071cd9b1 100755..100644
--- a/audio/sfx/sfx_08_1f.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1f_Ch1: ; 20d03 (8:4d03)
+SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_08_1f_Ch1: ; 20d03 (8:4d03)
 	endchannel
 
 
-SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
+SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
 	endchannel
 
 
-SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
+SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -35,4 +35,3 @@ SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x20d66
diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/cry0b_3.asm
index 1466c684..c2bd1809 100755..100644
--- a/audio/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
+SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
 	endchannel
 
 
-SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
+SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
 	endchannel
 
 
-SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
+SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -35,4 +35,3 @@ SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x7cb33
diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/cry0c_1.asm
index 90e68dd0..1c0f9f65 100755..100644
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,4 +1,4 @@
-SFX_02_20_Ch1: ; 8abe (2:4abe)
+SFX_Cry0C_1_Ch1: ; 8abe (2:4abe)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_02_20_Ch1: ; 8abe (2:4abe)
 	endchannel
 
 
-SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
+SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_02_20_Ch3: ; 8b0b (2:4b0b)
+SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b)
 	endchannel
-; 0x8b0c
diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/cry0c_2.asm
index 35cd9acc..ef598b3e 100755..100644
--- a/audio/sfx/sfx_08_20.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,4 +1,4 @@
-SFX_08_20_Ch1: ; 20d66 (8:4d66)
+SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_08_20_Ch1: ; 20d66 (8:4d66)
 	endchannel
 
 
-SFX_08_20_Ch2: ; 20d8d (8:4d8d)
+SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_08_20_Ch3: ; 20db3 (8:4db3)
+SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3)
 	endchannel
-; 0x20db4
diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/cry0c_3.asm
index 68eb568c..4075ac51 100755..100644
--- a/audio/sfx/sfx_1f_20.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
+SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
 	endchannel
 
 
-SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
+SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
+SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80)
 	endchannel
-; 0x7cb81
diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/cry0d_1.asm
index b454585c..591bf58e 100755..100644
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_21_Ch1: ; 8b2a (2:4b2a)
+SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_02_21_Ch1: ; 8b2a (2:4b2a)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_02_21_Ch1
+	loopchannel 2, SFX_Cry0D_1_Ch1
 	endchannel
 
 
-SFX_02_21_Ch2: ; 8b49 (2:4b49)
+SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_02_21_Ch2: ; 8b49 (2:4b49)
 	endchannel
 
 
-SFX_02_21_Ch3: ; 8b78 (2:4b78)
+SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -38,4 +38,3 @@ SFX_02_21_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x8b97
diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/cry0d_2.asm
index 50c0106a..a7ca34f1 100755..100644
--- a/audio/sfx/sfx_08_21.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,4 +1,4 @@
-SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
+SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_08_21_Ch1
+	loopchannel 2, SFX_Cry0D_2_Ch1
 	endchannel
 
 
-SFX_08_21_Ch2: ; 20df1 (8:4df1)
+SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_08_21_Ch2: ; 20df1 (8:4df1)
 	endchannel
 
 
-SFX_08_21_Ch3: ; 20e20 (8:4e20)
+SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -38,4 +38,3 @@ SFX_08_21_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x20e3f
diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/cry0d_3.asm
index d37e2940..a9187dc8 100755..100644
--- a/audio/sfx/sfx_1f_21.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
+SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_1f_21_Ch1
+	loopchannel 2, SFX_Cry0D_3_Ch1
 	endchannel
 
 
-SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
+SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
 	endchannel
 
 
-SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
+SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -38,4 +38,3 @@ SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x7cc0c
diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/cry0e_1.asm
index 5fb2b91c..1e778dea 100755..100644
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_22_Ch1: ; 89af (2:49af)
+SFX_Cry0E_1_Ch1: ; 89af (2:49af)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_02_22_Ch1: ; 89af (2:49af)
 	endchannel
 
 
-SFX_02_22_Ch2: ; 89c2 (2:49c2)
+SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_02_22_Ch2: ; 89c2 (2:49c2)
 	endchannel
 
 
-SFX_02_22_Ch3: ; 89d5 (2:49d5)
+SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x89df
diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/cry0e_2.asm
index a08f0a89..bab74449 100755..100644
--- a/audio/sfx/sfx_08_22.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_22_Ch1: ; 20c57 (8:4c57)
+SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_08_22_Ch1: ; 20c57 (8:4c57)
 	endchannel
 
 
-SFX_08_22_Ch2: ; 20c6a (8:4c6a)
+SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_08_22_Ch2: ; 20c6a (8:4c6a)
 	endchannel
 
 
-SFX_08_22_Ch3: ; 20c7d (8:4c7d)
+SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x20c87
diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/cry0e_3.asm
index f765ed15..da14b3a7 100755..100644
--- a/audio/sfx/sfx_1f_22.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
+SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
 	endchannel
 
 
-SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
+SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
 	endchannel
 
 
-SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
+SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x7ca54
diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/cry0f_1.asm
index 19110b45..84563293 100755..100644
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,4 +1,4 @@
-SFX_02_23_Ch1: ; 88f1 (2:48f1)
+SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_02_23_Ch1: ; 88f1 (2:48f1)
 	endchannel
 
 
-SFX_02_23_Ch2: ; 890c (2:490c)
+SFX_Cry0F_1_Ch2: ; 890c (2:490c)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_02_23_Ch2: ; 890c (2:490c)
 	endchannel
 
 
-SFX_02_23_Ch3: ; 8927 (2:4927)
+SFX_Cry0F_1_Ch3: ; 8927 (2:4927)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x8937
diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/cry0f_2.asm
index 8552ddc7..0fbaeb7a 100755..100644
--- a/audio/sfx/sfx_08_23.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,4 +1,4 @@
-SFX_08_23_Ch1: ; 20b99 (8:4b99)
+SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_08_23_Ch1: ; 20b99 (8:4b99)
 	endchannel
 
 
-SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
+SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
 	endchannel
 
 
-SFX_08_23_Ch3: ; 20bcf (8:4bcf)
+SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x20bdf
diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/cry0f_3.asm
index 76151d7e..810ab949 100755..100644
--- a/audio/sfx/sfx_1f_23.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_23_Ch1: ; 7c966 (1f:4966)
+SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_1f_23_Ch1: ; 7c966 (1f:4966)
 	endchannel
 
 
-SFX_1f_23_Ch2: ; 7c981 (1f:4981)
+SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_1f_23_Ch2: ; 7c981 (1f:4981)
 	endchannel
 
 
-SFX_1f_23_Ch3: ; 7c99c (1f:499c)
+SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x7c9ac
diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/cry10_1.asm
index c487c8b8..956fc910 100755..100644
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,4 +1,4 @@
-SFX_02_24_Ch1: ; 8937 (2:4937)
+SFX_Cry10_1_Ch1: ; 8937 (2:4937)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_02_24_Ch1: ; 8937 (2:4937)
 	endchannel
 
 
-SFX_02_24_Ch2: ; 895a (2:495a)
+SFX_Cry10_1_Ch2: ; 895a (2:495a)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_02_24_Ch2: ; 895a (2:495a)
 	endchannel
 
 
-SFX_02_24_Ch3: ; 897d (2:497d)
+SFX_Cry10_1_Ch3: ; 897d (2:497d)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x8987
diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/cry10_2.asm
index 9b4def61..5d4cc3aa 100755..100644
--- a/audio/sfx/sfx_08_24.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,4 +1,4 @@
-SFX_08_24_Ch1: ; 20bdf (8:4bdf)
+SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_08_24_Ch1: ; 20bdf (8:4bdf)
 	endchannel
 
 
-SFX_08_24_Ch2: ; 20c02 (8:4c02)
+SFX_Cry10_2_Ch2: ; 20c02 (8:4c02)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_08_24_Ch2: ; 20c02 (8:4c02)
 	endchannel
 
 
-SFX_08_24_Ch3: ; 20c25 (8:4c25)
+SFX_Cry10_2_Ch3: ; 20c25 (8:4c25)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x20c2f
diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/cry10_3.asm
index 55d6345c..2d5df465 100755..100644
--- a/audio/sfx/sfx_1f_24.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
+SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
 	endchannel
 
 
-SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
+SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
 	endchannel
 
 
-SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
+SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x7c9fc
diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/cry11_1.asm
index 97ed7c86..dd354c90 100755..100644
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,4 +1,4 @@
-SFX_02_25_Ch1: ; 8813 (2:4813)
+SFX_Cry11_1_Ch1: ; 8813 (2:4813)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_02_25_Ch1: ; 8813 (2:4813)
 	endchannel
 
 
-SFX_02_25_Ch2: ; 8832 (2:4832)
+SFX_Cry11_1_Ch2: ; 8832 (2:4832)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_02_25_Ch2: ; 8832 (2:4832)
 	endchannel
 
 
-SFX_02_25_Ch3: ; 8855 (2:4855)
+SFX_Cry11_1_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -32,4 +32,3 @@ SFX_02_25_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x886b
diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/cry11_2.asm
index b305664b..37546fe1 100755..100644
--- a/audio/sfx/sfx_08_25.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,4 +1,4 @@
-SFX_08_25_Ch1: ; 20abb (8:4abb)
+SFX_Cry11_2_Ch1: ; 20abb (8:4abb)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_08_25_Ch1: ; 20abb (8:4abb)
 	endchannel
 
 
-SFX_08_25_Ch2: ; 20ada (8:4ada)
+SFX_Cry11_2_Ch2: ; 20ada (8:4ada)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_08_25_Ch2: ; 20ada (8:4ada)
 	endchannel
 
 
-SFX_08_25_Ch3: ; 20afd (8:4afd)
+SFX_Cry11_2_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -32,4 +32,3 @@ SFX_08_25_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x20b13
diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/cry11_3.asm
index 15ea54a7..75b9a861 100755..100644
--- a/audio/sfx/sfx_1f_25.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_25_Ch1: ; 7c888 (1f:4888)
+SFX_Cry11_3_Ch1: ; 7c888 (1f:4888)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_1f_25_Ch1: ; 7c888 (1f:4888)
 	endchannel
 
 
-SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
+SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
 	endchannel
 
 
-SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
+SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -32,4 +32,3 @@ SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7c8e0
diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/cry12_1.asm
index 46f596d0..a6b1a0f8 100755..100644
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,4 +1,4 @@
-SFX_02_26_Ch1: ; 8d2b (2:4d2b)
+SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_02_26_Ch1: ; 8d2b (2:4d2b)
 	endchannel
 
 
-SFX_02_26_Ch2: ; 8d3e (2:4d3e)
+SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_02_26_Ch2: ; 8d3e (2:4d3e)
 	endchannel
 
 
-SFX_02_26_Ch3: ; 8d51 (2:4d51)
+SFX_Cry12_1_Ch3: ; 8d51 (2:4d51)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x8d5e
diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/cry12_2.asm
index dd5f7897..e2b29de7 100755..100644
--- a/audio/sfx/sfx_08_26.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,4 +1,4 @@
-SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
+SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
 	endchannel
 
 
-SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
+SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
 	endchannel
 
 
-SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
+SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x21006
diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/cry12_3.asm
index 488c9c32..143f8045 100755..100644
--- a/audio/sfx/sfx_1f_26.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
+SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
 	endchannel
 
 
-SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
+SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
 	endchannel
 
 
-SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
+SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x7cdd3
diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/cry13_1.asm
index d25a4db9..c2f1002f 100755..100644
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,4 +1,4 @@
-SFX_02_27_Ch1: ; 8d5e (2:4d5e)
+SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_02_27_Ch1: ; 8d5e (2:4d5e)
 	endchannel
 
 
-SFX_02_27_Ch2: ; 8d79 (2:4d79)
+SFX_Cry13_1_Ch2: ; 8d79 (2:4d79)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_02_27_Ch2: ; 8d79 (2:4d79)
 	endchannel
 
 
-SFX_02_27_Ch3: ; 8d94 (2:4d94)
+SFX_Cry13_1_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -28,4 +28,3 @@ SFX_02_27_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8da7
diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/cry13_2.asm
index 044e1d6f..b072fb07 100755..100644
--- a/audio/sfx/sfx_08_27.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,4 +1,4 @@
-SFX_08_27_Ch1: ; 21006 (8:5006)
+SFX_Cry13_2_Ch1: ; 21006 (8:5006)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_08_27_Ch1: ; 21006 (8:5006)
 	endchannel
 
 
-SFX_08_27_Ch2: ; 21021 (8:5021)
+SFX_Cry13_2_Ch2: ; 21021 (8:5021)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_08_27_Ch2: ; 21021 (8:5021)
 	endchannel
 
 
-SFX_08_27_Ch3: ; 2103c (8:503c)
+SFX_Cry13_2_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -28,4 +28,3 @@ SFX_08_27_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x2104f
diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/cry13_3.asm
index ade4b1ba..f2c110b8 100755..100644
--- a/audio/sfx/sfx_1f_27.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
+SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
 	endchannel
 
 
-SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
+SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
 	endchannel
 
 
-SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
+SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -28,4 +28,3 @@ SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7ce1c
diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/cry14_1.asm
index f4ed88b2..125fe86e 100755..100644
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,4 +1,4 @@
-SFX_02_28_Ch1: ; 8da7 (2:4da7)
+SFX_Cry14_1_Ch1: ; 8da7 (2:4da7)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_02_28_Ch1: ; 8da7 (2:4da7)
 	endchannel
 
 
-SFX_02_28_Ch2: ; 8db6 (2:4db6)
+SFX_Cry14_1_Ch2: ; 8db6 (2:4db6)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_02_28_Ch2: ; 8db6 (2:4db6)
 	endchannel
 
 
-SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
+SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8dcf
diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/cry14_2.asm
index c7f7e3a7..3ba2ac26 100755..100644
--- a/audio/sfx/sfx_08_28.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,4 +1,4 @@
-SFX_08_28_Ch1: ; 2104f (8:504f)
+SFX_Cry14_2_Ch1: ; 2104f (8:504f)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_08_28_Ch1: ; 2104f (8:504f)
 	endchannel
 
 
-SFX_08_28_Ch2: ; 2105e (8:505e)
+SFX_Cry14_2_Ch2: ; 2105e (8:505e)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_08_28_Ch2: ; 2105e (8:505e)
 	endchannel
 
 
-SFX_08_28_Ch3: ; 2106d (8:506d)
+SFX_Cry14_2_Ch3: ; 2106d (8:506d)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x21077
diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/cry14_3.asm
index 5f24e7d9..fe2cd1e8 100755..100644
--- a/audio/sfx/sfx_1f_28.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
+SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
 	endchannel
 
 
-SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
+SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
 	endchannel
 
 
-SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
+SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7ce44
diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/cry15_1.asm
index f0a86c6a..54f94deb 100755..100644
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,4 +1,4 @@
-SFX_02_29_Ch1: ; 8e35 (2:4e35)
+SFX_Cry15_1_Ch1: ; 8e35 (2:4e35)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_02_29_Ch1: ; 8e35 (2:4e35)
 	endchannel
 
 
-SFX_02_29_Ch2: ; 8e50 (2:4e50)
+SFX_Cry15_1_Ch2: ; 8e50 (2:4e50)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_02_29_Ch2: ; 8e50 (2:4e50)
 	endchannel
 
 
-SFX_02_29_Ch3: ; 8e6b (2:4e6b)
+SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -28,4 +28,3 @@ SFX_02_29_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x8e7e
diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/cry15_2.asm
index 7149e4e1..14b1af72 100755..100644
--- a/audio/sfx/sfx_08_29.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,4 +1,4 @@
-SFX_08_29_Ch1: ; 210dd (8:50dd)
+SFX_Cry15_2_Ch1: ; 210dd (8:50dd)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_08_29_Ch1: ; 210dd (8:50dd)
 	endchannel
 
 
-SFX_08_29_Ch2: ; 210f8 (8:50f8)
+SFX_Cry15_2_Ch2: ; 210f8 (8:50f8)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_08_29_Ch2: ; 210f8 (8:50f8)
 	endchannel
 
 
-SFX_08_29_Ch3: ; 21113 (8:5113)
+SFX_Cry15_2_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -28,4 +28,3 @@ SFX_08_29_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x21126
diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/cry15_3.asm
index 3c15675b..36951439 100755..100644
--- a/audio/sfx/sfx_1f_29.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
+SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
 	endchannel
 
 
-SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
+SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
 	endchannel
 
 
-SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
+SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -28,4 +28,3 @@ SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x7cef3
diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/cry16_1.asm
index 70778f03..91fa2596 100755..100644
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
+SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
 	endchannel
 
 
-SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
+SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
 	endchannel
 
 
-SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
+SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x8cf0
diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/cry16_2.asm
index a2b247ef..5e29eba8 100755..100644
--- a/audio/sfx/sfx_08_2a.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2a_Ch1: ; 20f70 (8:4f70)
+SFX_Cry16_2_Ch1: ; 20f70 (8:4f70)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_08_2a_Ch1: ; 20f70 (8:4f70)
 	endchannel
 
 
-SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
+SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
 	endchannel
 
 
-SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
+SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x20f98
diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/cry16_3.asm
index 36f0ccd5..af32e9ef 100755..100644
--- a/audio/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
+SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
 	endchannel
 
 
-SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
+SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
 	endchannel
 
 
-SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
+SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x7cd65
diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/cry17_1.asm
index dfc4d66d..2f2cde11 100755..100644
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
+SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
 	endchannel
 
 
-SFX_02_2b_Ch2: ; 8e91 (2:4e91)
+SFX_Cry17_1_Ch2: ; 8e91 (2:4e91)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_02_2b_Ch2: ; 8e91 (2:4e91)
 	endchannel
 
 
-SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
+SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x8eb1
diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/cry17_2.asm
index 36411656..cca78ae2 100755..100644
--- a/audio/sfx/sfx_08_2b.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2b_Ch1: ; 21126 (8:5126)
+SFX_Cry17_2_Ch1: ; 21126 (8:5126)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_08_2b_Ch1: ; 21126 (8:5126)
 	endchannel
 
 
-SFX_08_2b_Ch2: ; 21139 (8:5139)
+SFX_Cry17_2_Ch2: ; 21139 (8:5139)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_08_2b_Ch2: ; 21139 (8:5139)
 	endchannel
 
 
-SFX_08_2b_Ch3: ; 2114c (8:514c)
+SFX_Cry17_2_Ch3: ; 2114c (8:514c)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x21159
diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/cry17_3.asm
index 859969eb..6aad35d0 100755..100644
--- a/audio/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
+SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
 	endchannel
 
 
-SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
+SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
 	endchannel
 
 
-SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
+SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x7cf26
diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/cry18_1.asm
index 642d5fd5..576ea693 100755..100644
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
+SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
 	endchannel
 
 
-SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
+SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
 	endchannel
 
 
-SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
+SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -32,4 +32,3 @@ SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x8fe7
diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/cry18_2.asm
index 5c7d9541..333ddb9e 100755..100644
--- a/audio/sfx/sfx_08_2c.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2c_Ch1: ; 21236 (8:5236)
+SFX_Cry18_2_Ch1: ; 21236 (8:5236)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_08_2c_Ch1: ; 21236 (8:5236)
 	endchannel
 
 
-SFX_08_2c_Ch2: ; 21259 (8:5259)
+SFX_Cry18_2_Ch2: ; 21259 (8:5259)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_08_2c_Ch2: ; 21259 (8:5259)
 	endchannel
 
 
-SFX_08_2c_Ch3: ; 2127c (8:527c)
+SFX_Cry18_2_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -32,4 +32,3 @@ SFX_08_2c_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x2128f
diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/cry18_3.asm
index bdbcad46..3c7b1a99 100755..100644
--- a/audio/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
+SFX_Cry18_3_Ch1: ; 7d003 (1f:5003)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
 	endchannel
 
 
-SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
+SFX_Cry18_3_Ch2: ; 7d026 (1f:5026)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
 	endchannel
 
 
-SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
+SFX_Cry18_3_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -32,4 +32,3 @@ SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7d05c
diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/cry19_1.asm
index 4c42b231..94607b9b 100755..100644
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
+SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
 	endchannel
 
 
-SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
+SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
+SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7)
 	endchannel
-; 0x8cc8
diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/cry19_2.asm
index 44033318..717a5d2b 100755..100644
--- a/audio/sfx/sfx_08_2d.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
+SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
 	endchannel
 
 
-SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
+SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
+SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f)
 	endchannel
-; 0x20f70
diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/cry19_3.asm
index 8ba33430..535be2b6 100755..100644
--- a/audio/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
+SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
 	endchannel
 
 
-SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
+SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
+SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c)
 	endchannel
-; 0x7cd3d
diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/cry1a_1.asm
index a39964c8..0217deef 100755..100644
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2e_Ch1: ; 8eff (2:4eff)
+SFX_Cry1A_1_Ch1: ; 8eff (2:4eff)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_02_2e_Ch1: ; 8eff (2:4eff)
 	endchannel
 
 
-SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
+SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
 	endchannel
 
 
-SFX_02_2e_Ch3: ; 8f35 (2:4f35)
+SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -28,4 +28,3 @@ SFX_02_2e_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8f48
diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/cry1a_2.asm
index 617d3b8b..c94fc657 100755..100644
--- a/audio/sfx/sfx_08_2e.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2e_Ch1: ; 211a7 (8:51a7)
+SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_08_2e_Ch1: ; 211a7 (8:51a7)
 	endchannel
 
 
-SFX_08_2e_Ch2: ; 211c2 (8:51c2)
+SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_08_2e_Ch2: ; 211c2 (8:51c2)
 	endchannel
 
 
-SFX_08_2e_Ch3: ; 211dd (8:51dd)
+SFX_Cry1A_2_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -28,4 +28,3 @@ SFX_08_2e_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x211f0
diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/cry1a_3.asm
index 8c76ae07..29ff2ec0 100755..100644
--- a/audio/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
+SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
 	endchannel
 
 
-SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
+SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
 	endchannel
 
 
-SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
+SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -28,4 +28,3 @@ SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7cfbd
diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/cry1b_1.asm
index 3594ebd1..858d724a 100755..100644
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
+SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
 	endchannel
 
 
-SFX_02_2f_Ch2: ; 8d07 (2:4d07)
+SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_02_2f_Ch2: ; 8d07 (2:4d07)
 	endchannel
 
 
-SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
+SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x8d2b
diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/cry1b_2.asm
index 5d786f9c..423258ee 100755..100644
--- a/audio/sfx/sfx_08_2f.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2f_Ch1: ; 20f98 (8:4f98)
+SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_08_2f_Ch1: ; 20f98 (8:4f98)
 	endchannel
 
 
-SFX_08_2f_Ch2: ; 20faf (8:4faf)
+SFX_Cry1B_2_Ch2: ; 20faf (8:4faf)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_08_2f_Ch2: ; 20faf (8:4faf)
 	endchannel
 
 
-SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
+SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x20fd3
diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/cry1b_3.asm
index dbefbf62..7fe6019f 100755..100644
--- a/audio/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
+SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
 	endchannel
 
 
-SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
+SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
 	endchannel
 
 
-SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
+SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x7cda0
diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/cry1c_1.asm
index c94fbbbc..f7e66dfb 100755..100644
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,4 +1,4 @@
-SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
+SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
 	endchannel
 
 
-SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
+SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
 	endchannel
 
 
-SFX_02_30_Ch3: ; 8eef (2:4eef)
+SFX_Cry1C_1_Ch3: ; 8eef (2:4eef)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x8eff
diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/cry1c_2.asm
index 8877a00f..8037fc96 100755..100644
--- a/audio/sfx/sfx_08_30.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,4 +1,4 @@
-SFX_08_30_Ch1: ; 21159 (8:5159)
+SFX_Cry1C_2_Ch1: ; 21159 (8:5159)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_08_30_Ch1: ; 21159 (8:5159)
 	endchannel
 
 
-SFX_08_30_Ch2: ; 2117c (8:517c)
+SFX_Cry1C_2_Ch2: ; 2117c (8:517c)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_08_30_Ch2: ; 2117c (8:517c)
 	endchannel
 
 
-SFX_08_30_Ch3: ; 21197 (8:5197)
+SFX_Cry1C_2_Ch3: ; 21197 (8:5197)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x211a7
diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/cry1c_3.asm
index 89447832..853eb1c6 100755..100644
--- a/audio/sfx/sfx_1f_30.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
+SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
 	endchannel
 
 
-SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
+SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
 	endchannel
 
 
-SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
+SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x7cf74
diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/cry1d_1.asm
index 543aeea9..6e2818c1 100755..100644
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_31_Ch1: ; 8f48 (2:4f48)
+SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_02_31_Ch1: ; 8f48 (2:4f48)
 	endchannel
 
 
-SFX_02_31_Ch2: ; 8f63 (2:4f63)
+SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_02_31_Ch2: ; 8f63 (2:4f63)
 	endchannel
 
 
-SFX_02_31_Ch3: ; 8f7e (2:4f7e)
+SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8f8e
diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/cry1d_2.asm
index 5afe29c7..c7a2c512 100755..100644
--- a/audio/sfx/sfx_08_31.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,4 +1,4 @@
-SFX_08_31_Ch1: ; 211f0 (8:51f0)
+SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_08_31_Ch1: ; 211f0 (8:51f0)
 	endchannel
 
 
-SFX_08_31_Ch2: ; 2120b (8:520b)
+SFX_Cry1D_2_Ch2: ; 2120b (8:520b)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_08_31_Ch2: ; 2120b (8:520b)
 	endchannel
 
 
-SFX_08_31_Ch3: ; 21226 (8:5226)
+SFX_Cry1D_2_Ch3: ; 21226 (8:5226)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x21236
diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/cry1d_3.asm
index 4af60d4a..7210406c 100755..100644
--- a/audio/sfx/sfx_1f_31.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
+SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
 	endchannel
 
 
-SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
+SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
 	endchannel
 
 
-SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
+SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7d003
diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/cry1e_1.asm
index c231ace0..e445fdd7 100755..100644
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_32_Ch1: ; 8dcf (2:4dcf)
+SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_02_32_Ch1: ; 8dcf (2:4dcf)
 	endchannel
 
 
-SFX_02_32_Ch2: ; 8df2 (2:4df2)
+SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_02_32_Ch2: ; 8df2 (2:4df2)
 	endchannel
 
 
-SFX_02_32_Ch3: ; 8e19 (2:4e19)
+SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -36,4 +36,3 @@ SFX_02_32_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x8e35
diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/cry1e_2.asm
index cda5f116..59c9985f 100755..100644
--- a/audio/sfx/sfx_08_32.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_32_Ch1: ; 21077 (8:5077)
+SFX_Cry1E_2_Ch1: ; 21077 (8:5077)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_08_32_Ch1: ; 21077 (8:5077)
 	endchannel
 
 
-SFX_08_32_Ch2: ; 2109a (8:509a)
+SFX_Cry1E_2_Ch2: ; 2109a (8:509a)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_08_32_Ch2: ; 2109a (8:509a)
 	endchannel
 
 
-SFX_08_32_Ch3: ; 210c1 (8:50c1)
+SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -36,4 +36,3 @@ SFX_08_32_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x210dd
diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/cry1e_3.asm
index 4e11a38e..1c50d4b8 100755..100644
--- a/audio/sfx/sfx_1f_32.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
+SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
 	endchannel
 
 
-SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
+SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
 	endchannel
 
 
-SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
+SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -36,4 +36,3 @@ SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x7ceaa
diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/cry1f_1.asm
index f13e35f7..52be80df 100755..100644
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,4 +1,4 @@
-SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
+SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
 	endchannel
 
 
-SFX_02_33_Ch2: ; 8ffa (2:4ffa)
+SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_02_33_Ch2: ; 8ffa (2:4ffa)
 	endchannel
 
 
-SFX_02_33_Ch3: ; 900d (2:500d)
+SFX_Cry1F_1_Ch3: ; 900d (2:500d)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x901a
diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/cry1f_2.asm
index 21c1fd1e..da7df61a 100755..100644
--- a/audio/sfx/sfx_08_33.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,4 +1,4 @@
-SFX_08_33_Ch1: ; 2128f (8:528f)
+SFX_Cry1F_2_Ch1: ; 2128f (8:528f)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_08_33_Ch1: ; 2128f (8:528f)
 	endchannel
 
 
-SFX_08_33_Ch2: ; 212a2 (8:52a2)
+SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_08_33_Ch2: ; 212a2 (8:52a2)
 	endchannel
 
 
-SFX_08_33_Ch3: ; 212b5 (8:52b5)
+SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x212c2
diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/cry1f_3.asm
index b273d6ac..2f6c1eda 100755..100644
--- a/audio/sfx/sfx_1f_33.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_33_Ch1: ; 7d05c (1f:505c)
+SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_1f_33_Ch1: ; 7d05c (1f:505c)
 	endchannel
 
 
-SFX_1f_33_Ch2: ; 7d06f (1f:506f)
+SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_1f_33_Ch2: ; 7d06f (1f:506f)
 	endchannel
 
 
-SFX_1f_33_Ch3: ; 7d082 (1f:5082)
+SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x7d08f
diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/cry20_1.asm
index 786ffbd4..d6586bdd 100755..100644
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,4 +1,4 @@
-SFX_02_34_Ch1: ; 901a (2:501a)
+SFX_Cry20_1_Ch1: ; 901a (2:501a)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_02_34_Ch1: ; 901a (2:501a)
 	endchannel
 
 
-SFX_02_34_Ch2: ; 902d (2:502d)
+SFX_Cry20_1_Ch2: ; 902d (2:502d)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_02_34_Ch2: ; 902d (2:502d)
 	endchannel
 
 
-SFX_02_34_Ch3: ; 9040 (2:5040)
+SFX_Cry20_1_Ch3: ; 9040 (2:5040)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x904d
diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/cry20_2.asm
index 4c892016..b345eba5 100755..100644
--- a/audio/sfx/sfx_08_34.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,4 +1,4 @@
-SFX_08_34_Ch1: ; 212c2 (8:52c2)
+SFX_Cry20_2_Ch1: ; 212c2 (8:52c2)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_08_34_Ch1: ; 212c2 (8:52c2)
 	endchannel
 
 
-SFX_08_34_Ch2: ; 212d5 (8:52d5)
+SFX_Cry20_2_Ch2: ; 212d5 (8:52d5)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_08_34_Ch2: ; 212d5 (8:52d5)
 	endchannel
 
 
-SFX_08_34_Ch3: ; 212e8 (8:52e8)
+SFX_Cry20_2_Ch3: ; 212e8 (8:52e8)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x212f5
diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/cry20_3.asm
index 18588747..5bcdf3df 100755..100644
--- a/audio/sfx/sfx_1f_34.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_34_Ch1: ; 7d08f (1f:508f)
+SFX_Cry20_3_Ch1: ; 7d08f (1f:508f)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_1f_34_Ch1: ; 7d08f (1f:508f)
 	endchannel
 
 
-SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
+SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
 	endchannel
 
 
-SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
+SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x7d0c2
diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/cry21_1.asm
index 005ea485..9b81e2a3 100755..100644
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,4 +1,4 @@
-SFX_02_35_Ch1: ; 904d (2:504d)
+SFX_Cry21_1_Ch1: ; 904d (2:504d)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_02_35_Ch1: ; 904d (2:504d)
 	endchannel
 
 
-SFX_02_35_Ch2: ; 9070 (2:5070)
+SFX_Cry21_1_Ch2: ; 9070 (2:5070)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_02_35_Ch2: ; 9070 (2:5070)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_02_35_Ch3: ; 9092 (2:5092)
+SFX_Cry21_1_Ch3: ; 9092 (2:5092)
 	endchannel
-; 0x9093
diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/cry21_2.asm
index 463f3597..f5571642 100755..100644
--- a/audio/sfx/sfx_08_35.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,4 +1,4 @@
-SFX_08_35_Ch1: ; 212f5 (8:52f5)
+SFX_Cry21_2_Ch1: ; 212f5 (8:52f5)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_08_35_Ch1: ; 212f5 (8:52f5)
 	endchannel
 
 
-SFX_08_35_Ch2: ; 21318 (8:5318)
+SFX_Cry21_2_Ch2: ; 21318 (8:5318)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_08_35_Ch2: ; 21318 (8:5318)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_08_35_Ch3: ; 2133a (8:533a)
+SFX_Cry21_2_Ch3: ; 2133a (8:533a)
 	endchannel
-; 0x2133b
diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/cry21_3.asm
index 565dd1f2..d91177b8 100755..100644
--- a/audio/sfx/sfx_1f_35.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
+SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
 	endchannel
 
 
-SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
+SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_1f_35_Ch3: ; 7d107 (1f:5107)
+SFX_Cry21_3_Ch3: ; 7d107 (1f:5107)
 	endchannel
-; 0x7d108
diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/cry22_1.asm
index 369f6a4b..90961298 100755..100644
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,4 +1,4 @@
-SFX_02_36_Ch1: ; 9093 (2:5093)
+SFX_Cry22_1_Ch1: ; 9093 (2:5093)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_02_36_Ch1: ; 9093 (2:5093)
 	endchannel
 
 
-SFX_02_36_Ch2: ; 90a6 (2:50a6)
+SFX_Cry22_1_Ch2: ; 90a6 (2:50a6)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_02_36_Ch2: ; 90a6 (2:50a6)
 	endchannel
 
 
-SFX_02_36_Ch3: ; 90b9 (2:50b9)
+SFX_Cry22_1_Ch3: ; 90b9 (2:50b9)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x90c6
diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/cry22_2.asm
index 843fa8e5..861c3bfb 100755..100644
--- a/audio/sfx/sfx_08_36.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,4 +1,4 @@
-SFX_08_36_Ch1: ; 2133b (8:533b)
+SFX_Cry22_2_Ch1: ; 2133b (8:533b)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_08_36_Ch1: ; 2133b (8:533b)
 	endchannel
 
 
-SFX_08_36_Ch2: ; 2134e (8:534e)
+SFX_Cry22_2_Ch2: ; 2134e (8:534e)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_08_36_Ch2: ; 2134e (8:534e)
 	endchannel
 
 
-SFX_08_36_Ch3: ; 21361 (8:5361)
+SFX_Cry22_2_Ch3: ; 21361 (8:5361)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x2136e
diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/cry22_3.asm
index 2bb9dc28..42b3039c 100755..100644
--- a/audio/sfx/sfx_1f_36.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_36_Ch1: ; 7d108 (1f:5108)
+SFX_Cry22_3_Ch1: ; 7d108 (1f:5108)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_1f_36_Ch1: ; 7d108 (1f:5108)
 	endchannel
 
 
-SFX_1f_36_Ch2: ; 7d11b (1f:511b)
+SFX_Cry22_3_Ch2: ; 7d11b (1f:511b)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_1f_36_Ch2: ; 7d11b (1f:511b)
 	endchannel
 
 
-SFX_1f_36_Ch3: ; 7d12e (1f:512e)
+SFX_Cry22_3_Ch3: ; 7d12e (1f:512e)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x7d13b
diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/cry23_1.asm
index cc093dcd..02868042 100755..100644
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,4 +1,4 @@
-SFX_02_37_Ch1: ; 8786 (2:4786)
+SFX_Cry23_1_Ch1: ; 8786 (2:4786)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_02_37_Ch1: ; 8786 (2:4786)
 	endchannel
 
 
-SFX_02_37_Ch2: ; 879d (2:479d)
+SFX_Cry23_1_Ch2: ; 879d (2:479d)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_02_37_Ch2: ; 879d (2:479d)
 	endchannel
 
 
-SFX_02_37_Ch3: ; 87b0 (2:47b0)
+SFX_Cry23_1_Ch3: ; 87b0 (2:47b0)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x87bd
diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/cry23_2.asm
index 32a44e59..089a233c 100755..100644
--- a/audio/sfx/sfx_08_37.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,4 +1,4 @@
-SFX_08_37_Ch1: ; 20a2e (8:4a2e)
+SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_08_37_Ch1: ; 20a2e (8:4a2e)
 	endchannel
 
 
-SFX_08_37_Ch2: ; 20a45 (8:4a45)
+SFX_Cry23_2_Ch2: ; 20a45 (8:4a45)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_08_37_Ch2: ; 20a45 (8:4a45)
 	endchannel
 
 
-SFX_08_37_Ch3: ; 20a58 (8:4a58)
+SFX_Cry23_2_Ch3: ; 20a58 (8:4a58)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x20a65
diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/cry23_3.asm
index 6dd98fb8..31ba3743 100755..100644
--- a/audio/sfx/sfx_1f_37.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
+SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
 	endchannel
 
 
-SFX_1f_37_Ch2: ; 7c812 (1f:4812)
+SFX_Cry23_3_Ch2: ; 7c812 (1f:4812)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_1f_37_Ch2: ; 7c812 (1f:4812)
 	endchannel
 
 
-SFX_1f_37_Ch3: ; 7c825 (1f:4825)
+SFX_Cry23_3_Ch3: ; 7c825 (1f:4825)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7c832
diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/cry24_1.asm
index 5511cfb1..061ed65a 100755..100644
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,4 +1,4 @@
-SFX_02_38_Ch1: ; 87bd (2:47bd)
+SFX_Cry24_1_Ch1: ; 87bd (2:47bd)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_02_38_Ch1: ; 87bd (2:47bd)
 	endchannel
 
 
-SFX_02_38_Ch2: ; 87e0 (2:47e0)
+SFX_Cry24_1_Ch2: ; 87e0 (2:47e0)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_02_38_Ch2: ; 87e0 (2:47e0)
 	endchannel
 
 
-SFX_02_38_Ch3: ; 8803 (2:4803)
+SFX_Cry24_1_Ch3: ; 8803 (2:4803)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x8813
diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/cry24_2.asm
index 7db5b654..52986829 100755..100644
--- a/audio/sfx/sfx_08_38.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,4 +1,4 @@
-SFX_08_38_Ch1: ; 20a65 (8:4a65)
+SFX_Cry24_2_Ch1: ; 20a65 (8:4a65)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_08_38_Ch1: ; 20a65 (8:4a65)
 	endchannel
 
 
-SFX_08_38_Ch2: ; 20a88 (8:4a88)
+SFX_Cry24_2_Ch2: ; 20a88 (8:4a88)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_08_38_Ch2: ; 20a88 (8:4a88)
 	endchannel
 
 
-SFX_08_38_Ch3: ; 20aab (8:4aab)
+SFX_Cry24_2_Ch3: ; 20aab (8:4aab)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20abb
diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/cry24_3.asm
index 02c65baa..8c9cfc81 100755..100644
--- a/audio/sfx/sfx_1f_38.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_38_Ch1: ; 7c832 (1f:4832)
+SFX_Cry24_3_Ch1: ; 7c832 (1f:4832)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_1f_38_Ch1: ; 7c832 (1f:4832)
 	endchannel
 
 
-SFX_1f_38_Ch2: ; 7c855 (1f:4855)
+SFX_Cry24_3_Ch2: ; 7c855 (1f:4855)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_1f_38_Ch2: ; 7c855 (1f:4855)
 	endchannel
 
 
-SFX_1f_38_Ch3: ; 7c878 (1f:4878)
+SFX_Cry24_3_Ch3: ; 7c878 (1f:4878)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c888
diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/cry25_1.asm
index 079059ec..ce238db2 100755..100644
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,4 +1,4 @@
-SFX_02_39_Ch1: ; 886b (2:486b)
+SFX_Cry25_1_Ch1: ; 886b (2:486b)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_02_39_Ch1: ; 886b (2:486b)
 	endchannel
 
 
-SFX_02_39_Ch2: ; 8882 (2:4882)
+SFX_Cry25_1_Ch2: ; 8882 (2:4882)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_02_39_Ch2: ; 8882 (2:4882)
 	endchannel
 
 
-SFX_02_39_Ch3: ; 8899 (2:4899)
+SFX_Cry25_1_Ch3: ; 8899 (2:4899)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x88a6
diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/cry25_2.asm
index 1b9b0dae..b00210a9 100755..100644
--- a/audio/sfx/sfx_08_39.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,4 +1,4 @@
-SFX_08_39_Ch1: ; 20b13 (8:4b13)
+SFX_Cry25_2_Ch1: ; 20b13 (8:4b13)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_08_39_Ch1: ; 20b13 (8:4b13)
 	endchannel
 
 
-SFX_08_39_Ch2: ; 20b2a (8:4b2a)
+SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_08_39_Ch2: ; 20b2a (8:4b2a)
 	endchannel
 
 
-SFX_08_39_Ch3: ; 20b41 (8:4b41)
+SFX_Cry25_2_Ch3: ; 20b41 (8:4b41)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x20b4e
diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/cry25_3.asm
index 7b9d5121..7c93b0e6 100755..100644
--- a/audio/sfx/sfx_1f_39.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
+SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
 	endchannel
 
 
-SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
+SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
 	endchannel
 
 
-SFX_1f_39_Ch3: ; 7c90e (1f:490e)
+SFX_Cry25_3_Ch3: ; 7c90e (1f:490e)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x7c91b
diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/cut_1.asm
index ee6636e1..c1b763e0 100755..100644
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,8 +1,7 @@
-SFX_02_56_Ch1: ; 83e1 (2:43e1)
+SFX_Cut_1_Ch1: ; 83e1 (2:43e1)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x83f1
diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/cut_3.asm
index 941c4b0c..4ad5551d 100755..100644
--- a/audio/sfx/sfx_1f_56.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
+SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c3da
diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/cymbal1_1.asm
index 57d20bc6..d001b750 100755..100644
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0c_Ch1: ; 833b (2:433b)
+SFX_Cymbal1_1_Ch1: ; 833b (2:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x833f
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm
new file mode 100644
index 00000000..8987d85f
--- /dev/null
+++ b/audio/sfx/cymbal1_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal1_2_Ch1: ; 2033b (8:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm
new file mode 100644
index 00000000..597a8b61
--- /dev/null
+++ b/audio/sfx/cymbal1_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/cymbal2_1.asm
index f143024f..3f50299a 100755..100644
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0d_Ch1: ; 833f (2:433f)
+SFX_Cymbal2_1_Ch1: ; 833f (2:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x8343
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm
new file mode 100644
index 00000000..5224a20d
--- /dev/null
+++ b/audio/sfx/cymbal2_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal2_2_Ch1: ; 2033f (8:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm
new file mode 100644
index 00000000..dd3a4fc9
--- /dev/null
+++ b/audio/sfx/cymbal2_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/cymbal3_1.asm
index 9ba580ae..8aa5ebe5 100755..100644
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0e_Ch1: ; 8343 (2:4343)
+SFX_Cymbal3_1_Ch1: ; 8343 (2:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x8347
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm
new file mode 100644
index 00000000..d1fd3b90
--- /dev/null
+++ b/audio/sfx/cymbal3_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal3_2_Ch1: ; 20343 (8:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm
new file mode 100644
index 00000000..45e41c15
--- /dev/null
+++ b/audio/sfx/cymbal3_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/damage.asm
index 23b6d22c..4022fcbf 100755..100644
--- a/audio/sfx/sfx_08_50.asm
+++ b/audio/sfx/damage.asm
@@ -1,6 +1,5 @@
-SFX_08_50_Ch1: ; 204f4 (8:44f4)
+SFX_Damage_Ch1: ; 204f4 (8:44f4)
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
 	endchannel
-; 0x204fe
diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/denied_1.asm
index 1c039e7c..46520151 100755..100644
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,4 +1,4 @@
-SFX_02_51_Ch1: ; 861f (2:461f)
+SFX_Denied_1_Ch1: ; 861f (2:461f)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,11 +9,10 @@ SFX_02_51_Ch1: ; 861f (2:461f)
 	endchannel
 
 
-SFX_02_51_Ch2: ; 8636 (2:4636)
+SFX_Denied_1_Ch2: ; 8636 (2:4636)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8649
diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/denied_3.asm
index 83501af4..2cebd766 100755..100644
--- a/audio/sfx/sfx_1f_51.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
+SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,11 +9,10 @@ SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
 	endchannel
 
 
-SFX_1f_51_Ch2: ; 7c613 (1f:4613)
+SFX_Denied_3_Ch2: ; 7c613 (1f:4613)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c626
diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/dex_page_added.asm
index 77a1065f..dac55ed9 100755..100644
--- a/audio/sfx/sfx_08_45.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,4 +1,4 @@
-SFX_08_45_Ch1: ; 2047f (8:447f)
+SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f)
 	duty 2
 	unknownsfx0x10 68
 	unknownsfx0x20 15, 240, 240, 4
@@ -8,9 +8,8 @@ SFX_08_45_Ch1: ; 2047f (8:447f)
 	endchannel
 
 
-SFX_08_45_Ch2: ; 20490 (8:4490)
+SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490)
 	duty 2
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
 	endchannel
-; 0x2049b
diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/doubleslap.asm
index c973dcf6..0918238a 100755..100644
--- a/audio/sfx/sfx_08_5d.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,5 +1,4 @@
-SFX_08_5d_Ch1: ; 2058c (8:458c)
+SFX_Doubleslap_Ch1: ; 2058c (8:458c)
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
-; 0x20593
diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/enter_pc_1.asm
index ee3214fa..5c1a189a 100755..100644
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,8 +1,7 @@
-SFX_02_47_Ch1: ; 853b (2:453b)
+SFX_Enter_PC_1_Ch1: ; 853b (2:453b)
 	duty 2
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x854e
diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/enter_pc_3.asm
index 945e93fe..5907a7e5 100755..100644
--- a/audio/sfx/sfx_1f_47.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_47_Ch1: ; 7c518 (1f:4518)
+SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c52b
diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/faint_fall.asm
index 0792ae25..c252b93a 100755..100644
--- a/audio/sfx/sfx_08_48.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,7 +1,6 @@
-SFX_08_48_Ch1: ; 204ae (8:44ae)
+SFX_Faint_Fall_Ch1: ; 204ae (8:44ae)
 	duty 1
 	unknownsfx0x10 175
 	unknownsfx0x20 15, 242, 128, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x204b9
diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/faint_thud.asm
index 27bd52fb..5ef100c5 100755..100644
--- a/audio/sfx/sfx_08_43.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,12 +1,11 @@
-SFX_08_43_Ch1: ; 2044c (8:444c)
+SFX_Faint_Thud_Ch1: ; 2044c (8:444c)
 	unknownsfx0x20 15, 209, 0, 2
 	unknownsfx0x10 8
 	endchannel
 
 
-SFX_08_43_Ch2: ; 20453 (8:4453)
+SFX_Faint_Thud_Ch2: ; 20453 (8:4453)
 	unknownnoise0x20 4, 245, 51
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2045d
diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/fly_1.asm
index 3d5bf3fe..c2ecf435 100755..100644
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,4 +1,4 @@
-SFX_02_50_Ch1: ; 85ee (2:45ee)
+SFX_Fly_1_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
@@ -16,4 +16,3 @@ SFX_02_50_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x861f
diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/fly_3.asm
index 3b99e1f3..043d4b51 100755..100644
--- a/audio/sfx/sfx_1f_50.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
+SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
@@ -16,4 +16,3 @@ SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x7c5fc
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/get_item1_1.asm
index b394d7c9..471124d7 100755..100644
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3a_Ch1: ; ad77 (2:6d77)
+SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77)
 	endchannel
 
 
-SFX_02_3a_Ch2: ; ad8e (2:6d8e)
+SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e)
 	endchannel
 
 
-SFX_02_3a_Ch3: ; ad9e (2:6d9e)
+SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
@@ -45,4 +45,3 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e)
 	B_ 2
 	rest 2
 	endchannel
-; 0xadae
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/get_item1_3.asm
index 3ab6c1d3..6a7ebabc 100755..100644
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
+SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
 	endchannel
 
 
-SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
+SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
 	endchannel
 
 
-SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
+SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
@@ -45,4 +45,3 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
 	B_ 2
 	rest 2
 	endchannel
-; 0x7e887
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/get_item2_1.asm
index b864987b..6fda3404 100755..100644
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
+SFX_Get_Item2_1_Ch1: ; b316 (2:7316)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
 	endchannel
 
 
-SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
+SFX_Get_Item2_1_Ch2: ; b335 (2:7335)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
 	endchannel
 
 
-SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
+SFX_Get_Item2_1_Ch3: ; b34d (2:734d)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
 	rest 1
 	A_ 8
 	endchannel
-; 0x7ee74
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/get_item2_2.asm
index 1c2fbd50..25e40744 100755..100644
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,4 +1,4 @@
-SFX_02_3b_Ch1: ; b316 (2:7316)
+SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316)
 	endchannel
 
 
-SFX_02_3b_Ch2: ; b335 (2:7335)
+SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335)
 	endchannel
 
 
-SFX_02_3b_Ch3: ; b34d (2:734d)
+SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_02_3b_Ch3: ; b34d (2:734d)
 	rest 1
 	A_ 8
 	endchannel
-; 0xb362
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/get_item2_3.asm
index 6a178f4c..20a0ee04 100755..100644
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,4 +1,4 @@
-SFX_08_3b_Ch1: ; 239c7 (8:79c7)
+SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7)
 	endchannel
 
 
-SFX_08_3b_Ch2: ; 239e6 (8:79e6)
+SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6)
 	endchannel
 
 
-SFX_08_3b_Ch3: ; 239fe (8:79fe)
+SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe)
 	rest 1
 	A_ 8
 	endchannel
-; 0x23a13
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/get_key_item_1.asm
index daa4c7bb..233ea01b 100755..100644
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
+SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
 	endchannel
 
 
-SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
+SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
 	endchannel
 
 
-SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
+SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
@@ -57,4 +57,3 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
 	F_ 4
 	D# 8
 	endchannel
-; 0x7eeb9
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/get_key_item_3.asm
index f31a8e26..f918e1bf 100755..100644
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,4 +1,4 @@
-SFX_02_42_Ch1: ; b362 (2:7362)
+SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_02_42_Ch1: ; b362 (2:7362)
 	endchannel
 
 
-SFX_02_42_Ch2: ; b381 (2:7381)
+SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_02_42_Ch2: ; b381 (2:7381)
 	endchannel
 
 
-SFX_02_42_Ch3: ; b39d (2:739d)
+SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
@@ -57,4 +57,3 @@ SFX_02_42_Ch3: ; b39d (2:739d)
 	F_ 4
 	D# 8
 	endchannel
-; 0xb3a7
diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/go_inside_1.asm
index e81877d1..1eb1e2ca 100755..100644
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,5 +1,4 @@
-SFX_02_57_Ch1: ; 83f1 (2:43f1)
+SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x83f8
diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/go_inside_3.asm
index 3ea03695..d8e18b7d 100755..100644
--- a/audio/sfx/sfx_1f_57.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_57_Ch1: ; 7c3da (1f:43da)
+SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x7c3e1
diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/go_outside_1.asm
index 4f48870b..2e8a8b31 100755..100644
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,8 +1,7 @@
-SFX_02_5c_Ch1: ; 8452 (2:4452)
+SFX_Go_Outside_1_Ch1: ; 8452 (2:4452)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x8462
diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/go_outside_3.asm
index 571db9a9..2dc4242d 100755..100644
--- a/audio/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
+SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x7c44b
diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/heal_ailment_1.asm
index 39757272..5937f3a2 100755..100644
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3e_Ch1: ; 84d9 (2:44d9)
+SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -7,4 +7,3 @@ SFX_02_3e_Ch1: ; 84d9 (2:44d9)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84ee
diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/heal_ailment_2.asm
index 0808979b..4b39895a 100755..100644
--- a/audio/sfx/sfx_08_3e.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3e_Ch1: ; 203fd (8:43fd)
+SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -7,4 +7,3 @@ SFX_08_3e_Ch1: ; 203fd (8:43fd)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x20412
diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/heal_ailment_3.asm
index 89518f22..b2805f3d 100755..100644
--- a/audio/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
+SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -7,4 +7,3 @@ SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4c7
diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/heal_hp_1.asm
index 35f52890..eb8063f7 100755..100644
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,8 +1,7 @@
-SFX_02_3d_Ch1: ; 84b7 (2:44b7)
+SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84c6
diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/heal_hp_2.asm
index c263a999..890a2151 100755..100644
--- a/audio/sfx/sfx_08_3d.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,8 +1,7 @@
-SFX_08_3d_Ch1: ; 203ee (8:43ee)
+SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x203fd
diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/heal_hp_3.asm
index 0275329d..da80d48f 100755..100644
--- a/audio/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
+SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c49f
diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/healing_machine_1.asm
index 4e1c7e2e..4babf6b0 100755..100644
--- a/audio/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
+SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
@@ -7,4 +7,3 @@ SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c572
diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/healing_machine_3.asm
index f4f37ab8..c72f7905 100755..100644
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_02_4a_Ch1: ; 8580 (2:4580)
+SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
@@ -7,4 +7,3 @@ SFX_02_4a_Ch1: ; 8580 (2:4580)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8595
diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/horn_drill.asm
index cd5da5a0..e68e5834 100755..100644
--- a/audio/sfx/sfx_08_5f.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,7 +1,6 @@
-SFX_08_5f_Ch1: ; 205b1 (8:45b1)
+SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1)
 	unknownnoise0x20 3, 146, 49
 	unknownnoise0x20 3, 178, 50
 	unknownnoise0x20 3, 194, 51
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x205be
diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/intro_crash.asm
index 44a2c2c0..65e475f8 100755..100644
--- a/audio/sfx/sfx_1f_62.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,5 +1,4 @@
-SFX_1f_62_Ch1: ; 7c6de (1f:46de)
+SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6e5
diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/intro_hip.asm
index 5a18de25..70d0f8b1 100755..100644
--- a/audio/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,7 +1,6 @@
-SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
+SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 64, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6c9
diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/intro_hop.asm
index 424a2d28..223c7f25 100755..100644
--- a/audio/sfx/sfx_1f_60.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,7 +1,6 @@
-SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
+SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 128, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6d4
diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/intro_lunge.asm
index 30de5a1a..ad00f56f 100755..100644
--- a/audio/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,4 +1,4 @@
-SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
+SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 6, 32, 16
 	unknownnoise0x20 6, 47, 64
 	unknownnoise0x20 6, 79, 65
@@ -8,4 +8,3 @@ SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 15, 231, 67
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6be
diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/intro_raise.asm
index afc7dae3..d6ee1430 100755..100644
--- a/audio/sfx/sfx_1f_61.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,6 +1,5 @@
-SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
+SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4)
 	unknownnoise0x20 2, 111, 33
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x7c6de
diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/intro_whoosh.asm
index f47ed1c1..903b7252 100755..100644
--- a/audio/sfx/sfx_1f_63.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,8 +1,7 @@
-SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
+SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5)
 	unknownnoise0x20 4, 44, 32
 	unknownnoise0x20 3, 160, 32
 	unknownnoise0x20 3, 176, 33
 	unknownnoise0x20 3, 192, 34
 	unknownnoise0x20 15, 210, 36
 	endchannel
-; 0x7c6f5
diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/ledge_1.asm
index 9f204e21..dfd7c819 100755..100644
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4e_Ch1: ; 85d6 (2:45d6)
+SFX_Ledge_1_Ch1: ; 85d6 (2:45d6)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x85e1
diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/ledge_3.asm
index e3f4b6e5..2bf172e7 100755..100644
--- a/audio/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
+SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5be
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/level_up.asm
index cc992756..03e077ec 100755..100644
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/level_up.asm
@@ -1,4 +1,4 @@
-SFX_08_3a_Ch1: ; 2397d (8:797d)
+SFX_Level_Up_Ch1: ; 2397d (8:797d)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -20,7 +20,7 @@ SFX_08_3a_Ch1: ; 2397d (8:797d)
 	endchannel
 
 
-SFX_08_3a_Ch2: ; 23998 (8:7998)
+SFX_Level_Up_Ch2: ; 23998 (8:7998)
 	executemusic
 	vibrato 4, 2, 2
 	duty 2
@@ -40,7 +40,7 @@ SFX_08_3a_Ch2: ; 23998 (8:7998)
 	endchannel
 
 
-SFX_08_3a_Ch3: ; 239b0 (8:79b0)
+SFX_Level_Up_Ch3: ; 239b0 (8:79b0)
 	executemusic
 	notetype 6, 1, 0
 	octave 5
@@ -61,4 +61,3 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0)
 	rest 1
 	A_ 8
 	endchannel
-; 0x239c7
diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/muted_snare1_1.asm
index 906e27d0..5d10ecc1 100755..100644
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,5 +1,4 @@
-SFX_02_0f_Ch1: ; 8347 (2:4347)
+SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x834e
diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/muted_snare1_2.asm
index b7bbfb7f..ea3cfc8c 100755..100644
--- a/audio/sfx/sfx_08_0f.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,5 +1,4 @@
-SFX_08_0f_Ch1: ; 20347 (8:4347)
+SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x2034e
diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/muted_snare1_3.asm
index c9cdaac4..27caa37b 100755..100644
--- a/audio/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
+SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x7c34e
diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/muted_snare2_1.asm
index 34edf69a..7ab6252b 100755..100644
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_11_Ch1: ; 8355 (2:4355)
+SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x8359
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm
new file mode 100644
index 00000000..a9359226
--- /dev/null
+++ b/audio/sfx/muted_snare2_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
new file mode 100644
index 00000000..7ac9705d
--- /dev/null
+++ b/audio/sfx/muted_snare2_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/muted_snare3_1.asm
index 95ea4278..1cd27319 100755..100644
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_12_Ch1: ; 8359 (2:4359)
+SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x835d
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm
new file mode 100644
index 00000000..1606b6d5
--- /dev/null
+++ b/audio/sfx/muted_snare3_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
new file mode 100644
index 00000000..c0fe7efb
--- /dev/null
+++ b/audio/sfx/muted_snare3_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/muted_snare4_1.asm
index fcf6613a..bcac6440 100755..100644
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,4 +1,3 @@
-SFX_02_13_Ch1: ; 835d (2:435d)
+SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x8361
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
new file mode 100644
index 00000000..6910c20d
--- /dev/null
+++ b/audio/sfx/muted_snare4_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
new file mode 100644
index 00000000..52f14f21
--- /dev/null
+++ b/audio/sfx/muted_snare4_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/not_very_effective.asm
index d34a0d2b..959f33e3 100755..100644
--- a/audio/sfx/sfx_08_51.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,7 +1,6 @@
-SFX_08_51_Ch1: ; 204fe (8:44fe)
+SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe)
 	unknownnoise0x20 4, 143, 85
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2050b
diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm
new file mode 100644
index 00000000..e4632281
--- /dev/null
+++ b/audio/sfx/peck.asm
@@ -0,0 +1,3 @@
+SFX_Peck_Ch1: ; 204aa (8:44aa)
+	unknownnoise0x20 2, 161, 18
+	endchannel
diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/poisoned_1.asm
index 3d588100..4760696d 100755..100644
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,9 +1,8 @@
-SFX_02_43_Ch1: ; 84c6 (2:44c6)
+SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_02_43_Ch1
+	loopchannel 4, SFX_Poisoned_1_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84d9
diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/poisoned_3.asm
index 94d8fb9c..b6d69dc6 100755..100644
--- a/audio/sfx/sfx_1f_43.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,9 +1,8 @@
-SFX_1f_43_Ch1: ; 7c49f (1f:449f)
+SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_1f_43_Ch1
+	loopchannel 4, SFX_Poisoned_3_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4b2
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/pokedex_rating_1.asm
index f255ba76..21503d16 100755..100644
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_41_Ch1: ; 7edda (1f:6dda)
+SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda)
 	endchannel
 
 
-SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
+SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
 	endchannel
 
 
-SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
+SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -75,4 +75,3 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
 	F_ 2
 	rest 2
 	endchannel
-; 0x7ee28
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/pokedex_rating_3.asm
index e40c1fe5..a9ea1c75 100755..100644
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,4 +1,4 @@
-SFX_02_41_Ch1: ; b2c8 (2:72c8)
+SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8)
 	endchannel
 
 
-SFX_02_41_Ch2: ; b2e1 (2:72e1)
+SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1)
 	endchannel
 
 
-SFX_02_41_Ch3: ; b2f7 (2:72f7)
+SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -75,4 +75,3 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7)
 	F_ 2
 	rest 2
 	endchannel
-; 0xb316
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/pokeflute.asm
index cd04822d..4abf1713 100755..100644
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,4 +1,4 @@
-SFX_02_5e_Ch1: ; 83ca (2:43ca)
+SFX_Pokeflute_Ch1: ; 83ca (2:43ca)
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
@@ -19,4 +19,3 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	G_ 8
 	rest 12
 	endchannel
-; 0x83e1
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/pokeflute_ch1_ch2.asm
index 4c015e73..4ccf89d8 100755..100644
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/pokeflute_ch1_ch2.asm
@@ -12,4 +12,3 @@ SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
 	rest 5
 	rest 5
 	endchannel
-; 0x2232f
diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm
index e0060d7f..0652e673 100755..100644
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/pokeflute_ch3.asm
@@ -11,4 +11,3 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
 	octave 6
 	C_ 13
 	endchannel
-; 0x204aa
diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm
new file mode 100644
index 00000000..102d7d6d
--- /dev/null
+++ b/audio/sfx/pound.asm
@@ -0,0 +1,3 @@
+SFX_Pound_Ch1: ; 204c4 (8:44c4)
+	unknownnoise0x20 2, 161, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/press_ab_1.asm
index 7b4edd6e..5925b788 100755..100644
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,8 +1,7 @@
-SFX_02_40_Ch1: ; 8462 (2:4462)
+SFX_Press_AB_1_Ch1: ; 8462 (2:4462)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x8475
diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/press_ab_2.asm
index f62eb148..e15dadc4 100755..100644
--- a/audio/sfx/sfx_08_40.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,8 +1,7 @@
-SFX_08_40_Ch1: ; 203c3 (8:43c3)
+SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x203d6
diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/press_ab_3.asm
index 05d2e17d..8af4a335 100755..100644
--- a/audio/sfx/sfx_1f_40.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_40_Ch1: ; 7c44b (1f:444b)
+SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x7c45e
diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/psybeam.asm
index 7693df84..65fcc229 100755..100644
--- a/audio/sfx/sfx_08_6d.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,26 +1,25 @@
-SFX_08_6d_Ch1: ; 20759 (8:4759)
+SFX_Psybeam_Ch1: ; 20759 (8:4759)
 	dutycycle 161
 	unknownsfx0x20 10, 241, 64, 6
 	unknownsfx0x20 10, 243, 128, 6
 	unknownsfx0x20 10, 242, 32, 6
-	loopchannel 4, SFX_08_6d_Ch1
+	loopchannel 4, SFX_Psybeam_Ch1
 	unknownsfx0x20 10, 241, 64, 6
 	endchannel
 
 
-SFX_08_6d_Ch2: ; 20770 (8:4770)
+SFX_Psybeam_Ch2: ; 20770 (8:4770)
 	dutycycle 179
 	unknownsfx0x20 10, 243, 113, 5
 	unknownsfx0x20 7, 227, 49, 5
 	unknownsfx0x20 10, 241, 81, 5
-	loopchannel 4, SFX_08_6d_Ch2
+	loopchannel 4, SFX_Psybeam_Ch2
 	unknownsfx0x20 10, 241, 113, 5
 	endchannel
 
 
-SFX_08_6d_Ch3: ; 20787 (8:4787)
+SFX_Psybeam_Ch3: ; 20787 (8:4787)
 	unknownnoise0x20 2, 209, 74
 	unknownnoise0x20 2, 210, 42
-	loopchannel 21, SFX_08_6d_Ch3
+	loopchannel 21, SFX_Psybeam_Ch3
 	endchannel
-; 0x20792
diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/psychic_m.asm
index 9ac504ff..e734b7ac 100755..100644
--- a/audio/sfx/sfx_08_70.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,4 +1,4 @@
-SFX_08_70_Ch1: ; 207fa (8:47fa)
+SFX_Psychic_M_Ch1: ; 207fa (8:47fa)
 	duty 2
 	unknownsfx0x10 247
 	unknownsfx0x20 8, 196, 189, 7
@@ -11,7 +11,7 @@ SFX_08_70_Ch1: ; 207fa (8:47fa)
 	endchannel
 
 
-SFX_08_70_Ch2: ; 20819 (8:4819)
+SFX_Psychic_M_Ch2: ; 20819 (8:4819)
 	duty 2
 	unknownsfx0x20 8, 196, 112, 7
 	unknownsfx0x20 8, 196, 97, 7
@@ -22,7 +22,7 @@ SFX_08_70_Ch2: ; 20819 (8:4819)
 	endchannel
 
 
-SFX_08_70_Ch3: ; 20834 (8:4834)
+SFX_Psychic_M_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 63, 20
 	unknownnoise0x20 15, 207, 19
 	unknownnoise0x20 15, 207, 18
@@ -30,4 +30,3 @@ SFX_08_70_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 207, 16
 	unknownnoise0x20 15, 194, 16
 	endchannel
-; 0x20847
diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/purchase_1.asm
index 9ad8098e..fc0cecb5 100755..100644
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,14 +1,13 @@
-SFX_02_5a_Ch1: ; 842d (2:442d)
+SFX_Purchase_1_Ch1: ; 842d (2:442d)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_02_5a_Ch2: ; 8438 (2:4438)
+SFX_Purchase_1_Ch2: ; 8438 (2:4438)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x8447
diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/purchase_3.asm
index 567b331b..5d649958 100755..100644
--- a/audio/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,14 +1,13 @@
-SFX_1f_5a_Ch1: ; 7c416 (1f:4416)
+SFX_Purchase_3_Ch1: ; 7c416 (1f:4416)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
+SFX_Purchase_3_Ch2: ; 7c421 (1f:4421)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x7c430
diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/push_boulder_1.asm
index dc2f6d92..31096861 100755..100644
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,4 +1,4 @@
-SFX_02_53_Ch1: ; 8654 (2:4654)
+SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
@@ -8,4 +8,3 @@ SFX_02_53_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x866d
diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/push_boulder_3.asm
index 47d5d3dd..ca7d2cd1 100755..100644
--- a/audio/sfx/sfx_1f_53.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_53_Ch1: ; 7c631 (1f:4631)
+SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
@@ -8,4 +8,3 @@ SFX_1f_53_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c64a
diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/run.asm
index 57f8901a..653b0f6b 100755..100644
--- a/audio/sfx/sfx_08_44.asm
+++ b/audio/sfx/run.asm
@@ -1,4 +1,4 @@
-SFX_08_44_Ch1: ; 2045d (8:445d)
+SFX_Run_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 97, 35
 	unknownnoise0x20 2, 161, 51
 	unknownnoise0x20 2, 193, 51
@@ -11,4 +11,3 @@ SFX_08_44_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 49, 17
 	unknownnoise0x20 8, 65, 51
 	endchannel
-; 0x2047f
diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/safari_zone_pa.asm
index 0a60c2b3..fb8c4d1f 100755..100644
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,4 +1,4 @@
-SFX_02_5f_Ch1: ; 86c8 (2:46c8)
+SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8)
 	duty 2
 	unknownsfx0x20 15, 243, 48, 7
 	unknownsfx0x20 8, 101, 48, 7
@@ -7,4 +7,3 @@ SFX_02_5f_Ch1: ; 86c8 (2:46c8)
 	unknownsfx0x20 15, 68, 0, 7
 	unknownsfx0x20 15, 36, 0, 7
 	endchannel
-; 0x86e3
diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/save_1.asm
index b764b5e8..2e6c1f2b 100755..100644
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/save_1.asm
@@ -1,4 +1,4 @@
-SFX_02_5d_Ch1: ; 8475 (2:4475)
+SFX_Save_1_Ch1: ; 8475 (2:4475)
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 2, 228, 0, 6
@@ -10,7 +10,7 @@ SFX_02_5d_Ch1: ; 8475 (2:4475)
 	endchannel
 
 
-SFX_02_5d_Ch2: ; 8494 (2:4494)
+SFX_Save_1_Ch2: ; 8494 (2:4494)
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 2, 212, 1, 7
@@ -21,4 +21,3 @@ SFX_02_5d_Ch2: ; 8494 (2:4494)
 	unknownsfx0x20 2, 196, 161, 7
 	unknownsfx0x20 15, 210, 225, 7
 	endchannel
-; 0x84b7
diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/save_3.asm
index b26e5e09..70b6a81c 100755..100644
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/save_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
+SFX_Save_3_Ch1: ; 7c45e (1f:445e)
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 3, 228, 128, 6
@@ -8,7 +8,7 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
 	endchannel
 
 
-SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
+SFX_Save_3_Ch2: ; 7c475 (1f:4475)
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 3, 212, 1, 7
@@ -17,4 +17,3 @@ SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
 	unknownsfx0x20 3, 196, 1, 7
 	unknownsfx0x20 2, 196, 161, 7
 	endchannel
-; 0x7c490
diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm
deleted file mode 100755
index ddfb484c..00000000
--- a/audio/sfx/sfx_08_01.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_01_Ch1: ; 202fd (8:42fd)
-	unknownnoise0x20 0, 193, 51
-	endchannel
-; 0x20301
diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm
deleted file mode 100755
index 38464468..00000000
--- a/audio/sfx/sfx_08_02.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_02_Ch1: ; 20301 (8:4301)
-	unknownnoise0x20 0, 177, 51
-	endchannel
-; 0x20305
diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm
deleted file mode 100755
index 1e20c0ce..00000000
--- a/audio/sfx/sfx_08_03.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_03_Ch1: ; 20305 (8:4305)
-	unknownnoise0x20 0, 161, 51
-	endchannel
-; 0x20309
diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm
deleted file mode 100755
index 01a30723..00000000
--- a/audio/sfx/sfx_08_04.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_04_Ch1: ; 20309 (8:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
-; 0x2030d
diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm
deleted file mode 100755
index 6d2d8366..00000000
--- a/audio/sfx/sfx_08_06.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_06_Ch1: ; 20320 (8:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
-; 0x20324
diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm
deleted file mode 100755
index d4ab06c1..00000000
--- a/audio/sfx/sfx_08_08.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_08_Ch1: ; 2032b (8:432b)
-	unknownnoise0x20 0, 129, 16
-	endchannel
-; 0x2032f
diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm
deleted file mode 100755
index 9e801da7..00000000
--- a/audio/sfx/sfx_08_09.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_09_Ch1: ; 2032f (8:432f)
-	unknownnoise0x20 0, 130, 35
-	endchannel
-; 0x20333
diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm
deleted file mode 100755
index 6da585ac..00000000
--- a/audio/sfx/sfx_08_0a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0a_Ch1: ; 20333 (8:4333)
-	unknownnoise0x20 0, 130, 37
-	endchannel
-; 0x20337
diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm
deleted file mode 100755
index c2d0c079..00000000
--- a/audio/sfx/sfx_08_0b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0b_Ch1: ; 20337 (8:4337)
-	unknownnoise0x20 0, 130, 38
-	endchannel
-; 0x2033b
diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm
deleted file mode 100755
index 9f872678..00000000
--- a/audio/sfx/sfx_08_0c.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0c_Ch1: ; 2033b (8:433b)
-	unknownnoise0x20 0, 161, 16
-	endchannel
-; 0x2033f
diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm
deleted file mode 100755
index 245add5b..00000000
--- a/audio/sfx/sfx_08_0d.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0d_Ch1: ; 2033f (8:433f)
-	unknownnoise0x20 0, 162, 17
-	endchannel
-; 0x20343
diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm
deleted file mode 100755
index 096e0a33..00000000
--- a/audio/sfx/sfx_08_0e.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0e_Ch1: ; 20343 (8:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
-; 0x20347
diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm
deleted file mode 100755
index ae617471..00000000
--- a/audio/sfx/sfx_08_11.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_11_Ch1: ; 20355 (8:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
-; 0x20359
diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm
deleted file mode 100755
index e391b0a9..00000000
--- a/audio/sfx/sfx_08_12.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_12_Ch1: ; 20359 (8:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
-; 0x2035d
diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm
deleted file mode 100755
index 4c478514..00000000
--- a/audio/sfx/sfx_08_13.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_13_Ch1: ; 2035d (8:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
-; 0x20361
diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm
deleted file mode 100755
index 47f8b645..00000000
--- a/audio/sfx/sfx_08_47.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_47_Ch1: ; 204aa (8:44aa)
-	unknownnoise0x20 2, 161, 18
-	endchannel
-; 0x204ae
diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm
deleted file mode 100755
index f566332b..00000000
--- a/audio/sfx/sfx_08_4a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_4a_Ch1: ; 204c4 (8:44c4)
-	unknownnoise0x20 2, 161, 34
-	endchannel
-; 0x204c8
diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm
deleted file mode 100755
index 24e6bfc3..00000000
--- a/audio/sfx/sfx_08_4b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_4b_Ch1: ; 204c8 (8:44c8)
-	unknownnoise0x20 8, 241, 84
-	endchannel
-; 0x204cc
diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm
deleted file mode 100755
index dec8baa6..00000000
--- a/audio/sfx/sfx_1f_01.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_01_Ch1: ; 7c2fd (1f:42fd)
-	unknownnoise0x20 0, 193, 51
-	endchannel
-; 0x7c301
diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm
deleted file mode 100755
index d383abed..00000000
--- a/audio/sfx/sfx_1f_02.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_02_Ch1: ; 7c301 (1f:4301)
-	unknownnoise0x20 0, 177, 51
-	endchannel
-; 0x7c305
diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm
deleted file mode 100755
index 57e18697..00000000
--- a/audio/sfx/sfx_1f_03.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_03_Ch1: ; 7c305 (1f:4305)
-	unknownnoise0x20 0, 161, 51
-	endchannel
-; 0x7c309
diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm
deleted file mode 100755
index 587d9f22..00000000
--- a/audio/sfx/sfx_1f_04.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_04_Ch1: ; 7c309 (1f:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
-; 0x7c30d
diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm
deleted file mode 100755
index 0470795c..00000000
--- a/audio/sfx/sfx_1f_06.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_06_Ch1: ; 7c320 (1f:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
-; 0x7c324
diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm
deleted file mode 100755
index 94c0e10d..00000000
--- a/audio/sfx/sfx_1f_08.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_08_Ch1: ; 7c32b (1f:432b)
-	unknownnoise0x20 0, 129, 16
-	endchannel
-; 0x7c32f
diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm
deleted file mode 100755
index 4a9216e9..00000000
--- a/audio/sfx/sfx_1f_09.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_09_Ch1: ; 7c32f (1f:432f)
-	unknownnoise0x20 0, 130, 35
-	endchannel
-; 0x7c333
diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm
deleted file mode 100755
index b3c618ca..00000000
--- a/audio/sfx/sfx_1f_0a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0a_Ch1: ; 7c333 (1f:4333)
-	unknownnoise0x20 0, 130, 37
-	endchannel
-; 0x7c337
diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm
deleted file mode 100755
index 5d21ffb8..00000000
--- a/audio/sfx/sfx_1f_0b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0b_Ch1: ; 7c337 (1f:4337)
-	unknownnoise0x20 0, 130, 38
-	endchannel
-; 0x7c33b
diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm
deleted file mode 100755
index 82cba9c0..00000000
--- a/audio/sfx/sfx_1f_0c.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0c_Ch1: ; 7c33b (1f:433b)
-	unknownnoise0x20 0, 161, 16
-	endchannel
-; 0x7c33f
diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm
deleted file mode 100755
index b7d6ca2f..00000000
--- a/audio/sfx/sfx_1f_0d.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0d_Ch1: ; 7c33f (1f:433f)
-	unknownnoise0x20 0, 162, 17
-	endchannel
-; 0x7c343
diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm
deleted file mode 100755
index 397d78b1..00000000
--- a/audio/sfx/sfx_1f_0e.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
-; 0x7c347
diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
deleted file mode 100755
index b0fe8073..00000000
--- a/audio/sfx/sfx_1f_11.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_11_Ch1: ; 7c355 (1f:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
-; 0x7c359
diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm
deleted file mode 100755
index 8fc78082..00000000
--- a/audio/sfx/sfx_1f_12.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_12_Ch1: ; 7c359 (1f:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
-; 0x7c35d
diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm
deleted file mode 100755
index 831d50c4..00000000
--- a/audio/sfx/sfx_1f_13.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_13_Ch1: ; 7c35d (1f:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
-; 0x7c361
diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/shooting_star.asm
index 0ba27bad..2cb831c8 100755..100644
--- a/audio/sfx/sfx_1f_67.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,4 +1,4 @@
-SFX_1f_67_Ch1: ; 7c72d (1f:472d)
+SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d)
 	dutycycle 228
 	unknownsfx0x10 47
 	unknownsfx0x20 4, 64, 224, 7
@@ -12,4 +12,3 @@ SFX_1f_67_Ch1: ; 7c72d (1f:472d)
 	unknownsfx0x20 15, 18, 224, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c758
diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/shrink_1.asm
index 58dc2934..61ca1933 100755..100644
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_48_Ch1: ; 854e (2:454e)
+SFX_Shrink_1_Ch1: ; 854e (2:454e)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
@@ -8,4 +8,3 @@ SFX_02_48_Ch1: ; 854e (2:454e)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x8569
diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/shrink_3.asm
index c0854070..59fe1556 100755..100644
--- a/audio/sfx/sfx_1f_48.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_48_Ch1: ; 7c52b (1f:452b)
+SFX_Shrink_3_Ch1: ; 7c52b (1f:452b)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
@@ -8,4 +8,3 @@ SFX_1f_48_Ch1: ; 7c52b (1f:452b)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c546
diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/silph_scope.asm
index 54a0aa3b..66e4fe95 100755..100644
--- a/audio/sfx/sfx_08_77.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,4 +1,4 @@
-SFX_08_77_Ch1: ; 20412 (8:4412)
+SFX_Silph_Scope_Ch1: ; 20412 (8:4412)
 	duty 0
 	unknownsfx0x20 0, 210, 0, 7
 	unknownsfx0x20 0, 210, 64, 7
@@ -7,4 +7,3 @@ SFX_08_77_Ch1: ; 20412 (8:4412)
 	unknownsfx0x20 10, 225, 224, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x2042d
diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/slots_new_spin.asm
index 7ffa9bd2..d122517d 100755..100644
--- a/audio/sfx/sfx_1f_66.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,4 +1,4 @@
-SFX_1f_66_Ch1: ; 7c70f (1f:470f)
+SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f)
 	duty 3
 	unknownsfx0x20 5, 225, 0, 7
 	unknownsfx0x20 2, 225, 128, 7
@@ -6,10 +6,9 @@ SFX_1f_66_Ch1: ; 7c70f (1f:470f)
 	endchannel
 
 
-SFX_1f_66_Ch2: ; 7c71e (1f:471e)
+SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e)
 	duty 2
 	unknownsfx0x20 4, 193, 193, 6
 	unknownsfx0x20 2, 193, 65, 7
 	unknownsfx0x20 15, 209, 129, 7
 	endchannel
-; 0x7c72d
diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/slots_reward.asm
index 1f262365..2400c0df 100755..100644
--- a/audio/sfx/sfx_1f_65.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,6 +1,5 @@
-SFX_1f_65_Ch1: ; 7c704 (1f:4704)
+SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704)
 	duty 2
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
 	endchannel
-; 0x7c70f
diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/slots_stop_wheel.asm
index 3e6ec789..e67af4c4 100755..100644
--- a/audio/sfx/sfx_1f_64.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,7 +1,6 @@
-SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
+SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5)
 	duty 2
 	unknownsfx0x20 1, 242, 160, 6
 	unknownsfx0x20 1, 242, 224, 6
 	unknownsfx0x20 8, 241, 0, 7
 	endchannel
-; 0x7c704
diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/snare1_1.asm
index dfae6786..3aa0f74e 100755..100644
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_01_Ch1: ; 82fd (2:42fd)
+SFX_Snare1_1_Ch1: ; 82fd (2:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x8301
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm
new file mode 100644
index 00000000..7d0c3413
--- /dev/null
+++ b/audio/sfx/snare1_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare1_2_Ch1: ; 202fd (8:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm
new file mode 100644
index 00000000..8d92bff6
--- /dev/null
+++ b/audio/sfx/snare1_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/snare2_1.asm
index 8d0f3a34..7636a4f3 100755..100644
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_02_Ch1: ; 8301 (2:4301)
+SFX_Snare2_1_Ch1: ; 8301 (2:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x8305
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm
new file mode 100644
index 00000000..4c34e91a
--- /dev/null
+++ b/audio/sfx/snare2_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare2_2_Ch1: ; 20301 (8:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm
new file mode 100644
index 00000000..eb816f54
--- /dev/null
+++ b/audio/sfx/snare2_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare2_3_Ch1: ; 7c301 (1f:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/snare3_1.asm
index 9b8745e7..b7e319b2 100755..100644
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_03_Ch1: ; 8305 (2:4305)
+SFX_Snare3_1_Ch1: ; 8305 (2:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x8309
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm
new file mode 100644
index 00000000..ce889e55
--- /dev/null
+++ b/audio/sfx/snare3_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare3_2_Ch1: ; 20305 (8:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm
new file mode 100644
index 00000000..c94f436f
--- /dev/null
+++ b/audio/sfx/snare3_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare3_3_Ch1: ; 7c305 (1f:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/snare4_1.asm
index a0fe41e3..20c62731 100755..100644
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,4 +1,3 @@
-SFX_02_04_Ch1: ; 8309 (2:4309)
+SFX_Snare4_1_Ch1: ; 8309 (2:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x830d
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm
new file mode 100644
index 00000000..da38dd62
--- /dev/null
+++ b/audio/sfx/snare4_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare4_2_Ch1: ; 20309 (8:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm
new file mode 100644
index 00000000..4496260b
--- /dev/null
+++ b/audio/sfx/snare4_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare4_3_Ch1: ; 7c309 (1f:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/snare5_1.asm
index f5df11e2..e0ae8b4c 100755..100644
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,4 +1,4 @@
-SFX_02_05_Ch1: ; 830d (2:430d)
+SFX_Snare5_1_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -6,4 +6,3 @@ SFX_02_05_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x8320
diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/snare5_2.asm
index 1568969c..649463cc 100755..100644
--- a/audio/sfx/sfx_08_05.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,4 +1,4 @@
-SFX_08_05_Ch1: ; 2030d (8:430d)
+SFX_Snare5_2_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -6,4 +6,3 @@ SFX_08_05_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x20320
diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/snare5_3.asm
index 1edcdf20..33a169b9 100755..100644
--- a/audio/sfx/sfx_1f_05.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_05_Ch1: ; 7c30d (1f:430d)
+SFX_Snare5_3_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -6,4 +6,3 @@ SFX_1f_05_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x7c320
diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/snare6_1.asm
index 606587a0..4779226f 100755..100644
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,4 +1,3 @@
-SFX_02_08_Ch1: ; 832b (2:432b)
+SFX_Snare6_1_Ch1: ; 832b (2:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x832f
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm
new file mode 100644
index 00000000..36359d02
--- /dev/null
+++ b/audio/sfx/snare6_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare6_2_Ch1: ; 2032b (8:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm
new file mode 100644
index 00000000..d4807ff6
--- /dev/null
+++ b/audio/sfx/snare6_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare6_3_Ch1: ; 7c32b (1f:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/snare7_1.asm
index 6b35f5aa..c53642ed 100755..100644
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,4 +1,3 @@
-SFX_02_09_Ch1: ; 832f (2:432f)
+SFX_Snare7_1_Ch1: ; 832f (2:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x8333
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm
new file mode 100644
index 00000000..066aaa53
--- /dev/null
+++ b/audio/sfx/snare7_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare7_2_Ch1: ; 2032f (8:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm
new file mode 100644
index 00000000..1b058a9b
--- /dev/null
+++ b/audio/sfx/snare7_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare7_3_Ch1: ; 7c32f (1f:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/snare8_1.asm
index cf9539b6..6269c7dc 100755..100644
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0a_Ch1: ; 8333 (2:4333)
+SFX_Snare8_1_Ch1: ; 8333 (2:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x8337
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm
new file mode 100644
index 00000000..4c5bb18e
--- /dev/null
+++ b/audio/sfx/snare8_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare8_2_Ch1: ; 20333 (8:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm
new file mode 100644
index 00000000..d1f0edc0
--- /dev/null
+++ b/audio/sfx/snare8_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare8_3_Ch1: ; 7c333 (1f:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/snare9_1.asm
index f6142168..44b2e8c7 100755..100644
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0b_Ch1: ; 8337 (2:4337)
+SFX_Snare9_1_Ch1: ; 8337 (2:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x833b
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm
new file mode 100644
index 00000000..1d20de2d
--- /dev/null
+++ b/audio/sfx/snare9_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare9_2_Ch1: ; 20337 (8:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm
new file mode 100644
index 00000000..849f4404
--- /dev/null
+++ b/audio/sfx/snare9_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare9_3_Ch1: ; 7c337 (1f:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/ss_anne_horn_1.asm
index b15a29cc..3989c148 100755..100644
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,4 +1,4 @@
-SFX_02_54_Ch1: ; 866d (2:466d)
+SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_02_54_Ch1: ; 866d (2:466d)
 	endchannel
 
 
-SFX_02_54_Ch2: ; 868c (2:468c)
+SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
@@ -20,4 +20,3 @@ SFX_02_54_Ch2: ; 868c (2:468c)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x86ab
diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/ss_anne_horn_3.asm
index 1a6a1031..c671b6cb 100755..100644
--- a/audio/sfx/sfx_1f_54.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_54_Ch1: ; 7c64a (1f:464a)
+SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_1f_54_Ch1: ; 7c64a (1f:464a)
 	endchannel
 
 
-SFX_1f_54_Ch2: ; 7c669 (1f:4669)
+SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
@@ -20,4 +20,3 @@ SFX_1f_54_Ch2: ; 7c669 (1f:4669)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x7c688
diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/start_menu_1.asm
index 57d5feca..350b08ce 100755..100644
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,5 +1,4 @@
-SFX_02_3f_Ch1: ; 83c3 (2:43c3)
+SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x83ca
diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/start_menu_2.asm
index 6351f53c..aabd41ce 100755..100644
--- a/audio/sfx/sfx_08_3f.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,5 +1,4 @@
-SFX_08_3f_Ch1: ; 203d6 (8:43d6)
+SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x203dd
diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/start_menu_3.asm
index 017daf8a..566f11f4 100755..100644
--- a/audio/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
+SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x7c3ca
diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/super_effective.asm
index 788ac25e..6759ef6a 100755..100644
--- a/audio/sfx/sfx_08_5a.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,5 +1,4 @@
-SFX_08_5a_Ch1: ; 20574 (8:4574)
+SFX_Super_Effective_Ch1: ; 20574 (8:4574)
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
-; 0x2057b
diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/swap_1.asm
index bf45fc6c..c96d8522 100755..100644
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,12 +1,11 @@
-SFX_02_58_Ch1: ; 83f8 (2:43f8)
+SFX_Swap_1_Ch1: ; 83f8 (2:43f8)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_02_58_Ch2: ; 83ff (2:43ff)
+SFX_Swap_1_Ch2: ; 83ff (2:43ff)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x840a
diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/swap_3.asm
index 6a27c732..95aa3f19 100755..100644
--- a/audio/sfx/sfx_1f_58.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,12 +1,11 @@
-SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1)
+SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
+SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x7c3f3
diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/switch_1.asm
index d2a9922b..040e95aa 100755..100644
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,4 +1,4 @@
-SFX_02_49_Ch1: ; 8569 (2:4569)
+SFX_Switch_1_Ch1: ; 8569 (2:4569)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
@@ -6,4 +6,3 @@ SFX_02_49_Ch1: ; 8569 (2:4569)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x8580
diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/switch_3.asm
index f1ae8229..cbe6c8b2 100755..100644
--- a/audio/sfx/sfx_1f_49.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_49_Ch1: ; 7c546 (1f:4546)
+SFX_Switch_3_Ch1: ; 7c546 (1f:4546)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
@@ -6,4 +6,3 @@ SFX_1f_49_Ch1: ; 7c546 (1f:4546)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x7c55d
diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/teleport_enter1_1.asm
index 4bd47818..f9fc5ee2 100755..100644
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4c_Ch1: ; 85b0 (2:45b0)
+SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
@@ -8,4 +8,3 @@ SFX_02_4c_Ch1: ; 85b0 (2:45b0)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85cb
diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/teleport_enter1_3.asm
index 1f55c9c2..24220173 100755..100644
--- a/audio/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
+SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
@@ -8,4 +8,3 @@ SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5a8
diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/teleport_enter2_1.asm
index 268586bb..c3c593b2 100755..100644
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4f_Ch1: ; 85e1 (2:45e1)
+SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x85ee
diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/teleport_enter2_3.asm
index 5b73d196..628bb9fa 100755..100644
--- a/audio/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
+SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x7c5cb
diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/teleport_exit1_1.asm
index 5826cf25..46ba29cf 100755..100644
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4b_Ch1: ; 8595 (2:4595)
+SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
@@ -8,4 +8,3 @@ SFX_02_4b_Ch1: ; 8595 (2:4595)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x85b0
diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/teleport_exit1_3.asm
index 2dc74200..8d203212 100755..100644
--- a/audio/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
+SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
@@ -8,4 +8,3 @@ SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c58d
diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/teleport_exit2_1.asm
index b3028e82..37159083 100755..100644
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4d_Ch1: ; 85cb (2:45cb)
+SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85d6
diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/teleport_exit2_3.asm
index 9c5686ec..c7ad054b 100755..100644
--- a/audio/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
+SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5b3
diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/tink_1.asm
index 24858e3e..a8099ae1 100755..100644
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3c_Ch1: ; 840a (2:440a)
+SFX_Tink_1_Ch1: ; 840a (2:440a)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -6,4 +6,3 @@ SFX_02_3c_Ch1: ; 840a (2:440a)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x841b
diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/tink_2.asm
index 2bbc9caf..cca37381 100755..100644
--- a/audio/sfx/sfx_08_3c.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3c_Ch1: ; 203dd (8:43dd)
+SFX_Tink_2_Ch1: ; 203dd (8:43dd)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -6,4 +6,3 @@ SFX_08_3c_Ch1: ; 203dd (8:43dd)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x203ee
diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/tink_3.asm
index 051a4376..7299b7ae 100755..100644
--- a/audio/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
+SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -6,4 +6,3 @@ SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x7c404
diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/trade_machine_1.asm
index 594b4b17..ce2bbc0a 100755..100644
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,8 +1,7 @@
-SFX_02_44_Ch1: ; 84ee (2:44ee)
+SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84fd
diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/trade_machine_3.asm
index 4efbe345..f7515ffb 100755..100644
--- a/audio/sfx/sfx_1f_44.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
+SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4d6
diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/triangle1_1.asm
index cccff91b..fded5b94 100755..100644
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_06_Ch1: ; 8320 (2:4320)
+SFX_Triangle1_1_Ch1: ; 8320 (2:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x8324
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm
new file mode 100644
index 00000000..4f4474ee
--- /dev/null
+++ b/audio/sfx/triangle1_2.asm
@@ -0,0 +1,3 @@
+SFX_Triangle1_2_Ch1: ; 20320 (8:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm
new file mode 100644
index 00000000..d1ad9390
--- /dev/null
+++ b/audio/sfx/triangle1_3.asm
@@ -0,0 +1,3 @@
+SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/triangle2_1.asm
index d960c62e..f9c4bc6a 100755..100644
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,5 +1,4 @@
-SFX_02_07_Ch1: ; 8324 (2:4324)
+SFX_Triangle2_1_Ch1: ; 8324 (2:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x832b
diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/triangle2_2.asm
index 7392a1d8..feddf1af 100755..100644
--- a/audio/sfx/sfx_08_07.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,5 +1,4 @@
-SFX_08_07_Ch1: ; 20324 (8:4324)
+SFX_Triangle2_2_Ch1: ; 20324 (8:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x2032b
diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/triangle2_3.asm
index 0471d63a..a4acff1b 100755..100644
--- a/audio/sfx/sfx_1f_07.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_07_Ch1: ; 7c324 (1f:4324)
+SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x7c32b
diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/triangle3_1.asm
index 04d67fba..e4c3c919 100755..100644
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,5 +1,4 @@
-SFX_02_10_Ch1: ; 834e (2:434e)
+SFX_Triangle3_1_Ch1: ; 834e (2:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x8355
diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/triangle3_2.asm
index 6399a966..7a642878 100755..100644
--- a/audio/sfx/sfx_08_10.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,5 +1,4 @@
-SFX_08_10_Ch1: ; 2034e (8:434e)
+SFX_Triangle3_2_Ch1: ; 2034e (8:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x20355
diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/triangle3_3.asm
index 34bd5cd2..73ad42ce 100755..100644
--- a/audio/sfx/sfx_1f_10.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_10_Ch1: ; 7c34e (1f:434e)
+SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x7c355
diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/turn_off_pc_1.asm
index acd5299c..7b4e999d 100755..100644
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,8 +1,7 @@
-SFX_02_46_Ch1: ; 8528 (2:4528)
+SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x853b
diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/turn_off_pc_3.asm
index 3989bd00..057ab9a4 100755..100644
--- a/audio/sfx/sfx_1f_46.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_46_Ch1: ; 7c505 (1f:4505)
+SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c518
diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/turn_on_pc_1.asm
index 38243a99..b537791c 100755..100644
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_02_45_Ch1: ; 84fd (2:44fd)
+SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
@@ -11,4 +11,3 @@ SFX_02_45_Ch1: ; 84fd (2:44fd)
 	unknownsfx0x20 3, 161, 192, 7
 	unknownsfx0x20 8, 161, 0, 7
 	endchannel
-; 0x8528
diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/turn_on_pc_3.asm
index e64cb337..df654cfa 100755..100644
--- a/audio/sfx/sfx_1f_45.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
+SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
@@ -12,4 +12,3 @@ SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
 	unknownsfx0x20 3, 129, 192, 7
 	unknownsfx0x20 3, 129, 0, 7
 	endchannel
-; 0x7c505
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/unused2_2.asm
index e69ec72d..1eca4432 100755..100644
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/unused2_2.asm
@@ -54,4 +54,3 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359)
 	B_ 4
 	rest 4
 	endchannel
-; 0x22370
diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/unused_1.asm
index 919d7319..bd9bdfb3 100755..100644
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/unused_1.asm
@@ -29,4 +29,3 @@ SFX_02_unused_Ch3: ; 8719 (2:4719)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x872f
diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/unused_2.asm
index 857502d3..25e4840c 100755..100644
--- a/audio/sfx/sfx_08_unused.asm
+++ b/audio/sfx/unused_2.asm
@@ -29,4 +29,3 @@ SFX_08_unused_Ch3: ; 209c1 (8:49c1)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x209d7
diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/unused_3.asm
index c4109f17..dfb16ee1 100755..100644
--- a/audio/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/unused_3.asm
@@ -29,4 +29,3 @@ SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x7c7a4
diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/vine_whip.asm
index 50b73f0d..c1e610b6 100755..100644
--- a/audio/sfx/sfx_08_55.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,4 +1,4 @@
-SFX_08_55_Ch1: ; 20533 (8:4533)
+SFX_Vine_Whip_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 1, 194, 51
 	unknownnoise0x20 2, 242, 33
 	unknownnoise0x20 1, 226, 51
@@ -8,4 +8,3 @@ SFX_08_55_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 12, 145, 16
 	unknownnoise0x20 8, 242, 65
 	endchannel
-; 0x2054c
diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/withdraw_deposit_1.asm
index e4d46f3a..bb7a8d6e 100755..100644
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,4 +1,4 @@
-SFX_02_55_Ch1: ; 86ab (2:46ab)
+SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
@@ -10,4 +10,3 @@ SFX_02_55_Ch1: ; 86ab (2:46ab)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x86c8
diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/withdraw_deposit_3.asm
index 3622e334..99e47fee 100755..100644
--- a/audio/sfx/sfx_1f_55.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_55_Ch1: ; 7c688 (1f:4688)
+SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
@@ -10,4 +10,3 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6a5