Update to latest pokered

author: einstein95 <einstein95@users.noreply.github.com> 2016-12-27 11:57:05 +1300
committer: einstein95 <einstein95@users.noreply.github.com> 2016-12-27 11:57:05 +1300
commit: f73893db566c67ee9e1b4b6b309853503351d8ca (patch)
tree: 6b420d9e1ab47f11bf6240b48d237c810f4b6aa1 /audio
parent: fde4f79b3ba6a6653b91801e26865155b89a6be0 (diff)
378 files changed, 1314 insertions, 2475 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 36f5db5a..f762da29 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,7 +1,7 @@
 ; The first of three duplicated sound engines.
 
 Audio1_UpdateMusic::
-	ld c, CH0
+	ld c, Ch0
 .loop
 	ld b, 0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio1_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,7 +30,7 @@ Audio1_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
-	cp CH7
+	cp Ch7
 	jr nz, .loop
 	ret
 
@@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -171,7 +171,7 @@ Audio1_endchannel:
 	bit BIT_CHANNEL_CALL, [hl]
 	jr nz, .returnFromCall
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nc, .noiseOrSfxChannel
 	jr .disableChannelOutput
 .noiseOrSfxChannel
@@ -179,7 +179,7 @@ Audio1_endchannel:
 	ld hl, wChannelFlags2
 	add hl, bc
 	res BIT_EXECUTE_MUSIC, [hl]
-	cp CH6
+	cp Ch6
 	jr nz, .skipSfxChannel3
 ; restart hardware channel 3 (wave channel) output
 	ld a, $0
@@ -223,19 +223,19 @@ Audio1_endchannel:
 	and [hl]
 	ld [rNR51], a
 .asm_9248
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp CRY_SFX_START
 	jr nc, .asm_9251
 	jr .skipCry
 .asm_9251
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp CRY_SFX_END
 	jr z, .skipCry
 	jr c, .cry
 	jr .skipCry
 .cry
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr z, .asm_9265
 	call Audio1_GoBackOneCommandIfCry
 	ret c
@@ -336,14 +336,14 @@ Audio1_notetype:
 	add hl, bc
 	ld [hl], a ; store low nibble as speed
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio1_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
-	cp CH6
+	cp Ch6
 	jr nz, .skipChannel3
 	ld hl, wSfxWaveInstrument
 	jr .channel3
@@ -477,7 +477,7 @@ Audio1_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio1_stereopanning ; no
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	call Audio1_GetNextMusicByte
 	ld [wMusicTempo], a ; store first param
@@ -520,10 +520,10 @@ Audio1_unknownmusic0xef:
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .skip
-	ld a, [wChannelSoundIDs + CH7]
+	ld a, [wChannelSoundIDs + Ch7]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + CH7], a
+	ld [wChannelSoundIDs + Ch7], a
 .skip
 	jp Audio1_endchannel
 
@@ -576,7 +576,7 @@ Audio1_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio1_unknownsfx0x10
 	ld a, c
-	cp CH3 ; is this a noise or sfx channel?
+	cp Ch3 ; is this a noise or sfx channel?
 	jr c, Audio1_unknownsfx0x10 ; no
 	ld b, 0
 	ld hl, wChannelFlags2
@@ -606,7 +606,7 @@ Audio1_unknownsfx0x20:
 	call Audio1_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	ld a, 0
 	jr z, .skip
 ; Channels 1 through 3 have 2 registers that control frequency, but the noise
@@ -626,7 +626,7 @@ Audio1_unknownsfx0x20:
 
 Audio1_unknownsfx0x10:
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr c, Audio1_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
@@ -642,7 +642,7 @@ Audio1_unknownsfx0x10:
 
 Audio1_note:
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nz, Audio1_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -690,7 +690,7 @@ Audio1_notelength:
 	ld l, b
 	call Audio1_MultiplyAdd
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -700,7 +700,7 @@ Audio1_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp CH7
+	cp Ch7
 	jr z, .skip ; if noise channel
 	call Audio1_SetSfxTempo
 	ld a, [wSfxTempo]
@@ -740,10 +740,10 @@ Audio1_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .next
 ; If this isn't an SFX channel, try the corresponding SFX channel.
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -751,9 +751,9 @@ Audio1_notepitch:
 	; fall through
 .next
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3
-	cp CH6
+	cp Ch6
 	jr nz, .notChannel3
 .channel3
 	ld b, 0
@@ -789,10 +789,10 @@ Audio1_notepitch:
 .skipPitchBend
 	push de
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel ; if sfx channel
 ; If this isn't an SFX channel, try the corresponding SFX channel.
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld d, 0
 	ld e, a
 	add hl, de
@@ -837,12 +837,12 @@ Audio1_EnableChannelOutput:
 	or [hl] ; set this channel's bits
 	ld d, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	jr z, .noiseChannelOrNoSfx
-	cp CH4
+	cp Ch4
 	jr nc, .skip ; if sfx channel
 ; If this isn't an SFX channel, try the corresponding SFX channel.
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -872,9 +872,9 @@ Audio1_ApplyDutyAndSoundLength:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .skipDuty ; if music channel 3
-	cp CH6
+	cp Ch6
 	jr z, .skipDuty ; if sfx channel 3
 ; include duty (except on channel 3 which doesn't have it)
 	ld a, d
@@ -893,15 +893,15 @@ Audio1_ApplyDutyAndSoundLength:
 
 Audio1_ApplyWavePatternAndFrequency:
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3
-	cp CH6
+	cp Ch6
 	jr nz, .notChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp CH2
+	cp Ch2
 	jr z, .next
 	ld de, wSfxWaveInstrument
 .next
@@ -1005,7 +1005,7 @@ Audio1_GoBackOneCommandIfCry:
 
 Audio1_IsCry:
 ; Returns whether the currently playing audio is a cry in carry.
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp CRY_SFX_START
 	jr nc, .next
 	jr .no
@@ -1541,7 +1541,7 @@ Audio1_PlaySound::
 	add hl, de
 	ld [hl], a
 	ld a, e
-	cp CH4
+	cp Ch4
 	jr nz, .asm_9a2b
 	ld a, $8
 	ld [rNR10], a ; sweep off
@@ -1643,7 +1643,7 @@ Audio1_PlaySound::
 	ld a, [wSoundID]
 	ld [hl], a
 	pop af
-	cp CH3
+	cp Ch3
 	jr c, .skipSettingFlag
 	ld hl, wChannelFlags1
 	add hl, bc
@@ -1675,12 +1675,12 @@ Audio1_PlaySound::
 	jr c, .cry
 	jr .done
 .cry
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer
+	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer
 	ld de, Audio1_CryEndchannel
 	ld [hl], e
 	inc hl
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 26cef4bd..7f31d88b 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,7 +1,7 @@
 ; The second of three duplicated sound engines.
 
 Audio2_UpdateMusic::
-	ld c, CH0
+	ld c, Ch0
 .loop
 	ld b, $0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio2_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,18 +30,18 @@ Audio2_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c
-	cp CH7
+	cp Ch7
 	jr nz, .loop
 	ret
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
 ; 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
+;   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
 Audio2_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
@@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -160,7 +160,7 @@ Audio2_PlayNextNote:
 	res 4, [hl]
 	res 5, [hl]
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nz, .beginChecks
 	ld a, [wLowHealthAlarm] ;low health alarm enabled?
 	bit 7, a
@@ -180,7 +180,7 @@ Audio2_endchannel:
 	bit 1, [hl]
 	jr nz, .returnFromCall
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nc, .noiseOrSfxChannel
 	jr .asm_219c0
 .noiseOrSfxChannel
@@ -188,7 +188,7 @@ Audio2_endchannel:
 	ld hl, wChannelFlags2
 	add hl, bc
 	res 0, [hl]
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 	ld a, $0
 	ld [rNR30], a
@@ -231,19 +231,19 @@ Audio2_endchannel:
 	and [hl]
 	ld [rNR51], a
 .asm_219c9
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $14
 	jr nc, .asm_219d2
 	jr .asm_219ef
 .asm_219d2
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $86
 	jr z, .asm_219ef
 	jr c, .asm_219dd
 	jr .asm_219ef
 .asm_219dd
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr z, .asm_219e6
 	call Audio2_21e6d
 	ret c
@@ -344,14 +344,14 @@ Audio2_notetype:
 	add hl, bc
 	ld [hl], a ; store low nibble as speed
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio2_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
-	cp CH6
+	cp Ch6
 	jr nz, .notChannel3
 	ld hl, wSfxWaveInstrument
 	jr .sfxChannel3
@@ -471,7 +471,7 @@ Audio2_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	call Audio2_GetNextMusicByte
 	ld [wMusicTempo], a ; store first param
@@ -514,10 +514,10 @@ Audio2_unknownmusic0xef:
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .skip
-	ld a, [wChannelSoundIDs + CH7]
+	ld a, [wChannelSoundIDs + Ch7]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + CH7], a
+	ld [wChannelSoundIDs + Ch7], a
 .skip
 	jp Audio2_endchannel
 
@@ -570,7 +570,7 @@ Audio2_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio2_unknownsfx0x10 ; no
 	ld a, c
-	cp CH3 ; is this a noise or sfx channel?
+	cp Ch3 ; is this a noise or sfx channel?
 	jr c, Audio2_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -596,7 +596,7 @@ Audio2_unknownsfx0x20:
 	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
@@ -613,7 +613,7 @@ Audio2_unknownsfx0x20:
 
 Audio2_unknownsfx0x10:
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr c, Audio2_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
@@ -629,7 +629,7 @@ Audio2_unknownsfx0x10:
 
 Audio2_note:
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nz, Audio2_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -677,7 +677,7 @@ Audio2_notelength:
 	ld l, b
 	call Audio2_22006
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -687,7 +687,7 @@ Audio2_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp CH7
+	cp Ch7
 	jr z, .skip ; if noise channel
 	call Audio2_21e2f
 	ld a, [wSfxTempo]
@@ -727,9 +727,9 @@ Audio2_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -737,9 +737,9 @@ Audio2_notepitch:
 	; fall through
 .sfxChannel
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 .musicChannel3
 	ld b, $0
@@ -775,9 +775,9 @@ Audio2_notepitch:
 .asm_21d39
 	push de
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -822,11 +822,11 @@ Audio2_21d79:
 	or [hl]
 	ld d, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	jr z, .sfxNoiseChannel
-	cp CH4
+	cp Ch4
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -854,9 +854,9 @@ Audio2_21daa:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3 ; if music channel 3
-	cp CH6
+	cp Ch6
 	jr z, .channel3 ; if sfx channel 3
 	ld a, d
 	and $3f
@@ -874,15 +874,15 @@ Audio2_21daa:
 
 Audio2_21dcc:
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
 	ld de, wSfxWaveInstrument
 .musicChannel3
@@ -921,7 +921,7 @@ Audio2_21dcc:
 	inc hl
 	ld [hl], d
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr c, .musicChannel
 	call Audio2_21e56
 .musicChannel
@@ -929,7 +929,7 @@ Audio2_21dcc:
 
 Audio2_21e19:
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nz, .asm_21e2e
 	ld a, [wLowHealthAlarm]
 	bit 7, a
@@ -1008,7 +1008,7 @@ Audio2_21e6d:
 	ret
 
 Audio2_21e8b:
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $14
 	jr nc, .asm_21e94
 	jr .asm_21e9a
@@ -1025,9 +1025,9 @@ Audio2_21e8b:
 	ret
 
 Audio2_21e9f:
-	ld a, [wChannelSoundIDs + CH7]
+	ld a, [wChannelSoundIDs + Ch7]
 	ld b, a
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	or b
 	cp $9d
 	jr nc, .asm_21ead
@@ -1313,7 +1313,7 @@ Audio2_22017:
 	ld d, [hl]
 	ld a, b
 .loop
-	cp CH7
+	cp Ch7
 	jr z, .done
 	sra d
 	rr e
@@ -1682,12 +1682,12 @@ Audio2_2224e:
 	jr c, .asm_222b5
 	jr .asm_222d4
 .asm_222b5
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer
 	ld de, Noise2_endchannel
 	ld [hl], e
 	inc hl
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 33baa5c6..bd784023 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,7 +1,7 @@
 ; The third of three duplicated sound engines.
 
 Audio3_UpdateMusic::
-	ld c, CH0
+	ld c, Ch0
 .loop
 	ld b, $0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio3_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,18 +30,18 @@ Audio3_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
-	cp CH7
+	cp Ch7
 	jr nz, .loop
 	ret
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
 ; 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
+;   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
 Audio3_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
@@ -52,9 +52,9 @@ Audio3_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -173,7 +173,7 @@ Audio3_endchannel:
 	bit 1, [hl]
 	jr nz, .returnFromCall
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nc, .noiseOrSfxChannel
 	jr .asm_7d2b3
 .noiseOrSfxChannel
@@ -181,7 +181,7 @@ Audio3_endchannel:
 	ld hl, wChannelFlags2
 	add hl, bc
 	res 0, [hl]
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 	ld a, $0
 	ld [rNR30], a
@@ -224,19 +224,19 @@ Audio3_endchannel:
 	and [hl]
 	ld [rNR51], a
 .asm_7d2bc
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $14
 	jr nc, .asm_7d2c5
 	jr .asm_7d2e2
 .asm_7d2c5
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $86
 	jr z, .asm_7d2e2
 	jr c, .asm_7d2d0
 	jr .asm_7d2e2
 .asm_7d2d0
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr z, .asm_7d2d9
 	call Audio3_7d73b
 	ret c
@@ -337,14 +337,14 @@ Audio3_notetype:
 	add hl, bc
 	ld [hl], a ; store low nibble as speed
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio3_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
-	cp CH6
+	cp Ch6
 	jr nz, .notChannel3
 	ld hl, wSfxWaveInstrument
 	jr .sfxChannel3
@@ -464,7 +464,7 @@ Audio3_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio3_stereopanning ; no
 	ld a, c ; yes
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	call Audio3_GetNextMusicByte
 	ld [wMusicTempo], a ; store first param
@@ -507,10 +507,10 @@ Audio3_unknownmusic0xef:
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .skip
-	ld a, [wChannelSoundIDs + CH7]
+	ld a, [wChannelSoundIDs + Ch7]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + CH7], a
+	ld [wChannelSoundIDs + Ch7], a
 .skip
 	jp Audio3_endchannel
 
@@ -563,7 +563,7 @@ Audio3_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio3_unknownsfx0x10 ; no
 	ld a, c
-	cp CH3 ; is this a noise or sfx channel?
+	cp Ch3 ; is this a noise or sfx channel?
 	jr c, Audio3_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -589,7 +589,7 @@ Audio3_unknownsfx0x20:
 	call Audio3_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
@@ -606,7 +606,7 @@ Audio3_unknownsfx0x20:
 
 Audio3_unknownsfx0x10:
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr c, Audio3_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command an unknownsfx0x10?
@@ -622,7 +622,7 @@ Audio3_unknownsfx0x10:
 
 Audio3_note:
 	ld a, c
-	cp CH3
+	cp Ch3
 	jr nz, Audio3_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -670,7 +670,7 @@ Audio3_notelength:
 	ld l, b
 	call Audio3_7d8bb
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -680,7 +680,7 @@ Audio3_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp CH7
+	cp Ch7
 	jr z, .skip ; if noise channel
 	call Audio3_7d707
 	ld a, [wSfxTempo]
@@ -720,9 +720,9 @@ Audio3_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .sfxChannel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -730,9 +730,9 @@ Audio3_notepitch:
 	; fall through
 .sfxChannel
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 .musicChannel3
 	ld b, $0
@@ -768,9 +768,9 @@ Audio3_notepitch:
 .asm_7d62c
 	push de
 	ld a, c
-	cp CH4
+	cp Ch4
 	jr nc, .skip ; if sfx Channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -815,11 +815,11 @@ Audio3_7d66c:
 	or [hl]
 	ld d, a
 	ld a, c
-	cp CH7
+	cp Ch7
 	jr z, .sfxNoiseChannel
-	cp CH4
+	cp Ch4
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -847,9 +847,9 @@ Audio3_7d69d:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3 ; if music channel 3
-	cp CH6
+	cp Ch6
 	jr z, .channel3 ; if sfx channel 3
 	ld a, d
 	and $3f
@@ -867,15 +867,15 @@ Audio3_7d69d:
 
 Audio3_7d6bf:
 	ld a, c
-	cp CH2
+	cp Ch2
 	jr z, .channel3
-	cp CH6
+	cp Ch6
 	jr nz, .notSfxChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp CH2
+	cp Ch2
 	jr z, .musicChannel3
 	ld de, wSfxWaveInstrument
 .musicChannel3
@@ -977,7 +977,7 @@ Audio3_7d73b:
 	ret
 
 Audio3_7d759:
-	ld a, [wChannelSoundIDs + CH4]
+	ld a, [wChannelSoundIDs + Ch4]
 	cp $14
 	jr nc, .asm_7d762
 	jr .asm_7d768
@@ -1631,12 +1631,12 @@ Audio3_7db03:
 	jr c, .asm_7db6a
 	jr .asm_7db89
 .asm_7db6a
-	ld hl, wChannelSoundIDs + CH4
+	ld hl, wChannelSoundIDs + Ch4
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer
 	ld de, Noise3_endchannel
 	ld [hl], e
 	inc hl
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index 5a762b30..38594d41 100755
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,184 +1,66 @@
 Music_PalletTown::
-	db ( $80 | CH0 )
-	dw Music_PalletTown_Ch1
-	db CH1
-	dw Music_PalletTown_Ch2
-	db CH2
-	dw Music_PalletTown_Ch3
+	audio Music_PalletTown, Ch0, Ch1, Ch2
 
 Music_Pokecenter::
-	db ( $80 | CH0 )
-	dw Music_Pokecenter_Ch1
-	db CH1
-	dw Music_Pokecenter_Ch2
-	db CH2
-	dw Music_Pokecenter_Ch3
+	audio Music_Pokecenter, Ch0, Ch1, Ch2
 
 Music_Gym::
-	db ( $80 | CH0 )
-	dw Music_Gym_Ch1
-	db CH1
-	dw Music_Gym_Ch2
-	db CH2
-	dw Music_Gym_Ch3
+	audio Music_Gym, Ch0, Ch1, Ch2
 
 ; Viridian City, Pewter City, Saffron City
 Music_Cities1::
-	db ( $C0 | CH0 )
-	dw Music_Cities1_Ch1
-	db CH1
-	dw Music_Cities1_Ch2
-	db CH2
-	dw Music_Cities1_Ch3
-	db CH3
-	dw Music_Cities1_Ch4
+	audio Music_Cities1, Ch0, Ch1, Ch2, Ch3
 
 ; Cerulean City, Fuchsia City
 Music_Cities2::
-	db ( $80 | CH0 )
-	dw Music_Cities2_Ch1
-	db CH1
-	dw Music_Cities2_Ch2
-	db CH2
-	dw Music_Cities2_Ch3
+	audio Music_Cities2, Ch0, Ch1, Ch2
 
 Music_Celadon::
-	db ( $80 | CH0 )
-	dw Music_Celadon_Ch1
-	db CH1
-	dw Music_Celadon_Ch2
-	db CH2
-	dw Music_Celadon_Ch3
+	audio Music_Celadon, Ch0, Ch1, Ch2
 
 Music_Cinnabar::
-	db ( $80 | CH0 )
-	dw Music_Cinnabar_Ch1
-	db CH1
-	dw Music_Cinnabar_Ch2
-	db CH2
-	dw Music_Cinnabar_Ch3
+	audio Music_Cinnabar, Ch0, Ch1, Ch2
 
 Music_Vermilion::
-	db ( $C0 | CH0 )
-	dw Music_Vermilion_Ch1
-	db CH1
-	dw Music_Vermilion_Ch2
-	db CH2
-	dw Music_Vermilion_Ch3
-	db CH3
-	dw Music_Vermilion_Ch4
+	audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3
 
 Music_Lavender::
-	db ( $C0 | CH0 )
-	dw Music_Lavender_Ch1
-	db CH1
-	dw Music_Lavender_Ch2
-	db CH2
-	dw Music_Lavender_Ch3
-	db CH3
-	dw Music_Lavender_Ch4
+	audio Music_Lavender, Ch0, Ch1, Ch2, Ch3
 
 Music_SSAnne::
-	db ( $80 | CH0 )
-	dw Music_SSAnne_Ch1
-	db CH1
-	dw Music_SSAnne_Ch2
-	db CH2
-	dw Music_SSAnne_Ch3
+	audio Music_SSAnne, Ch0, Ch1, Ch2
 
 Music_MeetProfOak::
-	db ( $80 | CH0 )
-	dw Music_MeetProfOak_Ch1
-	db CH1
-	dw Music_MeetProfOak_Ch2
-	db CH2
-	dw Music_MeetProfOak_Ch3
+	audio Music_MeetProfOak, Ch0, Ch1, Ch2
 
 Music_MeetRival::
-	db ( $80 | CH0 )
-	dw Music_MeetRival_Ch1
-	db CH1
-	dw Music_MeetRival_Ch2
-	db CH2
-	dw Music_MeetRival_Ch3
+	audio Music_MeetRival, Ch0, Ch1, Ch2
 
 Music_MuseumGuy::
-	db ( $C0 | CH0 )
-	dw Music_MuseumGuy_Ch1
-	db CH1
-	dw Music_MuseumGuy_Ch2
-	db CH2
-	dw Music_MuseumGuy_Ch3
-	db CH3
-	dw Music_MuseumGuy_Ch4
+	audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3
 
 Music_SafariZone::
-	db ( $80 | CH0 )
-	dw Music_SafariZone_Ch1
-	db CH1
-	dw Music_SafariZone_Ch2
-	db CH2
-	dw Music_SafariZone_Ch3
+	audio Music_SafariZone, Ch0, Ch1, Ch2
 
 Music_PkmnHealed::
-	db ( $80 | CH0 )
-	dw Music_PkmnHealed_Ch1
-	db CH1
-	dw Music_PkmnHealed_Ch2
-	db CH2
-	dw Music_PkmnHealed_Ch3
+	audio Music_PkmnHealed, Ch0, Ch1, Ch2
 
 ; Routes 1 and 2
 Music_Routes1::
-	db ( $C0 | CH0 )
-	dw Music_Routes1_Ch1
-	db CH1
-	dw Music_Routes1_Ch2
-	db CH2
-	dw Music_Routes1_Ch3
-	db CH3
-	dw Music_Routes1_Ch4
+	audio Music_Routes1, Ch0, Ch1, Ch2, Ch3
 
 ; Routes 24 and 25
 Music_Routes2::
-	db ( $C0 | CH0 )
-	dw Music_Routes2_Ch1
-	db CH1
-	dw Music_Routes2_Ch2
-	db CH2
-	dw Music_Routes2_Ch3
-	db CH3
-	dw Music_Routes2_Ch4
+	audio Music_Routes2, Ch0, Ch1, Ch2, Ch3
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
 Music_Routes3::
-	db ( $C0 | CH0 )
-	dw Music_Routes3_Ch1
-	db CH1
-	dw Music_Routes3_Ch2
-	db CH2
-	dw Music_Routes3_Ch3
-	db CH3
-	dw Music_Routes3_Ch4
+	audio Music_Routes3, Ch0, Ch1, Ch2, Ch3
 
 ; Routes 11, 12, 13, 14, 15
 Music_Routes4::
-	db ( $C0 | CH0 )
-	dw Music_Routes4_Ch1
-	db CH1
-	dw Music_Routes4_Ch2
-	db CH2
-	dw Music_Routes4_Ch3
-	db CH3
-	dw Music_Routes4_Ch4
+	audio Music_Routes4, Ch0, Ch1, Ch2, Ch3
 
 ; Route 23, Indigo Plateau
 Music_IndigoPlateau::
-	db ( $C0 | CH0 )
-	dw Music_IndigoPlateau_Ch1
-	db CH1
-	dw Music_IndigoPlateau_Ch2
-	db CH2
-	dw Music_IndigoPlateau_Ch3
-	db CH3
-	dw Music_IndigoPlateau_Ch4
+	audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 8adc039a..45557420 100755
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,55 +1,20 @@
 Music_GymLeaderBattle::
-	db ( $80 | CH0 )
-	dw Music_GymLeaderBattle_Ch1
-	db CH1
-	dw Music_GymLeaderBattle_Ch2
-	db CH2
-	dw Music_GymLeaderBattle_Ch3
+	audio Music_GymLeaderBattle, Ch0, Ch1, Ch2
 
 Music_TrainerBattle::
-	db ( $80 | CH0 )
-	dw Music_TrainerBattle_Ch1
-	db CH1
-	dw Music_TrainerBattle_Ch2
-	db CH2
-	dw Music_TrainerBattle_Ch3
+	audio Music_TrainerBattle, Ch0, Ch1, Ch2
 
 Music_WildBattle::
-	db ( $80 | CH0 )
-	dw Music_WildBattle_Ch1
-	db CH1
-	dw Music_WildBattle_Ch2
-	db CH2
-	dw Music_WildBattle_Ch3
+	audio Music_WildBattle, Ch0, Ch1, Ch2
 
 Music_FinalBattle::
-	db ( $80 | CH0 )
-	dw Music_FinalBattle_Ch1
-	db CH1
-	dw Music_FinalBattle_Ch2
-	db CH2
-	dw Music_FinalBattle_Ch3
+	audio Music_FinalBattle, Ch0, Ch1, Ch2
 
 Music_DefeatedTrainer::
-	db ( $80 | CH0 )
-	dw Music_DefeatedTrainer_Ch1
-	db CH1
-	dw Music_DefeatedTrainer_Ch2
-	db CH2
-	dw Music_DefeatedTrainer_Ch3
+	audio Music_DefeatedTrainer, Ch0, Ch1, Ch2
 
 Music_DefeatedWildMon::
-	db ( $80 | CH0 )
-	dw Music_DefeatedWildMon_Ch1
-	db CH1
-	dw Music_DefeatedWildMon_Ch2
-	db CH2
-	dw Music_DefeatedWildMon_Ch3
+	audio Music_DefeatedWildMon, Ch0, Ch1, Ch2
 
 Music_DefeatedGymLeader::
-	db ( $80 | CH0 )
-	dw Music_DefeatedGymLeader_Ch1
-	db CH1
-	dw Music_DefeatedGymLeader_Ch2
-	db CH2
-	dw Music_DefeatedGymLeader_Ch3
+	audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 1c54b266..90798882 100755
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,158 +1,56 @@
 Music_TitleScreen::
-	db ( $C0 | CH0 )
-	dw Music_TitleScreen_Ch1
-	db CH1
-	dw Music_TitleScreen_Ch2
-	db CH2
-	dw Music_TitleScreen_Ch3
-	db CH3
-	dw Music_TitleScreen_Ch4
+	audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3
 
 Music_Credits::
-	db ( $80 | CH0 )
-	dw Music_Credits_Ch1
-	db CH1
-	dw Music_Credits_Ch2
-	db CH2
-	dw Music_Credits_Ch3
+	audio Music_Credits, Ch0, Ch1, Ch2
 
 Music_HallOfFame::
-	db ( $80 | CH0 )
-	dw Music_HallOfFame_Ch1
-	db CH1
-	dw Music_HallOfFame_Ch2
-	db CH2
-	dw Music_HallOfFame_Ch3
+	audio Music_HallOfFame, Ch0, Ch1, Ch2
 
 Music_OaksLab::
-	db ( $80 | CH0 )
-	dw Music_OaksLab_Ch1
-	db CH1
-	dw Music_OaksLab_Ch2
-	db CH2
-	dw Music_OaksLab_Ch3
+	audio Music_OaksLab, Ch0, Ch1, Ch2
 
 Music_JigglypuffSong::
-	db $40
-	dw Music_JigglypuffSong_Ch1
-	db CH1
-	dw Music_JigglypuffSong_Ch2
+	audio Music_JigglypuffSong, Ch0, Ch1
 
 Music_BikeRiding::
-	db ( $C0 | CH0 )
-	dw Music_BikeRiding_Ch1
-	db CH1
-	dw Music_BikeRiding_Ch2
-	db CH2
-	dw Music_BikeRiding_Ch3
-	db CH3
-	dw Music_BikeRiding_Ch4
+	audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3
 
 Music_Surfing::
-	db ( $80 | CH0 )
-	dw Music_Surfing_Ch1
-	db CH1
-	dw Music_Surfing_Ch2
-	db CH2
-	dw Music_Surfing_Ch3
+	audio Music_Surfing, Ch0, Ch1, Ch2
 
 Music_GameCorner::
-	db ( $80 | CH0 )
-	dw Music_GameCorner_Ch1
-	db CH1
-	dw Music_GameCorner_Ch2
-	db CH2
-	dw Music_GameCorner_Ch3
+	audio Music_GameCorner, Ch0, Ch1, Ch2
 
 Music_IntroBattle::
-	db ( $C0 | CH0 )
-	dw Music_IntroBattle_Ch1
-	db CH1
-	dw Music_IntroBattle_Ch2
-	db CH2
-	dw Music_IntroBattle_Ch3
-	db CH3
-	dw Music_IntroBattle_Ch4
+	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
 Music_Dungeon1::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon1_Ch1
-	db CH1
-	dw Music_Dungeon1_Ch2
-	db CH2
-	dw Music_Dungeon1_Ch3
-	db CH3
-	dw Music_Dungeon1_Ch4
+	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon2_Ch1
-	db CH1
-	dw Music_Dungeon2_Ch2
-	db CH2
-	dw Music_Dungeon2_Ch3
-	db CH3
-	dw Music_Dungeon2_Ch4
+	audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon3_Ch1
-	db CH1
-	dw Music_Dungeon3_Ch2
-	db CH2
-	dw Music_Dungeon3_Ch3
-	db CH3
-	dw Music_Dungeon3_Ch4
+	audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3
 
 Music_CinnabarMansion::
-	db ( $C0 | CH0 )
-	dw Music_CinnabarMansion_Ch1
-	db CH1
-	dw Music_CinnabarMansion_Ch2
-	db CH2
-	dw Music_CinnabarMansion_Ch3
-	db CH3
-	dw Music_CinnabarMansion_Ch4
+	audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3
 
 Music_PokemonTower::
-	db ( $80 | CH0 )
-	dw Music_PokemonTower_Ch1
-	db CH1
-	dw Music_PokemonTower_Ch2
-	db CH2
-	dw Music_PokemonTower_Ch3
+	audio Music_PokemonTower, Ch0, Ch1, Ch2
 
 Music_SilphCo::
-	db ( $80 | CH0 )
-	dw Music_SilphCo_Ch1
-	db CH1
-	dw Music_SilphCo_Ch2
-	db CH2
-	dw Music_SilphCo_Ch3
+	audio Music_SilphCo, Ch0, Ch1, Ch2
 
 Music_MeetEvilTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetEvilTrainer_Ch1
-	db CH1
-	dw Music_MeetEvilTrainer_Ch2
-	db CH2
-	dw Music_MeetEvilTrainer_Ch3
+	audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2
 
 Music_MeetFemaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetFemaleTrainer_Ch1
-	db CH1
-	dw Music_MeetFemaleTrainer_Ch2
-	db CH2
-	dw Music_MeetFemaleTrainer_Ch3
+	audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2
 
 Music_MeetMaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetMaleTrainer_Ch1
-	db CH1
-	dw Music_MeetMaleTrainer_Ch2
-	db CH2
-	dw Music_MeetMaleTrainer_Ch3
+	audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 57c62e1c..72a69646 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,561 +2,287 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_1::
-	db CH7
-	dw SFX_Snare1_1_Ch1
+	audio SFX_Snare1_1, Ch7
 
 SFX_Snare2_1::
-	db CH7
-	dw SFX_Snare2_1_Ch1
+	audio SFX_Snare2_1, Ch7
 
 SFX_Snare3_1::
-	db CH7
-	dw SFX_Snare3_1_Ch1
+	audio SFX_Snare3_1, Ch7
 
 SFX_Snare4_1::
-	db CH7
-	dw SFX_Snare4_1_Ch1
+	audio SFX_Snare4_1, Ch7
 
 SFX_Snare5_1::
-	db CH7
-	dw SFX_Snare5_1_Ch1
+	audio SFX_Snare5_1, Ch7
 
 SFX_Triangle1_1::
-	db CH7
-	dw SFX_Triangle1_1_Ch1
+	audio SFX_Triangle1_1, Ch7
 
 SFX_Triangle2_1::
-	db CH7
-	dw SFX_Triangle2_1_Ch1
+	audio SFX_Triangle2_1, Ch7
 
 SFX_Snare6_1::
-	db CH7
-	dw SFX_Snare6_1_Ch1
+	audio SFX_Snare6_1, Ch7
 
 SFX_Snare7_1::
-	db CH7
-	dw SFX_Snare7_1_Ch1
+	audio SFX_Snare7_1, Ch7
 
 SFX_Snare8_1::
-	db CH7
-	dw SFX_Snare8_1_Ch1
+	audio SFX_Snare8_1, Ch7
 
 SFX_Snare9_1::
-	db CH7
-	dw SFX_Snare9_1_Ch1
+	audio SFX_Snare9_1, Ch7
 
 SFX_Cymbal1_1::
-	db CH7
-	dw SFX_Cymbal1_1_Ch1
+	audio SFX_Cymbal1_1, Ch7
 
 SFX_Cymbal2_1::
-	db CH7
-	dw SFX_Cymbal2_1_Ch1
+	audio SFX_Cymbal2_1, Ch7
 
 SFX_Cymbal3_1::
-	db CH7
-	dw SFX_Cymbal3_1_Ch1
+	audio SFX_Cymbal3_1, Ch7
 
 SFX_Muted_Snare1_1::
-	db CH7
-	dw SFX_Muted_Snare1_1_Ch1
+	audio SFX_Muted_Snare1_1, Ch7
 
 SFX_Triangle3_1::
-	db CH7
-	dw SFX_Triangle3_1_Ch1
+	audio SFX_Triangle3_1, Ch7
 
 SFX_Muted_Snare2_1::
-	db CH7
-	dw SFX_Muted_Snare2_1_Ch1
+	audio SFX_Muted_Snare2_1, Ch7
 
 SFX_Muted_Snare3_1::
-	db CH7
-	dw SFX_Muted_Snare3_1_Ch1
+	audio SFX_Muted_Snare3_1, Ch7
 
 SFX_Muted_Snare4_1::
-	db CH7
-	dw SFX_Muted_Snare4_1_Ch1
+	audio SFX_Muted_Snare4_1, Ch7
 
 SFX_Cry00_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_1_Ch1
-	db CH5
-	dw SFX_Cry00_1_Ch2
-	db CH7
-	dw SFX_Cry00_1_Ch3
+	audio SFX_Cry00_1, Ch4, Ch5, Ch7
 
 SFX_Cry01_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_1_Ch1
-	db CH5
-	dw SFX_Cry01_1_Ch2
-	db CH7
-	dw SFX_Cry01_1_Ch3
+	audio SFX_Cry01_1, Ch4, Ch5, Ch7
 
 SFX_Cry02_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_1_Ch1
-	db CH5
-	dw SFX_Cry02_1_Ch2
-	db CH7
-	dw SFX_Cry02_1_Ch3
+	audio SFX_Cry02_1, Ch4, Ch5, Ch7
 
 SFX_Cry03_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_1_Ch1
-	db CH5
-	dw SFX_Cry03_1_Ch2
-	db CH7
-	dw SFX_Cry03_1_Ch3
+	audio SFX_Cry03_1, Ch4, Ch5, Ch7
 
 SFX_Cry04_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_1_Ch1
-	db CH5
-	dw SFX_Cry04_1_Ch2
-	db CH7
-	dw SFX_Cry04_1_Ch3
+	audio SFX_Cry04_1, Ch4, Ch5, Ch7
 
 SFX_Cry05_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_1_Ch1
-	db CH5
-	dw SFX_Cry05_1_Ch2
-	db CH7
-	dw SFX_Cry05_1_Ch3
+	audio SFX_Cry05_1, Ch4, Ch5, Ch7
 
 SFX_Cry06_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_1_Ch1
-	db CH5
-	dw SFX_Cry06_1_Ch2
-	db CH7
-	dw SFX_Cry06_1_Ch3
+	audio SFX_Cry06_1, Ch4, Ch5, Ch7
 
 SFX_Cry07_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_1_Ch1
-	db CH5
-	dw SFX_Cry07_1_Ch2
-	db CH7
-	dw SFX_Cry07_1_Ch3
+	audio SFX_Cry07_1, Ch4, Ch5, Ch7
 
 SFX_Cry08_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_1_Ch1
-	db CH5
-	dw SFX_Cry08_1_Ch2
-	db CH7
-	dw SFX_Cry08_1_Ch3
+	audio SFX_Cry08_1, Ch4, Ch5, Ch7
 
 SFX_Cry09_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_1_Ch1
-	db CH5
-	dw SFX_Cry09_1_Ch2
-	db CH7
-	dw SFX_Cry09_1_Ch3
+	audio SFX_Cry09_1, Ch4, Ch5, Ch7
 
 SFX_Cry0A_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_1_Ch1
-	db CH5
-	dw SFX_Cry0A_1_Ch2
-	db CH7
-	dw SFX_Cry0A_1_Ch3
+	audio SFX_Cry0A_1, Ch4, Ch5, Ch7
 
 SFX_Cry0B_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_1_Ch1
-	db CH5
-	dw SFX_Cry0B_1_Ch2
-	db CH7
-	dw SFX_Cry0B_1_Ch3
+	audio SFX_Cry0B_1, Ch4, Ch5, Ch7
 
 SFX_Cry0C_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_1_Ch1
-	db CH5
-	dw SFX_Cry0C_1_Ch2
-	db CH7
-	dw SFX_Cry0C_1_Ch3
+	audio SFX_Cry0C_1, Ch4, Ch5, Ch7
 
 SFX_Cry0D_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_1_Ch1
-	db CH5
-	dw SFX_Cry0D_1_Ch2
-	db CH7
-	dw SFX_Cry0D_1_Ch3
+	audio SFX_Cry0D_1, Ch4, Ch5, Ch7
 
 SFX_Cry0E_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_1_Ch1
-	db CH5
-	dw SFX_Cry0E_1_Ch2
-	db CH7
-	dw SFX_Cry0E_1_Ch3
+	audio SFX_Cry0E_1, Ch4, Ch5, Ch7
 
 SFX_Cry0F_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_1_Ch1
-	db CH5
-	dw SFX_Cry0F_1_Ch2
-	db CH7
-	dw SFX_Cry0F_1_Ch3
+	audio SFX_Cry0F_1, Ch4, Ch5, Ch7
 
 SFX_Cry10_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_1_Ch1
-	db CH5
-	dw SFX_Cry10_1_Ch2
-	db CH7
-	dw SFX_Cry10_1_Ch3
+	audio SFX_Cry10_1, Ch4, Ch5, Ch7
 
 SFX_Cry11_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_1_Ch1
-	db CH5
-	dw SFX_Cry11_1_Ch2
-	db CH7
-	dw SFX_Cry11_1_Ch3
+	audio SFX_Cry11_1, Ch4, Ch5, Ch7
 
 SFX_Cry12_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_1_Ch1
-	db CH5
-	dw SFX_Cry12_1_Ch2
-	db CH7
-	dw SFX_Cry12_1_Ch3
+	audio SFX_Cry12_1, Ch4, Ch5, Ch7
 
 SFX_Cry13_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_1_Ch1
-	db CH5
-	dw SFX_Cry13_1_Ch2
-	db CH7
-	dw SFX_Cry13_1_Ch3
+	audio SFX_Cry13_1, Ch4, Ch5, Ch7
 
 SFX_Cry14_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_1_Ch1
-	db CH5
-	dw SFX_Cry14_1_Ch2
-	db CH7
-	dw SFX_Cry14_1_Ch3
+	audio SFX_Cry14_1, Ch4, Ch5, Ch7
 
 SFX_Cry15_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_1_Ch1
-	db CH5
-	dw SFX_Cry15_1_Ch2
-	db CH7
-	dw SFX_Cry15_1_Ch3
+	audio SFX_Cry15_1, Ch4, Ch5, Ch7
 
 SFX_Cry16_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_1_Ch1
-	db CH5
-	dw SFX_Cry16_1_Ch2
-	db CH7
-	dw SFX_Cry16_1_Ch3
+	audio SFX_Cry16_1, Ch4, Ch5, Ch7
 
 SFX_Cry17_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_1_Ch1
-	db CH5
-	dw SFX_Cry17_1_Ch2
-	db CH7
-	dw SFX_Cry17_1_Ch3
+	audio SFX_Cry17_1, Ch4, Ch5, Ch7
 
 SFX_Cry18_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_1_Ch1
-	db CH5
-	dw SFX_Cry18_1_Ch2
-	db CH7
-	dw SFX_Cry18_1_Ch3
+	audio SFX_Cry18_1, Ch4, Ch5, Ch7
 
 SFX_Cry19_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_1_Ch1
-	db CH5
-	dw SFX_Cry19_1_Ch2
-	db CH7
-	dw SFX_Cry19_1_Ch3
+	audio SFX_Cry19_1, Ch4, Ch5, Ch7
 
 SFX_Cry1A_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_1_Ch1
-	db CH5
-	dw SFX_Cry1A_1_Ch2
-	db CH7
-	dw SFX_Cry1A_1_Ch3
+	audio SFX_Cry1A_1, Ch4, Ch5, Ch7
 
 SFX_Cry1B_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_1_Ch1
-	db CH5
-	dw SFX_Cry1B_1_Ch2
-	db CH7
-	dw SFX_Cry1B_1_Ch3
+	audio SFX_Cry1B_1, Ch4, Ch5, Ch7
 
 SFX_Cry1C_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_1_Ch1
-	db CH5
-	dw SFX_Cry1C_1_Ch2
-	db CH7
-	dw SFX_Cry1C_1_Ch3
+	audio SFX_Cry1C_1, Ch4, Ch5, Ch7
 
 SFX_Cry1D_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_1_Ch1
-	db CH5
-	dw SFX_Cry1D_1_Ch2
-	db CH7
-	dw SFX_Cry1D_1_Ch3
+	audio SFX_Cry1D_1, Ch4, Ch5, Ch7
 
 SFX_Cry1E_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_1_Ch1
-	db CH5
-	dw SFX_Cry1E_1_Ch2
-	db CH7
-	dw SFX_Cry1E_1_Ch3
+	audio SFX_Cry1E_1, Ch4, Ch5, Ch7
 
 SFX_Cry1F_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_1_Ch1
-	db CH5
-	dw SFX_Cry1F_1_Ch2
-	db CH7
-	dw SFX_Cry1F_1_Ch3
+	audio SFX_Cry1F_1, Ch4, Ch5, Ch7
 
 SFX_Cry20_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_1_Ch1
-	db CH5
-	dw SFX_Cry20_1_Ch2
-	db CH7
-	dw SFX_Cry20_1_Ch3
+	audio SFX_Cry20_1, Ch4, Ch5, Ch7
 
 SFX_Cry21_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_1_Ch1
-	db CH5
-	dw SFX_Cry21_1_Ch2
-	db CH7
-	dw SFX_Cry21_1_Ch3
+	audio SFX_Cry21_1, Ch4, Ch5, Ch7
 
 SFX_Cry22_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_1_Ch1
-	db CH5
-	dw SFX_Cry22_1_Ch2
-	db CH7
-	dw SFX_Cry22_1_Ch3
+	audio SFX_Cry22_1, Ch4, Ch5, Ch7
 
 SFX_Cry23_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_1_Ch1
-	db CH5
-	dw SFX_Cry23_1_Ch2
-	db CH7
-	dw SFX_Cry23_1_Ch3
+	audio SFX_Cry23_1, Ch4, Ch5, Ch7
 
 SFX_Cry24_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_1_Ch1
-	db CH5
-	dw SFX_Cry24_1_Ch2
-	db CH7
-	dw SFX_Cry24_1_Ch3
+	audio SFX_Cry24_1, Ch4, Ch5, Ch7
 
 SFX_Cry25_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_1_Ch1
-	db CH5
-	dw SFX_Cry25_1_Ch2
-	db CH7
-	dw SFX_Cry25_1_Ch3
+	audio SFX_Cry25_1, Ch4, Ch5, Ch7
 
 SFX_Get_Item1_1::
-	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
+	audio SFX_Get_Item1_1, Ch4, Ch5, Ch6
 
 SFX_Get_Item2_1::
-	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
+	audio SFX_Get_Item2_1, Ch4, Ch5, Ch6
 
 SFX_Tink_1::
-	db CH4
-	dw SFX_Tink_1_Ch1
+	audio SFX_Tink_1, Ch4
 
 SFX_Heal_HP_1::
-	db CH4
-	dw SFX_Heal_HP_1_Ch1
+	audio SFX_Heal_HP_1, Ch4
 
 SFX_Heal_Ailment_1::
-	db CH4
-	dw SFX_Heal_Ailment_1_Ch1
+	audio SFX_Heal_Ailment_1, Ch4
 
 SFX_Start_Menu_1::
-	db CH7
-	dw SFX_Start_Menu_1_Ch1
+	audio SFX_Start_Menu_1, Ch7
 
 SFX_Press_AB_1::
-	db CH4
-	dw SFX_Press_AB_1_Ch1
+	audio SFX_Press_AB_1, Ch4
 
 SFX_Pokedex_Rating_1::
-	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
+	audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6
 
 SFX_Get_Key_Item_1::
-	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
+	audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6
 
 SFX_Poisoned_1::
-	db CH4
-	dw SFX_Poisoned_1_Ch1
+	audio SFX_Poisoned_1, Ch4
 
 SFX_Trade_Machine_1::
-	db CH4
-	dw SFX_Trade_Machine_1_Ch1
+	audio SFX_Trade_Machine_1, Ch4
 
 SFX_Turn_On_PC_1::
-	db CH4
-	dw SFX_Turn_On_PC_1_Ch1
+	audio SFX_Turn_On_PC_1, Ch4
 
 SFX_Turn_Off_PC_1::
-	db CH4
-	dw SFX_Turn_Off_PC_1_Ch1
+	audio SFX_Turn_Off_PC_1, Ch4
 
 SFX_Enter_PC_1::
-	db CH4
-	dw SFX_Enter_PC_1_Ch1
+	audio SFX_Enter_PC_1, Ch4
 
 SFX_Shrink_1::
-	db CH4
-	dw SFX_Shrink_1_Ch1
+	audio SFX_Shrink_1, Ch4
 
 SFX_Switch_1::
-	db CH4
-	dw SFX_Switch_1_Ch1
+	audio SFX_Switch_1, Ch4
 
 SFX_Healing_Machine_1::
-	db CH4
-	dw SFX_Healing_Machine_1_Ch1
+	audio SFX_Healing_Machine_1, Ch4
 
 SFX_Teleport_Exit1_1::
-	db CH4
-	dw SFX_Teleport_Exit1_1_Ch1
+	audio SFX_Teleport_Exit1_1, Ch4
 
 SFX_Teleport_Enter1_1::
-	db CH4
-	dw SFX_Teleport_Enter1_1_Ch1
+	audio SFX_Teleport_Enter1_1, Ch4
 
 SFX_Teleport_Exit2_1::
-	db CH4
-	dw SFX_Teleport_Exit2_1_Ch1
+	audio SFX_Teleport_Exit2_1, Ch4
 
 SFX_Ledge_1::
-	db CH4
-	dw SFX_Ledge_1_Ch1
+	audio SFX_Ledge_1, Ch4
 
 SFX_Teleport_Enter2_1::
-	db CH7
-	dw SFX_Teleport_Enter2_1_Ch1
+	audio SFX_Teleport_Enter2_1, Ch7
 
 SFX_Fly_1::
-	db CH7
-	dw SFX_Fly_1_Ch1
+	audio SFX_Fly_1, Ch7
 
 SFX_Denied_1::
-	db ( $40 | CH4 )
-	dw SFX_Denied_1_Ch1
-	db CH5
-	dw SFX_Denied_1_Ch2
+	audio SFX_Denied_1, Ch4, Ch5
 
 SFX_Arrow_Tiles_1::
-	db CH4
-	dw SFX_Arrow_Tiles_1_Ch1
+	audio SFX_Arrow_Tiles_1, Ch4
 
 SFX_Push_Boulder_1::
-	db CH7
-	dw SFX_Push_Boulder_1_Ch1
+	audio SFX_Push_Boulder_1, Ch7
 
 SFX_SS_Anne_Horn_1::
-	db ( $40 | CH4 )
-	dw SFX_SS_Anne_Horn_1_Ch1
-	db CH5
-	dw SFX_SS_Anne_Horn_1_Ch2
+	audio SFX_SS_Anne_Horn_1, Ch4, Ch5
 
 SFX_Withdraw_Deposit_1::
-	db CH4
-	dw SFX_Withdraw_Deposit_1_Ch1
+	audio SFX_Withdraw_Deposit_1, Ch4
 
 SFX_Cut_1::
-	db CH7
-	dw SFX_Cut_1_Ch1
+	audio SFX_Cut_1, Ch7
 
 SFX_Go_Inside_1::
-	db CH7
-	dw SFX_Go_Inside_1_Ch1
+	audio SFX_Go_Inside_1, Ch7
 
 SFX_Swap_1::
-	db ( $40 | CH4 )
-	dw SFX_Swap_1_Ch1
-	db CH5
-	dw SFX_Swap_1_Ch2
+	audio SFX_Swap_1, Ch4, Ch5
 
 SFX_59_1::
-	db ( $40 | CH4 )
-	dw SFX_59_1_Ch1
-	db CH5
-	dw SFX_59_1_Ch2
+	audio SFX_59_1, Ch4, Ch5
 
 SFX_Purchase_1::
-	db ( $40 | CH4 )
-	dw SFX_Purchase_1_Ch1
-	db CH5
-	dw SFX_Purchase_1_Ch2
+	audio SFX_Purchase_1, Ch4, Ch5
 
 SFX_Collision_1::
-	db CH4
-	dw SFX_Collision_1_Ch1
+	audio SFX_Collision_1, Ch4
 
 SFX_Go_Outside_1::
-	db CH7
-	dw SFX_Go_Outside_1_Ch1
+	audio SFX_Go_Outside_1, Ch7
 
 SFX_Save_1::
-	db ( $40 | CH4 )
-	dw SFX_Save_1_Ch1
-	db CH5
-	dw SFX_Save_1_Ch2
+	audio SFX_Save_1, Ch4, Ch5
 
+; the Pokeflute sound effect directly hijacks channel 2
 SFX_Pokeflute::
-	db CH2
-	dw SFX_Pokeflute_Ch1
+	audio SFX_Pokeflute, Ch2
 
 SFX_Safari_Zone_PA::
-	db CH4
-	dw SFX_Safari_Zone_PA_Ch1
+	audio SFX_Safari_Zone_PA, Ch4
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 1b6f8a5c..b96a764f 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -2,705 +2,358 @@ SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_2::
-	db CH7
-	dw SFX_Snare1_2_Ch1
+	audio SFX_Snare1_2, Ch7
 
 SFX_Snare2_2::
-	db CH7
-	dw SFX_Snare2_2_Ch1
+	audio SFX_Snare2_2, Ch7
 
 SFX_Snare3_2::
-	db CH7
-	dw SFX_Snare3_2_Ch1
+	audio SFX_Snare3_2, Ch7
 
 SFX_Snare4_2::
-	db CH7
-	dw SFX_Snare4_2_Ch1
+	audio SFX_Snare4_2, Ch7
 
 SFX_Snare5_2::
-	db CH7
-	dw SFX_Snare5_2_Ch1
+	audio SFX_Snare5_2, Ch7
 
 SFX_Triangle1_2::
-	db CH7
-	dw SFX_Triangle1_2_Ch1
+	audio SFX_Triangle1_2, Ch7
 
 SFX_Triangle2_2::
-	db CH7
-	dw SFX_Triangle2_2_Ch1
+	audio SFX_Triangle2_2, Ch7
 
 SFX_Snare6_2::
-	db CH7
-	dw SFX_Snare6_2_Ch1
+	audio SFX_Snare6_2, Ch7
 
 SFX_Snare7_2::
-	db CH7
-	dw SFX_Snare7_2_Ch1
+	audio SFX_Snare7_2, Ch7
 
 SFX_Snare8_2::
-	db CH7
-	dw SFX_Snare8_2_Ch1
+	audio SFX_Snare8_2, Ch7
 
 SFX_Snare9_2::
-	db CH7
-	dw SFX_Snare9_2_Ch1
+	audio SFX_Snare9_2, Ch7
 
 SFX_Cymbal1_2::
-	db CH7
-	dw SFX_Cymbal1_2_Ch1
+	audio SFX_Cymbal1_2, Ch7
 
 SFX_Cymbal2_2::
-	db CH7
-	dw SFX_Cymbal2_2_Ch1
+	audio SFX_Cymbal2_2, Ch7
 
 SFX_Cymbal3_2::
-	db CH7
-	dw SFX_Cymbal3_2_Ch1
+	audio SFX_Cymbal3_2, Ch7
 
 SFX_Muted_Snare1_2::
-	db CH7
-	dw SFX_Muted_Snare1_2_Ch1
+	audio SFX_Muted_Snare1_2, Ch7
 
 SFX_Triangle3_2::
-	db CH7
-	dw SFX_Triangle3_2_Ch1
+	audio SFX_Triangle3_2, Ch7
 
 SFX_Muted_Snare2_2::
-	db CH7
-	dw SFX_Muted_Snare2_2_Ch1
+	audio SFX_Muted_Snare2_2, Ch7
 
 SFX_Muted_Snare3_2::
-	db CH7
-	dw SFX_Muted_Snare3_2_Ch1
+	audio SFX_Muted_Snare3_2, Ch7
 
 SFX_Muted_Snare4_2::
-	db CH7
-	dw SFX_Muted_Snare4_2_Ch1
+	audio SFX_Muted_Snare4_2, Ch7
 
 SFX_Cry00_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_2_Ch1
-	db CH5
-	dw SFX_Cry00_2_Ch2
-	db CH7
-	dw SFX_Cry00_2_Ch3
+	audio SFX_Cry00_2, Ch4, Ch5, Ch7
 
 SFX_Cry01_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_2_Ch1
-	db CH5
-	dw SFX_Cry01_2_Ch2
-	db CH7
-	dw SFX_Cry01_2_Ch3
+	audio SFX_Cry01_2, Ch4, Ch5, Ch7
 
 SFX_Cry02_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_2_Ch1
-	db CH5
-	dw SFX_Cry02_2_Ch2
-	db CH7
-	dw SFX_Cry02_2_Ch3
+	audio SFX_Cry02_2, Ch4, Ch5, Ch7
 
 SFX_Cry03_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_2_Ch1
-	db CH5
-	dw SFX_Cry03_2_Ch2
-	db CH7
-	dw SFX_Cry03_2_Ch3
+	audio SFX_Cry03_2, Ch4, Ch5, Ch7
 
 SFX_Cry04_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_2_Ch1
-	db CH5
-	dw SFX_Cry04_2_Ch2
-	db CH7
-	dw SFX_Cry04_2_Ch3
+	audio SFX_Cry04_2, Ch4, Ch5, Ch7
 
 SFX_Cry05_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_2_Ch1
-	db CH5
-	dw SFX_Cry05_2_Ch2
-	db CH7
-	dw SFX_Cry05_2_Ch3
+	audio SFX_Cry05_2, Ch4, Ch5, Ch7
 
 SFX_Cry06_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_2_Ch1
-	db CH5
-	dw SFX_Cry06_2_Ch2
-	db CH7
-	dw SFX_Cry06_2_Ch3
+	audio SFX_Cry06_2, Ch4, Ch5, Ch7
 
 SFX_Cry07_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_2_Ch1
-	db CH5
-	dw SFX_Cry07_2_Ch2
-	db CH7
-	dw SFX_Cry07_2_Ch3
+	audio SFX_Cry07_2, Ch4, Ch5, Ch7
 
 SFX_Cry08_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_2_Ch1
-	db CH5
-	dw SFX_Cry08_2_Ch2
-	db CH7
-	dw SFX_Cry08_2_Ch3
+	audio SFX_Cry08_2, Ch4, Ch5, Ch7
 
 SFX_Cry09_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_2_Ch1
-	db CH5
-	dw SFX_Cry09_2_Ch2
-	db CH7
-	dw SFX_Cry09_2_Ch3
+	audio SFX_Cry09_2, Ch4, Ch5, Ch7
 
 SFX_Cry0A_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_2_Ch1
-	db CH5
-	dw SFX_Cry0A_2_Ch2
-	db CH7
-	dw SFX_Cry0A_2_Ch3
+	audio SFX_Cry0A_2, Ch4, Ch5, Ch7
 
 SFX_Cry0B_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_2_Ch1
-	db CH5
-	dw SFX_Cry0B_2_Ch2
-	db CH7
-	dw SFX_Cry0B_2_Ch3
+	audio SFX_Cry0B_2, Ch4, Ch5, Ch7
 
 SFX_Cry0C_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_2_Ch1
-	db CH5
-	dw SFX_Cry0C_2_Ch2
-	db CH7
-	dw SFX_Cry0C_2_Ch3
+	audio SFX_Cry0C_2, Ch4, Ch5, Ch7
 
 SFX_Cry0D_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_2_Ch1
-	db CH5
-	dw SFX_Cry0D_2_Ch2
-	db CH7
-	dw SFX_Cry0D_2_Ch3
+	audio SFX_Cry0D_2, Ch4, Ch5, Ch7
 
 SFX_Cry0E_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_2_Ch1
-	db CH5
-	dw SFX_Cry0E_2_Ch2
-	db CH7
-	dw SFX_Cry0E_2_Ch3
+	audio SFX_Cry0E_2, Ch4, Ch5, Ch7
 
 SFX_Cry0F_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_2_Ch1
-	db CH5
-	dw SFX_Cry0F_2_Ch2
-	db CH7
-	dw SFX_Cry0F_2_Ch3
+	audio SFX_Cry0F_2, Ch4, Ch5, Ch7
 
 SFX_Cry10_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_2_Ch1
-	db CH5
-	dw SFX_Cry10_2_Ch2
-	db CH7
-	dw SFX_Cry10_2_Ch3
+	audio SFX_Cry10_2, Ch4, Ch5, Ch7
 
 SFX_Cry11_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_2_Ch1
-	db CH5
-	dw SFX_Cry11_2_Ch2
-	db CH7
-	dw SFX_Cry11_2_Ch3
+	audio SFX_Cry11_2, Ch4, Ch5, Ch7
 
 SFX_Cry12_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_2_Ch1
-	db CH5
-	dw SFX_Cry12_2_Ch2
-	db CH7
-	dw SFX_Cry12_2_Ch3
+	audio SFX_Cry12_2, Ch4, Ch5, Ch7
 
 SFX_Cry13_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_2_Ch1
-	db CH5
-	dw SFX_Cry13_2_Ch2
-	db CH7
-	dw SFX_Cry13_2_Ch3
+	audio SFX_Cry13_2, Ch4, Ch5, Ch7
 
 SFX_Cry14_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_2_Ch1
-	db CH5
-	dw SFX_Cry14_2_Ch2
-	db CH7
-	dw SFX_Cry14_2_Ch3
+	audio SFX_Cry14_2, Ch4, Ch5, Ch7
 
 SFX_Cry15_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_2_Ch1
-	db CH5
-	dw SFX_Cry15_2_Ch2
-	db CH7
-	dw SFX_Cry15_2_Ch3
+	audio SFX_Cry15_2, Ch4, Ch5, Ch7
 
 SFX_Cry16_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_2_Ch1
-	db CH5
-	dw SFX_Cry16_2_Ch2
-	db CH7
-	dw SFX_Cry16_2_Ch3
+	audio SFX_Cry16_2, Ch4, Ch5, Ch7
 
 SFX_Cry17_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_2_Ch1
-	db CH5
-	dw SFX_Cry17_2_Ch2
-	db CH7
-	dw SFX_Cry17_2_Ch3
+	audio SFX_Cry17_2, Ch4, Ch5, Ch7
 
 SFX_Cry18_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_2_Ch1
-	db CH5
-	dw SFX_Cry18_2_Ch2
-	db CH7
-	dw SFX_Cry18_2_Ch3
+	audio SFX_Cry18_2, Ch4, Ch5, Ch7
 
 SFX_Cry19_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_2_Ch1
-	db CH5
-	dw SFX_Cry19_2_Ch2
-	db CH7
-	dw SFX_Cry19_2_Ch3
+	audio SFX_Cry19_2, Ch4, Ch5, Ch7
 
 SFX_Cry1A_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_2_Ch1
-	db CH5
-	dw SFX_Cry1A_2_Ch2
-	db CH7
-	dw SFX_Cry1A_2_Ch3
+	audio SFX_Cry1A_2, Ch4, Ch5, Ch7
 
 SFX_Cry1B_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_2_Ch1
-	db CH5
-	dw SFX_Cry1B_2_Ch2
-	db CH7
-	dw SFX_Cry1B_2_Ch3
+	audio SFX_Cry1B_2, Ch4, Ch5, Ch7
 
 SFX_Cry1C_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_2_Ch1
-	db CH5
-	dw SFX_Cry1C_2_Ch2
-	db CH7
-	dw SFX_Cry1C_2_Ch3
+	audio SFX_Cry1C_2, Ch4, Ch5, Ch7
 
 SFX_Cry1D_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_2_Ch1
-	db CH5
-	dw SFX_Cry1D_2_Ch2
-	db CH7
-	dw SFX_Cry1D_2_Ch3
+	audio SFX_Cry1D_2, Ch4, Ch5, Ch7
 
 SFX_Cry1E_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_2_Ch1
-	db CH5
-	dw SFX_Cry1E_2_Ch2
-	db CH7
-	dw SFX_Cry1E_2_Ch3
+	audio SFX_Cry1E_2, Ch4, Ch5, Ch7
 
 SFX_Cry1F_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_2_Ch1
-	db CH5
-	dw SFX_Cry1F_2_Ch2
-	db CH7
-	dw SFX_Cry1F_2_Ch3
+	audio SFX_Cry1F_2, Ch4, Ch5, Ch7
 
 SFX_Cry20_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_2_Ch1
-	db CH5
-	dw SFX_Cry20_2_Ch2
-	db CH7
-	dw SFX_Cry20_2_Ch3
+	audio SFX_Cry20_2, Ch4, Ch5, Ch7
 
 SFX_Cry21_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_2_Ch1
-	db CH5
-	dw SFX_Cry21_2_Ch2
-	db CH7
-	dw SFX_Cry21_2_Ch3
+	audio SFX_Cry21_2, Ch4, Ch5, Ch7
 
 SFX_Cry22_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_2_Ch1
-	db CH5
-	dw SFX_Cry22_2_Ch2
-	db CH7
-	dw SFX_Cry22_2_Ch3
+	audio SFX_Cry22_2, Ch4, Ch5, Ch7
 
 SFX_Cry23_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_2_Ch1
-	db CH5
-	dw SFX_Cry23_2_Ch2
-	db CH7
-	dw SFX_Cry23_2_Ch3
+	audio SFX_Cry23_2, Ch4, Ch5, Ch7
 
 SFX_Cry24_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_2_Ch1
-	db CH5
-	dw SFX_Cry24_2_Ch2
-	db CH7
-	dw SFX_Cry24_2_Ch3
+	audio SFX_Cry24_2, Ch4, Ch5, Ch7
 
 SFX_Cry25_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_2_Ch1
-	db CH5
-	dw SFX_Cry25_2_Ch2
-	db CH7
-	dw SFX_Cry25_2_Ch3
+	audio SFX_Cry25_2, Ch4, Ch5, Ch7
 
 SFX_Level_Up::
-	db ( $80 | CH4 )
-	dw SFX_Level_Up_Ch1
-	db CH5
-	dw SFX_Level_Up_Ch2
-	db CH6
-	dw SFX_Level_Up_Ch3
+	audio SFX_Level_Up, Ch4, Ch5, Ch6
 
 SFX_Get_Item2_2::
-	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
+	audio SFX_Get_Item2_2, Ch4, Ch5, Ch6
 
 SFX_Tink_2::
-	db CH4
-	dw SFX_Tink_2_Ch1
+	audio SFX_Tink_2, Ch4
 
 SFX_Heal_HP_2::
-	db CH4
-	dw SFX_Heal_HP_2_Ch1
+	audio SFX_Heal_HP_2, Ch4
 
 SFX_Heal_Ailment_2::
-	db CH4
-	dw SFX_Heal_Ailment_2_Ch1
+	audio SFX_Heal_Ailment_2, Ch4
 
 SFX_Start_Menu_2::
-	db CH7
-	dw SFX_Start_Menu_2_Ch1
+	audio SFX_Start_Menu_2, Ch7
 
 SFX_Press_AB_2::
-	db CH4
-	dw SFX_Press_AB_2_Ch1
+	audio SFX_Press_AB_2, Ch4
 
 SFX_Ball_Toss::
-	db ( $40 | CH4 )
-	dw SFX_Ball_Toss_Ch1
-	db CH5
-	dw SFX_Ball_Toss_Ch2
+	audio SFX_Ball_Toss, Ch4, Ch5
 
 SFX_Ball_Poof::
-	db ( $40 | CH4 )
-	dw SFX_Ball_Poof_Ch1
-	db CH7
-	dw SFX_Ball_Poof_Ch2
+	audio SFX_Ball_Poof, Ch4, Ch7
 
 SFX_Faint_Thud::
-	db ( $40 | CH4 )
-	dw SFX_Faint_Thud_Ch1
-	db CH7
-	dw SFX_Faint_Thud_Ch2
+	audio SFX_Faint_Thud, Ch4, Ch7
 
 SFX_Run::
-	db CH7
-	dw SFX_Run_Ch1
+	audio SFX_Run, Ch7
 
 SFX_Dex_Page_Added::
-	db ( $40 | CH4 )
-	dw SFX_Dex_Page_Added_Ch1
-	db CH5
-	dw SFX_Dex_Page_Added_Ch2
+	audio SFX_Dex_Page_Added, Ch4, Ch5
 
 SFX_Caught_Mon::
-	db ( $80 | CH4 )
-	dw SFX_Caught_Mon_Ch1
-	db CH5
-	dw SFX_Caught_Mon_Ch2
-	db CH6
-	dw SFX_Caught_Mon_Ch3
+	audio SFX_Caught_Mon, Ch4, Ch5, Ch6
 
 SFX_Peck::
-	db CH7
-	dw SFX_Peck_Ch1
+	audio SFX_Peck, Ch7
 
 SFX_Faint_Fall::
-	db CH4
-	dw SFX_Faint_Fall_Ch1
+	audio SFX_Faint_Fall, Ch4
 
 SFX_Battle_09::
-	db CH4
-	dw SFX_Battle_09_Ch1
+	audio SFX_Battle_09, Ch4
 
 SFX_Pound::
-	db CH7
-	dw SFX_Pound_Ch1
+	audio SFX_Pound, Ch7
 
 SFX_Battle_0B::
-	db CH7
-	dw SFX_Battle_0B_Ch1
+	audio SFX_Battle_0B, Ch7
 
 SFX_Battle_0C::
-	db CH7
-	dw SFX_Battle_0C_Ch1
+	audio SFX_Battle_0C, Ch7
 
 SFX_Battle_0D::
-	db CH7
-	dw SFX_Battle_0D_Ch1
+	audio SFX_Battle_0D, Ch7
 
 SFX_Battle_0E::
-	db CH7
-	dw SFX_Battle_0E_Ch1
+	audio SFX_Battle_0E, Ch7
 
 SFX_Battle_0F::
-	db CH7
-	dw SFX_Battle_0F_Ch1
+	audio SFX_Battle_0F, Ch7
 
 SFX_Damage::
-	db CH7
-	dw SFX_Damage_Ch1
+	audio SFX_Damage, Ch7
 
 SFX_Not_Very_Effective::
-	db CH7
-	dw SFX_Not_Very_Effective_Ch1
+	audio SFX_Not_Very_Effective, Ch7
 
 SFX_Battle_12::
-	db CH7
-	dw SFX_Battle_12_Ch1
+	audio SFX_Battle_12, Ch7
 
 SFX_Battle_13::
-	db CH7
-	dw SFX_Battle_13_Ch1
+	audio SFX_Battle_13, Ch7
 
 SFX_Battle_14::
-	db CH7
-	dw SFX_Battle_14_Ch1
+	audio SFX_Battle_14, Ch7
 
 SFX_Vine_Whip::
-	db CH7
-	dw SFX_Vine_Whip_Ch1
+	audio SFX_Vine_Whip, Ch7
 
 SFX_Battle_16::
-	db CH7
-	dw SFX_Battle_16_Ch1
+	audio SFX_Battle_16, Ch7
 
 SFX_Battle_17::
-	db CH7
-	dw SFX_Battle_17_Ch1
+	audio SFX_Battle_17, Ch7
 
 SFX_Battle_18::
-	db CH7
-	dw SFX_Battle_18_Ch1
+	audio SFX_Battle_18, Ch7
 
 SFX_Battle_19::
-	db CH7
-	dw SFX_Battle_19_Ch1
+	audio SFX_Battle_19, Ch7
 
 SFX_Super_Effective::
-	db CH7
-	dw SFX_Super_Effective_Ch1
+	audio SFX_Super_Effective, Ch7
 
 SFX_Battle_1B::
-	db CH7
-	dw SFX_Battle_1B_Ch1
+	audio SFX_Battle_1B, Ch7
 
 SFX_Battle_1C::
-	db CH7
-	dw SFX_Battle_1C_Ch1
+	audio SFX_Battle_1C, Ch7
 
 SFX_Doubleslap::
-	db CH7
-	dw SFX_Doubleslap_Ch1
+	audio SFX_Doubleslap, Ch7
 
 SFX_Battle_1E::
-	db ( $40 | CH4 )
-	dw SFX_Battle_1E_Ch1
-	db CH7
-	dw SFX_Battle_1E_Ch2
+	audio SFX_Battle_1E, Ch4, Ch7
 
 SFX_Horn_Drill::
-	db CH7
-	dw SFX_Horn_Drill_Ch1
+	audio SFX_Horn_Drill, Ch7
 
 SFX_Battle_20::
-	db CH7
-	dw SFX_Battle_20_Ch1
+	audio SFX_Battle_20, Ch7
 
 SFX_Battle_21::
-	db CH7
-	dw SFX_Battle_21_Ch1
+	audio SFX_Battle_21, Ch7
 
 SFX_Battle_22::
-	db CH7
-	dw SFX_Battle_22_Ch1
+	audio SFX_Battle_22, Ch7
 
 SFX_Battle_23::
-	db CH7
-	dw SFX_Battle_23_Ch1
+	audio SFX_Battle_23, Ch7
 
 SFX_Battle_24::
-	db ( $40 | CH4 )
-	dw SFX_Battle_24_Ch1
-	db CH7
-	dw SFX_Battle_24_Ch2
+	audio SFX_Battle_24, Ch4, Ch7
 
 SFX_Battle_25::
-	db CH7
-	dw SFX_Battle_25_Ch1
+	audio SFX_Battle_25, Ch7
 
 SFX_Battle_26::
-	db CH7
-	dw SFX_Battle_26_Ch1
+	audio SFX_Battle_26, Ch7
 
 SFX_Battle_27::
-	db ( $80 | CH4 )
-	dw SFX_Battle_27_Ch1
-	db CH5
-	dw SFX_Battle_27_Ch2
-	db CH7
-	dw SFX_Battle_27_Ch3
+	audio SFX_Battle_27, Ch4, Ch5, Ch7
 
 SFX_Battle_28::
-	db ( $80 | CH4 )
-	dw SFX_Battle_28_Ch1
-	db CH5
-	dw SFX_Battle_28_Ch2
-	db CH7
-	dw SFX_Battle_28_Ch3
+	audio SFX_Battle_28, Ch4, Ch5, Ch7
 
 SFX_Battle_29::
-	db ( $40 | CH4 )
-	dw SFX_Battle_29_Ch1
-	db CH7
-	dw SFX_Battle_29_Ch2
+	audio SFX_Battle_29, Ch4, Ch7
 
 SFX_Battle_2A::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2A_Ch1
-	db CH5
-	dw SFX_Battle_2A_Ch2
-	db CH7
-	dw SFX_Battle_2A_Ch3
+	audio SFX_Battle_2A, Ch4, Ch5, Ch7
 
 SFX_Battle_2B::
-	db ( $40 | CH4 )
-	dw SFX_Battle_2B_Ch1
-	db CH7
-	dw SFX_Battle_2B_Ch2
+	audio SFX_Battle_2B, Ch4, Ch7
 
 SFX_Battle_2C::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2C_Ch1
-	db CH5
-	dw SFX_Battle_2C_Ch2
-	db CH7
-	dw SFX_Battle_2C_Ch3
+	audio SFX_Battle_2C, Ch4, Ch5, Ch7
 
 SFX_Psybeam::
-	db ( $80 | CH4 )
-	dw SFX_Psybeam_Ch1
-	db CH5
-	dw SFX_Psybeam_Ch2
-	db CH7
-	dw SFX_Psybeam_Ch3
+	audio SFX_Psybeam, Ch4, Ch5, Ch7
 
 SFX_Battle_2E::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2E_Ch1
-	db CH5
-	dw SFX_Battle_2E_Ch2
-	db CH7
-	dw SFX_Battle_2E_Ch3
+	audio SFX_Battle_2E, Ch4, Ch5, Ch7
 
 SFX_Battle_2F::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2F_Ch1
-	db CH5
-	dw SFX_Battle_2F_Ch2
-	db CH7
-	dw SFX_Battle_2F_Ch3
+	audio SFX_Battle_2F, Ch4, Ch5, Ch7
 
 SFX_Psychic_M::
-	db ( $80 | CH4 )
-	dw SFX_Psychic_M_Ch1
-	db CH5
-	dw SFX_Psychic_M_Ch2
-	db CH7
-	dw SFX_Psychic_M_Ch3
+	audio SFX_Psychic_M, Ch4, Ch5, Ch7
 
 SFX_Battle_31::
-	db ( $40 | CH4 )
-	dw SFX_Battle_31_Ch1
-	db CH5
-	dw SFX_Battle_31_Ch2
+	audio SFX_Battle_31, Ch4, Ch5
 
 SFX_Battle_32::
-	db ( $40 | CH4 )
-	dw SFX_Battle_32_Ch1
-	db CH5
-	dw SFX_Battle_32_Ch2
+	audio SFX_Battle_32, Ch4, Ch5
 
 SFX_Battle_33::
-	db ( $40 | CH4 )
-	dw SFX_Battle_33_Ch1
-	db CH5
-	dw SFX_Battle_33_Ch2
+	audio SFX_Battle_33, Ch4, Ch5
 
 SFX_Battle_34::
-	db ( $80 | CH4 )
-	dw SFX_Battle_34_Ch1
-	db CH5
-	dw SFX_Battle_34_Ch2
-	db CH7
-	dw SFX_Battle_34_Ch3
+	audio SFX_Battle_34, Ch4, Ch5, Ch7
 
 SFX_Battle_35::
-	db ( $40 | CH4 )
-	dw SFX_Battle_35_Ch1
-	db CH5
-	dw SFX_Battle_35_Ch2
+	audio SFX_Battle_35, Ch4, Ch5
 
 SFX_Battle_36::
-	db ( $80 | CH4 )
-	dw SFX_Battle_36_Ch1
-	db CH5
-	dw SFX_Battle_36_Ch2
-	db CH7
-	dw SFX_Battle_36_Ch3
+	audio SFX_Battle_36, Ch4, Ch5, Ch7
 
 SFX_Silph_Scope::
-	db CH4
-	dw SFX_Silph_Scope_Ch1
+	audio SFX_Silph_Scope, Ch4
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 0472afa6..19a19272 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,595 +2,310 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_3::
-	db CH7
-	dw SFX_Snare1_3_Ch1
+	audio SFX_Snare1_3, Ch7
 
 SFX_Snare2_3::
-	db CH7
-	dw SFX_Snare2_3_Ch1
+	audio SFX_Snare2_3, Ch7
 
 SFX_Snare3_3::
-	db CH7
-	dw SFX_Snare3_3_Ch1
+	audio SFX_Snare3_3, Ch7
 
 SFX_Snare4_3::
-	db CH7
-	dw SFX_Snare4_3_Ch1
+	audio SFX_Snare4_3, Ch7
 
 SFX_Snare5_3::
-	db CH7
-	dw SFX_Snare5_3_Ch1
+	audio SFX_Snare5_3, Ch7
 
 SFX_Triangle1_3::
-	db CH7
-	dw SFX_Triangle1_3_Ch1
+	audio SFX_Triangle1_3, Ch7
 
 SFX_Triangle2_3::
-	db CH7
-	dw SFX_Triangle2_3_Ch1
+	audio SFX_Triangle2_3, Ch7
 
 SFX_Snare6_3::
-	db CH7
-	dw SFX_Snare6_3_Ch1
+	audio SFX_Snare6_3, Ch7
 
 SFX_Snare7_3::
-	db CH7
-	dw SFX_Snare7_3_Ch1
+	audio SFX_Snare7_3, Ch7
 
 SFX_Snare8_3::
-	db CH7
-	dw SFX_Snare8_3_Ch1
+	audio SFX_Snare8_3, Ch7
 
 SFX_Snare9_3::
-	db CH7
-	dw SFX_Snare9_3_Ch1
+	audio SFX_Snare9_3, Ch7
 
 SFX_Cymbal1_3::
-	db CH7
-	dw SFX_Cymbal1_3_Ch1
+	audio SFX_Cymbal1_3, Ch7
 
 SFX_Cymbal2_3::
-	db CH7
-	dw SFX_Cymbal2_3_Ch1
+	audio SFX_Cymbal2_3, Ch7
 
 SFX_Cymbal3_3::
-	db CH7
-	dw SFX_Cymbal3_3_Ch1
+	audio SFX_Cymbal3_3, Ch7
 
 SFX_Muted_Snare1_3::
-	db CH7
-	dw SFX_Muted_Snare1_3_Ch1
+	audio SFX_Muted_Snare1_3, Ch7
 
 SFX_Triangle3_3::
-	db CH7
-	dw SFX_Triangle3_3_Ch1
+	audio SFX_Triangle3_3, Ch7
 
 SFX_Muted_Snare2_3::
-	db CH7
-	dw SFX_Muted_Snare2_3_Ch1
+	audio SFX_Muted_Snare2_3, Ch7
 
 SFX_Muted_Snare3_3::
-	db CH7
-	dw SFX_Muted_Snare3_3_Ch1
+	audio SFX_Muted_Snare3_3, Ch7
 
 SFX_Muted_Snare4_3::
-	db CH7
-	dw SFX_Muted_Snare4_3_Ch1
+	audio SFX_Muted_Snare4_3, Ch7
 
 SFX_Cry00_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_3_Ch1
-	db CH5
-	dw SFX_Cry00_3_Ch2
-	db CH7
-	dw SFX_Cry00_3_Ch3
+	audio SFX_Cry00_3, Ch4, Ch5, Ch7
 
 SFX_Cry01_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_3_Ch1
-	db CH5
-	dw SFX_Cry01_3_Ch2
-	db CH7
-	dw SFX_Cry01_3_Ch3
+	audio SFX_Cry01_3, Ch4, Ch5, Ch7
 
 SFX_Cry02_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_3_Ch1
-	db CH5
-	dw SFX_Cry02_3_Ch2
-	db CH7
-	dw SFX_Cry02_3_Ch3
+	audio SFX_Cry02_3, Ch4, Ch5, Ch7
 
 SFX_Cry03_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_3_Ch1
-	db CH5
-	dw SFX_Cry03_3_Ch2
-	db CH7
-	dw SFX_Cry03_3_Ch3
+	audio SFX_Cry03_3, Ch4, Ch5, Ch7
 
 SFX_Cry04_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_3_Ch1
-	db CH5
-	dw SFX_Cry04_3_Ch2
-	db CH7
-	dw SFX_Cry04_3_Ch3
+	audio SFX_Cry04_3, Ch4, Ch5, Ch7
 
 SFX_Cry05_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_3_Ch1
-	db CH5
-	dw SFX_Cry05_3_Ch2
-	db CH7
-	dw SFX_Cry05_3_Ch3
+	audio SFX_Cry05_3, Ch4, Ch5, Ch7
 
 SFX_Cry06_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_3_Ch1
-	db CH5
-	dw SFX_Cry06_3_Ch2
-	db CH7
-	dw SFX_Cry06_3_Ch3
+	audio SFX_Cry06_3, Ch4, Ch5, Ch7
 
 SFX_Cry07_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_3_Ch1
-	db CH5
-	dw SFX_Cry07_3_Ch2
-	db CH7
-	dw SFX_Cry07_3_Ch3
+	audio SFX_Cry07_3, Ch4, Ch5, Ch7
 
 SFX_Cry08_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_3_Ch1
-	db CH5
-	dw SFX_Cry08_3_Ch2
-	db CH7
-	dw SFX_Cry08_3_Ch3
+	audio SFX_Cry08_3, Ch4, Ch5, Ch7
 
 SFX_Cry09_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_3_Ch1
-	db CH5
-	dw SFX_Cry09_3_Ch2
-	db CH7
-	dw SFX_Cry09_3_Ch3
+	audio SFX_Cry09_3, Ch4, Ch5, Ch7
 
 SFX_Cry0A_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_3_Ch1
-	db CH5
-	dw SFX_Cry0A_3_Ch2
-	db CH7
-	dw SFX_Cry0A_3_Ch3
+	audio SFX_Cry0A_3, Ch4, Ch5, Ch7
 
 SFX_Cry0B_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_3_Ch1
-	db CH5
-	dw SFX_Cry0B_3_Ch2
-	db CH7
-	dw SFX_Cry0B_3_Ch3
+	audio SFX_Cry0B_3, Ch4, Ch5, Ch7
 
 SFX_Cry0C_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_3_Ch1
-	db CH5
-	dw SFX_Cry0C_3_Ch2
-	db CH7
-	dw SFX_Cry0C_3_Ch3
+	audio SFX_Cry0C_3, Ch4, Ch5, Ch7
 
 SFX_Cry0D_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_3_Ch1
-	db CH5
-	dw SFX_Cry0D_3_Ch2
-	db CH7
-	dw SFX_Cry0D_3_Ch3
+	audio SFX_Cry0D_3, Ch4, Ch5, Ch7
 
 SFX_Cry0E_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_3_Ch1
-	db CH5
-	dw SFX_Cry0E_3_Ch2
-	db CH7
-	dw SFX_Cry0E_3_Ch3
+	audio SFX_Cry0E_3, Ch4, Ch5, Ch7
 
 SFX_Cry0F_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_3_Ch1
-	db CH5
-	dw SFX_Cry0F_3_Ch2
-	db CH7
-	dw SFX_Cry0F_3_Ch3
+	audio SFX_Cry0F_3, Ch4, Ch5, Ch7
 
 SFX_Cry10_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_3_Ch1
-	db CH5
-	dw SFX_Cry10_3_Ch2
-	db CH7
-	dw SFX_Cry10_3_Ch3
+	audio SFX_Cry10_3, Ch4, Ch5, Ch7
 
 SFX_Cry11_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_3_Ch1
-	db CH5
-	dw SFX_Cry11_3_Ch2
-	db CH7
-	dw SFX_Cry11_3_Ch3
+	audio SFX_Cry11_3, Ch4, Ch5, Ch7
 
 SFX_Cry12_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_3_Ch1
-	db CH5
-	dw SFX_Cry12_3_Ch2
-	db CH7
-	dw SFX_Cry12_3_Ch3
+	audio SFX_Cry12_3, Ch4, Ch5, Ch7
 
 SFX_Cry13_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_3_Ch1
-	db CH5
-	dw SFX_Cry13_3_Ch2
-	db CH7
-	dw SFX_Cry13_3_Ch3
+	audio SFX_Cry13_3, Ch4, Ch5, Ch7
 
 SFX_Cry14_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_3_Ch1
-	db CH5
-	dw SFX_Cry14_3_Ch2
-	db CH7
-	dw SFX_Cry14_3_Ch3
+	audio SFX_Cry14_3, Ch4, Ch5, Ch7
 
 SFX_Cry15_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_3_Ch1
-	db CH5
-	dw SFX_Cry15_3_Ch2
-	db CH7
-	dw SFX_Cry15_3_Ch3
+	audio SFX_Cry15_3, Ch4, Ch5, Ch7
 
 SFX_Cry16_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_3_Ch1
-	db CH5
-	dw SFX_Cry16_3_Ch2
-	db CH7
-	dw SFX_Cry16_3_Ch3
+	audio SFX_Cry16_3, Ch4, Ch5, Ch7
 
 SFX_Cry17_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_3_Ch1
-	db CH5
-	dw SFX_Cry17_3_Ch2
-	db CH7
-	dw SFX_Cry17_3_Ch3
+	audio SFX_Cry17_3, Ch4, Ch5, Ch7
 
 SFX_Cry18_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_3_Ch1
-	db CH5
-	dw SFX_Cry18_3_Ch2
-	db CH7
-	dw SFX_Cry18_3_Ch3
+	audio SFX_Cry18_3, Ch4, Ch5, Ch7
 
 SFX_Cry19_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_3_Ch1
-	db CH5
-	dw SFX_Cry19_3_Ch2
-	db CH7
-	dw SFX_Cry19_3_Ch3
+	audio SFX_Cry19_3, Ch4, Ch5, Ch7
 
 SFX_Cry1A_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_3_Ch1
-	db CH5
-	dw SFX_Cry1A_3_Ch2
-	db CH7
-	dw SFX_Cry1A_3_Ch3
+	audio SFX_Cry1A_3, Ch4, Ch5, Ch7
 
 SFX_Cry1B_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_3_Ch1
-	db CH5
-	dw SFX_Cry1B_3_Ch2
-	db CH7
-	dw SFX_Cry1B_3_Ch3
+	audio SFX_Cry1B_3, Ch4, Ch5, Ch7
 
 SFX_Cry1C_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_3_Ch1
-	db CH5
-	dw SFX_Cry1C_3_Ch2
-	db CH7
-	dw SFX_Cry1C_3_Ch3
+	audio SFX_Cry1C_3, Ch4, Ch5, Ch7
 
 SFX_Cry1D_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_3_Ch1
-	db CH5
-	dw SFX_Cry1D_3_Ch2
-	db CH7
-	dw SFX_Cry1D_3_Ch3
+	audio SFX_Cry1D_3, Ch4, Ch5, Ch7
 
 SFX_Cry1E_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_3_Ch1
-	db CH5
-	dw SFX_Cry1E_3_Ch2
-	db CH7
-	dw SFX_Cry1E_3_Ch3
+	audio SFX_Cry1E_3, Ch4, Ch5, Ch7
 
 SFX_Cry1F_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_3_Ch1
-	db CH5
-	dw SFX_Cry1F_3_Ch2
-	db CH7
-	dw SFX_Cry1F_3_Ch3
+	audio SFX_Cry1F_3, Ch4, Ch5, Ch7
 
 SFX_Cry20_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_3_Ch1
-	db CH5
-	dw SFX_Cry20_3_Ch2
-	db CH7
-	dw SFX_Cry20_3_Ch3
+	audio SFX_Cry20_3, Ch4, Ch5, Ch7
 
 SFX_Cry21_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_3_Ch1
-	db CH5
-	dw SFX_Cry21_3_Ch2
-	db CH7
-	dw SFX_Cry21_3_Ch3
+	audio SFX_Cry21_3, Ch4, Ch5, Ch7
 
 SFX_Cry22_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_3_Ch1
-	db CH5
-	dw SFX_Cry22_3_Ch2
-	db CH7
-	dw SFX_Cry22_3_Ch3
+	audio SFX_Cry22_3, Ch4, Ch5, Ch7
 
 SFX_Cry23_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_3_Ch1
-	db CH5
-	dw SFX_Cry23_3_Ch2
-	db CH7
-	dw SFX_Cry23_3_Ch3
+	audio SFX_Cry23_3, Ch4, Ch5, Ch7
 
 SFX_Cry24_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_3_Ch1
-	db CH5
-	dw SFX_Cry24_3_Ch2
-	db CH7
-	dw SFX_Cry24_3_Ch3
+	audio SFX_Cry24_3, Ch4, Ch5, Ch7
 
 SFX_Cry25_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_3_Ch1
-	db CH5
-	dw SFX_Cry25_3_Ch2
-	db CH7
-	dw SFX_Cry25_3_Ch3
+	audio SFX_Cry25_3, Ch4, Ch5, Ch7
 
 SFX_Get_Item1_3::
-	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
+	audio SFX_Get_Item1_3, Ch4, Ch5, Ch6
 
 SFX_Get_Item2_3::
-	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
+	audio SFX_Get_Item2_3, Ch4, Ch5, Ch6
 
 SFX_Tink_3::
-	db CH4
-	dw SFX_Tink_3_Ch1
+	audio SFX_Tink_3, Ch4
 
 SFX_Heal_HP_3::
-	db CH4
-	dw SFX_Heal_HP_3_Ch1
+	audio SFX_Heal_HP_3, Ch4
 
 SFX_Heal_Ailment_3::
-	db CH4
-	dw SFX_Heal_Ailment_3_Ch1
+	audio SFX_Heal_Ailment_3, Ch4
 
 SFX_Start_Menu_3::
-	db CH7
-	dw SFX_Start_Menu_3_Ch1
+	audio SFX_Start_Menu_3, Ch7
 
 SFX_Press_AB_3::
-	db CH4
-	dw SFX_Press_AB_3_Ch1
+	audio SFX_Press_AB_3, Ch4
 
 SFX_Pokedex_Rating_3::
-	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
+	audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6
 
 SFX_Get_Key_Item_3::
-	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
+	audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6
 
 SFX_Poisoned_3::
-	db CH4
-	dw SFX_Poisoned_3_Ch1
+	audio SFX_Poisoned_3, Ch4
 
 SFX_Trade_Machine_3::
-	db CH4
-	dw SFX_Trade_Machine_3_Ch1
+	audio SFX_Trade_Machine_3, Ch4
 
 SFX_Turn_On_PC_3::
-	db CH4
-	dw SFX_Turn_On_PC_3_Ch1
+	audio SFX_Turn_On_PC_3, Ch4
 
 SFX_Turn_Off_PC_3::
-	db CH4
-	dw SFX_Turn_Off_PC_3_Ch1
+	audio SFX_Turn_Off_PC_3, Ch4
 
 SFX_Enter_PC_3::
-	db CH4
-	dw SFX_Enter_PC_3_Ch1
+	audio SFX_Enter_PC_3, Ch4
 
 SFX_Shrink_3::
-	db CH4
-	dw SFX_Shrink_3_Ch1
+	audio SFX_Shrink_3, Ch4
 
 SFX_Switch_3::
-	db CH4
-	dw SFX_Switch_3_Ch1
+	audio SFX_Switch_3, Ch4
 
 SFX_Healing_Machine_3::
-	db CH4
-	dw SFX_Healing_Machine_3_Ch1
+	audio SFX_Healing_Machine_3, Ch4
 
 SFX_Teleport_Exit1_3::
-	db CH4
-	dw SFX_Teleport_Exit1_3_Ch1
+	audio SFX_Teleport_Exit1_3, Ch4
 
 SFX_Teleport_Enter1_3::
-	db CH4
-	dw SFX_Teleport_Enter1_3_Ch1
+	audio SFX_Teleport_Enter1_3, Ch4
 
 SFX_Teleport_Exit2_3::
-	db CH4
-	dw SFX_Teleport_Exit2_3_Ch1
+	audio SFX_Teleport_Exit2_3, Ch4
 
 SFX_Ledge_3::
-	db CH4
-	dw SFX_Ledge_3_Ch1
+	audio SFX_Ledge_3, Ch4
 
 SFX_Teleport_Enter2_3::
-	db CH7
-	dw SFX_Teleport_Enter2_3_Ch1
+	audio SFX_Teleport_Enter2_3, Ch7
 
 SFX_Fly_3::
-	db CH7
-	dw SFX_Fly_3_Ch1
+	audio SFX_Fly_3, Ch7
 
 SFX_Denied_3::
-	db ( $40 | CH4 )
-	dw SFX_Denied_3_Ch1
-	db CH5
-	dw SFX_Denied_3_Ch2
+	audio SFX_Denied_3, Ch4, Ch5
 
 SFX_Arrow_Tiles_3::
-	db CH4
-	dw SFX_Arrow_Tiles_3_Ch1
+	audio SFX_Arrow_Tiles_3, Ch4
 
 SFX_Push_Boulder_3::
-	db CH7
-	dw SFX_Push_Boulder_3_Ch1
+	audio SFX_Push_Boulder_3, Ch7
 
 SFX_SS_Anne_Horn_3::
-	db ( $40 | CH4 )
-	dw SFX_SS_Anne_Horn_3_Ch1
-	db CH5
-	dw SFX_SS_Anne_Horn_3_Ch2
+	audio SFX_SS_Anne_Horn_3, Ch4, Ch5
 
 SFX_Withdraw_Deposit_3::
-	db CH4
-	dw SFX_Withdraw_Deposit_3_Ch1
+	audio SFX_Withdraw_Deposit_3, Ch4
 
 SFX_Cut_3::
-	db CH7
-	dw SFX_Cut_3_Ch1
+	audio SFX_Cut_3, Ch7
 
 SFX_Go_Inside_3::
-	db CH7
-	dw SFX_Go_Inside_3_Ch1
+	audio SFX_Go_Inside_3, Ch7
 
 SFX_Swap_3::
-	db ( $40 | CH4 )
-	dw SFX_Swap_3_Ch1
-	db CH5
-	dw SFX_Swap_3_Ch2
+	audio SFX_Swap_3, Ch4, Ch5
 
 SFX_59_3::
-	db ( $40 | CH4 )
-	dw SFX_59_3_Ch1
-	db CH5
-	dw SFX_59_3_Ch2
+	audio SFX_59_3, Ch4, Ch5
 
 SFX_Purchase_3::
-	db ( $40 | CH4 )
-	dw SFX_Purchase_3_Ch1
-	db CH5
-	dw SFX_Purchase_3_Ch2
+	audio SFX_Purchase_3, Ch4, Ch5
 
 SFX_Collision_3::
-	db CH4
-	dw SFX_Collision_3_Ch1
+	audio SFX_Collision_3, Ch4
 
 SFX_Go_Outside_3::
-	db CH7
-	dw SFX_Go_Outside_3_Ch1
+	audio SFX_Go_Outside_3, Ch7
 
 SFX_Save_3::
-	db ( $40 | CH4 )
-	dw SFX_Save_3_Ch1
-	db CH5
-	dw SFX_Save_3_Ch2
+	audio SFX_Save_3, Ch4, Ch5
 
 SFX_Intro_Lunge::
-	db CH7
-	dw SFX_Intro_Lunge_Ch1
+	audio SFX_Intro_Lunge, Ch7
 
 SFX_Intro_Hip::
-	db CH4
-	dw SFX_Intro_Hip_Ch1
+	audio SFX_Intro_Hip, Ch4
 
 SFX_Intro_Hop::
-	db CH4
-	dw SFX_Intro_Hop_Ch1
+	audio SFX_Intro_Hop, Ch4
 
 SFX_Intro_Raise::
-	db CH7
-	dw SFX_Intro_Raise_Ch1
+	audio SFX_Intro_Raise, Ch7
 
 SFX_Intro_Crash::
-	db CH7
-	dw SFX_Intro_Crash_Ch1
+	audio SFX_Intro_Crash, Ch7
 
 SFX_Intro_Whoosh::
-	db CH7
-	dw SFX_Intro_Whoosh_Ch1
+	audio SFX_Intro_Whoosh, Ch7
 
 SFX_Slots_Stop_Wheel::
-	db CH4
-	dw SFX_Slots_Stop_Wheel_Ch1
+	audio SFX_Slots_Stop_Wheel, Ch4
 
 SFX_Slots_Reward::
-	db CH4
-	dw SFX_Slots_Reward_Ch1
+	audio SFX_Slots_Reward, Ch4
 
 SFX_Slots_New_Spin::
-	db ( $40 | CH4 )
-	dw SFX_Slots_New_Spin_Ch1
-	db CH5
-	dw SFX_Slots_New_Spin_Ch2
+	audio SFX_Slots_New_Spin, Ch4, Ch5
 
 SFX_Shooting_Star::
-	db CH4
-	dw SFX_Shooting_Star_Ch1
+	audio SFX_Shooting_Star, Ch4
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index b5378a94..87c7b5c2 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -1,4 +1,4 @@
-Music_BikeRiding_Ch1::
+Music_BikeRiding_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9::
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
 
 
-Music_BikeRiding_Ch2::
+Music_BikeRiding_Ch1::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
@@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75::
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
 
-Music_BikeRiding_Ch3::
+Music_BikeRiding_Ch2::
 	notetype 12, 1, 3
 	rest 2
 
@@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17::
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
 
-Music_BikeRiding_Ch4::
+Music_BikeRiding_Ch3::
 	dspeed 12
 	rest 2
 
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index 3f015d8d..a1699301 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -1,4 +1,4 @@
-Music_Celadon_Ch1::
+Music_Celadon_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4::
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
-Music_Celadon_Ch2::
+Music_Celadon_Ch1::
 	duty 3
 	notetype 12, 12, 2
 	octave 4
@@ -226,7 +226,7 @@ Music_Celadon_branch_b74a::
 	loopchannel 0, Music_Celadon_branch_b74a
 
 
-Music_Celadon_Ch3::
+Music_Celadon_Ch2::
 	notetype 12, 1, 3
 	rest 8
 	octave 5
diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm
index 4fe93c31..c6b3564d 100644
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -1,4 +1,4 @@
-Music_Cinnabar_Ch1::
+Music_Cinnabar_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878::
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
-Music_Cinnabar_Ch2::
+Music_Cinnabar_Ch1::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9::
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
-Music_Cinnabar_Ch3::
+Music_Cinnabar_Ch2::
 	notetype 12, 1, 0
 
 Music_Cinnabar_branch_b93f::
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index 438c2f18..bb54a456 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -1,4 +1,4 @@
-Music_CinnabarMansion_Ch1::
+Music_CinnabarMansion_Ch0::
 	tempo 144
 	volume 7, 7
 	vibrato 11, 2, 5
@@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19::
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch2::
+Music_CinnabarMansion_Ch1::
 	duty 2
 	toggleperfectpitch
 	vibrato 10, 2, 4
@@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c::
 	endchannel
 
 
-Music_CinnabarMansion_Ch3::
+Music_CinnabarMansion_Ch2::
 	notetype 12, 1, 1
 
 Music_CinnabarMansion_branch_7ed80::
@@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80::
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
-Music_CinnabarMansion_Ch4::
+Music_CinnabarMansion_Ch3::
 	dspeed 6
 	rest 16
 	rest 16
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index eb9ccde5..984202f6 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f::
 	tempo 232
 	loopchannel 0, Music_Cities1_branch_aa79
 
-Music_Cities1_Ch1::
+Music_Cities1_Ch0::
 	tempo 144
 
 Music_Cities1_branch_aa79::
@@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a::
 	endchannel
 
 
-Music_Cities1_Ch2::
+Music_Cities1_Ch1::
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
@@ -357,7 +357,7 @@ Music_Cities1_Ch2::
 	G# 1
 	notetype 12, 10, 4
 	A_ 1
-	loopchannel 0, Music_Cities1_Ch2
+	loopchannel 0, Music_Cities1_Ch1
 
 Music_Cities1_branch_ac00::
 	duty 2
@@ -401,7 +401,7 @@ Music_Cities1_branch_ac00::
 	endchannel
 
 
-Music_Cities1_Ch3::
+Music_Cities1_Ch2::
 	notetype 12, 1, 1
 	toggleperfectpitch
 
@@ -579,7 +579,7 @@ Music_Cities1_branch_acce::
 	endchannel
 
 
-Music_Cities1_Ch4::
+Music_Cities1_Ch3::
 	dspeed 12
 	callchannel Music_Cities1_branch_ad36
 
@@ -609,7 +609,7 @@ Music_Cities1_branch_acf3::
 	triangle1 6
 	snare6 6
 	snare6 4
-	loopchannel 0, Music_Cities1_Ch4
+	loopchannel 0, Music_Cities1_Ch3
 
 Music_Cities1_branch_ad36::
 	snare6 6
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index 897fb8c9..fb167999 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -1,4 +1,4 @@
-Music_Cities2_Ch1::
+Music_Cities2_Ch0::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -94,7 +94,7 @@ Music_Cities2_branch_b51a::
 	loopchannel 0, Music_Cities2_branch_b51a
 
 
-Music_Cities2_Ch2::
+Music_Cities2_Ch1::
 	duty 3
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
@@ -280,7 +280,7 @@ Music_Cities2_branch_b58b::
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
-Music_Cities2_Ch3::
+Music_Cities2_Ch2::
 	notetype 12, 1, 1
 	rest 16
 	octave 4
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index d9a5ec35..f092326b 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,4 +1,4 @@
-Music_Credits_Ch1::
+Music_Credits_Ch0::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -284,7 +284,7 @@ Music_Credits_Ch1::
 	endchannel
 
 
-Music_Credits_Ch2::
+Music_Credits_Ch1::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
@@ -574,7 +574,7 @@ Music_Credits_Ch2::
 	endchannel
 
 
-Music_Credits_Ch3::
+Music_Credits_Ch2::
 	notetype 12, 1, 0
 	octave 5
 	C# 6
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 7f0d046d..1ea6c1ff 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -1,4 +1,4 @@
-Music_DefeatedGymLeader_Ch1::
+Music_DefeatedGymLeader_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc::
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
-Music_DefeatedGymLeader_Ch2::
+Music_DefeatedGymLeader_Ch1::
 	duty 2
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
@@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84::
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
-Music_DefeatedGymLeader_Ch3::
+Music_DefeatedGymLeader_Ch2::
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 8ad51afa..87c5d2c9 100644
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -1,4 +1,4 @@
-Music_DefeatedTrainer_Ch1::
+Music_DefeatedTrainer_Ch0::
 	tempo 224
 	volume 7, 7
 	duty 2
@@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76::
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
-Music_DefeatedTrainer_Ch2::
+Music_DefeatedTrainer_Ch1::
 	duty 2
 	notetype 4, 12, 3
 	octave 4
@@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2::
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
-Music_DefeatedTrainer_Ch3::
+Music_DefeatedTrainer_Ch2::
 	notetype 4, 1, 0
 	octave 5
 	D_ 2
diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index 92326a84..ea3f733f 100644
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -1,4 +1,4 @@
-Music_DefeatedWildMon_Ch1::
+Music_DefeatedWildMon_Ch0::
 	tempo 112
 	volume 7, 7
 	executemusic
@@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b::
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
-Music_DefeatedWildMon_Ch2::
+Music_DefeatedWildMon_Ch1::
 	executemusic
 	duty 2
 	notetype 12, 12, 3
@@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce::
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
-Music_DefeatedWildMon_Ch3::
+Music_DefeatedWildMon_Ch2::
 	executemusic
 	notetype 12, 2, 0
 	octave 5
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index c84fc694..c6f6b105 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -1,4 +1,4 @@
-Music_Dungeon1_Ch1::
+Music_Dungeon1_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5::
 	endchannel
 
 
-Music_Dungeon1_Ch2::
+Music_Dungeon1_Ch1::
 	vibrato 11, 1, 5
 	duty 3
 	notetype 12, 0, 15
@@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd::
 	endchannel
 
 
-Music_Dungeon1_Ch3::
+Music_Dungeon1_Ch2::
 	notetype 12, 1, 1
 	vibrato 8, 2, 6
 	rest 14
@@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177::
 	endchannel
 
 
-Music_Dungeon1_Ch4::
+Music_Dungeon1_Ch3::
 	dspeed 12
 	rest 14
 	cymbal1 1
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 44e9d5bf..d5f459fb 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -1,4 +1,4 @@
-Music_Dungeon2_Ch1::
+Music_Dungeon2_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892::
 	loopchannel 0, Music_Dungeon2_branch_7e892
 
 
-Music_Dungeon2_Ch2::
+Music_Dungeon2_Ch1::
 	vibrato 11, 1, 5
 
 Music_Dungeon2_branch_7e8db::
@@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db::
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
-Music_Dungeon2_Ch3::
+Music_Dungeon2_Ch2::
 	notetype 12, 1, 3
 	vibrato 8, 2, 6
 
@@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1::
 	endchannel
 
 
-Music_Dungeon2_Ch4::
+Music_Dungeon2_Ch3::
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm
index 767ca626..f9742a26 100644
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -1,4 +1,4 @@
-Music_Dungeon3_Ch1::
+Music_Dungeon3_Ch0::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc::
 	endchannel
 
 
-Music_Dungeon3_Ch2::
+Music_Dungeon3_Ch1::
 	vibrato 11, 1, 5
 	duty 3
 
@@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d::
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
-Music_Dungeon3_Ch3::
+Music_Dungeon3_Ch2::
 	notetype 12, 1, 2
 	rest 16
 	rest 16
@@ -707,10 +707,10 @@ Music_Dungeon3_Ch3::
 	rest 16
 	rest 16
 	rest 10
-	loopchannel 0, Music_Dungeon3_Ch3
+	loopchannel 0, Music_Dungeon3_Ch2
 
 
-Music_Dungeon3_Ch4::
+Music_Dungeon3_Ch3::
 	dspeed 12
 	rest 16
 	rest 16
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index 9a13f00f..adb0f8b9 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1,4 +1,4 @@
-Music_FinalBattle_Ch1::
+Music_FinalBattle_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429::
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
-Music_FinalBattle_Ch2::
+Music_FinalBattle_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710::
 	endchannel
 
 
-Music_FinalBattle_Ch3::
+Music_FinalBattle_Ch2::
 	notetype 12, 1, 1
 	octave 4
 	E_ 4
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index 52b85e08..832bade6 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,4 +1,4 @@
-Music_GameCorner_Ch1::
+Music_GameCorner_Ch0::
 	tempo 120
 	volume 7, 7
 	duty 3
@@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222::
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
-Music_GameCorner_Ch2::
+Music_GameCorner_Ch1::
 	duty 2
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
@@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa::
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
-Music_GameCorner_Ch3::
+Music_GameCorner_Ch2::
 	notetype 12, 1, 3
 	octave 5
 	C# 1
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index b314336d..ad99bddd 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,4 +1,4 @@
-Music_Gym_Ch1::
+Music_Gym_Ch0::
 	tempo 138
 	volume 7, 7
 	duty 3
@@ -165,7 +165,7 @@ Music_Gym_branch_bcd8::
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
-Music_Gym_Ch2::
+Music_Gym_Ch1::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
@@ -288,7 +288,7 @@ Music_Gym_branch_bd82::
 	loopchannel 0, Music_Gym_branch_bd82
 
 
-Music_Gym_Ch3::
+Music_Gym_Ch2::
 	notetype 12, 1, 1
 	rest 16
 	rest 10
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index 1eb2951d..6c1cffb5 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1,4 +1,4 @@
-Music_GymLeaderBattle_Ch1::
+Music_GymLeaderBattle_Ch0::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0::
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch2::
+Music_GymLeaderBattle_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0::
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch3::
+Music_GymLeaderBattle_Ch2::
 	vibrato 0, 2, 0
 	notetype 12, 1, 3
 	rest 12
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index 69f926f6..098c82c8 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,4 +1,4 @@
-Music_HallOfFame_Ch1::
+Music_HallOfFame_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5::
 	loopchannel 0, Music_HallOfFame_branch_7fbc5
 
 
-Music_HallOfFame_Ch2::
+Music_HallOfFame_Ch1::
 	vibrato 8, 2, 5
 	duty 3
 
@@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf::
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
-Music_HallOfFame_Ch3::
+Music_HallOfFame_Ch2::
 	notetype 12, 1, 2
 
 Music_HallOfFame_branch_7fbfe::
@@ -93,4 +93,4 @@ Music_HallOfFame_branch_7fbfe::
 	G_ 4
 	E_ 4
 	G_ 4
-	loopchannel 0, Music_HallOfFame_Ch3
+	loopchannel 0, Music_HallOfFame_Ch2
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index 61623e39..f139775b 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,4 +1,4 @@
-Music_IndigoPlateau_Ch1::
+Music_IndigoPlateau_Ch0::
 	tempo 132
 	volume 7, 7
 	duty 3
@@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659::
 	endchannel
 
 
-Music_IndigoPlateau_Ch2::
+Music_IndigoPlateau_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af::
 	endchannel
 
 
-Music_IndigoPlateau_Ch3::
+Music_IndigoPlateau_Ch2::
 	notetype 12, 1, 0
 	octave 4
 	D_ 2
@@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe::
 	endchannel
 
 
-Music_IndigoPlateau_Ch4::
+Music_IndigoPlateau_Ch3::
 	dspeed 6
 	mutedsnare2 16
 	mutedsnare2 16
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index fd4a8e35..2aad0d88 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1::
+Music_IntroBattle_Ch0::
 	tempo 98
 	volume 7, 7
 	duty 3
@@ -90,7 +90,7 @@ Music_IntroBattle_Ch1::
 	endchannel
 
 
-Music_IntroBattle_Ch2::
+Music_IntroBattle_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -165,7 +165,7 @@ Music_IntroBattle_Ch2::
 	endchannel
 
 
-Music_IntroBattle_Ch3::
+Music_IntroBattle_Ch2::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -229,7 +229,7 @@ Music_IntroBattle_Ch3::
 	endchannel
 
 
-Music_IntroBattle_Ch4::
+Music_IntroBattle_Ch3::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 9a01246b..0b791a30 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -1,4 +1,4 @@
-Music_JigglypuffSong_Ch1::
+Music_JigglypuffSong_Ch0::
 	tempo 144
 	volume 7, 7
 	vibrato 8, 2, 4
@@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1::
 	endchannel
 
 
-Music_JigglypuffSong_Ch2::
+Music_JigglypuffSong_Ch1::
 	vibrato 5, 1, 5
 	duty 2
 	dutycycle 10
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index 7b60cc24..da58e489 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -1,4 +1,4 @@
-Music_Lavender_Ch1::
+Music_Lavender_Ch0::
 	tempo 152
 	volume 7, 7
 	duty 1
@@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b::
 	loopchannel 0, Music_Lavender_branch_bb6b
 
 
-Music_Lavender_Ch2::
+Music_Lavender_Ch1::
 	vibrato 0, 3, 4
 	duty 3
 	notetype 12, 9, 1
@@ -76,7 +76,7 @@ Music_Lavender_branch_bba5::
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
-Music_Lavender_Ch3::
+Music_Lavender_Ch2::
 	vibrato 4, 1, 1
 	notetype 12, 3, 5
 	rest 16
@@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9::
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
-Music_Lavender_Ch4::
+Music_Lavender_Ch3::
 	dspeed 12
 	rest 16
 	rest 16
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index 2378a03a..941b0c34 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetEvilTrainer_Ch1::
+Music_MeetEvilTrainer_Ch0::
 	tempo 124
 	volume 7, 7
 	duty 2
@@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae::
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
-Music_MeetEvilTrainer_Ch2::
+Music_MeetEvilTrainer_Ch1::
 	duty 1
 	notetype 12, 11, 6
 	octave 3
@@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
 
-Music_MeetEvilTrainer_Ch3::
+Music_MeetEvilTrainer_Ch2::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 0f24f99e..2a5659b4 100644
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetFemaleTrainer_Ch1::
+Music_MeetFemaleTrainer_Ch0::
 	tempo 124
 	volume 7, 7
 	duty 1
@@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c::
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
-Music_MeetFemaleTrainer_Ch2::
+Music_MeetFemaleTrainer_Ch1::
 	duty 2
 	notetype 12, 12, 2
 	octave 3
@@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726::
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
-Music_MeetFemaleTrainer_Ch3::
+Music_MeetFemaleTrainer_Ch2::
 	notetype 12, 1, 0
 	rest 8
 	octave 5
diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index 92047849..c13e40cb 100644
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -1,4 +1,4 @@
-Music_MeetMaleTrainer_Ch1::
+Music_MeetMaleTrainer_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f::
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
-Music_MeetMaleTrainer_Ch2::
+Music_MeetMaleTrainer_Ch1::
 	duty 3
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
@@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5::
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
-Music_MeetMaleTrainer_Ch3::
+Music_MeetMaleTrainer_Ch2::
 	notetype 12, 1, 0
 	rest 6
 	octave 4
diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index 6532a187..5c6ea13d 100644
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -1,4 +1,4 @@
-Music_MeetProfOak_Ch1::
+Music_MeetProfOak_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85::
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
-Music_MeetProfOak_Ch2::
+Music_MeetProfOak_Ch1::
 	vibrato 8, 1, 1
 	duty 2
 	notetype 12, 12, 4
@@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005::
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
-Music_MeetProfOak_Ch3::
+Music_MeetProfOak_Ch2::
 	notetype 12, 1, 2
 	rest 10
 	octave 4
diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm
index 153523af..a6391247 100644
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -2,7 +2,7 @@ Music_MeetRival_branch_b119::
 	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch1::
+Music_MeetRival_Ch0::
 	tempo 112
 
 Music_MeetRival_branch_b123::
@@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5::
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
-Music_MeetRival_Ch2::
+Music_MeetRival_Ch1::
 	duty 3
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
@@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d::
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 
-Music_MeetRival_Ch3::
+Music_MeetRival_Ch2::
 	notetype 12, 1, 4
 	octave 5
 	D_ 2
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index cb08fcf4..e41b37bd 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -1,4 +1,4 @@
-Music_MuseumGuy_Ch1::
+Music_MuseumGuy_Ch0::
 	tempo 128
 	volume 7, 7
 	duty 2
@@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec::
 	endchannel
 
 
-Music_MuseumGuy_Ch2::
+Music_MuseumGuy_Ch1::
 	duty 2
 	notetype 12, 12, 1
 	octave 4
@@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26::
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
-Music_MuseumGuy_Ch3::
+Music_MuseumGuy_Ch2::
 	notetype 12, 1, 0
 	rest 16
 	octave 4
@@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1::
 	endchannel
 
 
-Music_MuseumGuy_Ch4::
+Music_MuseumGuy_Ch3::
 	dspeed 12
 	rest 16
 	rest 16
diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm
index 7214264c..87245350 100644
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -1,4 +1,4 @@
-Music_OaksLab_Ch1::
+Music_OaksLab_Ch0::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0::
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
-Music_OaksLab_Ch2::
+Music_OaksLab_Ch1::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
@@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16::
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
 
-Music_OaksLab_Ch3::
+Music_OaksLab_Ch2::
 	notetype 12, 1, 1
 	rest 2
 	octave 4
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 0c8b7dbc..5ad31f81 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,4 +1,4 @@
-Music_PalletTown_Ch1::
+Music_PalletTown_Ch0::
 	tempo 160
 	volume 7, 7
 	duty 2
@@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce::
 	endchannel
 
 
-Music_PalletTown_Ch2::
+Music_PalletTown_Ch1::
 	duty 2
 
 Music_PalletTown_branch_a861::
@@ -262,7 +262,7 @@ Music_PalletTown_branch_a861::
 	endchannel
 
 
-Music_PalletTown_Ch3::
+Music_PalletTown_Ch2::
 	vibrato 24, 2, 8
 	notetype 12, 1, 2
 
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 2b7b545b..9d3cd3d0 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -1,4 +1,4 @@
-Music_PkmnHealed_Ch1::
+Music_PkmnHealed_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 2
@@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1::
 	endchannel
 
 
-Music_PkmnHealed_Ch2::
+Music_PkmnHealed_Ch1::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2::
 	endchannel
 
 
-Music_PkmnHealed_Ch3::
+Music_PkmnHealed_Ch2::
 	notetype 12, 1, 0
 	octave 4
 	E_ 2
diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm
index 5de546ad..83d161d7 100644
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -1,4 +1,4 @@
-Music_Pokecenter_Ch1::
+Music_Pokecenter_Ch0::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61::
 	loopchannel 0, Music_Pokecenter_branch_be61
 
 
-Music_Pokecenter_Ch2::
+Music_Pokecenter_Ch1::
 	vibrato 8, 2, 5
 
 Music_Pokecenter_branch_befc::
@@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60::
 	endchannel
 
 
-Music_Pokecenter_Ch3::
+Music_Pokecenter_Ch2::
 	notetype 12, 1, 0
 
 Music_Pokecenter_branch_bf72::
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index afae9a75..0f17ddeb 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -1,4 +1,4 @@
-Music_PokemonTower_Ch1::
+Music_PokemonTower_Ch0::
 	tempo 152
 	volume 7, 7
 	duty 3
@@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a::
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
-Music_PokemonTower_Ch2::
+Music_PokemonTower_Ch1::
 	vibrato 20, 3, 4
 	duty 3
 	notetype 12, 10, 0
@@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee::
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
-Music_PokemonTower_Ch3::
+Music_PokemonTower_Ch2::
 	vibrato 4, 1, 1
 	notetype 12, 1, 3
 	rest 8
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index bab18261..fc3227ce 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -1,4 +1,4 @@
-Music_Routes1_Ch1::
+Music_Routes1_Ch0::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
@@ -106,7 +106,7 @@ Music_Routes1_branch_9be9::
 	endchannel
 
 
-Music_Routes1_Ch2::
+Music_Routes1_Ch1::
 	duty 2
 
 Music_Routes1_branch_9c53::
@@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d::
 	endchannel
 
 
-Music_Routes1_Ch3::
+Music_Routes1_Ch2::
 	vibrato 8, 2, 5
 	notetype 12, 1, 3
 
@@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd::
 	endchannel
 
 
-Music_Routes1_Ch4::
+Music_Routes1_Ch3::
 	dspeed 12
 	rest 4
 	mutedsnare1 2
@@ -400,5 +400,5 @@ Music_Routes1_Ch4::
 	rest 2
 	mutedsnare1 2
 	mutedsnare1 2
-	loopchannel 0, Music_Routes1_Ch4
+	loopchannel 0, Music_Routes1_Ch3
 	endchannel
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index 42b4deda..ae5b22d1 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -1,4 +1,4 @@
-Music_Routes2_Ch1::
+Music_Routes2_Ch0::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
@@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3::
 	endchannel
 
 
-Music_Routes2_Ch2::
+Music_Routes2_Ch1::
 	vibrato 8, 2, 6
 	duty 3
 
@@ -216,7 +216,7 @@ Music_Routes2_branch_9e54::
 	endchannel
 
 
-Music_Routes2_Ch3::
+Music_Routes2_Ch2::
 	vibrato 9, 2, 8
 
 Music_Routes2_branch_9e9e::
@@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e::
 	endchannel
 
 
-Music_Routes2_Ch4::
+Music_Routes2_Ch3::
 	dspeed 12
 	snare3 2
 	rest 2
@@ -421,5 +421,5 @@ Music_Routes2_Ch4::
 	rest 3
 	snare3 3
 	rest 3
-	loopchannel 0, Music_Routes2_Ch4
+	loopchannel 0, Music_Routes2_Ch3
 	endchannel
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index d0d1672e..b384308b 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -1,4 +1,4 @@
-Music_Routes3_Ch1::
+Music_Routes3_Ch0::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3::
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch2::
+Music_Routes3_Ch1::
 	vibrato 8, 2, 3
 	duty 2
 	notetype 12, 12, 7
@@ -178,7 +178,7 @@ Music_Routes3_branch_a01a::
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
-Music_Routes3_Ch3::
+Music_Routes3_Ch2::
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
@@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3::
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
-Music_Routes3_Ch4::
+Music_Routes3_Ch3::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 9bbf44ea..a9149f05 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -1,4 +1,4 @@
-Music_Routes4_Ch1::
+Music_Routes4_Ch0::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -138,7 +138,7 @@ Music_Routes4_branch_a28a::
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
-Music_Routes4_Ch2::
+Music_Routes4_Ch1::
 	vibrato 12, 2, 4
 	duty 1
 	notetype 12, 9, 2
@@ -288,7 +288,7 @@ Music_Routes4_branch_a325::
 	loopchannel 0, Music_Routes4_branch_a325
 
 
-Music_Routes4_Ch3::
+Music_Routes4_Ch2::
 	notetype 12, 1, 0
 	octave 4
 	E_ 1
@@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7::
 	loopchannel 0, Music_Routes4_branch_a3d7
 
 
-Music_Routes4_Ch4::
+Music_Routes4_Ch3::
 	dspeed 12
 	rest 16
 	rest 12
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 45d84fd0..e2853646 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -1,4 +1,4 @@
-Music_SafariZone_Ch1::
+Music_SafariZone_Ch0::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
@@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f::
 	endchannel
 
 
-Music_SafariZone_Ch2::
+Music_SafariZone_Ch1::
 	duty 2
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
@@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89::
 	endchannel
 
 
-Music_SafariZone_Ch3::
+Music_SafariZone_Ch2::
 	notetype 12, 1, 0
 	rest 8
 
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index 2b6d8134..3e1ff3fc 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -1,4 +1,4 @@
-Music_SilphCo_Ch1::
+Music_SilphCo_Ch0::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0::
 	endchannel
 
 
-Music_SilphCo_Ch2::
+Music_SilphCo_Ch1::
 	vibrato 10, 3, 2
 	duty 3
 	notetype 6, 12, 3
@@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e::
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
 
-Music_SilphCo_Ch3::
+Music_SilphCo_Ch2::
 	vibrato 8, 1, 1
 	notetype 12, 1, 1
 	rest 12
diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm
index ea6b1a0f..1356c8b1 100644
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -1,4 +1,4 @@
-Music_SSAnne_Ch1::
+Music_SSAnne_Ch0::
 	tempo 128
 	volume 7, 7
 	duty 1
@@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2::
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
-Music_SSAnne_Ch2::
+Music_SSAnne_Ch1::
 	duty 0
 	vibrato 12, 2, 4
 
@@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e::
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
-Music_SSAnne_Ch3::
+Music_SSAnne_Ch2::
 	notetype 12, 1, 3
 	rest 16
 	rest 12
@@ -335,4 +335,4 @@ Music_SSAnne_Ch3::
 	F# 8
 	G# 8
 	B_ 8
-	loopchannel 0, Music_SSAnne_Ch3
+	loopchannel 0, Music_SSAnne_Ch2
diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm
index 03ebfed0..c4507a55 100644
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -1,4 +1,4 @@
-Music_Surfing_Ch1::
+Music_Surfing_Ch0::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30::
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
-Music_Surfing_Ch2::
+Music_Surfing_Ch1::
 	duty 3
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
@@ -203,7 +203,7 @@ Music_Surfing_branch_7faae::
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
-Music_Surfing_Ch3::
+Music_Surfing_Ch2::
 	notetype 12, 1, 0
 	rest 12
 	octave 5
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index b28474eb..2d41b082 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen_Ch1::
+Music_TitleScreen_Ch0::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
@@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c::
 	endchannel
 
 
-Music_TitleScreen_Ch2::
+Music_TitleScreen_Ch1::
 	vibrato 16, 4, 6
 	duty 1
 	notetype 12, 14, 1
@@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636::
 	endchannel
 
 
-Music_TitleScreen_Ch3::
+Music_TitleScreen_Ch2::
 	notetype 12, 1, 0
 	octave 3
 	G_ 1
@@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5::
 	endchannel
 
 
-Music_TitleScreen_Ch4::
+Music_TitleScreen_Ch3::
 	dspeed 6
 	rest 4
 	snare3 1
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 395f05de..5bd2c5f8 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1,4 +1,4 @@
-Music_TrainerBattle_Ch1::
+Music_TrainerBattle_Ch0::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962::
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
-Music_TrainerBattle_Ch2::
+Music_TrainerBattle_Ch1::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
@@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc::
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
-Music_TrainerBattle_Ch3::
+Music_TrainerBattle_Ch2::
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm
index 10ca4beb..fb541581 100644
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -1,4 +1,4 @@
-Music_UnusedSong_Ch1::
+Music_UnusedSong_Ch0::
 	tempo 144
 	volume 7, 7
 	vibrato 5, 1, 6
@@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b::
 	endchannel
 
 
-Music_UnusedSong_Ch2::
+Music_UnusedSong_Ch1::
 	tempo 144
 	volume 7, 7
 	toggleperfectpitch
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index 94f87b25..c89c9b3b 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -1,4 +1,4 @@
-Music_Vermilion_Ch1::
+Music_Vermilion_Ch0::
 	tempo 156
 	volume 7, 7
 	duty 3
@@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6::
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
-Music_Vermilion_Ch2::
+Music_Vermilion_Ch1::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66::
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
-Music_Vermilion_Ch3::
+Music_Vermilion_Ch2::
 	notetype 12, 1, 0
 
 Music_Vermilion_branch_baa8::
@@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8::
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
-Music_Vermilion_Ch4::
+Music_Vermilion_Ch3::
 	dspeed 12
 
 Music_Vermilion_branch_bb0e::
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index 3a88678f..e9aad529 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -1,4 +1,4 @@
-Music_WildBattle_Ch1::
+Music_WildBattle_Ch0::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0::
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
-Music_WildBattle_Ch2::
+Music_WildBattle_Ch1::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -462,7 +462,7 @@ Music_WildBattle_branch_23225::
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
-Music_WildBattle_Ch3::
+Music_WildBattle_Ch2::
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm
index c14be83e..f36f9e1e 100644
--- a/audio/sfx/59_1.asm
+++ b/audio/sfx/59_1.asm
@@ -1,10 +1,10 @@
-SFX_59_1_Ch1:
+SFX_59_1_Ch4:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_1_Ch2:
+SFX_59_1_Ch5:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm
index 3b817f2f..559318ba 100644
--- a/audio/sfx/59_3.asm
+++ b/audio/sfx/59_3.asm
@@ -1,10 +1,10 @@
-SFX_59_3_Ch1:
+SFX_59_3_Ch4:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_3_Ch2:
+SFX_59_3_Ch5:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm
index 6c3959c9..c9ef1564 100644
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_1_Ch1:
+SFX_Arrow_Tiles_1_Ch4:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm
index 8ff79858..f88b9c83 100644
--- a/audio/sfx/arrow_tiles_3.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_3_Ch1:
+SFX_Arrow_Tiles_3_Ch4:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm
index 6cd9701b..7068c66c 100644
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,4 +1,4 @@
-SFX_Ball_Poof_Ch1:
+SFX_Ball_Poof_Ch4:
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1:
 	endchannel
 
 
-SFX_Ball_Poof_Ch2:
+SFX_Ball_Poof_Ch7:
 	unknownnoise0x20 15, 162, 34
 	endchannel
diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm
index 49176db3..e9beac77 100644
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,11 +1,11 @@
-SFX_Ball_Toss_Ch1:
+SFX_Ball_Toss_Ch4:
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
 	endchannel
 
 
-SFX_Ball_Toss_Ch2:
+SFX_Ball_Toss_Ch5:
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm
index 8b92fc50..11f156cb 100644
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,4 +1,4 @@
-SFX_Battle_09_Ch1:
+SFX_Battle_09_Ch4:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5
diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm
index 27909666..d6feba8e 100644
--- a/audio/sfx/battle_0b.asm
+++ b/audio/sfx/battle_0b.asm
@@ -1,3 +1,3 @@
-SFX_Battle_0B_Ch1:
+SFX_Battle_0B_Ch7:
 	unknownnoise0x20 8, 241, 84
 	endchannel
diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm
index 7aa009ba..f193fc20 100644
--- a/audio/sfx/battle_0c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0C_Ch1:
+SFX_Battle_0C_Ch7:
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm
index 1b69e13f..f9d423ad 100644
--- a/audio/sfx/battle_0d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0D_Ch1:
+SFX_Battle_0D_Ch7:
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm
index ff60cb9e..92a660b2 100644
--- a/audio/sfx/battle_0e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0E_Ch1:
+SFX_Battle_0E_Ch7:
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm
index 3827a5a6..846a9053 100644
--- a/audio/sfx/battle_0f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0F_Ch1:
+SFX_Battle_0F_Ch7:
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58
diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm
index 7d301053..77be75c0 100644
--- a/audio/sfx/battle_12.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,6 +1,6 @@
-SFX_Battle_12_Ch1:
+SFX_Battle_12_Ch7:
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
-	loopchannel 4, SFX_Battle_12_Ch1
+	loopchannel 4, SFX_Battle_12_Ch7
 	endchannel
diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm
index 89b8c555..81e1a0ef 100644
--- a/audio/sfx/battle_13.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,4 +1,4 @@
-SFX_Battle_13_Ch1:
+SFX_Battle_13_Ch7:
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm
index acc064f7..8cecfb37 100644
--- a/audio/sfx/battle_14.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,4 +1,4 @@
-SFX_Battle_14_Ch1:
+SFX_Battle_14_Ch7:
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84
diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm
index 3aa31247..dcc7014d 100644
--- a/audio/sfx/battle_16.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,4 +1,4 @@
-SFX_Battle_16_Ch1:
+SFX_Battle_16_Ch7:
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm
index 2ff4bd6d..82bb2117 100644
--- a/audio/sfx/battle_17.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,4 +1,4 @@
-SFX_Battle_17_Ch1:
+SFX_Battle_17_Ch7:
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68
diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm
index 81fa2178..14aac5c1 100644
--- a/audio/sfx/battle_18.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,4 +1,4 @@
-SFX_Battle_18_Ch1:
+SFX_Battle_18_Ch7:
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm
index 9981f5e4..6bc1804d 100644
--- a/audio/sfx/battle_19.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,4 +1,4 @@
-SFX_Battle_19_Ch1:
+SFX_Battle_19_Ch7:
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm
index 9f89e449..a4d8992b 100644
--- a/audio/sfx/battle_1b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1B_Ch1:
+SFX_Battle_1B_Ch7:
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm
index 3827b34c..05cdd091 100644
--- a/audio/sfx/battle_1c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1C_Ch1:
+SFX_Battle_1C_Ch7:
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm
index f4e9bdc8..8d3f4745 100644
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1E_Ch1:
+SFX_Battle_1E_Ch4:
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1:
 	endchannel
 
 
-SFX_Battle_1E_Ch2:
+SFX_Battle_1E_Ch7:
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34
diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm
index e8a4d9f3..f7413e63 100644
--- a/audio/sfx/battle_20.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,4 +1,4 @@
-SFX_Battle_20_Ch1:
+SFX_Battle_20_Ch7:
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm
index b59f5833..a6b63a6c 100644
--- a/audio/sfx/battle_21.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,4 +1,4 @@
-SFX_Battle_21_Ch1:
+SFX_Battle_21_Ch7:
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49
diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm
index 66cd218d..6a20c3ae 100644
--- a/audio/sfx/battle_22.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,4 +1,4 @@
-SFX_Battle_22_Ch1:
+SFX_Battle_22_Ch7:
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm
index 7203dcf2..e532cf08 100644
--- a/audio/sfx/battle_23.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,4 +1,4 @@
-SFX_Battle_23_Ch1:
+SFX_Battle_23_Ch7:
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49
diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm
index 7c81b40b..46e9d29f 100644
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,4 +1,4 @@
-SFX_Battle_24_Ch1:
+SFX_Battle_24_Ch4:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,7 +6,7 @@ SFX_Battle_24_Ch1:
 	endchannel
 
 
-SFX_Battle_24_Ch2:
+SFX_Battle_24_Ch7:
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm
index b1f4fc54..3a46e505 100644
--- a/audio/sfx/battle_25.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,4 +1,4 @@
-SFX_Battle_25_Ch1:
+SFX_Battle_25_Ch7:
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65
diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm
index c656264b..ce1ac2f9 100644
--- a/audio/sfx/battle_26.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,4 +1,4 @@
-SFX_Battle_26_Ch1:
+SFX_Battle_26_Ch7:
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81
diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm
index af86c33f..1e662c29 100644
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,4 +1,4 @@
-SFX_Battle_27_Ch1:
+SFX_Battle_27_Ch4:
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
@@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a:
 	endchannel
 
 
-SFX_Battle_27_Ch2:
+SFX_Battle_27_Ch5:
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
@@ -20,8 +20,8 @@ SFX_Battle_27_branch_2063d:
 	endchannel
 
 
-SFX_Battle_27_Ch3:
+SFX_Battle_27_Ch7:
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
-	loopchannel 10, SFX_Battle_27_Ch3
+	loopchannel 10, SFX_Battle_27_Ch7
 	endchannel
diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm
index 1c974e85..298ddb7a 100644
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,21 +1,21 @@
-SFX_Battle_28_Ch1:
+SFX_Battle_28_Ch4:
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
-	loopchannel 12, SFX_Battle_28_Ch1
+	loopchannel 12, SFX_Battle_28_Ch4
 	endchannel
 
 
-SFX_Battle_28_Ch2:
+SFX_Battle_28_Ch5:
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
-	loopchannel 12, SFX_Battle_28_Ch2
+	loopchannel 12, SFX_Battle_28_Ch5
 	endchannel
 
 
-SFX_Battle_28_Ch3:
+SFX_Battle_28_Ch7:
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 6, SFX_Battle_28_Ch3
+	loopchannel 6, SFX_Battle_28_Ch7
 	endchannel
diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm
index d0abb3cb..e36c18dc 100644
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,17 +1,17 @@
-SFX_Battle_29_Ch1:
+SFX_Battle_29_Ch4:
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
-	loopchannel 5, SFX_Battle_29_Ch1
+	loopchannel 5, SFX_Battle_29_Ch4
 	unknownsfx0x20 8, 227, 48, 1
 	unknownsfx0x20 15, 194, 16, 1
 	endchannel
 
 
-SFX_Battle_29_Ch2:
+SFX_Battle_29_Ch7:
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
-	loopchannel 4, SFX_Battle_29_Ch2
+	loopchannel 4, SFX_Battle_29_Ch7
 	unknownnoise0x20 12, 244, 188
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm
index ab01bf85..710a45f1 100644
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,28 +1,28 @@
-SFX_Battle_2A_Ch1:
+SFX_Battle_2A_Ch4:
 	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_Battle_2A_Ch1
+	loopchannel 3, SFX_Battle_2A_Ch4
 	unknownsfx0x20 8, 209, 0, 6
 	endchannel
 
 
-SFX_Battle_2A_Ch2:
+SFX_Battle_2A_Ch5:
 	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_Battle_2A_Ch2
+	loopchannel 3, SFX_Battle_2A_Ch5
 	endchannel
 
 
-SFX_Battle_2A_Ch3:
+SFX_Battle_2A_Ch7:
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51
 	unknownnoise0x20 15, 195, 50
-	loopchannel 2, SFX_Battle_2A_Ch3
+	loopchannel 2, SFX_Battle_2A_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm
index 6eddfa76..da57c7a7 100644
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,21 +1,21 @@
-SFX_Battle_2B_Ch1:
+SFX_Battle_2B_Ch4:
 	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_Battle_2B_Ch1
+	loopchannel 5, SFX_Battle_2B_Ch4
 	unknownsfx0x20 8, 129, 0, 4
 	endchannel
 
 
-SFX_Battle_2B_Ch2:
+SFX_Battle_2B_Ch7:
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51
 	unknownnoise0x20 3, 146, 35
 	unknownnoise0x20 3, 82, 18
-	loopchannel 5, SFX_Battle_2B_Ch2
+	loopchannel 5, SFX_Battle_2B_Ch7
 	unknownnoise0x20 8, 129, 18
 	endchannel
diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm
index 9cd9bd16..2f8bdc49 100644
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,25 +1,25 @@
-SFX_Battle_2C_Ch1:
+SFX_Battle_2C_Ch4:
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
 	unknownsfx0x20 15, 226, 192, 5
-	loopchannel 3, SFX_Battle_2C_Ch1
+	loopchannel 3, SFX_Battle_2C_Ch4
 	endchannel
 
 
-SFX_Battle_2C_Ch2:
+SFX_Battle_2C_Ch5:
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
 	unknownsfx0x20 15, 162, 56, 4
-	loopchannel 4, SFX_Battle_2C_Ch2
+	loopchannel 4, SFX_Battle_2C_Ch5
 	endchannel
 
 
-SFX_Battle_2C_Ch3:
+SFX_Battle_2C_Ch7:
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66
 	unknownnoise0x20 15, 244, 65
-	loopchannel 3, SFX_Battle_2C_Ch3
+	loopchannel 3, SFX_Battle_2C_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm
index a0841ccf..20c86033 100644
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,27 +1,27 @@
-SFX_Battle_2E_Ch1:
+SFX_Battle_2E_Ch4:
 	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_Battle_2E_Ch1
+	loopchannel 8, SFX_Battle_2E_Ch4
 	endchannel
 
 
-SFX_Battle_2E_Ch2:
+SFX_Battle_2E_Ch5:
 	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_Battle_2E_Ch2
+	loopchannel 8, SFX_Battle_2E_Ch5
 	endchannel
 
 
-SFX_Battle_2E_Ch3:
+SFX_Battle_2E_Ch7:
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16
 	unknownnoise0x20 5, 210, 18
-	loopchannel 9, SFX_Battle_2E_Ch3
+	loopchannel 9, SFX_Battle_2E_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm
index ad607993..fb4c7a14 100644
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,21 +1,21 @@
-SFX_Battle_2F_Ch1:
+SFX_Battle_2F_Ch4:
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
-	loopchannel 8, SFX_Battle_2F_Ch1
+	loopchannel 8, SFX_Battle_2F_Ch4
 	endchannel
 
 
-SFX_Battle_2F_Ch2:
+SFX_Battle_2F_Ch5:
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
-	loopchannel 9, SFX_Battle_2F_Ch2
+	loopchannel 9, SFX_Battle_2F_Ch5
 	endchannel
 
 
-SFX_Battle_2F_Ch3:
+SFX_Battle_2F_Ch7:
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
-	loopchannel 9, SFX_Battle_2F_Ch3
+	loopchannel 9, SFX_Battle_2F_Ch7
 	endchannel
diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm
index c88cc476..cc1169eb 100644
--- a/audio/sfx/battle_31.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,4 +1,4 @@
-SFX_Battle_31_Ch1:
+SFX_Battle_31_Ch4:
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@ SFX_Battle_31_Ch1:
 	endchannel
 
 
-SFX_Battle_31_Ch2:
+SFX_Battle_31_Ch5:
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7
diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm
index a85d4334..c7bff4b2 100644
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,4 +1,4 @@
-SFX_Battle_32_Ch1:
+SFX_Battle_32_Ch4:
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,7 +6,7 @@ SFX_Battle_32_Ch1:
 	endchannel
 
 
-SFX_Battle_32_Ch2:
+SFX_Battle_32_Ch5:
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm
index 25b1ee42..c92b5482 100644
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,4 +1,4 @@
-SFX_Battle_33_Ch1:
+SFX_Battle_33_Ch4:
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@ SFX_Battle_33_Ch1:
 	endchannel
 
 
-SFX_Battle_33_Ch2:
+SFX_Battle_33_Ch5:
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5
diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm
index 14718916..38576ecb 100644
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,4 +1,4 @@
-SFX_Battle_34_Ch1:
+SFX_Battle_34_Ch4:
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@ SFX_Battle_34_Ch1:
 	endchannel
 
 
-SFX_Battle_34_Ch2:
+SFX_Battle_34_Ch5:
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,7 +14,7 @@ SFX_Battle_34_Ch2:
 	endchannel
 
 
-SFX_Battle_34_Ch3:
+SFX_Battle_34_Ch7:
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85
diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm
index 2fe57bc4..7ce3afb4 100644
--- a/audio/sfx/battle_35.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,4 +1,4 @@
-SFX_Battle_35_Ch1:
+SFX_Battle_35_Ch4:
 	executemusic
 	vibrato 10, 2, 4
 	duty 2
@@ -13,7 +13,7 @@ SFX_Battle_35_Ch1:
 	endchannel
 
 
-SFX_Battle_35_Ch2:
+SFX_Battle_35_Ch5:
 	executemusic
 	vibrato 10, 2, 3
 	duty 2
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm
index dcf9c56e..df23fb37 100644
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,4 +1,4 @@
-SFX_Battle_36_Ch1:
+SFX_Battle_36_Ch4:
 	duty 0
 	unknownsfx0x20 2, 241, 128, 7
 	unknownsfx0x20 2, 241, 0, 7
@@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930:
 	endchannel
 
 
-SFX_Battle_36_Ch2:
+SFX_Battle_36_Ch5:
 	dutycycle 179
 	unknownsfx0x20 2, 241, 129, 7
 	unknownsfx0x20 2, 241, 1, 7
@@ -40,8 +40,8 @@ SFX_Battle_36_Ch2:
 	endchannel
 
 
-SFX_Battle_36_Ch3:
+SFX_Battle_36_Ch7:
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 26, SFX_Battle_36_Ch3
+	loopchannel 26, SFX_Battle_36_Ch7
 	endchannel
diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm
index d4f3e858..b844a54a 100644
--- a/audio/sfx/caught_mon.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,4 +1,4 @@
-SFX_Caught_Mon_Ch1:
+SFX_Caught_Mon_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1:
 	endchannel
 
 
-SFX_Caught_Mon_Ch2:
+SFX_Caught_Mon_Ch5:
 	executemusic
 	duty 2
 	notetype 6, 12, 2
@@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2:
 	endchannel
 
 
-SFX_Caught_Mon_Ch3:
+SFX_Caught_Mon_Ch6:
 	executemusic
 	notetype 6, 1, 0
 	octave 4
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
index 7a45bdf4..241a5e68 100644
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,4 +1,4 @@
-SFX_Collision_1_Ch1:
+SFX_Collision_1_Ch4:
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm
index 601670d5..649792eb 100644
--- a/audio/sfx/collision_3.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,4 +1,4 @@
-SFX_Collision_3_Ch1:
+SFX_Collision_3_Ch4:
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm
index 4fc82294..98920dfc 100644
--- a/audio/sfx/cry00_1.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_1_Ch1:
+SFX_Cry00_1_Ch4:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1:
 	endchannel
 
 
-SFX_Cry00_1_Ch2:
+SFX_Cry00_1_Ch5:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2:
 	endchannel
 
 
-SFX_Cry00_1_Ch3:
+SFX_Cry00_1_Ch7:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm
index ccce6943..17a9207e 100644
--- a/audio/sfx/cry00_2.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_2_Ch1:
+SFX_Cry00_2_Ch4:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1:
 	endchannel
 
 
-SFX_Cry00_2_Ch2:
+SFX_Cry00_2_Ch5:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2:
 	endchannel
 
 
-SFX_Cry00_2_Ch3:
+SFX_Cry00_2_Ch7:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm
index 9b8b6fda..81ad7edf 100644
--- a/audio/sfx/cry00_3.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry00_3_Ch1:
+SFX_Cry00_3_Ch4:
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1:
 	endchannel
 
 
-SFX_Cry00_3_Ch2:
+SFX_Cry00_3_Ch5:
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2:
 	endchannel
 
 
-SFX_Cry00_3_Ch3:
+SFX_Cry00_3_Ch7:
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm
index d684af6f..392adbe3 100644
--- a/audio/sfx/cry01_1.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_1_Ch1:
+SFX_Cry01_1_Ch4:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1:
 	endchannel
 
 
-SFX_Cry01_1_Ch2:
+SFX_Cry01_1_Ch5:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2:
 	endchannel
 
 
-SFX_Cry01_1_Ch3:
+SFX_Cry01_1_Ch7:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm
index 0e1030e1..a7397fd8 100644
--- a/audio/sfx/cry01_2.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_2_Ch1:
+SFX_Cry01_2_Ch4:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1:
 	endchannel
 
 
-SFX_Cry01_2_Ch2:
+SFX_Cry01_2_Ch5:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2:
 	endchannel
 
 
-SFX_Cry01_2_Ch3:
+SFX_Cry01_2_Ch7:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm
index be084d7e..19235f9e 100644
--- a/audio/sfx/cry01_3.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry01_3_Ch1:
+SFX_Cry01_3_Ch4:
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1:
 	endchannel
 
 
-SFX_Cry01_3_Ch2:
+SFX_Cry01_3_Ch5:
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2:
 	endchannel
 
 
-SFX_Cry01_3_Ch3:
+SFX_Cry01_3_Ch7:
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm
index d4b520c9..62834724 100644
--- a/audio/sfx/cry02_1.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_1_Ch1:
+SFX_Cry02_1_Ch4:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1:
 	endchannel
 
 
-SFX_Cry02_1_Ch2:
+SFX_Cry02_1_Ch5:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_1_Ch3:
+SFX_Cry02_1_Ch7:
 	endchannel
diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm
index 526e8c48..ae40372a 100644
--- a/audio/sfx/cry02_2.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_2_Ch1:
+SFX_Cry02_2_Ch4:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1:
 	endchannel
 
 
-SFX_Cry02_2_Ch2:
+SFX_Cry02_2_Ch5:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_2_Ch3:
+SFX_Cry02_2_Ch7:
 	endchannel
diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm
index 2366ff97..32be5608 100644
--- a/audio/sfx/cry02_3.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry02_3_Ch1:
+SFX_Cry02_3_Ch4:
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1:
 	endchannel
 
 
-SFX_Cry02_3_Ch2:
+SFX_Cry02_3_Ch5:
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_Cry02_3_Ch3:
+SFX_Cry02_3_Ch7:
 	endchannel
diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm
index 72ea5d38..706d2325 100644
--- a/audio/sfx/cry03_1.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_1_Ch1:
+SFX_Cry03_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1:
 	endchannel
 
 
-SFX_Cry03_1_Ch2:
+SFX_Cry03_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2:
 	endchannel
 
 
-SFX_Cry03_1_Ch3:
+SFX_Cry03_1_Ch7:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm
index de043909..89e98ae4 100644
--- a/audio/sfx/cry03_2.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_2_Ch1:
+SFX_Cry03_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1:
 	endchannel
 
 
-SFX_Cry03_2_Ch2:
+SFX_Cry03_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2:
 	endchannel
 
 
-SFX_Cry03_2_Ch3:
+SFX_Cry03_2_Ch7:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm
index 467745f9..d472d37b 100644
--- a/audio/sfx/cry03_3.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry03_3_Ch1:
+SFX_Cry03_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1:
 	endchannel
 
 
-SFX_Cry03_3_Ch2:
+SFX_Cry03_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2:
 	endchannel
 
 
-SFX_Cry03_3_Ch3:
+SFX_Cry03_3_Ch7:
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm
index 2c34f1c6..d1bb26c6 100644
--- a/audio/sfx/cry04_1.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_1_Ch1:
+SFX_Cry04_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1:
 	endchannel
 
 
-SFX_Cry04_1_Ch2:
+SFX_Cry04_1_Ch5:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2:
 	endchannel
 
 
-SFX_Cry04_1_Ch3:
+SFX_Cry04_1_Ch7:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm
index 38bfbf63..aa5baf29 100644
--- a/audio/sfx/cry04_2.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_2_Ch1:
+SFX_Cry04_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1:
 	endchannel
 
 
-SFX_Cry04_2_Ch2:
+SFX_Cry04_2_Ch5:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2:
 	endchannel
 
 
-SFX_Cry04_2_Ch3:
+SFX_Cry04_2_Ch7:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm
index bd73c271..b4d9cf2e 100644
--- a/audio/sfx/cry04_3.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry04_3_Ch1:
+SFX_Cry04_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1:
 	endchannel
 
 
-SFX_Cry04_3_Ch2:
+SFX_Cry04_3_Ch5:
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2:
 	endchannel
 
 
-SFX_Cry04_3_Ch3:
+SFX_Cry04_3_Ch7:
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm
index 8de5bf02..dc68e77d 100644
--- a/audio/sfx/cry05_1.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_1_Ch1:
+SFX_Cry05_1_Ch4:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1:
 	endchannel
 
 
-SFX_Cry05_1_Ch2:
+SFX_Cry05_1_Ch5:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2:
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_1_Ch3:
+SFX_Cry05_1_Ch7:
 	endchannel
diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm
index 28879677..f7e09dcc 100644
--- a/audio/sfx/cry05_2.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_2_Ch1:
+SFX_Cry05_2_Ch4:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1:
 	endchannel
 
 
-SFX_Cry05_2_Ch2:
+SFX_Cry05_2_Ch5:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2:
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_2_Ch3:
+SFX_Cry05_2_Ch7:
 	endchannel
diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm
index 261492af..2e8839c9 100644
--- a/audio/sfx/cry05_3.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry05_3_Ch1:
+SFX_Cry05_3_Ch4:
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1:
 	endchannel
 
 
-SFX_Cry05_3_Ch2:
+SFX_Cry05_3_Ch5:
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2:
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_Cry05_3_Ch3:
+SFX_Cry05_3_Ch7:
 	endchannel
diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm
index e171b025..d3b051c8 100644
--- a/audio/sfx/cry06_1.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_1_Ch1:
+SFX_Cry06_1_Ch4:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1:
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_1_Ch2:
+SFX_Cry06_1_Ch5:
 	endchannel
 
 
-SFX_Cry06_1_Ch3:
+SFX_Cry06_1_Ch7:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm
index 5e6e9e6a..6a46246c 100644
--- a/audio/sfx/cry06_2.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_2_Ch1:
+SFX_Cry06_2_Ch4:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1:
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_2_Ch2:
+SFX_Cry06_2_Ch5:
 	endchannel
 
 
-SFX_Cry06_2_Ch3:
+SFX_Cry06_2_Ch7:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm
index 5d2994f1..692cd1cf 100644
--- a/audio/sfx/cry06_3.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry06_3_Ch1:
+SFX_Cry06_3_Ch4:
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1:
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_Cry06_3_Ch2:
+SFX_Cry06_3_Ch5:
 	endchannel
 
 
-SFX_Cry06_3_Ch3:
+SFX_Cry06_3_Ch7:
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm
index e48a50a2..2eebb7f9 100644
--- a/audio/sfx/cry07_1.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_1_Ch1:
+SFX_Cry07_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1:
 	endchannel
 
 
-SFX_Cry07_1_Ch2:
+SFX_Cry07_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2:
 	endchannel
 
 
-SFX_Cry07_1_Ch3:
+SFX_Cry07_1_Ch7:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm
index ab902a30..e0381424 100644
--- a/audio/sfx/cry07_2.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_2_Ch1:
+SFX_Cry07_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1:
 	endchannel
 
 
-SFX_Cry07_2_Ch2:
+SFX_Cry07_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2:
 	endchannel
 
 
-SFX_Cry07_2_Ch3:
+SFX_Cry07_2_Ch7:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm
index 40fad544..92a401a9 100644
--- a/audio/sfx/cry07_3.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry07_3_Ch1:
+SFX_Cry07_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1:
 	endchannel
 
 
-SFX_Cry07_3_Ch2:
+SFX_Cry07_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2:
 	endchannel
 
 
-SFX_Cry07_3_Ch3:
+SFX_Cry07_3_Ch7:
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm
index 6ec5ca3c..91901faa 100644
--- a/audio/sfx/cry08_1.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_1_Ch1:
+SFX_Cry08_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1:
 	endchannel
 
 
-SFX_Cry08_1_Ch2:
+SFX_Cry08_1_Ch5:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2:
 	endchannel
 
 
-SFX_Cry08_1_Ch3:
+SFX_Cry08_1_Ch7:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm
index 9c154b1c..45d12f38 100644
--- a/audio/sfx/cry08_2.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_2_Ch1:
+SFX_Cry08_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1:
 	endchannel
 
 
-SFX_Cry08_2_Ch2:
+SFX_Cry08_2_Ch5:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2:
 	endchannel
 
 
-SFX_Cry08_2_Ch3:
+SFX_Cry08_2_Ch7:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm
index 95fea40e..8f1ec3fb 100644
--- a/audio/sfx/cry08_3.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry08_3_Ch1:
+SFX_Cry08_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1:
 	endchannel
 
 
-SFX_Cry08_3_Ch2:
+SFX_Cry08_3_Ch5:
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2:
 	endchannel
 
 
-SFX_Cry08_3_Ch3:
+SFX_Cry08_3_Ch7:
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm
index 46aae33c..11b4ab55 100644
--- a/audio/sfx/cry09_1.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_1_Ch1:
+SFX_Cry09_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1:
 	endchannel
 
 
-SFX_Cry09_1_Ch2:
+SFX_Cry09_1_Ch5:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2:
 	endchannel
 
 
-SFX_Cry09_1_Ch3:
+SFX_Cry09_1_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm
index 8ce97609..ac4b1f74 100644
--- a/audio/sfx/cry09_2.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_2_Ch1:
+SFX_Cry09_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1:
 	endchannel
 
 
-SFX_Cry09_2_Ch2:
+SFX_Cry09_2_Ch5:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2:
 	endchannel
 
 
-SFX_Cry09_2_Ch3:
+SFX_Cry09_2_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm
index a6b40dde..1d3856cc 100644
--- a/audio/sfx/cry09_3.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry09_3_Ch1:
+SFX_Cry09_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1:
 	endchannel
 
 
-SFX_Cry09_3_Ch2:
+SFX_Cry09_3_Ch5:
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2:
 	endchannel
 
 
-SFX_Cry09_3_Ch3:
+SFX_Cry09_3_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm
index 4264e858..051a5d73 100644
--- a/audio/sfx/cry0a_1.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_1_Ch1:
+SFX_Cry0A_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1:
 	endchannel
 
 
-SFX_Cry0A_1_Ch2:
+SFX_Cry0A_1_Ch5:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2:
 	endchannel
 
 
-SFX_Cry0A_1_Ch3:
+SFX_Cry0A_1_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm
index 42a8e603..d7fdd264 100644
--- a/audio/sfx/cry0a_2.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_2_Ch1:
+SFX_Cry0A_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1:
 	endchannel
 
 
-SFX_Cry0A_2_Ch2:
+SFX_Cry0A_2_Ch5:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2:
 	endchannel
 
 
-SFX_Cry0A_2_Ch3:
+SFX_Cry0A_2_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm
index f8576fa1..e16287c4 100644
--- a/audio/sfx/cry0a_3.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0A_3_Ch1:
+SFX_Cry0A_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1:
 	endchannel
 
 
-SFX_Cry0A_3_Ch2:
+SFX_Cry0A_3_Ch5:
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2:
 	endchannel
 
 
-SFX_Cry0A_3_Ch3:
+SFX_Cry0A_3_Ch7:
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm
index d0da6c2e..5ee9b81c 100644
--- a/audio/sfx/cry0b_1.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_1_Ch1:
+SFX_Cry0B_1_Ch4:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1:
 	endchannel
 
 
-SFX_Cry0B_1_Ch2:
+SFX_Cry0B_1_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2:
 	endchannel
 
 
-SFX_Cry0B_1_Ch3:
+SFX_Cry0B_1_Ch7:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm
index 0fe7840a..f762ea02 100644
--- a/audio/sfx/cry0b_2.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_2_Ch1:
+SFX_Cry0B_2_Ch4:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1:
 	endchannel
 
 
-SFX_Cry0B_2_Ch2:
+SFX_Cry0B_2_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2:
 	endchannel
 
 
-SFX_Cry0B_2_Ch3:
+SFX_Cry0B_2_Ch7:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm
index ff761b85..22420974 100644
--- a/audio/sfx/cry0b_3.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0B_3_Ch1:
+SFX_Cry0B_3_Ch4:
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1:
 	endchannel
 
 
-SFX_Cry0B_3_Ch2:
+SFX_Cry0B_3_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2:
 	endchannel
 
 
-SFX_Cry0B_3_Ch3:
+SFX_Cry0B_3_Ch7:
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm
index 4ff72662..dfbf0283 100644
--- a/audio/sfx/cry0c_1.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_1_Ch1:
+SFX_Cry0C_1_Ch4:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1:
 	endchannel
 
 
-SFX_Cry0C_1_Ch2:
+SFX_Cry0C_1_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2:
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_1_Ch3:
+SFX_Cry0C_1_Ch7:
 	endchannel
diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm
index 8fb925da..11e0d06a 100644
--- a/audio/sfx/cry0c_2.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_2_Ch1:
+SFX_Cry0C_2_Ch4:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1:
 	endchannel
 
 
-SFX_Cry0C_2_Ch2:
+SFX_Cry0C_2_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2:
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_2_Ch3:
+SFX_Cry0C_2_Ch7:
 	endchannel
diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm
index 149b585d..6fc798f2 100644
--- a/audio/sfx/cry0c_3.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0C_3_Ch1:
+SFX_Cry0C_3_Ch4:
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1:
 	endchannel
 
 
-SFX_Cry0C_3_Ch2:
+SFX_Cry0C_3_Ch5:
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2:
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_Cry0C_3_Ch3:
+SFX_Cry0C_3_Ch7:
 	endchannel
diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm
index dccccb4e..2864fa01 100644
--- a/audio/sfx/cry0d_1.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_1_Ch1:
+SFX_Cry0D_1_Ch4:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_Cry0D_1_Ch1:
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_Cry0D_1_Ch1
+	loopchannel 2, SFX_Cry0D_1_Ch4
 	endchannel
 
 
-SFX_Cry0D_1_Ch2:
+SFX_Cry0D_1_Ch5:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2:
 	endchannel
 
 
-SFX_Cry0D_1_Ch3:
+SFX_Cry0D_1_Ch7:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm
index 718364dd..ef4a0eb6 100644
--- a/audio/sfx/cry0d_2.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_2_Ch1:
+SFX_Cry0D_2_Ch4:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_Cry0D_2_Ch1:
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_Cry0D_2_Ch1
+	loopchannel 2, SFX_Cry0D_2_Ch4
 	endchannel
 
 
-SFX_Cry0D_2_Ch2:
+SFX_Cry0D_2_Ch5:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2:
 	endchannel
 
 
-SFX_Cry0D_2_Ch3:
+SFX_Cry0D_2_Ch7:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm
index ce26e7e5..1fbc40b5 100644
--- a/audio/sfx/cry0d_3.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0D_3_Ch1:
+SFX_Cry0D_3_Ch4:
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_Cry0D_3_Ch1:
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_Cry0D_3_Ch1
+	loopchannel 2, SFX_Cry0D_3_Ch4
 	endchannel
 
 
-SFX_Cry0D_3_Ch2:
+SFX_Cry0D_3_Ch5:
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2:
 	endchannel
 
 
-SFX_Cry0D_3_Ch3:
+SFX_Cry0D_3_Ch7:
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm
index c30aaf20..37cabb7c 100644
--- a/audio/sfx/cry0e_1.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_1_Ch1:
+SFX_Cry0E_1_Ch4:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1:
 	endchannel
 
 
-SFX_Cry0E_1_Ch2:
+SFX_Cry0E_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2:
 	endchannel
 
 
-SFX_Cry0E_1_Ch3:
+SFX_Cry0E_1_Ch7:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm
index 194fb04b..5f6f481f 100644
--- a/audio/sfx/cry0e_2.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_2_Ch1:
+SFX_Cry0E_2_Ch4:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1:
 	endchannel
 
 
-SFX_Cry0E_2_Ch2:
+SFX_Cry0E_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2:
 	endchannel
 
 
-SFX_Cry0E_2_Ch3:
+SFX_Cry0E_2_Ch7:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm
index 062e8970..13cf9405 100644
--- a/audio/sfx/cry0e_3.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0E_3_Ch1:
+SFX_Cry0E_3_Ch4:
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1:
 	endchannel
 
 
-SFX_Cry0E_3_Ch2:
+SFX_Cry0E_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2:
 	endchannel
 
 
-SFX_Cry0E_3_Ch3:
+SFX_Cry0E_3_Ch7:
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm
index 1646d4b5..81abdc09 100644
--- a/audio/sfx/cry0f_1.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_1_Ch1:
+SFX_Cry0F_1_Ch4:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1:
 	endchannel
 
 
-SFX_Cry0F_1_Ch2:
+SFX_Cry0F_1_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2:
 	endchannel
 
 
-SFX_Cry0F_1_Ch3:
+SFX_Cry0F_1_Ch7:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm
index 6058e7cc..112b9e8b 100644
--- a/audio/sfx/cry0f_2.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_2_Ch1:
+SFX_Cry0F_2_Ch4:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1:
 	endchannel
 
 
-SFX_Cry0F_2_Ch2:
+SFX_Cry0F_2_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2:
 	endchannel
 
 
-SFX_Cry0F_2_Ch3:
+SFX_Cry0F_2_Ch7:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm
index 113f5ed1..08abd131 100644
--- a/audio/sfx/cry0f_3.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry0F_3_Ch1:
+SFX_Cry0F_3_Ch4:
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1:
 	endchannel
 
 
-SFX_Cry0F_3_Ch2:
+SFX_Cry0F_3_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2:
 	endchannel
 
 
-SFX_Cry0F_3_Ch3:
+SFX_Cry0F_3_Ch7:
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm
index 5199b973..eef13d3d 100644
--- a/audio/sfx/cry10_1.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_1_Ch1:
+SFX_Cry10_1_Ch4:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1:
 	endchannel
 
 
-SFX_Cry10_1_Ch2:
+SFX_Cry10_1_Ch5:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2:
 	endchannel
 
 
-SFX_Cry10_1_Ch3:
+SFX_Cry10_1_Ch7:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm
index 789c61b1..dd468979 100644
--- a/audio/sfx/cry10_2.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_2_Ch1:
+SFX_Cry10_2_Ch4:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1:
 	endchannel
 
 
-SFX_Cry10_2_Ch2:
+SFX_Cry10_2_Ch5:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2:
 	endchannel
 
 
-SFX_Cry10_2_Ch3:
+SFX_Cry10_2_Ch7:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm
index 83980fc7..e9a5200d 100644
--- a/audio/sfx/cry10_3.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry10_3_Ch1:
+SFX_Cry10_3_Ch4:
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1:
 	endchannel
 
 
-SFX_Cry10_3_Ch2:
+SFX_Cry10_3_Ch5:
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2:
 	endchannel
 
 
-SFX_Cry10_3_Ch3:
+SFX_Cry10_3_Ch7:
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm
index d7e0b0f9..f7c314ef 100644
--- a/audio/sfx/cry11_1.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_1_Ch1:
+SFX_Cry11_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1:
 	endchannel
 
 
-SFX_Cry11_1_Ch2:
+SFX_Cry11_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2:
 	endchannel
 
 
-SFX_Cry11_1_Ch3:
+SFX_Cry11_1_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm
index f46580eb..0009a0ec 100644
--- a/audio/sfx/cry11_2.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_2_Ch1:
+SFX_Cry11_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1:
 	endchannel
 
 
-SFX_Cry11_2_Ch2:
+SFX_Cry11_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2:
 	endchannel
 
 
-SFX_Cry11_2_Ch3:
+SFX_Cry11_2_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm
index c07e01a5..a8af19f6 100644
--- a/audio/sfx/cry11_3.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry11_3_Ch1:
+SFX_Cry11_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1:
 	endchannel
 
 
-SFX_Cry11_3_Ch2:
+SFX_Cry11_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2:
 	endchannel
 
 
-SFX_Cry11_3_Ch3:
+SFX_Cry11_3_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm
index 62956626..29d93eff 100644
--- a/audio/sfx/cry12_1.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_1_Ch1:
+SFX_Cry12_1_Ch4:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1:
 	endchannel
 
 
-SFX_Cry12_1_Ch2:
+SFX_Cry12_1_Ch5:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2:
 	endchannel
 
 
-SFX_Cry12_1_Ch3:
+SFX_Cry12_1_Ch7:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm
index 4acb8911..90f373c0 100644
--- a/audio/sfx/cry12_2.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_2_Ch1:
+SFX_Cry12_2_Ch4:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1:
 	endchannel
 
 
-SFX_Cry12_2_Ch2:
+SFX_Cry12_2_Ch5:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2:
 	endchannel
 
 
-SFX_Cry12_2_Ch3:
+SFX_Cry12_2_Ch7:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm
index bb433ac9..f2c012ae 100644
--- a/audio/sfx/cry12_3.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry12_3_Ch1:
+SFX_Cry12_3_Ch4:
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1:
 	endchannel
 
 
-SFX_Cry12_3_Ch2:
+SFX_Cry12_3_Ch5:
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2:
 	endchannel
 
 
-SFX_Cry12_3_Ch3:
+SFX_Cry12_3_Ch7:
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm
index 7f9ef226..703db728 100644
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_1_Ch1:
+SFX_Cry13_1_Ch4:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1:
 	endchannel
 
 
-SFX_Cry13_1_Ch2:
+SFX_Cry13_1_Ch5:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2:
 	endchannel
 
 
-SFX_Cry13_1_Ch3:
+SFX_Cry13_1_Ch7:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm
index 35d723dd..7d75853c 100644
--- a/audio/sfx/cry13_2.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_2_Ch1:
+SFX_Cry13_2_Ch4:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1:
 	endchannel
 
 
-SFX_Cry13_2_Ch2:
+SFX_Cry13_2_Ch5:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2:
 	endchannel
 
 
-SFX_Cry13_2_Ch3:
+SFX_Cry13_2_Ch7:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm
index a298e5ff..53296f1a 100644
--- a/audio/sfx/cry13_3.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry13_3_Ch1:
+SFX_Cry13_3_Ch4:
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1:
 	endchannel
 
 
-SFX_Cry13_3_Ch2:
+SFX_Cry13_3_Ch5:
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2:
 	endchannel
 
 
-SFX_Cry13_3_Ch3:
+SFX_Cry13_3_Ch7:
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm
index b3cb43b9..fa8964de 100644
--- a/audio/sfx/cry14_1.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_1_Ch1:
+SFX_Cry14_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1:
 	endchannel
 
 
-SFX_Cry14_1_Ch2:
+SFX_Cry14_1_Ch5:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2:
 	endchannel
 
 
-SFX_Cry14_1_Ch3:
+SFX_Cry14_1_Ch7:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm
index d243bcbd..1f70dca8 100644
--- a/audio/sfx/cry14_2.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_2_Ch1:
+SFX_Cry14_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1:
 	endchannel
 
 
-SFX_Cry14_2_Ch2:
+SFX_Cry14_2_Ch5:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2:
 	endchannel
 
 
-SFX_Cry14_2_Ch3:
+SFX_Cry14_2_Ch7:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm
index b1a32bc4..3bab2100 100644
--- a/audio/sfx/cry14_3.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry14_3_Ch1:
+SFX_Cry14_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1:
 	endchannel
 
 
-SFX_Cry14_3_Ch2:
+SFX_Cry14_3_Ch5:
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2:
 	endchannel
 
 
-SFX_Cry14_3_Ch3:
+SFX_Cry14_3_Ch7:
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm
index 4ebd4963..0220ad4f 100644
--- a/audio/sfx/cry15_1.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_1_Ch1:
+SFX_Cry15_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1:
 	endchannel
 
 
-SFX_Cry15_1_Ch2:
+SFX_Cry15_1_Ch5:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2:
 	endchannel
 
 
-SFX_Cry15_1_Ch3:
+SFX_Cry15_1_Ch7:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm
index 77807203..2ebd7ab0 100644
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_2_Ch1:
+SFX_Cry15_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1:
 	endchannel
 
 
-SFX_Cry15_2_Ch2:
+SFX_Cry15_2_Ch5:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2:
 	endchannel
 
 
-SFX_Cry15_2_Ch3:
+SFX_Cry15_2_Ch7:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm
index 2c24d658..39ba7a74 100644
--- a/audio/sfx/cry15_3.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry15_3_Ch1:
+SFX_Cry15_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1:
 	endchannel
 
 
-SFX_Cry15_3_Ch2:
+SFX_Cry15_3_Ch5:
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2:
 	endchannel
 
 
-SFX_Cry15_3_Ch3:
+SFX_Cry15_3_Ch7:
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm
index 8a7ee4c1..34d6f6d9 100644
--- a/audio/sfx/cry16_1.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_1_Ch1:
+SFX_Cry16_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1:
 	endchannel
 
 
-SFX_Cry16_1_Ch2:
+SFX_Cry16_1_Ch5:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2:
 	endchannel
 
 
-SFX_Cry16_1_Ch3:
+SFX_Cry16_1_Ch7:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm
index 46729c2a..8948cd29 100644
--- a/audio/sfx/cry16_2.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_2_Ch1:
+SFX_Cry16_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1:
 	endchannel
 
 
-SFX_Cry16_2_Ch2:
+SFX_Cry16_2_Ch5:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2:
 	endchannel
 
 
-SFX_Cry16_2_Ch3:
+SFX_Cry16_2_Ch7:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm
index a94ac495..026ee67b 100644
--- a/audio/sfx/cry16_3.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry16_3_Ch1:
+SFX_Cry16_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1:
 	endchannel
 
 
-SFX_Cry16_3_Ch2:
+SFX_Cry16_3_Ch5:
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2:
 	endchannel
 
 
-SFX_Cry16_3_Ch3:
+SFX_Cry16_3_Ch7:
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm
index ddf0967d..97dec764 100644
--- a/audio/sfx/cry17_1.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_1_Ch1:
+SFX_Cry17_1_Ch4:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1:
 	endchannel
 
 
-SFX_Cry17_1_Ch2:
+SFX_Cry17_1_Ch5:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2:
 	endchannel
 
 
-SFX_Cry17_1_Ch3:
+SFX_Cry17_1_Ch7:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm
index f2528875..a6ab03a2 100644
--- a/audio/sfx/cry17_2.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_2_Ch1:
+SFX_Cry17_2_Ch4:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1:
 	endchannel
 
 
-SFX_Cry17_2_Ch2:
+SFX_Cry17_2_Ch5:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2:
 	endchannel
 
 
-SFX_Cry17_2_Ch3:
+SFX_Cry17_2_Ch7:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm
index f180a3b8..53555206 100644
--- a/audio/sfx/cry17_3.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry17_3_Ch1:
+SFX_Cry17_3_Ch4:
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1:
 	endchannel
 
 
-SFX_Cry17_3_Ch2:
+SFX_Cry17_3_Ch5:
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2:
 	endchannel
 
 
-SFX_Cry17_3_Ch3:
+SFX_Cry17_3_Ch7:
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm
index c28bf7f4..8cb3283f 100644
--- a/audio/sfx/cry18_1.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_1_Ch1:
+SFX_Cry18_1_Ch4:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1:
 	endchannel
 
 
-SFX_Cry18_1_Ch2:
+SFX_Cry18_1_Ch5:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2:
 	endchannel
 
 
-SFX_Cry18_1_Ch3:
+SFX_Cry18_1_Ch7:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm
index 1c3c26b9..01dacd5f 100644
--- a/audio/sfx/cry18_2.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_2_Ch1:
+SFX_Cry18_2_Ch4:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1:
 	endchannel
 
 
-SFX_Cry18_2_Ch2:
+SFX_Cry18_2_Ch5:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2:
 	endchannel
 
 
-SFX_Cry18_2_Ch3:
+SFX_Cry18_2_Ch7:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm
index ceeda42f..23d2d6a6 100644
--- a/audio/sfx/cry18_3.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry18_3_Ch1:
+SFX_Cry18_3_Ch4:
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1:
 	endchannel
 
 
-SFX_Cry18_3_Ch2:
+SFX_Cry18_3_Ch5:
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2:
 	endchannel
 
 
-SFX_Cry18_3_Ch3:
+SFX_Cry18_3_Ch7:
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm
index 4b5b4ed0..2e6790e5 100644
--- a/audio/sfx/cry19_1.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_1_Ch1:
+SFX_Cry19_1_Ch4:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1:
 	endchannel
 
 
-SFX_Cry19_1_Ch2:
+SFX_Cry19_1_Ch5:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2:
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_1_Ch3:
+SFX_Cry19_1_Ch7:
 	endchannel
diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm
index 9c9557a9..f412ec14 100644
--- a/audio/sfx/cry19_2.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_2_Ch1:
+SFX_Cry19_2_Ch4:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1:
 	endchannel
 
 
-SFX_Cry19_2_Ch2:
+SFX_Cry19_2_Ch5:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2:
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_2_Ch3:
+SFX_Cry19_2_Ch7:
 	endchannel
diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm
index 71eccbf8..2baff05e 100644
--- a/audio/sfx/cry19_3.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry19_3_Ch1:
+SFX_Cry19_3_Ch4:
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1:
 	endchannel
 
 
-SFX_Cry19_3_Ch2:
+SFX_Cry19_3_Ch5:
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2:
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_Cry19_3_Ch3:
+SFX_Cry19_3_Ch7:
 	endchannel
diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm
index 7f8911c7..5d03596e 100644
--- a/audio/sfx/cry1a_1.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_1_Ch1:
+SFX_Cry1A_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1:
 	endchannel
 
 
-SFX_Cry1A_1_Ch2:
+SFX_Cry1A_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2:
 	endchannel
 
 
-SFX_Cry1A_1_Ch3:
+SFX_Cry1A_1_Ch7:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm
index da54ff6e..4dcf2a42 100644
--- a/audio/sfx/cry1a_2.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_2_Ch1:
+SFX_Cry1A_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1:
 	endchannel
 
 
-SFX_Cry1A_2_Ch2:
+SFX_Cry1A_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2:
 	endchannel
 
 
-SFX_Cry1A_2_Ch3:
+SFX_Cry1A_2_Ch7:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm
index d16cf035..274ce438 100644
--- a/audio/sfx/cry1a_3.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1A_3_Ch1:
+SFX_Cry1A_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1:
 	endchannel
 
 
-SFX_Cry1A_3_Ch2:
+SFX_Cry1A_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2:
 	endchannel
 
 
-SFX_Cry1A_3_Ch3:
+SFX_Cry1A_3_Ch7:
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm
index f6f03c98..562239c7 100644
--- a/audio/sfx/cry1b_1.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_1_Ch1:
+SFX_Cry1B_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1:
 	endchannel
 
 
-SFX_Cry1B_1_Ch2:
+SFX_Cry1B_1_Ch5:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2:
 	endchannel
 
 
-SFX_Cry1B_1_Ch3:
+SFX_Cry1B_1_Ch7:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm
index fe96943d..45bb41a2 100644
--- a/audio/sfx/cry1b_2.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_2_Ch1:
+SFX_Cry1B_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1:
 	endchannel
 
 
-SFX_Cry1B_2_Ch2:
+SFX_Cry1B_2_Ch5:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2:
 	endchannel
 
 
-SFX_Cry1B_2_Ch3:
+SFX_Cry1B_2_Ch7:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm
index 8a034b1e..e6e31b00 100644
--- a/audio/sfx/cry1b_3.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1B_3_Ch1:
+SFX_Cry1B_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1:
 	endchannel
 
 
-SFX_Cry1B_3_Ch2:
+SFX_Cry1B_3_Ch5:
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2:
 	endchannel
 
 
-SFX_Cry1B_3_Ch3:
+SFX_Cry1B_3_Ch7:
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm
index 1561353e..332b7da8 100644
--- a/audio/sfx/cry1c_1.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_1_Ch1:
+SFX_Cry1C_1_Ch4:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1:
 	endchannel
 
 
-SFX_Cry1C_1_Ch2:
+SFX_Cry1C_1_Ch5:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2:
 	endchannel
 
 
-SFX_Cry1C_1_Ch3:
+SFX_Cry1C_1_Ch7:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm
index c589a24d..aee95be5 100644
--- a/audio/sfx/cry1c_2.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_2_Ch1:
+SFX_Cry1C_2_Ch4:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1:
 	endchannel
 
 
-SFX_Cry1C_2_Ch2:
+SFX_Cry1C_2_Ch5:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2:
 	endchannel
 
 
-SFX_Cry1C_2_Ch3:
+SFX_Cry1C_2_Ch7:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm
index 930e3368..13e687f6 100644
--- a/audio/sfx/cry1c_3.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1C_3_Ch1:
+SFX_Cry1C_3_Ch4:
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1:
 	endchannel
 
 
-SFX_Cry1C_3_Ch2:
+SFX_Cry1C_3_Ch5:
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2:
 	endchannel
 
 
-SFX_Cry1C_3_Ch3:
+SFX_Cry1C_3_Ch7:
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm
index 6b8b3f79..4e7b6308 100644
--- a/audio/sfx/cry1d_1.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_1_Ch1:
+SFX_Cry1D_1_Ch4:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1:
 	endchannel
 
 
-SFX_Cry1D_1_Ch2:
+SFX_Cry1D_1_Ch5:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2:
 	endchannel
 
 
-SFX_Cry1D_1_Ch3:
+SFX_Cry1D_1_Ch7:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm
index 31fccb8d..9ee56bf8 100644
--- a/audio/sfx/cry1d_2.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_2_Ch1:
+SFX_Cry1D_2_Ch4:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1:
 	endchannel
 
 
-SFX_Cry1D_2_Ch2:
+SFX_Cry1D_2_Ch5:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2:
 	endchannel
 
 
-SFX_Cry1D_2_Ch3:
+SFX_Cry1D_2_Ch7:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm
index fbbe9ca5..e2e5fae3 100644
--- a/audio/sfx/cry1d_3.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1D_3_Ch1:
+SFX_Cry1D_3_Ch4:
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1:
 	endchannel
 
 
-SFX_Cry1D_3_Ch2:
+SFX_Cry1D_3_Ch5:
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2:
 	endchannel
 
 
-SFX_Cry1D_3_Ch3:
+SFX_Cry1D_3_Ch7:
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm
index 9501a06a..56d97001 100644
--- a/audio/sfx/cry1e_1.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_1_Ch1:
+SFX_Cry1E_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1:
 	endchannel
 
 
-SFX_Cry1E_1_Ch2:
+SFX_Cry1E_1_Ch5:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2:
 	endchannel
 
 
-SFX_Cry1E_1_Ch3:
+SFX_Cry1E_1_Ch7:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm
index fe112101..7ed25afe 100644
--- a/audio/sfx/cry1e_2.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_2_Ch1:
+SFX_Cry1E_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1:
 	endchannel
 
 
-SFX_Cry1E_2_Ch2:
+SFX_Cry1E_2_Ch5:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2:
 	endchannel
 
 
-SFX_Cry1E_2_Ch3:
+SFX_Cry1E_2_Ch7:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm
index f5bdbe08..82dbdfcc 100644
--- a/audio/sfx/cry1e_3.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1E_3_Ch1:
+SFX_Cry1E_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1:
 	endchannel
 
 
-SFX_Cry1E_3_Ch2:
+SFX_Cry1E_3_Ch5:
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2:
 	endchannel
 
 
-SFX_Cry1E_3_Ch3:
+SFX_Cry1E_3_Ch7:
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm
index 28b91c61..a38bd975 100644
--- a/audio/sfx/cry1f_1.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_1_Ch1:
+SFX_Cry1F_1_Ch4:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1:
 	endchannel
 
 
-SFX_Cry1F_1_Ch2:
+SFX_Cry1F_1_Ch5:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2:
 	endchannel
 
 
-SFX_Cry1F_1_Ch3:
+SFX_Cry1F_1_Ch7:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm
index 9691654f..3d261bb2 100644
--- a/audio/sfx/cry1f_2.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_2_Ch1:
+SFX_Cry1F_2_Ch4:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1:
 	endchannel
 
 
-SFX_Cry1F_2_Ch2:
+SFX_Cry1F_2_Ch5:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2:
 	endchannel
 
 
-SFX_Cry1F_2_Ch3:
+SFX_Cry1F_2_Ch7:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm
index 3c50327b..2bdfe24b 100644
--- a/audio/sfx/cry1f_3.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry1F_3_Ch1:
+SFX_Cry1F_3_Ch4:
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1:
 	endchannel
 
 
-SFX_Cry1F_3_Ch2:
+SFX_Cry1F_3_Ch5:
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2:
 	endchannel
 
 
-SFX_Cry1F_3_Ch3:
+SFX_Cry1F_3_Ch7:
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm
index 0e9ffb00..14ec6942 100644
--- a/audio/sfx/cry20_1.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_1_Ch1:
+SFX_Cry20_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1:
 	endchannel
 
 
-SFX_Cry20_1_Ch2:
+SFX_Cry20_1_Ch5:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2:
 	endchannel
 
 
-SFX_Cry20_1_Ch3:
+SFX_Cry20_1_Ch7:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm
index 91891b4f..bcbf27a6 100644
--- a/audio/sfx/cry20_2.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_2_Ch1:
+SFX_Cry20_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1:
 	endchannel
 
 
-SFX_Cry20_2_Ch2:
+SFX_Cry20_2_Ch5:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2:
 	endchannel
 
 
-SFX_Cry20_2_Ch3:
+SFX_Cry20_2_Ch7:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm
index 1fae1bb3..12e42d7f 100644
--- a/audio/sfx/cry20_3.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry20_3_Ch1:
+SFX_Cry20_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1:
 	endchannel
 
 
-SFX_Cry20_3_Ch2:
+SFX_Cry20_3_Ch5:
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2:
 	endchannel
 
 
-SFX_Cry20_3_Ch3:
+SFX_Cry20_3_Ch7:
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm
index 17d1e16c..c08704d7 100644
--- a/audio/sfx/cry21_1.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_1_Ch1:
+SFX_Cry21_1_Ch4:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1:
 	endchannel
 
 
-SFX_Cry21_1_Ch2:
+SFX_Cry21_1_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2:
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_1_Ch3:
+SFX_Cry21_1_Ch7:
 	endchannel
diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm
index 14856fc9..b8f68dbd 100644
--- a/audio/sfx/cry21_2.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_2_Ch1:
+SFX_Cry21_2_Ch4:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1:
 	endchannel
 
 
-SFX_Cry21_2_Ch2:
+SFX_Cry21_2_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2:
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_2_Ch3:
+SFX_Cry21_2_Ch7:
 	endchannel
diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm
index 40cbf7f2..4a549af9 100644
--- a/audio/sfx/cry21_3.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry21_3_Ch1:
+SFX_Cry21_3_Ch4:
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1:
 	endchannel
 
 
-SFX_Cry21_3_Ch2:
+SFX_Cry21_3_Ch5:
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2:
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_Cry21_3_Ch3:
+SFX_Cry21_3_Ch7:
 	endchannel
diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm
index fb0c6b23..0da8dbd2 100644
--- a/audio/sfx/cry22_1.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_1_Ch1:
+SFX_Cry22_1_Ch4:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1:
 	endchannel
 
 
-SFX_Cry22_1_Ch2:
+SFX_Cry22_1_Ch5:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2:
 	endchannel
 
 
-SFX_Cry22_1_Ch3:
+SFX_Cry22_1_Ch7:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm
index 7653234e..d7456dbc 100644
--- a/audio/sfx/cry22_2.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_2_Ch1:
+SFX_Cry22_2_Ch4:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1:
 	endchannel
 
 
-SFX_Cry22_2_Ch2:
+SFX_Cry22_2_Ch5:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2:
 	endchannel
 
 
-SFX_Cry22_2_Ch3:
+SFX_Cry22_2_Ch7:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm
index 96fae832..927c174c 100644
--- a/audio/sfx/cry22_3.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry22_3_Ch1:
+SFX_Cry22_3_Ch4:
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1:
 	endchannel
 
 
-SFX_Cry22_3_Ch2:
+SFX_Cry22_3_Ch5:
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2:
 	endchannel
 
 
-SFX_Cry22_3_Ch3:
+SFX_Cry22_3_Ch7:
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm
index 4aaa3bfa..cc0587d7 100644
--- a/audio/sfx/cry23_1.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_1_Ch1:
+SFX_Cry23_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1:
 	endchannel
 
 
-SFX_Cry23_1_Ch2:
+SFX_Cry23_1_Ch5:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2:
 	endchannel
 
 
-SFX_Cry23_1_Ch3:
+SFX_Cry23_1_Ch7:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm
index 644b14cf..5d130aa5 100644
--- a/audio/sfx/cry23_2.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_2_Ch1:
+SFX_Cry23_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1:
 	endchannel
 
 
-SFX_Cry23_2_Ch2:
+SFX_Cry23_2_Ch5:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2:
 	endchannel
 
 
-SFX_Cry23_2_Ch3:
+SFX_Cry23_2_Ch7:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm
index d86dfcd4..8ada0c63 100644
--- a/audio/sfx/cry23_3.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry23_3_Ch1:
+SFX_Cry23_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1:
 	endchannel
 
 
-SFX_Cry23_3_Ch2:
+SFX_Cry23_3_Ch5:
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2:
 	endchannel
 
 
-SFX_Cry23_3_Ch3:
+SFX_Cry23_3_Ch7:
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm
index a94803c1..f79dc72c 100644
--- a/audio/sfx/cry24_1.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_1_Ch1:
+SFX_Cry24_1_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1:
 	endchannel
 
 
-SFX_Cry24_1_Ch2:
+SFX_Cry24_1_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2:
 	endchannel
 
 
-SFX_Cry24_1_Ch3:
+SFX_Cry24_1_Ch7:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm
index cc8b2f87..aede2b95 100644
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_2_Ch1:
+SFX_Cry24_2_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1:
 	endchannel
 
 
-SFX_Cry24_2_Ch2:
+SFX_Cry24_2_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2:
 	endchannel
 
 
-SFX_Cry24_2_Ch3:
+SFX_Cry24_2_Ch7:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm
index 37926146..cad3ada1 100644
--- a/audio/sfx/cry24_3.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry24_3_Ch1:
+SFX_Cry24_3_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1:
 	endchannel
 
 
-SFX_Cry24_3_Ch2:
+SFX_Cry24_3_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2:
 	endchannel
 
 
-SFX_Cry24_3_Ch3:
+SFX_Cry24_3_Ch7:
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm
index d54b8d6c..f3ae46ae 100644
--- a/audio/sfx/cry25_1.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_1_Ch1:
+SFX_Cry25_1_Ch4:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1:
 	endchannel
 
 
-SFX_Cry25_1_Ch2:
+SFX_Cry25_1_Ch5:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2:
 	endchannel
 
 
-SFX_Cry25_1_Ch3:
+SFX_Cry25_1_Ch7:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm
index 48e4d057..9b976b4e 100644
--- a/audio/sfx/cry25_2.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_2_Ch1:
+SFX_Cry25_2_Ch4:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1:
 	endchannel
 
 
-SFX_Cry25_2_Ch2:
+SFX_Cry25_2_Ch5:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2:
 	endchannel
 
 
-SFX_Cry25_2_Ch3:
+SFX_Cry25_2_Ch7:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm
index f08c6a00..e76feb9e 100644
--- a/audio/sfx/cry25_3.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,4 +1,4 @@
-SFX_Cry25_3_Ch1:
+SFX_Cry25_3_Ch4:
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1:
 	endchannel
 
 
-SFX_Cry25_3_Ch2:
+SFX_Cry25_3_Ch5:
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2:
 	endchannel
 
 
-SFX_Cry25_3_Ch3:
+SFX_Cry25_3_Ch7:
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm
index a42cd660..73510fd7 100644
--- a/audio/sfx/cut_1.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,4 +1,4 @@
-SFX_Cut_1_Ch1:
+SFX_Cut_1_Ch7:
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm
index 12c2366e..6e7d8951 100644
--- a/audio/sfx/cut_3.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,4 +1,4 @@
-SFX_Cut_3_Ch1:
+SFX_Cut_3_Ch7:
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm
index 3f3c6d8b..35cae4df 100644
--- a/audio/sfx/cymbal1_1.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_1_Ch1:
+SFX_Cymbal1_1_Ch7:
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm
index bb1e3e3e..bffe7690 100644
--- a/audio/sfx/cymbal1_2.asm
+++ b/audio/sfx/cymbal1_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_2_Ch1:
+SFX_Cymbal1_2_Ch7:
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm
index 9587977f..0f03f455 100644
--- a/audio/sfx/cymbal1_3.asm
+++ b/audio/sfx/cymbal1_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_3_Ch1:
+SFX_Cymbal1_3_Ch7:
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm
index 2ec3fc86..ce19bb6b 100644
--- a/audio/sfx/cymbal2_1.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_1_Ch1:
+SFX_Cymbal2_1_Ch7:
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm
index 8b27a0de..f45dec5b 100644
--- a/audio/sfx/cymbal2_2.asm
+++ b/audio/sfx/cymbal2_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_2_Ch1:
+SFX_Cymbal2_2_Ch7:
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm
index 642a336a..2d2ebf1c 100644
--- a/audio/sfx/cymbal2_3.asm
+++ b/audio/sfx/cymbal2_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_3_Ch1:
+SFX_Cymbal2_3_Ch7:
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm
index 3fd225e2..98f3977d 100644
--- a/audio/sfx/cymbal3_1.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_1_Ch1:
+SFX_Cymbal3_1_Ch7:
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm
index 1435b5ed..2a2cb997 100644
--- a/audio/sfx/cymbal3_2.asm
+++ b/audio/sfx/cymbal3_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_2_Ch1:
+SFX_Cymbal3_2_Ch7:
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm
index b45fb03d..60b96278 100644
--- a/audio/sfx/cymbal3_3.asm
+++ b/audio/sfx/cymbal3_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_3_Ch1:
+SFX_Cymbal3_3_Ch7:
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm
index ea2727d8..452fd5ed 100644
--- a/audio/sfx/damage.asm
+++ b/audio/sfx/damage.asm
@@ -1,4 +1,4 @@
-SFX_Damage_Ch1:
+SFX_Damage_Ch7:
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm
index d954308a..e7d5a8ca 100644
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,4 +1,4 @@
-SFX_Denied_1_Ch1:
+SFX_Denied_1_Ch4:
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@ SFX_Denied_1_Ch1:
 	endchannel
 
 
-SFX_Denied_1_Ch2:
+SFX_Denied_1_Ch5:
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm
index ca82a739..cf3b2a20 100644
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,4 +1,4 @@
-SFX_Denied_3_Ch1:
+SFX_Denied_3_Ch4:
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@ SFX_Denied_3_Ch1:
 	endchannel
 
 
-SFX_Denied_3_Ch2:
+SFX_Denied_3_Ch5:
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm
index 6e3a0dcf..08180071 100644
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,4 +1,4 @@
-SFX_Dex_Page_Added_Ch1:
+SFX_Dex_Page_Added_Ch4:
 	duty 2
 	unknownsfx0x10 68
 	unknownsfx0x20 15, 240, 240, 4
@@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1:
 	endchannel
 
 
-SFX_Dex_Page_Added_Ch2:
+SFX_Dex_Page_Added_Ch5:
 	duty 2
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm
index 5cae0a4b..4e71ac36 100644
--- a/audio/sfx/doubleslap.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,4 +1,4 @@
-SFX_Doubleslap_Ch1:
+SFX_Doubleslap_Ch7:
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm
index b2450ced..338c32ab 100644
--- a/audio/sfx/enter_pc_1.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Enter_PC_1_Ch1:
+SFX_Enter_PC_1_Ch4:
 	duty 2
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm
index 061068ce..f34ed9d0 100644
--- a/audio/sfx/enter_pc_3.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Enter_PC_3_Ch1:
+SFX_Enter_PC_3_Ch4:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm
index cd1b2cdc..cd403485 100644
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,4 +1,4 @@
-SFX_Faint_Fall_Ch1:
+SFX_Faint_Fall_Ch4:
 	duty 1
 	unknownsfx0x10 175
 	unknownsfx0x20 15, 242, 128, 7
diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm
index 7b6ec0a0..479efab3 100644
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,10 +1,10 @@
-SFX_Faint_Thud_Ch1:
+SFX_Faint_Thud_Ch4:
 	unknownsfx0x20 15, 209, 0, 2
 	unknownsfx0x10 8
 	endchannel
 
 
-SFX_Faint_Thud_Ch2:
+SFX_Faint_Thud_Ch7:
 	unknownnoise0x20 4, 245, 51
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm
index 2b487bc2..ededef48 100644
--- a/audio/sfx/fly_1.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,4 +1,4 @@
-SFX_Fly_1_Ch1:
+SFX_Fly_1_Ch7:
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm
index c081030d..084c8b4c 100644
--- a/audio/sfx/fly_3.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,4 +1,4 @@
-SFX_Fly_3_Ch1:
+SFX_Fly_3_Ch7:
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm
index ba428722..2cf5e8c9 100644
--- a/audio/sfx/get_item1_1.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item1_1_Ch1:
+SFX_Get_Item1_1_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1:
 	endchannel
 
 
-SFX_Get_Item1_1_Ch2:
+SFX_Get_Item1_1_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2:
 	endchannel
 
 
-SFX_Get_Item1_1_Ch3:
+SFX_Get_Item1_1_Ch6:
 	executemusic
 	notetype 4, 1, 0
 	octave 4
diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm
index b30ce40c..6c4c01b5 100644
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item1_3_Ch1:
+SFX_Get_Item1_3_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1:
 	endchannel
 
 
-SFX_Get_Item1_3_Ch2:
+SFX_Get_Item1_3_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2:
 	endchannel
 
 
-SFX_Get_Item1_3_Ch3:
+SFX_Get_Item1_3_Ch6:
 	executemusic
 	notetype 4, 1, 0
 	octave 4
diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm
index 67bb7bb8..01e66269 100644
--- a/audio/sfx/get_item2_1.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_1_Ch1:
+SFX_Get_Item2_1_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1:
 	endchannel
 
 
-SFX_Get_Item2_1_Ch2:
+SFX_Get_Item2_1_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2:
 	endchannel
 
 
-SFX_Get_Item2_1_Ch3:
+SFX_Get_Item2_1_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm
index 292a74f6..27c5864d 100644
--- a/audio/sfx/get_item2_2.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_2_Ch1:
+SFX_Get_Item2_2_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1:
 	endchannel
 
 
-SFX_Get_Item2_2_Ch2:
+SFX_Get_Item2_2_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2:
 	endchannel
 
 
-SFX_Get_Item2_2_Ch3:
+SFX_Get_Item2_2_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm
index 1a833741..42d74e8e 100644
--- a/audio/sfx/get_item2_3.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_3_Ch1:
+SFX_Get_Item2_3_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1:
 	endchannel
 
 
-SFX_Get_Item2_3_Ch2:
+SFX_Get_Item2_3_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2:
 	endchannel
 
 
-SFX_Get_Item2_3_Ch3:
+SFX_Get_Item2_3_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm
index c8da1745..b2ae3d57 100644
--- a/audio/sfx/get_key_item_1.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,4 +1,4 @@
-SFX_Get_Key_Item_1_Ch1:
+SFX_Get_Key_Item_1_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1:
 	endchannel
 
 
-SFX_Get_Key_Item_1_Ch2:
+SFX_Get_Key_Item_1_Ch5:
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2:
 	endchannel
 
 
-SFX_Get_Key_Item_1_Ch3:
+SFX_Get_Key_Item_1_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 4
diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm
index e6a50929..aebae361 100644
--- a/audio/sfx/get_key_item_3.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,4 +1,4 @@
-SFX_Get_Key_Item_3_Ch1:
+SFX_Get_Key_Item_3_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1:
 	endchannel
 
 
-SFX_Get_Key_Item_3_Ch2:
+SFX_Get_Key_Item_3_Ch5:
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2:
 	endchannel
 
 
-SFX_Get_Key_Item_3_Ch3:
+SFX_Get_Key_Item_3_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 4
diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm
index 5da5be86..aa523774 100644
--- a/audio/sfx/go_inside_1.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_1_Ch1:
+SFX_Go_Inside_1_Ch7:
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm
index 460b3b4a..9939ba6d 100644
--- a/audio/sfx/go_inside_3.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_3_Ch1:
+SFX_Go_Inside_3_Ch7:
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm
index 2038d299..c60bb592 100644
--- a/audio/sfx/go_outside_1.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,4 +1,4 @@
-SFX_Go_Outside_1_Ch1:
+SFX_Go_Outside_1_Ch7:
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm
index d45b8410..30b9884c 100644
--- a/audio/sfx/go_outside_3.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,4 +1,4 @@
-SFX_Go_Outside_3_Ch1:
+SFX_Go_Outside_3_Ch7:
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm
index 3a292b82..ca703c09 100644
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_1_Ch1:
+SFX_Heal_Ailment_1_Ch4:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm
index 25e1bbe0..b06abe62 100644
--- a/audio/sfx/heal_ailment_2.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_2_Ch1:
+SFX_Heal_Ailment_2_Ch4:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm
index 2719358f..c13d74fd 100644
--- a/audio/sfx/heal_ailment_3.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,4 +1,4 @@
-SFX_Heal_Ailment_3_Ch1:
+SFX_Heal_Ailment_3_Ch4:
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm
index a23db490..75400957 100644
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_1_Ch1:
+SFX_Heal_HP_1_Ch4:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm
index f21f6712..182937cd 100644
--- a/audio/sfx/heal_hp_2.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_2_Ch1:
+SFX_Heal_HP_2_Ch4:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm
index 96ff391b..c238013a 100644
--- a/audio/sfx/heal_hp_3.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,4 +1,4 @@
-SFX_Heal_HP_3_Ch1:
+SFX_Heal_HP_3_Ch4:
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm
index ecb7c09c..ebaee990 100644
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_Healing_Machine_1_Ch1:
+SFX_Healing_Machine_1_Ch4:
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm
index ec73e139..ac11fee4 100644
--- a/audio/sfx/healing_machine_3.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_Healing_Machine_3_Ch1:
+SFX_Healing_Machine_3_Ch4:
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm
index b1af527b..12ca5da6 100644
--- a/audio/sfx/horn_drill.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,4 +1,4 @@
-SFX_Horn_Drill_Ch1:
+SFX_Horn_Drill_Ch7:
 	unknownnoise0x20 3, 146, 49
 	unknownnoise0x20 3, 178, 50
 	unknownnoise0x20 3, 194, 51
diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm
index 69d6ff9b..82c58356 100644
--- a/audio/sfx/intro_crash.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Crash_Ch1:
+SFX_Intro_Crash_Ch7:
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm
index 3d6de9d6..0d450e21 100644
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Hip_Ch1:
+SFX_Intro_Hip_Ch4:
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 64, 7
diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm
index 8e077c67..1bd9faec 100644
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Hop_Ch1:
+SFX_Intro_Hop_Ch4:
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 128, 6
diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm
index cb7570de..bb534a70 100644
--- a/audio/sfx/intro_lunge.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Lunge_Ch1:
+SFX_Intro_Lunge_Ch7:
 	unknownnoise0x20 6, 32, 16
 	unknownnoise0x20 6, 47, 64
 	unknownnoise0x20 6, 79, 65
diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm
index 0088228f..060ef09a 100644
--- a/audio/sfx/intro_raise.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Raise_Ch1:
+SFX_Intro_Raise_Ch7:
 	unknownnoise0x20 2, 111, 33
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm
index 5609bfc0..e874e773 100644
--- a/audio/sfx/intro_whoosh.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Whoosh_Ch1:
+SFX_Intro_Whoosh_Ch7:
 	unknownnoise0x20 4, 44, 32
 	unknownnoise0x20 3, 160, 32
 	unknownnoise0x20 3, 176, 33
diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm
index 72aa087e..26acaf1b 100644
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,4 +1,4 @@
-SFX_Ledge_1_Ch1:
+SFX_Ledge_1_Ch4:
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm
index a554282e..623e56ce 100644
--- a/audio/sfx/ledge_3.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,4 +1,4 @@
-SFX_Ledge_3_Ch1:
+SFX_Ledge_3_Ch4:
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm
index f0890eab..5b3da83d 100644
--- a/audio/sfx/level_up.asm
+++ b/audio/sfx/level_up.asm
@@ -1,4 +1,4 @@
-SFX_Level_Up_Ch1:
+SFX_Level_Up_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -20,7 +20,7 @@ SFX_Level_Up_Ch1:
 	endchannel
 
 
-SFX_Level_Up_Ch2:
+SFX_Level_Up_Ch5:
 	executemusic
 	vibrato 4, 2, 2
 	duty 2
@@ -40,7 +40,7 @@ SFX_Level_Up_Ch2:
 	endchannel
 
 
-SFX_Level_Up_Ch3:
+SFX_Level_Up_Ch6:
 	executemusic
 	notetype 6, 1, 0
 	octave 5
diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm
index b29a5b87..4b205470 100644
--- a/audio/sfx/muted_snare1_1.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_1_Ch1:
+SFX_Muted_Snare1_1_Ch7:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm
index a7f5467f..d530bd89 100644
--- a/audio/sfx/muted_snare1_2.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_2_Ch1:
+SFX_Muted_Snare1_2_Ch7:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm
index 136018ef..8b5c2c6d 100644
--- a/audio/sfx/muted_snare1_3.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_3_Ch1:
+SFX_Muted_Snare1_3_Ch7:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm
index 9ad52c27..4e15e386 100644
--- a/audio/sfx/muted_snare2_1.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_1_Ch1:
+SFX_Muted_Snare2_1_Ch7:
 	unknownnoise0x20 0, 145, 34
 	endchannel
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm
index 20670ec8..5107fb77 100644
--- a/audio/sfx/muted_snare2_2.asm
+++ b/audio/sfx/muted_snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_2_Ch1:
+SFX_Muted_Snare2_2_Ch7:
 	unknownnoise0x20 0, 145, 34
 	endchannel
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
index 007d462d..043c870d 100644
--- a/audio/sfx/muted_snare2_3.asm
+++ b/audio/sfx/muted_snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_3_Ch1:
+SFX_Muted_Snare2_3_Ch7:
 	unknownnoise0x20 0, 145, 34
 	endchannel
diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm
index 8db6b874..d0c689a4 100644
--- a/audio/sfx/muted_snare3_1.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_1_Ch1:
+SFX_Muted_Snare3_1_Ch7:
 	unknownnoise0x20 0, 113, 34
 	endchannel
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm
index 013ea9ab..3e470ae6 100644
--- a/audio/sfx/muted_snare3_2.asm
+++ b/audio/sfx/muted_snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_2_Ch1:
+SFX_Muted_Snare3_2_Ch7:
 	unknownnoise0x20 0, 113, 34
 	endchannel
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
index 038a66db..c8749577 100644
--- a/audio/sfx/muted_snare3_3.asm
+++ b/audio/sfx/muted_snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_3_Ch1:
+SFX_Muted_Snare3_3_Ch7:
 	unknownnoise0x20 0, 113, 34
 	endchannel
diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm
index 99429995..ebe2ee1d 100644
--- a/audio/sfx/muted_snare4_1.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_1_Ch1:
+SFX_Muted_Snare4_1_Ch7:
 	unknownnoise0x20 0, 97, 34
 	endchannel
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
index 11ee3218..bdbe4d11 100644
--- a/audio/sfx/muted_snare4_2.asm
+++ b/audio/sfx/muted_snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_2_Ch1:
+SFX_Muted_Snare4_2_Ch7:
 	unknownnoise0x20 0, 97, 34
 	endchannel
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
index 86223813..59d72218 100644
--- a/audio/sfx/muted_snare4_3.asm
+++ b/audio/sfx/muted_snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_3_Ch1:
+SFX_Muted_Snare4_3_Ch7:
 	unknownnoise0x20 0, 97, 34
 	endchannel
diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm
index 8a4c521e..3f74c515 100644
--- a/audio/sfx/not_very_effective.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,4 +1,4 @@
-SFX_Not_Very_Effective_Ch1:
+SFX_Not_Very_Effective_Ch7:
 	unknownnoise0x20 4, 143, 85
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 8, 244, 34
diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm
index c474e9b3..cca7ecaa 100644
--- a/audio/sfx/peck.asm
+++ b/audio/sfx/peck.asm
@@ -1,3 +1,3 @@
-SFX_Peck_Ch1:
+SFX_Peck_Ch7:
 	unknownnoise0x20 2, 161, 18
 	endchannel
diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm
index bfd619fd..73068b86 100644
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,8 +1,8 @@
-SFX_Poisoned_1_Ch1:
+SFX_Poisoned_1_Ch4:
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_Poisoned_1_Ch1
+	loopchannel 4, SFX_Poisoned_1_Ch4
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm
index b972ca92..7dc973bc 100644
--- a/audio/sfx/poisoned_3.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,8 +1,8 @@
-SFX_Poisoned_3_Ch1:
+SFX_Poisoned_3_Ch4:
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_Poisoned_3_Ch1
+	loopchannel 4, SFX_Poisoned_3_Ch4
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm
index eccf0ee5..1e0f95f5 100644
--- a/audio/sfx/pokedex_rating_1.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,4 +1,4 @@
-SFX_Pokedex_Rating_1_Ch1:
+SFX_Pokedex_Rating_1_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1:
 	endchannel
 
 
-SFX_Pokedex_Rating_1_Ch2:
+SFX_Pokedex_Rating_1_Ch5:
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2:
 	endchannel
 
 
-SFX_Pokedex_Rating_1_Ch3:
+SFX_Pokedex_Rating_1_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm
index ec82888e..01ac0e1c 100644
--- a/audio/sfx/pokedex_rating_3.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,4 +1,4 @@
-SFX_Pokedex_Rating_3_Ch1:
+SFX_Pokedex_Rating_3_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1:
 	endchannel
 
 
-SFX_Pokedex_Rating_3_Ch2:
+SFX_Pokedex_Rating_3_Ch5:
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2:
 	endchannel
 
 
-SFX_Pokedex_Rating_3_Ch3:
+SFX_Pokedex_Rating_3_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm
index cf61a6ee..272c114f 100644
--- a/audio/sfx/pokeflute.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,4 +1,4 @@
-SFX_Pokeflute_Ch1:
+SFX_Pokeflute_Ch2:
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch4_ch5.asm
index 84631bca..146488d8 100755
--- a/audio/sfx/pokeflute_ch1_ch2.asm
+++ b/audio/sfx/pokeflute_ch4_ch5.asm
@@ -1,8 +1,8 @@
-SFX_08_PokeFlute_Ch1:
+SFX_08_PokeFlute_Ch4:
 	tempo 256
 
 
-SFX_08_PokeFlute_Ch2:
+SFX_08_PokeFlute_Ch5:
 	executemusic
 	notetype 8, 0, 0
 	rest 5
diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch6.asm
index 3c883462..4d4e5bae 100755
--- a/audio/sfx/pokeflute_ch3.asm
+++ b/audio/sfx/pokeflute_ch6.asm
@@ -1,4 +1,4 @@
-SFX_08_PokeFlute_Ch3:
+SFX_08_PokeFlute_Ch6:
 	executemusic
 	vibrato 16, 1, 4
 	notetype 8, 1, 0
diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm
index f70f6725..fc6d292e 100644
--- a/audio/sfx/pound.asm
+++ b/audio/sfx/pound.asm
@@ -1,3 +1,3 @@
-SFX_Pound_Ch1:
+SFX_Pound_Ch7:
 	unknownnoise0x20 2, 161, 34
 	endchannel
diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm
index f68a6384..95edbf4a 100644
--- a/audio/sfx/press_ab_1.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_1_Ch1:
+SFX_Press_AB_1_Ch4:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm
index 83b5ccd6..0d8faa46 100644
--- a/audio/sfx/press_ab_2.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_2_Ch1:
+SFX_Press_AB_2_Ch4:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm
index 167c0fb1..0f11fc34 100644
--- a/audio/sfx/press_ab_3.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,4 +1,4 @@
-SFX_Press_AB_3_Ch1:
+SFX_Press_AB_3_Ch4:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm
index 893d4334..12a1b6fc 100644
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,25 +1,25 @@
-SFX_Psybeam_Ch1:
+SFX_Psybeam_Ch4:
 	dutycycle 161
 	unknownsfx0x20 10, 241, 64, 6
 	unknownsfx0x20 10, 243, 128, 6
 	unknownsfx0x20 10, 242, 32, 6
-	loopchannel 4, SFX_Psybeam_Ch1
+	loopchannel 4, SFX_Psybeam_Ch4
 	unknownsfx0x20 10, 241, 64, 6
 	endchannel
 
 
-SFX_Psybeam_Ch2:
+SFX_Psybeam_Ch5:
 	dutycycle 179
 	unknownsfx0x20 10, 243, 113, 5
 	unknownsfx0x20 7, 227, 49, 5
 	unknownsfx0x20 10, 241, 81, 5
-	loopchannel 4, SFX_Psybeam_Ch2
+	loopchannel 4, SFX_Psybeam_Ch5
 	unknownsfx0x20 10, 241, 113, 5
 	endchannel
 
 
-SFX_Psybeam_Ch3:
+SFX_Psybeam_Ch7:
 	unknownnoise0x20 2, 209, 74
 	unknownnoise0x20 2, 210, 42
-	loopchannel 21, SFX_Psybeam_Ch3
+	loopchannel 21, SFX_Psybeam_Ch7
 	endchannel
diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm
index abaa8345..2bbde2f1 100644
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,4 +1,4 @@
-SFX_Psychic_M_Ch1:
+SFX_Psychic_M_Ch4:
 	duty 2
 	unknownsfx0x10 247
 	unknownsfx0x20 8, 196, 189, 7
@@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1:
 	endchannel
 
 
-SFX_Psychic_M_Ch2:
+SFX_Psychic_M_Ch5:
 	duty 2
 	unknownsfx0x20 8, 196, 112, 7
 	unknownsfx0x20 8, 196, 97, 7
@@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2:
 	endchannel
 
 
-SFX_Psychic_M_Ch3:
+SFX_Psychic_M_Ch7:
 	unknownnoise0x20 15, 63, 20
 	unknownnoise0x20 15, 207, 19
 	unknownnoise0x20 15, 207, 18
diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm
index 767035ea..1c9490a2 100644
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,11 +1,11 @@
-SFX_Purchase_1_Ch1:
+SFX_Purchase_1_Ch4:
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_Purchase_1_Ch2:
+SFX_Purchase_1_Ch5:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm
index 65a22527..78929c27 100644
--- a/audio/sfx/purchase_3.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,11 +1,11 @@
-SFX_Purchase_3_Ch1:
+SFX_Purchase_3_Ch4:
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_Purchase_3_Ch2:
+SFX_Purchase_3_Ch5:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm
index cf43bbcf..86035278 100644
--- a/audio/sfx/push_boulder_1.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,4 +1,4 @@
-SFX_Push_Boulder_1_Ch1:
+SFX_Push_Boulder_1_Ch7:
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm
index 9f536964..ecaeb768 100644
--- a/audio/sfx/push_boulder_3.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,4 +1,4 @@
-SFX_Push_Boulder_3_Ch1:
+SFX_Push_Boulder_3_Ch7:
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm
index 656d3d01..81d01467 100644
--- a/audio/sfx/run.asm
+++ b/audio/sfx/run.asm
@@ -1,4 +1,4 @@
-SFX_Run_Ch1:
+SFX_Run_Ch7:
 	unknownnoise0x20 2, 97, 35
 	unknownnoise0x20 2, 161, 51
 	unknownnoise0x20 2, 193, 51
diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm
index d385feb3..f898def0 100644
--- a/audio/sfx/safari_zone_pa.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,4 +1,4 @@
-SFX_Safari_Zone_PA_Ch1:
+SFX_Safari_Zone_PA_Ch4:
 	duty 2
 	unknownsfx0x20 15, 243, 48, 7
 	unknownsfx0x20 8, 101, 48, 7
diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm
index 13cb46e5..afb1f13a 100644
--- a/audio/sfx/save_1.asm
+++ b/audio/sfx/save_1.asm
@@ -1,4 +1,4 @@
-SFX_Save_1_Ch1:
+SFX_Save_1_Ch4:
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 2, 228, 0, 6
@@ -10,7 +10,7 @@ SFX_Save_1_Ch1:
 	endchannel
 
 
-SFX_Save_1_Ch2:
+SFX_Save_1_Ch5:
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 2, 212, 1, 7
diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm
index ad049ec6..083e77c8 100644
--- a/audio/sfx/save_3.asm
+++ b/audio/sfx/save_3.asm
@@ -1,4 +1,4 @@
-SFX_Save_3_Ch1:
+SFX_Save_3_Ch4:
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 244, 0, 7
@@ -16,7 +16,7 @@ ENDC
 	endchannel
 
 
-SFX_Save_3_Ch2:
+SFX_Save_3_Ch5:
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 8, 0, 0
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index f8b8e285..f9b03feb 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,4 +1,4 @@
-SFX_Shooting_Star_Ch1:
+SFX_Shooting_Star_Ch4:
 	dutycycle 228
 	unknownsfx0x10 47
 	unknownsfx0x20 4, 64, 224, 7
diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm
index d69d60de..54731535 100644
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,4 +1,4 @@
-SFX_Shrink_1_Ch1:
+SFX_Shrink_1_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm
index e5c4b7af..b03cbe55 100644
--- a/audio/sfx/shrink_3.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,4 +1,4 @@
-SFX_Shrink_3_Ch1:
+SFX_Shrink_3_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm
index ad789af2..ee238262 100644
--- a/audio/sfx/silph_scope.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,4 +1,4 @@
-SFX_Silph_Scope_Ch1:
+SFX_Silph_Scope_Ch4:
 	duty 0
 	unknownsfx0x20 0, 210, 0, 7
 	unknownsfx0x20 0, 210, 64, 7
diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm
index d29529e9..ae1a6d90 100644
--- a/audio/sfx/slots_new_spin.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,4 +1,4 @@
-SFX_Slots_New_Spin_Ch1:
+SFX_Slots_New_Spin_Ch4:
 	duty 3
 	unknownsfx0x20 5, 225, 0, 7
 	unknownsfx0x20 2, 225, 128, 7
@@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1:
 	endchannel
 
 
-SFX_Slots_New_Spin_Ch2:
+SFX_Slots_New_Spin_Ch5:
 	duty 2
 	unknownsfx0x20 4, 193, 193, 6
 	unknownsfx0x20 2, 193, 65, 7
diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm
index d7833f55..6923ac71 100644
--- a/audio/sfx/slots_reward.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,4 +1,4 @@
-SFX_Slots_Reward_Ch1:
+SFX_Slots_Reward_Ch4:
 	duty 2
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm
index 00641a5e..85d73daf 100644
--- a/audio/sfx/slots_stop_wheel.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,4 +1,4 @@
-SFX_Slots_Stop_Wheel_Ch1:
+SFX_Slots_Stop_Wheel_Ch4:
 	duty 2
 	unknownsfx0x20 1, 242, 160, 6
 	unknownsfx0x20 1, 242, 224, 6
diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm
index 9f7b4138..aae0ef28 100644
--- a/audio/sfx/snare1_1.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_1_Ch1:
+SFX_Snare1_1_Ch7:
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm
index 55fdf84a..e5013081 100644
--- a/audio/sfx/snare1_2.asm
+++ b/audio/sfx/snare1_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_2_Ch1:
+SFX_Snare1_2_Ch7:
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm
index cab603c1..4ffffa7f 100644
--- a/audio/sfx/snare1_3.asm
+++ b/audio/sfx/snare1_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_3_Ch1:
+SFX_Snare1_3_Ch7:
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm
index e40facb5..286e397a 100644
--- a/audio/sfx/snare2_1.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_1_Ch1:
+SFX_Snare2_1_Ch7:
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm
index 82deb096..a3718612 100644
--- a/audio/sfx/snare2_2.asm
+++ b/audio/sfx/snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_2_Ch1:
+SFX_Snare2_2_Ch7:
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm
index fb5e1672..67f8c7fb 100644
--- a/audio/sfx/snare2_3.asm
+++ b/audio/sfx/snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_3_Ch1:
+SFX_Snare2_3_Ch7:
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm
index c2b20add..686b4561 100644
--- a/audio/sfx/snare3_1.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_1_Ch1:
+SFX_Snare3_1_Ch7:
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm
index 16f87fc5..f8236d40 100644
--- a/audio/sfx/snare3_2.asm
+++ b/audio/sfx/snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_2_Ch1:
+SFX_Snare3_2_Ch7:
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm
index 6b9a006f..3b52bac9 100644
--- a/audio/sfx/snare3_3.asm
+++ b/audio/sfx/snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_3_Ch1:
+SFX_Snare3_3_Ch7:
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm
index 2796410c..35d58dba 100644
--- a/audio/sfx/snare4_1.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_1_Ch1:
+SFX_Snare4_1_Ch7:
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm
index 920321ab..713f8996 100644
--- a/audio/sfx/snare4_2.asm
+++ b/audio/sfx/snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_2_Ch1:
+SFX_Snare4_2_Ch7:
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm
index a47c332c..231193e1 100644
--- a/audio/sfx/snare4_3.asm
+++ b/audio/sfx/snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_3_Ch1:
+SFX_Snare4_3_Ch7:
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm
index dd4eab3a..54106d58 100644
--- a/audio/sfx/snare5_1.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_1_Ch1:
+SFX_Snare5_1_Ch7:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm
index fad74021..f7f55eb5 100644
--- a/audio/sfx/snare5_2.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_2_Ch1:
+SFX_Snare5_2_Ch7:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm
index d0ca1d91..76dc3966 100644
--- a/audio/sfx/snare5_3.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_3_Ch1:
+SFX_Snare5_3_Ch7:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm
index 74bf01c7..97c0241d 100644
--- a/audio/sfx/snare6_1.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_1_Ch1:
+SFX_Snare6_1_Ch7:
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm
index 0a96680e..797d5518 100644
--- a/audio/sfx/snare6_2.asm
+++ b/audio/sfx/snare6_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_2_Ch1:
+SFX_Snare6_2_Ch7:
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm
index f3130931..28fc695a 100644
--- a/audio/sfx/snare6_3.asm
+++ b/audio/sfx/snare6_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_3_Ch1:
+SFX_Snare6_3_Ch7:
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm
index ef8f80ab..1b54eefa 100644
--- a/audio/sfx/snare7_1.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_1_Ch1:
+SFX_Snare7_1_Ch7:
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm
index 5e266b12..e480f87f 100644
--- a/audio/sfx/snare7_2.asm
+++ b/audio/sfx/snare7_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_2_Ch1:
+SFX_Snare7_2_Ch7:
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm
index 26db3703..b57dfc13 100644
--- a/audio/sfx/snare7_3.asm
+++ b/audio/sfx/snare7_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_3_Ch1:
+SFX_Snare7_3_Ch7:
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm
index 5f624177..1a0f74a3 100644
--- a/audio/sfx/snare8_1.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_1_Ch1:
+SFX_Snare8_1_Ch7:
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm
index cf5d5654..87619598 100644
--- a/audio/sfx/snare8_2.asm
+++ b/audio/sfx/snare8_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_2_Ch1:
+SFX_Snare8_2_Ch7:
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm
index 7da0e415..54076c8e 100644
--- a/audio/sfx/snare8_3.asm
+++ b/audio/sfx/snare8_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_3_Ch1:
+SFX_Snare8_3_Ch7:
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm
index c511cdaf..6923bb09 100644
--- a/audio/sfx/snare9_1.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_1_Ch1:
+SFX_Snare9_1_Ch7:
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm
index db9aecf9..308ae7f6 100644
--- a/audio/sfx/snare9_2.asm
+++ b/audio/sfx/snare9_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_2_Ch1:
+SFX_Snare9_2_Ch7:
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm
index 18df2e46..ffbdc454 100644
--- a/audio/sfx/snare9_3.asm
+++ b/audio/sfx/snare9_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_3_Ch1:
+SFX_Snare9_3_Ch7:
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm
index 66c95262..38407f24 100644
--- a/audio/sfx/ss_anne_horn_1.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,4 +1,4 @@
-SFX_SS_Anne_Horn_1_Ch1:
+SFX_SS_Anne_Horn_1_Ch4:
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1:
 	endchannel
 
 
-SFX_SS_Anne_Horn_1_Ch2:
+SFX_SS_Anne_Horn_1_Ch5:
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm
index 070f111c..3162f664 100644
--- a/audio/sfx/ss_anne_horn_3.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,4 +1,4 @@
-SFX_SS_Anne_Horn_3_Ch1:
+SFX_SS_Anne_Horn_3_Ch4:
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1:
 	endchannel
 
 
-SFX_SS_Anne_Horn_3_Ch2:
+SFX_SS_Anne_Horn_3_Ch5:
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm
index f509326c..3a979b44 100644
--- a/audio/sfx/start_menu_1.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_1_Ch1:
+SFX_Start_Menu_1_Ch7:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm
index 92bb7558..2706f555 100644
--- a/audio/sfx/start_menu_2.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_2_Ch1:
+SFX_Start_Menu_2_Ch7:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm
index 74c82cf3..4b16cea4 100644
--- a/audio/sfx/start_menu_3.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_3_Ch1:
+SFX_Start_Menu_3_Ch7:
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm
index 70d7014a..63ba35e8 100644
--- a/audio/sfx/super_effective.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,4 +1,4 @@
-SFX_Super_Effective_Ch1:
+SFX_Super_Effective_Ch7:
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm
index 782dd3fb..95a31fcd 100644
--- a/audio/sfx/swap_1.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,10 +1,10 @@
-SFX_Swap_1_Ch1:
+SFX_Swap_1_Ch4:
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_Swap_1_Ch2:
+SFX_Swap_1_Ch5:
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm
index 4fc1db1d..6ed97d7d 100644
--- a/audio/sfx/swap_3.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,10 +1,10 @@
-SFX_Swap_3_Ch1:
+SFX_Swap_3_Ch4:
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_Swap_3_Ch2:
+SFX_Swap_3_Ch5:
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm
index ac9fb680..ee15dc20 100644
--- a/audio/sfx/switch_1.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,4 +1,4 @@
-SFX_Switch_1_Ch1:
+SFX_Switch_1_Ch4:
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm
index 81b68d26..d98a7f29 100644
--- a/audio/sfx/switch_3.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,4 +1,4 @@
-SFX_Switch_3_Ch1:
+SFX_Switch_3_Ch4:
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm
index 0522ee16..60c87cab 100644
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter1_1_Ch1:
+SFX_Teleport_Enter1_1_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm
index 6518e416..d3dab8b4 100644
--- a/audio/sfx/teleport_enter1_3.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter1_3_Ch1:
+SFX_Teleport_Enter1_3_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm
index 338c1c30..53eb3335 100644
--- a/audio/sfx/teleport_enter2_1.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter2_1_Ch1:
+SFX_Teleport_Enter2_1_Ch7:
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm
index f6cd103c..8b7c7894 100644
--- a/audio/sfx/teleport_enter2_3.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Enter2_3_Ch1:
+SFX_Teleport_Enter2_3_Ch7:
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm
index f916d539..084c116f 100644
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit1_1_Ch1:
+SFX_Teleport_Exit1_1_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm
index 67739bd1..b3a26af8 100644
--- a/audio/sfx/teleport_exit1_3.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit1_3_Ch1:
+SFX_Teleport_Exit1_3_Ch4:
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm
index 1e1de5a5..4b168bb9 100644
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit2_1_Ch1:
+SFX_Teleport_Exit2_1_Ch4:
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm
index 928e486e..171e59d8 100644
--- a/audio/sfx/teleport_exit2_3.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,4 +1,4 @@
-SFX_Teleport_Exit2_3_Ch1:
+SFX_Teleport_Exit2_3_Ch4:
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm
index e6eff9ac..c1f5f00c 100644
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,4 +1,4 @@
-SFX_Tink_1_Ch1:
+SFX_Tink_1_Ch4:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm
index fa06cf19..bab45323 100644
--- a/audio/sfx/tink_2.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,4 +1,4 @@
-SFX_Tink_2_Ch1:
+SFX_Tink_2_Ch4:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm
index d786d289..a9cf73ec 100644
--- a/audio/sfx/tink_3.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,4 +1,4 @@
-SFX_Tink_3_Ch1:
+SFX_Tink_3_Ch4:
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm
index 87993851..2f67936b 100644
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_Trade_Machine_1_Ch1:
+SFX_Trade_Machine_1_Ch4:
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm
index 6b70d5da..b590455e 100644
--- a/audio/sfx/trade_machine_3.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_Trade_Machine_3_Ch1:
+SFX_Trade_Machine_3_Ch4:
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm
index 94b61fe1..957dc63f 100644
--- a/audio/sfx/triangle1_1.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_1_Ch1:
+SFX_Triangle1_1_Ch7:
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm
index 1c9c1d29..535448cd 100644
--- a/audio/sfx/triangle1_2.asm
+++ b/audio/sfx/triangle1_2.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_2_Ch1:
+SFX_Triangle1_2_Ch7:
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm
index b900da7c..a13d00ea 100644
--- a/audio/sfx/triangle1_3.asm
+++ b/audio/sfx/triangle1_3.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_3_Ch1:
+SFX_Triangle1_3_Ch7:
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm
index 0f648237..09ba8a67 100644
--- a/audio/sfx/triangle2_1.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_1_Ch1:
+SFX_Triangle2_1_Ch7:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm
index cbc2a642..6512648a 100644
--- a/audio/sfx/triangle2_2.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_2_Ch1:
+SFX_Triangle2_2_Ch7:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm
index 44fc95dd..b0612aba 100644
--- a/audio/sfx/triangle2_3.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_3_Ch1:
+SFX_Triangle2_3_Ch7:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm
index f5622bd7..9fd3952f 100644
--- a/audio/sfx/triangle3_1.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_1_Ch1:
+SFX_Triangle3_1_Ch7:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm
index 8b0b76e5..38b3198b 100644
--- a/audio/sfx/triangle3_2.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_2_Ch1:
+SFX_Triangle3_2_Ch7:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm
index d40779fb..138c8fac 100644
--- a/audio/sfx/triangle3_3.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_3_Ch1:
+SFX_Triangle3_3_Ch7:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm
index ca29a4cc..6b2561fe 100644
--- a/audio/sfx/turn_off_pc_1.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Turn_Off_PC_1_Ch1:
+SFX_Turn_Off_PC_1_Ch4:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm
index 2ae0787b..cf6d95cd 100644
--- a/audio/sfx/turn_off_pc_3.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Turn_Off_PC_3_Ch1:
+SFX_Turn_Off_PC_3_Ch4:
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm
index 22433707..dede7c3e 100644
--- a/audio/sfx/turn_on_pc_1.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_Turn_On_PC_1_Ch1:
+SFX_Turn_On_PC_1_Ch4:
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm
index d97dc1c7..1ed54d3c 100644
--- a/audio/sfx/turn_on_pc_3.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_Turn_On_PC_3_Ch1:
+SFX_Turn_On_PC_3_Ch4:
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm
index 7e0350d4..36c10ba3 100755
--- a/audio/sfx/unused2_2.asm
+++ b/audio/sfx/unused2_2.asm
@@ -1,4 +1,4 @@
-SFX_08_unused2_Ch1:
+SFX_08_unused2_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -17,7 +17,7 @@ SFX_08_unused2_Ch1:
 	endchannel
 
 
-SFX_08_unused2_Ch2:
+SFX_08_unused2_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -33,7 +33,7 @@ SFX_08_unused2_Ch2:
 	endchannel
 
 
-SFX_08_unused2_Ch3:
+SFX_08_unused2_Ch6:
 	executemusic
 	notetype 6, 1, 0
 	octave 4
diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm
index d0bbfd59..21d54fb1 100755
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_1.asm
@@ -1,4 +1,4 @@
-SFX_02_unused_Ch1:
+SFX_02_unused_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@ SFX_02_unused_Ch1:
 	endchannel
 
 
-SFX_02_unused_Ch2:
+SFX_02_unused_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@ SFX_02_unused_Ch2:
 	endchannel
 
 
-SFX_02_unused_Ch3:
+SFX_02_unused_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm
index fd491b71..20de851f 100755
--- a/audio/sfx/unused_2.asm
+++ b/audio/sfx/unused_2.asm
@@ -1,4 +1,4 @@
-SFX_08_unused_Ch1:
+SFX_08_unused_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@ SFX_08_unused_Ch1:
 	endchannel
 
 
-SFX_08_unused_Ch2:
+SFX_08_unused_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@ SFX_08_unused_Ch2:
 	endchannel
 
 
-SFX_08_unused_Ch3:
+SFX_08_unused_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm
index b00e55f5..d4a30539 100755
--- a/audio/sfx/unused_3.asm
+++ b/audio/sfx/unused_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_unused_Ch1:
+SFX_1f_unused_Ch4:
 	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
@@ -9,7 +9,7 @@ SFX_1f_unused_Ch1:
 	endchannel
 
 
-SFX_1f_unused_Ch2:
+SFX_1f_unused_Ch5:
 	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
@@ -20,7 +20,7 @@ SFX_1f_unused_Ch2:
 	endchannel
 
 
-SFX_1f_unused_Ch3:
+SFX_1f_unused_Ch7:
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 224, 58
 	unknownnoise0x20 15, 208, 58
diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm
index a8445131..ad0bd40b 100644
--- a/audio/sfx/vine_whip.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,4 +1,4 @@
-SFX_Vine_Whip_Ch1:
+SFX_Vine_Whip_Ch7:
 	unknownnoise0x20 1, 194, 51
 	unknownnoise0x20 2, 242, 33
 	unknownnoise0x20 1, 226, 51
diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm
index 59827ceb..d7a2f54d 100644
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,4 +1,4 @@
-SFX_Withdraw_Deposit_1_Ch1:
+SFX_Withdraw_Deposit_1_Ch4:
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm
index 0add48e1..1fd1fe3e 100644
--- a/audio/sfx/withdraw_deposit_3.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,4 +1,4 @@
-SFX_Withdraw_Deposit_3_Ch1:
+SFX_Withdraw_Deposit_3_Ch4:
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
author	einstein95 <einstein95@users.noreply.github.com>	2016-12-27 11:57:05 +1300
committer	einstein95 <einstein95@users.noreply.github.com>	2016-12-27 11:57:05 +1300
commit	f73893db566c67ee9e1b4b6b309853503351d8ca (patch)
tree	6b420d9e1ab47f11bf6240b48d237c810f4b6aa1 /audio
parent	fde4f79b3ba6a6653b91801e26865155b89a6be0 (diff)