Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

392 files changed, 20220 insertions, 20251 deletions

diff --git a/audio.asm b/audio.asm
index ff7b721d..4305657c 100644
--- a/audio.asm
+++ b/audio.asm
@@ -155,7 +155,7 @@ INCLUDE "audio/sfx/ball_poof.asm"
 INCLUDE "audio/sfx/faint_thud.asm"
 INCLUDE "audio/sfx/run.asm"
 INCLUDE "audio/sfx/dex_page_added.asm"
-INCLUDE "audio/sfx/pokeflute_ch6.asm"
+INCLUDE "audio/sfx/pokeflute_ch7.asm"
 INCLUDE "audio/sfx/peck.asm"
 INCLUDE "audio/sfx/faint_fall.asm"
 INCLUDE "audio/sfx/battle_09.asm"
@@ -470,7 +470,7 @@ Music_DoLowHealthAlarm::
 
 .asm_2138a
 	ld a, $86
-	ld [wChannelSoundIDs + Ch4], a ;disable sound channel?
+	ld [wChannelSoundIDs + Ch5], a ;disable sound channel?
 	ld a, [wLowHealthAlarm]
 	and $7f ;decrement alarm timer.
 	dec a
@@ -484,7 +484,7 @@ Music_DoLowHealthAlarm::
 .disableAlarm
 	xor a
 	ld [wLowHealthAlarm], a  ;disable alarm
-	ld [wChannelSoundIDs + Ch4], a  ;re-enable sound channel?
+	ld [wChannelSoundIDs + Ch5], a  ;re-enable sound channel?
 	ld de, .toneDataSilence
 	jr .playTone
 
@@ -535,12 +535,12 @@ Music_PokeFluteInBattle::
 	ld a, SFX_CAUGHT_MON
 	call PlaySoundWaitForCurrent
 	; then immediately overwrite the channel pointers
-	ld hl, wChannelCommandPointers + Ch4 * 2
-	ld de, SFX_08_PokeFlute_Ch4
+	ld hl, wChannelCommandPointers + Ch5 * 2
+	ld de, SFX_Pokeflute_Ch5
 	call Audio2_OverwriteChannelPointer
-	ld de, SFX_08_PokeFlute_Ch5
+	ld de, SFX_Pokeflute_Ch6
 	call Audio2_OverwriteChannelPointer
-	ld de, SFX_08_PokeFlute_Ch6
+	ld de, SFX_Pokeflute_Ch7
 
 Audio2_OverwriteChannelPointer:
 	ld a, e
@@ -625,7 +625,7 @@ INCLUDE "audio/music/pokecenter.asm"
 
 SECTION "Music 2", ROMX ; BANK $08
 
-INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm"
+INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm"
 INCLUDE "audio/sfx/unused2_2.asm"
 INCLUDE "audio/music/gymleaderbattle.asm"
 INCLUDE "audio/music/trainerbattle.asm"
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index bab1be55..8b021acf 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, Ch1
 .loop
 	ld b, 0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio1_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp Ch4
+	cp Ch5
 	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 Ch8
 	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 Ch5
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	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 Ch4
 	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 Ch7
 	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 + Ch5]
 	cp CRY_SFX_START
 	jr nc, .asm_9251
 	jr .skipCry
 .asm_9251
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp CRY_SFX_END
 	jr z, .skipCry
 	jr c, .cry
 	jr .skipCry
 .cry
 	ld a, c
-	cp Ch4
+	cp Ch5
 	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 Ch4
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio1_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	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 Ch5
 	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 + Ch8]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + Ch7], a
+	ld [wChannelSoundIDs + Ch8], a
 .skip
 	jp Audio1_endchannel
 
@@ -577,7 +577,7 @@ Audio1_sfxnote:
 	cp $20 ; is this command a sfxnote?
 	jr nz, Audio1_pitchenvelope
 	ld a, c
-	cp Ch3 ; is this a noise or sfx channel?
+	cp Ch4 ; is this a noise or sfx channel?
 	jr c, Audio1_pitchenvelope ; no
 	ld b, 0
 	ld hl, wChannelFlags2
@@ -607,7 +607,7 @@ Audio1_sfxnote:
 	call Audio1_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	ld a, 0
 	jr z, .skip
 ; Channels 1 through 3 have 2 registers that control frequency, but the noise
@@ -627,7 +627,7 @@ Audio1_sfxnote:
 
 Audio1_pitchenvelope:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, Audio1_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a pitchenvelope?
@@ -643,7 +643,7 @@ Audio1_pitchenvelope:
 
 Audio1_note:
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr nz, Audio1_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -691,7 +691,7 @@ Audio1_notelength:
 	ld l, b
 	call Audio1_MultiplyAdd
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -701,7 +701,7 @@ Audio1_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp Ch7
+	cp Ch8
 	jr z, .skip ; if noise channel
 	call Audio1_SetSfxTempo
 	ld a, [wSfxTempo]
@@ -741,10 +741,10 @@ Audio1_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .next
 ; If this isn't an SFX channel, try the corresponding SFX channel.
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -752,9 +752,9 @@ Audio1_notepitch:
 	; fall through
 .next
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notChannel3
 .channel3
 	ld b, 0
@@ -790,10 +790,10 @@ Audio1_notepitch:
 .skipPitchBend
 	push de
 	ld a, c
-	cp Ch4
+	cp Ch5
 	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 + Ch5
 	ld d, 0
 	ld e, a
 	add hl, de
@@ -838,12 +838,12 @@ Audio1_EnableChannelOutput:
 	or [hl] ; set this channel's bits
 	ld d, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	jr z, .noiseChannelOrNoSfx
-	cp Ch4
+	cp Ch5
 	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 + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -873,9 +873,9 @@ Audio1_ApplyDutyAndSoundLength:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .skipDuty ; if music channel 3
-	cp Ch6
+	cp Ch7
 	jr z, .skipDuty ; if sfx channel 3
 ; include duty (except on channel 3 which doesn't have it)
 	ld a, d
@@ -894,15 +894,15 @@ Audio1_ApplyDutyAndSoundLength:
 
 Audio1_ApplyWavePatternAndFrequency:
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp Ch2
+	cp Ch3
 	jr z, .next
 	ld de, wSfxWaveInstrument
 .next
@@ -1006,7 +1006,7 @@ Audio1_GoBackOneCommandIfCry:
 
 Audio1_IsCry:
 ; Returns whether the currently playing audio is a cry in carry.
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp CRY_SFX_START
 	jr nc, .next
 	jr .no
@@ -1542,7 +1542,7 @@ Audio1_PlaySound::
 	add hl, de
 	ld [hl], a
 	ld a, e
-	cp Ch4
+	cp Ch5
 	jr nz, .asm_9a2b
 	ld a, $8
 	ld [rNR10], a ; sweep off
@@ -1644,7 +1644,7 @@ Audio1_PlaySound::
 	ld a, [wSoundID]
 	ld [hl], a
 	pop af
-	cp Ch3
+	cp Ch4
 	jr c, .skipSettingFlag
 	ld hl, wChannelFlags1
 	add hl, bc
@@ -1676,12 +1676,12 @@ Audio1_PlaySound::
 	jr c, .cry
 	jr .done
 .cry
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
 	ld de, Audio1_CryEndchannel
 	ld [hl], e
 	inc hl
@@ -1697,7 +1697,7 @@ Audio1_PlaySound::
 	ret
 
 Audio1_CryEndchannel:
-	endchannel
+	sound_ret
 
 Audio1_HWChannelBaseAddresses:
 ; the low bytes of each HW channel's base address
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 2ca5cbe8..4f7f6277 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, Ch1
 .loop
 	ld b, $0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio2_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,7 +30,7 @@ Audio2_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c
-	cp Ch7
+	cp Ch8
 	jr nz, .loop
 	ret
 
@@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	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 Ch5
 	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 Ch4
 	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 Ch7
 	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 + Ch5]
 	cp $14
 	jr nc, .asm_219d2
 	jr .asm_219ef
 .asm_219d2
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $86
 	jr z, .asm_219ef
 	jr c, .asm_219dd
 	jr .asm_219ef
 .asm_219dd
 	ld a, c
-	cp Ch4
+	cp Ch5
 	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 Ch4
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio2_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	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 Ch5
 	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 + Ch8]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + Ch7], a
+	ld [wChannelSoundIDs + Ch8], a
 .skip
 	jp Audio2_endchannel
 
@@ -571,7 +571,7 @@ Audio2_sfxnote:
 	cp $20 ; is this command an sfxnote?
 	jr nz, Audio2_pitchenvelope ; no
 	ld a, c
-	cp Ch3 ; is this a noise or sfx channel?
+	cp Ch4 ; is this a noise or sfx channel?
 	jr c, Audio2_pitchenvelope ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -597,7 +597,7 @@ Audio2_sfxnote:
 	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
@@ -614,7 +614,7 @@ Audio2_sfxnote:
 
 Audio2_pitchenvelope:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, Audio2_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a pitchenvelope?
@@ -630,7 +630,7 @@ Audio2_pitchenvelope:
 
 Audio2_note:
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr nz, Audio2_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -678,7 +678,7 @@ Audio2_notelength:
 	ld l, b
 	call Audio2_22006
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -688,7 +688,7 @@ Audio2_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp Ch7
+	cp Ch8
 	jr z, .skip ; if noise channel
 	call Audio2_21e2f
 	ld a, [wSfxTempo]
@@ -728,9 +728,9 @@ Audio2_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -738,9 +738,9 @@ Audio2_notepitch:
 	; fall through
 .sfxChannel
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 .musicChannel3
 	ld b, $0
@@ -776,9 +776,9 @@ Audio2_notepitch:
 .asm_21d39
 	push de
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -823,11 +823,11 @@ Audio2_21d79:
 	or [hl]
 	ld d, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	jr z, .sfxNoiseChannel
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -855,9 +855,9 @@ Audio2_21daa:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3 ; if music channel 3
-	cp Ch6
+	cp Ch7
 	jr z, .channel3 ; if sfx channel 3
 	ld a, d
 	and $3f
@@ -875,15 +875,15 @@ Audio2_21daa:
 
 Audio2_21dcc:
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
 	ld de, wSfxWaveInstrument
 .musicChannel3
@@ -922,7 +922,7 @@ Audio2_21dcc:
 	inc hl
 	ld [hl], d
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, .musicChannel
 	call Audio2_21e56
 .musicChannel
@@ -930,7 +930,7 @@ Audio2_21dcc:
 
 Audio2_21e19:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nz, .asm_21e2e
 	ld a, [wLowHealthAlarm]
 	bit 7, a
@@ -1009,7 +1009,7 @@ Audio2_21e6d:
 	ret
 
 Audio2_21e8b:
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $14
 	jr nc, .asm_21e94
 	jr .asm_21e9a
@@ -1026,9 +1026,9 @@ Audio2_21e8b:
 	ret
 
 Audio2_21e9f:
-	ld a, [wChannelSoundIDs + Ch7]
+	ld a, [wChannelSoundIDs + Ch8]
 	ld b, a
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	or b
 	cp $9d
 	jr nc, .asm_21ead
@@ -1314,7 +1314,7 @@ Audio2_22017:
 	ld d, [hl]
 	ld a, b
 .loop
-	cp Ch7
+	cp Ch8
 	jr z, .done
 	sra d
 	rr e
@@ -1683,12 +1683,12 @@ Audio2_2224e:
 	jr c, .asm_222b5
 	jr .asm_222d4
 .asm_222b5
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer
 	ld de, Noise2_endchannel
 	ld [hl], e
 	inc hl
@@ -1704,7 +1704,7 @@ Audio2_2224e:
 	ret
 
 Noise2_endchannel:
-	endchannel
+	sound_ret
 
 Unknown_222d6:
 	db $10, $15, $1A, $1F ; channels 0-3
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 9a95f3e1..cf435740 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, Ch1
 .loop
 	ld b, $0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio3_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,7 +30,7 @@ Audio3_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
-	cp Ch7
+	cp Ch8
 	jr nz, .loop
 	ret
 
@@ -52,9 +52,9 @@ Audio3_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	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 Ch4
 	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 Ch7
 	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 + Ch5]
 	cp $14
 	jr nc, .asm_7d2c5
 	jr .asm_7d2e2
 .asm_7d2c5
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $86
 	jr z, .asm_7d2e2
 	jr c, .asm_7d2d0
 	jr .asm_7d2e2
 .asm_7d2d0
 	ld a, c
-	cp Ch4
+	cp Ch5
 	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 Ch4
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio3_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	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 Ch5
 	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 + Ch8]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + Ch7], a
+	ld [wChannelSoundIDs + Ch8], a
 .skip
 	jp Audio3_endchannel
 
@@ -564,7 +564,7 @@ Audio3_sfxnote:
 	cp $20 ; is this command an sfxnote?
 	jr nz, Audio3_pitchenvelope ; no
 	ld a, c
-	cp Ch3 ; is this a noise or sfx channel?
+	cp Ch4 ; is this a noise or sfx channel?
 	jr c, Audio3_pitchenvelope ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -590,7 +590,7 @@ Audio3_sfxnote:
 	call Audio3_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
@@ -607,7 +607,7 @@ Audio3_sfxnote:
 
 Audio3_pitchenvelope:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, Audio3_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command an pitchenvelope?
@@ -623,7 +623,7 @@ Audio3_pitchenvelope:
 
 Audio3_note:
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr nz, Audio3_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -671,7 +671,7 @@ Audio3_notelength:
 	ld l, b
 	call Audio3_7d8bb
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -681,7 +681,7 @@ Audio3_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp Ch7
+	cp Ch8
 	jr z, .skip ; if noise channel
 	call Audio3_7d707
 	ld a, [wSfxTempo]
@@ -721,9 +721,9 @@ Audio3_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -731,9 +731,9 @@ Audio3_notepitch:
 	; fall through
 .sfxChannel
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 .musicChannel3
 	ld b, $0
@@ -769,9 +769,9 @@ Audio3_notepitch:
 .asm_7d62c
 	push de
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx Channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -816,11 +816,11 @@ Audio3_7d66c:
 	or [hl]
 	ld d, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	jr z, .sfxNoiseChannel
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -848,9 +848,9 @@ Audio3_7d69d:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3 ; if music channel 3
-	cp Ch6
+	cp Ch7
 	jr z, .channel3 ; if sfx channel 3
 	ld a, d
 	and $3f
@@ -868,15 +868,15 @@ Audio3_7d69d:
 
 Audio3_7d6bf:
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
 	ld de, wSfxWaveInstrument
 .musicChannel3
@@ -978,7 +978,7 @@ Audio3_7d73b:
 	ret
 
 Audio3_7d759:
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $14
 	jr nc, .asm_7d762
 	jr .asm_7d768
@@ -1632,12 +1632,12 @@ Audio3_7db03:
 	jr c, .asm_7db6a
 	jr .asm_7db89
 .asm_7db6a
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer
 	ld de, Noise3_endchannel
 	ld [hl], e
 	inc hl
@@ -1653,7 +1653,7 @@ Audio3_7db03:
 	ret
 
 Noise3_endchannel:
-	endchannel
+	sound_ret
 
 Unknown_7db8b:
 	db $10, $15, $1A, $1F ; channels 0-3
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index 38594d41..ef85eae6 100755
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,66 +1,66 @@
 Music_PalletTown::
-	audio Music_PalletTown, Ch0, Ch1, Ch2
+	audio_header Music_PalletTown, Ch1, Ch2, Ch3
 
 Music_Pokecenter::
-	audio Music_Pokecenter, Ch0, Ch1, Ch2
+	audio_header Music_Pokecenter, Ch1, Ch2, Ch3
 
 Music_Gym::
-	audio Music_Gym, Ch0, Ch1, Ch2
+	audio_header Music_Gym, Ch1, Ch2, Ch3
 
 ; Viridian City, Pewter City, Saffron City
 Music_Cities1::
-	audio Music_Cities1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4
 
 ; Cerulean City, Fuchsia City
 Music_Cities2::
-	audio Music_Cities2, Ch0, Ch1, Ch2
+	audio_header Music_Cities2, Ch1, Ch2, Ch3
 
 Music_Celadon::
-	audio Music_Celadon, Ch0, Ch1, Ch2
+	audio_header Music_Celadon, Ch1, Ch2, Ch3
 
 Music_Cinnabar::
-	audio Music_Cinnabar, Ch0, Ch1, Ch2
+	audio_header Music_Cinnabar, Ch1, Ch2, Ch3
 
 Music_Vermilion::
-	audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4
 
 Music_Lavender::
-	audio Music_Lavender, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4
 
 Music_SSAnne::
-	audio Music_SSAnne, Ch0, Ch1, Ch2
+	audio_header Music_SSAnne, Ch1, Ch2, Ch3
 
 Music_MeetProfOak::
-	audio Music_MeetProfOak, Ch0, Ch1, Ch2
+	audio_header Music_MeetProfOak, Ch1, Ch2, Ch3
 
 Music_MeetRival::
-	audio Music_MeetRival, Ch0, Ch1, Ch2
+	audio_header Music_MeetRival, Ch1, Ch2, Ch3
 
 Music_MuseumGuy::
-	audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4
 
 Music_SafariZone::
-	audio Music_SafariZone, Ch0, Ch1, Ch2
+	audio_header Music_SafariZone, Ch1, Ch2, Ch3
 
 Music_PkmnHealed::
-	audio Music_PkmnHealed, Ch0, Ch1, Ch2
+	audio_header Music_PkmnHealed, Ch1, Ch2, Ch3
 
 ; Routes 1 and 2
 Music_Routes1::
-	audio Music_Routes1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 24 and 25
 Music_Routes2::
-	audio Music_Routes2, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
 Music_Routes3::
-	audio Music_Routes3, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 11, 12, 13, 14, 15
 Music_Routes4::
-	audio Music_Routes4, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4
 
 ; Route 23, Indigo Plateau
 Music_IndigoPlateau::
-	audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 45557420..d6cca9a9 100755
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,20 +1,20 @@
 Music_GymLeaderBattle::
-	audio Music_GymLeaderBattle, Ch0, Ch1, Ch2
+	audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3
 
 Music_TrainerBattle::
-	audio Music_TrainerBattle, Ch0, Ch1, Ch2
+	audio_header Music_TrainerBattle, Ch1, Ch2, Ch3
 
 Music_WildBattle::
-	audio Music_WildBattle, Ch0, Ch1, Ch2
+	audio_header Music_WildBattle, Ch1, Ch2, Ch3
 
 Music_FinalBattle::
-	audio Music_FinalBattle, Ch0, Ch1, Ch2
+	audio_header Music_FinalBattle, Ch1, Ch2, Ch3
 
 Music_DefeatedTrainer::
-	audio Music_DefeatedTrainer, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3
 
 Music_DefeatedWildMon::
-	audio Music_DefeatedWildMon, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3
 
 Music_DefeatedGymLeader::
-	audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 03dd7777..ca21b419 100755
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,56 +1,56 @@
 Music_TitleScreen::
-	audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4
 
 Music_Credits::
-	audio Music_Credits, Ch0, Ch1, Ch2
+	audio_header Music_Credits, Ch1, Ch2, Ch3
 
 Music_HallOfFame::
-	audio Music_HallOfFame, Ch0, Ch1, Ch2
+	audio_header Music_HallOfFame, Ch1, Ch2, Ch3
 
 Music_OaksLab::
-	audio Music_OaksLab, Ch0, Ch1, Ch2
+	audio_header Music_OaksLab, Ch1, Ch2, Ch3
 
 Music_JigglypuffSong::
-	audio Music_JigglypuffSong, Ch0, Ch1
+	audio_header Music_JigglypuffSong, Ch1, Ch2
 
 Music_BikeRiding::
-	audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4
 
 Music_Surfing::
-	audio Music_Surfing, Ch0, Ch1, Ch2
+	audio_header Music_Surfing, Ch1, Ch2, Ch3
 
 Music_GameCorner::
-	audio Music_GameCorner, Ch0, Ch1, Ch2
+	audio_header Music_GameCorner, Ch1, Ch2, Ch3
 
 Music_IntroBattle::
-	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_IntroBattle, Ch1, Ch2, Ch3, Ch4
 
 ; Power Plant, Cerulean Cave, Rocket HQ
 Music_Dungeon1::
-	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4
 
 Music_CinnabarMansion::
-	audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4
 
 Music_PokemonTower::
-	audio Music_PokemonTower, Ch0, Ch1, Ch2
+	audio_header Music_PokemonTower, Ch1, Ch2, Ch3
 
 Music_SilphCo::
-	audio Music_SilphCo, Ch0, Ch1, Ch2
+	audio_header Music_SilphCo, Ch1, Ch2, Ch3
 
 Music_MeetEvilTrainer::
-	audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3
 
 Music_MeetFemaleTrainer::
-	audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3
 
 Music_MeetMaleTrainer::
-	audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 72a69646..cc50dddd 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,287 +2,287 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_1::
-	audio SFX_Snare1_1, Ch7
+	audio_header SFX_Snare1_1, Ch8
 
 SFX_Snare2_1::
-	audio SFX_Snare2_1, Ch7
+	audio_header SFX_Snare2_1, Ch8
 
 SFX_Snare3_1::
-	audio SFX_Snare3_1, Ch7
+	audio_header SFX_Snare3_1, Ch8
 
 SFX_Snare4_1::
-	audio SFX_Snare4_1, Ch7
+	audio_header SFX_Snare4_1, Ch8
 
 SFX_Snare5_1::
-	audio SFX_Snare5_1, Ch7
+	audio_header SFX_Snare5_1, Ch8
 
 SFX_Triangle1_1::
-	audio SFX_Triangle1_1, Ch7
+	audio_header SFX_Triangle1_1, Ch8
 
 SFX_Triangle2_1::
-	audio SFX_Triangle2_1, Ch7
+	audio_header SFX_Triangle2_1, Ch8
 
 SFX_Snare6_1::
-	audio SFX_Snare6_1, Ch7
+	audio_header SFX_Snare6_1, Ch8
 
 SFX_Snare7_1::
-	audio SFX_Snare7_1, Ch7
+	audio_header SFX_Snare7_1, Ch8
 
 SFX_Snare8_1::
-	audio SFX_Snare8_1, Ch7
+	audio_header SFX_Snare8_1, Ch8
 
 SFX_Snare9_1::
-	audio SFX_Snare9_1, Ch7
+	audio_header SFX_Snare9_1, Ch8
 
 SFX_Cymbal1_1::
-	audio SFX_Cymbal1_1, Ch7
+	audio_header SFX_Cymbal1_1, Ch8
 
 SFX_Cymbal2_1::
-	audio SFX_Cymbal2_1, Ch7
+	audio_header SFX_Cymbal2_1, Ch8
 
 SFX_Cymbal3_1::
-	audio SFX_Cymbal3_1, Ch7
+	audio_header SFX_Cymbal3_1, Ch8
 
 SFX_Muted_Snare1_1::
-	audio SFX_Muted_Snare1_1, Ch7
+	audio_header SFX_Muted_Snare1_1, Ch8
 
 SFX_Triangle3_1::
-	audio SFX_Triangle3_1, Ch7
+	audio_header SFX_Triangle3_1, Ch8
 
 SFX_Muted_Snare2_1::
-	audio SFX_Muted_Snare2_1, Ch7
+	audio_header SFX_Muted_Snare2_1, Ch8
 
 SFX_Muted_Snare3_1::
-	audio SFX_Muted_Snare3_1, Ch7
+	audio_header SFX_Muted_Snare3_1, Ch8
 
 SFX_Muted_Snare4_1::
-	audio SFX_Muted_Snare4_1, Ch7
+	audio_header SFX_Muted_Snare4_1, Ch8
 
 SFX_Cry00_1::
-	audio SFX_Cry00_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
 
 SFX_Cry01_1::
-	audio SFX_Cry01_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_1, Ch5, Ch6, Ch8
 
 SFX_Cry02_1::
-	audio SFX_Cry02_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_1, Ch5, Ch6, Ch8
 
 SFX_Cry03_1::
-	audio SFX_Cry03_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_1, Ch5, Ch6, Ch8
 
 SFX_Cry04_1::
-	audio SFX_Cry04_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_1, Ch5, Ch6, Ch8
 
 SFX_Cry05_1::
-	audio SFX_Cry05_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_1, Ch5, Ch6, Ch8
 
 SFX_Cry06_1::
-	audio SFX_Cry06_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_1, Ch5, Ch6, Ch8
 
 SFX_Cry07_1::
-	audio SFX_Cry07_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_1, Ch5, Ch6, Ch8
 
 SFX_Cry08_1::
-	audio SFX_Cry08_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_1, Ch5, Ch6, Ch8
 
 SFX_Cry09_1::
-	audio SFX_Cry09_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_1, Ch5, Ch6, Ch8
 
 SFX_Cry0A_1::
-	audio SFX_Cry0A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8
 
 SFX_Cry0B_1::
-	audio SFX_Cry0B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8
 
 SFX_Cry0C_1::
-	audio SFX_Cry0C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8
 
 SFX_Cry0D_1::
-	audio SFX_Cry0D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8
 
 SFX_Cry0E_1::
-	audio SFX_Cry0E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8
 
 SFX_Cry0F_1::
-	audio SFX_Cry0F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8
 
 SFX_Cry10_1::
-	audio SFX_Cry10_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_1, Ch5, Ch6, Ch8
 
 SFX_Cry11_1::
-	audio SFX_Cry11_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_1, Ch5, Ch6, Ch8
 
 SFX_Cry12_1::
-	audio SFX_Cry12_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_1, Ch5, Ch6, Ch8
 
 SFX_Cry13_1::
-	audio SFX_Cry13_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_1, Ch5, Ch6, Ch8
 
 SFX_Cry14_1::
-	audio SFX_Cry14_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_1, Ch5, Ch6, Ch8
 
 SFX_Cry15_1::
-	audio SFX_Cry15_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_1, Ch5, Ch6, Ch8
 
 SFX_Cry16_1::
-	audio SFX_Cry16_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_1, Ch5, Ch6, Ch8
 
 SFX_Cry17_1::
-	audio SFX_Cry17_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_1, Ch5, Ch6, Ch8
 
 SFX_Cry18_1::
-	audio SFX_Cry18_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_1, Ch5, Ch6, Ch8
 
 SFX_Cry19_1::
-	audio SFX_Cry19_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_1, Ch5, Ch6, Ch8
 
 SFX_Cry1A_1::
-	audio SFX_Cry1A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8
 
 SFX_Cry1B_1::
-	audio SFX_Cry1B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8
 
 SFX_Cry1C_1::
-	audio SFX_Cry1C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8
 
 SFX_Cry1D_1::
-	audio SFX_Cry1D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8
 
 SFX_Cry1E_1::
-	audio SFX_Cry1E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8
 
 SFX_Cry1F_1::
-	audio SFX_Cry1F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8
 
 SFX_Cry20_1::
-	audio SFX_Cry20_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_1, Ch5, Ch6, Ch8
 
 SFX_Cry21_1::
-	audio SFX_Cry21_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_1, Ch5, Ch6, Ch8
 
 SFX_Cry22_1::
-	audio SFX_Cry22_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_1, Ch5, Ch6, Ch8
 
 SFX_Cry23_1::
-	audio SFX_Cry23_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_1, Ch5, Ch6, Ch8
 
 SFX_Cry24_1::
-	audio SFX_Cry24_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_1, Ch5, Ch6, Ch8
 
 SFX_Cry25_1::
-	audio SFX_Cry25_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_1, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_1::
-	audio SFX_Get_Item1_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_1::
-	audio SFX_Get_Item2_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
 
 SFX_Tink_1::
-	audio SFX_Tink_1, Ch4
+	audio_header SFX_Tink_1, Ch5
 
 SFX_Heal_HP_1::
-	audio SFX_Heal_HP_1, Ch4
+	audio_header SFX_Heal_HP_1, Ch5
 
 SFX_Heal_Ailment_1::
-	audio SFX_Heal_Ailment_1, Ch4
+	audio_header SFX_Heal_Ailment_1, Ch5
 
 SFX_Start_Menu_1::
-	audio SFX_Start_Menu_1, Ch7
+	audio_header SFX_Start_Menu_1, Ch8
 
 SFX_Press_AB_1::
-	audio SFX_Press_AB_1, Ch4
+	audio_header SFX_Press_AB_1, Ch5
 
 SFX_Pokedex_Rating_1::
-	audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_1::
-	audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
 
 SFX_Poisoned_1::
-	audio SFX_Poisoned_1, Ch4
+	audio_header SFX_Poisoned_1, Ch5
 
 SFX_Trade_Machine_1::
-	audio SFX_Trade_Machine_1, Ch4
+	audio_header SFX_Trade_Machine_1, Ch5
 
 SFX_Turn_On_PC_1::
-	audio SFX_Turn_On_PC_1, Ch4
+	audio_header SFX_Turn_On_PC_1, Ch5
 
 SFX_Turn_Off_PC_1::
-	audio SFX_Turn_Off_PC_1, Ch4
+	audio_header SFX_Turn_Off_PC_1, Ch5
 
 SFX_Enter_PC_1::
-	audio SFX_Enter_PC_1, Ch4
+	audio_header SFX_Enter_PC_1, Ch5
 
 SFX_Shrink_1::
-	audio SFX_Shrink_1, Ch4
+	audio_header SFX_Shrink_1, Ch5
 
 SFX_Switch_1::
-	audio SFX_Switch_1, Ch4
+	audio_header SFX_Switch_1, Ch5
 
 SFX_Healing_Machine_1::
-	audio SFX_Healing_Machine_1, Ch4
+	audio_header SFX_Healing_Machine_1, Ch5
 
 SFX_Teleport_Exit1_1::
-	audio SFX_Teleport_Exit1_1, Ch4
+	audio_header SFX_Teleport_Exit1_1, Ch5
 
 SFX_Teleport_Enter1_1::
-	audio SFX_Teleport_Enter1_1, Ch4
+	audio_header SFX_Teleport_Enter1_1, Ch5
 
 SFX_Teleport_Exit2_1::
-	audio SFX_Teleport_Exit2_1, Ch4
+	audio_header SFX_Teleport_Exit2_1, Ch5
 
 SFX_Ledge_1::
-	audio SFX_Ledge_1, Ch4
+	audio_header SFX_Ledge_1, Ch5
 
 SFX_Teleport_Enter2_1::
-	audio SFX_Teleport_Enter2_1, Ch7
+	audio_header SFX_Teleport_Enter2_1, Ch8
 
 SFX_Fly_1::
-	audio SFX_Fly_1, Ch7
+	audio_header SFX_Fly_1, Ch8
 
 SFX_Denied_1::
-	audio SFX_Denied_1, Ch4, Ch5
+	audio_header SFX_Denied_1, Ch5, Ch6
 
 SFX_Arrow_Tiles_1::
-	audio SFX_Arrow_Tiles_1, Ch4
+	audio_header SFX_Arrow_Tiles_1, Ch5
 
 SFX_Push_Boulder_1::
-	audio SFX_Push_Boulder_1, Ch7
+	audio_header SFX_Push_Boulder_1, Ch8
 
 SFX_SS_Anne_Horn_1::
-	audio SFX_SS_Anne_Horn_1, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
 
 SFX_Withdraw_Deposit_1::
-	audio SFX_Withdraw_Deposit_1, Ch4
+	audio_header SFX_Withdraw_Deposit_1, Ch5
 
 SFX_Cut_1::
-	audio SFX_Cut_1, Ch7
+	audio_header SFX_Cut_1, Ch8
 
 SFX_Go_Inside_1::
-	audio SFX_Go_Inside_1, Ch7
+	audio_header SFX_Go_Inside_1, Ch8
 
 SFX_Swap_1::
-	audio SFX_Swap_1, Ch4, Ch5
+	audio_header SFX_Swap_1, Ch5, Ch6
 
 SFX_59_1::
-	audio SFX_59_1, Ch4, Ch5
+	audio_header SFX_59_1, Ch5, Ch6
 
 SFX_Purchase_1::
-	audio SFX_Purchase_1, Ch4, Ch5
+	audio_header SFX_Purchase_1, Ch5, Ch6
 
 SFX_Collision_1::
-	audio SFX_Collision_1, Ch4
+	audio_header SFX_Collision_1, Ch5
 
 SFX_Go_Outside_1::
-	audio SFX_Go_Outside_1, Ch7
+	audio_header SFX_Go_Outside_1, Ch8
 
 SFX_Save_1::
-	audio SFX_Save_1, Ch4, Ch5
+	audio_header SFX_Save_1, Ch5, Ch6
 
-; the Pokeflute sound effect directly hijacks channel 2
+; the Pokeflute sound effect directly hijacks channel 3
 SFX_Pokeflute::
-	audio SFX_Pokeflute, Ch2
+	audio_header SFX_Pokeflute, Ch3
 
 SFX_Safari_Zone_PA::
-	audio SFX_Safari_Zone_PA, Ch4
+	audio_header SFX_Safari_Zone_PA, Ch5
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index b96a764f..7e76325d 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -2,358 +2,358 @@ SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_2::
-	audio SFX_Snare1_2, Ch7
+	audio_header SFX_Snare1_2, Ch8
 
 SFX_Snare2_2::
-	audio SFX_Snare2_2, Ch7
+	audio_header SFX_Snare2_2, Ch8
 
 SFX_Snare3_2::
-	audio SFX_Snare3_2, Ch7
+	audio_header SFX_Snare3_2, Ch8
 
 SFX_Snare4_2::
-	audio SFX_Snare4_2, Ch7
+	audio_header SFX_Snare4_2, Ch8
 
 SFX_Snare5_2::
-	audio SFX_Snare5_2, Ch7
+	audio_header SFX_Snare5_2, Ch8
 
 SFX_Triangle1_2::
-	audio SFX_Triangle1_2, Ch7
+	audio_header SFX_Triangle1_2, Ch8
 
 SFX_Triangle2_2::
-	audio SFX_Triangle2_2, Ch7
+	audio_header SFX_Triangle2_2, Ch8
 
 SFX_Snare6_2::
-	audio SFX_Snare6_2, Ch7
+	audio_header SFX_Snare6_2, Ch8
 
 SFX_Snare7_2::
-	audio SFX_Snare7_2, Ch7
+	audio_header SFX_Snare7_2, Ch8
 
 SFX_Snare8_2::
-	audio SFX_Snare8_2, Ch7
+	audio_header SFX_Snare8_2, Ch8
 
 SFX_Snare9_2::
-	audio SFX_Snare9_2, Ch7
+	audio_header SFX_Snare9_2, Ch8
 
 SFX_Cymbal1_2::
-	audio SFX_Cymbal1_2, Ch7
+	audio_header SFX_Cymbal1_2, Ch8
 
 SFX_Cymbal2_2::
-	audio SFX_Cymbal2_2, Ch7
+	audio_header SFX_Cymbal2_2, Ch8
 
 SFX_Cymbal3_2::
-	audio SFX_Cymbal3_2, Ch7
+	audio_header SFX_Cymbal3_2, Ch8
 
 SFX_Muted_Snare1_2::
-	audio SFX_Muted_Snare1_2, Ch7
+	audio_header SFX_Muted_Snare1_2, Ch8
 
 SFX_Triangle3_2::
-	audio SFX_Triangle3_2, Ch7
+	audio_header SFX_Triangle3_2, Ch8
 
 SFX_Muted_Snare2_2::
-	audio SFX_Muted_Snare2_2, Ch7
+	audio_header SFX_Muted_Snare2_2, Ch8
 
 SFX_Muted_Snare3_2::
-	audio SFX_Muted_Snare3_2, Ch7
+	audio_header SFX_Muted_Snare3_2, Ch8
 
 SFX_Muted_Snare4_2::
-	audio SFX_Muted_Snare4_2, Ch7
+	audio_header SFX_Muted_Snare4_2, Ch8
 
 SFX_Cry00_2::
-	audio SFX_Cry00_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_2, Ch5, Ch6, Ch8
 
 SFX_Cry01_2::
-	audio SFX_Cry01_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_2, Ch5, Ch6, Ch8
 
 SFX_Cry02_2::
-	audio SFX_Cry02_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_2, Ch5, Ch6, Ch8
 
 SFX_Cry03_2::
-	audio SFX_Cry03_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_2, Ch5, Ch6, Ch8
 
 SFX_Cry04_2::
-	audio SFX_Cry04_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_2, Ch5, Ch6, Ch8
 
 SFX_Cry05_2::
-	audio SFX_Cry05_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_2, Ch5, Ch6, Ch8
 
 SFX_Cry06_2::
-	audio SFX_Cry06_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_2, Ch5, Ch6, Ch8
 
 SFX_Cry07_2::
-	audio SFX_Cry07_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_2, Ch5, Ch6, Ch8
 
 SFX_Cry08_2::
-	audio SFX_Cry08_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_2, Ch5, Ch6, Ch8
 
 SFX_Cry09_2::
-	audio SFX_Cry09_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_2, Ch5, Ch6, Ch8
 
 SFX_Cry0A_2::
-	audio SFX_Cry0A_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8
 
 SFX_Cry0B_2::
-	audio SFX_Cry0B_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8
 
 SFX_Cry0C_2::
-	audio SFX_Cry0C_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8
 
 SFX_Cry0D_2::
-	audio SFX_Cry0D_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8
 
 SFX_Cry0E_2::
-	audio SFX_Cry0E_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8
 
 SFX_Cry0F_2::
-	audio SFX_Cry0F_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8
 
 SFX_Cry10_2::
-	audio SFX_Cry10_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_2, Ch5, Ch6, Ch8
 
 SFX_Cry11_2::
-	audio SFX_Cry11_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_2, Ch5, Ch6, Ch8
 
 SFX_Cry12_2::
-	audio SFX_Cry12_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_2, Ch5, Ch6, Ch8
 
 SFX_Cry13_2::
-	audio SFX_Cry13_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_2, Ch5, Ch6, Ch8
 
 SFX_Cry14_2::
-	audio SFX_Cry14_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_2, Ch5, Ch6, Ch8
 
 SFX_Cry15_2::
-	audio SFX_Cry15_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_2, Ch5, Ch6, Ch8
 
 SFX_Cry16_2::
-	audio SFX_Cry16_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_2, Ch5, Ch6, Ch8
 
 SFX_Cry17_2::
-	audio SFX_Cry17_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_2, Ch5, Ch6, Ch8
 
 SFX_Cry18_2::
-	audio SFX_Cry18_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_2, Ch5, Ch6, Ch8
 
 SFX_Cry19_2::
-	audio SFX_Cry19_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_2, Ch5, Ch6, Ch8
 
 SFX_Cry1A_2::
-	audio SFX_Cry1A_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8
 
 SFX_Cry1B_2::
-	audio SFX_Cry1B_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8
 
 SFX_Cry1C_2::
-	audio SFX_Cry1C_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8
 
 SFX_Cry1D_2::
-	audio SFX_Cry1D_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8
 
 SFX_Cry1E_2::
-	audio SFX_Cry1E_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8
 
 SFX_Cry1F_2::
-	audio SFX_Cry1F_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8
 
 SFX_Cry20_2::
-	audio SFX_Cry20_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_2, Ch5, Ch6, Ch8
 
 SFX_Cry21_2::
-	audio SFX_Cry21_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_2, Ch5, Ch6, Ch8
 
 SFX_Cry22_2::
-	audio SFX_Cry22_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_2, Ch5, Ch6, Ch8
 
 SFX_Cry23_2::
-	audio SFX_Cry23_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_2, Ch5, Ch6, Ch8
 
 SFX_Cry24_2::
-	audio SFX_Cry24_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_2, Ch5, Ch6, Ch8
 
 SFX_Cry25_2::
-	audio SFX_Cry25_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_2, Ch5, Ch6, Ch8
 
 SFX_Level_Up::
-	audio SFX_Level_Up, Ch4, Ch5, Ch6
+	audio_header SFX_Level_Up, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_2::
-	audio SFX_Get_Item2_2, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7
 
 SFX_Tink_2::
-	audio SFX_Tink_2, Ch4
+	audio_header SFX_Tink_2, Ch5
 
 SFX_Heal_HP_2::
-	audio SFX_Heal_HP_2, Ch4
+	audio_header SFX_Heal_HP_2, Ch5
 
 SFX_Heal_Ailment_2::
-	audio SFX_Heal_Ailment_2, Ch4
+	audio_header SFX_Heal_Ailment_2, Ch5
 
 SFX_Start_Menu_2::
-	audio SFX_Start_Menu_2, Ch7
+	audio_header SFX_Start_Menu_2, Ch8
 
 SFX_Press_AB_2::
-	audio SFX_Press_AB_2, Ch4
+	audio_header SFX_Press_AB_2, Ch5
 
 SFX_Ball_Toss::
-	audio SFX_Ball_Toss, Ch4, Ch5
+	audio_header SFX_Ball_Toss, Ch5, Ch6
 
 SFX_Ball_Poof::
-	audio SFX_Ball_Poof, Ch4, Ch7
+	audio_header SFX_Ball_Poof, Ch5, Ch8
 
 SFX_Faint_Thud::
-	audio SFX_Faint_Thud, Ch4, Ch7
+	audio_header SFX_Faint_Thud, Ch5, Ch8
 
 SFX_Run::
-	audio SFX_Run, Ch7
+	audio_header SFX_Run, Ch8
 
 SFX_Dex_Page_Added::
-	audio SFX_Dex_Page_Added, Ch4, Ch5
+	audio_header SFX_Dex_Page_Added, Ch5, Ch6
 
 SFX_Caught_Mon::
-	audio SFX_Caught_Mon, Ch4, Ch5, Ch6
+	audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7
 
 SFX_Peck::
-	audio SFX_Peck, Ch7
+	audio_header SFX_Peck, Ch8
 
 SFX_Faint_Fall::
-	audio SFX_Faint_Fall, Ch4
+	audio_header SFX_Faint_Fall, Ch5
 
 SFX_Battle_09::
-	audio SFX_Battle_09, Ch4
+	audio_header SFX_Battle_09, Ch5
 
 SFX_Pound::
-	audio SFX_Pound, Ch7
+	audio_header SFX_Pound, Ch8
 
 SFX_Battle_0B::
-	audio SFX_Battle_0B, Ch7
+	audio_header SFX_Battle_0B, Ch8
 
 SFX_Battle_0C::
-	audio SFX_Battle_0C, Ch7
+	audio_header SFX_Battle_0C, Ch8
 
 SFX_Battle_0D::
-	audio SFX_Battle_0D, Ch7
+	audio_header SFX_Battle_0D, Ch8
 
 SFX_Battle_0E::
-	audio SFX_Battle_0E, Ch7
+	audio_header SFX_Battle_0E, Ch8
 
 SFX_Battle_0F::
-	audio SFX_Battle_0F, Ch7
+	audio_header SFX_Battle_0F, Ch8
 
 SFX_Damage::
-	audio SFX_Damage, Ch7
+	audio_header SFX_Damage, Ch8
 
 SFX_Not_Very_Effective::
-	audio SFX_Not_Very_Effective, Ch7
+	audio_header SFX_Not_Very_Effective, Ch8
 
 SFX_Battle_12::
-	audio SFX_Battle_12, Ch7
+	audio_header SFX_Battle_12, Ch8
 
 SFX_Battle_13::
-	audio SFX_Battle_13, Ch7
+	audio_header SFX_Battle_13, Ch8
 
 SFX_Battle_14::
-	audio SFX_Battle_14, Ch7
+	audio_header SFX_Battle_14, Ch8
 
 SFX_Vine_Whip::
-	audio SFX_Vine_Whip, Ch7
+	audio_header SFX_Vine_Whip, Ch8
 
 SFX_Battle_16::
-	audio SFX_Battle_16, Ch7
+	audio_header SFX_Battle_16, Ch8
 
 SFX_Battle_17::
-	audio SFX_Battle_17, Ch7
+	audio_header SFX_Battle_17, Ch8
 
 SFX_Battle_18::
-	audio SFX_Battle_18, Ch7
+	audio_header SFX_Battle_18, Ch8
 
 SFX_Battle_19::
-	audio SFX_Battle_19, Ch7
+	audio_header SFX_Battle_19, Ch8
 
 SFX_Super_Effective::
-	audio SFX_Super_Effective, Ch7
+	audio_header SFX_Super_Effective, Ch8
 
 SFX_Battle_1B::
-	audio SFX_Battle_1B, Ch7
+	audio_header SFX_Battle_1B, Ch8
 
 SFX_Battle_1C::
-	audio SFX_Battle_1C, Ch7
+	audio_header SFX_Battle_1C, Ch8
 
 SFX_Doubleslap::
-	audio SFX_Doubleslap, Ch7
+	audio_header SFX_Doubleslap, Ch8
 
 SFX_Battle_1E::
-	audio SFX_Battle_1E, Ch4, Ch7
+	audio_header SFX_Battle_1E, Ch5, Ch8
 
 SFX_Horn_Drill::
-	audio SFX_Horn_Drill, Ch7
+	audio_header SFX_Horn_Drill, Ch8
 
 SFX_Battle_20::
-	audio SFX_Battle_20, Ch7
+	audio_header SFX_Battle_20, Ch8
 
 SFX_Battle_21::
-	audio SFX_Battle_21, Ch7
+	audio_header SFX_Battle_21, Ch8
 
 SFX_Battle_22::
-	audio SFX_Battle_22, Ch7
+	audio_header SFX_Battle_22, Ch8
 
 SFX_Battle_23::
-	audio SFX_Battle_23, Ch7
+	audio_header SFX_Battle_23, Ch8
 
 SFX_Battle_24::
-	audio SFX_Battle_24, Ch4, Ch7
+	audio_header SFX_Battle_24, Ch5, Ch8
 
 SFX_Battle_25::
-	audio SFX_Battle_25, Ch7
+	audio_header SFX_Battle_25, Ch8
 
 SFX_Battle_26::
-	audio SFX_Battle_26, Ch7
+	audio_header SFX_Battle_26, Ch8
 
 SFX_Battle_27::
-	audio SFX_Battle_27, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_27, Ch5, Ch6, Ch8
 
 SFX_Battle_28::
-	audio SFX_Battle_28, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_28, Ch5, Ch6, Ch8
 
 SFX_Battle_29::
-	audio SFX_Battle_29, Ch4, Ch7
+	audio_header SFX_Battle_29, Ch5, Ch8
 
 SFX_Battle_2A::
-	audio SFX_Battle_2A, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2A, Ch5, Ch6, Ch8
 
 SFX_Battle_2B::
-	audio SFX_Battle_2B, Ch4, Ch7
+	audio_header SFX_Battle_2B, Ch5, Ch8
 
 SFX_Battle_2C::
-	audio SFX_Battle_2C, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2C, Ch5, Ch6, Ch8
 
 SFX_Psybeam::
-	audio SFX_Psybeam, Ch4, Ch5, Ch7
+	audio_header SFX_Psybeam, Ch5, Ch6, Ch8
 
 SFX_Battle_2E::
-	audio SFX_Battle_2E, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2E, Ch5, Ch6, Ch8
 
 SFX_Battle_2F::
-	audio SFX_Battle_2F, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2F, Ch5, Ch6, Ch8
 
 SFX_Psychic_M::
-	audio SFX_Psychic_M, Ch4, Ch5, Ch7
+	audio_header SFX_Psychic_M, Ch5, Ch6, Ch8
 
 SFX_Battle_31::
-	audio SFX_Battle_31, Ch4, Ch5
+	audio_header SFX_Battle_31, Ch5, Ch6
 
 SFX_Battle_32::
-	audio SFX_Battle_32, Ch4, Ch5
+	audio_header SFX_Battle_32, Ch5, Ch6
 
 SFX_Battle_33::
-	audio SFX_Battle_33, Ch4, Ch5
+	audio_header SFX_Battle_33, Ch5, Ch6
 
 SFX_Battle_34::
-	audio SFX_Battle_34, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_34, Ch5, Ch6, Ch8
 
 SFX_Battle_35::
-	audio SFX_Battle_35, Ch4, Ch5
+	audio_header SFX_Battle_35, Ch5, Ch6
 
 SFX_Battle_36::
-	audio SFX_Battle_36, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_36, Ch5, Ch6, Ch8
 
 SFX_Silph_Scope::
-	audio SFX_Silph_Scope, Ch4
+	audio_header SFX_Silph_Scope, Ch5
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 19a19272..6fb67546 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,310 +2,310 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_3::
-	audio SFX_Snare1_3, Ch7
+	audio_header SFX_Snare1_3, Ch8
 
 SFX_Snare2_3::
-	audio SFX_Snare2_3, Ch7
+	audio_header SFX_Snare2_3, Ch8
 
 SFX_Snare3_3::
-	audio SFX_Snare3_3, Ch7
+	audio_header SFX_Snare3_3, Ch8
 
 SFX_Snare4_3::
-	audio SFX_Snare4_3, Ch7
+	audio_header SFX_Snare4_3, Ch8
 
 SFX_Snare5_3::
-	audio SFX_Snare5_3, Ch7
+	audio_header SFX_Snare5_3, Ch8
 
 SFX_Triangle1_3::
-	audio SFX_Triangle1_3, Ch7
+	audio_header SFX_Triangle1_3, Ch8
 
 SFX_Triangle2_3::
-	audio SFX_Triangle2_3, Ch7
+	audio_header SFX_Triangle2_3, Ch8
 
 SFX_Snare6_3::
-	audio SFX_Snare6_3, Ch7
+	audio_header SFX_Snare6_3, Ch8
 
 SFX_Snare7_3::
-	audio SFX_Snare7_3, Ch7
+	audio_header SFX_Snare7_3, Ch8
 
 SFX_Snare8_3::
-	audio SFX_Snare8_3, Ch7
+	audio_header SFX_Snare8_3, Ch8
 
 SFX_Snare9_3::
-	audio SFX_Snare9_3, Ch7
+	audio_header SFX_Snare9_3, Ch8
 
 SFX_Cymbal1_3::
-	audio SFX_Cymbal1_3, Ch7
+	audio_header SFX_Cymbal1_3, Ch8
 
 SFX_Cymbal2_3::
-	audio SFX_Cymbal2_3, Ch7
+	audio_header SFX_Cymbal2_3, Ch8
 
 SFX_Cymbal3_3::
-	audio SFX_Cymbal3_3, Ch7
+	audio_header SFX_Cymbal3_3, Ch8
 
 SFX_Muted_Snare1_3::
-	audio SFX_Muted_Snare1_3, Ch7
+	audio_header SFX_Muted_Snare1_3, Ch8
 
 SFX_Triangle3_3::
-	audio SFX_Triangle3_3, Ch7
+	audio_header SFX_Triangle3_3, Ch8
 
 SFX_Muted_Snare2_3::
-	audio SFX_Muted_Snare2_3, Ch7
+	audio_header SFX_Muted_Snare2_3, Ch8
 
 SFX_Muted_Snare3_3::
-	audio SFX_Muted_Snare3_3, Ch7
+	audio_header SFX_Muted_Snare3_3, Ch8
 
 SFX_Muted_Snare4_3::
-	audio SFX_Muted_Snare4_3, Ch7
+	audio_header SFX_Muted_Snare4_3, Ch8
 
 SFX_Cry00_3::
-	audio SFX_Cry00_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
 
 SFX_Cry01_3::
-	audio SFX_Cry01_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_3, Ch5, Ch6, Ch8
 
 SFX_Cry02_3::
-	audio SFX_Cry02_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_3, Ch5, Ch6, Ch8
 
 SFX_Cry03_3::
-	audio SFX_Cry03_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_3, Ch5, Ch6, Ch8
 
 SFX_Cry04_3::
-	audio SFX_Cry04_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_3, Ch5, Ch6, Ch8
 
 SFX_Cry05_3::
-	audio SFX_Cry05_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_3, Ch5, Ch6, Ch8
 
 SFX_Cry06_3::
-	audio SFX_Cry06_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_3, Ch5, Ch6, Ch8
 
 SFX_Cry07_3::
-	audio SFX_Cry07_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_3, Ch5, Ch6, Ch8
 
 SFX_Cry08_3::
-	audio SFX_Cry08_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_3, Ch5, Ch6, Ch8
 
 SFX_Cry09_3::
-	audio SFX_Cry09_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_3, Ch5, Ch6, Ch8
 
 SFX_Cry0A_3::
-	audio SFX_Cry0A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8
 
 SFX_Cry0B_3::
-	audio SFX_Cry0B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8
 
 SFX_Cry0C_3::
-	audio SFX_Cry0C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8
 
 SFX_Cry0D_3::
-	audio SFX_Cry0D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8
 
 SFX_Cry0E_3::
-	audio SFX_Cry0E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8
 
 SFX_Cry0F_3::
-	audio SFX_Cry0F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8
 
 SFX_Cry10_3::
-	audio SFX_Cry10_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_3, Ch5, Ch6, Ch8
 
 SFX_Cry11_3::
-	audio SFX_Cry11_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_3, Ch5, Ch6, Ch8
 
 SFX_Cry12_3::
-	audio SFX_Cry12_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_3, Ch5, Ch6, Ch8
 
 SFX_Cry13_3::
-	audio SFX_Cry13_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_3, Ch5, Ch6, Ch8
 
 SFX_Cry14_3::
-	audio SFX_Cry14_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_3, Ch5, Ch6, Ch8
 
 SFX_Cry15_3::
-	audio SFX_Cry15_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_3, Ch5, Ch6, Ch8
 
 SFX_Cry16_3::
-	audio SFX_Cry16_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_3, Ch5, Ch6, Ch8
 
 SFX_Cry17_3::
-	audio SFX_Cry17_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_3, Ch5, Ch6, Ch8
 
 SFX_Cry18_3::
-	audio SFX_Cry18_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_3, Ch5, Ch6, Ch8
 
 SFX_Cry19_3::
-	audio SFX_Cry19_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_3, Ch5, Ch6, Ch8
 
 SFX_Cry1A_3::
-	audio SFX_Cry1A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8
 
 SFX_Cry1B_3::
-	audio SFX_Cry1B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8
 
 SFX_Cry1C_3::
-	audio SFX_Cry1C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8
 
 SFX_Cry1D_3::
-	audio SFX_Cry1D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8
 
 SFX_Cry1E_3::
-	audio SFX_Cry1E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8
 
 SFX_Cry1F_3::
-	audio SFX_Cry1F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8
 
 SFX_Cry20_3::
-	audio SFX_Cry20_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_3, Ch5, Ch6, Ch8
 
 SFX_Cry21_3::
-	audio SFX_Cry21_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_3, Ch5, Ch6, Ch8
 
 SFX_Cry22_3::
-	audio SFX_Cry22_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_3, Ch5, Ch6, Ch8
 
 SFX_Cry23_3::
-	audio SFX_Cry23_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_3, Ch5, Ch6, Ch8
 
 SFX_Cry24_3::
-	audio SFX_Cry24_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_3, Ch5, Ch6, Ch8
 
 SFX_Cry25_3::
-	audio SFX_Cry25_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_3, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_3::
-	audio SFX_Get_Item1_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_3::
-	audio SFX_Get_Item2_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7
 
 SFX_Tink_3::
-	audio SFX_Tink_3, Ch4
+	audio_header SFX_Tink_3, Ch5
 
 SFX_Heal_HP_3::
-	audio SFX_Heal_HP_3, Ch4
+	audio_header SFX_Heal_HP_3, Ch5
 
 SFX_Heal_Ailment_3::
-	audio SFX_Heal_Ailment_3, Ch4
+	audio_header SFX_Heal_Ailment_3, Ch5
 
 SFX_Start_Menu_3::
-	audio SFX_Start_Menu_3, Ch7
+	audio_header SFX_Start_Menu_3, Ch8
 
 SFX_Press_AB_3::
-	audio SFX_Press_AB_3, Ch4
+	audio_header SFX_Press_AB_3, Ch5
 
 SFX_Pokedex_Rating_3::
-	audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_3::
-	audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7
 
 SFX_Poisoned_3::
-	audio SFX_Poisoned_3, Ch4
+	audio_header SFX_Poisoned_3, Ch5
 
 SFX_Trade_Machine_3::
-	audio SFX_Trade_Machine_3, Ch4
+	audio_header SFX_Trade_Machine_3, Ch5
 
 SFX_Turn_On_PC_3::
-	audio SFX_Turn_On_PC_3, Ch4
+	audio_header SFX_Turn_On_PC_3, Ch5
 
 SFX_Turn_Off_PC_3::
-	audio SFX_Turn_Off_PC_3, Ch4
+	audio_header SFX_Turn_Off_PC_3, Ch5
 
 SFX_Enter_PC_3::
-	audio SFX_Enter_PC_3, Ch4
+	audio_header SFX_Enter_PC_3, Ch5
 
 SFX_Shrink_3::
-	audio SFX_Shrink_3, Ch4
+	audio_header SFX_Shrink_3, Ch5
 
 SFX_Switch_3::
-	audio SFX_Switch_3, Ch4
+	audio_header SFX_Switch_3, Ch5
 
 SFX_Healing_Machine_3::
-	audio SFX_Healing_Machine_3, Ch4
+	audio_header SFX_Healing_Machine_3, Ch5
 
 SFX_Teleport_Exit1_3::
-	audio SFX_Teleport_Exit1_3, Ch4
+	audio_header SFX_Teleport_Exit1_3, Ch5
 
 SFX_Teleport_Enter1_3::
-	audio SFX_Teleport_Enter1_3, Ch4
+	audio_header SFX_Teleport_Enter1_3, Ch5
 
 SFX_Teleport_Exit2_3::
-	audio SFX_Teleport_Exit2_3, Ch4
+	audio_header SFX_Teleport_Exit2_3, Ch5
 
 SFX_Ledge_3::
-	audio SFX_Ledge_3, Ch4
+	audio_header SFX_Ledge_3, Ch5
 
 SFX_Teleport_Enter2_3::
-	audio SFX_Teleport_Enter2_3, Ch7
+	audio_header SFX_Teleport_Enter2_3, Ch8
 
 SFX_Fly_3::
-	audio SFX_Fly_3, Ch7
+	audio_header SFX_Fly_3, Ch8
 
 SFX_Denied_3::
-	audio SFX_Denied_3, Ch4, Ch5
+	audio_header SFX_Denied_3, Ch5, Ch6
 
 SFX_Arrow_Tiles_3::
-	audio SFX_Arrow_Tiles_3, Ch4
+	audio_header SFX_Arrow_Tiles_3, Ch5
 
 SFX_Push_Boulder_3::
-	audio SFX_Push_Boulder_3, Ch7
+	audio_header SFX_Push_Boulder_3, Ch8
 
 SFX_SS_Anne_Horn_3::
-	audio SFX_SS_Anne_Horn_3, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6
 
 SFX_Withdraw_Deposit_3::
-	audio SFX_Withdraw_Deposit_3, Ch4
+	audio_header SFX_Withdraw_Deposit_3, Ch5
 
 SFX_Cut_3::
-	audio SFX_Cut_3, Ch7
+	audio_header SFX_Cut_3, Ch8
 
 SFX_Go_Inside_3::
-	audio SFX_Go_Inside_3, Ch7
+	audio_header SFX_Go_Inside_3, Ch8
 
 SFX_Swap_3::
-	audio SFX_Swap_3, Ch4, Ch5
+	audio_header SFX_Swap_3, Ch5, Ch6
 
 SFX_59_3::
-	audio SFX_59_3, Ch4, Ch5
+	audio_header SFX_59_3, Ch5, Ch6
 
 SFX_Purchase_3::
-	audio SFX_Purchase_3, Ch4, Ch5
+	audio_header SFX_Purchase_3, Ch5, Ch6
 
 SFX_Collision_3::
-	audio SFX_Collision_3, Ch4
+	audio_header SFX_Collision_3, Ch5
 
 SFX_Go_Outside_3::
-	audio SFX_Go_Outside_3, Ch7
+	audio_header SFX_Go_Outside_3, Ch8
 
 SFX_Save_3::
-	audio SFX_Save_3, Ch4, Ch5
+	audio_header SFX_Save_3, Ch5, Ch6
 
 SFX_Intro_Lunge::
-	audio SFX_Intro_Lunge, Ch7
+	audio_header SFX_Intro_Lunge, Ch8
 
 SFX_Intro_Hip::
-	audio SFX_Intro_Hip, Ch4
+	audio_header SFX_Intro_Hip, Ch5
 
 SFX_Intro_Hop::
-	audio SFX_Intro_Hop, Ch4
+	audio_header SFX_Intro_Hop, Ch5
 
 SFX_Intro_Raise::
-	audio SFX_Intro_Raise, Ch7
+	audio_header SFX_Intro_Raise, Ch8
 
 SFX_Intro_Crash::
-	audio SFX_Intro_Crash, Ch7
+	audio_header SFX_Intro_Crash, Ch8
 
 SFX_Intro_Whoosh::
-	audio SFX_Intro_Whoosh, Ch7
+	audio_header SFX_Intro_Whoosh, Ch8
 
 SFX_Slots_Stop_Wheel::
-	audio SFX_Slots_Stop_Wheel, Ch4
+	audio_header SFX_Slots_Stop_Wheel, Ch5
 
 SFX_Slots_Reward::
-	audio SFX_Slots_Reward, Ch4
+	audio_header SFX_Slots_Reward, Ch5
 
 SFX_Slots_New_Spin::
-	audio SFX_Slots_New_Spin, Ch4, Ch5
+	audio_header SFX_Slots_New_Spin, Ch5, Ch6
 
 SFX_Shooting_Star::
-	audio SFX_Shooting_Star, Ch4
+	audio_header SFX_Shooting_Star, Ch5
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 87c7b5c2..58f1b7a5 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -1,673 +1,673 @@
-Music_BikeRiding_Ch0::
+Music_BikeRiding_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 1, 4
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	G_ 2
+	note G_, 2
 
 Music_BikeRiding_branch_7dbc9::
 	octave 4
-	C_ 4
-	D_ 4
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	F_ 4
-	E_ 2
-	D_ 2
-	F_ 4
-	D_ 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note F_, 4
+	note D_, 4
 	octave 3
-	B_ 2
-	octave 4
-	F_ 4
-	D_ 4
-	E_ 2
-	F_ 2
-	G_ 2
-	C_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	E_ 2
-	notetype 12, 11, 6
-	F_ 10
-	notetype 12, 10, 6
-	F_ 2
-	E_ 2
-	F_ 2
-	G_ 10
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 6
-	toggleperfectpitch
-	notetype 12, 11, 3
-	E_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F_ 2
-	E_ 1
-	F_ 1
-	toggleperfectpitch
-	notetype 12, 11, 5
-	G_ 6
-	G_ 6
-	A_ 2
-	F_ 2
-	G_ 6
-	notetype 12, 11, 4
-	G_ 2
-	F_ 4
-	notetype 12, 10, 4
-	E_ 2
-	D_ 2
-	notetype 12, 9, 3
+	note B_, 2
+	octave 4
+	note F_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note_type 12, 11, 6
+	note F_, 10
+	note_type 12, 10, 6
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 10
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 6
+	toggle_perfect_pitch
+	note_type 12, 11, 3
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note E_, 1
+	note F_, 1
+	toggle_perfect_pitch
+	note_type 12, 11, 5
+	note G_, 6
+	note G_, 6
+	note A_, 2
+	note F_, 2
+	note G_, 6
+	note_type 12, 11, 4
+	note G_, 2
+	note F_, 4
+	note_type 12, 10, 4
+	note E_, 2
+	note D_, 2
+	note_type 12, 9, 3
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C_ 4
-	C_ 2
+	note C_, 4
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 1
-	B_ 1
-	A_ 2
-	B_ 2
-	octave 4
-	C_ 2
-	C_ 4
-	C_ 2
+	note B_, 2
+	note A_, 1
+	note B_, 1
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note C_, 4
+	note C_, 2
 	octave 3
-	A_ 2
-	B_ 2
-	B_ 2
-	A_ 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note A_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 2
-	B_ 1
+	note A_, 2
+	note B_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	D_ 1
+	note C_, 1
+	note D_, 1
 	octave 3
-	B_ 1
-	octave 4
-	C_ 4
-	notetype 12, 3, 13
-	C_ 4
-	notetype 12, 11, 4
-	F_ 6
-	G_ 4
-	F_ 1
-	G_ 1
-	F_ 4
-	E_ 6
-	F_ 2
-	E_ 2
-	D_ 1
-	E_ 1
-	D_ 2
-	C_ 2
-	notetype 12, 11, 5
+	note B_, 1
+	octave 4
+	note C_, 4
+	note_type 12, 3, 13
+	note C_, 4
+	note_type 12, 11, 4
+	note F_, 6
+	note G_, 4
+	note F_, 1
+	note G_, 1
+	note F_, 4
+	note E_, 6
+	note F_, 2
+	note E_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 2
+	note C_, 2
+	note_type 12, 11, 5
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	C_ 4
-	F_ 4
-	D_ 4
-	F# 4
+	note E_, 4
+	note C_, 4
+	note F_, 4
+	note D_, 4
+	note F#, 4
 	vibrato 10, 2, 6
-	notetype 12, 8, 0
-	G_ 16
-	G_ 4
-	notetype 12, 8, 7
-	G_ 12
-	notetype 12, 11, 5
+	note_type 12, 8, 0
+	note G_, 16
+	note G_, 4
+	note_type 12, 8, 7
+	note G_, 12
+	note_type 12, 11, 5
 	vibrato 8, 1, 4
-	loopchannel 0, Music_BikeRiding_branch_7dbc9
+	sound_loop 0, Music_BikeRiding_branch_7dbc9
 
 
-Music_BikeRiding_Ch1::
-	duty 2
+Music_BikeRiding_Ch2::
+	duty_cycle 2
 	vibrato 6, 1, 5
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 	octave 4
-	C_ 2
+	note C_, 2
 
 Music_BikeRiding_branch_7dc75::
-	E_ 4
-	F_ 4
-	G_ 4
+	note E_, 4
+	note F_, 4
+	note G_, 4
 	octave 5
-	C_ 4
-	octave 4
-	B_ 6
-	A_ 1
-	B_ 1
-	A_ 10
-	F_ 2
-	G_ 2
-	A_ 2
+	note C_, 4
+	octave 4
+	note B_, 6
+	note A_, 1
+	note B_, 1
+	note A_, 10
+	note F_, 2
+	note G_, 2
+	note A_, 2
 	octave 5
-	D_ 2
-	C_ 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 1
-	B_ 1
+	note B_, 2
+	note A_, 1
+	note B_, 1
 	octave 5
-	C_ 6
-	octave 4
-	A_ 2
-	G_ 4
-	duty 3
-	notetype 12, 8, 4
-	A# 6
-	duty 2
-	notetype 12, 12, 5
+	note C_, 6
+	octave 4
+	note A_, 2
+	note G_, 4
+	duty_cycle 3
+	note_type 12, 8, 4
+	note A#, 6
+	duty_cycle 2
+	note_type 12, 12, 5
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	A_ 10
+	note A_, 10
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 10
-	notetype 12, 12, 3
+	note G_, 10
+	note_type 12, 12, 3
 	octave 5
-	C_ 4
-	E_ 2
-	D_ 2
-	C_ 2
+	note C_, 4
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
-	notetype 12, 11, 0
-	D_ 4
-	notetype 12, 12, 7
-	D_ 10
-	D_ 1
-	C_ 1
-	notetype 12, 11, 0
-	octave 4
-	B_ 4
-	notetype 12, 12, 7
-	B_ 12
-	notetype 12, 12, 4
-	F_ 6
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 6
-	E_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	F_ 2
-	G_ 4
-	A_ 2
-	F_ 2
-	E_ 2
-	G_ 4
-	F_ 2
-	E_ 6
-	notetype 6, 12, 2
-	F_ 1
-	G_ 1
-	A_ 1
-	B_ 1
-	notetype 12, 12, 3
+	note C_, 2
+	note_type 12, 11, 0
+	note D_, 4
+	note_type 12, 12, 7
+	note D_, 10
+	note D_, 1
+	note C_, 1
+	note_type 12, 11, 0
+	octave 4
+	note B_, 4
+	note_type 12, 12, 7
+	note B_, 12
+	note_type 12, 12, 4
+	note F_, 6
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 6
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 4
+	note A_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 6
+	note_type 6, 12, 2
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note_type 12, 12, 3
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 5
-	C_ 2
-	octave 4
-	B_ 4
-	A_ 4
-	G_ 2
-	A# 4
-	A_ 2
-	G_ 4
-	F_ 2
-	E_ 2
-	notetype 8, 12, 4
-	A_ 4
-	G_ 4
-	F_ 4
-	B_ 4
-	A_ 4
-	G_ 4
+	note C_, 2
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note A#, 4
+	note A_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note_type 8, 12, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note B_, 4
+	note A_, 4
+	note G_, 4
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 5
-	D_ 4
-	E_ 4
-	C_ 4
-	notetype 12, 12, 7
-	D_ 12
-	C_ 4
-	notetype 12, 11, 0
-	octave 4
-	B_ 4
-	notetype 12, 12, 7
-	B_ 12
-	notetype 12, 12, 3
-	loopchannel 0, Music_BikeRiding_branch_7dc75
+	note D_, 4
+	note E_, 4
+	note C_, 4
+	note_type 12, 12, 7
+	note D_, 12
+	note C_, 4
+	note_type 12, 11, 0
+	octave 4
+	note B_, 4
+	note_type 12, 12, 7
+	note B_, 12
+	note_type 12, 12, 3
+	sound_loop 0, Music_BikeRiding_branch_7dc75
 
 
-Music_BikeRiding_Ch2::
-	notetype 12, 1, 3
+Music_BikeRiding_Ch3::
+	note_type 12, 1, 3
 	rest 2
 
 Music_BikeRiding_branch_7dd17::
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 3
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	loopchannel 0, Music_BikeRiding_branch_7dd17
+	sound_loop 0, Music_BikeRiding_branch_7dd17
 
 
-Music_BikeRiding_Ch3::
+Music_BikeRiding_Ch4::
 	dspeed 12
 	rest 2
 
 Music_BikeRiding_branch_7de6a::
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dec2
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dec2
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	loopchannel 0, Music_BikeRiding_branch_7de6a
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7deb4
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dec2
+	sound_call Music_BikeRiding_branch_7deb4
+	sound_call Music_BikeRiding_branch_7deb4
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7deb4
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dec2
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7deb4
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_call Music_BikeRiding_branch_7dea7
+	sound_loop 0, Music_BikeRiding_branch_7de6a
 
 Music_BikeRiding_branch_7dea7::
 	rest 2
@@ -678,7 +678,7 @@ Music_BikeRiding_branch_7dea7::
 	triangle3 2
 	rest 2
 	triangle3 2
-	endchannel
+	sound_ret
 
 Music_BikeRiding_branch_7deb4::
 	rest 2
@@ -689,7 +689,7 @@ Music_BikeRiding_branch_7deb4::
 	triangle3 2
 	triangle3 2
 	triangle3 2
-	endchannel
+	sound_ret
 
 Music_BikeRiding_branch_7dec2::
 	rest 2
@@ -701,4 +701,4 @@ Music_BikeRiding_branch_7dec2::
 	rest 2
 	triangle3 1
 	triangle3 1
-	endchannel
+	sound_ret
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index a1699301..b64fc6dd 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -1,411 +1,411 @@
-Music_Celadon_Ch0::
+Music_Celadon_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 12, 2, 15
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 12, 2, 15
 	rest 8
 	octave 3
-	D_ 8
+	note D_, 8
 
 Music_Celadon_branch_b6d4::
-	duty 2
-	notetype 12, 11, 2
-	G_ 4
-	B_ 4
-	G_ 2
-	B_ 4
-	G_ 2
-	E_ 1
-	E_ 1
-	G_ 1
-	E_ 1
-	B_ 2
-	octave 4
-	C_ 2
+	duty_cycle 2
+	note_type 12, 11, 2
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note B_, 2
+	octave 4
+	note C_, 2
 	octave 3
-	A_ 8
-	F# 4
-	A_ 4
-	F# 2
-	A_ 6
-	A_ 1
-	B_ 1
-	octave 4
-	C_ 1
+	note A_, 8
+	note F#, 4
+	note A_, 4
+	note F#, 2
+	note A_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
 	octave 3
-	B_ 1
-	A_ 2
-	B_ 2
-	G_ 4
+	note B_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
 	octave 4
-	G_ 4
+	note G_, 4
 	octave 3
-	G_ 4
-	B_ 4
-	G_ 2
-	B_ 4
-	G_ 2
-	E_ 1
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 2
-	octave 4
-	C_ 2
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 2
+	octave 4
+	note C_, 2
 	octave 3
-	A_ 8
-	A_ 2
-	B_ 2
+	note A_, 8
+	note A_, 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	F# 4
-	D_ 1
-	E_ 1
-	F# 1
-	G_ 1
-	A_ 8
-	notetype 12, 9, 4
-	B_ 8
-	G_ 4
-	D_ 4
-	G_ 4
-	A_ 2
-	octave 4
-	C_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 4
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 8
+	note_type 12, 9, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
+	octave 4
+	note C_, 2
 	octave 3
-	B_ 8
-	A_ 8
-	F# 4
-	G_ 4
-	A_ 4
-	G_ 4
-	F# 4
-	A_ 4
-	B_ 8
-	G_ 4
-	D_ 4
-	G_ 4
-	A_ 2
-	octave 4
-	C_ 2
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
+	octave 4
+	note C_, 2
 	octave 3
-	B_ 8
-	A_ 8
-	F# 4
-	G_ 4
-	A_ 4
-	G_ 4
-	F# 4
-	A_ 4
-	loopchannel 0, Music_Celadon_branch_b6d4
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	sound_loop 0, Music_Celadon_branch_b6d4
 
 
-Music_Celadon_Ch1::
-	duty 3
-	notetype 12, 12, 2
-	octave 4
-	D_ 1
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	E_ 1
-	F# 1
-	G_ 1
-	notetype 12, 10, 0
-	A_ 8
+Music_Celadon_Ch2::
+	duty_cycle 3
+	note_type 12, 12, 2
+	octave 4
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note_type 12, 10, 0
+	note A_, 8
 
 Music_Celadon_branch_b74a::
-	duty 2
-	notetype 12, 12, 2
-	octave 4
-	B_ 4
-	G_ 4
-	B_ 2
-	G_ 6
-	B_ 1
-	G_ 1
-	A_ 1
-	B_ 1
+	duty_cycle 2
+	note_type 12, 12, 2
+	octave 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 6
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 5
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 8
-	A_ 4
-	F# 4
-	A_ 2
-	F# 6
-	A_ 1
-	G_ 1
-	F# 1
-	G_ 1
-	A_ 2
-	B_ 2
-	G_ 4
-	B_ 4
-	B_ 4
-	G_ 4
-	B_ 2
-	G_ 4
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 4
+	note F#, 4
+	note A_, 2
+	note F#, 6
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
+	note B_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	B_ 1
-	G_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 5
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 8
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C# 2
-	D_ 8
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 8
 	octave 5
-	D_ 8
-	notetype 12, 11, 4
+	note D_, 8
+	note_type 12, 11, 4
 	octave 4
-	D_ 8
-	C_ 2
+	note D_, 8
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	octave 4
-	E_ 4
-	F# 4
-	D_ 8
-	C_ 8
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note F#, 4
+	note D_, 8
+	note C_, 8
 	octave 3
-	A_ 2
-	B_ 2
-	octave 4
-	C_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	E_ 2
-	D_ 8
-	D_ 8
-	C_ 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note D_, 8
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	octave 4
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 8
-	C_ 8
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 8
-	loopchannel 0, Music_Celadon_branch_b74a
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note C_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	sound_loop 0, Music_Celadon_branch_b74a
 
 
-Music_Celadon_Ch2::
-	notetype 12, 1, 3
+Music_Celadon_Ch3::
+	note_type 12, 1, 3
 	rest 8
 	octave 5
-	D_ 1
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	E_ 1
-	F# 1
-	G_ 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
 
 Music_Celadon_branch_b7c1::
 	octave 4
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	C# 2
-	D_ 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
 	rest 6
-	F# 2
+	note F#, 2
 	rest 4
-	F# 2
-	G_ 2
+	note F#, 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	G_ 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	G_ 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	loopchannel 0, Music_Celadon_branch_b7c1
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	sound_loop 0, Music_Celadon_branch_b7c1
diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm
index c6b3564d..69496af5 100644
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -1,354 +1,354 @@
-Music_Cinnabar_Ch0::
+Music_Cinnabar_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_Cinnabar_branch_b878::
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	rest 4
 	octave 3
-	D_ 4
-	E_ 6
-	C# 2
-	notetype 12, 11, 1
-	D_ 4
-	notetype 12, 11, 5
-	B_ 4
+	note D_, 4
+	note E_, 6
+	note C#, 2
+	note_type 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 5
+	note B_, 4
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	notetype 12, 11, 1
-	B_ 4
-	notetype 12, 11, 5
-	G_ 4
-	F# 4
-	E_ 2
-	F# 2
-	notetype 12, 11, 1
-	G_ 4
-	notetype 12, 11, 5
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	E_ 4
-	F# 6
-	A_ 2
-	notetype 12, 11, 1
-	G_ 4
-	notetype 12, 11, 5
-	B_ 4
+	note A_, 2
+	note_type 12, 11, 1
+	note B_, 4
+	note_type 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note_type 12, 11, 1
+	note G_, 4
+	note_type 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note F#, 6
+	note A_, 2
+	note_type 12, 11, 1
+	note G_, 4
+	note_type 12, 11, 5
+	note B_, 4
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	B_ 4
-	G_ 4
-	F# 3
-	E_ 1
-	F# 2
-	A_ 2
-	notetype 12, 10, 2
-	G_ 4
+	note A_, 2
+	note B_, 4
+	note G_, 4
+	note F#, 3
+	note E_, 1
+	note F#, 2
+	note A_, 2
+	note_type 12, 10, 2
+	note G_, 4
 	octave 4
-	D_ 1
-	E_ 1
-	D_ 4
-	notetype 12, 7, 2
-	D_ 1
-	E_ 1
-	D_ 4
-	notetype 12, 10, 7
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	note_type 12, 7, 2
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	note_type 12, 10, 7
 	octave 3
-	B_ 6
-	G_ 2
-	E_ 8
+	note B_, 6
+	note G_, 2
+	note E_, 8
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	F# 8
+	note A_, 2
+	note F#, 8
 	octave 4
-	F# 6
-	D_ 2
+	note F#, 6
+	note D_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 8
-	F# 4
-	E_ 4
-	loopchannel 0, Music_Cinnabar_branch_b878
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 4
+	note E_, 4
+	sound_loop 0, Music_Cinnabar_branch_b878
 
 
-Music_Cinnabar_Ch1::
-	duty 3
+Music_Cinnabar_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 3
 
 Music_Cinnabar_branch_b8d9::
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 3
-	G_ 6
-	A_ 1
-	B_ 1
+	note G_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 6
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	G_ 4
-	A_ 6
-	G_ 1
-	F# 1
-	E_ 4
-	D_ 4
-	C_ 3
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 2
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
 	octave 3
-	B_ 8
-	A_ 4
-	G_ 6
-	A_ 1
-	B_ 1
+	note B_, 8
+	note A_, 4
+	note G_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 6
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	G_ 4
-	A_ 6
-	G_ 1
-	F# 1
-	E_ 4
-	D_ 4
-	C_ 3
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 2
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
 	octave 3
-	A_ 4
-	G_ 4
-	F# 4
-	notetype 12, 11, 0
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note_type 12, 11, 0
 	octave 4
-	D_ 6
+	note D_, 6
 	octave 3
-	B_ 2
-	G_ 8
+	note B_, 2
+	note G_, 8
 	octave 4
-	E_ 6
-	C_ 2
+	note E_, 6
+	note C_, 2
 	octave 3
-	A_ 8
+	note A_, 8
 	octave 4
-	A_ 6
-	F# 2
-	D_ 2
-	C_ 2
+	note A_, 6
+	note F#, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 4
+	note B_, 2
+	note A_, 2
+	note B_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 2
-	A_ 6
-	loopchannel 0, Music_Cinnabar_branch_b8d9
+	note B_, 2
+	note A_, 6
+	sound_loop 0, Music_Cinnabar_branch_b8d9
 
 
-Music_Cinnabar_Ch2::
-	notetype 12, 1, 0
+Music_Cinnabar_Ch3::
+	note_type 12, 1, 0
 
 Music_Cinnabar_branch_b93f::
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 4
-	A_ 1
+	note B_, 4
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	B_ 1
-	B_ 1
-	B_ 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
 	octave 5
-	E_ 2
-	C_ 1
-	C_ 1
-	C_ 1
+	note E_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	E_ 2
-	C_ 1
+	note E_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 3
 	octave 5
-	A_ 2
-	F# 1
-	F# 1
-	D_ 1
+	note A_, 2
+	note F#, 1
+	note F#, 1
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	D_ 2
-	C_ 1
+	note D_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 5
-	D_ 2
-	C_ 1
-	C_ 1
+	note D_, 2
+	note C_, 1
+	note C_, 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 2
+	note A_, 2
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
-	loopchannel 0, Music_Cinnabar_branch_b93f
+	sound_loop 0, Music_Cinnabar_branch_b93f
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index bb54a456..ff3de714 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -1,149 +1,149 @@
-Music_CinnabarMansion_Ch0::
+Music_CinnabarMansion_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 11, 2, 5
-	duty 2
+	duty_cycle 2
 
 Music_CinnabarMansion_branch_7ed19::
-	notetype 12, 6, 2
+	note_type 12, 6, 2
 	octave 5
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 4
-	B_ 1
-	B_ 1
-	C_ 1
+	note B_, 1
+	note B_, 1
+	note C_, 1
 	rest 2
 	octave 5
-	B_ 2
-	E_ 2
+	note B_, 2
+	note E_, 2
 	octave 4
-	C_ 2
-	B_ 2
-	E_ 2
-	C_ 1
+	note C_, 2
+	note B_, 2
+	note E_, 2
+	note C_, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
-	loopchannel 14, Music_CinnabarMansion_branch_7ed19
-	notetype 12, 10, 5
+	sound_loop 14, Music_CinnabarMansion_branch_7ed19
+	note_type 12, 10, 5
 	rest 16
 	rest 16
 	rest 15
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 5
-	B_ 1
-	B_ 2
-	loopchannel 0, Music_CinnabarMansion_branch_7ed19
+	note B_, 1
+	note B_, 2
+	sound_loop 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch1::
-	duty 2
-	toggleperfectpitch
+Music_CinnabarMansion_Ch2::
+	duty_cycle 2
+	toggle_perfect_pitch
 	vibrato 10, 2, 4
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 
 Music_CinnabarMansion_branch_7ed48::
 	rest 16
 	rest 16
-	loopchannel 4, Music_CinnabarMansion_branch_7ed48
+	sound_loop 4, Music_CinnabarMansion_branch_7ed48
 
 Music_CinnabarMansion_branch_7ed4e::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 
 Music_CinnabarMansion_branch_7ed50::
-	callchannel Music_CinnabarMansion_branch_7ed6c
-	loopchannel 3, Music_CinnabarMansion_branch_7ed50
+	sound_call Music_CinnabarMansion_branch_7ed6c
+	sound_loop 3, Music_CinnabarMansion_branch_7ed50
 	octave 3
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
 	rest 4
-	A# 4
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
-	G_ 4
-	D# 4
-	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note G_, 4
+	note D#, 4
+	sound_loop 0, Music_CinnabarMansion_branch_7ed4e
 
 Music_CinnabarMansion_branch_7ed6c::
 	octave 3
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
-	A_ 4
-	A# 4
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
 	rest 4
-	A# 4
-	endchannel
+	note A#, 4
+	sound_ret
 
 
-Music_CinnabarMansion_Ch2::
-	notetype 12, 1, 1
+Music_CinnabarMansion_Ch3::
+	note_type 12, 1, 1
 
 Music_CinnabarMansion_branch_7ed80::
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 3
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	loopchannel 8, Music_CinnabarMansion_branch_7ed80
-	E_ 16
-	D# 16
-	G_ 16
-	G# 8
-	D# 8
-	loopchannel 0, Music_CinnabarMansion_branch_7ed80
+	sound_loop 8, Music_CinnabarMansion_branch_7ed80
+	note E_, 16
+	note D#, 16
+	note G_, 16
+	note G#, 8
+	note D#, 8
+	sound_loop 0, Music_CinnabarMansion_branch_7ed80
 
 
-Music_CinnabarMansion_Ch3::
+Music_CinnabarMansion_Ch4::
 	dspeed 6
 	rest 16
 	rest 16
@@ -169,4 +169,4 @@ Music_CinnabarMansion_branch_7edb5::
 	rest 10
 	rest 8
 	cymbal3 8
-	loopchannel 0, Music_CinnabarMansion_branch_7edb5
+	sound_loop 0, Music_CinnabarMansion_branch_7edb5
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index 984202f6..3aef872b 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -1,604 +1,604 @@
 Music_Cities1_branch_aa6f::
 	tempo 232
-	loopchannel 0, Music_Cities1_branch_aa79
+	sound_loop 0, Music_Cities1_branch_aa79
 
-Music_Cities1_Ch0::
+Music_Cities1_Ch1::
 	tempo 144
 
 Music_Cities1_branch_aa79::
 	volume 7, 7
 	vibrato 8, 2, 4
-	duty 3
+	duty_cycle 3
 
 Music_Cities1_branch_aa80::
-	notetype 12, 12, 5
+	note_type 12, 12, 5
 	octave 3
-	G# 4
-	F# 4
-	E_ 2
-	E_ 2
-	F# 2
-	D# 2
-	E_ 2
-	E_ 2
-	D# 2
-	C# 4
-	D# 4
-	E_ 2
-	D# 4
-	C# 2
-	E_ 2
-	E_ 4
-	notetype 12, 10, 5
-	C# 4
+	note G#, 4
+	note F#, 4
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
+	note D#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 2
+	note E_, 2
+	note E_, 4
+	note_type 12, 10, 5
+	note C#, 4
 	octave 2
-	B_ 6
+	note B_, 6
 	octave 3
-	C# 2
-	C# 4
+	note C#, 2
+	note C#, 4
 	octave 2
-	B_ 4
-	notetype 12, 12, 5
-	callchannel Music_Cities1_branch_ab7d
+	note B_, 4
+	note_type 12, 12, 5
+	sound_call Music_Cities1_branch_ab7d
 	octave 3
-	D# 6
-	E_ 2
+	note D#, 6
+	note E_, 2
 	octave 2
-	B_ 4
-	notetype 12, 10, 5
+	note B_, 4
+	note_type 12, 10, 5
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	B_ 2
-	A_ 4
-	B_ 4
-	B_ 2
+	note B_, 2
+	note A_, 4
+	note B_, 4
+	note B_, 2
 	octave 3
-	C# 2
-	D# 2
-	E_ 2
-	D# 2
-	C# 2
-	D# 2
-	notetype 12, 12, 5
-	G# 2
-	E_ 2
-	F# 2
-	E_ 2
-	E_ 4
-	F# 2
-	D# 2
-	E_ 4
-	D# 2
-	C# 4
-	D# 4
-	E_ 2
-	D# 2
-	C# 2
-	C# 2
-	E_ 2
-	E_ 4
-	notetype 12, 10, 5
-	C# 2
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note_type 12, 12, 5
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note E_, 4
+	note F#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C#, 2
+	note E_, 2
+	note E_, 4
+	note_type 12, 10, 5
+	note C#, 2
 	octave 2
-	A_ 2
-	B_ 6
+	note A_, 2
+	note B_, 6
 	octave 3
-	C# 2
-	C# 2
+	note C#, 2
+	note C#, 2
 	octave 2
-	B_ 2
-	B_ 4
-	notetype 12, 12, 5
-	callchannel Music_Cities1_branch_ab7d
+	note B_, 2
+	note B_, 4
+	note_type 12, 12, 5
+	sound_call Music_Cities1_branch_ab7d
 	octave 3
-	D# 4
-	D# 2
-	E_ 2
+	note D#, 4
+	note D#, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	G# 2
-	E_ 4
+	note C#, 2
+	note G#, 2
+	note E_, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	notetype 12, 10, 5
-	C# 4
+	note E_, 2
+	note_type 12, 10, 5
+	note C#, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 4
-	C# 2
-	E_ 4
-	notetype 12, 11, 3
-	callchannel Music_Cities1_branch_ab8a
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 4
-	F# 4
-	G# 2
-	E_ 2
+	note D#, 4
+	note C#, 2
+	note E_, 4
+	note_type 12, 11, 3
+	sound_call Music_Cities1_branch_ab8a
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note F#, 4
+	note G#, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 4
-	G# 2
+	note E_, 4
+	note G#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	E_ 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
 
 Music_Cities1_branch_ab12::
-	C# 2
-	D# 2
-	C# 2
+	note C#, 2
+	note D#, 2
+	note C#, 2
 	octave 2
-	B_ 4
-	B_ 2
+	note B_, 4
+	note B_, 2
 	octave 3
-	C# 2
-	D# 2
-	loopchannel 2, Music_Cities1_branch_ab12
-	E_ 2
+	note C#, 2
+	note D#, 2
+	sound_loop 2, Music_Cities1_branch_ab12
+	note E_, 2
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	G# 2
-	G# 2
+	note C#, 2
+	note G#, 2
+	note G#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	callchannel Music_Cities1_branch_ab8a
-	A_ 2
-	E_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	F# 2
-	G# 2
-	E_ 2
+	sound_call Music_Cities1_branch_ab8a
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	C# 2
-	G# 2
-	C# 2
-	D# 2
-	B_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	F# 2
-	E_ 4
-	G# 2
-	F# 2
-	D# 2
+	note E_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note D#, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 4
+	note G#, 2
+	note F#, 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 4
-	F# 2
-	D# 2
-	D# 2
-	F# 2
+	note D#, 4
+	note F#, 2
+	note D#, 2
+	note D#, 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
+	note D#, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D# 2
-	notetype 12, 11, 6
-	F# 8
-	F# 4
-	D# 4
-	E_ 8
-	notetype 12, 8, 4
+	note D#, 2
+	note_type 12, 11, 6
+	note F#, 8
+	note F#, 4
+	note D#, 4
+	note E_, 8
+	note_type 12, 8, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	E_ 2
-	F# 2
-	loopchannel 0, Music_Cities1_branch_aa80
+	note E_, 2
+	note F#, 2
+	sound_loop 0, Music_Cities1_branch_aa80
 
 Music_Cities1_branch_ab7d::
 	octave 3
-	F# 2
-	D# 4
-	E_ 2
-	D# 4
-	C# 4
+	note F#, 2
+	note D#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	C# 2
-	D# 2
-	C# 2
-	endchannel
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	sound_ret
 
 Music_Cities1_branch_ab8a::
-	A_ 2
-	E_ 2
-	C# 2
-	E_ 4
-	A_ 2
-	C# 2
-	E_ 2
-	endchannel
+	note A_, 2
+	note E_, 2
+	note C#, 2
+	note E_, 4
+	note A_, 2
+	note C#, 2
+	note E_, 2
+	sound_ret
 
 
-Music_Cities1_Ch1::
+Music_Cities1_Ch2::
 	vibrato 5, 1, 5
-	callchannel Music_Cities1_branch_ac00
+	sound_call Music_Cities1_branch_ac00
 	octave 4
-	G# 2
-	notetype 12, 12, 4
-	E_ 6
-	notetype 12, 12, 5
-	duty 3
+	note G#, 2
+	note_type 12, 12, 4
+	note E_, 6
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	C# 4
-	D# 4
-	E_ 6
-	F# 6
-	G# 4
-	callchannel Music_Cities1_branch_ac00
+	note C#, 4
+	note D#, 4
+	note E_, 6
+	note F#, 6
+	note G#, 4
+	sound_call Music_Cities1_branch_ac00
 	octave 4
-	G# 2
-	notetype 12, 12, 4
-	E_ 14
-	duty 3
+	note G#, 2
+	note_type 12, 12, 4
+	note E_, 14
+	duty_cycle 3
 	octave 3
-	E_ 6
-	F# 6
-	G# 4
-	notetype 12, 11, 7
-	duty 2
+	note E_, 6
+	note F#, 6
+	note G#, 4
+	note_type 12, 11, 7
+	duty_cycle 2
 	vibrato 8, 1, 7
 	octave 5
-	C# 12
+	note C#, 12
 	octave 4
-	A_ 4
+	note A_, 4
 	octave 5
-	E_ 8
-	F# 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 8
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 4
-	B_ 12
-	G# 4
-	B_ 16
-	F# 12
-	G# 2
-	A_ 2
-	B_ 4
-	A_ 4
-	G# 4
-	F# 4
-	G# 12
-	E_ 4
-	B_ 16
+	note B_, 12
+	note G#, 4
+	note B_, 16
+	note F#, 12
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note G#, 12
+	note E_, 4
+	note B_, 16
 	octave 5
-	C# 12
-	D# 2
-	E_ 2
-	F# 4
-	E_ 4
-	D# 4
-	C# 4
+	note C#, 12
+	note D#, 2
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
 	octave 4
-	B_ 12
+	note B_, 12
 	octave 5
-	C# 2
-	D# 2
-	C# 4
+	note C#, 2
+	note D#, 2
+	note C#, 4
 	octave 4
-	B_ 4
-	A_ 4
-	G# 4
-	A_ 12
-	B_ 2
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note A_, 12
+	note B_, 2
 	octave 5
-	C_ 2
-	C_ 4
+	note C_, 2
+	note C_, 4
 	octave 4
-	B_ 4
-	A_ 4
-	F# 4
-	notetype 12, 11, 7
-	A_ 8
+	note B_, 4
+	note A_, 4
+	note F#, 4
+	note_type 12, 11, 7
+	note A_, 8
 	octave 5
-	C_ 8
+	note C_, 8
 	octave 4
-	B_ 14
-	notetype 12, 8, 4
-	G# 1
-	notetype 12, 10, 4
-	A_ 1
-	loopchannel 0, Music_Cities1_Ch1
+	note B_, 14
+	note_type 12, 8, 4
+	note G#, 1
+	note_type 12, 10, 4
+	note A_, 1
+	sound_loop 0, Music_Cities1_Ch2
 
 Music_Cities1_branch_ac00::
-	duty 2
-	notetype 12, 12, 3
+	duty_cycle 2
+	note_type 12, 12, 3
 	octave 4
-	B_ 4
-	A_ 4
-	notetype 12, 12, 4
-	G# 10
-	notetype 12, 12, 3
-	G# 2
-	A_ 2
-	B_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	notetype 12, 12, 4
-	F# 10
-	notetype 12, 12, 5
-	duty 3
+	note B_, 4
+	note A_, 4
+	note_type 12, 12, 4
+	note G#, 10
+	note_type 12, 12, 3
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note_type 12, 12, 4
+	note F#, 10
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	E_ 4
-	D# 8
-	E_ 4
-	F# 4
-	notetype 12, 12, 3
-	duty 2
+	note E_, 4
+	note D#, 8
+	note E_, 4
+	note F#, 4
+	note_type 12, 12, 3
+	duty_cycle 2
 	octave 4
-	A_ 4
-	G# 4
-	notetype 12, 12, 4
-	F# 10
-	notetype 12, 12, 3
-	F# 2
-	G# 2
-	A_ 4
-	A_ 2
-	G# 2
-	F# 2
-	endchannel
+	note A_, 4
+	note G#, 4
+	note_type 12, 12, 4
+	note F#, 10
+	note_type 12, 12, 3
+	note F#, 2
+	note G#, 2
+	note A_, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	sound_ret
 
 
-Music_Cities1_Ch2::
-	notetype 12, 1, 1
-	toggleperfectpitch
+Music_Cities1_Ch3::
+	note_type 12, 1, 1
+	toggle_perfect_pitch
 
 Music_Cities1_branch_ac35::
 	vibrato 0, 0, 0
 	octave 4
-	callchannel Music_Cities1_branch_acc5
-	callchannel Music_Cities1_branch_acc5
-	callchannel Music_Cities1_branch_acce
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
+	sound_call Music_Cities1_branch_acc5
+	sound_call Music_Cities1_branch_acc5
+	sound_call Music_Cities1_branch_acce
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
-	callchannel Music_Cities1_branch_acc5
-	B_ 2
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	sound_call Music_Cities1_branch_acc5
+	note B_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
-	callchannel Music_Cities1_branch_acc5
-	callchannel Music_Cities1_branch_acce
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	sound_call Music_Cities1_branch_acc5
+	sound_call Music_Cities1_branch_acce
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	G# 2
-	E_ 2
-	B_ 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
 	rest 2
-	E_ 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	B_ 2
-	E_ 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
 	vibrato 8, 2, 5
-	A_ 8
-	E_ 8
-	A_ 8
-	F# 8
-	G# 8
-	E_ 8
-	G# 12
-	E_ 4
-	F# 2
-	F# 2
-	D# 2
-	E_ 4
-	F# 2
-	D# 2
-	E_ 2
-	F# 2
-	F# 2
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	G# 2
-	E_ 2
-	G# 2
+	note A_, 8
+	note E_, 8
+	note A_, 8
+	note F#, 8
+	note G#, 8
+	note E_, 8
+	note G#, 12
+	note E_, 4
+	note F#, 2
+	note F#, 2
+	note D#, 2
+	note E_, 4
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	A_ 8
-	E_ 8
-	A_ 8
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 8
-	E_ 8
-	B_ 4
-	E_ 4
-	F# 4
-	G# 4
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 8
+	note E_, 8
+	note A_, 8
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 8
+	note E_, 8
+	note B_, 4
+	note E_, 4
+	note F#, 4
+	note G#, 4
 	rest 2
-	D# 2
-	E_ 2
-	F# 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
 	rest 2
-	F# 2
-	B_ 2
-	A_ 2
-	A_ 4
-	G# 4
-	F# 2
-	D# 2
-	A_ 2
-	F# 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 4
+	note F#, 2
+	note D#, 2
+	note A_, 2
+	note F#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 1
-	G# 1
-	E_ 1
-	F# 1
-	G# 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	loopchannel 0, Music_Cities1_branch_ac35
+	note E_, 2
+	note F#, 1
+	note G#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	sound_loop 0, Music_Cities1_branch_ac35
 
 Music_Cities1_branch_acc5::
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
-	E_ 2
-	F# 2
-	G# 2
-	endchannel
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	sound_ret
 
 Music_Cities1_branch_acce::
-	A_ 2
-	F# 2
-	G# 2
-	A_ 2
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	rest 2
-	A_ 2
-	G# 2
-	F# 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
 	rest 2
-	F# 2
-	G# 2
-	A_ 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	rest 2
-	A_ 2
-	G# 2
-	F# 2
-	D# 2
-	D# 2
-	E_ 2
-	F# 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
 	rest 2
-	D# 2
-	E_ 2
-	F# 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
 	rest 2
-	D# 2
-	E_ 2
-	F# 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
 	rest 2
-	D# 2
-	E_ 2
-	F# 2
-	endchannel
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	sound_ret
 
 
-Music_Cities1_Ch3::
+Music_Cities1_Ch4::
 	dspeed 12
-	callchannel Music_Cities1_branch_ad36
+	sound_call Music_Cities1_branch_ad36
 
 Music_Cities1_branch_acf3::
-	callchannel Music_Cities1_branch_ad36
-	callchannel Music_Cities1_branch_ad45
-	callchannel Music_Cities1_branch_ad45
-	loopchannel 2, Music_Cities1_branch_acf3
-	callchannel Music_Cities1_branch_ad36
-	callchannel Music_Cities1_branch_ad5f
-	callchannel Music_Cities1_branch_ad52
+	sound_call Music_Cities1_branch_ad36
+	sound_call Music_Cities1_branch_ad45
+	sound_call Music_Cities1_branch_ad45
+	sound_loop 2, Music_Cities1_branch_acf3
+	sound_call Music_Cities1_branch_ad36
+	sound_call Music_Cities1_branch_ad5f
+	sound_call Music_Cities1_branch_ad52
 	triangle1 6
 	triangle1 6
 	triangle2 4
-	callchannel Music_Cities1_branch_ad6e
-	callchannel Music_Cities1_branch_ad5f
-	callchannel Music_Cities1_branch_ad52
-	callchannel Music_Cities1_branch_ad6e
-	callchannel Music_Cities1_branch_ad52
+	sound_call Music_Cities1_branch_ad6e
+	sound_call Music_Cities1_branch_ad5f
+	sound_call Music_Cities1_branch_ad52
+	sound_call Music_Cities1_branch_ad6e
+	sound_call Music_Cities1_branch_ad52
 	triangle1 6
 	triangle1 6
 	triangle2 2
@@ -609,7 +609,7 @@ Music_Cities1_branch_acf3::
 	triangle1 6
 	snare6 6
 	snare6 4
-	loopchannel 0, Music_Cities1_Ch3
+	sound_loop 0, Music_Cities1_Ch4
 
 Music_Cities1_branch_ad36::
 	snare6 6
@@ -619,7 +619,7 @@ Music_Cities1_branch_ad36::
 	snare6 6
 	snare6 2
 	snare6 2
-	endchannel
+	sound_ret
 
 Music_Cities1_branch_ad45::
 	snare6 6
@@ -628,7 +628,7 @@ Music_Cities1_branch_ad45::
 	snare6 6
 	snare6 6
 	snare6 4
-	endchannel
+	sound_ret
 
 Music_Cities1_branch_ad52::
 	triangle1 6
@@ -637,7 +637,7 @@ Music_Cities1_branch_ad52::
 	triangle1 6
 	triangle1 6
 	triangle2 4
-	endchannel
+	sound_ret
 
 Music_Cities1_branch_ad5f::
 	triangle1 6
@@ -647,11 +647,11 @@ Music_Cities1_branch_ad5f::
 	triangle1 6
 	triangle2 2
 	triangle1 2
-	endchannel
+	sound_ret
 
 Music_Cities1_branch_ad6e::
 	triangle1 6
 	triangle1 6
 	triangle2 2
 	triangle2 2
-	endchannel
+	sound_ret
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index fb167999..6397f965 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -1,416 +1,416 @@
-Music_Cities2_Ch0::
+Music_Cities2_Ch1::
 	tempo 148
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 3, 2
-	toggleperfectpitch
-	notetype 12, 11, 6
+	toggle_perfect_pitch
+	note_type 12, 11, 6
 	rest 8
 	octave 3
-	E_ 2
-	D# 2
-	C# 2
-	C_ 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 14
 
 Music_Cities2_branch_b51a::
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 2
-	D# 1
-	D_ 1
-	C# 4
+	note C#, 2
+	note D#, 1
+	note D_, 1
+	note C#, 4
 	octave 3
-	B_ 4
-	G# 8
-	E_ 8
-	A_ 4
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
+	note B_, 4
+	note G#, 8
+	note E_, 8
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	rest 16
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 1
-	D# 1
-	C# 4
+	note C#, 1
+	note D#, 1
+	note C#, 4
 	octave 3
-	B_ 4
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note B_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 3
-	G# 8
-	B_ 4
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
-	E_ 2
-	F# 2
-	G# 2
+	note G#, 8
+	note B_, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	rest 2
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 4
-	F# 2
-	G# 2
-	A_ 2
+	note B_, 4
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	rest 2
 	octave 4
-	F# 4
-	D# 4
+	note F#, 4
+	note D#, 4
 	octave 3
-	E_ 2
+	note E_, 2
 	rest 4
-	F# 2
+	note F#, 2
 	rest 4
-	A_ 2
+	note A_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 16
 	rest 16
 	rest 14
-	E_ 16
-	F# 8
-	G# 4
-	F# 4
-	E_ 2
+	note E_, 16
+	note F#, 8
+	note G#, 4
+	note F#, 4
+	note E_, 2
 	rest 14
-	loopchannel 0, Music_Cities2_branch_b51a
+	sound_loop 0, Music_Cities2_branch_b51a
 
 
-Music_Cities2_Ch1::
-	duty 3
+Music_Cities2_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 3
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 4
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	E_ 6
-	notetype 12, 12, 2
-	duty 2
+	note C#, 2
+	note D#, 2
+	note E_, 6
+	note_type 12, 12, 2
+	duty_cycle 2
 	octave 4
-	E_ 1
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 2
-	D# 2
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
 
 Music_Cities2_branch_b58b::
-	notetype 12, 10, 6
-	G# 6
-	notetype 12, 12, 2
-	A_ 1
-	G# 1
-	notetype 12, 12, 4
-	F# 14
-	notetype 12, 12, 2
-	E_ 1
+	note_type 12, 10, 6
+	note G#, 6
+	note_type 12, 12, 2
+	note A_, 1
+	note G#, 1
+	note_type 12, 12, 4
+	note F#, 14
+	note_type 12, 12, 2
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 2
-	D# 2
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 12, 12, 4
-	G# 6
-	notetype 12, 12, 2
-	E_ 1
-	G# 1
-	notetype 12, 12, 5
-	B_ 14
-	notetype 12, 12, 2
-	E_ 1
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 12, 12, 4
+	note G#, 6
+	note_type 12, 12, 2
+	note E_, 1
+	note G#, 1
+	note_type 12, 12, 5
+	note B_, 14
+	note_type 12, 12, 2
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 2
-	D# 2
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 12, 10, 6
-	G# 6
-	notetype 12, 12, 2
-	A_ 1
-	G# 1
-	notetype 12, 12, 4
-	F# 8
-	notetype 12, 10, 1
-	duty 1
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 12, 10, 6
+	note G#, 6
+	note_type 12, 12, 2
+	note A_, 1
+	note G#, 1
+	note_type 12, 12, 4
+	note F#, 8
+	note_type 12, 10, 1
+	duty_cycle 1
 	octave 3
-	G# 1
-	G# 1
-	G# 1
-	G# 1
-	G# 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	rest 1
-	notetype 12, 12, 2
-	duty 2
+	note_type 12, 12, 2
+	duty_cycle 2
 	octave 4
-	E_ 1
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 2
-	D# 2
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 12, 12, 4
-	G# 6
-	E_ 1
-	G# 1
-	notetype 12, 12, 6
-	B_ 8
-	notetype 12, 12, 2
-	C# 1
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 12, 12, 4
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	note_type 12, 12, 6
+	note B_, 8
+	note_type 12, 12, 2
+	note C#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
-	D# 1
-	E_ 4
-	notetype 12, 12, 7
-	G# 4
-	E_ 4
-	notetype 12, 12, 2
-	D# 1
-	C# 1
-	D# 1
-	E_ 1
-	F# 4
-	notetype 12, 12, 7
-	B_ 4
-	F# 4
-	notetype 12, 12, 2
-	C# 1
+	note C#, 1
+	note D#, 1
+	note E_, 4
+	note_type 12, 12, 7
+	note G#, 4
+	note E_, 4
+	note_type 12, 12, 2
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 4
+	note_type 12, 12, 7
+	note B_, 4
+	note F#, 4
+	note_type 12, 12, 2
+	note C#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
-	D# 1
-	E_ 2
-	E_ 1
-	D# 1
-	E_ 1
-	F# 1
-	G# 2
-	G# 1
-	A_ 1
-	G# 1
-	A_ 1
-	B_ 1
-	F# 1
-	D# 1
-	C# 1
+	note C#, 1
+	note D#, 1
+	note E_, 2
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 2
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	note F#, 1
+	note D#, 1
+	note C#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
-	D# 1
-	F# 1
-	notetype 12, 12, 2
-	B_ 8
-	notetype 12, 11, 7
+	note C#, 1
+	note D#, 1
+	note F#, 1
+	note_type 12, 12, 2
+	note B_, 8
+	note_type 12, 11, 7
 	octave 3
-	E_ 8
+	note E_, 8
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	F# 4
-	G# 4
-	A_ 4
-	B_ 8
-	B_ 8
-	G# 4
+	note F#, 4
+	note G#, 4
+	note A_, 4
+	note B_, 8
+	note B_, 8
+	note G#, 4
 	octave 4
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	D# 2
-	C# 2
-	D# 2
-	notetype 12, 12, 2
-	E_ 6
-	E_ 1
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note_type 12, 12, 2
+	note E_, 6
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 2
-	D# 2
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	loopchannel 0, Music_Cities2_branch_b58b
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	sound_loop 0, Music_Cities2_branch_b58b
 
 
-Music_Cities2_Ch2::
-	notetype 12, 1, 1
+Music_Cities2_Ch3::
+	note_type 12, 1, 1
 	rest 16
 	octave 4
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
 
 Music_Cities2_branch_b64c::
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
 	rest 2
-	E_ 4
-	G# 4
-	F# 2
-	A_ 2
-	F# 2
+	note E_, 4
+	note G#, 4
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	rest 2
-	F# 4
-	A_ 4
-	C# 2
+	note F#, 4
+	note A_, 4
+	note C#, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 4
-	G# 2
-	A_ 2
-	B_ 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	rest 8
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	loopchannel 0, Music_Cities2_branch_b64c
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	sound_loop 0, Music_Cities2_branch_b64c
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index f092326b..b8a6d7dd 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,820 +1,820 @@
-Music_Credits_Ch0::
+Music_Credits_Ch1::
 	tempo 140
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	A_ 1
+	note A_, 1
 	octave 4
-	E_ 1
-	D_ 6
+	note E_, 1
+	note D_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	D_ 1
-	C# 6
+	note D_, 1
+	note C#, 6
 	octave 3
-	F# 1
-	octave 4
-	C# 1
-	D_ 4
-	E_ 2
-	C# 1
-	E_ 1
-	C# 1
+	note F#, 1
+	octave 4
+	note C#, 1
+	note D_, 4
+	note E_, 2
+	note C#, 1
+	note E_, 1
+	note C#, 1
 	rest 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
-	E_ 1
-	F# 1
-	G_ 1
-	notetype 12, 11, 6
-	A_ 4
-	E_ 2
-	A_ 2
-	G_ 4
-	A_ 2
-	G_ 2
-	B_ 4
-	A_ 4
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C# 6
-	E_ 2
-	A_ 4
-	C# 4
-	E_ 4
-	D_ 2
-	C# 2
-	E_ 2
-	F# 2
-	G_ 2
-	F# 2
-	A_ 4
-	E_ 2
-	A_ 2
-	G_ 4
-	A_ 2
-	G_ 2
-	B_ 4
-	A_ 4
-	G_ 2
-	A_ 2
-	F# 2
-	D_ 2
-	E_ 6
-	C# 2
-	A_ 4
-	C# 4
-	E_ 4
-	D_ 2
-	C# 2
-	E_ 2
-	F# 2
-	G_ 2
-	F# 2
-	G_ 4
-	D_ 2
-	G_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	D_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 6
-	A_ 2
-	G_ 4
-	F# 4
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	G_ 4
-	D_ 2
-	G_ 2
-	B_ 2
-	octave 4
-	C# 2
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note_type 12, 11, 6
+	note A_, 4
+	note E_, 2
+	note A_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 6
+	note E_, 2
+	note A_, 4
+	note C#, 4
+	note E_, 4
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note A_, 4
+	note E_, 2
+	note A_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	note E_, 6
+	note C#, 2
+	note A_, 4
+	note C#, 4
+	note E_, 4
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 6
+	note A_, 2
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	D_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	notetype 12, 11, 7
-	E_ 6
-	A_ 2
-	G_ 4
-	F# 4
-	notetype 12, 12, 7
-	A_ 4
-	B_ 4
-	octave 4
-	C# 4
-	D_ 4
+	note B_, 2
+	note A_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note_type 12, 11, 7
+	note E_, 6
+	note A_, 2
+	note G_, 4
+	note F#, 4
+	note_type 12, 12, 7
+	note A_, 4
+	note B_, 4
+	octave 4
+	note C#, 4
+	note D_, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	notetype 12, 9, 0
-	G_ 8
-	F# 8
-	E_ 8
-	D_ 8
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 9, 0
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note D_, 8
 	rest 16
 	rest 16
 	rest 8
-	notetype 12, 11, 6
-	E_ 6
-	D# 1
-	D_ 1
-	notetype 12, 10, 0
-	C# 8
-	notetype 12, 10, 7
-	C# 8
+	note_type 12, 11, 6
+	note E_, 6
+	note D#, 1
+	note D_, 1
+	note_type 12, 10, 0
+	note C#, 8
+	note_type 12, 10, 7
+	note C#, 8
 	rest 16
 	rest 16
 	rest 8
-	E_ 6
-	C# 1
-	E_ 1
-	notetype 12, 10, 0
-	A_ 8
-	notetype 12, 10, 7
-	A_ 8
-	notetype 12, 11, 6
-	G_ 6
-	D_ 4
-	G_ 2
-	B_ 4
-	notetype 12, 11, 7
-	G_ 8
-	F# 4
-	G# 4
-	notetype 12, 9, 0
-	A_ 8
-	F# 8
-	E_ 8
-	C# 8
-	notetype 12, 11, 7
-	D_ 8
-	C# 8
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note_type 12, 10, 0
+	note A_, 8
+	note_type 12, 10, 7
+	note A_, 8
+	note_type 12, 11, 6
+	note G_, 6
+	note D_, 4
+	note G_, 2
+	note B_, 4
+	note_type 12, 11, 7
+	note G_, 8
+	note F#, 4
+	note G#, 4
+	note_type 12, 9, 0
+	note A_, 8
+	note F#, 8
+	note E_, 8
+	note C#, 8
+	note_type 12, 11, 7
+	note D_, 8
+	note C#, 8
 	octave 2
-	B_ 8
+	note B_, 8
 	octave 3
-	D_ 8
-	notetype 12, 9, 0
-	E_ 8
-	D_ 8
-	F# 8
-	E_ 8
-	notetype 12, 10, 0
-	D_ 8
-	E_ 8
-	D_ 8
-	C_ 8
-	G_ 8
-	F_ 8
-	E_ 8
-	D_ 8
-	notetype 12, 10, 0
-	C# 6
-	notetype 12, 10, 7
-	C# 6
-	notetype 12, 11, 7
-	D_ 4
-	E_ 8
-	G_ 6
-	F# 1
-	F_ 1
-	notetype 12, 10, 0
-	E_ 6
-	notetype 12, 10, 7
-	E_ 6
-	notetype 12, 11, 7
-	D_ 4
-	notetype 12, 10, 0
-	C# 8
-	notetype 12, 10, 7
-	C# 8
-	notetype 12, 11, 7
-	E_ 6
-	D_ 2
-	G_ 4
-	F# 4
-	E_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	E_ 4
-	D_ 4
-	C# 4
-	D_ 4
-	C# 4
-	C# 4
-	E_ 4
-	F# 4
-	notetype 12, 10, 0
-	E_ 6
-	notetype 12, 11, 7
-	D_ 2
-	G_ 4
-	F# 4
-	E_ 4
-	F# 4
-	A_ 4
-	B_ 4
-	notetype 12, 10, 0
-	octave 4
-	C# 16
-	C# 8
-	notetype 12, 10, 7
-	C# 8
-	notetype 12, 11, 5
+	note D_, 8
+	note_type 12, 9, 0
+	note E_, 8
+	note D_, 8
+	note F#, 8
+	note E_, 8
+	note_type 12, 10, 0
+	note D_, 8
+	note E_, 8
+	note D_, 8
+	note C_, 8
+	note G_, 8
+	note F_, 8
+	note E_, 8
+	note D_, 8
+	note_type 12, 10, 0
+	note C#, 6
+	note_type 12, 10, 7
+	note C#, 6
+	note_type 12, 11, 7
+	note D_, 4
+	note E_, 8
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note_type 12, 10, 0
+	note E_, 6
+	note_type 12, 10, 7
+	note E_, 6
+	note_type 12, 11, 7
+	note D_, 4
+	note_type 12, 10, 0
+	note C#, 8
+	note_type 12, 10, 7
+	note C#, 8
+	note_type 12, 11, 7
+	note E_, 6
+	note D_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
+	note D_, 4
+	note C#, 4
+	note C#, 4
+	note E_, 4
+	note F#, 4
+	note_type 12, 10, 0
+	note E_, 6
+	note_type 12, 11, 7
+	note D_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 4
+	note_type 12, 10, 0
+	octave 4
+	note C#, 16
+	note C#, 8
+	note_type 12, 10, 7
+	note C#, 8
+	note_type 12, 11, 5
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
-	A_ 1
-	notetype 12, 11, 1
-	A_ 8
-	endchannel
+	note A_, 1
+	note A_, 1
+	note_type 12, 11, 1
+	note A_, 8
+	sound_ret
 
 
-Music_Credits_Ch1::
-	duty 3
+Music_Credits_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 5
-	notetype 12, 12, 5
-	octave 4
-	A_ 6
-	E_ 1
-	A_ 1
-	G_ 6
-	D_ 1
-	G_ 1
-	notetype 12, 12, 7
-	F# 12
-	G# 2
-	E_ 1
-	G# 1
-	notetype 12, 12, 2
-	A_ 2
-	notetype 12, 12, 1
+	note_type 12, 12, 5
+	octave 4
+	note A_, 6
+	note E_, 1
+	note A_, 1
+	note G_, 6
+	note D_, 1
+	note G_, 1
+	note_type 12, 12, 7
+	note F#, 12
+	note G#, 2
+	note E_, 1
+	note G#, 1
+	note_type 12, 12, 2
+	note A_, 2
+	note_type 12, 12, 1
 	octave 3
-	A_ 4
-	A_ 1
-	A_ 1
-	A_ 2
-	A_ 2
-	A_ 4
-	A_ 2
-	A_ 4
-	A_ 1
-	A_ 1
-	A_ 2
-	A_ 2
-	notetype 12, 12, 4
-	A_ 1
-	F# 1
-	A_ 1
-	B_ 1
-	notetype 12, 12, 7
-	octave 4
-	C# 6
-	C# 1
-	D_ 1
-	E_ 4
-	C# 4
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	C# 6
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	note A_, 2
+	note A_, 2
+	note_type 12, 12, 4
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	note_type 12, 12, 7
+	octave 4
+	note C#, 6
+	note C#, 1
+	note D_, 1
+	note E_, 4
+	note C#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 6
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 8
+	note E_, 8
 	octave 3
-	A_ 6
-	E_ 2
-	octave 4
-	C# 8
-	C# 6
-	C# 1
-	D_ 1
-	E_ 4
-	C# 4
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	C# 6
+	note A_, 6
+	note E_, 2
+	octave 4
+	note C#, 8
+	note C#, 6
+	note C#, 1
+	note D_, 1
+	note E_, 4
+	note C#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 6
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 8
+	note E_, 8
 	octave 3
-	A_ 6
-	E_ 2
-	notetype 12, 11, 0
+	note A_, 6
+	note E_, 2
+	note_type 12, 11, 0
 	octave 4
-	C# 8
-	notetype 12, 12, 7
-	D_ 6
+	note C#, 8
+	note_type 12, 12, 7
+	note D_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 8
+	note G_, 8
 	octave 3
-	G_ 6
-	D_ 2
-	B_ 8
-	notetype 12, 11, 0
-	octave 4
-	C# 6
-	notetype 12, 11, 7
-	C# 6
-	D_ 4
-	notetype 12, 10, 0
-	E_ 8
-	notetype 12, 10, 7
-	E_ 8
-	notetype 12, 12, 7
-	D_ 6
+	note G_, 6
+	note D_, 2
+	note B_, 8
+	note_type 12, 11, 0
+	octave 4
+	note C#, 6
+	note_type 12, 11, 7
+	note C#, 6
+	note D_, 4
+	note_type 12, 10, 0
+	note E_, 8
+	note_type 12, 10, 7
+	note E_, 8
+	note_type 12, 12, 7
+	note D_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 8
+	note G_, 8
 	octave 3
-	G_ 6
-	D_ 2
-	B_ 8
-	notetype 12, 11, 0
-	octave 4
-	E_ 7
-	notetype 12, 11, 7
-	E_ 7
-	notetype 12, 12, 3
-	E_ 1
-	G# 1
-	notetype 12, 11, 0
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	notetype 12, 12, 6
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	notetype 12, 10, 0
-	C# 8
-	notetype 12, 10, 7
-	C# 8
-	notetype 12, 9, 0
+	note G_, 6
+	note D_, 2
+	note B_, 8
+	note_type 12, 11, 0
+	octave 4
+	note E_, 7
+	note_type 12, 11, 7
+	note E_, 7
+	note_type 12, 12, 3
+	note E_, 1
+	note G#, 1
+	note_type 12, 11, 0
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note_type 12, 12, 6
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 10, 0
+	note C#, 8
+	note_type 12, 10, 7
+	note C#, 8
+	note_type 12, 9, 0
 	octave 3
-	A_ 8
-	notetype 12, 9, 7
-	A_ 8
-	notetype 12, 11, 0
-	E_ 8
-	notetype 12, 11, 7
-	E_ 8
-	notetype 12, 12, 7
-	D_ 8
-	G_ 6
-	F# 1
-	F_ 1
-	E_ 8
-	notetype 12, 11, 7
-	G_ 6
-	F# 1
-	F_ 1
-	notetype 12, 11, 0
-	E_ 8
-	notetype 12, 11, 7
-	E_ 8
-	notetype 12, 11, 0
-	D_ 8
-	notetype 12, 11, 7
-	D_ 8
-	notetype 12, 12, 7
+	note A_, 8
+	note_type 12, 9, 7
+	note A_, 8
+	note_type 12, 11, 0
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 8
+	note_type 12, 12, 7
+	note D_, 8
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
+	note_type 12, 11, 7
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note_type 12, 11, 0
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 8
+	note_type 12, 11, 0
+	note D_, 8
+	note_type 12, 11, 7
+	note D_, 8
+	note_type 12, 12, 7
 	octave 2
-	B_ 8
+	note B_, 8
 	octave 3
-	F# 6
-	D_ 1
-	F# 1
-	E_ 8
-	B_ 6
-	G_ 1
-	B_ 1
-	notetype 12, 11, 0
-	octave 4
-	C# 8
-	notetype 12, 11, 7
-	C# 8
-	notetype 12, 11, 0
-	D_ 8
-	notetype 12, 11, 7
-	D_ 8
-	notetype 12, 12, 7
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note E_, 8
+	note B_, 6
+	note G_, 1
+	note B_, 1
+	note_type 12, 11, 0
+	octave 4
+	note C#, 8
+	note_type 12, 11, 7
+	note C#, 8
+	note_type 12, 11, 0
+	note D_, 8
+	note_type 12, 11, 7
+	note D_, 8
+	note_type 12, 12, 7
 	octave 3
-	B_ 8
+	note B_, 8
 	octave 4
-	D_ 6
+	note D_, 6
 	octave 3
-	B_ 1
-	octave 4
-	D_ 1
-	notetype 12, 11, 0
-	C# 6
-	notetype 12, 11, 7
-	C# 6
-	notetype 12, 12, 7
+	note B_, 1
+	octave 4
+	note D_, 1
+	note_type 12, 11, 0
+	note C#, 6
+	note_type 12, 11, 7
+	note C#, 6
+	note_type 12, 12, 7
 	octave 3
-	B_ 4
-	notetype 12, 11, 0
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	notetype 12, 11, 0
-	F# 6
-	notetype 12, 11, 7
-	F# 6
-	notetype 12, 12, 7
-	G# 4
-	A_ 8
-	F# 8
-	notetype 12, 11, 0
-	G# 6
-	notetype 12, 11, 7
-	G# 6
-	notetype 12, 12, 7
-	A_ 4
-	B_ 8
-	G# 8
-	notetype 12, 11, 0
-	A_ 6
-	notetype 12, 11, 7
-	A_ 6
-	notetype 12, 12, 7
-	B_ 4
-	octave 4
-	C_ 8
+	note B_, 4
+	note_type 12, 11, 0
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note_type 12, 11, 0
+	note F#, 6
+	note_type 12, 11, 7
+	note F#, 6
+	note_type 12, 12, 7
+	note G#, 4
+	note A_, 8
+	note F#, 8
+	note_type 12, 11, 0
+	note G#, 6
+	note_type 12, 11, 7
+	note G#, 6
+	note_type 12, 12, 7
+	note A_, 4
+	note B_, 8
+	note G#, 8
+	note_type 12, 11, 0
+	note A_, 6
+	note_type 12, 11, 7
+	note A_, 6
+	note_type 12, 12, 7
+	note B_, 4
+	octave 4
+	note C_, 8
 	octave 3
-	A_ 8
-	notetype 12, 11, 0
-	B_ 6
-	notetype 12, 11, 7
-	B_ 6
-	notetype 12, 12, 7
-	octave 4
-	C_ 4
-	notetype 12, 11, 0
-	D_ 8
+	note A_, 8
+	note_type 12, 11, 0
+	note B_, 6
+	note_type 12, 11, 7
+	note B_, 6
+	note_type 12, 12, 7
+	octave 4
+	note C_, 4
+	note_type 12, 11, 0
+	note D_, 8
 	octave 3
-	B_ 8
-	notetype 12, 11, 0
-	octave 4
-	C# 16
-	C# 8
-	notetype 12, 11, 7
-	C# 8
-	notetype 12, 11, 0
+	note B_, 8
+	note_type 12, 11, 0
+	octave 4
+	note C#, 16
+	note C#, 8
+	note_type 12, 11, 7
+	note C#, 8
+	note_type 12, 11, 0
 	octave 3
-	A_ 16
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	notetype 12, 12, 7
-	G_ 6
-	B_ 2
-	octave 4
-	D_ 8
+	note A_, 16
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note_type 12, 12, 7
+	note G_, 6
+	note B_, 2
+	octave 4
+	note D_, 8
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	D_ 2
-	G_ 6
-	F# 1
-	F_ 1
-	E_ 8
+	note D_, 2
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
 	octave 3
-	G_ 6
-	F# 1
-	F_ 1
-	E_ 8
-	C# 4
-	D_ 4
-	G_ 6
-	B_ 2
-	octave 4
-	D_ 8
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
+	note C#, 4
+	note D_, 4
+	note G_, 6
+	note B_, 2
+	octave 4
+	note D_, 8
 	octave 3
-	B_ 6
-	octave 4
-	D_ 2
-	G_ 8
-	notetype 12, 11, 0
-	A_ 16
-	notetype 12, 10, 0
-	A_ 8
-	notetype 12, 10, 7
-	A_ 8
-	notetype 12, 12, 1
-	A_ 2
-	A_ 4
-	A_ 1
-	A_ 1
-	notetype 12, 12, 1
-	A_ 8
-	endchannel
+	note B_, 6
+	octave 4
+	note D_, 2
+	note G_, 8
+	note_type 12, 11, 0
+	note A_, 16
+	note_type 12, 10, 0
+	note A_, 8
+	note_type 12, 10, 7
+	note A_, 8
+	note_type 12, 12, 1
+	note A_, 2
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	note_type 12, 12, 1
+	note A_, 8
+	sound_ret
 
 
-Music_Credits_Ch2::
-	notetype 12, 1, 0
+Music_Credits_Ch3::
+	note_type 12, 1, 0
 	octave 5
-	C# 6
+	note C#, 6
 	octave 4
-	A_ 1
+	note A_, 1
 	octave 5
-	C# 1
-	D_ 6
+	note C#, 1
+	note D_, 6
 	octave 4
-	B_ 1
+	note B_, 1
 	octave 5
-	D_ 1
-	F# 6
-	D_ 1
-	F# 1
-	A_ 4
-	G# 2
-	E_ 1
-	G# 1
-	A_ 1
+	note D_, 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note A_, 4
+	note G#, 2
+	note E_, 1
+	note G#, 1
+	note A_, 1
 	rest 15
 	rest 16
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffa4
-	octave 4
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffc1
-	octave 4
-	A_ 2
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffa4
+	octave 4
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffc1
+	octave 4
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
-	octave 4
-	B_ 2
-	A_ 2
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffc1
-	callchannel Music_Credits_branch_7ffc1
-	octave 4
-	G_ 4
-	A_ 4
-	B_ 4
+	note C#, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffc1
+	sound_call Music_Credits_branch_7ffc1
+	octave 4
+	note G_, 4
+	note A_, 4
+	note B_, 4
 	octave 5
-	D_ 4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffa4
-	E_ 4
-	A_ 2
-	E_ 4
-	A_ 2
-	E_ 2
-	A_ 2
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffae
-	callchannel Music_Credits_branch_7ffa4
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	callchannel Music_Credits_branch_7ffd2
-	callchannel Music_Credits_branch_7ffd2
-	callchannel Music_Credits_branch_7ffdb
-	callchannel Music_Credits_branch_7ffdb
-	F_ 2
-	A_ 2
-	F_ 2
-	A_ 2
-	F_ 2
-	A_ 2
-	F_ 2
-	A_ 2
-	F_ 2
-	A_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffb8
-	E_ 4
-	A_ 4
-	E_ 4
-	A_ 4
-	E_ 4
-	A_ 4
-	E_ 4
-	A_ 4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffe4
-	callchannel Music_Credits_branch_7ffe4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffa4
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffb8
-	callchannel Music_Credits_branch_7ffed
-	callchannel Music_Credits_branch_7ffed
-	A_ 1
+	note D_, 4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffa4
+	note E_, 4
+	note A_, 2
+	note E_, 4
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffae
+	sound_call Music_Credits_branch_7ffa4
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	sound_call Music_Credits_branch_7ffd2
+	sound_call Music_Credits_branch_7ffd2
+	sound_call Music_Credits_branch_7ffdb
+	sound_call Music_Credits_branch_7ffdb
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffb8
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffe4
+	sound_call Music_Credits_branch_7ffe4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffa4
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffb8
+	sound_call Music_Credits_branch_7ffed
+	sound_call Music_Credits_branch_7ffed
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
-	A_ 1
-	A_ 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	rest 7
-	endchannel
+	sound_ret
 
 Music_Credits_branch_7ffa4::
 	octave 4
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	endchannel
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	sound_ret
 
 Music_Credits_branch_7ffae::
 	octave 4
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	endchannel
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	sound_ret
 
 Music_Credits_branch_7ffb8::
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	endchannel
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	sound_ret
 
 Music_Credits_branch_7ffc1::
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
-	endchannel
+	note C#, 2
+	sound_ret
 
 Music_Credits_branch_7ffd2::
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	endchannel
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	sound_ret
 
 Music_Credits_branch_7ffdb::
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	endchannel
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	sound_ret
 
 Music_Credits_branch_7ffe4::
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	endchannel
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	sound_ret
 
 Music_Credits_branch_7ffed::
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
-	A_ 1
-	A_ 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	endchannel
+	sound_ret
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 1ea6c1ff..94c9eae3 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -1,607 +1,607 @@
-Music_DefeatedGymLeader_Ch0::
+Music_DefeatedGymLeader_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 18, 3, 1
-	toggleperfectpitch
+	toggle_perfect_pitch
 	tempo 112
-	notetype 12, 10, 6
+	note_type 12, 10, 6
 	octave 4
-	D_ 6
+	note D_, 6
 	octave 3
-	A_ 1
+	note A_, 1
 	octave 4
-	D_ 1
-	F# 6
-	D_ 1
-	F# 1
-	notetype 12, 10, 0
-	A_ 8
-	notetype 12, 10, 7
-	A_ 8
+	note D_, 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note_type 12, 10, 0
+	note A_, 8
+	note_type 12, 10, 7
+	note A_, 8
 
 Music_DefeatedGymLeader_branch_23ccc::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 3
-	A_ 2
-	A_ 2
-	F# 4
-	G_ 2
-	G_ 2
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 4
-	D_ 4
-	A_ 2
-	A_ 2
-	F# 4
-	G_ 2
-	G_ 2
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 2
-	C# 2
-	notetype 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note D_, 4
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note_type 12, 11, 1
 	octave 2
-	B_ 8
-	notetype 12, 11, 2
+	note B_, 8
+	note_type 12, 11, 2
 	octave 3
-	A_ 2
-	A_ 2
-	F# 4
-	G_ 2
-	G_ 2
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 4
-	D_ 4
-	A_ 2
-	A_ 2
-	F# 4
-	G_ 2
-	G_ 2
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 2
-	C# 2
-	notetype 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note D_, 4
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note_type 12, 11, 1
 	octave 2
-	B_ 8
-	notetype 12, 9, 7
+	note B_, 8
+	note_type 12, 9, 7
 	octave 3
-	D_ 6
+	note D_, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	D_ 1
-	F# 8
-	notetype 12, 11, 0
-	F# 6
-	E_ 1
-	F# 1
-	A_ 8
-	notetype 12, 9, 7
-	E_ 6
-	C# 1
-	E_ 1
-	G# 8
-	notetype 12, 11, 0
-	G# 6
-	E_ 1
-	G# 1
-	B_ 8
-	notetype 12, 9, 7
-	C# 6
+	note D_, 1
+	note F#, 8
+	note_type 12, 11, 0
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	note_type 12, 9, 7
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note G#, 8
+	note_type 12, 11, 0
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	note B_, 8
+	note_type 12, 9, 7
+	note C#, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	C# 1
-	E_ 8
-	notetype 12, 11, 0
-	E_ 6
-	C# 1
-	E_ 1
-	E_ 4
-	G_ 4
-	notetype 12, 9, 0
-	F# 8
-	E_ 8
-	D_ 8
-	C# 8
-	notetype 12, 9, 7
-	D_ 6
+	note C#, 1
+	note E_, 8
+	note_type 12, 11, 0
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note E_, 4
+	note G_, 4
+	note_type 12, 9, 0
+	note F#, 8
+	note E_, 8
+	note D_, 8
+	note C#, 8
+	note_type 12, 9, 7
+	note D_, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	D_ 1
-	F# 8
-	notetype 12, 11, 0
-	F# 6
-	E_ 1
-	F# 1
-	A_ 8
-	notetype 12, 9, 7
-	E_ 6
-	C# 1
-	E_ 1
-	G# 8
-	notetype 12, 11, 0
-	G# 6
-	E_ 1
-	G# 1
-	B_ 8
-	notetype 12, 9, 7
-	C# 6
+	note D_, 1
+	note F#, 8
+	note_type 12, 11, 0
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	note_type 12, 9, 7
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note G#, 8
+	note_type 12, 11, 0
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	note B_, 8
+	note_type 12, 9, 7
+	note C#, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	C# 1
-	E_ 8
-	notetype 12, 11, 0
-	E_ 6
-	C# 1
-	E_ 1
-	E_ 4
-	G_ 4
-	notetype 12, 9, 7
-	F# 6
-	E_ 1
-	F# 1
-	A_ 8
-	notetype 12, 10, 7
-	G_ 8
-	E_ 8
-	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
+	note C#, 1
+	note E_, 8
+	note_type 12, 11, 0
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note E_, 4
+	note G_, 4
+	note_type 12, 9, 7
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	note_type 12, 10, 7
+	note G_, 8
+	note E_, 8
+	sound_loop 0, Music_DefeatedGymLeader_branch_23ccc
 
 
-Music_DefeatedGymLeader_Ch1::
-	duty 2
+Music_DefeatedGymLeader_Ch2::
+	duty_cycle 2
 	vibrato 24, 2, 4
-	notetype 12, 12, 4
+	note_type 12, 12, 4
 	octave 4
-	A_ 6
-	F# 1
-	A_ 1
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 5
-	D_ 6
+	note D_, 6
 	octave 4
-	A_ 1
+	note A_, 1
 	octave 5
-	D_ 1
-	notetype 12, 11, 0
-	F# 8
-	notetype 12, 11, 7
-	F# 8
+	note D_, 1
+	note_type 12, 11, 0
+	note F#, 8
+	note_type 12, 11, 7
+	note F#, 8
 
 Music_DefeatedGymLeader_branch_23d84::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	notetype 12, 12, 4
-	A_ 4
-	A_ 4
-	notetype 12, 12, 2
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note_type 12, 12, 4
+	note A_, 4
+	note A_, 4
+	note_type 12, 12, 2
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	notetype 12, 12, 1
-	D_ 6
-	notetype 6, 12, 2
-	G_ 1
-	A_ 1
-	B_ 1
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note_type 12, 12, 1
+	note D_, 6
+	note_type 6, 12, 2
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	C# 1
-	notetype 12, 12, 2
-	D_ 2
-	C# 2
+	note C#, 1
+	note_type 12, 12, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	notetype 12, 12, 4
-	A_ 4
-	A_ 3
-	notetype 6, 12, 2
-	B_ 1
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note_type 12, 12, 4
+	note A_, 4
+	note A_, 3
+	note_type 6, 12, 2
+	note B_, 1
 	octave 4
-	C# 1
-	notetype 12, 12, 2
-	D_ 2
-	C# 2
+	note C#, 1
+	note_type 12, 12, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	notetype 12, 12, 1
-	D_ 8
-	notetype 12, 12, 7
-	A_ 6
-	F# 1
-	A_ 1
-	notetype 12, 11, 0
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note_type 12, 12, 1
+	note D_, 8
+	note_type 12, 12, 7
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	note_type 12, 11, 0
 	octave 4
-	D_ 8
-	notetype 12, 10, 0
-	D_ 8
-	notetype 12, 9, 7
-	D_ 8
-	notetype 12, 12, 7
+	note D_, 8
+	note_type 12, 10, 0
+	note D_, 8
+	note_type 12, 9, 7
+	note D_, 8
+	note_type 12, 12, 7
 	octave 3
-	B_ 6
-	G# 1
-	B_ 1
-	notetype 12, 8, 0
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	note_type 12, 8, 0
 	octave 4
-	E_ 8
-	notetype 12, 10, 0
-	E_ 8
-	notetype 12, 12, 7
-	E_ 8
+	note E_, 8
+	note_type 12, 10, 0
+	note E_, 8
+	note_type 12, 12, 7
+	note E_, 8
 	octave 3
-	G_ 6
-	E_ 1
-	G_ 1
-	notetype 12, 6, 15
+	note G_, 6
+	note E_, 1
+	note G_, 1
+	note_type 12, 6, 15
 	octave 4
-	C# 8
-	notetype 12, 12, 7
-	C# 8
-	F# 4
-	E_ 4
-	notetype 12, 11, 0
-	D_ 14
+	note C#, 8
+	note_type 12, 12, 7
+	note C#, 8
+	note F#, 4
+	note E_, 4
+	note_type 12, 11, 0
+	note D_, 14
 	octave 3
-	B_ 2
-	notetype 12, 10, 0
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	notetype 12, 12, 7
-	A_ 6
-	F# 1
-	A_ 1
-	notetype 12, 11, 0
+	note B_, 2
+	note_type 12, 10, 0
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note_type 12, 12, 7
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	note_type 12, 11, 0
 	octave 4
-	D_ 8
-	notetype 12, 10, 0
-	D_ 8
-	notetype 12, 9, 7
-	D_ 8
-	notetype 12, 12, 7
+	note D_, 8
+	note_type 12, 10, 0
+	note D_, 8
+	note_type 12, 9, 7
+	note D_, 8
+	note_type 12, 12, 7
 	octave 3
-	B_ 6
-	G# 1
-	B_ 1
-	notetype 12, 4, 15
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	note_type 12, 4, 15
 	octave 4
-	E_ 8
-	notetype 12, 11, 0
-	E_ 8
-	notetype 12, 12, 7
-	E_ 8
+	note E_, 8
+	note_type 12, 11, 0
+	note E_, 8
+	note_type 12, 12, 7
+	note E_, 8
 	octave 3
-	G_ 6
-	E_ 1
-	G_ 1
-	notetype 12, 11, 0
+	note G_, 6
+	note E_, 1
+	note G_, 1
+	note_type 12, 11, 0
 	octave 4
-	C# 8
-	notetype 12, 11, 7
-	C# 8
+	note C#, 8
+	note_type 12, 11, 7
+	note C#, 8
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C# 4
-	notetype 12, 11, 0
-	D_ 14
-	E_ 2
-	D_ 12
-	notetype 12, 12, 2
+	note C#, 4
+	note_type 12, 11, 0
+	note D_, 14
+	note E_, 2
+	note D_, 12
+	note_type 12, 12, 2
 	octave 3
-	G_ 1
-	A_ 1
-	B_ 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	C# 1
-	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
+	note C#, 1
+	sound_loop 0, Music_DefeatedGymLeader_branch_23d84
 
 
-Music_DefeatedGymLeader_Ch2::
-	notetype 12, 1, 0
+Music_DefeatedGymLeader_Ch3::
+	note_type 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
-	F# 6
-	D_ 1
-	F# 1
-	A_ 6
-	F# 1
-	A_ 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 5
-	D_ 6
+	note D_, 6
 	octave 4
-	A_ 1
+	note A_, 1
 	octave 5
-	D_ 1
-	F# 8
+	note D_, 1
+	note F#, 8
 
 Music_DefeatedGymLeader_branch_23e65::
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F# 3
+	note F#, 3
 	rest 1
-	F# 3
+	note F#, 3
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 5
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 3
+	note G_, 3
 	rest 1
-	D_ 3
+	note D_, 3
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 7
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	C# 2
-	D_ 2
-	E_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	C# 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	E_ 2
-	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	sound_loop 0, Music_DefeatedGymLeader_branch_23e65
diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 87c5d2c9..158d755c 100644
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -1,266 +1,266 @@
-Music_DefeatedTrainer_Ch0::
+Music_DefeatedTrainer_Ch1::
 	tempo 224
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
+	duty_cycle 2
+	toggle_perfect_pitch
 	tempo 224
-	notetype 4, 10, 2
+	note_type 4, 10, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	tempo 224
-	notetype 4, 10, 2
-	D_ 2
-	D_ 2
-	D_ 2
+	note_type 4, 10, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
-	notetype 4, 11, 3
-	F# 12
-	duty 1
+	note D_, 2
+	note_type 4, 11, 3
+	note F#, 12
+	duty_cycle 1
 	tempo 224
 
 Music_DefeatedTrainer_branch_23a76::
-	notetype 4, 6, 3
+	note_type 4, 6, 3
 	octave 3
-	A_ 6
-	F# 3
-	A_ 3
-	B_ 6
-	G# 3
-	B_ 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	B_ 3
-	A_ 3
-	G_ 3
-	A_ 3
-	B_ 3
-	A_ 3
-	G_ 3
-	A_ 6
-	F# 3
-	A_ 3
-	B_ 6
-	G# 3
-	B_ 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
 	octave 4
-	C# 3
-	D_ 3
-	E_ 3
-	F# 3
-	C# 3
+	note C#, 3
+	note D_, 3
+	note E_, 3
+	note F#, 3
+	note C#, 3
 	octave 3
-	B_ 3
-	A_ 3
+	note B_, 3
+	note A_, 3
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	A_ 6
-	F# 3
-	A_ 3
-	B_ 6
-	G# 3
-	B_ 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 3
+	note A_, 3
 	octave 4
-	C_ 3
-	D_ 3
+	note C_, 3
+	note D_, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	D_ 6
-	C# 3
+	note D_, 6
+	note C#, 3
 	octave 3
-	B_ 3
-	A_ 3
-	G_ 3
-	F# 3
-	G_ 3
-	A_ 3
-	B_ 3
-	A_ 3
-	G_ 3
-	F# 3
-	E_ 3
-	F# 3
-	G_ 3
-	A_ 3
-	B_ 3
-	loopchannel 0, Music_DefeatedTrainer_branch_23a76
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	sound_loop 0, Music_DefeatedTrainer_branch_23a76
 
 
-Music_DefeatedTrainer_Ch1::
-	duty 2
-	notetype 4, 12, 3
+Music_DefeatedTrainer_Ch2::
+	duty_cycle 2
+	note_type 4, 12, 3
 	octave 4
-	A_ 2
-	notetype 4, 12, 3
-	A_ 2
-	A_ 2
-	A_ 2
-	B_ 2
+	note A_, 2
+	note_type 4, 12, 3
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	C# 2
-	notetype 4, 12, 4
-	D_ 12
+	note C#, 2
+	note_type 4, 12, 4
+	note D_, 12
 
 Music_DefeatedTrainer_branch_23ad2::
-	notetype 4, 8, 5
+	note_type 4, 8, 5
 	octave 4
-	D_ 6
+	note D_, 6
 	octave 3
-	A_ 3
+	note A_, 3
 	octave 4
-	D_ 3
-	E_ 6
+	note D_, 3
+	note E_, 6
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 3
-	F# 3
-	G_ 3
-	A_ 6
-	E_ 3
-	F# 3
-	G_ 6
-	D_ 6
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note E_, 3
+	note F#, 3
+	note G_, 6
+	note D_, 6
 	octave 3
-	A_ 3
+	note A_, 3
 	octave 4
-	D_ 3
-	E_ 6
+	note D_, 3
+	note E_, 6
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 3
-	F# 3
-	G_ 3
-	A_ 6
-	F# 3
-	G_ 3
-	A_ 6
-	D_ 6
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note D_, 6
 	octave 3
-	A_ 3
+	note A_, 3
 	octave 4
-	D_ 3
-	E_ 6
+	note D_, 3
+	note E_, 6
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 3
-	F_ 6
-	C_ 3
-	F_ 3
-	G_ 3
-	D_ 3
-	G_ 6
-	notetype 4, 7, 0
-	F# 12
-	notetype 4, 7, 7
-	F# 12
-	notetype 4, 6, 0
-	E_ 12
-	notetype 4, 6, 7
-	E_ 12
-	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
+	note E_, 3
+	note F_, 6
+	note C_, 3
+	note F_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 6
+	note_type 4, 7, 0
+	note F#, 12
+	note_type 4, 7, 7
+	note F#, 12
+	note_type 4, 6, 0
+	note E_, 12
+	note_type 4, 6, 7
+	note E_, 12
+	sound_loop 0, Music_DefeatedTrainer_branch_23ad2
 
 
-Music_DefeatedTrainer_Ch2::
-	notetype 4, 1, 0
+Music_DefeatedTrainer_Ch3::
+	note_type 4, 1, 0
 	octave 5
-	D_ 2
-	notetype 4, 1, 0
-	D_ 2
-	D_ 2
+	note D_, 2
+	note_type 4, 1, 0
+	note D_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	G_ 2
-	A_ 12
-	notetype 4, 2, 1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 12
+	note_type 4, 2, 1
 
 Music_DefeatedTrainer_branch_23b24::
-	F# 3
+	note F#, 3
 	rest 3
-	F# 3
+	note F#, 3
 	rest 3
-	G# 3
+	note G#, 3
 	rest 3
-	G# 3
+	note G#, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
-	B_ 3
+	note B_, 3
 	rest 3
-	B_ 3
+	note B_, 3
 	rest 3
-	F# 3
+	note F#, 3
 	rest 3
-	F# 3
+	note F#, 3
 	rest 3
-	G# 3
+	note G#, 3
 	rest 3
-	G# 3
+	note G#, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
 	octave 5
-	C# 3
+	note C#, 3
 	rest 3
-	C# 3
+	note C#, 3
 	octave 4
-	A_ 3
-	F# 3
+	note A_, 3
+	note F#, 3
 	octave 5
-	D_ 3
+	note D_, 3
 	octave 4
-	F# 3
+	note F#, 3
 	rest 3
-	G# 3
+	note G#, 3
 	octave 5
-	E_ 3
+	note E_, 3
 	octave 4
-	G# 3
+	note G#, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	octave 5
-	F_ 3
+	note F_, 3
 	octave 4
-	A_ 3
+	note A_, 3
 	rest 3
-	B_ 3
+	note B_, 3
 	octave 5
-	G_ 3
+	note G_, 3
 	octave 4
-	B_ 3
-	A# 3
-	A_ 3
+	note B_, 3
+	note A#, 3
+	note A_, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	rest 3
-	A_ 3
+	note A_, 3
 	octave 5
-	C_ 3
-	C# 3
+	note C_, 3
+	note C#, 3
 	rest 3
-	C# 3
+	note C#, 3
 	rest 3
-	C# 3
+	note C#, 3
 	rest 3
-	C# 3
+	note C#, 3
 	octave 4
-	A_ 3
-	loopchannel 0, Music_DefeatedTrainer_branch_23b24
+	note A_, 3
+	sound_loop 0, Music_DefeatedTrainer_branch_23b24
diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index ea3f733f..364f548e 100644
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -1,302 +1,302 @@
-Music_DefeatedWildMon_Ch0::
+Music_DefeatedWildMon_Ch1::
 	tempo 112
 	volume 7, 7
-	executemusic
-	duty 3
+	execute_music
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 	tempo 112
-	notetype 12, 11, 7
+	note_type 12, 11, 7
 	octave 3
-	B_ 1
-	A_ 1
-	G# 1
-	F# 1
-	E_ 12
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 12
 
 Music_DefeatedWildMon_branch_23b8b::
-	notetype 12, 6, 2
-	E_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	G# 2
-	G# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	G# 2
-	G# 2
-	G# 4
-	E_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	G# 2
-	G# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	G# 8
-	F_ 2
-	G_ 2
-	F_ 2
-	G_ 2
-	A_ 2
-	A_ 2
-	A_ 4
-	A# 2
-	A# 2
-	A# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	G_ 2
-	A_ 2
-	A_ 2
-	A_ 4
-	A# 2
-	A# 2
-	A# 4
-	A_ 8
-	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
+	note_type 12, 6, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 8
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 8
+	sound_loop 0, Music_DefeatedWildMon_branch_23b8b
 
 
-Music_DefeatedWildMon_Ch1::
-	executemusic
-	duty 2
-	notetype 12, 12, 3
+Music_DefeatedWildMon_Ch2::
+	execute_music
+	duty_cycle 2
+	note_type 12, 12, 3
 	octave 4
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 12, 12, 7
-	B_ 12
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 12, 12, 7
+	note B_, 12
 
 Music_DefeatedWildMon_branch_23bce::
-	notetype 12, 8, 2
+	note_type 12, 8, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	B_ 2
-	B_ 2
-	B_ 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
 	octave 4
-	C# 2
-	C# 2
-	C# 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
 	octave 3
-	B_ 2
-	B_ 2
-	B_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	B_ 2
-	B_ 2
-	B_ 4
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
 	octave 4
-	C# 2
-	C# 2
-	C# 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
 	octave 3
-	B_ 8
+	note B_, 8
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	A# 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	C_ 2
-	C_ 2
-	C_ 4
-	D_ 2
-	D_ 2
-	D_ 4
-	C_ 2
-	C_ 2
-	C_ 4
-	C_ 2
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	A# 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	C_ 2
-	C_ 2
-	C_ 4
-	D_ 2
-	D_ 2
-	D_ 4
-	C_ 8
-	loopchannel 0, Music_DefeatedWildMon_branch_23bce
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 8
+	sound_loop 0, Music_DefeatedWildMon_branch_23bce
 
 
-Music_DefeatedWildMon_Ch2::
-	executemusic
-	notetype 12, 2, 0
+Music_DefeatedWildMon_Ch3::
+	execute_music
+	note_type 12, 2, 0
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
 
 Music_DefeatedWildMon_branch_23c21::
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	D# 1
+	note D#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	D# 4
+	note D#, 4
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	D# 4
-	loopchannel 0, Music_DefeatedWildMon_branch_23c21
+	note D#, 4
+	sound_loop 0, Music_DefeatedWildMon_branch_23c21
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index c6f6b105..a28b31e6 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -1,610 +1,610 @@
-Music_Dungeon1_Ch0::
+Music_Dungeon1_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 10, 1, 4
-	notetype 12, 4, 13
+	note_type 12, 4, 13
 	rest 8
-	stereopanning 237
+	stereo_panning 237
 	octave 4
-	F# 8
-	stereopanning 255
+	note F#, 8
+	stereo_panning 255
 
 Music_Dungeon1_branch_7dee5::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 3
 
 Music_Dungeon1_branch_7dee8::
-	callchannel Music_Dungeon1_branch_7dfaa
-	loopchannel 3, Music_Dungeon1_branch_7dee8
-	E_ 1
-	D# 1
-	B_ 1
-	A# 1
-	G_ 1
-	G# 1
+	sound_call Music_Dungeon1_branch_7dfaa
+	sound_loop 3, Music_Dungeon1_branch_7dee8
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
 	rest 1
-	A# 1
-	E_ 1
-	D# 1
-	B_ 1
-	A# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
+	note A#, 1
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
 
 Music_Dungeon1_branch_7deff::
-	callchannel Music_Dungeon1_branch_7dfaa
-	loopchannel 4, Music_Dungeon1_branch_7deff
-	callchannel Music_Dungeon1_branch_7dfd5
-	octave 3
-	G_ 1
-	F# 1
-	E_ 1
-	G_ 1
-	callchannel Music_Dungeon1_branch_7dfd5
-	octave 3
-	A_ 1
-	G_ 1
-	E_ 1
-	A_ 1
-	callchannel Music_Dungeon1_branch_7dfd5
-	octave 3
-	B_ 1
-	A_ 1
-	G_ 1
-	F# 1
-	notetype 12, 12, 3
-	G_ 4
-	F# 4
-	E_ 4
-	D# 4
-	notetype 12, 12, 2
-	callchannel Music_Dungeon1_branch_7dfc5
-	octave 3
-	B_ 3
-	callchannel Music_Dungeon1_branch_7dfc5
-	C_ 3
-	callchannel Music_Dungeon1_branch_7dfc5
-	C# 3
-	notetype 12, 12, 3
-	octave 3
-	G_ 4
-	F# 4
-	E_ 4
-	D# 4
-	E_ 4
-	D# 4
-	C_ 4
+	sound_call Music_Dungeon1_branch_7dfaa
+	sound_loop 4, Music_Dungeon1_branch_7deff
+	sound_call Music_Dungeon1_branch_7dfd5
+	octave 3
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note G_, 1
+	sound_call Music_Dungeon1_branch_7dfd5
+	octave 3
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	sound_call Music_Dungeon1_branch_7dfd5
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note_type 12, 12, 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note_type 12, 12, 2
+	sound_call Music_Dungeon1_branch_7dfc5
+	octave 3
+	note B_, 3
+	sound_call Music_Dungeon1_branch_7dfc5
+	note C_, 3
+	sound_call Music_Dungeon1_branch_7dfc5
+	note C#, 3
+	note_type 12, 12, 3
+	octave 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
 	octave 2
-	B_ 4
-	notetype 12, 12, 2
-	B_ 1
-	A# 1
-	G_ 1
-	A# 1
-	B_ 1
-	A# 1
-	G_ 1
-	A# 1
-	octave 3
-	C_ 1
+	note B_, 4
+	note_type 12, 12, 2
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 3
+	note C_, 1
 	octave 2
-	B_ 1
-	G# 1
-	B_ 1
+	note B_, 1
+	note G#, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	G# 1
-	B_ 1
+	note B_, 1
+	note G#, 1
+	note B_, 1
 	octave 3
-	C# 1
-	C_ 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	C_ 1
-	C# 1
-	C_ 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	C_ 1
-	D_ 1
-	C# 1
+	note C_, 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	A# 1
+	note A#, 1
 	octave 3
-	C# 1
-	D_ 1
-	C# 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	A# 1
+	note A#, 1
 	octave 3
-	C# 1
+	note C#, 1
 
 Music_Dungeon1_branch_7df6e::
 	rest 16
-	loopchannel 8, Music_Dungeon1_branch_7df6e
-	notetype 12, 12, 3
-	callchannel Music_Dungeon1_branch_7dfbb
-	B_ 2
-	G_ 2
+	sound_loop 8, Music_Dungeon1_branch_7df6e
+	note_type 12, 12, 3
+	sound_call Music_Dungeon1_branch_7dfbb
+	note B_, 2
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A_ 4
-	F# 2
-	callchannel Music_Dungeon1_branch_7dfbb
-	A# 2
-	G_ 2
-	B_ 4
-	G_ 2
-	F# 2
-	G_ 2
-	D# 2
-	notetype 12, 12, 2
-	callchannel Music_Dungeon1_branch_7dfc5
-	octave 3
-	B_ 3
-	callchannel Music_Dungeon1_branch_7dfc5
-	C_ 3
-	callchannel Music_Dungeon1_branch_7dfc5
-	C# 3
-	notetype 12, 12, 7
-	octave 3
-	F# 8
-	D# 8
-	notetype 12, 12, 2
-	callchannel Music_Dungeon1_branch_7dfaa
-	callchannel Music_Dungeon1_branch_7dfaa
-	loopchannel 0, Music_Dungeon1_branch_7dee5
+	note G_, 2
+	note A_, 4
+	note F#, 2
+	sound_call Music_Dungeon1_branch_7dfbb
+	note A#, 2
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note D#, 2
+	note_type 12, 12, 2
+	sound_call Music_Dungeon1_branch_7dfc5
+	octave 3
+	note B_, 3
+	sound_call Music_Dungeon1_branch_7dfc5
+	note C_, 3
+	sound_call Music_Dungeon1_branch_7dfc5
+	note C#, 3
+	note_type 12, 12, 7
+	octave 3
+	note F#, 8
+	note D#, 8
+	note_type 12, 12, 2
+	sound_call Music_Dungeon1_branch_7dfaa
+	sound_call Music_Dungeon1_branch_7dfaa
+	sound_loop 0, Music_Dungeon1_branch_7dee5
 
 Music_Dungeon1_branch_7dfaa::
-	E_ 1
-	D# 1
-	B_ 1
-	A# 1
-	G_ 1
-	G# 1
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
 	rest 1
-	A# 1
-	E_ 1
-	D# 1
-	B_ 1
-	A# 1
-	G_ 1
-	G# 1
+	note A#, 1
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
 	rest 1
-	A# 1
-	endchannel
+	note A#, 1
+	sound_ret
 
 Music_Dungeon1_branch_7dfbb::
 	octave 2
-	G_ 2
-	A# 4
-	G_ 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A# 2
-	endchannel
+	note G_, 2
+	note A#, 2
+	sound_ret
 
 Music_Dungeon1_branch_7dfc5::
 	octave 3
-	E_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	G_ 1
-	E_ 1
-	A_ 1
-	E_ 1
-	A# 1
-	E_ 1
-	B_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A#, 1
+	note E_, 1
+	note B_, 1
+	note E_, 1
 	octave 4
-	C_ 1
-	endchannel
+	note C_, 1
+	sound_ret
 
 Music_Dungeon1_branch_7dfd5::
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 4
 	octave 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	endchannel
+	sound_ret
 
 
-Music_Dungeon1_Ch1::
+Music_Dungeon1_Ch2::
 	vibrato 11, 1, 5
-	duty 3
-	notetype 12, 0, 15
+	duty_cycle 3
+	note_type 12, 0, 15
 	octave 4
-	G# 8
-	notetype 12, 4, 13
+	note G#, 8
+	note_type 12, 4, 13
 	octave 5
-	D_ 8
+	note D_, 8
 
 Music_Dungeon1_branch_7dfeb::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 
 Music_Dungeon1_branch_7dfed::
-	callchannel Music_Dungeon1_branch_7e097
-	loopchannel 3, Music_Dungeon1_branch_7dfed
+	sound_call Music_Dungeon1_branch_7e097
+	sound_loop 3, Music_Dungeon1_branch_7dfed
 	octave 2
-	E_ 1
-	E_ 1
-	B_ 1
+	note E_, 1
+	note E_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	rest 2
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	E_ 1
-	E_ 1
-	A_ 1
-	G_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	D# 1
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note D#, 1
 
 Music_Dungeon1_branch_7e006::
-	callchannel Music_Dungeon1_branch_7e097
-	loopchannel 4, Music_Dungeon1_branch_7e006
+	sound_call Music_Dungeon1_branch_7e097
+	sound_loop 4, Music_Dungeon1_branch_7e006
 	rest 2
-	callchannel Music_Dungeon1_branch_7e0ab
+	sound_call Music_Dungeon1_branch_7e0ab
 	octave 3
-	C_ 4
-	callchannel Music_Dungeon1_branch_7e0ab
+	note C_, 4
+	sound_call Music_Dungeon1_branch_7e0ab
 	octave 3
-	C# 4
-	callchannel Music_Dungeon1_branch_7e0ab
+	note C#, 4
+	sound_call Music_Dungeon1_branch_7e0ab
 	octave 3
-	D# 4
-	notetype 12, 13, 3
+	note D#, 4
+	note_type 12, 13, 3
 	octave 4
-	E_ 4
-	D# 4
-	C_ 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
 	octave 3
-	B_ 4
-	notetype 12, 13, 2
-	callchannel Music_Dungeon1_branch_7e0b5
+	note B_, 4
+	note_type 12, 13, 2
+	sound_call Music_Dungeon1_branch_7e0b5
 	octave 3
-	F# 4
-	callchannel Music_Dungeon1_branch_7e0b5
+	note F#, 4
+	sound_call Music_Dungeon1_branch_7e0b5
 	octave 3
-	G_ 4
-	callchannel Music_Dungeon1_branch_7e0b5
+	note G_, 4
+	sound_call Music_Dungeon1_branch_7e0b5
 	octave 3
-	A# 4
-	notetype 12, 13, 3
+	note A#, 4
+	note_type 12, 13, 3
 	octave 4
-	E_ 4
-	D# 4
-	C_ 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
-	octave 3
-	B_ 4
-	G_ 4
-	F# 2
-	notetype 12, 13, 6
-	E_ 8
-	F_ 8
-	F# 8
-	G_ 8
-	notetype 12, 13, 2
-	callchannel Music_Dungeon1_branch_7e0ba
+	note C_, 4
+	octave 3
+	note B_, 4
+	note G_, 4
+	note F#, 2
+	note_type 12, 13, 6
+	note E_, 8
+	note F_, 8
+	note F#, 8
+	note G_, 8
+	note_type 12, 13, 2
+	sound_call Music_Dungeon1_branch_7e0ba
 	rest 10
-	E_ 1
+	note E_, 1
 	rest 1
-	callchannel Music_Dungeon1_branch_7e0ba
+	sound_call Music_Dungeon1_branch_7e0ba
 	rest 12
-	callchannel Music_Dungeon1_branch_7e0ba
+	sound_call Music_Dungeon1_branch_7e0ba
 	rest 12
-	callchannel Music_Dungeon1_branch_7e0ba
+	sound_call Music_Dungeon1_branch_7e0ba
 	rest 14
-	notetype 12, 13, 3
-	callchannel Music_Dungeon1_branch_7e0cd
-	D# 4
-	callchannel Music_Dungeon1_branch_7e0cd
-	D# 2
+	note_type 12, 13, 3
+	sound_call Music_Dungeon1_branch_7e0cd
+	note D#, 4
+	sound_call Music_Dungeon1_branch_7e0cd
+	note D#, 2
 	rest 2
-	notetype 12, 13, 2
-	callchannel Music_Dungeon1_branch_7e0c0
+	note_type 12, 13, 2
+	sound_call Music_Dungeon1_branch_7e0c0
 	rest 2
 	octave 3
-	F# 4
+	note F#, 4
 	octave 2
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	rest 2
 	octave 3
-	G_ 4
-	callchannel Music_Dungeon1_branch_7e0c0
+	note G_, 4
+	sound_call Music_Dungeon1_branch_7e0c0
 	octave 3
-	A# 4
-	notetype 12, 13, 6
-	B_ 8
+	note A#, 4
+	note_type 12, 13, 6
+	note B_, 8
 	octave 4
-	D# 8
-	notetype 12, 13, 2
-	callchannel Music_Dungeon1_branch_7e097
-	callchannel Music_Dungeon1_branch_7e097
-	loopchannel 0, Music_Dungeon1_branch_7dfeb
+	note D#, 8
+	note_type 12, 13, 2
+	sound_call Music_Dungeon1_branch_7e097
+	sound_call Music_Dungeon1_branch_7e097
+	sound_loop 0, Music_Dungeon1_branch_7dfeb
 
 Music_Dungeon1_branch_7e097::
 	octave 2
-	E_ 1
-	E_ 1
-	B_ 1
+	note E_, 1
+	note E_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	rest 2
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	E_ 1
-	E_ 1
-	B_ 1
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	rest 2
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	endchannel
+	note B_, 1
+	sound_ret
 
 Music_Dungeon1_branch_7e0ab::
 	octave 2
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	endchannel
+	sound_ret
 
 Music_Dungeon1_branch_7e0b5::
 	octave 2
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 10
-	endchannel
+	sound_ret
 
 Music_Dungeon1_branch_7e0ba::
 	octave 1
-	E_ 1
-	G_ 1
-	E_ 1
-	D# 1
-	endchannel
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	sound_ret
 
 Music_Dungeon1_branch_7e0c0::
 	octave 2
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	C# 1
-	C_ 1
-	endchannel
+	note C#, 1
+	note C_, 1
+	sound_ret
 
 Music_Dungeon1_branch_7e0cd::
 	octave 3
-	E_ 6
-	G_ 6
-	E_ 4
-	A_ 6
+	note E_, 6
+	note G_, 6
+	note E_, 4
+	note A_, 6
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 4
-	G_ 6
-	A# 6
-	F# 4
-	E_ 6
-	F# 6
-	endchannel
+	note B_, 4
+	note G_, 6
+	note A#, 6
+	note F#, 4
+	note E_, 6
+	note F#, 6
+	sound_ret
 
 
-Music_Dungeon1_Ch2::
-	notetype 12, 1, 1
+Music_Dungeon1_Ch3::
+	note_type 12, 1, 1
 	vibrato 8, 2, 6
 	rest 14
 	octave 4
-	D_ 1
-	D# 1
+	note D_, 1
+	note D#, 1
 
 Music_Dungeon1_branch_7e0e5::
-	callchannel Music_Dungeon1_branch_7e140
-	callchannel Music_Dungeon1_branch_7e140
+	sound_call Music_Dungeon1_branch_7e140
+	sound_call Music_Dungeon1_branch_7e140
 	octave 5
-	E_ 2
+	note E_, 2
 	rest 4
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	F# 4
-	callchannel Music_Dungeon1_branch_7e154
+	note F#, 4
+	sound_call Music_Dungeon1_branch_7e154
 	octave 4
-	G_ 4
-	callchannel Music_Dungeon1_branch_7e154
+	note G_, 4
+	sound_call Music_Dungeon1_branch_7e154
 	octave 4
-	A_ 4
-	B_ 4
-	A# 4
-	G_ 4
-	F# 4
+	note A_, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
 	rest 6
-	callchannel Music_Dungeon1_branch_7e177
-	B_ 4
-	A# 4
-	G_ 4
-	F# 4
-	G_ 4
-	F# 4
-	E_ 4
-	D# 4
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e177
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 12
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 12
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 10
-	E_ 1
+	note E_, 1
 	rest 1
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 12
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 12
-	callchannel Music_Dungeon1_branch_7e15e
+	sound_call Music_Dungeon1_branch_7e15e
 	rest 10
-	D_ 1
-	D# 1
-	callchannel Music_Dungeon1_branch_7e164
-	callchannel Music_Dungeon1_branch_7e164
-	E_ 2
+	note D_, 1
+	note D#, 1
+	sound_call Music_Dungeon1_branch_7e164
+	sound_call Music_Dungeon1_branch_7e164
+	note E_, 2
 	rest 4
-	callchannel Music_Dungeon1_branch_7e177
-	B_ 8
-	F# 6
-	D_ 1
-	D# 1
+	sound_call Music_Dungeon1_branch_7e177
+	note B_, 8
+	note F#, 6
+	note D_, 1
+	note D#, 1
 	rest 16
 	rest 16
-	loopchannel 0, Music_Dungeon1_branch_7e0e5
+	sound_loop 0, Music_Dungeon1_branch_7e0e5
 
 Music_Dungeon1_branch_7e140::
 	octave 5
-	E_ 4
-	B_ 4
-	A# 4
+	note E_, 4
+	note B_, 4
+	note A#, 4
 	octave 6
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 5
-	G# 4
-	G_ 4
-	B_ 4
-	A# 4
-	E_ 4
-	D# 4
-	A_ 4
-	G# 4
-	E_ 4
-	F# 4
-	D# 4
-	endchannel
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	sound_ret
 
 Music_Dungeon1_branch_7e154::
 	octave 6
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 4
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_Dungeon1_branch_7e15e::
 	octave 3
-	E_ 1
-	G_ 1
-	E_ 1
-	D# 1
-	endchannel
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	sound_ret
 
 Music_Dungeon1_branch_7e164::
-	E_ 4
-	B_ 4
-	A# 4
+	note E_, 4
+	note B_, 4
+	note A#, 4
 	octave 4
-	D_ 4
-	C# 4
-	octave 3
-	G# 4
-	G_ 4
-	B_ 4
-	A# 4
-	E_ 4
-	D# 4
-	A_ 4
-	G# 4
-	E_ 4
-	F# 4
-	D# 4
-	endchannel
+	note D_, 4
+	note C#, 4
+	octave 3
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	sound_ret
 
 Music_Dungeon1_branch_7e177::
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 4
+	note F#, 4
 	rest 6
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 4
+	note G_, 4
 	rest 6
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	A# 4
-	endchannel
+	note E_, 1
+	note E_, 1
+	note A#, 4
+	sound_ret
 
 
-Music_Dungeon1_Ch3::
+Music_Dungeon1_Ch4::
 	dspeed 12
 	rest 14
 	cymbal1 1
 	cymbal1 1
 
 Music_Dungeon1_branch_7e190::
-	callchannel Music_Dungeon1_branch_7e1f1
-	loopchannel 3, Music_Dungeon1_branch_7e190
+	sound_call Music_Dungeon1_branch_7e1f1
+	sound_loop 3, Music_Dungeon1_branch_7e190
 	cymbal2 4
 	cymbal1 4
 	cymbal2 4
@@ -612,22 +612,22 @@ Music_Dungeon1_branch_7e190::
 	cymbal1 2
 
 Music_Dungeon1_branch_7e1a1::
-	callchannel Music_Dungeon1_branch_7e1f1
-	loopchannel 3, Music_Dungeon1_branch_7e1a1
+	sound_call Music_Dungeon1_branch_7e1f1
+	sound_loop 3, Music_Dungeon1_branch_7e1a1
 	cymbal2 4
 	cymbal1 4
 	cymbal2 4
 	cymbal2 4
 
 Music_Dungeon1_branch_7e1b0::
-	callchannel Music_Dungeon1_branch_7e1fa
-	loopchannel 3, Music_Dungeon1_branch_7e1b0
-	callchannel Music_Dungeon1_branch_7e202
+	sound_call Music_Dungeon1_branch_7e1fa
+	sound_loop 3, Music_Dungeon1_branch_7e1b0
+	sound_call Music_Dungeon1_branch_7e202
 
 Music_Dungeon1_branch_7e1ba::
-	callchannel Music_Dungeon1_branch_7e1fa
-	loopchannel 3, Music_Dungeon1_branch_7e1ba
-	callchannel Music_Dungeon1_branch_7e202
+	sound_call Music_Dungeon1_branch_7e1fa
+	sound_loop 3, Music_Dungeon1_branch_7e1ba
+	sound_call Music_Dungeon1_branch_7e202
 	snare7 4
 	snare8 4
 	snare8 4
@@ -637,39 +637,39 @@ Music_Dungeon1_branch_7e1ba::
 
 Music_Dungeon1_branch_7e1cf::
 	rest 16
-	loopchannel 13, Music_Dungeon1_branch_7e1cf
+	sound_loop 13, Music_Dungeon1_branch_7e1cf
 	rest 12
 
 Music_Dungeon1_branch_7e1d5::
-	callchannel Music_Dungeon1_branch_7e1fa
-	loopchannel 3, Music_Dungeon1_branch_7e1d5
+	sound_call Music_Dungeon1_branch_7e1fa
+	sound_loop 3, Music_Dungeon1_branch_7e1d5
 	cymbal1 4
 	cymbal1 4
 	cymbal1 4
 	rest 2
 	cymbal1 1
 	cymbal1 1
-	callchannel Music_Dungeon1_branch_7e1f1
-	callchannel Music_Dungeon1_branch_7e1f1
-	loopchannel 0, Music_Dungeon1_branch_7e190
+	sound_call Music_Dungeon1_branch_7e1f1
+	sound_call Music_Dungeon1_branch_7e1f1
+	sound_loop 0, Music_Dungeon1_branch_7e190
 
 Music_Dungeon1_branch_7e1f1::
 	cymbal2 4
 	cymbal1 4
 	cymbal2 4
 	cymbal1 4
-	endchannel
+	sound_ret
 
 Music_Dungeon1_branch_7e1fa::
 	cymbal1 1
 	cymbal1 1
 	rest 10
 	cymbal3 4
-	endchannel
+	sound_ret
 
 Music_Dungeon1_branch_7e202::
 	snare7 4
 	snare8 4
 	snare8 4
 	snare9 4
-	endchannel
+	sound_ret
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index d5f459fb..807c2f40 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -1,64 +1,64 @@
-Music_Dungeon2_Ch0::
+Music_Dungeon2_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 10, 1, 4
 
 Music_Dungeon2_branch_7e892::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	A# 4
-	A# 4
-	A# 4
-	A# 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
 	octave 5
-	C# 4
-	C# 4
-	C# 4
-	C# 4
+	note C#, 4
+	note C#, 4
+	note C#, 4
+	note C#, 4
 	octave 3
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	A# 4
-	A# 4
-	A# 4
-	A# 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
 	octave 2
-	G_ 2
-	A# 4
-	G_ 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A# 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A_ 4
-	F# 2
-	loopchannel 2, Music_Dungeon2_branch_7e892
-	notetype 12, 1, 15
+	note G_, 2
+	note A_, 4
+	note F#, 2
+	sound_loop 2, Music_Dungeon2_branch_7e892
+	note_type 12, 1, 15
 	octave 3
-	E_ 16
-	C_ 16
-	D_ 16
+	note E_, 16
+	note C_, 16
+	note D_, 16
 	octave 2
-	A# 16
+	note A#, 16
 	rest 16
 	rest 16
 	rest 16
@@ -67,242 +67,242 @@ Music_Dungeon2_branch_7e892::
 	rest 16
 	rest 16
 	rest 16
-	loopchannel 0, Music_Dungeon2_branch_7e892
+	sound_loop 0, Music_Dungeon2_branch_7e892
 
 
-Music_Dungeon2_Ch1::
+Music_Dungeon2_Ch2::
 	vibrato 11, 1, 5
 
 Music_Dungeon2_branch_7e8db::
-	duty 3
-	notetype 12, 12, 2
+	duty_cycle 3
+	note_type 12, 12, 2
 	octave 3
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	C_ 4
-	C_ 4
-	C_ 4
-	C_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	C_ 4
-	C_ 4
-	C_ 4
-	C_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
 	octave 4
-	F# 4
-	F# 4
-	F# 4
-	F# 4
-	D_ 4
-	D_ 4
-	D_ 4
-	D_ 4
-	G_ 4
-	G_ 4
-	G_ 4
-	F# 4
-	loopchannel 2, Music_Dungeon2_branch_7e8db
+	note F#, 4
+	note F#, 4
+	note F#, 4
+	note F#, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note F#, 4
+	sound_loop 2, Music_Dungeon2_branch_7e8db
 	octave 3
-	E_ 2
-	G_ 2
-	E_ 2
-	D# 2
-	E_ 2
-	E_ 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	C# 2
-	C_ 2
+	note C#, 2
+	note C_, 2
 	octave 4
-	E_ 2
-	G_ 2
+	note E_, 2
+	note G_, 2
 	octave 3
-	A# 2
-	C# 2
-	A# 2
-	A_ 2
-	A# 2
-	G_ 2
+	note A#, 2
+	note C#, 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
 	octave 5
-	G_ 2
+	note G_, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	F_ 2
+	note F_, 2
 	rest 2
-	E_ 2
-	D# 2
-	D_ 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	notetype 12, 12, 7
-	duty 1
+	note_type 12, 12, 7
+	duty_cycle 1
 	octave 4
-	E_ 16
-	D_ 16
-	C_ 16
-	D_ 16
-	loopchannel 0, Music_Dungeon2_branch_7e8db
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note D_, 16
+	sound_loop 0, Music_Dungeon2_branch_7e8db
 
 
-Music_Dungeon2_Ch2::
-	notetype 12, 1, 3
+Music_Dungeon2_Ch3::
+	note_type 12, 1, 3
 	vibrato 8, 2, 6
 
 Music_Dungeon2_branch_7e940::
-	callchannel Music_Dungeon2_branch_7e9d1
-	loopchannel 16, Music_Dungeon2_branch_7e940
-	E_ 4
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_loop 16, Music_Dungeon2_branch_7e940
+	note E_, 4
 	rest 4
 	rest 4
-	E_ 4
-	C_ 4
+	note E_, 4
+	note C_, 4
 	rest 4
 	rest 4
-	C_ 4
-	D_ 4
+	note C_, 4
+	note D_, 4
 	rest 4
 	rest 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A# 4
+	note A#, 4
 	rest 4
 	rest 4
-	A# 4
+	note A#, 4
 
 Music_Dungeon2_branch_7e958::
 	octave 5
-	E_ 2
+	note E_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	A# 2
+	note A#, 2
 	rest 2
 	octave 6
-	D_ 2
+	note D_, 2
 	rest 2
-	C# 2
+	note C#, 2
 	rest 2
 	octave 5
-	G# 2
+	note G#, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	A# 2
+	note A#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	loopchannel 3, Music_Dungeon2_branch_7e958
+	sound_loop 3, Music_Dungeon2_branch_7e958
 	octave 4
-	E_ 4
-	B_ 4
-	A# 4
+	note E_, 4
+	note B_, 4
+	note A#, 4
 	octave 5
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 4
-	G# 4
-	G_ 4
-	B_ 4
-	A# 4
-	E_ 4
-	D# 4
-	A_ 4
-	G# 4
-	E_ 4
-	F# 4
-	D# 4
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
 	octave 3
-	E_ 16
-	C_ 16
-	D_ 16
+	note E_, 16
+	note C_, 16
+	note D_, 16
 	octave 2
-	A# 16
+	note A#, 16
 	octave 3
-	E_ 16
-	F_ 16
-	G_ 16
+	note E_, 16
+	note F_, 16
+	note G_, 16
 	octave 3
-	B_ 16
+	note B_, 16
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	callchannel Music_Dungeon2_branch_7e9d1
-	loopchannel 0, Music_Dungeon2_branch_7e940
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_call Music_Dungeon2_branch_7e9d1
+	sound_loop 0, Music_Dungeon2_branch_7e940
 	octave 2
-	G_ 2
-	A# 4
-	G_ 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A_ 2
-	A# 2
-	G_ 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 2
-	A# 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
 	rest 2
-	endchannel
+	sound_ret
 
 Music_Dungeon2_branch_7e9d1::
 	octave 4
-	E_ 2
+	note E_, 2
 	rest 4
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	F# 4
-	endchannel
+	note F#, 4
+	sound_ret
 
 
-Music_Dungeon2_Ch3::
+Music_Dungeon2_Ch4::
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
@@ -314,4 +314,4 @@ Music_Dungeon2_branch_7e9dd::
 	cymbal2 4
 	snare9 4
 	snare7 4
-	loopchannel 0, Music_Dungeon2_branch_7e9dd
+	sound_loop 0, Music_Dungeon2_branch_7e9dd
diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm
index f9742a26..a72dea34 100644
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -1,432 +1,432 @@
-Music_Dungeon3_Ch0::
+Music_Dungeon3_Ch1::
 	tempo 160
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 8, 1, 4
 
 Music_Dungeon3_branch_7e9fc::
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 
 Music_Dungeon3_branch_7e9fe::
-	callchannel Music_Dungeon3_branch_7eab2
-	loopchannel 3, Music_Dungeon3_branch_7e9fe
+	sound_call Music_Dungeon3_branch_7eab2
+	sound_loop 3, Music_Dungeon3_branch_7e9fe
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
-	D# 2
-	E_ 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note E_, 2
 
 Music_Dungeon3_branch_7ea11::
-	callchannel Music_Dungeon3_branch_7eac1
-	loopchannel 4, Music_Dungeon3_branch_7ea11
+	sound_call Music_Dungeon3_branch_7eac1
+	sound_loop 4, Music_Dungeon3_branch_7ea11
 
 Music_Dungeon3_branch_7ea18::
-	callchannel Music_Dungeon3_branch_7eab2
-	loopchannel 4, Music_Dungeon3_branch_7ea18
+	sound_call Music_Dungeon3_branch_7eab2
+	sound_loop 4, Music_Dungeon3_branch_7ea18
 	octave 4
-	F_ 2
-	F_ 2
+	note F_, 2
+	note F_, 2
 	rest 2
-	F_ 2
-	E_ 2
-	E_ 2
-	D# 2
-	D# 2
+	note F_, 2
+	note E_, 2
+	note E_, 2
+	note D#, 2
+	note D#, 2
 	rest 2
-	D# 2
-	D_ 2
-	D_ 2
-	callchannel Music_Dungeon3_branch_7eafc
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	sound_call Music_Dungeon3_branch_7eafc
 	octave 4
-	D_ 2
-	D_ 2
+	note D_, 2
+	note D_, 2
 	rest 2
-	D_ 2
-	D# 2
-	D# 2
-	E_ 2
-	E_ 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
 	rest 2
-	E_ 2
-	F_ 2
-	F_ 2
+	note E_, 2
+	note F_, 2
+	note F_, 2
 
 Music_Dungeon3_branch_7ea3c::
-	callchannel Music_Dungeon3_branch_7eace
-	loopchannel 4, Music_Dungeon3_branch_7ea3c
+	sound_call Music_Dungeon3_branch_7eace
+	sound_loop 4, Music_Dungeon3_branch_7ea3c
 
 Music_Dungeon3_branch_7ea43::
-	callchannel Music_Dungeon3_branch_7eadd
-	loopchannel 3, Music_Dungeon3_branch_7ea43
+	sound_call Music_Dungeon3_branch_7eadd
+	sound_loop 3, Music_Dungeon3_branch_7ea43
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	F_ 2
-	G# 2
-	E_ 2
+	note A_, 2
+	note F_, 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
-	callchannel Music_Dungeon3_branch_7eaea
-	callchannel Music_Dungeon3_branch_7eaea
+	note C_, 2
+	sound_call Music_Dungeon3_branch_7eaea
+	sound_call Music_Dungeon3_branch_7eaea
 	octave 3
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
 	rest 16
 	rest 8
-	callchannel Music_Dungeon3_branch_7eaf7
-	callchannel Music_Dungeon3_branch_7eaf7
-	callchannel Music_Dungeon3_branch_7eaf7
-	callchannel Music_Dungeon3_branch_7eaf7
-	D# 2
+	sound_call Music_Dungeon3_branch_7eaf7
+	sound_call Music_Dungeon3_branch_7eaf7
+	sound_call Music_Dungeon3_branch_7eaf7
+	sound_call Music_Dungeon3_branch_7eaf7
+	note D#, 2
 	rest 16
 	rest 16
-	loopchannel 0, Music_Dungeon3_branch_7e9fc
+	sound_loop 0, Music_Dungeon3_branch_7e9fc
 
 Music_Dungeon3_branch_7eab2::
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	endchannel
+	note D#, 2
+	sound_ret
 
 Music_Dungeon3_branch_7eac1::
-	E_ 2
-	G# 2
+	note E_, 2
+	note G#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	E_ 2
-	G# 2
+	note E_, 2
+	note G#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	E_ 2
-	G# 2
-	endchannel
+	note E_, 2
+	note G#, 2
+	sound_ret
 
 Music_Dungeon3_branch_7eace::
 	octave 3
-	D# 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
-	D# 2
+	note G_, 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
-	D# 2
+	note G_, 2
+	note D#, 2
 	octave 2
-	B_ 2
-	endchannel
+	note B_, 2
+	sound_ret
 
 Music_Dungeon3_branch_7eadd::
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	A_ 2
-	F_ 2
+	note A_, 2
+	note F_, 2
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	A_ 2
-	F_ 2
-	endchannel
+	note A_, 2
+	note F_, 2
+	sound_ret
 
 Music_Dungeon3_branch_7eaea::
 	octave 3
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G# 2
-	E_ 2
+	note G#, 2
+	note E_, 2
 	octave 4
-	C_ 2
-	endchannel
+	note C_, 2
+	sound_ret
 
 Music_Dungeon3_branch_7eaf7::
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
-	endchannel
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	sound_ret
 
 Music_Dungeon3_branch_7eafc::
 	tempo 168
 	octave 1
-	A# 1
-	B_ 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
 	tempo 176
 	octave 1
-	A# 1
-	B_ 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
 	tempo 184
 	octave 1
-	A# 1
-	B_ 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
 	tempo 192
 	octave 1
-	A_ 1
-	A# 1
-	B_ 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
 	tempo 200
 	octave 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
 	tempo 208
 	octave 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
-	D_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
 	tempo 216
 	octave 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
-	C# 1
+	note C_, 1
+	note C#, 1
 	tempo 224
 	octave 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 2
-	C_ 1
+	note C_, 1
 	tempo 160
-	endchannel
+	sound_ret
 
 
-Music_Dungeon3_Ch1::
+Music_Dungeon3_Ch2::
 	vibrato 11, 1, 5
-	duty 3
+	duty_cycle 3
 
 Music_Dungeon3_branch_7eb6d::
-	notetype 12, 13, 3
+	note_type 12, 13, 3
 	octave 4
-	D# 6
-	C# 6
+	note D#, 6
+	note C#, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	B_ 2
-	A# 2
-	B_ 6
+	note B_, 2
+	note A#, 2
+	note B_, 6
 	octave 4
-	C# 8
+	note C#, 8
 	rest 2
-	G# 6
-	F# 6
-	E_ 2
-	F# 2
-	G# 2
+	note G#, 6
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G# 2
-	F# 6
-	E_ 2
-	F# 2
-	G# 2
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	octave 5
-	C_ 2
-	octave 4
-	G# 2
-	F# 6
-	E_ 2
-	D# 2
-	E_ 6
-	F# 6
-	E_ 4
-	D# 6
-	C# 6
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
-	octave 3
-	B_ 2
-	A# 2
-	B_ 6
-	octave 4
-	C# 8
+	note C_, 2
+	octave 4
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note E_, 6
+	note F#, 6
+	note E_, 4
+	note D#, 6
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 6
+	octave 4
+	note C#, 8
 	rest 2
-	G# 2
-	G# 2
+	note G#, 2
+	note G#, 2
 	rest 2
-	G# 2
-	A_ 2
-	A_ 2
-	A# 2
-	A# 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A#, 2
+	note A#, 2
 	rest 2
-	A# 2
-	B_ 2
-	B_ 2
+	note A#, 2
+	note B_, 2
+	note B_, 2
 	rest 8
 	rest 8
 	rest 8
@@ -436,179 +436,179 @@ Music_Dungeon3_branch_7eb6d::
 	rest 8
 	rest 8
 	octave 4
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	rest 2
-	B_ 2
-	A# 2
-	A# 2
-	A_ 2
-	A_ 2
+	note B_, 2
+	note A#, 2
+	note A#, 2
+	note A_, 2
+	note A_, 2
 	rest 2
-	A_ 2
-	G# 2
-	G# 2
-	C# 8
+	note A_, 2
+	note G#, 2
+	note G#, 2
+	note C#, 8
 	rest 2
 	octave 3
-	B_ 6
-	A# 2
-	B_ 2
+	note B_, 6
+	note A#, 2
+	note B_, 2
 	octave 4
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 6
-	G_ 6
+	note C#, 2
+	note D#, 6
+	note G_, 6
 	octave 3
-	G_ 8
+	note G_, 8
 	rest 2
-	F_ 6
-	E_ 2
-	F_ 2
-	A_ 2
+	note F_, 6
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	G_ 6
-	F_ 2
-	G_ 2
-	A_ 2
+	note A_, 2
+	note G_, 6
+	note F_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
-	G_ 6
-	A_ 6
+	note A_, 2
+	note G_, 6
+	note A_, 6
 	octave 4
-	C# 6
-	G_ 8
+	note C#, 6
+	note G_, 8
 	rest 2
-	F_ 6
-	E_ 2
-	F_ 2
-	A_ 2
+	note F_, 6
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
-	G_ 6
-	A_ 2
+	note A_, 2
+	note G_, 6
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
-	G_ 6
-	A_ 6
+	note A_, 2
+	note G_, 6
+	note A_, 6
 	octave 5
-	C# 6
+	note C#, 6
 	octave 4
-	F# 8
+	note F#, 8
 	rest 2
-	E_ 6
-	D# 2
-	E_ 2
-	G# 2
+	note E_, 6
+	note D#, 2
+	note E_, 2
+	note G#, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G# 2
-	F# 6
-	E_ 2
-	F# 2
-	G# 2
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G# 2
-	F# 6
-	G# 6
+	note G#, 2
+	note F#, 6
+	note G#, 6
 	octave 5
-	C_ 6
-	octave 3
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
-	D# 2
-	G_ 2
-	D# 2
-	C# 6
+	note C_, 6
+	octave 3
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
 	octave 2
-	E_ 2
-	G# 2
-	octave 3
-	C_ 2
-	E_ 2
-	G# 2
-	octave 4
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	E_ 2
-	G# 2
-	C_ 2
-	D# 2
+	note E_, 2
+	note G#, 2
+	octave 3
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	octave 4
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
+	note D#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	G_ 2
+	note D#, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D# 2
-	loopchannel 0, Music_Dungeon3_branch_7eb6d
+	note D#, 2
+	sound_loop 0, Music_Dungeon3_branch_7eb6d
 
 
-Music_Dungeon3_Ch2::
-	notetype 12, 1, 2
+Music_Dungeon3_Ch3::
+	note_type 12, 1, 2
 	rest 16
 	rest 16
 	rest 16
@@ -621,71 +621,71 @@ Music_Dungeon3_Ch2::
 	rest 16
 	rest 16
 	rest 12
-	notetype 6, 1, 0
+	note_type 6, 1, 0
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
 	rest 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
 	rest 16
 	rest 16
 	rest 10
 	octave 5
-	E_ 8
+	note E_, 8
 	octave 4
-	B_ 8
+	note B_, 8
 	octave 5
-	D# 8
+	note D#, 8
 	octave 4
-	A# 8
+	note A#, 8
 	octave 5
-	D_ 8
+	note D_, 8
 	octave 4
-	A_ 8
+	note A_, 8
 	octave 5
-	C# 8
+	note C#, 8
 	octave 4
-	G# 8
+	note G#, 8
 	octave 5
-	C_ 8
+	note C_, 8
 	octave 4
-	G_ 8
-	B_ 8
-	F# 8
-	A# 8
-	F_ 8
-	A_ 8
-	E_ 8
+	note G_, 8
+	note B_, 8
+	note F#, 8
+	note A#, 8
+	note F_, 8
+	note A_, 8
+	note E_, 8
 	rest 16
 	rest 16
 	rest 8
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	rest 2
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 10
 	rest 16
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	rest 16
 	rest 16
 	rest 16
@@ -707,10 +707,10 @@ Music_Dungeon3_Ch2::
 	rest 16
 	rest 16
 	rest 10
-	loopchannel 0, Music_Dungeon3_Ch2
+	sound_loop 0, Music_Dungeon3_Ch3
 
 
-Music_Dungeon3_Ch3::
+Music_Dungeon3_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
@@ -753,4 +753,4 @@ Music_Dungeon3_Ch3::
 	rest 16
 	rest 16
 	rest 10
-	endchannel
+	sound_ret
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index adb0f8b9..19fc01e5 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1,1344 +1,1344 @@
-Music_FinalBattle_Ch0::
+Music_FinalBattle_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 2
+	toggle_perfect_pitch
+	note_type 12, 11, 2
 	octave 3
-	F# 1
-	F_ 1
-	F# 1
-	G_ 1
-	F# 1
-	G_ 1
-	G# 1
-	G_ 1
-	notetype 12, 10, 2
-	G# 1
-	A_ 1
-	G# 1
-	A_ 1
-	A# 1
-	A_ 1
-	A# 1
-	B_ 1
-	notetype 12, 9, 2
-	A# 1
-	B_ 1
-	octave 4
-	C_ 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note_type 12, 10, 2
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	note_type 12, 9, 2
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C_, 1
 	octave 3
-	B_ 1
-	octave 4
-	C_ 1
-	C# 1
-	C_ 1
-	C# 1
-	notetype 12, 8, 2
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	notetype 12, 12, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note_type 12, 8, 2
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note_type 12, 12, 1
 	octave 3
-	E_ 1
-	E_ 7
-	F_ 1
-	F_ 7
-	G_ 1
-	G_ 7
-	F_ 1
-	F_ 7
-	E_ 1
-	E_ 7
-	F_ 1
-	F_ 7
-	G_ 1
-	G_ 7
-	G# 1
-	G# 3
-	D# 4
-	notetype 12, 12, 1
-	E_ 1
-	E_ 3
-	notetype 12, 11, 3
-	E_ 4
-	notetype 12, 12, 1
-	F_ 1
-	F_ 3
-	notetype 12, 11, 3
-	F_ 4
-	notetype 12, 12, 1
-	G_ 1
-	G_ 3
-	notetype 12, 11, 3
-	G_ 4
-	notetype 12, 12, 1
-	F_ 1
-	F_ 3
-	notetype 12, 11, 3
-	F_ 4
-	notetype 12, 12, 1
-	E_ 1
-	E_ 3
-	notetype 12, 11, 3
-	E_ 4
-	notetype 12, 12, 1
-	F_ 1
-	F_ 3
-	notetype 12, 11, 3
-	F_ 4
-	notetype 12, 12, 1
-	G_ 1
-	G_ 3
-	notetype 12, 11, 3
-	G_ 4
-	notetype 12, 12, 1
-	G# 1
-	G# 3
-	notetype 12, 11, 7
-	D# 4
+	note E_, 1
+	note E_, 7
+	note F_, 1
+	note F_, 7
+	note G_, 1
+	note G_, 7
+	note F_, 1
+	note F_, 7
+	note E_, 1
+	note E_, 7
+	note F_, 1
+	note F_, 7
+	note G_, 1
+	note G_, 7
+	note G#, 1
+	note G#, 3
+	note D#, 4
+	note_type 12, 12, 1
+	note E_, 1
+	note E_, 3
+	note_type 12, 11, 3
+	note E_, 4
+	note_type 12, 12, 1
+	note F_, 1
+	note F_, 3
+	note_type 12, 11, 3
+	note F_, 4
+	note_type 12, 12, 1
+	note G_, 1
+	note G_, 3
+	note_type 12, 11, 3
+	note G_, 4
+	note_type 12, 12, 1
+	note F_, 1
+	note F_, 3
+	note_type 12, 11, 3
+	note F_, 4
+	note_type 12, 12, 1
+	note E_, 1
+	note E_, 3
+	note_type 12, 11, 3
+	note E_, 4
+	note_type 12, 12, 1
+	note F_, 1
+	note F_, 3
+	note_type 12, 11, 3
+	note F_, 4
+	note_type 12, 12, 1
+	note G_, 1
+	note G_, 3
+	note_type 12, 11, 3
+	note G_, 4
+	note_type 12, 12, 1
+	note G#, 1
+	note G#, 3
+	note_type 12, 11, 7
+	note D#, 4
 
 Music_FinalBattle_branch_23429::
-	notetype 12, 11, 7
+	note_type 12, 11, 7
 	octave 3
-	E_ 4
-	B_ 4
-	D# 4
-	A# 4
-	D_ 4
-	A_ 4
+	note E_, 4
+	note B_, 4
+	note D#, 4
+	note A#, 4
+	note D_, 4
+	note A_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	F# 4
-	F_ 4
-	F# 4
-	notetype 12, 11, 1
-	F# 2
-	F_ 1
-	F# 1
-	A_ 1
-	F# 2
-	F# 1
-	notetype 12, 11, 7
+	note F#, 4
+	note F_, 4
+	note F#, 4
+	note_type 12, 11, 1
+	note F#, 2
+	note F_, 1
+	note F#, 1
+	note A_, 1
+	note F#, 2
+	note F#, 1
+	note_type 12, 11, 7
 	octave 2
-	B_ 6
-	notetype 12, 10, 0
+	note B_, 6
+	note_type 12, 10, 0
 	octave 3
-	D_ 6
-	notetype 12, 11, 7
-	F# 4
-	E_ 4
-	B_ 4
-	D# 4
-	A# 4
-	D_ 4
-	A_ 4
+	note D_, 6
+	note_type 12, 11, 7
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	note D#, 4
+	note A#, 4
+	note D_, 4
+	note A_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	F# 4
-	F_ 4
-	F# 12
-	A# 4
-	notetype 12, 5, 14
-	B_ 12
-	notetype 12, 11, 2
-	E_ 3
-	E_ 3
-	E_ 2
-	E_ 1
-	F# 1
-	E_ 1
-	B_ 1
-	F# 1
-	E_ 1
-	F# 1
-	B_ 1
-	F# 1
-	E_ 1
-	F# 1
-	B_ 1
-	F# 1
-	E_ 1
-	F# 1
-	B_ 1
-	F# 1
-	notetype 12, 12, 2
-	E_ 1
-	F# 1
-	B_ 1
-	F# 1
-	notetype 12, 13, 2
-	E_ 1
-	F# 1
-	B_ 1
-	notetype 12, 12, 1
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 3
-	notetype 12, 11, 5
-	D_ 4
-	notetype 12, 12, 1
-	E_ 1
-	E_ 3
-	notetype 12, 11, 5
-	F_ 4
-	notetype 12, 12, 1
-	E_ 1
-	E_ 3
-	notetype 12, 11, 5
-	D_ 4
-	notetype 12, 12, 1
-	E_ 1
-	notetype 12, 11, 7
-	E_ 7
-	notetype 12, 12, 1
-	E_ 2
-	B_ 1
-	A_ 1
-	E_ 2
-	B_ 1
-	A_ 1
-	E_ 2
-	B_ 1
-	A_ 1
-	E_ 2
-	B_ 1
-	A_ 3
-	E_ 1
-	D_ 3
-	E_ 1
-	D_ 3
-	E_ 1
-	D_ 3
-	E_ 1
-	D_ 1
-	F_ 2
-	octave 4
-	C_ 1
+	note F#, 4
+	note F_, 4
+	note F#, 12
+	note A#, 4
+	note_type 12, 5, 14
+	note B_, 12
+	note_type 12, 11, 2
+	note E_, 3
+	note E_, 3
+	note E_, 2
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note_type 12, 12, 2
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note_type 12, 13, 2
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	note_type 12, 12, 1
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 3
+	note_type 12, 11, 5
+	note D_, 4
+	note_type 12, 12, 1
+	note E_, 1
+	note E_, 3
+	note_type 12, 11, 5
+	note F_, 4
+	note_type 12, 12, 1
+	note E_, 1
+	note E_, 3
+	note_type 12, 11, 5
+	note D_, 4
+	note_type 12, 12, 1
+	note E_, 1
+	note_type 12, 11, 7
+	note E_, 7
+	note_type 12, 12, 1
+	note E_, 2
+	note B_, 1
+	note A_, 1
+	note E_, 2
+	note B_, 1
+	note A_, 1
+	note E_, 2
+	note B_, 1
+	note A_, 1
+	note E_, 2
+	note B_, 1
+	note A_, 3
+	note E_, 1
+	note D_, 3
+	note E_, 1
+	note D_, 3
+	note E_, 1
+	note D_, 3
+	note E_, 1
+	note D_, 1
+	note F_, 2
+	octave 4
+	note C_, 1
 	octave 3
-	B_ 1
-	F_ 2
+	note B_, 1
+	note F_, 2
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	F_ 2
+	note B_, 1
+	note F_, 2
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	F_ 2
+	note B_, 1
+	note F_, 2
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 3
-	F_ 1
-	E_ 3
-	F_ 1
-	E_ 3
-	F_ 1
-	E_ 3
-	F_ 1
-	E_ 1
-	F# 2
-	octave 4
-	C# 1
-	C_ 1
+	note B_, 3
+	note F_, 1
+	note E_, 3
+	note F_, 1
+	note E_, 3
+	note F_, 1
+	note E_, 3
+	note F_, 1
+	note E_, 1
+	note F#, 2
+	octave 4
+	note C#, 1
+	note C_, 1
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 1
-	C_ 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 1
-	C_ 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 1
-	C_ 3
+	note C#, 1
+	note C_, 3
 	octave 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	F# 1
-	F_ 3
-	notetype 12, 11, 7
-	octave 4
-	C_ 2
-	notetype 12, 11, 0
-	C# 8
-	notetype 12, 11, 7
-	C# 8
-	notetype 12, 10, 0
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note F_, 3
+	note_type 12, 11, 7
+	octave 4
+	note C_, 2
+	note_type 12, 11, 0
+	note C#, 8
+	note_type 12, 11, 7
+	note C#, 8
+	note_type 12, 10, 0
 	octave 3
-	F# 8
-	F# 8
-	notetype 12, 11, 0
+	note F#, 8
+	note F#, 8
+	note_type 12, 11, 0
 	octave 3
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	G_ 4
-	B_ 12
-	notetype 12, 11, 0
-	A_ 8
-	notetype 12, 11, 7
-	A_ 8
-	notetype 12, 11, 0
-	E_ 8
-	notetype 12, 11, 7
-	E_ 8
-	notetype 12, 11, 0
-	A# 8
-	notetype 12, 11, 7
-	A# 8
-	octave 4
-	F_ 8
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note G_, 4
+	note B_, 12
+	note_type 12, 11, 0
+	note A_, 8
+	note_type 12, 11, 7
+	note A_, 8
+	note_type 12, 11, 0
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 8
+	note_type 12, 11, 0
+	note A#, 8
+	note_type 12, 11, 7
+	note A#, 8
+	octave 4
+	note F_, 8
 	octave 3
-	A# 8
+	note A#, 8
 	octave 4
-	C# 4
-	E_ 12
+	note C#, 4
+	note E_, 12
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C# 12
-	notetype 12, 4, 0
-	callchannel Music_FinalBattle_branch_23710
-	callchannel Music_FinalBattle_branch_23710
-	notetype 12, 11, 7
+	note C#, 12
+	note_type 12, 4, 0
+	sound_call Music_FinalBattle_branch_23710
+	sound_call Music_FinalBattle_branch_23710
+	note_type 12, 11, 7
 	octave 3
-	E_ 4
-	B_ 4
-	D# 4
-	A# 4
-	D_ 4
-	A_ 4
+	note E_, 4
+	note B_, 4
+	note D#, 4
+	note A#, 4
+	note D_, 4
+	note A_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	F# 4
-	F_ 4
-	F# 12
-	notetype 12, 11, 0
-	A_ 8
-	G_ 8
-	notetype 12, 11, 7
-	E_ 4
-	B_ 4
-	D# 4
-	A# 4
-	D_ 4
-	A_ 4
+	note F#, 4
+	note F_, 4
+	note F#, 12
+	note_type 12, 11, 0
+	note A_, 8
+	note G_, 8
+	note_type 12, 11, 7
+	note E_, 4
+	note B_, 4
+	note D#, 4
+	note A#, 4
+	note D_, 4
+	note A_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	F# 4
-	F_ 4
-	F# 12
-	notetype 12, 11, 0
-	A_ 8
-	notetype 12, 11, 7
-	octave 4
-	C_ 8
-	notetype 12, 11, 0
+	note F#, 4
+	note F_, 4
+	note F#, 12
+	note_type 12, 11, 0
+	note A_, 8
+	note_type 12, 11, 7
+	octave 4
+	note C_, 8
+	note_type 12, 11, 0
 	octave 3
-	B_ 8
-	notetype 12, 11, 7
-	B_ 8
-	notetype 12, 11, 0
-	octave 4
-	E_ 8
-	notetype 12, 11, 7
-	E_ 8
-	loopchannel 0, Music_FinalBattle_branch_23429
+	note B_, 8
+	note_type 12, 11, 7
+	note B_, 8
+	note_type 12, 11, 0
+	octave 4
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 8
+	sound_loop 0, Music_FinalBattle_branch_23429
 
 
-Music_FinalBattle_Ch1::
-	duty 3
+Music_FinalBattle_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 5
-	C_ 1
+	note C_, 1
 	octave 4
-	G# 1
-	B_ 1
-	F# 1
-	A_ 1
-	E_ 1
-	G_ 1
+	note G#, 1
+	note B_, 1
+	note F#, 1
+	note A_, 1
+	note E_, 1
+	note G_, 1
 	octave 5
-	C_ 1
+	note C_, 1
 	octave 4
-	F_ 1
-	C# 1
-	E_ 1
-	C_ 1
-	D# 1
+	note F_, 1
+	note C#, 1
+	note E_, 1
+	note C_, 1
+	note D#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	D_ 1
+	note D_, 1
 	octave 5
-	C_ 1
+	note C_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	G# 1
-	B_ 1
-	F# 1
-	A# 1
-	F_ 1
-	A_ 1
-	octave 5
-	C_ 1
+	note G#, 1
+	note B_, 1
+	note F#, 1
+	note A#, 1
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
 	octave 3
-	G# 1
-	D# 1
-	G_ 1
-	D_ 1
-	F_ 1
-	C# 1
-	E_ 1
-	octave 5
-	C_ 1
-	notetype 12, 12, 1
-	octave 4
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 7
-	E_ 1
-	E_ 3
-	notetype 12, 12, 2
-	octave 5
-	E_ 4
-	notetype 12, 12, 1
-	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 12, 2
-	octave 5
-	E_ 4
-	notetype 12, 12, 1
-	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 12, 2
-	octave 5
-	E_ 4
-	notetype 12, 12, 1
-	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 12, 2
-	D# 4
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	callchannel Music_FinalBattle_branch_23704
-	notetype 12, 12, 1
-	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 4, 10
+	note G#, 1
+	note D#, 1
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note C#, 1
+	note E_, 1
+	octave 5
+	note C_, 1
+	note_type 12, 12, 1
+	octave 4
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 7
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 2
+	octave 5
+	note E_, 4
+	note_type 12, 12, 1
+	octave 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 2
+	octave 5
+	note E_, 4
+	note_type 12, 12, 1
+	octave 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 2
+	octave 5
+	note E_, 4
+	note_type 12, 12, 1
+	octave 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 2
+	note D#, 4
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	sound_call Music_FinalBattle_branch_23704
+	note_type 12, 12, 1
+	octave 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 4, 10
 	octave 3
-	G# 4
+	note G#, 4
 
 Music_FinalBattle_branch_235e6::
-	notetype 12, 13, 7
+	note_type 12, 13, 7
 	octave 4
-	E_ 8
-	D# 8
-	D_ 8
+	note E_, 8
+	note D#, 8
+	note D_, 8
 	octave 3
-	B_ 8
-	notetype 12, 13, 7
-	A# 4
-	B_ 12
-	notetype 12, 11, 1
-	F_ 2
-	F# 3
-	A_ 1
-	B_ 1
-	A_ 1
-	octave 4
-	C_ 1
+	note B_, 8
+	note_type 12, 13, 7
+	note A#, 4
+	note B_, 12
+	note_type 12, 11, 1
+	note F_, 2
+	note F#, 3
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
 	octave 3
-	B_ 2
-	A_ 1
-	B_ 1
-	B_ 1
-	A_ 1
-	A# 1
-	notetype 12, 13, 7
-	octave 4
-	E_ 8
-	D# 8
-	D_ 8
+	note B_, 2
+	note A_, 1
+	note B_, 1
+	note B_, 1
+	note A_, 1
+	note A#, 1
+	note_type 12, 13, 7
+	octave 4
+	note E_, 8
+	note D#, 8
+	note D_, 8
 	octave 3
-	B_ 8
-	notetype 12, 13, 7
-	A# 4
-	B_ 12
-	octave 4
-	D# 4
-	E_ 12
-	notetype 12, 10, 0
+	note B_, 8
+	note_type 12, 13, 7
+	note A#, 4
+	note B_, 12
+	octave 4
+	note D#, 4
+	note E_, 12
+	note_type 12, 10, 0
 	octave 3
-	B_ 8
-	octave 4
-	D_ 8
-	F_ 8
-	D_ 8
-	notetype 12, 13, 1
-	E_ 1
-	E_ 3
-	notetype 12, 12, 4
+	note B_, 8
+	octave 4
+	note D_, 8
+	note F_, 8
+	note D_, 8
+	note_type 12, 13, 1
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 4
 	octave 3
-	D_ 4
-	notetype 12, 13, 1
+	note D_, 4
+	note_type 12, 13, 1
 	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 12, 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 4
 	octave 3
-	F_ 4
-	notetype 12, 13, 1
+	note F_, 4
+	note_type 12, 13, 1
 	octave 4
-	E_ 1
-	E_ 3
-	notetype 12, 12, 4
+	note E_, 1
+	note E_, 3
+	note_type 12, 12, 4
 	octave 3
-	D_ 4
-	notetype 12, 13, 1
+	note D_, 4
+	note_type 12, 13, 1
 	octave 4
-	E_ 1
-	E_ 1
-	notetype 12, 12, 4
+	note E_, 1
+	note E_, 1
+	note_type 12, 12, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	D_ 2
-	notetype 12, 12, 2
-	octave 4
-	E_ 1
-	E_ 1
-	D_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D_ 1
-	F_ 1
-	E_ 1
-	E_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	F# 1
-	E_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	E_ 1
-	notetype 12, 12, 4
+	note D_, 2
+	note_type 12, 12, 2
+	octave 4
+	note E_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note E_, 1
+	note_type 12, 12, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	D_ 2
-	notetype 12, 13, 7
+	note D_, 2
+	note_type 12, 13, 7
 	octave 4
-	E_ 4
-	F_ 2
-	F# 12
-	notetype 12, 12, 2
+	note E_, 4
+	note F_, 2
+	note F#, 12
+	note_type 12, 12, 2
 	octave 3
-	B_ 2
-	B_ 4
-	B_ 2
-	B_ 4
-	B_ 2
-	notetype 12, 13, 7
-	octave 4
-	F_ 4
-	F# 2
-	G_ 12
-	notetype 12, 12, 2
-	C_ 2
-	C_ 4
-	C_ 2
-	C_ 4
-	C_ 2
-	notetype 12, 13, 7
-	F# 4
-	G_ 2
-	G# 12
-	notetype 12, 8, 2
-	C# 2
-	C# 4
-	notetype 12, 10, 2
-	C# 2
-	C# 4
-	C# 4
-	notetype 12, 13, 2
-	C# 2
-	C# 4
-	notetype 12, 15, 2
-	C# 2
-	C# 4
-	notetype 12, 12, 4
-	E_ 1
-	F_ 1
-	notetype 12, 12, 0
-	F# 12
-	notetype 12, 12, 7
-	F# 4
-	notetype 12, 1, 15
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note_type 12, 13, 7
+	octave 4
+	note F_, 4
+	note F#, 2
+	note G_, 12
+	note_type 12, 12, 2
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	note_type 12, 13, 7
+	note F#, 4
+	note G_, 2
+	note G#, 12
+	note_type 12, 8, 2
+	note C#, 2
+	note C#, 4
+	note_type 12, 10, 2
+	note C#, 2
+	note C#, 4
+	note C#, 4
+	note_type 12, 13, 2
+	note C#, 2
+	note C#, 4
+	note_type 12, 15, 2
+	note C#, 2
+	note C#, 4
+	note_type 12, 12, 4
+	note E_, 1
+	note F_, 1
+	note_type 12, 12, 0
+	note F#, 12
+	note_type 12, 12, 7
+	note F#, 4
+	note_type 12, 1, 15
 	octave 3
-	F# 8
-	notetype 12, 9, 0
-	F# 8
-	notetype 12, 12, 7
-	octave 4
-	C# 4
-	notetype 12, 12, 0
-	D_ 12
-	D_ 8
-	notetype 12, 12, 7
-	D_ 8
-	notetype 12, 12, 0
-	E_ 8
-	notetype 12, 12, 7
-	E_ 8
-	notetype 12, 12, 0
+	note F#, 8
+	note_type 12, 9, 0
+	note F#, 8
+	note_type 12, 12, 7
+	octave 4
+	note C#, 4
+	note_type 12, 12, 0
+	note D_, 12
+	note D_, 8
+	note_type 12, 12, 7
+	note D_, 8
+	note_type 12, 12, 0
+	note E_, 8
+	note_type 12, 12, 7
+	note E_, 8
+	note_type 12, 12, 0
 	octave 3
-	A_ 8
-	notetype 12, 12, 7
-	A_ 8
-	notetype 12, 12, 0
-	octave 4
-	F_ 8
-	notetype 12, 12, 7
-	F_ 8
-	octave 5
-	C_ 8
-	octave 4
-	A# 8
-	notetype 12, 12, 0
-	A_ 16
-	A_ 8
-	notetype 12, 12, 7
-	A_ 8
-	notetype 12, 12, 5
-	callchannel Music_FinalBattle_branch_23710
-	notetype 12, 11, 1
-	callchannel Music_FinalBattle_branch_23710
-	notetype 12, 13, 7
-	octave 4
-	E_ 8
-	D# 8
-	D_ 8
+	note A_, 8
+	note_type 12, 12, 7
+	note A_, 8
+	note_type 12, 12, 0
+	octave 4
+	note F_, 8
+	note_type 12, 12, 7
+	note F_, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note A#, 8
+	note_type 12, 12, 0
+	note A_, 16
+	note A_, 8
+	note_type 12, 12, 7
+	note A_, 8
+	note_type 12, 12, 5
+	sound_call Music_FinalBattle_branch_23710
+	note_type 12, 11, 1
+	sound_call Music_FinalBattle_branch_23710
+	note_type 12, 13, 7
+	octave 4
+	note E_, 8
+	note D#, 8
+	note D_, 8
 	octave 3
-	B_ 8
-	A# 4
-	B_ 12
-	notetype 12, 12, 7
-	octave 4
-	D_ 8
-	notetype 12, 4, 12
-	C_ 8
-	notetype 12, 13, 7
-	E_ 8
-	D# 8
-	D_ 8
+	note B_, 8
+	note A#, 4
+	note B_, 12
+	note_type 12, 12, 7
+	octave 4
+	note D_, 8
+	note_type 12, 4, 12
+	note C_, 8
+	note_type 12, 13, 7
+	note E_, 8
+	note D#, 8
+	note D_, 8
 	octave 3
-	B_ 8
-	A# 4
-	B_ 12
-	notetype 12, 5, 13
-	octave 4
-	D_ 8
-	notetype 12, 12, 0
-	F_ 8
-	notetype 12, 12, 0
-	E_ 8
-	notetype 12, 12, 7
-	E_ 8
-	A# 4
-	B_ 12
-	loopchannel 0, Music_FinalBattle_branch_235e6
+	note B_, 8
+	note A#, 4
+	note B_, 12
+	note_type 12, 5, 13
+	octave 4
+	note D_, 8
+	note_type 12, 12, 0
+	note F_, 8
+	note_type 12, 12, 0
+	note E_, 8
+	note_type 12, 12, 7
+	note E_, 8
+	note A#, 4
+	note B_, 12
+	sound_loop 0, Music_FinalBattle_branch_235e6
 
 Music_FinalBattle_branch_23704::
 	octave 4
-	E_ 1
-	E_ 1
-	G_ 1
+	note E_, 1
+	note E_, 1
+	note G_, 1
 	octave 5
-	C_ 1
-	E_ 1
-	C_ 1
+	note C_, 1
+	note E_, 1
+	note C_, 1
 	octave 4
-	G_ 1
-	F_ 1
-	endchannel
+	note G_, 1
+	note F_, 1
+	sound_ret
 
 Music_FinalBattle_branch_23710::
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D_ 2
-	C# 2
-	F# 2
-	D_ 2
-	endchannel
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note F#, 2
+	note D_, 2
+	sound_ret
 
 
-Music_FinalBattle_Ch2::
-	notetype 12, 1, 1
+Music_FinalBattle_Ch3::
+	note_type 12, 1, 1
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 5
-	E_ 4
+	note E_, 4
 	octave 4
-	F_ 4
+	note F_, 4
 	octave 5
-	D# 4
+	note D#, 4
 	octave 4
-	G_ 4
+	note G_, 4
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	G# 4
-	B_ 4
-	E_ 1
-	E_ 1
+	note G#, 4
+	note B_, 4
+	note E_, 1
+	note E_, 1
 	rest 6
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 6
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 6
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
-	D# 4
-	E_ 1
-	E_ 1
+	note D#, 4
+	note E_, 1
+	note E_, 1
 	rest 2
-	B_ 4
-	E_ 1
-	E_ 1
+	note B_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	A# 2
-	E_ 1
-	E_ 1
+	note A#, 2
+	note E_, 1
+	note E_, 1
 	rest 2
-	B_ 4
-	E_ 1
-	E_ 1
+	note B_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 5
-	C_ 4
-	D_ 2
+	note C_, 4
+	note D_, 2
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
-	B_ 4
-	E_ 1
-	E_ 1
+	note B_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
-	E_ 1
-	D# 1
-	E_ 1
-	G_ 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note G_, 1
 
 Music_FinalBattle_branch_2377d::
 	octave 4
-	E_ 1
+	note E_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 2
 	octave 4
-	F# 4
-	D# 1
+	note F#, 4
+	note D#, 1
 	octave 3
-	D# 1
+	note D#, 1
 	rest 2
 	octave 4
-	F_ 4
-	D_ 1
+	note F_, 4
+	note D_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 2
 	octave 4
-	E_ 4
-	F# 1
+	note E_, 4
+	note F#, 1
 	octave 3
-	F# 1
+	note F#, 1
 	rest 2
 	octave 4
-	F# 4
-	F_ 4
+	note F#, 4
+	note F_, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
-	E_ 1
+	note F#, 2
+	note E_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 2
 	octave 4
-	F# 4
-	D# 1
+	note F#, 4
+	note D#, 1
 	octave 3
-	D# 1
+	note D#, 1
 	rest 2
 	octave 4
-	F_ 4
-	D_ 1
+	note F_, 4
+	note D_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 2
 	octave 4
-	E_ 4
-	F# 1
+	note E_, 4
+	note F#, 1
 	octave 3
-	F# 1
+	note F#, 1
 	rest 2
 	octave 4
-	F# 4
-	F_ 4
+	note F#, 4
+	note F_, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
-	octave 4
-	F# 2
-	E_ 1
-	D# 1
-	E_ 1
-	F# 1
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 1
-	E_ 1
+	note B_, 2
+	octave 4
+	note F#, 2
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 1
+	note E_, 1
 	rest 2
-	D_ 4
-	E_ 1
-	E_ 1
+	note D_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
-	F_ 4
-	E_ 1
-	E_ 1
+	note F_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
-	D_ 4
-	E_ 1
-	E_ 1
+	note D_, 4
+	note E_, 1
+	note E_, 1
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	rest 2
-	D_ 4
-	E_ 1
-	E_ 1
+	note D_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
-	F_ 4
-	E_ 1
-	E_ 1
+	note F_, 4
+	note E_, 1
+	note E_, 1
 	rest 2
-	D_ 4
-	E_ 1
-	E_ 1
+	note D_, 4
+	note E_, 1
+	note E_, 1
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	E_ 2
-	B_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	B_ 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	B_ 2
-	F_ 2
+	note B_, 2
+	note F_, 2
 	octave 5
-	D# 2
+	note D#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	D# 2
+	note D#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	D# 2
+	note D#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	D# 2
+	note D#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	C_ 2
-	C_ 2
+	note C_, 2
+	note C_, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	C_ 2
-	C_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
-	C# 2
+	note C#, 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
-	C# 2
-	E_ 2
-	C# 2
+	note C#, 2
+	note C#, 2
+	note E_, 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
-	C# 2
+	note C#, 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
-	C# 2
-	E_ 2
-	C# 2
-	callchannel Music_FinalBattle_branch_2395b
-	callchannel Music_FinalBattle_branch_2395b
+	note C#, 2
+	note C#, 2
+	note E_, 2
+	note C#, 2
+	sound_call Music_FinalBattle_branch_2395b
+	sound_call Music_FinalBattle_branch_2395b
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 1
-	F# 1
-	G_ 1
-	G# 1
-	callchannel Music_FinalBattle_branch_2396c
-	callchannel Music_FinalBattle_branch_2396c
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	sound_call Music_FinalBattle_branch_2396c
+	sound_call Music_FinalBattle_branch_2396c
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	F_ 2
+	note F_, 2
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	F_ 2
+	note F_, 2
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	F_ 2
+	note F_, 2
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	F_ 2
+	note F_, 2
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C# 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 4
-	A# 2
-	A_ 2
+	note A#, 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	A_ 2
-	G# 2
-	G_ 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 1
-	F# 1
-	G_ 1
-	G# 1
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	F_ 2
-	F# 2
-	G_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	B_ 2
-	F# 2
-	D# 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	F_ 2
-	F# 2
-	G_ 2
-	F# 2
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
-	F_ 2
-	E_ 2
-	B_ 2
-	octave 5
-	E_ 4
-	octave 4
-	E_ 2
-	B_ 2
-	octave 5
-	D# 4
-	octave 4
-	E_ 2
-	B_ 2
-	octave 5
-	D_ 4
-	octave 4
-	E_ 2
-	A_ 2
-	B_ 4
-	loopchannel 0, Music_FinalBattle_branch_2377d
+	note F#, 2
+	note F_, 2
+	note E_, 2
+	note B_, 2
+	octave 5
+	note E_, 4
+	octave 4
+	note E_, 2
+	note B_, 2
+	octave 5
+	note D#, 4
+	octave 4
+	note E_, 2
+	note B_, 2
+	octave 5
+	note D_, 4
+	octave 4
+	note E_, 2
+	note A_, 2
+	note B_, 4
+	sound_loop 0, Music_FinalBattle_branch_2377d
 
 Music_FinalBattle_branch_2395b::
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
+	note C#, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	C# 2
-	endchannel
+	note C#, 2
+	sound_ret
 
 Music_FinalBattle_branch_2396c::
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	E_ 2
+	note E_, 2
 	octave 4
-	A_ 2
+	note A_, 2
 	octave 5
-	E_ 2
-	endchannel
+	note E_, 2
+	sound_ret
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index 832bade6..f152d180 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,627 +1,627 @@
-Music_GameCorner_Ch0::
+Music_GameCorner_Ch1::
 	tempo 120
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 5
-	octave 3
-	A_ 6
-	notetype 12, 11, 1
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	C# 2
-	D# 16
+	toggle_perfect_pitch
+	note_type 12, 11, 5
+	octave 3
+	note A_, 6
+	note_type 12, 11, 1
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 16
 
 Music_GameCorner_branch_7e222::
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G# 4
+	note G#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	B_ 4
-	octave 3
-	A_ 2
-	G# 8
-	notetype 12, 10, 7
-	G# 2
-	A_ 2
-	B_ 2
-	notetype 12, 11, 5
-	G# 6
-	E_ 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	notetype 12, 10, 7
-	F# 8
-	D# 8
-	notetype 12, 11, 5
-	D# 4
+	note B_, 4
+	octave 3
+	note A_, 2
+	note G#, 8
+	note_type 12, 10, 7
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note_type 12, 11, 5
+	note G#, 6
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note_type 12, 10, 7
+	note F#, 8
+	note D#, 8
+	note_type 12, 11, 5
+	note D#, 4
 	octave 2
-	B_ 4
-	octave 3
-	F# 4
-	D# 4
-	B_ 2
-	A_ 8
-	notetype 12, 11, 7
-	octave 4
-	E_ 2
-	D# 2
-	E_ 2
-	D# 6
-	C# 2
-	octave 3
-	D# 2
-	E_ 2
-	F# 2
-	G_ 2
-	G# 2
-	notetype 12, 9, 7
-	G# 1
-	G_ 1
-	G# 1
-	G_ 1
-	G# 2
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 11, 5
-	C# 4
+	note B_, 4
+	octave 3
+	note F#, 4
+	note D#, 4
+	note B_, 2
+	note A_, 8
+	note_type 12, 11, 7
+	octave 4
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 6
+	note C#, 2
+	octave 3
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	note_type 12, 9, 7
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 2
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 11, 5
+	note C#, 4
 	octave 2
-	G# 4
+	note G#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	B_ 4
-	octave 3
-	A_ 2
-	G# 8
-	notetype 12, 11, 7
-	G# 2
-	A_ 2
-	B_ 2
-	G# 6
-	E_ 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	F# 8
-	notetype 12, 9, 7
-	D# 4
-	C# 4
-	notetype 12, 11, 5
-	D# 4
+	note B_, 4
+	octave 3
+	note A_, 2
+	note G#, 8
+	note_type 12, 11, 7
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note G#, 6
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 8
+	note_type 12, 9, 7
+	note D#, 4
+	note C#, 4
+	note_type 12, 11, 5
+	note D#, 4
 	octave 2
-	B_ 4
-	octave 3
-	F# 4
-	D# 4
-	B_ 2
-	A_ 8
-	notetype 12, 11, 7
-	F# 2
-	G# 2
-	A_ 2
-	B_ 4
-	A_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	notetype 12, 12, 2
-	E_ 4
+	note B_, 4
+	octave 3
+	note F#, 4
+	note D#, 4
+	note B_, 2
+	note A_, 8
+	note_type 12, 11, 7
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note_type 12, 12, 2
+	note E_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	E_ 2
-	E_ 4
-	E_ 4
-	notetype 12, 11, 7
+	note E_, 2
+	note E_, 4
+	note E_, 4
+	note_type 12, 11, 7
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	D_ 2
-	D# 10
+	note C#, 2
+	note D_, 2
+	note D#, 10
 	octave 2
-	B_ 2
-	octave 3
-	C# 2
-	D# 2
-	E_ 8
-	notetype 12, 11, 5
-	octave 4
-	D# 4
-	octave 3
-	B_ 4
-	F# 4
-	D# 4
-	notetype 12, 11, 7
-	E_ 3
-	D# 1
-	notetype 12, 11, 2
-	C# 2
-	D# 2
-	E_ 10
-	notetype 12, 11, 7
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 8
+	note_type 12, 11, 5
+	octave 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	note F#, 4
+	note D#, 4
+	note_type 12, 11, 7
+	note E_, 3
+	note D#, 1
+	note_type 12, 11, 2
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	note_type 12, 11, 7
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	D_ 2
-	D# 10
+	note C#, 2
+	note D_, 2
+	note D#, 10
 	octave 2
-	B_ 2
-	octave 3
-	C# 2
-	D# 2
-	E_ 8
-	notetype 12, 11, 5
-	octave 4
-	D# 4
-	octave 3
-	B_ 4
-	F# 4
-	A_ 4
-	notetype 12, 11, 7
-	G# 2
-	G# 1
-	G_ 1
-	G# 1
-	G_ 1
-	G# 1
-	G_ 1
-	G# 8
-	loopchannel 0, Music_GameCorner_branch_7e222
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 8
+	note_type 12, 11, 5
+	octave 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	note F#, 4
+	note A_, 4
+	note_type 12, 11, 7
+	note G#, 2
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 8
+	sound_loop 0, Music_GameCorner_branch_7e222
 
 
-Music_GameCorner_Ch1::
-	duty 2
+Music_GameCorner_Ch2::
+	duty_cycle 2
 	vibrato 10, 2, 3
-	notetype 12, 12, 6
-	octave 4
-	C# 6
-	notetype 12, 12, 1
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	duty 3
-	B_ 1
-	A# 1
-	B_ 1
-	A# 1
-	B_ 1
-	A# 1
-	B_ 8
+	note_type 12, 12, 6
+	octave 4
+	note C#, 6
+	note_type 12, 12, 1
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	duty_cycle 3
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 8
 
 Music_GameCorner_branch_7e2fa::
-	duty 2
-	notetype 12, 12, 7
+	duty_cycle 2
+	note_type 12, 12, 7
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	B_ 4
-	octave 3
-	G# 4
-	E_ 4
-	octave 4
-	C# 2
-	octave 3
-	B_ 14
-	octave 4
-	E_ 6
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 16
-	F# 4
-	D# 4
-	A_ 4
-	F# 4
-	octave 4
-	D# 2
-	C# 14
-	F# 6
-	E_ 2
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	A# 2
-	B_ 16
-	E_ 4
+	note B_, 4
+	octave 3
+	note G#, 4
+	note E_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 14
+	octave 4
+	note E_, 6
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 16
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	octave 4
+	note D#, 2
+	note C#, 14
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 16
+	note E_, 4
 	octave 2
-	B_ 4
-	octave 3
-	G# 4
-	E_ 4
-	octave 4
-	C# 2
-	octave 3
-	B_ 14
-	octave 4
-	E_ 6
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 16
-	F# 4
-	D# 4
-	A_ 4
-	F# 4
-	octave 4
-	D# 2
-	C# 14
-	F# 6
-	E_ 2
-	D# 2
-	E_ 2
-	F# 2
-	G# 2
-	notetype 12, 12, 1
-	E_ 2
-	notetype 12, 10, 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 2
-	notetype 12, 12, 7
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D_ 2
-	D# 10
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	E_ 10
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	notetype 12, 12, 5
-	F# 4
-	D# 4
-	octave 3
-	B_ 4
-	octave 4
-	A_ 4
-	G# 3
-	A_ 1
-	notetype 12, 12, 2
-	G# 2
-	F# 2
-	E_ 2
-	notetype 12, 12, 7
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D_ 2
-	D# 10
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	E_ 10
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	F# 4
-	D# 4
-	A_ 4
-	F# 4
-	B_ 16
-	loopchannel 0, Music_GameCorner_branch_7e2fa
+	note B_, 4
+	octave 3
+	note G#, 4
+	note E_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 14
+	octave 4
+	note E_, 6
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 16
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	octave 4
+	note D#, 2
+	note C#, 14
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note_type 12, 12, 1
+	note E_, 2
+	note_type 12, 10, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 2
+	note_type 12, 12, 7
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note_type 12, 12, 5
+	note F#, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note A_, 4
+	note G#, 3
+	note A_, 1
+	note_type 12, 12, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note_type 12, 12, 7
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	note B_, 16
+	sound_loop 0, Music_GameCorner_branch_7e2fa
 
 
-Music_GameCorner_Ch2::
-	notetype 12, 1, 3
+Music_GameCorner_Ch3::
+	note_type 12, 1, 3
 	octave 5
-	C# 1
+	note C#, 1
 	rest 5
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
 
 Music_GameCorner_branch_7e3a5::
-	callchannel Music_GameCorner_branch_7e418
-	callchannel Music_GameCorner_branch_7e42d
-	callchannel Music_GameCorner_branch_7e442
-	callchannel Music_GameCorner_branch_7e457
-	callchannel Music_GameCorner_branch_7e46c
-	callchannel Music_GameCorner_branch_7e481
-	callchannel Music_GameCorner_branch_7e496
-	D# 1
+	sound_call Music_GameCorner_branch_7e418
+	sound_call Music_GameCorner_branch_7e42d
+	sound_call Music_GameCorner_branch_7e442
+	sound_call Music_GameCorner_branch_7e457
+	sound_call Music_GameCorner_branch_7e46c
+	sound_call Music_GameCorner_branch_7e481
+	sound_call Music_GameCorner_branch_7e496
+	note D#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	callchannel Music_GameCorner_branch_7e418
-	callchannel Music_GameCorner_branch_7e42d
-	callchannel Music_GameCorner_branch_7e442
-	callchannel Music_GameCorner_branch_7e457
-	callchannel Music_GameCorner_branch_7e46c
-	callchannel Music_GameCorner_branch_7e481
-	callchannel Music_GameCorner_branch_7e496
-	E_ 1
+	sound_call Music_GameCorner_branch_7e418
+	sound_call Music_GameCorner_branch_7e42d
+	sound_call Music_GameCorner_branch_7e442
+	sound_call Music_GameCorner_branch_7e457
+	sound_call Music_GameCorner_branch_7e46c
+	sound_call Music_GameCorner_branch_7e481
+	sound_call Music_GameCorner_branch_7e496
+	note E_, 1
 	rest 3
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 1
-	callchannel Music_GameCorner_branch_7e46c
-	callchannel Music_GameCorner_branch_7e418
-	callchannel Music_GameCorner_branch_7e4ab
-	E_ 1
+	sound_call Music_GameCorner_branch_7e46c
+	sound_call Music_GameCorner_branch_7e418
+	sound_call Music_GameCorner_branch_7e4ab
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	callchannel Music_GameCorner_branch_7e46c
-	callchannel Music_GameCorner_branch_7e418
-	callchannel Music_GameCorner_branch_7e4ab
-	callchannel Music_GameCorner_branch_7e42d
-	loopchannel 0, Music_GameCorner_branch_7e3a5
+	sound_call Music_GameCorner_branch_7e46c
+	sound_call Music_GameCorner_branch_7e418
+	sound_call Music_GameCorner_branch_7e4ab
+	sound_call Music_GameCorner_branch_7e42d
+	sound_loop 0, Music_GameCorner_branch_7e3a5
 
 Music_GameCorner_branch_7e418::
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e42d::
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e442::
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e457::
-	D# 1
+	note D#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e46c::
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e481::
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e496::
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	endchannel
+	sound_ret
 
 Music_GameCorner_branch_7e4ab::
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	endchannel
+	sound_ret
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index ad99bddd..1ffc4930 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,357 +1,357 @@
-Music_Gym_Ch0::
+Music_Gym_Ch1::
 	tempo 138
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 2, 2
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	octave 3
-	G_ 6
-	C_ 1
-	G_ 1
-	F_ 6
+	note G_, 6
+	note C_, 1
+	note G_, 1
+	note F_, 6
 	octave 2
-	A# 1
+	note A#, 1
 	octave 3
-	F_ 1
-	E_ 6
+	note F_, 1
+	note E_, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	E_ 1
-	F_ 4
-	G_ 4
+	note E_, 1
+	note F_, 4
+	note G_, 4
 
 Music_Gym_branch_bcd8::
-	E_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	notetype 12, 11, 1
-	D_ 3
-	notetype 12, 11, 5
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	E_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note_type 12, 11, 1
+	note D_, 3
+	note_type 12, 11, 5
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	F_ 2
-	notetype 12, 11, 1
-	A# 3
-	notetype 12, 11, 5
-	F_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note_type 12, 11, 1
+	note A#, 3
+	note_type 12, 11, 5
+	note F_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	F_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F_ 4
-	A# 2
-	F_ 1
-	A# 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note A#, 2
+	note F_, 1
+	note A#, 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	C_ 1
-	D_ 1
-	E_ 4
-	C_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	E_ 2
-	C_ 1
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	C_ 1
-	D_ 1
-	E_ 4
-	D_ 2
-	E_ 2
-	F_ 2
-	F_ 2
-	G_ 2
-	E_ 1
-	G_ 1
-	A# 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 1
+	note G_, 1
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_Gym_branch_bcd8
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_Gym_branch_bcd8
 
 
-Music_Gym_Ch1::
-	duty 3
+Music_Gym_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 5
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	A# 6
-	F_ 1
-	A# 1
-	notetype 12, 10, 0
-	A_ 12
-	notetype 12, 12, 7
-	B_ 4
+	note A#, 6
+	note F_, 1
+	note A#, 1
+	note_type 12, 10, 0
+	note A_, 12
+	note_type 12, 12, 7
+	note B_, 4
 
 Music_Gym_branch_bd82::
 	octave 4
-	C_ 12
+	note C_, 12
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	notetype 12, 12, 2
-	D_ 3
+	note C_, 2
+	note_type 12, 12, 2
+	note D_, 3
 	octave 3
-	A# 1
-	notetype 12, 12, 7
-	A# 12
+	note A#, 1
+	note_type 12, 12, 7
+	note A#, 12
 	octave 4
-	C_ 12
+	note C_, 12
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	notetype 12, 12, 4
+	note C_, 2
+	note_type 12, 12, 4
 	octave 3
-	A# 2
-	notetype 12, 12, 7
-	A# 1
+	note A#, 2
+	note_type 12, 12, 7
+	note A#, 1
 	octave 4
-	C_ 1
-	D_ 12
-	E_ 12
-	D_ 2
-	E_ 2
-	notetype 12, 12, 2
-	F_ 3
-	D_ 1
-	notetype 12, 12, 7
-	D_ 4
-	notetype 12, 12, 2
-	A# 3
-	F_ 1
-	notetype 12, 12, 7
-	F_ 4
-	E_ 12
-	D_ 2
-	E_ 2
-	F_ 2
-	D_ 1
-	F_ 1
-	A# 12
+	note C_, 1
+	note D_, 12
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note_type 12, 12, 2
+	note F_, 3
+	note D_, 1
+	note_type 12, 12, 7
+	note D_, 4
+	note_type 12, 12, 2
+	note A#, 3
+	note F_, 1
+	note_type 12, 12, 7
+	note F_, 4
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 1
+	note F_, 1
+	note A#, 12
 	octave 3
-	G_ 6
+	note G_, 6
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 4
-	A# 4
-	A_ 4
-	G_ 4
-	F_ 4
-	notetype 12, 12, 3
-	E_ 2
-	notetype 12, 12, 7
-	E_ 1
-	F_ 1
-	G_ 6
-	G_ 2
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note_type 12, 12, 3
+	note E_, 2
+	note_type 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 6
+	note G_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	A# 4
-	A_ 4
-	G_ 4
-	C_ 2
-	D_ 2
-	G_ 6
+	note G_, 2
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note C_, 2
+	note D_, 2
+	note G_, 6
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 4
-	A# 4
-	A_ 4
-	G_ 4
-	F_ 4
-	notetype 12, 12, 3
-	E_ 2
-	notetype 12, 12, 7
-	E_ 1
-	F_ 1
-	G_ 4
-	notetype 12, 12, 3
-	G_ 2
-	notetype 12, 12, 7
-	G_ 1
-	A_ 1
-	A# 4
-	notetype 12, 12, 4
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note_type 12, 12, 3
+	note E_, 2
+	note_type 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 4
+	note_type 12, 12, 3
+	note G_, 2
+	note_type 12, 12, 7
+	note G_, 1
+	note A_, 1
+	note A#, 4
+	note_type 12, 12, 4
 	octave 4
-	C_ 2
-	notetype 12, 12, 7
-	C_ 1
-	D_ 1
-	E_ 12
-	loopchannel 0, Music_Gym_branch_bd82
+	note C_, 2
+	note_type 12, 12, 7
+	note C_, 1
+	note D_, 1
+	note E_, 12
+	sound_loop 0, Music_Gym_branch_bd82
 
 
-Music_Gym_Ch2::
-	notetype 12, 1, 1
+Music_Gym_Ch3::
+	note_type 12, 1, 1
 	rest 16
 	rest 10
 	octave 4
-	G_ 2
-	F_ 2
-	D_ 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
 
 Music_Gym_branch_be02::
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	A_ 2
-	F_ 2
-	loopchannel 0, Music_Gym_branch_be02
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note F_, 2
+	sound_loop 0, Music_Gym_branch_be02
 
 Music_Gym_branch_be3b::
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	endchannel
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	sound_ret
 
 Music_Gym_branch_be44::
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	endchannel
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	sound_ret
 
 Music_Gym_branch_be4d::
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	endchannel
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	sound_ret
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index 6c1cffb5..cebda01b 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1,1400 +1,1400 @@
-Music_GymLeaderBattle_Ch0::
+Music_GymLeaderBattle_Ch1::
 	tempo 104
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	rest 6
 	octave 3
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	C_ 1
-	octave 2
-	B_ 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 2
+	note B_, 1
 	octave 1
-	G# 1
-	A_ 1
-	A# 1
-	A_ 1
-	A# 1
-	B_ 1
-	A# 1
-	B_ 1
-	octave 2
-	F# 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	G_ 6
-	F# 1
+	note G_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	F_ 6
-	F# 1
+	note F_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	G_ 6
-	F# 1
+	note G_, 6
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 9
-	A_ 6
+	note A_, 6
 
 Music_GymLeaderBattle_branch_223b0::
-	F# 1
-	octave 3
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	octave 2
-	E_ 1
-	A_ 1
-	octave 3
-	C# 1
-	octave 2
-	B_ 1
-	A_ 1
-	octave 3
-	C# 1
-	octave 2
-	B_ 1
-	A_ 1
-	octave 3
-	C# 1
-	octave 2
-	B_ 1
-	A_ 1
-	octave 3
-	C# 1
-	octave 2
-	B_ 1
-	A_ 1
-	octave 3
-	C# 1
+	note F#, 1
+	octave 3
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	octave 3
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
-	F# 1
+	note B_, 1
+	note A_, 1
+	note F#, 1
 	octave 3
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
-	C# 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
 	octave 2
-	E_ 1
-	A_ 1
+	note E_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	octave 3
-	C# 1
+	note C#, 1
 	octave 2
-	B_ 1
-	A_ 1
+	note B_, 1
+	note A_, 1
 	rest 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	E_ 4
+	note E_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	E_ 4
+	note E_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	D_ 4
+	note D_, 4
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 2
-	C# 2
+	note C#, 2
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	rest 16
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	B_ 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	C# 12
-	notetype 12, 11, 3
+	note C#, 12
+	note_type 12, 11, 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	A_ 12
-	notetype 12, 11, 3
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
+	note A_, 12
+	note_type 12, 11, 3
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	F# 2
-	B_ 2
-	F# 2
-	D# 2
-	F# 2
+	note C#, 2
+	note F#, 2
+	note B_, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
 	octave 1
-	A_ 1
-	rest 1
-	A_ 1
-	rest 1
-	notetype 12, 11, 5
-	octave 3
-	A_ 12
-	notetype 12, 11, 3
-	C# 1
-	octave 2
-	B_ 1
-	octave 3
-	C# 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	F# 1
-	A_ 1
-	G# 1
-	F# 1
-	E_ 1
-	F# 1
-	E_ 1
-	D# 1
-	C# 1
-	notetype 12, 11, 5
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	E_ 2
-	D# 4
-	C# 6
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note_type 12, 11, 5
+	octave 3
+	note A_, 12
+	note_type 12, 11, 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note_type 12, 11, 5
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 6
 	rest 16
 	rest 10
-	E_ 6
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	E_ 4
-	D# 2
-	C# 4
-	octave 2
-	B_ 6
-	octave 3
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	A_ 2
-	G# 4
-	E_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_223b0
+	note E_, 6
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	octave 2
+	note B_, 6
+	octave 3
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note A_, 2
+	note G#, 4
+	note E_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch1::
-	duty 3
+Music_GymLeaderBattle_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 3
-	octave 4
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	octave 3
-	B_ 1
+	note_type 12, 12, 3
+	octave 4
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
 	rest 5
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	B_ 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
-	A# 6
+	note A#, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 15
-	B_ 1
+	note B_, 1
 	rest 9
 	octave 4
-	C# 6
+	note C#, 6
 
 Music_GymLeaderBattle_branch_225e0::
-	notetype 12, 12, 5
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
-	E_ 4
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	notetype 12, 11, 7
-	duty 2
-	octave 3
-	A_ 8
-	octave 4
-	C# 8
-	E_ 8
-	C# 8
-	notetype 12, 12, 5
-	duty 3
-	D# 4
-	C# 4
-	D# 4
-	E_ 2
-	F# 4
-	E_ 4
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	notetype 12, 11, 7
-	duty 2
-	C# 8
-	octave 3
-	B_ 8
-	A_ 8
-	notetype 12, 12, 3
-	octave 4
-	E_ 4
-	E_ 2
-	C# 2
-	notetype 12, 12, 5
-	duty 3
+	note_type 12, 12, 5
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note_type 12, 11, 7
+	duty_cycle 2
+	octave 3
+	note A_, 8
+	octave 4
+	note C#, 8
+	note E_, 8
+	note C#, 8
+	note_type 12, 12, 5
+	duty_cycle 3
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note_type 12, 11, 7
+	duty_cycle 2
+	note C#, 8
+	octave 3
+	note B_, 8
+	note A_, 8
+	note_type 12, 12, 3
+	octave 4
+	note E_, 4
+	note E_, 2
+	note C#, 2
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 3
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 4
-	E_ 1
-	D_ 1
+	note E_, 1
+	note D_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 4
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
 	rest 2
-	E_ 1
-	C# 1
-	E_ 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 4
-	E_ 1
-	D_ 1
+	note E_, 1
+	note D_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	E_ 1
+	note E_, 1
 	rest 4
-	F# 1
-	E_ 1
-	C# 1
-	F# 1
-	E_ 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	note F#, 1
+	note E_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 12, 11, 0
+	note_type 12, 11, 0
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	G_ 4
-	notetype 12, 11, 0
-	F# 8
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 12, 3
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note A_, 4
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 8
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 12, 3
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 1
-	notetype 12, 11, 0
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note_type 12, 11, 0
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C_ 4
-	notetype 12, 11, 0
+	note C_, 4
+	note_type 12, 11, 0
 	octave 3
-	B_ 16
-	notetype 12, 3, 15
+	note B_, 16
+	note_type 12, 3, 15
 	octave 4
-	F# 16
-	notetype 12, 12, 3
-	duty 3
+	note F#, 16
+	note_type 12, 12, 3
+	duty_cycle 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 3
-	A_ 12
-	notetype 12, 12, 3
+	note A_, 12
+	note_type 12, 12, 3
 	octave 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 4
-	C# 12
-	notetype 12, 11, 0
-	D# 16
-	notetype 12, 11, 7
-	D# 16
-	notetype 12, 12, 3
+	note C#, 12
+	note_type 12, 11, 0
+	note D#, 16
+	note_type 12, 11, 7
+	note D#, 16
+	note_type 12, 12, 3
 	octave 1
-	A_ 1
-	rest 1
-	A_ 1
-	rest 1
-	notetype 12, 12, 7
-	octave 4
-	C# 12
-	notetype 12, 12, 0
-	A_ 8
-	E_ 8
-	B_ 16
-	notetype 12, 12, 7
-	B_ 16
-	notetype 12, 12, 4
-	octave 3
-	D# 4
-	E_ 4
-	C# 2
-	D# 6
-	F# 4
-	A_ 2
-	G# 4
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note_type 12, 12, 7
+	octave 4
+	note C#, 12
+	note_type 12, 12, 0
+	note A_, 8
+	note E_, 8
+	note B_, 16
+	note_type 12, 12, 7
+	note B_, 16
+	note_type 12, 12, 4
+	octave 3
+	note D#, 4
+	note E_, 4
+	note C#, 2
+	note D#, 6
+	note F#, 4
+	note A_, 2
+	note G#, 4
 	rest 2
-	B_ 1
-	octave 4
-	D# 1
-	F# 1
-	A# 1
-	notetype 12, 12, 0
-	B_ 16
-	F# 16
-	A_ 16
+	note B_, 1
+	octave 4
+	note D#, 1
+	note F#, 1
+	note A#, 1
+	note_type 12, 12, 0
+	note B_, 16
+	note F#, 16
+	note A_, 16
 	octave 5
-	C# 8
+	note C#, 8
 	rest 2
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 	octave 4
-	A_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_225e0
+	note A_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch2::
+Music_GymLeaderBattle_Ch3::
 	vibrato 0, 2, 0
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	rest 12
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	C_ 1
-	C# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	E_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	F# 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F_ 6
+	note F_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 6
-	notetype 12, 1, 4
+	note C#, 6
+	note_type 12, 1, 4
 
 Music_GymLeaderBattle_branch_227b1::
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 13
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	C# 12
+	note C#, 12
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	E_ 12
-	D# 16
+	note E_, 12
+	note D#, 16
 	octave 3
-	B_ 16
-	A_ 1
+	note B_, 16
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	E_ 12
-	C# 8
-	E_ 8
+	note E_, 12
+	note C#, 8
+	note E_, 8
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 6
+	note G_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G_ 6
-	loopchannel 0, Music_GymLeaderBattle_branch_227b1
+	note G_, 6
+	sound_loop 0, Music_GymLeaderBattle_branch_227b1
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index 098c82c8..80dafaa6 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,96 +1,96 @@
-Music_HallOfFame_Ch0::
+Music_HallOfFame_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 2, 2
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	rest 16
 	rest 16
 	rest 16
 	rest 12
 	octave 3
-	D_ 1
-	E_ 1
-	F_ 1
-	F# 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
 
 Music_HallOfFame_branch_7fbc5::
-	notetype 12, 8, 0
+	note_type 12, 8, 0
 	octave 4
-	C_ 16
-	E_ 16
-	F# 16
-	notetype 12, 6, 0
-	F_ 16
-	loopchannel 3, Music_HallOfFame_branch_7fbc5
+	note C_, 16
+	note E_, 16
+	note F#, 16
+	note_type 12, 6, 0
+	note F_, 16
+	sound_loop 3, Music_HallOfFame_branch_7fbc5
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	loopchannel 0, Music_HallOfFame_branch_7fbc5
+	sound_loop 0, Music_HallOfFame_branch_7fbc5
 
 
-Music_HallOfFame_Ch1::
+Music_HallOfFame_Ch2::
 	vibrato 8, 2, 5
-	duty 3
+	duty_cycle 3
 
 Music_HallOfFame_branch_7fbdf::
-	notetype 12, 12, 4
+	note_type 12, 12, 4
 	octave 3
-	G_ 2
-	D_ 2
-	G_ 2
-	A_ 10
-	G_ 2
-	D_ 2
-	G_ 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 4
-	A_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	A_ 10
-	F_ 2
-	C_ 2
-	F_ 2
-	A# 4
-	A_ 4
-	F_ 2
-	loopchannel 0, Music_HallOfFame_branch_7fbdf
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note A#, 4
+	note A_, 4
+	note F_, 2
+	sound_loop 0, Music_HallOfFame_branch_7fbdf
 
 
-Music_HallOfFame_Ch2::
-	notetype 12, 1, 2
+Music_HallOfFame_Ch3::
+	note_type 12, 1, 2
 
 Music_HallOfFame_branch_7fbfe::
 	octave 4
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	loopchannel 12, Music_HallOfFame_branch_7fbfe
-	D_ 4
-	G_ 4
-	D_ 4
-	G_ 4
-	E_ 4
-	G_ 4
-	E_ 4
-	G_ 4
-	F# 4
-	A_ 4
-	F# 4
-	A_ 4
-	E_ 4
-	G_ 4
-	E_ 4
-	G_ 4
-	loopchannel 0, Music_HallOfFame_Ch2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	sound_loop 12, Music_HallOfFame_branch_7fbfe
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note F#, 4
+	note A_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	sound_loop 0, Music_HallOfFame_Ch3
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index f139775b..f2ef8a7e 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,231 +1,231 @@
-Music_IndigoPlateau_Ch0::
+Music_IndigoPlateau_Ch1::
 	tempo 132
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 2
+	toggle_perfect_pitch
+	note_type 12, 11, 2
 	octave 2
-	A_ 8
-	A_ 8
-	A_ 8
-	A_ 4
-	notetype 12, 10, 4
-	A# 4
+	note A_, 8
+	note A_, 8
+	note A_, 8
+	note A_, 4
+	note_type 12, 10, 4
+	note A#, 4
 
 Music_IndigoPlateau_branch_a605::
-	callchannel Music_IndigoPlateau_branch_a659
-	notetype 12, 11, 4
+	sound_call Music_IndigoPlateau_branch_a659
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	callchannel Music_IndigoPlateau_branch_a659
-	notetype 12, 11, 4
+	note D_, 4
+	sound_call Music_IndigoPlateau_branch_a659
+	note_type 12, 11, 4
 	octave 3
-	D# 4
-	callchannel Music_IndigoPlateau_branch_a659
-	notetype 12, 11, 4
+	note D#, 4
+	sound_call Music_IndigoPlateau_branch_a659
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	callchannel Music_IndigoPlateau_branch_a659
-	notetype 12, 10, 0
+	note D_, 4
+	sound_call Music_IndigoPlateau_branch_a659
+	note_type 12, 10, 0
 	octave 2
-	A# 4
-	callchannel Music_IndigoPlateau_branch_a659
-	notetype 12, 11, 4
+	note A#, 4
+	sound_call Music_IndigoPlateau_branch_a659
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	notetype 12, 13, 4
+	note D_, 4
+	note_type 12, 13, 4
 	octave 3
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	notetype 12, 11, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note_type 12, 11, 4
 	octave 3
-	D# 4
-	notetype 12, 13, 4
+	note D#, 4
+	note_type 12, 13, 4
 	octave 3
-	A# 4
-	A# 4
-	A# 4
-	A# 4
-	A# 4
-	A# 4
-	A# 4
-	notetype 12, 11, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note_type 12, 11, 4
 	octave 3
-	F_ 2
-	notetype 12, 11, 4
+	note F_, 2
+	note_type 12, 11, 4
 	octave 3
-	G_ 2
-	notetype 12, 11, 0
-	A_ 8
+	note G_, 2
+	note_type 12, 11, 0
+	note A_, 8
 	octave 2
-	A_ 8
-	notetype 12, 11, 7
+	note A_, 8
+	note_type 12, 11, 7
 	octave 3
-	F_ 8
-	notetype 12, 4, 14
+	note F_, 8
+	note_type 12, 4, 14
 	octave 2
-	A# 8
-	loopchannel 0, Music_IndigoPlateau_branch_a605
+	note A#, 8
+	sound_loop 0, Music_IndigoPlateau_branch_a605
 
 Music_IndigoPlateau_branch_a659::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 2
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	A_ 4
-	endchannel
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	sound_ret
 
 
-Music_IndigoPlateau_Ch1::
-	duty 3
+Music_IndigoPlateau_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 3
-	D_ 8
-	D_ 8
-	D_ 8
-	D_ 4
-	notetype 12, 5, 10
-	D# 4
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 4
+	note_type 12, 5, 10
+	note D#, 4
 
 Music_IndigoPlateau_branch_a673::
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
-	A_ 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
-	A# 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
-	A_ 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 7
-	C# 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
-	A_ 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
-	A# 4
-	callchannel Music_IndigoPlateau_branch_a6af
-	notetype 12, 12, 5
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
+	note A_, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
+	note A#, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
+	note A_, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 7
+	note C#, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
+	note A_, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
+	note A#, 4
+	sound_call Music_IndigoPlateau_branch_a6af
+	note_type 12, 12, 5
 	octave 4
-	C_ 2
-	notetype 12, 12, 7
+	note C_, 2
+	note_type 12, 12, 7
 	octave 4
-	C# 2
-	D_ 8
+	note C#, 2
+	note D_, 8
 	octave 3
-	D_ 8
+	note D_, 8
 	octave 4
-	C_ 8
-	notetype 12, 4, 13
+	note C_, 8
+	note_type 12, 4, 13
 	octave 4
-	D# 8
-	loopchannel 0, Music_IndigoPlateau_branch_a673
+	note D#, 8
+	sound_loop 0, Music_IndigoPlateau_branch_a673
 
 Music_IndigoPlateau_branch_a6af::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 3
-	D_ 4
-	D_ 4
-	D_ 4
-	D_ 4
-	D_ 4
-	D_ 4
-	D_ 4
-	endchannel
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	sound_ret
 
 
-Music_IndigoPlateau_Ch2::
-	notetype 12, 1, 0
+Music_IndigoPlateau_Ch3::
+	note_type 12, 1, 0
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 6
-	D_ 2
+	note D_, 2
 	rest 6
-	D_ 2
+	note D_, 2
 	rest 6
-	D_ 2
+	note D_, 2
 	rest 2
-	D# 4
+	note D#, 4
 
 Music_IndigoPlateau_branch_a6c6::
-	callchannel Music_IndigoPlateau_branch_a6fe
-	callchannel Music_IndigoPlateau_branch_a6fe
-	callchannel Music_IndigoPlateau_branch_a6fe
-	D_ 2
+	sound_call Music_IndigoPlateau_branch_a6fe
+	sound_call Music_IndigoPlateau_branch_a6fe
+	sound_call Music_IndigoPlateau_branch_a6fe
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	F# 4
-	callchannel Music_IndigoPlateau_branch_a6fe
-	callchannel Music_IndigoPlateau_branch_a6fe
-	D_ 2
+	note F#, 4
+	sound_call Music_IndigoPlateau_branch_a6fe
+	sound_call Music_IndigoPlateau_branch_a6fe
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	A# 1
+	note A#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	A_ 8
-	D_ 8
-	A# 8
-	D# 8
-	loopchannel 0, Music_IndigoPlateau_branch_a6c6
+	note A_, 8
+	note D_, 8
+	note A#, 8
+	note D#, 8
+	sound_loop 0, Music_IndigoPlateau_branch_a6c6
 
 Music_IndigoPlateau_branch_a6fe::
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	D_ 2
+	note D_, 2
 	rest 2
-	A_ 4
-	endchannel
+	note A_, 4
+	sound_ret
 
 
-Music_IndigoPlateau_Ch3::
+Music_IndigoPlateau_Ch4::
 	dspeed 6
 	mutedsnare2 16
 	mutedsnare2 16
@@ -241,20 +241,20 @@ Music_IndigoPlateau_Ch3::
 	mutedsnare3 1
 
 Music_IndigoPlateau_branch_a728::
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a77e
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a7a8
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a77e
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a7a8
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a77e
-	callchannel Music_IndigoPlateau_branch_a791
-	callchannel Music_IndigoPlateau_branch_a7a8
-	callchannel Music_IndigoPlateau_branch_a77e
-	callchannel Music_IndigoPlateau_branch_a7a8
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a77e
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a7a8
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a77e
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a7a8
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a77e
+	sound_call Music_IndigoPlateau_branch_a791
+	sound_call Music_IndigoPlateau_branch_a7a8
+	sound_call Music_IndigoPlateau_branch_a77e
+	sound_call Music_IndigoPlateau_branch_a7a8
 	mutedsnare2 16
 	mutedsnare2 8
 	mutedsnare3 8
@@ -275,7 +275,7 @@ Music_IndigoPlateau_branch_a728::
 	mutedsnare2 1
 	mutedsnare2 1
 	mutedsnare2 1
-	loopchannel 0, Music_IndigoPlateau_branch_a728
+	sound_loop 0, Music_IndigoPlateau_branch_a728
 
 Music_IndigoPlateau_branch_a77e::
 	mutedsnare2 4
@@ -287,7 +287,7 @@ Music_IndigoPlateau_branch_a77e::
 	mutedsnare4 4
 	mutedsnare4 2
 	mutedsnare3 2
-	endchannel
+	sound_ret
 
 Music_IndigoPlateau_branch_a791::
 	mutedsnare2 4
@@ -301,7 +301,7 @@ Music_IndigoPlateau_branch_a791::
 	mutedsnare4 1
 	mutedsnare3 1
 	mutedsnare3 1
-	endchannel
+	sound_ret
 
 Music_IndigoPlateau_branch_a7a8::
 	mutedsnare2 4
@@ -318,4 +318,4 @@ Music_IndigoPlateau_branch_a7a8::
 	mutedsnare3 1
 	mutedsnare3 1
 	mutedsnare3 1
-	endchannel
+	sound_ret
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index 2aad0d88..4885e389 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -1,235 +1,235 @@
-Music_IntroBattle_Ch0::
+Music_IntroBattle_Ch1::
 	tempo 98
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 1
+	toggle_perfect_pitch
+	note_type 12, 11, 1
 	rest 8
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	notetype 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D# 4
-	notetype 12, 11, 1
+	note D#, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	notetype 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 10, 0
-	A# 4
-	notetype 12, 11, 1
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 10, 0
+	note A#, 4
+	note_type 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	notetype 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 2, 9
+	note A_, 2
+	note A_, 2
+	note_type 12, 2, 9
 	octave 3
-	G_ 4
-	notetype 12, 11, 0
-	A_ 8
+	note G_, 4
+	note_type 12, 11, 0
+	note A_, 8
 	octave 2
-	A_ 8
-	notetype 12, 11, 7
+	note A_, 8
+	note_type 12, 11, 7
 	octave 3
-	F_ 8
-	notetype 12, 4, 15
+	note F_, 8
+	note_type 12, 4, 15
 	octave 2
-	F_ 8
-	notetype 12, 11, 1
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note F_, 8
+	note_type 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D_ 4
-	notetype 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	D# 4
-	notetype 12, 11, 1
+	note D#, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	F_ 4
-	notetype 12, 11, 1
+	note F_, 4
+	note_type 12, 11, 1
 	octave 2
-	A_ 2
-	A_ 2
-	notetype 12, 11, 4
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	G_ 4
-	notetype 12, 11, 0
-	F# 16
-	notetype 12, 11, 1
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 16
+	note_type 12, 11, 1
 	octave 4
-	D_ 16
-	endchannel
+	note D_, 16
+	sound_ret
 
 
-Music_IntroBattle_Ch1::
-	duty 3
+Music_IntroBattle_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	rest 8
 	octave 3
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A_ 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A# 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A_ 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 11, 7
-	C# 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A_ 4
-	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 11, 7
+	note C#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
 	octave 3
-	D_ 2
-	D_ 2
-	notetype 12, 12, 7
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 7
 	octave 4
-	C# 4
-	D_ 8
+	note C#, 4
+	note D_, 8
 	octave 3
-	D_ 8
+	note D_, 8
 	octave 4
-	C_ 8
+	note C_, 8
 	octave 3
-	C_ 8
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A_ 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
-	A# 4
-	notetype 12, 12, 2
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
+	note C_, 8
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
 	octave 4
-	C_ 4
-	notetype 12, 12, 2
+	note C_, 4
+	note_type 12, 12, 2
 	octave 3
-	D_ 2
-	D_ 2
-	notetype 12, 12, 5
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
 	octave 4
-	C# 4
-	notetype 12, 2, 15
-	D_ 16
-	notetype 12, 12, 1
+	note C#, 4
+	note_type 12, 2, 15
+	note D_, 16
+	note_type 12, 12, 1
 	octave 5
-	D_ 16
-	endchannel
+	note D_, 16
+	sound_ret
 
 
-Music_IntroBattle_Ch2::
-	notetype 12, 1, 0
+Music_IntroBattle_Ch3::
+	note_type 12, 1, 0
 	rest 8
 	octave 4
-	D_ 1
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 4
-	D_ 1
+	note F#, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A# 4
-	A_ 8
-	D_ 8
-	A# 8
-	D_ 8
-	D_ 1
+	note A#, 4
+	note A_, 8
+	note D_, 8
+	note A#, 8
+	note D_, 8
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 4
-	D_ 1
+	note A_, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A# 4
-	D_ 1
+	note A#, 4
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A# 4
-	A_ 16
-	D_ 1
+	note A#, 4
+	note A_, 16
+	note D_, 1
 	rest 15
-	endchannel
+	sound_ret
 
 
-Music_IntroBattle_Ch3::
+Music_IntroBattle_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
@@ -326,4 +326,4 @@ Music_IntroBattle_Ch3::
 	mutedsnare2 2
 	rest 16
 	rest 14
-	endchannel
+	sound_ret
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 0b791a30..3c0d5234 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -1,40 +1,40 @@
-Music_JigglypuffSong_Ch0::
+Music_JigglypuffSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 8, 2, 4
-	duty 2
-	dutycycle 165
-	toggleperfectpitch
-	notetype 13, 6, 7
+	duty_cycle 2
+	duty_cycle_pattern 165
+	toggle_perfect_pitch
+	note_type 13, 6, 7
 	octave 4
-	E_ 8
-	notetype 12, 6, 7
-	B_ 2
-	G# 6
-	F# 8
-	G# 2
-	A_ 6
-	G# 8
-	F# 4
-	G# 4
-	E_ 10
-	endchannel
+	note E_, 8
+	note_type 12, 6, 7
+	note B_, 2
+	note G#, 6
+	note F#, 8
+	note G#, 2
+	note A_, 6
+	note G#, 8
+	note F#, 4
+	note G#, 4
+	note E_, 10
+	sound_ret
 
 
-Music_JigglypuffSong_Ch1::
+Music_JigglypuffSong_Ch2::
 	vibrato 5, 1, 5
-	duty 2
-	dutycycle 10
-	notetype 12, 10, 7
+	duty_cycle 2
+	duty_cycle_pattern 10
+	note_type 12, 10, 7
 	octave 4
-	E_ 8
-	B_ 2
-	G# 6
-	F# 8
-	G# 2
-	A_ 6
-	G# 8
-	F# 4
-	G# 4
-	E_ 10
-	endchannel
+	note E_, 8
+	note B_, 2
+	note G#, 6
+	note F#, 8
+	note G#, 2
+	note A_, 6
+	note G#, 8
+	note F#, 4
+	note G#, 4
+	note E_, 10
+	sound_ret
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index da58e489..671df650 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -1,192 +1,192 @@
-Music_Lavender_Ch0::
+Music_Lavender_Ch1::
 	tempo 152
 	volume 7, 7
-	duty 1
-	toggleperfectpitch
+	duty_cycle 1
+	toggle_perfect_pitch
 	vibrato 0, 8, 8
-	notetype 12, 8, 7
+	note_type 12, 8, 7
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	notetype 12, 10, 7
+	note_type 12, 10, 7
 
 Music_Lavender_branch_bb6b::
 	octave 3
-	G_ 8
-	G_ 8
-	E_ 8
-	E_ 8
-	G_ 4
-	F# 4
-	E_ 4
-	B_ 4
-	C# 8
-	C# 8
-	G_ 8
-	G_ 8
-	F# 8
-	F# 8
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note G_, 8
+	note G_, 8
+	note E_, 8
+	note E_, 8
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note C#, 8
+	note G_, 8
+	note G_, 8
+	note F#, 8
+	note F#, 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 4
-	C_ 8
-	C_ 8
+	note C_, 8
+	note C_, 8
 	octave 3
-	G_ 8
-	G_ 8
-	E_ 8
-	E_ 8
-	G_ 4
-	F# 4
-	E_ 4
-	B_ 4
-	C# 8
-	C# 8
-	G_ 8
-	G_ 8
-	F# 8
-	F# 8
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
-	C_ 8
-	C_ 8
-	rest 16
-	rest 16
-	rest 16
-	rest 16
-	loopchannel 0, Music_Lavender_branch_bb6b
+	note G_, 8
+	note G_, 8
+	note E_, 8
+	note E_, 8
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note C#, 8
+	note G_, 8
+	note G_, 8
+	note F#, 8
+	note F#, 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note C_, 8
+	note C_, 8
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	sound_loop 0, Music_Lavender_branch_bb6b
 
 
-Music_Lavender_Ch1::
+Music_Lavender_Ch2::
 	vibrato 0, 3, 4
-	duty 3
-	notetype 12, 9, 1
+	duty_cycle 3
+	note_type 12, 9, 1
 
 Music_Lavender_branch_bba5::
 	octave 5
-	C_ 4
-	G_ 4
-	B_ 4
-	F# 4
-	loopchannel 0, Music_Lavender_branch_bba5
+	note C_, 4
+	note G_, 4
+	note B_, 4
+	note F#, 4
+	sound_loop 0, Music_Lavender_branch_bba5
 
 
-Music_Lavender_Ch2::
+Music_Lavender_Ch3::
 	vibrato 4, 1, 1
-	notetype 12, 3, 5
+	note_type 12, 3, 5
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	notetype 12, 2, 5
+	note_type 12, 2, 5
 
 Music_Lavender_branch_bbb9::
 	octave 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	notetype 12, 3, 5
+	note E_, 4
+	note_type 12, 3, 5
 	octave 6
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
-	notetype 12, 2, 5
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note_type 12, 2, 5
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 7
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 4
-	E_ 4
-	G_ 4
-	F# 4
-	B_ 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	E_ 16
-	D_ 16
-	C_ 16
-	E_ 4
-	C_ 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	E_ 4
-	notetype 12, 2, 5
+	note E_, 4
+	note_type 12, 2, 5
 	octave 6
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 7
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 8
-	B_ 4
-	G_ 4
-	F# 4
-	B_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
 	octave 4
-	E_ 4
-	G_ 4
-	F# 4
-	B_ 4
-	loopchannel 0, Music_Lavender_branch_bbb9
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	sound_loop 0, Music_Lavender_branch_bbb9
 
 
-Music_Lavender_Ch3::
+Music_Lavender_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
@@ -196,4 +196,4 @@ Music_Lavender_Ch3::
 Music_Lavender_branch_bc26::
 	triangle2 8
 	triangle2 8
-	loopchannel 0, Music_Lavender_branch_bc26
+	sound_loop 0, Music_Lavender_branch_bc26
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index 941b0c34..eb4f05ae 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -1,80 +1,80 @@
-Music_MeetEvilTrainer_Ch0::
+Music_MeetEvilTrainer_Ch1::
 	tempo 124
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 12, 11, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 12, 11, 1
 	rest 4
 	octave 3
-	D_ 2
-	C# 2
-	notetype 12, 4, 15
-	D_ 4
+	note D_, 2
+	note C#, 2
+	note_type 12, 4, 15
+	note D_, 4
 
 Music_MeetEvilTrainer_branch_7f6ae::
-	notetype 12, 10, 1
-	D_ 4
-	D_ 4
-	D_ 4
-	notetype 12, 7, 0
-	D_ 4
-	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
+	note_type 12, 10, 1
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note_type 12, 7, 0
+	note D_, 4
+	sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
-Music_MeetEvilTrainer_Ch1::
-	duty 1
-	notetype 12, 11, 6
+Music_MeetEvilTrainer_Ch2::
+	duty_cycle 1
+	note_type 12, 11, 6
 	octave 3
-	B_ 2
-	A# 2
-	B_ 8
+	note B_, 2
+	note A#, 2
+	note B_, 8
 
 Music_MeetEvilTrainer_branch_7f6c2::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 4
-	D# 2
-	D_ 2
-	C# 2
-	C_ 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
 	octave 3
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	notetype 12, 4, 15
-	A# 4
-	notetype 12, 12, 2
-	G_ 2
-	G# 2
-	A_ 2
-	A# 2
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	notetype 12, 3, 15
-	A# 4
-	notetype 12, 12, 2
-	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note_type 12, 4, 15
+	note A#, 4
+	note_type 12, 12, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note_type 12, 3, 15
+	note A#, 4
+	note_type 12, 12, 2
+	sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2
 
 
-Music_MeetEvilTrainer_Ch2::
-	notetype 12, 1, 0
+Music_MeetEvilTrainer_Ch3::
+	note_type 12, 1, 0
 	rest 8
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 
 Music_MeetEvilTrainer_branch_7f6ee::
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	A# 4
-	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
+	note A#, 4
+	sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee
diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 2a5659b4..c76483e5 100644
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -1,118 +1,118 @@
-Music_MeetFemaleTrainer_Ch0::
+Music_MeetFemaleTrainer_Ch1::
 	tempo 124
 	volume 7, 7
-	duty 1
-	toggleperfectpitch
-	notetype 12, 11, 2
+	duty_cycle 1
+	toggle_perfect_pitch
+	note_type 12, 11, 2
 	octave 3
-	G# 6
+	note G#, 6
 	octave 4
-	E_ 2
-	D# 2
-	C# 2
-	C_ 2
-	notetype 12, 8, 1
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	note_type 12, 8, 1
 
 Music_MeetFemaleTrainer_branch_7f70c::
 	octave 3
-	E_ 4
-	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
-	E_ 4
+	note E_, 4
+	sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c
+	note E_, 4
 	octave 2
-	B_ 4
-	B_ 4
+	note B_, 4
+	note B_, 4
 	octave 3
-	E_ 4
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
+	note E_, 4
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
-Music_MeetFemaleTrainer_Ch1::
-	duty 2
-	notetype 12, 12, 2
+Music_MeetFemaleTrainer_Ch2::
+	duty_cycle 2
+	note_type 12, 12, 2
 	octave 3
-	B_ 2
-	notetype 12, 12, 7
+	note B_, 2
+	note_type 12, 12, 7
 	octave 4
-	B_ 12
+	note B_, 12
 
 Music_MeetFemaleTrainer_branch_7f726::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	D# 4
-	E_ 4
-	D# 4
-	C# 2
-	C_ 2
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	A# 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f726
 
 
-Music_MeetFemaleTrainer_Ch2::
-	notetype 12, 1, 0
+Music_MeetFemaleTrainer_Ch3::
+	note_type 12, 1, 0
 	rest 8
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 
 Music_MeetFemaleTrainer_branch_7f756::
-	callchannel Music_MeetFemaleTrainer_branch_7f770
-	G# 1
+	sound_call Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	callchannel Music_MeetFemaleTrainer_branch_7f770
-	G# 1
+	sound_call Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 3
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f756
 
 Music_MeetFemaleTrainer_branch_7f770::
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	endchannel
+	sound_ret
diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index c13e40cb..a2786052 100644
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -1,190 +1,190 @@
-Music_MeetMaleTrainer_Ch0::
+Music_MeetMaleTrainer_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 20, 3, 3
-	toggleperfectpitch
-	notetype 12, 11, 4
+	toggle_perfect_pitch
+	note_type 12, 11, 4
 	octave 3
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 12
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 12
 	rest 16
 
 Music_MeetMaleTrainer_branch_7f78f::
 	octave 3
-	B_ 4
-	A_ 4
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	F# 4
-	E_ 6
-	F_ 2
-	F# 4
-	G_ 8
-	octave 4
-	D_ 8
-	E_ 16
-	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 4
+	note E_, 6
+	note F_, 2
+	note F#, 4
+	note G_, 8
+	octave 4
+	note D_, 8
+	note E_, 16
+	sound_loop 0, Music_MeetMaleTrainer_branch_7f78f
 
 
-Music_MeetMaleTrainer_Ch1::
-	duty 3
+Music_MeetMaleTrainer_Ch2::
+	duty_cycle 3
 	vibrato 24, 2, 2
-	notetype 12, 12, 4
+	note_type 12, 12, 4
 	octave 4
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	octave 3
-	B_ 12
+	note B_, 12
 	rest 2
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 9
 
 Music_MeetMaleTrainer_branch_7f7b5::
-	notetype 12, 12, 4
+	note_type 12, 12, 4
 	octave 4
-	E_ 6
-	D# 6
-	C# 4
+	note E_, 6
+	note D#, 6
+	note C#, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
-	octave 4
-	C# 2
-	notetype 12, 12, 7
-	F_ 16
-	notetype 12, 12, 5
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	note_type 12, 12, 7
+	note F_, 16
+	note_type 12, 12, 5
 	octave 3
-	F# 8
+	note F#, 8
 	octave 4
-	C# 8
-	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
+	note C#, 8
+	sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
-Music_MeetMaleTrainer_Ch2::
-	notetype 12, 1, 0
+Music_MeetMaleTrainer_Ch3::
+	note_type 12, 1, 0
 	rest 6
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 
 Music_MeetMaleTrainer_branch_7f7ea::
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
+	sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea
diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index 5c6ea13d..24c6741a 100644
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -1,423 +1,423 @@
-Music_MeetProfOak_Ch0::
+Music_MeetProfOak_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 12, 11, 4
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 12, 11, 4
 	octave 3
-	F# 1
-	B_ 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	D# 1
-	E_ 1
-	F# 12
-	notetype 12, 10, 2
+	note D#, 1
+	note E_, 1
+	note F#, 12
+	note_type 12, 10, 2
 	octave 3
-	E_ 6
-	B_ 10
-	E_ 6
-	B_ 10
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
-	E_ 6
-	B_ 10
-	E_ 6
-	B_ 10
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
 
 Music_MeetProfOak_branch_af85::
-	F# 6
-	E_ 4
-	A_ 2
-	A_ 4
-	F# 6
-	E_ 4
-	A_ 2
-	A_ 4
-	F# 6
-	E_ 4
-	G# 2
-	G# 4
-	F# 6
-	E_ 4
-	G# 2
-	G# 4
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
-	E_ 6
-	D# 4
-	F# 2
-	F# 4
-	F# 6
-	E_ 4
-	G# 2
-	G# 4
-	F# 6
-	E_ 4
-	G# 2
-	G# 4
-	loopchannel 0, Music_MeetProfOak_branch_af85
+	note F#, 6
+	note E_, 4
+	note A_, 2
+	note A_, 4
+	note F#, 6
+	note E_, 4
+	note A_, 2
+	note A_, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	sound_loop 0, Music_MeetProfOak_branch_af85
 
 
-Music_MeetProfOak_Ch1::
+Music_MeetProfOak_Ch2::
 	vibrato 8, 1, 1
-	duty 2
-	notetype 12, 12, 4
+	duty_cycle 2
+	note_type 12, 12, 4
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	D# 1
-	F# 1
-	A# 1
-	B_ 12
-	notetype 12, 11, 2
+	note D#, 1
+	note F#, 1
+	note A#, 1
+	note B_, 12
+	note_type 12, 11, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	E_ 4
-	D# 2
-	C# 4
-	notetype 12, 6, 4
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note_type 12, 6, 4
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C# 2
-	D# 2
-	E_ 4
-	D# 2
-	C# 4
-	notetype 12, 11, 2
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note_type 12, 11, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 4
-	B_ 2
-	B_ 4
-	notetype 12, 8, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	note_type 12, 8, 1
 	octave 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 4
-	B_ 2
-	B_ 4
-	notetype 12, 11, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	note_type 12, 11, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	E_ 4
-	D# 2
-	C# 4
-	notetype 12, 6, 4
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note_type 12, 6, 4
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C# 2
-	D# 2
-	E_ 4
-	D# 2
-	C# 4
-	notetype 12, 11, 2
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note_type 12, 11, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 4
-	B_ 2
-	B_ 4
-	notetype 12, 8, 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	note_type 12, 8, 1
 	octave 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 4
-	B_ 2
-	B_ 4
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	note_type 12, 11, 5
 
 Music_MeetProfOak_branch_b005::
 	octave 4
-	C# 6
+	note C#, 6
 	octave 3
-	A_ 1
+	note A_, 1
 	octave 4
-	C# 1
-	E_ 6
-	C# 1
-	E_ 1
-	F# 4
-	E_ 4
-	D# 4
-	C# 4
+	note C#, 1
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
 	octave 3
-	B_ 6
-	G# 1
-	B_ 1
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 4
-	E_ 8
-	notetype 12, 6, 5
+	note E_, 8
+	note_type 12, 6, 5
 	octave 4
-	B_ 6
-	G# 1
-	B_ 1
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 5
-	E_ 8
-	notetype 12, 11, 5
+	note E_, 8
+	note_type 12, 11, 5
 	octave 3
-	A_ 6
-	F# 1
-	A_ 1
+	note A_, 6
+	note F#, 1
+	note A_, 1
 	octave 4
-	D# 8
-	E_ 4
-	D# 4
-	C# 4
-	C_ 4
+	note D#, 8
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C_, 4
 	octave 3
-	B_ 6
-	G# 1
-	B_ 1
+	note B_, 6
+	note G#, 1
+	note B_, 1
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	E_ 1
-	notetype 12, 11, 7
-	G# 16
-	loopchannel 0, Music_MeetProfOak_branch_b005
+	note E_, 1
+	note_type 12, 11, 7
+	note G#, 16
+	sound_loop 0, Music_MeetProfOak_branch_b005
 
 
-Music_MeetProfOak_Ch2::
-	notetype 12, 1, 2
+Music_MeetProfOak_Ch3::
+	note_type 12, 1, 2
 	rest 10
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 5
 	octave 5
-	E_ 4
+	note E_, 4
 	rest 6
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 5
 	octave 5
-	E_ 4
+	note E_, 4
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 
 Music_MeetProfOak_branch_b0bc::
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
-	loopchannel 2, Music_MeetProfOak_branch_b0bc
+	sound_loop 2, Music_MeetProfOak_branch_b0bc
 
 Music_MeetProfOak_branch_b0d8::
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	loopchannel 2, Music_MeetProfOak_branch_b0d8
+	sound_loop 2, Music_MeetProfOak_branch_b0d8
 
 Music_MeetProfOak_branch_b0ed::
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	loopchannel 2, Music_MeetProfOak_branch_b0ed
+	sound_loop 2, Music_MeetProfOak_branch_b0ed
 
 Music_MeetProfOak_branch_b101::
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	loopchannel 2, Music_MeetProfOak_branch_b101
-	loopchannel 0, Music_MeetProfOak_branch_b0bc
+	sound_loop 2, Music_MeetProfOak_branch_b101
+	sound_loop 0, Music_MeetProfOak_branch_b0bc
diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm
index a6391247..958db7be 100644
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -1,396 +1,396 @@
 Music_MeetRival_branch_b119::
 	tempo 100
-	loopchannel 0, Music_MeetRival_branch_b123
+	sound_loop 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch0::
+Music_MeetRival_Ch1::
 	tempo 112
 
 Music_MeetRival_branch_b123::
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 4
-	D_ 1
-	C# 1
-	C_ 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	B_ 1
-	A# 2
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 6
-	D_ 1
+	note B_, 1
+	note A#, 2
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 6
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 5
-	A_ 2
-	G_ 2
-	A_ 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
 
 Music_MeetRival_branch_b140::
-	B_ 4
-	A# 2
-	A_ 4
-	G_ 2
+	note B_, 4
+	note A#, 2
+	note A_, 4
+	note G_, 2
 	octave 4
-	C_ 4
-	D_ 2
+	note C_, 4
+	note D_, 2
 	rest 4
-	D_ 4
-	C# 2
-	C_ 2
+	note D_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 4
-	E_ 2
-	D_ 4
-	C_ 2
+	note C_, 4
+	note E_, 2
+	note D_, 4
+	note C_, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 4
-	G_ 4
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	F# 2
+	note G_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
-	F# 2
+	note D_, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 4
-	C_ 2
-	F_ 2
+	note C_, 2
+	note F_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	F_ 2
-	D# 2
-	C_ 2
+	note C_, 2
+	note F_, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	A# 2
-	G_ 2
+	note A#, 2
+	note G_, 2
 	rest 4
-	A# 4
+	note A#, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
-	notetype 12, 11, 7
+	note C_, 2
+	note_type 12, 11, 7
 	octave 3
-	G_ 4
-	D_ 2
-	F_ 6
-	F# 4
-	D_ 2
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note D_, 2
 	rest 4
-	D_ 4
-	notetype 12, 11, 3
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_MeetRival_branch_b140
+	note D_, 4
+	note_type 12, 11, 3
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_MeetRival_branch_b140
 
 Music_MeetRival_branch_b19b::
 	tempo 100
-	loopchannel 0, Music_MeetRival_branch_b1a5
+	sound_loop 0, Music_MeetRival_branch_b1a5
 
 Music_MeetRival_branch_b1a2::
 	tempo 112
 
 Music_MeetRival_branch_b1a5::
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 5
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_MeetRival_branch_b140
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_MeetRival_branch_b140
 
 
-Music_MeetRival_Ch1::
-	duty 3
+Music_MeetRival_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 6
-	notetype 12, 12, 7
-	octave 4
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 2
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 6
+	note_type 12, 12, 7
+	octave 4
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 2
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	D_ 2
-	F_ 2
-	F# 2
+	note D_, 2
+	note F_, 2
+	note F#, 2
 
 Music_MeetRival_branch_b1d8::
-	notetype 12, 12, 7
-	G_ 4
-	D_ 2
-	F_ 6
-	F# 4
-	G_ 2
+	note_type 12, 12, 7
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note G_, 2
 	rest 4
-	G_ 4
-	G_ 2
-	A# 2
-	B_ 2
+	note G_, 4
+	note G_, 2
+	note A#, 2
+	note B_, 2
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	G_ 2
-	A# 6
-	B_ 4
+	note G_, 2
+	note A#, 6
+	note B_, 4
 	octave 5
-	C_ 2
+	note C_, 2
 	rest 4
-	C_ 4
-	C_ 2
+	note C_, 4
+	note C_, 2
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
-	notetype 12, 11, 0
-	D_ 16
-	notetype 12, 11, 5
-	D_ 6
-	notetype 12, 12, 7
-	F_ 4
-	D_ 2
-	C_ 2
-	D_ 2
-	notetype 12, 11, 0
-	C_ 8
-	notetype 12, 12, 7
-	C_ 8
-	octave 4
-	C_ 2
+	note C_, 2
+	note_type 12, 11, 0
+	note D_, 16
+	note_type 12, 11, 5
+	note D_, 6
+	note_type 12, 12, 7
+	note F_, 4
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note_type 12, 11, 0
+	note C_, 8
+	note_type 12, 12, 7
+	note C_, 8
+	octave 4
+	note C_, 2
 	rest 4
-	A# 4
-	G_ 2
-	F_ 2
-	notetype 12, 11, 0
-	G_ 16
-	notetype 12, 11, 3
-	G_ 2
+	note A#, 4
+	note G_, 2
+	note F_, 2
+	note_type 12, 11, 0
+	note G_, 16
+	note_type 12, 11, 3
+	note G_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 4
-	G_ 4
+	note G_, 4
 	octave 4
-	D_ 2
-	F_ 2
-	F# 2
-	loopchannel 0, Music_MeetRival_branch_b1d8
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	sound_loop 0, Music_MeetRival_branch_b1d8
 
 Music_MeetRival_branch_b21d::
-	duty 3
+	duty_cycle 3
 	vibrato 10, 2, 6
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 4
-	D_ 2
-	F_ 2
-	F# 2
-	loopchannel 0, Music_MeetRival_branch_b1d8
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	sound_loop 0, Music_MeetRival_branch_b1d8
 
 
-Music_MeetRival_Ch2::
-	notetype 12, 1, 4
+Music_MeetRival_Ch3::
+	note_type 12, 1, 4
 	octave 5
-	D_ 2
+	note D_, 2
 	rest 2
-	C# 2
+	note C#, 2
 	rest 2
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 
 Music_MeetRival_branch_b24b::
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 4
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	G_ 2
-	A# 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	rest 4
-	C_ 4
-	C_ 2
+	note C_, 4
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	F# 2
-	A_ 2
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	rest 2
-	F# 2
-	A_ 2
-	F# 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	rest 2
-	A_ 2
-	F# 2
-	A_ 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	rest 2
-	F# 2
-	A_ 2
-	F# 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	A_ 2
-	E_ 2
+	note A_, 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	E_ 2
-	F_ 2
-	G_ 2
-	E_ 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A# 2
-	A_ 2
-	G_ 2
-	A# 2
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
 	rest 2
-	G_ 2
-	A# 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
 	rest 2
-	A# 2
-	G_ 2
+	note A#, 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
-	loopchannel 0, Music_MeetRival_branch_b24b
+	note D_, 2
+	sound_loop 0, Music_MeetRival_branch_b24b
 
 Music_MeetRival_branch_b2b5::
-	notetype 12, 1, 4
+	note_type 12, 1, 4
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	loopchannel 0, Music_MeetRival_branch_b24b
+	sound_loop 0, Music_MeetRival_branch_b24b
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index e41b37bd..80e4afd0 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -1,267 +1,267 @@
-Music_MuseumGuy_Ch0::
+Music_MuseumGuy_Ch1::
 	tempo 128
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 12, 11, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 12, 11, 1
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
 	octave 2
-	B_ 4
-	B_ 1
+	note B_, 4
+	note B_, 1
 	octave 3
-	D# 1
-	E_ 1
-	G# 1
-	B_ 10
-	callchannel Music_MuseumGuy_branch_ade7
-	callchannel Music_MuseumGuy_branch_adec
-	callchannel Music_MuseumGuy_branch_ade7
-	E_ 4
-	E_ 4
-	E_ 2
-	E_ 6
+	note D#, 1
+	note E_, 1
+	note G#, 1
+	note B_, 10
+	sound_call Music_MuseumGuy_branch_ade7
+	sound_call Music_MuseumGuy_branch_adec
+	sound_call Music_MuseumGuy_branch_ade7
+	note E_, 4
+	note E_, 4
+	note E_, 2
+	note E_, 6
 
 Music_MuseumGuy_branch_add6::
-	callchannel Music_MuseumGuy_branch_ade7
-	callchannel Music_MuseumGuy_branch_adec
-	callchannel Music_MuseumGuy_branch_ade7
-	E_ 4
-	E_ 4
-	E_ 2
-	E_ 6
-	loopchannel 0, Music_MuseumGuy_branch_add6
+	sound_call Music_MuseumGuy_branch_ade7
+	sound_call Music_MuseumGuy_branch_adec
+	sound_call Music_MuseumGuy_branch_ade7
+	note E_, 4
+	note E_, 4
+	note E_, 2
+	note E_, 6
+	sound_loop 0, Music_MuseumGuy_branch_add6
 
 Music_MuseumGuy_branch_ade7::
-	E_ 2
-	E_ 6
-	F# 2
-	F# 6
-	endchannel
+	note E_, 2
+	note E_, 6
+	note F#, 2
+	note F#, 6
+	sound_ret
 
 Music_MuseumGuy_branch_adec::
-	E_ 2
-	E_ 6
-	D_ 2
-	D_ 6
-	endchannel
+	note E_, 2
+	note E_, 6
+	note D_, 2
+	note D_, 6
+	sound_ret
 
 
-Music_MuseumGuy_Ch1::
-	duty 2
-	notetype 12, 12, 1
+Music_MuseumGuy_Ch2::
+	duty_cycle 2
+	note_type 12, 12, 1
 	octave 4
-	E_ 2
-	D_ 2
-	C# 2
-	D_ 2
-	C# 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	E_ 4
-	E_ 1
-	G# 1
-	B_ 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 4
+	note E_, 1
+	note G#, 1
+	note B_, 1
 	octave 4
-	D# 1
-	E_ 8
+	note D#, 1
+	note E_, 8
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 4
-	D_ 2
-	F# 2
-	A_ 4
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note F#, 2
+	note A_, 4
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 4
-	D_ 2
-	C# 2
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
-	A_ 2
+	note B_, 4
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 4
-	D_ 2
-	F# 2
-	A_ 2
-	A_ 2
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	A_ 2
-	A_ 4
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
 
 Music_MuseumGuy_branch_ae26::
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 3
-	notetype 12, 8, 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 2
-	F# 2
-	A_ 3
-	notetype 12, 9, 1
-	A_ 1
-	notetype 12, 12, 1
+	note C#, 2
+	note E_, 3
+	note_type 12, 8, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 2
+	note F#, 2
+	note A_, 3
+	note_type 12, 9, 1
+	note A_, 1
+	note_type 12, 12, 1
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 4
-	D_ 1
-	C# 1
-	C_ 1
+	note C#, 2
+	note E_, 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	B_ 1
-	B_ 3
-	notetype 12, 10, 1
-	G# 1
-	notetype 12, 12, 1
-	A_ 2
+	note B_, 1
+	note B_, 3
+	note_type 12, 10, 1
+	note G#, 1
+	note_type 12, 12, 1
+	note A_, 2
 	octave 4
-	C# 2
-	E_ 3
-	notetype 12, 9, 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 2
-	F# 2
-	A_ 3
-	notetype 12, 8, 1
-	A_ 1
-	notetype 12, 12, 1
-	G# 2
-	E_ 1
-	notetype 12, 8, 1
-	E_ 1
-	notetype 12, 12, 1
-	F# 2
-	notetype 12, 8, 1
-	F# 1
-	notetype 12, 12, 1
-	G# 1
-	A_ 2
-	A_ 2
-	A_ 4
-	loopchannel 0, Music_MuseumGuy_branch_ae26
+	note C#, 2
+	note E_, 3
+	note_type 12, 9, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 2
+	note F#, 2
+	note A_, 3
+	note_type 12, 8, 1
+	note A_, 1
+	note_type 12, 12, 1
+	note G#, 2
+	note E_, 1
+	note_type 12, 8, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note F#, 2
+	note_type 12, 8, 1
+	note F#, 1
+	note_type 12, 12, 1
+	note G#, 1
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	sound_loop 0, Music_MuseumGuy_branch_ae26
 
 
-Music_MuseumGuy_Ch2::
-	notetype 12, 1, 0
+Music_MuseumGuy_Ch3::
+	note_type 12, 1, 0
 	rest 16
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 9
-	callchannel Music_MuseumGuy_branch_aeb8
-	A_ 1
+	sound_call Music_MuseumGuy_branch_aeb8
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 5
-	G# 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 5
-	callchannel Music_MuseumGuy_branch_aeb8
-	B_ 1
+	sound_call Music_MuseumGuy_branch_aeb8
+	note B_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
 
 Music_MuseumGuy_branch_ae8e::
-	callchannel Music_MuseumGuy_branch_aec1
+	sound_call Music_MuseumGuy_branch_aec1
 	rest 3
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	callchannel Music_MuseumGuy_branch_aec1
+	sound_call Music_MuseumGuy_branch_aec1
 	rest 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	loopchannel 0, Music_MuseumGuy_branch_ae8e
+	sound_loop 0, Music_MuseumGuy_branch_ae8e
 
 Music_MuseumGuy_branch_aeb8::
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 5
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 5
-	endchannel
+	sound_ret
 
 Music_MuseumGuy_branch_aec1::
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
 	octave 6
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
-	endchannel
+	note A_, 1
+	sound_ret
 
 
-Music_MuseumGuy_Ch3::
+Music_MuseumGuy_Ch4::
 	dspeed 12
 	rest 16
 	rest 16
@@ -334,4 +334,4 @@ Music_MuseumGuy_branch_aee1::
 	mutedsnare4 1
 	mutedsnare3 1
 	mutedsnare3 1
-	loopchannel 0, Music_MuseumGuy_branch_aee1
+	sound_loop 0, Music_MuseumGuy_branch_aee1
diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm
index 87245350..5af9f9a9 100644
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -1,393 +1,393 @@
-Music_OaksLab_Ch0::
+Music_OaksLab_Ch1::
 	tempo 140
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 16, 1, 2
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	B_ 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
 
 Music_OaksLab_branch_7eed0::
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 4
-	G# 2
-	A_ 2
-	B_ 1
+	note A_, 4
+	note G#, 2
+	note A_, 2
+	note B_, 1
 	rest 3
-	A_ 6
-	G# 1
-	B_ 1
+	note A_, 6
+	note G#, 1
+	note B_, 1
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 4
-	G# 2
-	A_ 2
-	F# 4
-	E_ 2
-	F# 2
-	G# 1
+	note A_, 4
+	note G#, 2
+	note A_, 2
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G#, 1
 	rest 3
-	F# 8
-	E_ 4
-	A_ 6
-	E_ 1
-	A_ 1
+	note F#, 8
+	note E_, 4
+	note A_, 6
+	note E_, 1
+	note A_, 1
 	octave 4
-	D_ 8
-	C# 6
+	note D_, 8
+	note C#, 6
 	octave 3
-	A_ 1
+	note A_, 1
 	octave 4
-	C# 1
-	E_ 8
-	D_ 4
-	C# 4
+	note C#, 1
+	note E_, 8
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	G# 1
+	note B_, 4
+	note A_, 4
+	note G#, 1
 	rest 3
-	E_ 4
-	F# 4
-	G# 4
-	loopchannel 0, Music_OaksLab_branch_7eed0
+	note E_, 4
+	note F#, 4
+	note G#, 4
+	sound_loop 0, Music_OaksLab_branch_7eed0
 
 
-Music_OaksLab_Ch1::
-	duty 3
+Music_OaksLab_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 5
-	notetype 12, 12, 4
+	note_type 12, 12, 4
 	octave 3
-	G# 1
-	A_ 1
-	B_ 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	G# 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
 
 Music_OaksLab_branch_7ef16::
-	A_ 6
-	G# 1
-	F# 1
-	E_ 6
-	D# 1
-	E_ 1
-	F# 1
+	note A_, 6
+	note G#, 1
+	note F#, 1
+	note E_, 6
+	note D#, 1
+	note E_, 1
+	note F#, 1
 	rest 3
-	E_ 8
-	E_ 4
-	F# 6
-	E_ 1
-	D_ 1
-	C# 6
+	note E_, 8
+	note E_, 4
+	note F#, 6
+	note E_, 1
+	note D_, 1
+	note C#, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
-	D_ 1
+	note C#, 1
+	note D_, 1
 	rest 3
-	C# 8
-	C# 4
-	D_ 6
+	note C#, 8
+	note C#, 4
+	note D_, 6
 	octave 3
-	A_ 1
+	note A_, 1
 	octave 4
-	D_ 1
-	F# 8
-	E_ 6
-	C# 1
-	E_ 1
-	A_ 8
-	G# 4
-	A_ 2
-	G# 2
-	F# 4
-	G# 2
-	F# 2
-	E_ 1
+	note D_, 1
+	note F#, 8
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note A_, 8
+	note G#, 4
+	note A_, 2
+	note G#, 2
+	note F#, 4
+	note G#, 2
+	note F#, 2
+	note E_, 1
 	rest 1
 	octave 3
-	G# 1
+	note G#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	loopchannel 0, Music_OaksLab_branch_7ef16
+	sound_loop 0, Music_OaksLab_branch_7ef16
 
 
-Music_OaksLab_Ch2::
-	notetype 12, 1, 1
+Music_OaksLab_Ch3::
+	note_type 12, 1, 1
 	rest 2
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 
 Music_OaksLab_branch_7ef5c::
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 5
-	G# 1
+	note G#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	loopchannel 0, Music_OaksLab_branch_7ef5c
+	sound_loop 0, Music_OaksLab_branch_7ef5c
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 5ad31f81..26e5710f 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,314 +1,314 @@
-Music_PalletTown_Ch0::
+Music_PalletTown_Ch1::
 	tempo 160
 	volume 7, 7
-	duty 2
-	notetype 12, 12, 3
+	duty_cycle 2
+	note_type 12, 12, 3
 
 Music_PalletTown_branch_a7ce::
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 2
-	D_ 4
-	G_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 4
-	G_ 2
+	note B_, 4
+	note G_, 2
 	octave 4
-	D_ 4
-	D_ 2
-	C_ 2
+	note D_, 4
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 8
+	note C_, 8
 	rest 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A_ 2
-	B_ 2
-	G_ 2
-	A_ 2
-	F# 2
-	B_ 4
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note F#, 2
+	note B_, 4
 	octave 4
-	C_ 2
-	D_ 4
-	G_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 4
-	G_ 2
+	note B_, 4
+	note G_, 2
 	octave 4
-	D_ 4
-	D_ 2
-	G_ 2
-	F# 2
-	E_ 4
-	D_ 2
-	C_ 4
+	note D_, 4
+	note D_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note D_, 2
+	note C_, 4
 	octave 3
-	A_ 2
-	B_ 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 4
-	F# 4
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note F#, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	E_ 2
-	G_ 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
-	F# 2
-	A_ 2
-	notetype 12, 11, 3
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note_type 12, 11, 3
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	E_ 2
-	G_ 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	F# 2
-	D_ 2
-	C_ 2
-	D_ 2
-	G_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	F# 2
-	D_ 2
-	C_ 2
-	D_ 2
-	loopchannel 0, Music_PalletTown_branch_a7ce
-	endchannel
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	sound_loop 0, Music_PalletTown_branch_a7ce
+	sound_ret
 
 
-Music_PalletTown_Ch1::
-	duty 2
+Music_PalletTown_Ch2::
+	duty_cycle 2
 
 Music_PalletTown_branch_a861::
-	notetype 12, 13, 3
+	note_type 12, 13, 3
 	octave 5
-	D_ 2
-	notetype 12, 10, 3
-	C_ 2
-	notetype 12, 13, 3
+	note D_, 2
+	note_type 12, 10, 3
+	note C_, 2
+	note_type 12, 13, 3
 	octave 4
-	B_ 2
-	notetype 12, 11, 3
-	A_ 2
-	notetype 12, 13, 3
+	note B_, 2
+	note_type 12, 11, 3
+	note A_, 2
+	note_type 12, 13, 3
 	octave 5
-	G_ 2
-	notetype 12, 11, 3
-	E_ 2
-	notetype 12, 13, 3
-	F# 2
-	E_ 2
-	D_ 6
+	note G_, 2
+	note_type 12, 11, 3
+	note E_, 2
+	note_type 12, 13, 3
+	note F#, 2
+	note E_, 2
+	note D_, 6
 	octave 4
-	B_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	C_ 10
+	note C_, 10
 	octave 4
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 6
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 6
 	octave 5
-	C_ 1
+	note C_, 1
 	octave 4
-	B_ 1
-	A_ 8
+	note B_, 1
+	note A_, 8
 	octave 5
-	D_ 2
-	notetype 12, 10, 3
-	C_ 2
-	notetype 12, 13, 3
+	note D_, 2
+	note_type 12, 10, 3
+	note C_, 2
+	note_type 12, 13, 3
 	octave 4
-	B_ 2
-	notetype 12, 11, 3
+	note B_, 2
+	note_type 12, 11, 3
 	octave 5
-	D_ 2
-	notetype 12, 13, 3
-	G_ 2
-	notetype 12, 10, 3
-	F# 2
-	notetype 12, 11, 3
-	F# 2
-	notetype 12, 13, 3
-	G_ 2
-	E_ 6
-	D_ 2
-	D_ 8
-	C_ 2
+	note D_, 2
+	note_type 12, 13, 3
+	note G_, 2
+	note_type 12, 10, 3
+	note F#, 2
+	note_type 12, 11, 3
+	note F#, 2
+	note_type 12, 13, 3
+	note G_, 2
+	note E_, 6
+	note D_, 2
+	note D_, 8
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	G_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	octave 5
-	D_ 2
-	C_ 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	G_ 10
-	G_ 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 10
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	C_ 8
-	D_ 6
-	C_ 2
+	note C_, 8
+	note D_, 6
+	note C_, 2
 	octave 4
-	B_ 8
+	note B_, 8
 	rest 2
-	G_ 2
-	A_ 2
-	B_ 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
 	octave 5
-	C_ 4
-	C_ 4
-	D_ 6
-	C_ 1
-	D_ 1
+	note C_, 4
+	note C_, 4
+	note D_, 6
+	note C_, 1
+	note D_, 1
 	octave 4
-	B_ 8
+	note B_, 8
 	rest 2
-	B_ 2
-	A_ 2
-	G_ 2
-	A_ 8
-	E_ 4
-	B_ 4
-	A_ 8
-	G_ 4
-	E_ 4
-	F# 8
-	G_ 4
-	B_ 4
-	B_ 8
-	A_ 8
-	loopchannel 0, Music_PalletTown_branch_a861
-	endchannel
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 8
+	note E_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 4
+	note E_, 4
+	note F#, 8
+	note G_, 4
+	note B_, 4
+	note B_, 8
+	note A_, 8
+	sound_loop 0, Music_PalletTown_branch_a861
+	sound_ret
 
 
-Music_PalletTown_Ch2::
+Music_PalletTown_Ch3::
 	vibrato 24, 2, 8
-	notetype 12, 1, 2
+	note_type 12, 1, 2
 
 Music_PalletTown_branch_a8e3::
 	octave 4
-	G_ 6
-	E_ 6
-	F# 4
-	G_ 6
-	A_ 6
-	G_ 4
-	E_ 6
-	F# 6
-	E_ 4
-	G_ 6
-	E_ 6
-	D_ 4
-	G_ 6
-	E_ 6
-	F# 4
-	G_ 6
-	A_ 6
-	G_ 4
-	E_ 6
-	F# 6
-	A_ 4
-	G_ 6
-	E_ 6
-	D_ 4
-	C_ 8
-	D_ 8
-	G_ 8
-	E_ 4
-	D_ 4
-	C_ 8
-	D_ 8
-	G_ 8
-	A_ 4
-	G_ 4
-	E_ 8
-	A_ 8
-	E_ 8
-	G_ 8
-	F# 8
-	E_ 8
-	E_ 8
-	F# 8
-	loopchannel 0, Music_PalletTown_branch_a8e3
-	endchannel
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note E_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note A_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note E_, 4
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note A_, 4
+	note G_, 4
+	note E_, 8
+	note A_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note E_, 8
+	note F#, 8
+	sound_loop 0, Music_PalletTown_branch_a8e3
+	sound_ret
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 9d3cd3d0..f3b78d38 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -1,47 +1,47 @@
-Music_PkmnHealed_Ch0::
+Music_PkmnHealed_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 12, 8, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 12, 8, 1
 	rest 2
-	pitchbend 0, 75
-	B_ 2
-	pitchbend 0, 84
-	B_ 2
-	pitchbend 0, 68
-	E_ 2
+	pitch_slide 0, 75
+	note B_, 2
+	pitch_slide 0, 84
+	note B_, 2
+	pitch_slide 0, 68
+	note E_, 2
 	rest 4
-	pitchbend 0, 59
-	E_ 4
-	pitchbend 0, 75
-	B_ 4
-	endchannel
+	pitch_slide 0, 59
+	note E_, 4
+	pitch_slide 0, 75
+	note B_, 4
+	sound_ret
 
 
-Music_PkmnHealed_Ch1::
-	duty 2
-	notetype 12, 12, 3
+Music_PkmnHealed_Ch2::
+	duty_cycle 2
+	note_type 12, 12, 3
 	octave 4
-	B_ 4
-	B_ 4
-	B_ 2
-	G# 2
-	notetype 12, 12, 4
+	note B_, 4
+	note B_, 4
+	note B_, 2
+	note G#, 2
+	note_type 12, 12, 4
 	octave 5
-	E_ 8
-	endchannel
+	note E_, 8
+	sound_ret
 
 
-Music_PkmnHealed_Ch2::
-	notetype 12, 1, 0
+Music_PkmnHealed_Ch3::
+	note_type 12, 1, 0
 	octave 4
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
-	G# 2
-	E_ 6
+	note E_, 2
+	note G#, 2
+	note E_, 6
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm
index 83d161d7..a4a3f2bf 100644
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -1,375 +1,375 @@
-Music_Pokecenter_Ch0::
+Music_Pokecenter_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 10, 2, 2
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_Pokecenter_branch_be61::
-	notetype 12, 10, 3
+	note_type 12, 10, 3
 	octave 3
-	F# 2
-	F_ 2
-	F# 2
-	notetype 12, 11, 5
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note_type 12, 11, 5
 	octave 4
-	D_ 4
-	C# 2
+	note D_, 4
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 3
-	A_ 2
-	E_ 2
-	A_ 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note_type 12, 11, 5
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	C# 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	notetype 12, 10, 3
-	F# 2
-	F_ 2
-	F# 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note_type 12, 11, 5
 	octave 4
-	D_ 4
-	C# 2
+	note D_, 4
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 3
-	A_ 2
-	E_ 2
-	A_ 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note_type 12, 11, 5
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	F# 2
-	E_ 2
-	D_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 4
-	C# 2
-	D_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	A_ 8
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 8
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
-	A_ 2
-	B_ 2
+	note B_, 4
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	E_ 2
-	D_ 2
-	C# 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	E_ 2
-	C# 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	G_ 2
-	A_ 2
-	B_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	loopchannel 0, Music_Pokecenter_branch_be61
+	note B_, 2
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	sound_loop 0, Music_Pokecenter_branch_be61
 
 
-Music_Pokecenter_Ch1::
+Music_Pokecenter_Ch2::
 	vibrato 8, 2, 5
 
 Music_Pokecenter_branch_befc::
-	callchannel Music_Pokecenter_branch_bf4e
-	duty 3
-	notetype 12, 10, 5
+	sound_call Music_Pokecenter_branch_bf4e
+	duty_cycle 3
+	note_type 12, 10, 5
 	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf60
-	D_ 2
-	F# 6
-	duty 3
-	notetype 12, 10, 5
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf60
+	note D_, 2
+	note F#, 6
+	duty_cycle 3
+	note_type 12, 10, 5
 	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf4e
-	duty 3
-	notetype 12, 10, 5
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf4e
+	duty_cycle 3
+	note_type 12, 10, 5
 	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf60
-	D_ 8
-	duty 3
-	notetype 12, 10, 5
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf60
+	note D_, 8
+	duty_cycle 3
+	note_type 12, 10, 5
 	octave 3
-	D_ 4
-	E_ 4
-	duty 2
-	notetype 12, 12, 6
+	note D_, 4
+	note E_, 4
+	duty_cycle 2
+	note_type 12, 12, 6
 	octave 4
-	F# 8
-	A_ 8
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 8
-	C# 8
-	E_ 8
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 8
-	F# 8
-	A_ 8
-	G_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 8
-	A_ 4
-	G_ 2
-	F# 2
-	G_ 8
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 8
-	loopchannel 0, Music_Pokecenter_branch_befc
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 8
+	note C#, 8
+	note E_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 8
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	sound_loop 0, Music_Pokecenter_branch_befc
 
 Music_Pokecenter_branch_bf4e::
-	duty 2
-	notetype 12, 12, 2
+	duty_cycle 2
+	note_type 12, 12, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
-	notetype 12, 12, 3
-	A_ 4
-	G_ 4
-	F# 2
-	E_ 2
-	C# 6
-	endchannel
+	note D_, 2
+	note_type 12, 12, 3
+	note A_, 4
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note C#, 6
+	sound_ret
 
 Music_Pokecenter_branch_bf60::
-	duty 2
-	notetype 12, 12, 2
+	duty_cycle 2
+	note_type 12, 12, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
-	notetype 12, 12, 3
-	F# 4
-	E_ 4
-	C# 2
-	endchannel
+	note C#, 2
+	note_type 12, 12, 3
+	note F#, 4
+	note E_, 4
+	note C#, 2
+	sound_ret
 
 
-Music_Pokecenter_Ch2::
-	notetype 12, 1, 0
+Music_Pokecenter_Ch3::
+	note_type 12, 1, 0
 
 Music_Pokecenter_branch_bf72::
 	octave 4
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	G_ 2
-	F# 2
-	callchannel Music_Pokecenter_branch_bfd9
-	callchannel Music_Pokecenter_branch_bfe2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	G_ 2
-	A_ 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	G_ 2
-	F# 2
-	callchannel Music_Pokecenter_branch_bfd9
-	callchannel Music_Pokecenter_branch_bfe2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	callchannel Music_Pokecenter_branch_bfeb
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	G# 2
-	A_ 2
-	callchannel Music_Pokecenter_branch_bfeb
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	loopchannel 0, Music_Pokecenter_branch_bf72
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	sound_call Music_Pokecenter_branch_bfd9
+	sound_call Music_Pokecenter_branch_bfe2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	sound_call Music_Pokecenter_branch_bfd9
+	sound_call Music_Pokecenter_branch_bfe2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	sound_call Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	sound_call Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	sound_loop 0, Music_Pokecenter_branch_bf72
 
 Music_Pokecenter_branch_bfd9::
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	endchannel
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	sound_ret
 
 Music_Pokecenter_branch_bfe2::
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	endchannel
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_ret
 
 Music_Pokecenter_branch_bfeb::
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	endchannel
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	sound_ret
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index 0f17ddeb..8f78c613 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -1,458 +1,458 @@
-Music_PokemonTower_Ch0::
+Music_PokemonTower_Ch1::
 	tempo 152
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 12, 2, 3
-	notetype 12, 8, 0
+	note_type 12, 8, 0
 	rest 4
 	octave 4
-	B_ 12
+	note B_, 12
 
 Music_PokemonTower_branch_7f05a::
-	notetype 12, 11, 4
+	note_type 12, 11, 4
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 4
-	F# 1
+	note F#, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	G_ 1
+	note B_, 1
+	note G_, 1
 	rest 5
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C# 1
+	note C#, 1
 	rest 7
-	C# 1
+	note C#, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 3
-	notetype 12, 8, 4
-	C_ 1
+	note_type 12, 8, 4
+	note C_, 1
 	rest 3
-	notetype 12, 11, 4
-	D_ 1
+	note_type 12, 11, 4
+	note D_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 7
-	A_ 1
+	note A_, 1
 	rest 7
-	notetype 12, 10, 7
-	B_ 8
-	B_ 8
+	note_type 12, 10, 7
+	note B_, 8
+	note B_, 8
 	octave 4
-	C_ 8
-	C_ 8
-	C# 8
-	C# 8
-	notetype 12, 10, 6
-	D_ 16
+	note C_, 8
+	note C_, 8
+	note C#, 8
+	note C#, 8
+	note_type 12, 10, 6
+	note D_, 16
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	notetype 12, 9, 2
-	B_ 4
+	note_type 12, 9, 2
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
 	octave 5
-	C_ 16
-	C_ 16
-	loopchannel 0, Music_PokemonTower_branch_7f05a
+	note C_, 16
+	note C_, 16
+	sound_loop 0, Music_PokemonTower_branch_7f05a
 
 
-Music_PokemonTower_Ch1::
+Music_PokemonTower_Ch2::
 	vibrato 20, 3, 4
-	duty 3
-	notetype 12, 10, 0
+	duty_cycle 3
+	note_type 12, 10, 0
 	octave 5
-	C_ 12
+	note C_, 12
 	octave 4
-	E_ 4
+	note E_, 4
 
 Music_PokemonTower_branch_7f0ee::
-	notetype 12, 12, 1
+	note_type 12, 12, 1
 	octave 5
-	C_ 8
+	note C_, 8
 	octave 4
-	B_ 4
-	notetype 12, 12, 4
-	G_ 1
-	F# 1
-	E_ 1
-	D# 1
-	notetype 12, 11, 0
-	G_ 8
+	note B_, 4
+	note_type 12, 12, 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note_type 12, 11, 0
+	note G_, 8
 	octave 5
-	C_ 8
+	note C_, 8
 	octave 4
-	B_ 4
-	G_ 4
-	E_ 4
-	G_ 4
+	note B_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
 	octave 5
-	C_ 8
-	notetype 12, 11, 7
-	C_ 8
-	notetype 12, 12, 2
+	note C_, 8
+	note_type 12, 11, 7
+	note C_, 8
+	note_type 12, 12, 2
 	octave 4
-	G_ 1
-	F# 1
-	E_ 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
 	rest 1
-	notetype 12, 9, 6
+	note_type 12, 9, 6
 	octave 3
-	G_ 4
-	notetype 12, 12, 7
-	G_ 4
-	B_ 4
-	G_ 4
-	B_ 4
+	note G_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 4
-	notetype 12, 11, 0
+	note B_, 4
+	note_type 12, 11, 0
 	octave 4
-	C_ 16
-	E_ 8
-	notetype 12, 11, 7
-	E_ 12
-	notetype 12, 12, 5
+	note C_, 16
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 12
+	note_type 12, 12, 5
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	B_ 4
-	G_ 4
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
-	notetype 12, 11, 0
-	F# 12
-	G_ 4
-	notetype 12, 11, 0
-	F# 8
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 11, 0
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
-	B_ 16
-	notetype 12, 11, 0
+	note B_, 4
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note_type 12, 11, 0
+	note F#, 12
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 8
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 11, 0
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 16
+	note_type 12, 11, 0
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	G_ 4
-	F# 4
-	E_ 4
-	notetype 12, 9, 0
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note_type 12, 9, 0
 	octave 5
-	C_ 16
-	notetype 12, 11, 0
-	D_ 4
+	note C_, 16
+	note_type 12, 11, 0
+	note D_, 4
 	octave 4
-	A_ 4
-	G# 4
-	F# 4
-	notetype 12, 2, 15
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note_type 12, 2, 15
 	octave 5
-	D_ 16
-	notetype 12, 12, 0
-	E_ 4
+	note D_, 16
+	note_type 12, 12, 0
+	note E_, 4
 	octave 4
-	B_ 4
-	A_ 4
-	G_ 4
+	note B_, 4
+	note A_, 4
+	note G_, 4
 	octave 5
-	F_ 4
-	C_ 4
+	note F_, 4
+	note C_, 4
 	octave 4
-	A# 4
-	G# 4
+	note A#, 4
+	note G#, 4
 	octave 5
-	F# 4
-	D_ 4
-	C_ 4
+	note F#, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	A# 4
-	G# 4
-	F# 4
-	E_ 4
-	D_ 4
-	notetype 12, 11, 0
-	C_ 8
-	notetype 12, 9, 0
-	C_ 8
-	notetype 12, 8, 0
-	C_ 8
-	notetype 12, 7, 0
-	C_ 8
-	notetype 12, 6, 0
-	C_ 8
-	notetype 12, 6, 7
-	C_ 8
+	note A#, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 11, 0
+	note C_, 8
+	note_type 12, 9, 0
+	note C_, 8
+	note_type 12, 8, 0
+	note C_, 8
+	note_type 12, 7, 0
+	note C_, 8
+	note_type 12, 6, 0
+	note C_, 8
+	note_type 12, 6, 7
+	note C_, 8
 	rest 16
-	notetype 12, 10, 0
+	note_type 12, 10, 0
 	octave 5
-	G_ 16
+	note G_, 16
 	octave 6
-	C_ 16
+	note C_, 16
 	octave 5
-	B_ 8
-	G_ 8
-	E_ 8
-	G_ 8
+	note B_, 8
+	note G_, 8
+	note E_, 8
+	note G_, 8
 	octave 6
-	C_ 16
+	note C_, 16
 	vibrato 0, 3, 4
-	notetype 12, 10, 7
-	C_ 16
-	loopchannel 0, Music_PokemonTower_branch_7f0ee
+	note_type 12, 10, 7
+	note C_, 16
+	sound_loop 0, Music_PokemonTower_branch_7f0ee
 
 
-Music_PokemonTower_Ch2::
+Music_PokemonTower_Ch3::
 	vibrato 4, 1, 1
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	rest 8
 	octave 5
-	G_ 8
+	note G_, 8
 
 Music_PokemonTower_branch_7f1a2::
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	D# 1
-	F# 1
-	D# 1
-	E_ 1
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	E_ 1
-	D# 1
+	note E_, 1
+	note D#, 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 5
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	F_ 1
+	note F_, 1
 	rest 7
-	F_ 1
+	note F_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 15
-	notetype 12, 1, 5
+	note_type 12, 1, 5
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 7
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 7
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	loopchannel 0, Music_PokemonTower_branch_7f1a2
+	sound_loop 0, Music_PokemonTower_branch_7f1a2
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index fc3227ce..9f326c39 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -1,315 +1,315 @@
-Music_Routes1_Ch0::
+Music_Routes1_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
-	duty 2
-	toggleperfectpitch
+	duty_cycle 2
+	toggle_perfect_pitch
 
 Music_Routes1_branch_9be9::
-	notetype 12, 10, 1
+	note_type 12, 10, 1
 	rest 4
 	octave 4
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 1
-	C# 1
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note C#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
+	note C#, 1
 	octave 3
-	A_ 2
-	A_ 2
-	A_ 6
-	octave 4
-	C# 2
-	C# 6
-	C# 2
-	C# 4
+	note A_, 2
+	note A_, 2
+	note A_, 6
+	octave 4
+	note C#, 2
+	note C#, 6
+	note C#, 2
+	note C#, 4
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 2
-	A_ 6
-	octave 4
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 1
-	E_ 1
-	D_ 1
-	C# 1
+	note A_, 2
+	note A_, 6
+	octave 4
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
 	octave 3
-	B_ 2
-	A_ 2
-	A_ 6
+	note B_, 2
+	note A_, 2
+	note A_, 6
 	octave 4
-	C# 2
-	C# 6
+	note C#, 2
+	note C#, 6
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
-	notetype 12, 10, 2
+	note A_, 2
+	note_type 12, 10, 2
 	octave 4
-	G_ 4
-	E_ 4
-	F# 2
-	notetype 12, 10, 1
+	note G_, 4
+	note E_, 4
+	note F#, 2
+	note_type 12, 10, 1
 	octave 3
-	A_ 2
-	A_ 6
-	A_ 2
-	F# 2
-	A_ 4
-	B_ 2
-	octave 4
-	C# 2
+	note A_, 2
+	note A_, 6
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note B_, 2
+	octave 4
+	note C#, 2
 	octave 3
-	B_ 4
-	A_ 2
-	F# 2
-	A_ 4
-	G_ 2
-	E_ 2
-	C# 4
-	A_ 2
-	octave 4
-	D_ 2
+	note B_, 4
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note G_, 2
+	note E_, 2
+	note C#, 4
+	note A_, 2
+	octave 4
+	note D_, 2
 	octave 3
-	A_ 4
-	B_ 2
-	G_ 2
-	B_ 4
-	octave 4
-	D_ 2
-	E_ 2
-	C# 2
-	D_ 2
+	note A_, 4
+	note B_, 2
+	note G_, 2
+	note B_, 4
+	octave 4
+	note D_, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
 	octave 3
-	A_ 2
-	A_ 2
-	loopchannel 0, Music_Routes1_branch_9be9
-	endchannel
+	note A_, 2
+	note A_, 2
+	sound_loop 0, Music_Routes1_branch_9be9
+	sound_ret
 
 
-Music_Routes1_Ch1::
-	duty 2
+Music_Routes1_Ch2::
+	duty_cycle 2
 
 Music_Routes1_branch_9c53::
-	notetype 12, 13, 1
-	callchannel Music_Routes1_branch_9c65
-	callchannel Music_Routes1_branch_9c78
-	callchannel Music_Routes1_branch_9c65
-	callchannel Music_Routes1_branch_9c8d
-	loopchannel 0, Music_Routes1_branch_9c53
+	note_type 12, 13, 1
+	sound_call Music_Routes1_branch_9c65
+	sound_call Music_Routes1_branch_9c78
+	sound_call Music_Routes1_branch_9c65
+	sound_call Music_Routes1_branch_9c8d
+	sound_loop 0, Music_Routes1_branch_9c53
 
 Music_Routes1_branch_9c65::
 	octave 4
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	F# 2
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	F# 2
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	G_ 3
-	F# 1
-	E_ 6
-	endchannel
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note G_, 3
+	note F#, 1
+	note E_, 6
+	sound_ret
 
 Music_Routes1_branch_9c78::
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	F# 1
-	E_ 1
-	E_ 1
-	F# 1
-	D_ 4
-	F# 2
-	endchannel
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note D_, 4
+	note F#, 2
+	sound_ret
 
 Music_Routes1_branch_9c8d::
-	C# 1
-	D_ 1
-	E_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C# 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	notetype 12, 13, 2
-	B_ 4
-	notetype 6, 13, 1
+	note C#, 2
+	note_type 12, 13, 2
+	note B_, 4
+	note_type 6, 13, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
-	notetype 12, 13, 1
+	note C#, 1
+	note_type 12, 13, 1
 	octave 3
-	B_ 1
-	A_ 1
-	octave 4
-	C# 1
-	D_ 6
-	notetype 12, 13, 2
-	F# 1
-	G_ 1
-	A_ 2
-	A_ 2
-	F# 2
-	D_ 2
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	note D_, 6
+	note_type 12, 13, 2
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
 	octave 5
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C# 2
-	octave 4
-	A_ 2
-	F# 2
-	D_ 3
-	F# 1
-	E_ 6
-	F# 1
-	G_ 1
-	A_ 2
-	A_ 2
-	F# 2
-	A_ 2
+	note C#, 2
+	octave 4
+	note A_, 2
+	note F#, 2
+	note D_, 3
+	note F#, 1
+	note E_, 6
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	octave 5
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 4
-	B_ 3
-	G_ 1
-	A_ 2
+	note B_, 3
+	note G_, 1
+	note A_, 2
 	octave 5
-	D_ 2
-	C# 2
-	E_ 2
-	D_ 2
-	notetype 12, 13, 1
-	octave 4
-	D_ 2
-	D_ 2
-	endchannel
-	endchannel
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note D_, 2
+	note_type 12, 13, 1
+	octave 4
+	note D_, 2
+	note D_, 2
+	sound_ret
+	sound_ret
 
 
-Music_Routes1_Ch2::
+Music_Routes1_Ch3::
 	vibrato 8, 2, 5
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 
 Music_Routes1_branch_9cdd::
 	rest 2
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
-	B_ 4
-	A_ 4
+	note A_, 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
-	C# 4
+	note C_, 4
+	note C#, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
-	B_ 4
-	A_ 4
+	note A_, 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	B_ 4
+	note B_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 8
+	note D_, 8
 	octave 3
-	G_ 8
-	A_ 8
+	note G_, 8
+	note A_, 8
 	octave 4
-	C# 8
-	D_ 8
+	note C#, 8
+	note D_, 8
 	octave 3
-	G_ 8
-	A_ 8
+	note G_, 8
+	note A_, 8
 	octave 4
-	D_ 6
-	loopchannel 0, Music_Routes1_branch_9cdd
-	endchannel
+	note D_, 6
+	sound_loop 0, Music_Routes1_branch_9cdd
+	sound_ret
 
 
-Music_Routes1_Ch3::
+Music_Routes1_Ch4::
 	dspeed 12
 	rest 4
 	mutedsnare1 2
@@ -400,5 +400,5 @@ Music_Routes1_Ch3::
 	rest 2
 	mutedsnare1 2
 	mutedsnare1 2
-	loopchannel 0, Music_Routes1_Ch3
-	endchannel
+	sound_loop 0, Music_Routes1_Ch4
+	sound_ret
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index ae5b22d1..0115466e 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -1,330 +1,330 @@
-Music_Routes2_Ch0::
+Music_Routes2_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
-	duty 1
+	duty_cycle 1
 
 Music_Routes2_branch_9dc3::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 2
-	B_ 4
-	octave 3
-	G# 6
-	F# 2
-	E_ 2
-	D# 1
-	F# 1
-	E_ 2
+	note B_, 4
+	octave 3
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	A_ 2
-	G# 4
-	F# 4
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note F#, 4
 	octave 2
-	B_ 4
-	octave 3
-	G# 6
-	F# 2
-	E_ 2
-	D# 1
-	F# 1
-	B_ 2
+	note B_, 4
+	octave 3
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note B_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	A_ 2
-	G# 4
-	B_ 4
-	notetype 8, 11, 2
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note B_, 4
+	note_type 8, 11, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
-	D# 2
+	note E_, 2
+	note D#, 2
 	octave 3
-	G# 2
+	note G#, 2
 	octave 4
-	D# 2
-	D# 2
+	note D#, 2
+	note D#, 2
 	octave 3
-	G# 2
+	note G#, 2
 	octave 4
-	D# 2
-	C# 2
+	note D#, 2
+	note C#, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 2
-	C# 2
+	note C#, 2
+	note C#, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 2
-	octave 3
-	B_ 2
-	E_ 2
-	B_ 2
-	B_ 2
-	E_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	G# 2
-	A_ 2
-	A_ 2
-	F# 2
-	A_ 2
-	G# 2
-	E_ 2
-	B_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	A_ 2
-	B_ 2
-	A_ 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
+	note C#, 2
+	note D_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	D_ 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	loopchannel 0, Music_Routes2_branch_9dc3
-	endchannel
+	note E_, 2
+	sound_loop 0, Music_Routes2_branch_9dc3
+	sound_ret
 
 
-Music_Routes2_Ch1::
+Music_Routes2_Ch2::
 	vibrato 8, 2, 6
-	duty 3
+	duty_cycle 3
 
 Music_Routes2_branch_9e54::
-	notetype 12, 13, 4
+	note_type 12, 13, 4
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	E_ 1
-	F# 6
-	A_ 2
-	G# 3
-	E_ 1
-	F# 8
-	octave 3
-	D# 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note F#, 8
+	octave 3
+	note D#, 4
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	E_ 1
-	F# 6
-	A_ 2
-	G# 3
-	E_ 1
-	B_ 8
-	octave 3
-	G# 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note B_, 8
+	octave 3
+	note G#, 4
 	octave 5
-	C# 6
+	note C#, 6
 	octave 4
-	B_ 1
-	A_ 1
-	B_ 6
-	A_ 1
-	G# 1
-	A_ 6
-	G# 1
-	F# 1
-	G# 4
-	F# 2
-	E_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F# 8
-	A_ 4
-	G# 3
-	F# 1
-	E_ 8
-	F# 2
-	E_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F# 2
-	F# 1
-	G# 1
-	A_ 4
+	note B_, 1
+	note A_, 1
+	note B_, 6
+	note A_, 1
+	note G#, 1
+	note A_, 6
+	note G#, 1
+	note F#, 1
+	note G#, 4
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F#, 8
+	note A_, 4
+	note G#, 3
+	note F#, 1
+	note E_, 8
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 1
+	note G#, 1
+	note A_, 4
 	octave 5
-	C# 4
+	note C#, 4
 	octave 4
-	B_ 3
-	A_ 1
-	G# 8
+	note B_, 3
+	note A_, 1
+	note G#, 8
 	rest 4
-	loopchannel 0, Music_Routes2_branch_9e54
-	endchannel
+	sound_loop 0, Music_Routes2_branch_9e54
+	sound_ret
 
 
-Music_Routes2_Ch2::
+Music_Routes2_Ch3::
 	vibrato 9, 2, 8
 
 Music_Routes2_branch_9e9e::
-	notetype 12, 1, 1
+	note_type 12, 1, 1
 	octave 3
-	E_ 2
+	note E_, 2
 	rest 2
 	octave 2
-	B_ 6
+	note B_, 6
 	octave 3
-	D_ 1
-	C# 1
-	D_ 2
-	D# 2
-	E_ 2
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
 	rest 2
 	octave 2
-	B_ 6
+	note B_, 6
 	octave 3
-	D_ 1
-	C# 1
+	note D_, 1
+	note C#, 1
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	C# 2
-	E_ 2
+	note C#, 2
+	note E_, 2
 	rest 2
 	octave 2
-	B_ 6
+	note B_, 6
 	octave 3
-	D_ 1
-	C# 1
-	D_ 2
-	D# 2
-	E_ 2
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
 	rest 2
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 2
-	F# 2
-	E_ 2
+	note D_, 2
+	note F#, 2
+	note E_, 2
 	rest 2
 	octave 2
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 3
-	D# 2
+	note D#, 2
 	rest 2
 	octave 2
-	G# 2
+	note G#, 2
 	rest 2
 	octave 3
-	C# 2
+	note C#, 2
 	rest 2
 	octave 2
-	F# 2
+	note F#, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	E_ 2
-	G# 2
-	F# 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 3
-	C# 2
+	note C#, 2
 	rest 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	C# 2
+	note C#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 3
-	E_ 2
+	note E_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	loopchannel 0, Music_Routes2_branch_9e9e
-	endchannel
+	sound_loop 0, Music_Routes2_branch_9e9e
+	sound_ret
 
 
-Music_Routes2_Ch3::
+Music_Routes2_Ch4::
 	dspeed 12
 	snare3 2
 	rest 2
@@ -421,5 +421,5 @@ Music_Routes2_Ch3::
 	rest 3
 	snare3 3
 	rest 3
-	loopchannel 0, Music_Routes2_Ch3
-	endchannel
+	sound_loop 0, Music_Routes2_Ch4
+	sound_ret
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index b384308b..96aa2625 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -1,360 +1,360 @@
-Music_Routes3_Ch0::
+Music_Routes3_Ch1::
 	tempo 148
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	octave 3
-	E_ 1
-	F# 1
-	G_ 6
-	F_ 1
-	G_ 1
-	E_ 1
+	note E_, 1
+	note F#, 1
+	note G_, 6
+	note F_, 1
+	note G_, 1
+	note E_, 1
 	rest 16
 	rest 15
 
 Music_Routes3_branch_9fc3::
-	notetype 12, 11, 5
-	E_ 6
-	D_ 1
-	E_ 1
-	C_ 4
-	E_ 4
-	C_ 6
-	D_ 1
-	E_ 1
-	F_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 7
-	A# 8
-	F_ 8
-	D_ 8
-	F_ 8
-	notetype 12, 11, 5
-	E_ 6
-	D_ 1
-	E_ 1
-	C_ 4
-	E_ 4
-	C_ 6
-	D_ 1
-	E_ 1
-	F_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 7
-	A# 8
-	A# 8
-	D_ 8
-	F_ 8
-	notetype 12, 11, 5
-	E_ 4
-	E_ 2
-	F_ 2
-	G_ 4
-	F_ 2
-	E_ 2
-	B_ 2
+	note_type 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 7
+	note A#, 8
+	note F_, 8
+	note D_, 8
+	note F_, 8
+	note_type 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 7
+	note A#, 8
+	note A#, 8
+	note D_, 8
+	note F_, 8
+	note_type 12, 11, 5
+	note E_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note B_, 2
 	octave 2
-	G_ 4
+	note G_, 4
 	octave 3
-	B_ 8
-	A_ 2
-	notetype 8, 12, 3
-	A_ 4
-	F_ 4
-	A_ 4
-	notetype 8, 4, 15
-	A_ 12
-	notetype 8, 9, 0
-	F_ 12
-	G_ 12
-	loopchannel 0, Music_Routes3_branch_9fc3
+	note B_, 8
+	note A_, 2
+	note_type 8, 12, 3
+	note A_, 4
+	note F_, 4
+	note A_, 4
+	note_type 8, 4, 15
+	note A_, 12
+	note_type 8, 9, 0
+	note F_, 12
+	note G_, 12
+	sound_loop 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch1::
+Music_Routes3_Ch2::
 	vibrato 8, 2, 3
-	duty 2
-	notetype 12, 12, 7
+	duty_cycle 2
+	note_type 12, 12, 7
 	octave 3
-	G_ 1
-	A# 1
-	B_ 6
-	A_ 1
-	B_ 1
+	note G_, 1
+	note A#, 1
+	note B_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 15
 	rest 16
 
 Music_Routes3_branch_a01a::
-	notetype 12, 12, 7
-	duty 2
+	note_type 12, 12, 7
+	duty_cycle 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	C_ 1
-	E_ 10
+	note C_, 1
+	note E_, 10
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 8
-	F_ 8
-	notetype 12, 12, 5
-	duty 3
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	A# 8
-	A_ 8
-	notetype 12, 12, 7
-	duty 2
+	note A#, 8
+	note A_, 8
+	note_type 12, 12, 7
+	duty_cycle 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	C_ 1
-	E_ 10
+	note C_, 1
+	note E_, 10
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 8
-	F_ 8
-	notetype 12, 12, 5
-	duty 3
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	A# 8
+	note A#, 8
 	octave 4
-	D_ 6
-	notetype 12, 12, 7
-	duty 2
-	C_ 1
-	D_ 1
-	E_ 2
-	D_ 2
-	E_ 2
-	C_ 8
+	note D_, 6
+	note_type 12, 12, 7
+	duty_cycle 2
+	note C_, 1
+	note D_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 8
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	D_ 2
+	note C_, 1
+	note D_, 2
 	octave 3
-	G_ 4
+	note G_, 4
 	octave 4
-	G_ 8
-	F_ 1
-	E_ 1
-	notetype 8, 13, 3
-	F_ 4
-	E_ 4
-	notetype 8, 12, 4
-	C_ 4
-	notetype 8, 12, 5
-	C_ 12
-	notetype 12, 10, 0
-	duty 3
+	note G_, 8
+	note F_, 1
+	note E_, 1
+	note_type 8, 13, 3
+	note F_, 4
+	note E_, 4
+	note_type 8, 12, 4
+	note C_, 4
+	note_type 8, 12, 5
+	note C_, 12
+	note_type 12, 10, 0
+	duty_cycle 3
 	octave 3
-	A_ 8
-	B_ 8
-	loopchannel 0, Music_Routes3_branch_a01a
+	note A_, 8
+	note B_, 8
+	sound_loop 0, Music_Routes3_branch_a01a
 
 
-Music_Routes3_Ch2::
+Music_Routes3_Ch3::
 	vibrato 4, 1, 0
-	notetype 6, 1, 2
+	note_type 6, 1, 2
 	octave 4
-	G_ 2
-	A# 2
-	B_ 8
-	A_ 8
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note B_, 8
+	note A_, 8
+	note G_, 2
 	rest 2
-	G_ 7
+	note G_, 7
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 2
+	note G_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	G_ 8
-	G_ 2
+	note G_, 8
+	note G_, 2
 	rest 2
-	G_ 7
+	note G_, 7
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 2
+	note G_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	G_ 8
+	note G_, 8
 
 Music_Routes3_branch_a0a3::
-	notetype 12, 1, 2
-	E_ 1
+	note_type 12, 1, 2
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
+	note G_, 4
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 2
-	A_ 2
-	F_ 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
+	note A#, 4
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A# 2
-	F_ 2
-	E_ 1
+	note A#, 2
+	note F_, 2
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
+	note G_, 4
+	note E_, 1
 	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 2
-	A_ 2
-	F_ 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
+	note A#, 4
+	note F_, 1
 	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A# 2
-	A_ 2
-	G_ 1
+	note A#, 2
+	note A_, 2
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	G_ 1
-	G_ 1
-	G_ 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	G_ 1
-	G_ 1
-	G_ 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 4
-	F_ 1
-	F_ 1
-	F_ 1
+	note A_, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	A_ 4
-	loopchannel 0, Music_Routes3_branch_a0a3
+	note A_, 4
+	sound_loop 0, Music_Routes3_branch_a0a3
 
 
-Music_Routes3_Ch3::
+Music_Routes3_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
@@ -512,4 +512,4 @@ Music_Routes3_branch_a17a::
 	mutedsnare3 1
 	mutedsnare3 1
 	mutedsnare3 1
-	loopchannel 0, Music_Routes3_branch_a17a
+	sound_loop 0, Music_Routes3_branch_a17a
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index a9149f05..39f2ea89 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -1,512 +1,512 @@
-Music_Routes4_Ch0::
+Music_Routes4_Ch1::
 	tempo 148
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 10, 3, 4
-	toggleperfectpitch
-	notetype 12, 10, 2
+	toggle_perfect_pitch
+	note_type 12, 10, 2
 	octave 2
-	G# 4
-	G# 4
-	G# 4
-	notetype 12, 7, 15
-	G# 4
-	notetype 12, 10, 2
-	G# 4
-	G# 4
-	G# 4
-	notetype 12, 11, 7
-	B_ 1
+	note G#, 4
+	note G#, 4
+	note G#, 4
+	note_type 12, 7, 15
+	note G#, 4
+	note_type 12, 10, 2
+	note G#, 4
+	note G#, 4
+	note G#, 4
+	note_type 12, 11, 7
+	note B_, 1
 	octave 3
-	E_ 1
-	F# 1
-	B_ 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
 
 Music_Routes4_branch_a28a::
-	notetype 12, 11, 7
-	B_ 6
-	E_ 2
-	E_ 4
+	note_type 12, 11, 7
+	note B_, 6
+	note E_, 2
+	note E_, 4
 	octave 4
-	E_ 4
-	D_ 4
-	C# 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	notetype 12, 11, 1
-	G# 3
-	notetype 12, 11, 7
-	E_ 1
-	F# 12
-	E_ 8
-	D# 4
-	F# 4
-	B_ 6
-	E_ 2
-	E_ 4
+	note B_, 4
+	note A_, 4
+	note_type 12, 11, 1
+	note G#, 3
+	note_type 12, 11, 7
+	note E_, 1
+	note F#, 12
+	note E_, 8
+	note D#, 4
+	note F#, 4
+	note B_, 6
+	note E_, 2
+	note E_, 4
 	octave 4
-	E_ 4
-	D_ 4
-	C# 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C# 4
-	notetype 12, 11, 1
-	E_ 3
-	notetype 12, 11, 7
-	D# 1
-	E_ 12
+	note C#, 4
+	note_type 12, 11, 1
+	note E_, 3
+	note_type 12, 11, 7
+	note D#, 1
+	note E_, 12
 	octave 3
-	B_ 3
-	A_ 1
-	G# 8
+	note B_, 3
+	note A_, 1
+	note G#, 8
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	D_ 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	D_ 2
+	note C#, 2
+	note D_, 2
+	note D_, 2
 	octave 3
-	A_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F# 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
+	note A_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	D# 2
-	E_ 2
+	note D#, 2
+	note E_, 2
 	octave 3
-	B_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	B_ 2
-	notetype 8, 11, 5
-	A_ 4
-	G# 4
-	F# 4
+	note B_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note B_, 2
+	note_type 8, 11, 5
+	note A_, 4
+	note G#, 4
+	note F#, 4
 	octave 4
-	E_ 4
-	D# 4
-	C# 4
-	C# 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	B_ 4
+	note B_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C# 4
-	D# 4
+	note C#, 4
+	note D#, 4
 	octave 3
-	E_ 3
-	F# 3
-	G# 3
-	A_ 3
-	B_ 4
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	note B_, 4
 	octave 4
-	C# 4
-	D# 4
-	E_ 3
+	note C#, 4
+	note D#, 4
+	note E_, 3
 	octave 3
-	B_ 3
-	G# 3
-	F# 3
-	E_ 3
-	F# 3
-	G# 3
-	A_ 3
-	loopchannel 0, Music_Routes4_branch_a28a
+	note B_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	sound_loop 0, Music_Routes4_branch_a28a
 
 
-Music_Routes4_Ch1::
+Music_Routes4_Ch2::
 	vibrato 12, 2, 4
-	duty 1
-	notetype 12, 9, 2
+	duty_cycle 1
+	note_type 12, 9, 2
 	octave 3
-	E_ 3
-	F# 1
-	notetype 12, 9, 0
-	E_ 12
-	notetype 12, 9, 2
+	note E_, 3
+	note F#, 1
+	note_type 12, 9, 0
+	note E_, 12
+	note_type 12, 9, 2
 	octave 2
-	B_ 3
+	note B_, 3
 	octave 3
-	C_ 1
-	notetype 12, 9, 0
+	note C_, 1
+	note_type 12, 9, 0
 	octave 2
-	B_ 8
-	duty 3
-	notetype 12, 12, 7
+	note B_, 8
+	duty_cycle 3
+	note_type 12, 12, 7
 	octave 3
-	E_ 1
-	F# 1
-	B_ 1
+	note E_, 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	D# 1
+	note D#, 1
 
 Music_Routes4_branch_a325::
-	notetype 12, 12, 7
-	E_ 6
+	note_type 12, 12, 7
+	note E_, 6
 	octave 3
-	B_ 2
-	B_ 4
+	note B_, 2
+	note B_, 4
 	octave 4
-	B_ 4
-	A_ 4
-	G# 4
-	F# 4
-	F# 1
-	A_ 1
-	G# 1
-	F# 1
-	notetype 12, 12, 2
-	G# 3
-	E_ 1
-	notetype 12, 10, 0
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note F#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note_type 12, 12, 2
+	note G#, 3
+	note E_, 1
+	note_type 12, 10, 0
 	octave 3
-	B_ 12
-	duty 0
-	notetype 12, 12, 2
+	note B_, 12
+	duty_cycle 0
+	note_type 12, 12, 2
 	octave 2
-	B_ 3
-	notetype 12, 12, 7
+	note B_, 3
+	note_type 12, 12, 7
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 8
+	note B_, 8
 	octave 3
-	D# 4
-	duty 3
+	note D#, 4
+	duty_cycle 3
 	octave 4
-	E_ 6
+	note E_, 6
 	octave 3
-	B_ 2
-	B_ 4
+	note B_, 2
+	note B_, 4
 	octave 4
-	B_ 4
-	A_ 4
-	G# 4
-	F# 4
-	A_ 1
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note A_, 1
 	octave 5
-	C# 1
+	note C#, 1
 	octave 4
-	B_ 1
-	A_ 1
-	notetype 12, 12, 2
-	B_ 3
-	notetype 12, 12, 7
-	A_ 1
-	notetype 12, 11, 0
-	G# 6
-	notetype 12, 9, 0
-	G# 6
-	notetype 12, 7, 0
-	G# 6
-	notetype 12, 6, 15
-	G# 6
-	notetype 12, 12, 7
-	G# 4
-	notetype 8, 12, 3
-	A_ 4
-	G# 4
-	F# 4
-	notetype 8, 9, 0
-	F# 6
-	notetype 8, 7, 15
-	F# 6
-	duty 0
-	notetype 8, 9, 0
+	note B_, 1
+	note A_, 1
+	note_type 12, 12, 2
+	note B_, 3
+	note_type 12, 12, 7
+	note A_, 1
+	note_type 12, 11, 0
+	note G#, 6
+	note_type 12, 9, 0
+	note G#, 6
+	note_type 12, 7, 0
+	note G#, 6
+	note_type 12, 6, 15
+	note G#, 6
+	note_type 12, 12, 7
+	note G#, 4
+	note_type 8, 12, 3
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note_type 8, 9, 0
+	note F#, 6
+	note_type 8, 7, 15
+	note F#, 6
+	duty_cycle 0
+	note_type 8, 9, 0
 	octave 3
-	F# 4
-	E_ 4
-	F# 4
-	A_ 6
-	duty 3
-	notetype 8, 12, 7
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note A_, 6
+	duty_cycle 3
+	note_type 8, 12, 7
 	octave 4
-	F# 6
-	G# 4
-	F# 4
-	notetype 8, 12, 4
-	E_ 4
-	notetype 8, 10, 0
-	E_ 12
-	duty 0
-	notetype 8, 9, 0
+	note F#, 6
+	note G#, 4
+	note F#, 4
+	note_type 8, 12, 4
+	note E_, 4
+	note_type 8, 10, 0
+	note E_, 12
+	duty_cycle 0
+	note_type 8, 9, 0
 	octave 3
-	E_ 4
-	D# 4
-	E_ 4
-	G# 6
-	duty 3
-	notetype 8, 12, 7
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note G#, 6
+	duty_cycle 3
+	note_type 8, 12, 7
 	octave 4
-	E_ 6
-	F# 4
-	D# 4
+	note E_, 6
+	note F#, 4
+	note D#, 4
 	octave 3
-	B_ 4
-	notetype 8, 10, 0
+	note B_, 4
+	note_type 8, 10, 0
 	octave 4
-	B_ 16
-	notetype 8, 10, 7
-	B_ 8
-	notetype 8, 11, 0
-	A_ 6
-	notetype 8, 11, 7
-	A_ 6
-	notetype 12, 10, 7
-	G# 1
-	F# 1
-	notetype 12, 11, 0
-	E_ 12
-	notetype 12, 10, 0
-	E_ 8
-	notetype 12, 10, 7
-	E_ 10
-	loopchannel 0, Music_Routes4_branch_a325
+	note B_, 16
+	note_type 8, 10, 7
+	note B_, 8
+	note_type 8, 11, 0
+	note A_, 6
+	note_type 8, 11, 7
+	note A_, 6
+	note_type 12, 10, 7
+	note G#, 1
+	note F#, 1
+	note_type 12, 11, 0
+	note E_, 12
+	note_type 12, 10, 0
+	note E_, 8
+	note_type 12, 10, 7
+	note E_, 10
+	sound_loop 0, Music_Routes4_branch_a325
 
 
-Music_Routes4_Ch2::
-	notetype 12, 1, 0
+Music_Routes4_Ch3::
+	note_type 12, 1, 0
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	D# 1
+	note D#, 1
 	rest 3
 
 Music_Routes4_branch_a3d7::
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
-	F# 1
-	F# 1
-	F# 1
-	F# 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
-	G# 1
-	G# 1
-	G# 1
-	G# 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
-	G# 1
-	G# 1
-	G# 1
-	G# 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
-	F# 1
-	F# 1
-	F# 1
-	F# 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
-	B_ 1
-	B_ 1
-	B_ 1
-	B_ 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
-	F# 1
-	F# 1
-	F# 1
-	F# 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
-	D_ 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
-	G# 1
-	G# 1
-	G# 1
-	G# 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
-	F# 1
-	F# 1
-	F# 1
-	F# 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
-	B_ 1
-	B_ 1
-	B_ 1
-	B_ 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
-	G# 1
-	G# 1
-	G# 1
-	G# 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	D# 1
+	note D#, 1
 	rest 1
-	loopchannel 0, Music_Routes4_branch_a3d7
+	sound_loop 0, Music_Routes4_branch_a3d7
 
 
-Music_Routes4_Ch3::
+Music_Routes4_Ch4::
 	dspeed 12
 	rest 16
 	rest 12
@@ -678,4 +678,4 @@ Music_Routes4_branch_a4a8::
 	mutedsnare2 2
 	mutedsnare2 2
 	mutedsnare2 2
-	loopchannel 0, Music_Routes4_branch_a4a8
+	sound_loop 0, Music_Routes4_branch_a4a8
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index e2853646..083d077a 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -1,111 +1,111 @@
-Music_SafariZone_Ch0::
+Music_SafariZone_Ch1::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	duty 2
-	notetype 12, 9, 2
+	toggle_perfect_pitch
+	duty_cycle 2
+	note_type 12, 9, 2
 	octave 3
-	pitchbend 0, 73
-	C_ 1
-	pitchbend 0, 73
-	G_ 1
-	pitchbend 0, 73
-	C_ 1
-	pitchbend 0, 73
-	G_ 1
+	pitch_slide 0, 73
+	note C_, 1
+	pitch_slide 0, 73
+	note G_, 1
+	pitch_slide 0, 73
+	note C_, 1
+	pitch_slide 0, 73
+	note G_, 1
 	rest 4
-	duty 3
+	duty_cycle 3
 
 Music_SafariZone_branch_bc4f::
-	callchannel Music_SafariZone_branch_bc5f
-	notetype 12, 10, 4
-	F# 4
-	callchannel Music_SafariZone_branch_bc5f
-	notetype 12, 10, 4
-	F# 4
-	loopchannel 0, Music_SafariZone_branch_bc4f
+	sound_call Music_SafariZone_branch_bc5f
+	note_type 12, 10, 4
+	note F#, 4
+	sound_call Music_SafariZone_branch_bc5f
+	note_type 12, 10, 4
+	note F#, 4
+	sound_loop 0, Music_SafariZone_branch_bc4f
 
 Music_SafariZone_branch_bc5f::
-	notetype 12, 10, 2
+	note_type 12, 10, 2
 	octave 3
-	C_ 4
-	G_ 4
-	C_ 4
-	G_ 4
-	C_ 4
-	G_ 4
-	C_ 4
-	endchannel
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	sound_ret
 
 
-Music_SafariZone_Ch1::
-	duty 2
+Music_SafariZone_Ch2::
+	duty_cycle 2
 	vibrato 8, 2, 5
-	notetype 12, 10, 2
+	note_type 12, 10, 2
 	octave 4
-	G_ 1
-	D_ 1
-	G_ 1
-	D_ 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
 	rest 4
-	duty 3
+	duty_cycle 3
 
 Music_SafariZone_branch_bc79::
-	callchannel Music_SafariZone_branch_bc89
-	notetype 12, 11, 5
-	A_ 4
-	callchannel Music_SafariZone_branch_bc89
-	notetype 12, 11, 5
-	B_ 4
-	loopchannel 0, Music_SafariZone_branch_bc79
+	sound_call Music_SafariZone_branch_bc89
+	note_type 12, 11, 5
+	note A_, 4
+	sound_call Music_SafariZone_branch_bc89
+	note_type 12, 11, 5
+	note B_, 4
+	sound_loop 0, Music_SafariZone_branch_bc79
 
 Music_SafariZone_branch_bc89::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 3
-	G_ 4
-	D_ 4
-	G_ 4
-	D_ 4
-	G_ 4
-	D_ 4
-	G_ 4
-	endchannel
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	sound_ret
 
 
-Music_SafariZone_Ch2::
-	notetype 12, 1, 0
+Music_SafariZone_Ch3::
+	note_type 12, 1, 0
 	rest 8
 
 Music_SafariZone_branch_bc97::
-	callchannel Music_SafariZone_branch_bca5
+	sound_call Music_SafariZone_branch_bca5
 	octave 4
-	A_ 4
-	callchannel Music_SafariZone_branch_bca5
+	note A_, 4
+	sound_call Music_SafariZone_branch_bca5
 	octave 4
-	B_ 4
-	loopchannel 0, Music_SafariZone_branch_bc97
+	note B_, 4
+	sound_loop 0, Music_SafariZone_branch_bc97
 
 Music_SafariZone_branch_bca5::
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index 3e1ff3fc..58af9209 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -1,323 +1,323 @@
-Music_SilphCo_Ch0::
+Music_SilphCo_Ch1::
 	tempo 160
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 8, 2, 2
-	notetype 6, 11, 3
+	note_type 6, 11, 3
 	octave 2
-	E_ 1
-	F# 1
-	G# 1
-	A# 1
-	octave 3
-	C_ 1
-	notetype 6, 10, 0
-	C_ 12
-	notetype 6, 11, 3
-	C_ 2
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	note_type 6, 10, 0
+	note C_, 12
+	note_type 6, 11, 3
+	note C_, 2
 	octave 2
-	B_ 1
-	A# 1
-	G# 1
-	F# 1
-	E_ 1
-	E_ 2
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note E_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 2
 
 Music_SilphCo_branch_7f26d::
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	A# 2
+	note A#, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 3
-	C_ 2
+	note C_, 2
 	rest 2
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
 	octave 2
-	A# 2
+	note A#, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 10
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 6, 10, 0
-	B_ 12
-	notetype 6, 11, 3
-	B_ 1
-	A_ 1
-	G_ 1
-	F_ 1
-	E_ 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 6, 10, 0
+	note B_, 12
+	note_type 6, 11, 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
 	rest 11
-	F_ 1
-	G# 1
-	A# 1
-	B_ 1
-	notetype 6, 10, 0
-	octave 3
-	C_ 12
-	notetype 6, 11, 3
-	C_ 1
+	note F_, 1
+	note G#, 1
+	note A#, 1
+	note B_, 1
+	note_type 6, 10, 0
+	octave 3
+	note C_, 12
+	note_type 6, 11, 3
+	note C_, 1
 	octave 2
-	B_ 1
-	A_ 1
-	G_ 1
-	F_ 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
 	rest 11
-	F# 1
-	B_ 1
-	octave 3
-	C_ 1
-	C# 1
-	notetype 6, 10, 0
-	D_ 12
-	notetype 6, 11, 3
-	D_ 1
-	C_ 1
+	note F#, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note_type 6, 10, 0
+	note D_, 12
+	note_type 6, 11, 3
+	note D_, 1
+	note C_, 1
 	octave 2
-	A# 1
-	G_ 1
-	F_ 1
+	note A#, 1
+	note G_, 1
+	note F_, 1
 	rest 11
-	F_ 1
-	G# 1
-	A# 1
-	B_ 1
-	notetype 6, 10, 0
-	octave 3
-	C_ 12
-	notetype 6, 11, 3
-	C_ 1
+	note F_, 1
+	note G#, 1
+	note A#, 1
+	note B_, 1
+	note_type 6, 10, 0
+	octave 3
+	note C_, 12
+	note_type 6, 11, 3
+	note C_, 1
 	octave 2
-	B_ 1
-	G# 1
-	F_ 1
-	E_ 1
+	note B_, 1
+	note G#, 1
+	note F_, 1
+	note E_, 1
 	rest 7
-	notetype 6, 8, 0
-	B_ 16
-	notetype 6, 11, 0
+	note_type 6, 8, 0
+	note B_, 16
+	note_type 6, 11, 0
 	octave 3
-	E_ 8
+	note E_, 8
 	tempo 124
-	notetype 6, 11, 3
+	note_type 6, 11, 3
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 10
-	B_ 2
+	note B_, 2
 	rest 10
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 16
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
-	A# 2
-	A_ 2
-	A# 2
-	B_ 2
-	A# 2
-	callchannel Music_SilphCo_branch_7f3f0
-	callchannel Music_SilphCo_branch_7f3f0
-	callchannel Music_SilphCo_branch_7f3f0
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	note B_, 2
+	note A#, 2
+	sound_call Music_SilphCo_branch_7f3f0
+	sound_call Music_SilphCo_branch_7f3f0
+	sound_call Music_SilphCo_branch_7f3f0
 	rest 4
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	A# 2
+	note A#, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A_ 2
+	note A_, 2
 	rest 6
-	A# 2
+	note A#, 2
 	rest 6
-	A# 2
+	note A#, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
 	octave 3
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
 	octave 3
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 6
-	C_ 2
+	note C_, 2
 	rest 6
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
 	octave 4
-	E_ 2
+	note E_, 2
 	rest 6
-	E_ 2
+	note E_, 2
 	rest 6
-	D# 2
+	note D#, 2
 	rest 6
-	D# 2
+	note D#, 2
 	rest 2
 	octave 2
-	B_ 1
-	A# 1
-	G# 1
-	F# 1
-	E_ 1
-	notetype 6, 6, 0
-	E_ 16
-	E_ 11
-	notetype 6, 11, 3
-	E_ 1
-	F# 1
-	G# 1
-	A# 1
-	octave 3
-	C_ 1
-	notetype 6, 3, 15
-	C_ 16
-	notetype 6, 10, 0
-	C_ 11
-	notetype 6, 9, 3
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note_type 6, 6, 0
+	note E_, 16
+	note E_, 11
+	note_type 6, 11, 3
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	note_type 6, 3, 15
+	note C_, 16
+	note_type 6, 10, 0
+	note C_, 11
+	note_type 6, 9, 3
 	octave 2
-	B_ 1
-	A# 1
-	G# 1
-	F# 1
-	E_ 1
-	notetype 6, 3, 15
-	E_ 16
-	notetype 6, 9, 0
-	E_ 11
-	notetype 6, 11, 3
-	F_ 1
-	G_ 1
-	A# 1
-	octave 3
-	C_ 1
-	D_ 1
-	notetype 6, 3, 15
-	D_ 16
-	notetype 6, 10, 7
-	D_ 11
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note_type 6, 3, 15
+	note E_, 16
+	note_type 6, 9, 0
+	note E_, 11
+	note_type 6, 11, 3
+	note F_, 1
+	note G_, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note_type 6, 3, 15
+	note D_, 16
+	note_type 6, 10, 7
+	note D_, 11
 	rest 4
 	rest 4
 	tempo 128
@@ -344,633 +344,633 @@ Music_SilphCo_branch_7f26d::
 	rest 4
 	tempo 160
 	rest 4
-	notetype 6, 4, 3
+	note_type 6, 4, 3
 	octave 2
-	B_ 2
+	note B_, 2
 	rest 6
-	notetype 6, 6, 3
-	B_ 2
+	note_type 6, 6, 3
+	note B_, 2
 	rest 6
-	notetype 6, 8, 3
-	B_ 2
+	note_type 6, 8, 3
+	note B_, 2
 	rest 6
-	notetype 6, 5, 0
-	B_ 8
-	notetype 6, 11, 3
-	B_ 2
+	note_type 6, 5, 0
+	note B_, 8
+	note_type 6, 11, 3
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 2
-	loopchannel 0, Music_SilphCo_branch_7f26d
+	sound_loop 0, Music_SilphCo_branch_7f26d
 
 Music_SilphCo_branch_7f3f0::
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 3
-	C_ 2
-	endchannel
+	note C_, 2
+	sound_ret
 
 
-Music_SilphCo_Ch1::
+Music_SilphCo_Ch2::
 	vibrato 10, 3, 2
-	duty 3
-	notetype 6, 12, 3
+	duty_cycle 3
+	note_type 6, 12, 3
 	octave 3
-	E_ 1
-	F# 1
-	G# 1
-	A# 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
 	octave 4
-	C_ 1
-	notetype 6, 11, 0
-	C_ 12
-	notetype 6, 12, 3
-	C_ 2
-	octave 3
-	B_ 1
-	A# 1
-	G# 1
-	F# 1
-	E_ 1
-	E_ 2
+	note C_, 1
+	note_type 6, 11, 0
+	note C_, 12
+	note_type 6, 12, 3
+	note C_, 2
+	octave 3
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note E_, 2
 	rest 2
 	octave 2
-	G_ 2
+	note G_, 2
 	rest 6
-	F# 2
+	note F#, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 2
 
 Music_SilphCo_branch_7f42e::
-	E_ 2
+	note E_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	F# 2
+	note F#, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 2
-	notetype 6, 11, 7
-	duty 2
+	note_type 6, 11, 7
+	duty_cycle 2
 	octave 4
-	E_ 8
-	D# 8
-	E_ 8
-	F_ 8
-	E_ 8
-	D# 8
-	D_ 8
-	D# 8
-	E_ 8
-	F_ 8
-	F# 8
-	G_ 8
-	G# 8
-	D# 8
-	D_ 8
-	D# 8
-	duty 3
-	notetype 6, 6, 15
-	E_ 16
-	notetype 6, 12, 0
-	B_ 16
-	notetype 6, 12, 4
-	octave 3
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	E_ 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	D# 4
-	D_ 4
-	D# 4
-	notetype 6, 12, 2
-	duty 1
+	note E_, 8
+	note D#, 8
+	note E_, 8
+	note F_, 8
+	note E_, 8
+	note D#, 8
+	note D_, 8
+	note D#, 8
+	note E_, 8
+	note F_, 8
+	note F#, 8
+	note G_, 8
+	note G#, 8
+	note D#, 8
+	note D_, 8
+	note D#, 8
+	duty_cycle 3
+	note_type 6, 6, 15
+	note E_, 16
+	note_type 6, 12, 0
+	note B_, 16
+	note_type 6, 12, 4
+	octave 3
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note_type 6, 12, 2
+	duty_cycle 1
 	octave 4
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	E_ 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	notetype 6, 12, 4
-	duty 3
-	octave 3
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	D# 4
-	E_ 4
-	notetype 6, 12, 0
-	F_ 8
-	notetype 6, 11, 7
-	F_ 8
-	notetype 6, 8, 10
-	F_ 4
-	notetype 6, 12, 4
-	duty 3
-	F_ 4
-	E_ 4
-	F_ 4
-	notetype 6, 10, 0
-	F# 8
-	notetype 6, 11, 0
-	F# 8
-	notetype 6, 9, 9
-	F# 4
-	notetype 6, 12, 4
-	F# 4
-	F_ 4
-	F# 4
-	notetype 6, 9, 0
-	G_ 12
-	notetype 6, 5, 9
-	G_ 8
-	notetype 6, 12, 4
-	G_ 4
-	F# 4
-	G_ 4
-	F# 4
-	F_ 4
-	F# 4
-	F_ 4
-	E_ 4
-	F_ 4
-	E_ 4
-	D# 4
-	D_ 4
-	C# 4
-	D_ 4
-	D# 4
-	D_ 4
-	notetype 6, 12, 2
-	duty 1
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	A_ 4
-	notetype 6, 11, 4
-	duty 3
-	D# 4
-	D_ 4
-	D# 4
-	notetype 6, 12, 2
-	duty 1
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	A# 4
-	notetype 6, 11, 4
-	duty 3
-	D# 4
-	D_ 4
-	D# 4
-	notetype 6, 12, 2
-	duty 1
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	B_ 4
-	notetype 6, 11, 4
-	duty 3
-	D# 4
-	D_ 4
-	D# 4
-	notetype 6, 12, 2
-	duty 1
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note_type 6, 12, 4
+	duty_cycle 3
+	octave 3
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note_type 6, 12, 0
+	note F_, 8
+	note_type 6, 11, 7
+	note F_, 8
+	note_type 6, 8, 10
+	note F_, 4
+	note_type 6, 12, 4
+	duty_cycle 3
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note_type 6, 10, 0
+	note F#, 8
+	note_type 6, 11, 0
+	note F#, 8
+	note_type 6, 9, 9
+	note F#, 4
+	note_type 6, 12, 4
+	note F#, 4
+	note F_, 4
+	note F#, 4
+	note_type 6, 9, 0
+	note G_, 12
+	note_type 6, 5, 9
+	note G_, 8
+	note_type 6, 12, 4
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note F_, 4
+	note F#, 4
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note C#, 4
+	note D_, 4
+	note D#, 4
+	note D_, 4
+	note_type 6, 12, 2
+	duty_cycle 1
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
+	note_type 6, 11, 4
+	duty_cycle 3
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note_type 6, 12, 2
+	duty_cycle 1
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note A#, 4
+	note_type 6, 11, 4
+	duty_cycle 3
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note_type 6, 12, 2
+	duty_cycle 1
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note B_, 4
+	note_type 6, 11, 4
+	duty_cycle 3
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note_type 6, 12, 2
+	duty_cycle 1
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
 	octave 4
-	C_ 4
-	notetype 6, 11, 4
-	duty 3
+	note C_, 4
+	note_type 6, 11, 4
+	duty_cycle 3
 	octave 3
-	D# 4
-	D_ 4
-	D# 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
 	rest 4
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 2
-	duty 0
+	duty_cycle 0
 	octave 4
-	E_ 2
+	note E_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 6
-	duty 3
+	duty_cycle 3
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 2
-	duty 0
+	duty_cycle 0
 	octave 4
-	E_ 2
+	note E_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 2
-	duty 3
+	duty_cycle 3
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 3
-	G_ 2
+	note G_, 2
 	rest 2
-	notetype 6, 8, 7
+	note_type 6, 8, 7
 	octave 5
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	E_ 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	D# 4
-	D_ 4
-	D# 4
-	rest 4
-	notetype 6, 4, 3
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	rest 4
+	note_type 6, 4, 3
 	octave 2
-	G_ 2
+	note G_, 2
 	rest 6
-	notetype 6, 6, 3
-	F# 2
+	note_type 6, 6, 3
+	note F#, 2
 	rest 6
-	notetype 6, 8, 3
-	G_ 2
+	note_type 6, 8, 3
+	note G_, 2
 	rest 6
-	notetype 6, 4, 15
-	G# 8
-	notetype 6, 11, 4
-	G_ 2
+	note_type 6, 4, 15
+	note G#, 8
+	note_type 6, 11, 4
+	note G_, 2
 	rest 6
-	F# 2
+	note F#, 2
 	rest 6
-	G_ 2
+	note G_, 2
 	rest 6
-	G# 2
+	note G#, 2
 	rest 2
-	loopchannel 0, Music_SilphCo_branch_7f42e
+	sound_loop 0, Music_SilphCo_branch_7f42e
 
 
-Music_SilphCo_Ch2::
+Music_SilphCo_Ch3::
 	vibrato 8, 1, 1
-	notetype 12, 1, 1
+	note_type 12, 1, 1
 	rest 12
 	octave 5
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
 
 Music_SilphCo_branch_7f5c9::
-	E_ 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 1
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 5
-	F_ 1
+	note F_, 1
 	rest 5
-	F_ 1
+	note F_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 11
-	D# 1
+	note D#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 5
-	F_ 1
+	note F_, 1
 	rest 5
-	F_ 1
+	note F_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 11
-	D# 1
+	note D#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	D# 1
+	note D#, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
-	D_ 8
-	F_ 8
-	D_ 8
-	F# 8
-	D_ 8
-	G_ 8
-	D_ 8
-	A_ 8
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
+	note D_, 8
+	note F_, 8
+	note D_, 8
+	note F#, 8
+	note D_, 8
+	note G_, 8
+	note D_, 8
+	note A_, 8
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
 	octave 5
-	E_ 2
-	D# 2
-	E_ 2
-	F_ 2
-	E_ 2
-	D# 2
-	D_ 2
-	D# 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
 	octave 4
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
 	octave 5
-	E_ 2
-	F_ 2
-	F# 2
-	G_ 2
-	G# 2
-	D# 2
-	D_ 2
-	D# 2
+	note E_, 2
+	note F_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
 	octave 6
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	E_ 4
-	D# 4
-	D_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	F# 4
-	G_ 4
-	G# 4
-	D# 4
-	D_ 4
-	D# 4
-	notetype 6, 1, 1
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note E_, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note D#, 4
+	note D_, 4
+	note D#, 4
+	note_type 6, 1, 1
 	rest 4
 	rest 4
 	rest 4
@@ -987,14 +987,14 @@ Music_SilphCo_branch_7f5c9::
 	rest 4
 	rest 4
 	rest 4
-	notetype 12, 1, 1
+	note_type 12, 1, 1
 	rest 4
 	rest 4
 	rest 4
 	rest 4
 	octave 5
-	E_ 4
-	D# 4
-	E_ 4
-	F_ 4
-	loopchannel 0, Music_SilphCo_branch_7f5c9
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	sound_loop 0, Music_SilphCo_branch_7f5c9
diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm
index 1356c8b1..4dae83bc 100644
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -1,338 +1,338 @@
-Music_SSAnne_Ch0::
+Music_SSAnne_Ch1::
 	tempo 128
 	volume 7, 7
-	duty 1
+	duty_cycle 1
 	vibrato 8, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_SSAnne_branch_b3b2::
-	notetype 12, 10, 4
+	note_type 12, 10, 4
 	rest 12
 	octave 3
-	E_ 2
-	F# 2
-	E_ 4
-	D_ 4
-	C# 2
-	D_ 2
-	E_ 2
+	note E_, 2
+	note F#, 2
+	note E_, 4
+	note D_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
 	rest 2
-	E_ 4
-	F# 2
-	D_ 2
-	E_ 4
-	F# 4
-	G# 4
+	note E_, 4
+	note F#, 2
+	note D_, 2
+	note E_, 4
+	note F#, 4
+	note G#, 4
 	rest 4
-	E_ 4
-	G# 4
+	note E_, 4
+	note G#, 4
 	rest 4
-	C# 2
-	E_ 2
-	F# 4
-	D_ 4
-	E_ 4
-	D_ 4
-	C# 2
-	D_ 2
-	E_ 2
+	note C#, 2
+	note E_, 2
+	note F#, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
 	rest 2
-	E_ 4
-	F# 2
-	D_ 2
-	E_ 4
-	F# 4
-	G# 4
-	F# 4
-	E_ 4
-	F# 4
+	note E_, 4
+	note F#, 2
+	note D_, 2
+	note E_, 4
+	note F#, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
 	rest 4
-	C# 2
-	E_ 2
-	F# 4
-	D_ 4
-	E_ 4
-	D_ 4
-	C# 2
-	D_ 2
-	E_ 2
+	note C#, 2
+	note E_, 2
+	note F#, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
 	rest 2
-	E_ 4
-	F# 2
-	D_ 2
-	E_ 4
-	F# 4
-	G# 4
-	F# 8
-	G# 4
-	E_ 4
+	note E_, 4
+	note F#, 2
+	note D_, 2
+	note E_, 4
+	note F#, 4
+	note G#, 4
+	note F#, 8
+	note G#, 4
+	note E_, 4
 	rest 4
-	E_ 4
-	F# 2
-	E_ 2
-	D_ 4
+	note E_, 4
+	note F#, 2
+	note E_, 2
+	note D_, 4
 	rest 4
-	D_ 4
-	E_ 4
-	C# 4
+	note D_, 4
+	note E_, 4
+	note C#, 4
 	rest 4
-	C# 4
-	D_ 2
-	C# 2
+	note C#, 4
+	note D_, 2
+	note C#, 2
 	octave 2
-	B_ 4
-	E_ 4
-	B_ 4
+	note B_, 4
+	note E_, 4
+	note B_, 4
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	B_ 2
-	A_ 4
+	note B_, 2
+	note A_, 4
 	rest 4
-	A_ 4
-	B_ 2
-	A_ 2
-	G# 4
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 4
 	rest 4
-	C# 4
-	G# 4
-	A_ 4
+	note C#, 4
+	note G#, 4
+	note A_, 4
 	rest 4
-	A_ 4
-	B_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
+	note B_, 4
 	rest 4
 	octave 3
-	D_ 8
-	loopchannel 0, Music_SSAnne_branch_b3b2
+	note D_, 8
+	sound_loop 0, Music_SSAnne_branch_b3b2
 
 
-Music_SSAnne_Ch1::
-	duty 0
+Music_SSAnne_Ch2::
+	duty_cycle 0
 	vibrato 12, 2, 4
 
 Music_SSAnne_branch_b41e::
-	notetype 12, 12, 5
+	note_type 12, 12, 5
 	octave 3
-	A_ 2
-	E_ 2
-	A_ 4
-	B_ 4
+	note A_, 2
+	note E_, 2
+	note A_, 4
+	note B_, 4
 	octave 4
-	D_ 4
-	notetype 8, 12, 5
-	C# 2
-	D_ 2
-	C# 2
+	note D_, 4
+	note_type 8, 12, 5
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 3
-	A_ 3
-	B_ 6
-	G# 6
-	A_ 3
-	B_ 3
+	note B_, 3
+	note A_, 3
+	note B_, 6
+	note G#, 6
+	note A_, 3
+	note B_, 3
 	octave 4
-	C# 6
-	D_ 6
-	C# 3
+	note C#, 6
+	note D_, 6
+	note C#, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 6
-	D_ 3
-	C# 3
+	note E_, 6
+	note D_, 3
+	note C#, 3
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	B_ 3
-	A_ 3
-	E_ 3
-	A_ 6
-	B_ 6
+	note B_, 3
+	note A_, 3
+	note E_, 3
+	note A_, 6
+	note B_, 6
 	octave 4
-	D_ 6
-	C# 2
-	D_ 2
-	C# 2
+	note D_, 6
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 3
-	A_ 3
-	B_ 6
-	G# 6
-	A_ 3
-	B_ 3
+	note B_, 3
+	note A_, 3
+	note B_, 6
+	note G#, 6
+	note A_, 3
+	note B_, 3
 	octave 4
-	C# 6
-	D_ 6
-	C# 3
+	note C#, 6
+	note D_, 6
+	note C#, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 6
-	D_ 3
-	C# 3
+	note E_, 6
+	note D_, 3
+	note C#, 3
 	octave 3
-	B_ 12
-	A_ 3
-	E_ 3
-	A_ 6
-	B_ 6
+	note B_, 12
+	note A_, 3
+	note E_, 3
+	note A_, 6
+	note B_, 6
 	octave 4
-	D_ 6
-	C# 2
-	D_ 2
-	C# 2
+	note D_, 6
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 3
-	A_ 3
-	B_ 6
-	G# 6
-	A_ 3
-	B_ 3
+	note B_, 3
+	note A_, 3
+	note B_, 6
+	note G#, 6
+	note A_, 3
+	note B_, 3
 	octave 4
-	C# 6
-	D_ 6
-	C# 3
+	note C#, 6
+	note D_, 6
+	note C#, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 6
-	D_ 3
-	C# 3
+	note E_, 6
+	note D_, 3
+	note C#, 3
 	octave 3
-	B_ 12
+	note B_, 12
 	rest 3
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	C# 3
-	C# 3
-	D_ 3
-	C# 3
-	D_ 3
-	E_ 3
+	note C#, 3
+	note C#, 3
+	note D_, 3
+	note C#, 3
+	note D_, 3
+	note E_, 3
 	octave 3
-	B_ 3
-	G# 3
-	F# 3
-	E_ 3
-	F# 3
-	G# 3
-	B_ 3
+	note B_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note B_, 3
 	rest 3
-	A_ 3
-	G# 3
-	A_ 3
-	A_ 3
-	B_ 3
-	A_ 3
-	B_ 3
+	note A_, 3
+	note G#, 3
+	note A_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note B_, 3
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	G# 3
-	F# 3
-	E_ 3
-	E_ 3
-	F# 3
-	G# 3
-	B_ 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note B_, 3
 	rest 3
-	F# 3
-	E_ 3
-	F# 3
-	F# 3
-	G# 3
-	F# 3
-	G# 3
-	A_ 3
-	E_ 3
-	C# 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note F#, 3
+	note G#, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	note E_, 3
+	note C#, 3
 	octave 2
-	B_ 3
-	A_ 3
-	B_ 3
+	note B_, 3
+	note A_, 3
+	note B_, 3
 	octave 3
-	C# 3
-	E_ 3
+	note C#, 3
+	note E_, 3
 	rest 3
-	F# 3
-	E_ 3
-	F# 3
-	F# 3
-	G# 3
-	A_ 3
-	B_ 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	note B_, 3
 	octave 4
-	C# 3
-	D_ 3
-	C# 3
+	note C#, 3
+	note D_, 3
+	note C#, 3
 	octave 3
-	B_ 3
+	note B_, 3
 	octave 4
-	E_ 3
-	D_ 3
-	C# 3
+	note E_, 3
+	note D_, 3
+	note C#, 3
 	octave 3
-	B_ 3
-	loopchannel 0, Music_SSAnne_branch_b41e
+	note B_, 3
+	sound_loop 0, Music_SSAnne_branch_b41e
 
 
-Music_SSAnne_Ch2::
-	notetype 12, 1, 3
+Music_SSAnne_Ch3::
+	note_type 12, 1, 3
 	rest 16
 	rest 12
 	octave 4
-	B_ 2
-	G# 2
-	A_ 8
-	F# 8
-	G# 4
+	note B_, 2
+	note G#, 2
+	note A_, 8
+	note F#, 8
+	note G#, 4
 	rest 4
-	B_ 8
-	A_ 8
-	B_ 8
-	A_ 8
-	G# 8
-	A_ 8
-	F# 8
-	G# 8
-	B_ 8
-	A_ 4
-	E_ 4
-	B_ 4
-	E_ 4
-	A_ 4
-	E_ 4
-	G# 4
-	E_ 4
-	A_ 4
-	E_ 4
-	F# 4
-	G_ 4
-	G# 4
-	A_ 4
+	note B_, 8
+	note A_, 8
+	note B_, 8
+	note A_, 8
+	note G#, 8
+	note A_, 8
+	note F#, 8
+	note G#, 8
+	note B_, 8
+	note A_, 4
+	note E_, 4
+	note B_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note G#, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note F#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
 	octave 5
-	D_ 8
-	C# 8
-	C# 8
+	note D_, 8
+	note C#, 8
+	note C#, 8
 	octave 4
-	B_ 8
-	B_ 8
-	A_ 8
-	A_ 8
-	G# 8
-	G# 8
-	F# 8
-	F# 8
-	E_ 8
-	E_ 8
-	F# 8
-	F# 8
-	G# 8
-	B_ 8
-	loopchannel 0, Music_SSAnne_Ch2
+	note B_, 8
+	note B_, 8
+	note A_, 8
+	note A_, 8
+	note G#, 8
+	note G#, 8
+	note F#, 8
+	note F#, 8
+	note E_, 8
+	note E_, 8
+	note F#, 8
+	note F#, 8
+	note G#, 8
+	note B_, 8
+	sound_loop 0, Music_SSAnne_Ch3
diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm
index c4507a55..4765f391 100644
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -1,335 +1,335 @@
-Music_Surfing_Ch0::
+Music_Surfing_Ch1::
 	tempo 160
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	rest 6
 	octave 2
-	A_ 2
-	G# 3
-	F# 1
-	E_ 6
+	note A_, 2
+	note G#, 3
+	note F#, 1
+	note E_, 6
 	octave 3
-	G# 2
-	F# 2
-	G# 4
+	note G#, 2
+	note F#, 2
+	note G#, 4
 
 Music_Surfing_branch_7fa30::
-	notetype 12, 11, 2
-	E_ 2
-	E_ 4
-	E_ 2
-	E_ 4
-	D_ 2
-	D_ 4
-	D_ 2
-	D_ 4
-	D_ 2
-	D_ 4
-	notetype 12, 11, 1
-	F# 3
-	notetype 12, 11, 2
-	D_ 3
-	E_ 2
-	E_ 4
-	E_ 2
-	E_ 4
-	A_ 2
-	A_ 4
-	G# 2
-	G# 4
-	F# 2
-	F# 4
-	E_ 2
-	E_ 4
-	G# 2
-	G# 4
-	notetype 12, 11, 1
-	F# 3
-	notetype 12, 11, 2
-	G# 1
-	notetype 12, 11, 4
-	A_ 2
-	B_ 2
+	note_type 12, 11, 2
+	note E_, 2
+	note E_, 4
+	note E_, 2
+	note E_, 4
+	note D_, 2
+	note D_, 4
+	note D_, 2
+	note D_, 4
+	note D_, 2
+	note D_, 4
+	note_type 12, 11, 1
+	note F#, 3
+	note_type 12, 11, 2
+	note D_, 3
+	note E_, 2
+	note E_, 4
+	note E_, 2
+	note E_, 4
+	note A_, 2
+	note A_, 4
+	note G#, 2
+	note G#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 2
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note_type 12, 11, 1
+	note F#, 3
+	note_type 12, 11, 2
+	note G#, 1
+	note_type 12, 11, 4
+	note A_, 2
+	note B_, 2
 	octave 4
-	C_ 2
-	notetype 12, 11, 7
-	C# 6
-	notetype 12, 11, 3
-	D_ 2
-	C# 2
+	note C_, 2
+	note_type 12, 11, 7
+	note C#, 6
+	note_type 12, 11, 3
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	G# 2
-	A_ 2
-	E_ 2
-	G# 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note B_, 2
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 4
-	loopchannel 0, Music_Surfing_branch_7fa30
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 4
+	sound_loop 0, Music_Surfing_branch_7fa30
 
 
-Music_Surfing_Ch1::
-	duty 3
+Music_Surfing_Ch2::
+	duty_cycle 3
 	vibrato 16, 2, 5
-	notetype 12, 12, 6
+	note_type 12, 12, 6
 	octave 3
-	A_ 2
-	G# 3
-	F# 1
-	E_ 6
-	G# 6
+	note A_, 2
+	note G#, 3
+	note F#, 1
+	note E_, 6
+	note G#, 6
 	octave 4
-	E_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 
 Music_Surfing_branch_7faae::
-	notetype 12, 12, 6
+	note_type 12, 12, 6
 	octave 4
-	E_ 6
-	C# 5
-	E_ 1
-	D_ 6
+	note E_, 6
+	note C#, 5
+	note E_, 1
+	note D_, 6
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	D_ 6
+	note D_, 6
 	octave 3
-	B_ 2
-	notetype 12, 12, 1
+	note B_, 2
+	note_type 12, 12, 1
 	octave 4
-	F# 3
-	notetype 12, 12, 6
-	D_ 1
-	E_ 6
-	C# 6
-	E_ 6
-	C# 5
-	E_ 1
-	F# 6
-	D_ 6
-	F# 6
-	E_ 2
-	notetype 12, 12, 1
-	F# 3
-	notetype 12, 12, 6
-	E_ 1
-	A_ 6
-	A_ 6
-	B_ 2
-	A_ 3
-	D_ 1
-	F# 6
-	E_ 2
-	F# 3
-	E_ 1
-	C# 6
-	D_ 2
-	C# 3
+	note F#, 3
+	note_type 12, 12, 6
+	note D_, 1
+	note E_, 6
+	note C#, 6
+	note E_, 6
+	note C#, 5
+	note E_, 1
+	note F#, 6
+	note D_, 6
+	note F#, 6
+	note E_, 2
+	note_type 12, 12, 1
+	note F#, 3
+	note_type 12, 12, 6
+	note E_, 1
+	note A_, 6
+	note A_, 6
+	note B_, 2
+	note A_, 3
+	note D_, 1
+	note F#, 6
+	note E_, 2
+	note F#, 3
+	note E_, 1
+	note C#, 6
+	note D_, 2
+	note C#, 3
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	F# 6
-	E_ 2
-	D# 3
-	E_ 1
-	A_ 6
-	B_ 2
-	A_ 3
-	D_ 1
-	F# 6
-	E_ 2
-	F# 3
-	G# 1
-	A_ 6
-	G# 2
-	F# 3
-	E_ 1
-	G# 6
-	A_ 2
-	G# 3
-	A_ 1
+	note F#, 6
+	note E_, 2
+	note D#, 3
+	note E_, 1
+	note A_, 6
+	note B_, 2
+	note A_, 3
+	note D_, 1
+	note F#, 6
+	note E_, 2
+	note F#, 3
+	note G#, 1
+	note A_, 6
+	note G#, 2
+	note F#, 3
+	note E_, 1
+	note G#, 6
+	note A_, 2
+	note G#, 3
+	note A_, 1
 	octave 5
-	C# 6
-	loopchannel 0, Music_Surfing_branch_7faae
+	note C#, 6
+	sound_loop 0, Music_Surfing_branch_7faae
 
 
-Music_Surfing_Ch2::
-	notetype 12, 1, 0
+Music_Surfing_Ch3::
+	note_type 12, 1, 0
 	rest 12
 	octave 5
-	E_ 6
+	note E_, 6
 	octave 4
-	E_ 2
-	F# 2
-	G# 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
 
 Music_Surfing_branch_7fb03::
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	A_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	A_ 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	G# 2
-	G# 2
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note G#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	G# 1
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 1
 	rest 2
-	E_ 1
-	C# 2
-	A_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	A_ 2
-	C# 2
-	A_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	A_ 2
+	note E_, 1
+	note C#, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	G# 2
-	G# 2
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note G#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	G# 1
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 1
 	rest 2
-	E_ 1
-	C# 2
-	A_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	A_ 2
-	D_ 2
-	F# 2
-	F# 2
+	note E_, 1
+	note C#, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	F# 2
-	F# 2
-	E_ 2
-	A_ 2
-	A_ 2
-	C# 2
-	A_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	G# 2
+	note F#, 2
+	note F#, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note G#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	A_ 2
-	A_ 2
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	A_ 2
-	A_ 2
-	D_ 2
-	F# 2
-	F# 2
+	note A_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	F# 2
-	F# 2
-	E_ 2
-	A_ 2
-	A_ 2
-	C# 2
-	A_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	G# 2
+	note F#, 2
+	note F#, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note G#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	G# 2
-	G# 2
-	E_ 2
-	A_ 2
-	A_ 2
-	C# 2
-	D_ 2
-	E_ 2
-	loopchannel 0, Music_Surfing_branch_7fb03
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note A_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	sound_loop 0, Music_Surfing_branch_7fb03
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 2d41b082..9483b20d 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,465 +1,465 @@
-Music_TitleScreen_Ch0::
+Music_TitleScreen_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
-	duty 3
-	notetype 12, 12, 1
+	duty_cycle 3
+	note_type 12, 12, 1
 	octave 2
-	E_ 1
-	G_ 1
-	B_ 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	octave 2
-	G_ 4
-	G_ 6
-	G_ 1
-	G_ 1
-	G_ 4
-	G_ 4
-	G_ 4
-	notetype 8, 12, 1
-	A_ 2
-	A_ 2
-	A_ 2
-	A_ 2
-	A_ 2
-	F# 2
+	note G_, 4
+	note G_, 6
+	note G_, 1
+	note G_, 1
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note_type 8, 12, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
 
 Music_TitleScreen_branch_7e4e2::
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e54a
+	sound_call Music_TitleScreen_branch_7e541
 	octave 3
-	C_ 8
-	notetype 8, 12, 6
-	E_ 4
-	E_ 4
-	C_ 4
-	notetype 12, 12, 6
+	note C_, 8
+	note_type 8, 12, 6
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note_type 12, 12, 6
 	octave 2
-	B_ 8
-	notetype 8, 14, 7
+	note B_, 8
+	note_type 8, 14, 7
 	octave 3
-	F_ 4
-	E_ 4
-	C_ 4
-	notetype 12, 14, 7
-	D_ 10
-	notetype 12, 12, 6
+	note F_, 4
+	note E_, 4
+	note C_, 4
+	note_type 12, 14, 7
+	note D_, 10
+	note_type 12, 12, 6
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C_ 2
-	D_ 2
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
-	C_ 6
-	C_ 6
-	E_ 4
-	D_ 6
-	F_ 2
-	G_ 2
-	D_ 4
-	G_ 2
-	G_ 6
-	A_ 4
-	F_ 2
-	A_ 2
+	note C_, 2
+	note D_, 2
+	sound_call Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e54a
+	sound_call Music_TitleScreen_branch_7e541
+	note C_, 6
+	note C_, 6
+	note E_, 4
+	note D_, 6
+	note F_, 2
+	note G_, 2
+	note D_, 4
+	note G_, 2
+	note G_, 6
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	D_ 12
-	E_ 4
-	F_ 8
-	G_ 4
-	F_ 4
-	E_ 12
-	F_ 4
-	G_ 8
-	notetype 12, 11, 6
+	note D_, 12
+	note E_, 4
+	note F_, 8
+	note G_, 4
+	note F_, 4
+	note E_, 12
+	note F_, 4
+	note G_, 8
+	note_type 12, 11, 6
 	octave 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e55c
+	note_type 8, 11, 4
 	octave 4
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 2
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e55c
+	note_type 8, 11, 2
 	octave 3
-	E_ 4
-	E_ 4
-	C# 4
-	loopchannel 0, Music_TitleScreen_branch_7e4e2
+	note E_, 4
+	note E_, 4
+	note C#, 4
+	sound_loop 0, Music_TitleScreen_branch_7e4e2
 
 Music_TitleScreen_branch_7e541::
-	notetype 12, 12, 6
+	note_type 12, 12, 6
 	octave 3
-	D_ 6
+	note D_, 6
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 8
-	endchannel
+	note D_, 8
+	sound_ret
 
 Music_TitleScreen_branch_7e54a::
-	C_ 6
-	F_ 6
-	C_ 4
-	D_ 8
-	notetype 12, 14, 7
-	F_ 6
-	E_ 1
-	D# 1
-	D_ 8
-	notetype 8, 12, 6
-	C_ 4
+	note C_, 6
+	note F_, 6
+	note C_, 4
+	note D_, 8
+	note_type 12, 14, 7
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note_type 8, 12, 6
+	note C_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	C_ 4
-	endchannel
+	note C_, 4
+	sound_ret
 
 Music_TitleScreen_branch_7e55c::
-	notetype 12, 12, 1
-	D_ 1
+	note_type 12, 12, 1
+	note D_, 1
 	rest 1
 	octave 2
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	endchannel
+	note D_, 1
+	note D_, 1
+	sound_ret
 
 
-Music_TitleScreen_Ch1::
+Music_TitleScreen_Ch2::
 	vibrato 16, 4, 6
-	duty 1
-	notetype 12, 14, 1
+	duty_cycle 1
+	note_type 12, 14, 1
 	octave 2
-	G_ 1
-	B_ 1
+	note G_, 1
+	note B_, 1
 	octave 3
-	D_ 1
-	F# 1
-	G_ 4
-	G_ 6
-	G_ 1
-	G_ 1
-	G_ 4
-	G_ 4
-	G_ 4
-	notetype 8, 14, 1
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F# 2
+	note D_, 1
+	note F#, 1
+	note G_, 4
+	note G_, 6
+	note G_, 1
+	note G_, 1
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note_type 8, 14, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F#, 2
 
 Music_TitleScreen_branch_7e594::
 	vibrato 16, 4, 6
-	callchannel Music_TitleScreen_branch_7e622
+	sound_call Music_TitleScreen_branch_7e622
 	octave 2
-	A_ 4
-	F_ 4
-	callchannel Music_TitleScreen_branch_7e62c
+	note A_, 4
+	note F_, 4
+	sound_call Music_TitleScreen_branch_7e62c
 	octave 2
-	A_ 8
-	B_ 16
-	callchannel Music_TitleScreen_branch_7e622
+	note A_, 8
+	note B_, 16
+	sound_call Music_TitleScreen_branch_7e622
 	octave 2
-	A_ 6
-	F_ 2
-	notetype 8, 14, 7
+	note A_, 6
+	note F_, 2
+	note_type 8, 14, 7
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 4
-	notetype 12, 14, 7
-	D_ 8
-	notetype 12, 9, 5
+	note C_, 4
+	note_type 12, 14, 7
+	note D_, 8
+	note_type 12, 9, 5
 	octave 2
-	D_ 6
-	D_ 1
-	F# 1
-	G_ 16
-	callchannel Music_TitleScreen_branch_7e622
+	note D_, 6
+	note D_, 1
+	note F#, 1
+	note G_, 16
+	sound_call Music_TitleScreen_branch_7e622
 	octave 2
-	A_ 2
-	F_ 6
-	callchannel Music_TitleScreen_branch_7e62c
+	note A_, 2
+	note F_, 6
+	sound_call Music_TitleScreen_branch_7e62c
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	A_ 6
-	B_ 6
-	G_ 2
-	F_ 8
-	callchannel Music_TitleScreen_branch_7e622
-	notetype 8, 9, 5
+	note A_, 6
+	note B_, 6
+	note G_, 2
+	note F_, 8
+	sound_call Music_TitleScreen_branch_7e622
+	note_type 8, 9, 5
 	octave 2
-	G_ 4
-	F_ 5
-	A_ 3
-	notetype 8, 14, 6
+	note G_, 4
+	note F_, 5
+	note A_, 3
+	note_type 8, 14, 6
 	octave 4
-	F_ 4
-	E_ 4
-	F_ 4
-	notetype 12, 14, 7
-	G_ 6
-	A# 2
-	G_ 8
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note_type 12, 14, 7
+	note G_, 6
+	note A#, 2
+	note G_, 8
 	vibrato 16, 2, 6
-	duty 3
-	notetype 12, 0, 11
-	G_ 8
-	notetype 12, 14, 7
-	A_ 8
-	duty 1
-	notetype 12, 14, 7
-	A# 6
-	F_ 2
-	F_ 8
+	duty_cycle 3
+	note_type 12, 0, 11
+	note G_, 8
+	note_type 12, 14, 7
+	note A_, 8
+	duty_cycle 1
+	note_type 12, 14, 7
+	note A#, 6
+	note F_, 2
+	note F_, 8
 	octave 3
-	D_ 8
+	note D_, 8
 	octave 4
-	A# 4
-	B_ 4
+	note A#, 4
+	note B_, 4
 	octave 5
-	C_ 6
+	note C_, 6
 	octave 4
-	G_ 2
-	G_ 8
+	note G_, 2
+	note G_, 8
 	octave 3
-	E_ 8
-	notetype 12, 13, 7
+	note E_, 8
+	note_type 12, 13, 7
 	octave 5
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e636
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e636
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
-	notetype 8, 14, 5
+	note D_, 1
+	note_type 8, 14, 5
 	octave 5
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e636
-	D_ 1
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e636
+	note D_, 1
 	rest 2
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
-	notetype 8, 14, 3
+	note D_, 1
+	note_type 8, 14, 3
 	octave 5
-	C_ 4
-	C_ 4
+	note C_, 4
+	note C_, 4
 	octave 4
-	B_ 4
-	loopchannel 0, Music_TitleScreen_branch_7e594
+	note B_, 4
+	sound_loop 0, Music_TitleScreen_branch_7e594
 
 Music_TitleScreen_branch_7e622::
-	notetype 12, 14, 7
+	note_type 12, 14, 7
 	octave 3
-	G_ 6
-	B_ 2
+	note G_, 6
+	note B_, 2
 	octave 4
-	D_ 8
-	notetype 12, 9, 5
-	endchannel
+	note D_, 8
+	note_type 12, 9, 5
+	sound_ret
 
 Music_TitleScreen_branch_7e62c::
-	notetype 12, 14, 7
+	note_type 12, 14, 7
 	octave 4
-	F_ 6
-	E_ 1
-	D# 1
-	D_ 8
-	notetype 12, 9, 5
-	endchannel
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note_type 12, 9, 5
+	sound_ret
 
 Music_TitleScreen_branch_7e636::
-	notetype 12, 14, 1
-	D_ 1
+	note_type 12, 14, 1
+	note D_, 1
 	rest 2
 	octave 4
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
-	endchannel
+	note D_, 1
+	sound_ret
 
 
-Music_TitleScreen_Ch2::
-	notetype 12, 1, 0
+Music_TitleScreen_Ch3::
+	note_type 12, 1, 0
 	octave 3
-	G_ 1
+	note G_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 5
-	G_ 1
-	G_ 1
-	G_ 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	notetype 8, 1, 0
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	A_ 2
+	note_type 8, 1, 0
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
 
 Music_TitleScreen_branch_7e65e::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6d0
 
 Music_TitleScreen_branch_7e664::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
-	loopchannel 3, Music_TitleScreen_branch_7e664
-	callchannel Music_TitleScreen_branch_7e6c9
-	G_ 6
-	D_ 3
-	A_ 6
-	F_ 3
-	A_ 3
-	F_ 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	A# 3
-	F_ 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	B_ 3
-	G_ 3
-	callchannel Music_TitleScreen_branch_7e6dc
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6d0
+	sound_loop 3, Music_TitleScreen_branch_7e664
+	sound_call Music_TitleScreen_branch_7e6c9
+	note G_, 6
+	note D_, 3
+	note A_, 6
+	note F_, 3
+	note A_, 3
+	note F_, 3
+	sound_call Music_TitleScreen_branch_7e6d7
+	note A#, 3
+	note F_, 3
+	sound_call Music_TitleScreen_branch_7e6d7
+	note B_, 3
+	note G_, 3
+	sound_call Music_TitleScreen_branch_7e6dc
 	octave 4
-	C_ 3
+	note C_, 3
 	octave 3
-	G_ 3
-	callchannel Music_TitleScreen_branch_7e6dc
+	note G_, 3
+	sound_call Music_TitleScreen_branch_7e6dc
 	octave 4
-	C# 3
+	note C#, 3
 	octave 3
-	A_ 3
-	callchannel Music_TitleScreen_branch_7e6e5
+	note A_, 3
+	sound_call Music_TitleScreen_branch_7e6e5
 	octave 5
-	pitchbend 0, 66
-	D_ 4
+	pitch_slide 0, 66
+	note D_, 4
 	rest 4
 	octave 6
-	pitchbend 0, 50
-	D_ 4
+	pitch_slide 0, 50
+	note D_, 4
 	octave 5
-	pitchbend 0, 66
-	D_ 4
+	pitch_slide 0, 66
+	note D_, 4
 	rest 2
-	notetype 8, 1, 0
+	note_type 8, 1, 0
 	octave 4
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e6e5
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e6e5
 	octave 6
-	pitchbend 0, 50
-	D_ 4
+	pitch_slide 0, 50
+	note D_, 4
 	rest 4
 	octave 5
-	pitchbend 0, 66
-	D_ 4
+	pitch_slide 0, 66
+	note D_, 4
 	rest 6
-	notetype 8, 1, 0
+	note_type 8, 1, 0
 	octave 4
-	C_ 4
-	C_ 4
+	note C_, 4
+	note C_, 4
 	octave 3
-	B_ 4
-	loopchannel 0, Music_TitleScreen_branch_7e65e
+	note B_, 4
+	sound_loop 0, Music_TitleScreen_branch_7e65e
 
 Music_TitleScreen_branch_7e6c9::
-	G_ 6
-	D_ 3
-	G_ 6
-	D_ 3
-	G_ 3
-	D_ 3
-	endchannel
+	note G_, 6
+	note D_, 3
+	note G_, 6
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	sound_ret
 
 Music_TitleScreen_branch_7e6d0::
-	F_ 6
-	C_ 3
-	F_ 6
-	C_ 3
-	F_ 3
-	C_ 3
-	endchannel
+	note F_, 6
+	note C_, 3
+	note F_, 6
+	note C_, 3
+	note F_, 3
+	note C_, 3
+	sound_ret
 
 Music_TitleScreen_branch_7e6d7::
-	A# 6
-	F_ 3
-	A# 6
-	F_ 3
-	endchannel
+	note A#, 6
+	note F_, 3
+	note A#, 6
+	note F_, 3
+	sound_ret
 
 Music_TitleScreen_branch_7e6dc::
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 3
+	note G_, 3
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 3
-	endchannel
+	note G_, 3
+	sound_ret
 
 Music_TitleScreen_branch_7e6e5::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 4
-	D_ 1
+	note D_, 1
 	rest 5
-	endchannel
+	sound_ret
 
 
-Music_TitleScreen_Ch3::
+Music_TitleScreen_Ch4::
 	dspeed 6
 	rest 4
 	snare3 1
@@ -497,8 +497,8 @@ Music_TitleScreen_branch_7e716::
 	snare2 1
 	snare3 1
 	rest 3
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e834
 	snare2 1
 	rest 3
 	snare2 1
@@ -509,7 +509,7 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare3 1
 	snare2 1
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -520,7 +520,7 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare2 1
 	rest 1
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -535,8 +535,8 @@ Music_TitleScreen_branch_7e716::
 	snare4 1
 	snare4 1
 	dspeed 12
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -555,8 +555,8 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare3 1
 	snare2 1
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -652,7 +652,7 @@ Music_TitleScreen_branch_7e716::
 	snare2 4
 	snare3 4
 	snare2 4
-	loopchannel 0, Music_TitleScreen_branch_7e716
+	sound_loop 0, Music_TitleScreen_branch_7e716
 
 Music_TitleScreen_branch_7e834::
 	snare2 1
@@ -663,7 +663,7 @@ Music_TitleScreen_branch_7e834::
 	snare3 1
 	snare2 1
 	rest 3
-	endchannel
+	sound_ret
 
 Music_TitleScreen_branch_7e842::
 	snare2 1
@@ -674,4 +674,4 @@ Music_TitleScreen_branch_7e842::
 	snare2 1
 	snare2 1
 	rest 3
-	endchannel
+	sound_ret
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 5bd2c5f8..17e82ea9 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1,1857 +1,1857 @@
-Music_TrainerBattle_Ch0::
+Music_TrainerBattle_Ch1::
 	tempo 112
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 2
+	toggle_perfect_pitch
+	note_type 12, 11, 2
 	rest 8
 	octave 3
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	C_ 1
-	octave 2
-	B_ 1
-	octave 3
-	C_ 1
-	octave 2
-	B_ 1
-	A# 1
-	B_ 1
-	A# 1
-	A_ 1
-	A# 1
-	octave 3
-	D_ 6
-	E_ 6
-	F_ 4
-	D_ 2
-	E_ 4
-	F_ 6
-	C_ 4
-	D_ 6
-	E_ 6
-	F_ 4
-	D_ 2
-	E_ 4
-	F_ 6
-	C_ 2
-	C# 2
-	D_ 6
-	E_ 6
-	F_ 4
-	D_ 2
-	E_ 4
-	F_ 6
-	C_ 4
-	D_ 6
-	E_ 6
-	F_ 4
-	D_ 2
-	E_ 4
-	F_ 6
-	C_ 2
-	C# 2
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	octave 3
+	note D_, 6
+	note E_, 6
+	note F_, 4
+	note D_, 2
+	note E_, 4
+	note F_, 6
+	note C_, 4
+	note D_, 6
+	note E_, 6
+	note F_, 4
+	note D_, 2
+	note E_, 4
+	note F_, 6
+	note C_, 2
+	note C#, 2
+	note D_, 6
+	note E_, 6
+	note F_, 4
+	note D_, 2
+	note E_, 4
+	note F_, 6
+	note C_, 4
+	note D_, 6
+	note E_, 6
+	note F_, 4
+	note D_, 2
+	note E_, 4
+	note F_, 6
+	note C_, 2
+	note C#, 2
 
 Music_TrainerBattle_branch_22962::
-	notetype 12, 11, 5
-	D_ 2
-	E_ 4
-	C# 2
-	D_ 4
-	octave 2
-	B_ 4
-	F# 4
-	octave 3
-	E_ 2
-	D_ 4
-	C# 2
-	D_ 2
-	E_ 2
-	F_ 8
-	notetype 12, 11, 2
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C_ 1
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C_ 1
-	notetype 12, 11, 5
-	D_ 2
-	E_ 4
-	C# 2
-	D_ 4
-	octave 2
-	B_ 4
-	F# 4
-	octave 3
-	E_ 2
-	D_ 4
-	C# 2
-	octave 2
-	B_ 2
-	octave 3
-	C# 2
-	notetype 12, 10, 7
-	D_ 8
-	C# 8
-	octave 2
-	B_ 8
-	octave 3
-	C# 8
-	notetype 12, 11, 5
-	D_ 2
-	C# 2
-	octave 2
-	B_ 2
-	A_ 2
-	G_ 2
+	note_type 12, 11, 5
+	note D_, 2
+	note E_, 4
+	note C#, 2
+	note D_, 4
+	octave 2
+	note B_, 4
+	note F#, 4
+	octave 3
+	note E_, 2
+	note D_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note F_, 8
+	note_type 12, 11, 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note_type 12, 11, 5
+	note D_, 2
+	note E_, 4
+	note C#, 2
+	note D_, 4
+	octave 2
+	note B_, 4
+	note F#, 4
+	octave 3
+	note E_, 2
+	note D_, 4
+	note C#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note_type 12, 10, 7
+	note D_, 8
+	note C#, 8
+	octave 2
+	note B_, 8
+	octave 3
+	note C#, 8
+	note_type 12, 11, 5
+	note D_, 2
+	note C#, 2
+	octave 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	rest 2
 	octave 3
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	B_ 2
-	A_ 2
-	G_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	rest 2
 	octave 3
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 2
-	E_ 4
+	note C#, 2
+	note E_, 4
 	octave 2
-	G_ 1
-	A_ 1
-	B_ 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C# 1
-	D_ 4
+	note C#, 1
+	note D_, 4
 	octave 2
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C# 4
+	note C#, 4
 	octave 2
-	G_ 1
-	A_ 1
-	B_ 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	C# 1
-	D_ 4
+	note C#, 1
+	note D_, 4
 	octave 2
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 3
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	B_ 2
-	A_ 2
-	G_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
 	rest 2
 	octave 3
-	D_ 2
-	C# 2
-	octave 2
-	B_ 2
-	A_ 2
-	B_ 2
-	G_ 2
-	octave 3
-	D_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	A_ 2
+	note D_, 2
+	note C#, 2
+	octave 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	octave 3
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
 	rest 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	octave 2
-	B_ 1
-	octave 3
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	octave 3
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	octave 3
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	octave 3
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	octave 3
-	B_ 1
-	A# 1
-	B_ 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	octave 3
-	A_ 4
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	octave 3
+	note A_, 4
 	octave 4
-	D_ 4
-	octave 3
-	A_ 2
-	D_ 1
-	E_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A# 1
-	B_ 2
+	note D_, 4
+	octave 3
+	note A_, 2
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	B_ 2
-	F_ 2
-	G_ 2
-	A_ 2
+	note G_, 2
+	note B_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
 	octave 4
-	C_ 2
-	D_ 2
+	note C_, 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C_ 4
-	D_ 2
+	note C_, 4
+	note D_, 2
 	octave 3
-	F_ 1
-	G_ 1
-	A_ 1
-	B_ 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 1
-	D_ 1
-	E_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	E_ 2
+	note C_, 1
+	note D_, 1
+	note E_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
 	octave 3
-	B_ 2
-	C_ 2
+	note B_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	C_ 2
-	E_ 2
-	D_ 2
+	note C_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	D_ 2
-	F_ 2
-	C_ 2
+	note D_, 2
+	note F_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	C_ 2
+	note E_, 2
+	note C_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	C_ 2
-	E_ 2
-	D_ 2
+	note C_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
-	D_ 2
+	note F_, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	D_ 2
-	F_ 2
-	D_ 16
-	C_ 16
+	note D_, 2
+	note F_, 2
+	note D_, 16
+	note C_, 16
 	octave 2
-	A# 16
-	G_ 12
+	note A#, 16
+	note G_, 12
 	octave 3
-	D_ 1
-	E_ 1
-	G_ 1
+	note D_, 1
+	note E_, 1
+	note G_, 1
 	octave 4
-	C_ 1
-	D_ 8
-	F_ 8
+	note C_, 1
+	note D_, 8
+	note F_, 8
 	octave 3
-	A# 8
+	note A#, 8
 	octave 4
-	C_ 8
-	D_ 8
-	E_ 8
-	F_ 8
-	G_ 8
-	E_ 2
+	note C_, 8
+	note D_, 8
+	note E_, 8
+	note F_, 8
+	note G_, 8
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
 	octave 3
-	C_ 2
-	D_ 4
+	note C_, 2
+	note D_, 4
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C# 4
+	note C#, 4
 	rest 2
-	C# 1
-	D_ 1
-	E_ 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 2
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 3
-	C# 1
+	note C#, 1
 	rest 9
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
 	rest 5
-	C# 1
-	D_ 1
-	E_ 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	D_ 2
-	E_ 2
-	F_ 2
-	G_ 2
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
 	rest 9
-	F# 2
-	E_ 4
-	D# 2
-	E_ 2
-	F# 2
-	G# 2
-	E_ 8
-	F# 8
-	G_ 8
+	note F#, 2
+	note E_, 4
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note E_, 8
+	note F#, 8
+	note G_, 8
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	G_ 1
-	G# 1
-	A_ 1
-	A# 1
-	loopchannel 0, Music_TrainerBattle_branch_22962
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	sound_loop 0, Music_TrainerBattle_branch_22962
 
 
-Music_TrainerBattle_Ch1::
-	duty 3
+Music_TrainerBattle_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 4
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	A_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	A_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	A_ 1
-	D# 1
-	E_ 1
-	D# 1
-	A_ 1
-	D_ 1
-	D# 1
-	D_ 1
-	A_ 1
-	C# 1
-	D_ 1
-	C# 1
-	A_ 1
-	C_ 1
-	C# 1
-	C_ 1
-	A_ 1
-	octave 3
-	B_ 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note A_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note A_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note A_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note A_, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note A_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note A_, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note A_, 1
+	octave 3
+	note B_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	notetype 12, 14, 1
+	note B_, 1
+	note_type 12, 14, 1
 	octave 4
-	B_ 16
+	note B_, 16
 	rest 16
-	notetype 12, 13, 1
-	B_ 16
+	note_type 12, 13, 1
+	note B_, 16
 	rest 12
-	A_ 4
-	notetype 12, 12, 2
+	note A_, 4
+	note_type 12, 12, 2
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	C# 6
-	D_ 4
+	note C#, 6
+	note D_, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 4
-	D_ 6
-	A_ 2
-	A# 2
-	B_ 6
+	note C#, 4
+	note D_, 6
+	note A_, 2
+	note A#, 2
+	note B_, 6
 	octave 5
-	C# 6
-	D_ 4
+	note C#, 6
+	note D_, 4
 	octave 4
-	B_ 2
+	note B_, 2
 	octave 5
-	C# 4
-	D_ 6
+	note C#, 4
+	note D_, 6
 	octave 4
-	A_ 4
+	note A_, 4
 
 Music_TrainerBattle_branch_22bfc::
-	notetype 12, 12, 7
-	octave 3
-	B_ 6
-	F# 14
-	B_ 4
-	F# 4
-	B_ 4
-	notetype 12, 5, 0
+	note_type 12, 12, 7
+	octave 3
+	note B_, 6
+	note F#, 14
+	note B_, 4
+	note F#, 4
+	note B_, 4
+	note_type 12, 5, 0
 	octave 4
-	C_ 8
-	notetype 12, 3, 0
-	C_ 8
-	notetype 12, 4, 14
-	C_ 8
-	notetype 12, 12, 7
-	C_ 8
-	octave 3
-	B_ 6
-	F# 14
-	B_ 4
-	F# 4
-	B_ 4
-	notetype 12, 9, 0
-	A_ 8
-	notetype 12, 5, 0
-	A_ 8
-	notetype 12, 4, 0
-	A_ 8
-	notetype 12, 3, 0
-	A_ 8
-	notetype 12, 12, 7
-	G_ 16
+	note C_, 8
+	note_type 12, 3, 0
+	note C_, 8
+	note_type 12, 4, 14
+	note C_, 8
+	note_type 12, 12, 7
+	note C_, 8
+	octave 3
+	note B_, 6
+	note F#, 14
+	note B_, 4
+	note F#, 4
+	note B_, 4
+	note_type 12, 9, 0
+	note A_, 8
+	note_type 12, 5, 0
+	note A_, 8
+	note_type 12, 4, 0
+	note A_, 8
+	note_type 12, 3, 0
+	note A_, 8
+	note_type 12, 12, 7
+	note G_, 16
 	octave 4
-	D_ 8
-	octave 3
-	G_ 8
-	notetype 12, 8, 0
-	A_ 8
-	notetype 12, 5, 0
-	A_ 8
-	notetype 12, 4, 0
-	A_ 8
-	notetype 12, 6, 0
-	A_ 8
-	notetype 12, 12, 7
-	G_ 16
+	note D_, 8
+	octave 3
+	note G_, 8
+	note_type 12, 8, 0
+	note A_, 8
+	note_type 12, 5, 0
+	note A_, 8
+	note_type 12, 4, 0
+	note A_, 8
+	note_type 12, 6, 0
+	note A_, 8
+	note_type 12, 12, 7
+	note G_, 16
 	octave 4
-	E_ 8
-	F# 8
-	E_ 16
-	notetype 12, 12, 5
-	G_ 4
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 5, 0
-	F# 8
-	notetype 12, 6, 0
-	F# 8
-	notetype 12, 7, 0
-	F# 8
-	notetype 12, 10, 0
-	G_ 8
-	notetype 12, 10, 7
-	G_ 8
-	notetype 12, 11, 7
-	G_ 4
-	notetype 12, 12, 5
-	A_ 2
-	G_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	notetype 12, 10, 0
-	G# 8
-	notetype 12, 7, 0
-	G# 8
-	notetype 12, 8, 0
-	G# 8
-	notetype 12, 6, 0
-	G# 8
-	notetype 12, 10, 0
-	A_ 16
-	notetype 12, 11, 0
+	note E_, 8
+	note F#, 8
+	note E_, 16
+	note_type 12, 12, 5
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 5, 0
+	note F#, 8
+	note_type 12, 6, 0
+	note F#, 8
+	note_type 12, 7, 0
+	note F#, 8
+	note_type 12, 10, 0
+	note G_, 8
+	note_type 12, 10, 7
+	note G_, 8
+	note_type 12, 11, 7
+	note G_, 4
+	note_type 12, 12, 5
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note_type 12, 10, 0
+	note G#, 8
+	note_type 12, 7, 0
+	note G#, 8
+	note_type 12, 8, 0
+	note G#, 8
+	note_type 12, 6, 0
+	note G#, 8
+	note_type 12, 10, 0
+	note A_, 16
+	note_type 12, 11, 0
 	octave 5
-	C# 8
-	E_ 8
-	notetype 12, 12, 0
-	D_ 4
+	note C#, 8
+	note E_, 8
+	note_type 12, 12, 0
+	note D_, 4
 	octave 4
-	A_ 4
+	note A_, 4
 	octave 5
-	C_ 2
-	notetype 12, 12, 7
+	note C_, 2
+	note_type 12, 12, 7
 	octave 4
-	B_ 8
-	notetype 12, 6, 0
-	B_ 8
-	notetype 12, 6, 9
-	B_ 6
-	notetype 12, 9, 6
-	B_ 6
+	note B_, 8
+	note_type 12, 6, 0
+	note B_, 8
+	note_type 12, 6, 9
+	note B_, 6
+	note_type 12, 9, 6
+	note B_, 6
 	rest 2
-	notetype 12, 12, 0
+	note_type 12, 12, 0
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	A_ 4
-	A# 2
-	notetype 12, 11, 0
+	note A_, 4
+	note A#, 2
+	note_type 12, 11, 0
 	octave 5
-	F_ 14
-	notetype 12, 6, 0
-	G_ 16
-	notetype 12, 5, 0
-	E_ 16
-	notetype 12, 4, 0
-	E_ 16
-	notetype 12, 12, 7
+	note F_, 14
+	note_type 12, 6, 0
+	note G_, 16
+	note_type 12, 5, 0
+	note E_, 16
+	note_type 12, 4, 0
+	note E_, 16
+	note_type 12, 12, 7
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 14
+	note A_, 14
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A# 6
+	note A#, 6
 	octave 4
-	F_ 14
+	note F_, 14
 	octave 3
-	A# 4
+	note A#, 4
 	octave 4
-	F_ 4
-	D_ 4
-	C_ 6
+	note F_, 4
+	note D_, 4
+	note C_, 6
 	octave 3
-	A_ 14
+	note A_, 14
 	octave 4
-	C_ 4
-	E_ 2
-	D_ 2
-	C_ 2
-	E_ 2
-	D_ 2
-	octave 3
-	A# 4
+	note C_, 4
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	octave 3
+	note A#, 4
 	octave 4
-	F_ 10
-	G_ 6
-	F_ 6
-	D_ 4
-	notetype 12, 11, 0
-	F_ 16
-	E_ 16
-	D_ 16
-	E_ 16
-	notetype 12, 10, 0
+	note F_, 10
+	note G_, 6
+	note F_, 6
+	note D_, 4
+	note_type 12, 11, 0
+	note F_, 16
+	note E_, 16
+	note D_, 16
+	note E_, 16
+	note_type 12, 10, 0
 	octave 5
-	F_ 16
-	E_ 16
-	G_ 16
-	F_ 16
-	notetype 12, 13, 1
-	octave 3
-	A# 6
-	A# 6
-	A# 4
-	A_ 6
-	A_ 6
-	A_ 4
+	note F_, 16
+	note E_, 16
+	note G_, 16
+	note F_, 16
+	note_type 12, 13, 1
+	octave 3
+	note A#, 6
+	note A#, 6
+	note A#, 4
+	note A_, 6
+	note A_, 6
+	note A_, 4
 	octave 4
-	C_ 6
-	C_ 6
-	C_ 4
-	octave 3
-	A# 6
-	A# 6
-	A_ 4
-	notetype 12, 12, 7
-	A_ 4
-	B_ 4
-	G_ 2
-	A_ 10
-	B_ 2
+	note C_, 6
+	note C_, 6
+	note C_, 4
+	octave 3
+	note A#, 6
+	note A#, 6
+	note A_, 4
+	note_type 12, 12, 7
+	note A_, 4
+	note B_, 4
+	note G_, 2
+	note A_, 10
+	note B_, 2
 	octave 4
-	C# 2
-	E_ 2
-	D_ 2
-	C# 2
+	note C#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A# 16
+	note B_, 2
+	note A#, 16
 	rest 2
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	octave 3
-	A# 2
-	B_ 16
+	note C_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note A#, 2
+	note B_, 16
 	rest 2
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
+	note C#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 16
-	E_ 8
-	G_ 8
-	loopchannel 0, Music_TrainerBattle_branch_22bfc
+	note C_, 16
+	note E_, 8
+	note G_, 8
+	sound_loop 0, Music_TrainerBattle_branch_22bfc
 
 
-Music_TrainerBattle_Ch2::
+Music_TrainerBattle_Ch3::
 	vibrato 0, 2, 0
-	notetype 12, 1, 4
+	note_type 12, 1, 4
 	octave 3
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	C_ 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A# 1
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	A_ 2
-	A# 2
-	B_ 2
-	B_ 2
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 2
+	note A#, 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F_ 2
-	E_ 2
-	D_ 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F_ 2
-	E_ 2
-	D_ 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F_ 2
-	E_ 2
-	D_ 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	C_ 2
+	note C_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F_ 2
-	E_ 2
-	D_ 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
 	octave 2
-	B_ 2
-	B_ 2
+	note B_, 2
+	note B_, 2
 	octave 3
-	D_ 2
-	E_ 2
+	note D_, 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	C_ 2
+	note C_, 2
 
 Music_TrainerBattle_branch_22d9c::
 	octave 2
-	A# 1
-	B_ 1
+	note A#, 1
+	note B_, 1
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C_ 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	D_ 2
-	C# 2
-	D_ 2
-	C# 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	A_ 2
-	G# 2
-	G_ 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
-	G# 2
-	A_ 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
+	note G_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 2
-	G_ 2
-	G# 2
-	A_ 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	D_ 2
-	C# 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
-	D_ 2
-	E_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	F# 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	D# 2
-	F_ 2
-	G_ 2
-	F_ 2
-	D# 2
-	G_ 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	F_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 4
+	note F#, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note F#, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note D#, 2
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note D#, 2
+	note G_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 4
 	octave 2
-	A_ 4
+	note A_, 4
 	octave 3
-	C_ 2
-	G_ 2
+	note C_, 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	G_ 2
-	D_ 4
+	note G_, 2
+	note D_, 4
 	octave 2
-	A_ 4
-	A# 2
+	note A_, 4
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	F_ 4
+	note F_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	F_ 4
+	note F_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	D_ 4
+	note D_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	D_ 4
+	note D_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	F_ 4
+	note F_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	F_ 4
+	note F_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	D_ 4
+	note D_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	D_ 4
+	note D_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A# 4
+	note A#, 4
 	octave 3
-	E_ 4
+	note E_, 4
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 2
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	E_ 2
+	note E_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	F_ 2
+	note F_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	F# 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C_ 2
-	loopchannel 0, Music_TrainerBattle_branch_22d9c
+	note F#, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	sound_loop 0, Music_TrainerBattle_branch_22d9c
diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm
index fb541581..a2291a2a 100644
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -1,338 +1,338 @@
-Music_UnusedSong_Ch0::
+Music_UnusedSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 5, 1, 6
 
 Music_UnusedSong_branch_a91b::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 1
+	note D#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 8
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	D# 4
-	C# 4
-	D# 1
-	E_ 1
+	note D#, 4
+	note C#, 4
+	note D#, 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 8
-	D# 1
+	note D#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 4
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 2
+	note D#, 2
 	rest 3
 	octave 5
-	A_ 2
+	note A_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 2
+	note C#, 2
 	rest 2
-	E_ 2
-	F# 8
+	note E_, 2
+	note F#, 8
 	rest 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	rest 2
 	octave 5
-	G# 2
+	note G#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	D# 2
-	E_ 8
+	note D#, 2
+	note E_, 8
 	rest 2
-	D# 2
-	C# 2
-	D# 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
 	octave 5
-	A_ 2
-	G# 2
-	A_ 2
-	A# 1
-	B_ 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 1
+	note B_, 1
 	rest 4
-	F# 2
+	note F#, 2
 	rest 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 6
-	C_ 1
-	C# 1
+	note C_, 1
+	note C#, 1
 	rest 8
 	octave 5
-	F# 2
-	F_ 2
-	F# 2
-	G# 2
-	A_ 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	octave 6
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	loopchannel 0, Music_UnusedSong_branch_a91b
-	endchannel
+	sound_loop 0, Music_UnusedSong_branch_a91b
+	sound_ret
 
 
-Music_UnusedSong_Ch1::
+Music_UnusedSong_Ch2::
 	tempo 144
 	volume 7, 7
-	toggleperfectpitch
+	toggle_perfect_pitch
 	vibrato 6, 1, 5
 
 Music_UnusedSong_branch_a9d8::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
-	G# 1
+	note A_, 1
+	note G#, 1
 	rest 8
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
-	F# 1
+	note G#, 1
+	note F#, 1
 	rest 4
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 2
+	note D#, 2
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
-	G# 1
+	note A_, 1
+	note G#, 1
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
-	F# 1
+	note G#, 1
+	note F#, 1
 	rest 8
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 2
+	note F#, 2
 	rest 1
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	D# 8
+	note D#, 8
 	rest 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	C# 8
+	note C#, 8
 	rest 2
-	D# 2
-	C# 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	G# 1
-	F# 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 1
+	note F#, 1
 	rest 8
-	B_ 2
-	A# 2
-	B_ 2
-	A_ 1
-	G# 1
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note A_, 1
+	note G#, 1
 	rest 4
-	G# 2
-	rest 2
-	F# 2
-	F_ 2
-	F# 2
-	G# 2
-	A_ 2
-	E_ 2
-	C# 2
-	E_ 2
-	F# 2
+	note G#, 2
+	rest 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note E_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
 	rest 6
-	D# 2
+	note D#, 2
 	rest 6
-	loopchannel 0, Music_UnusedSong_branch_a9d8
-	endchannel
+	sound_loop 0, Music_UnusedSong_branch_a9d8
+	sound_ret
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index c89c9b3b..1858d138 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -1,292 +1,292 @@
-Music_Vermilion_Ch0::
+Music_Vermilion_Ch1::
 	tempo 156
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_Vermilion_branch_b9f6::
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	octave 3
-	E_ 4
-	C# 1
-	D_ 1
-	E_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	A_ 4
-	F# 1
-	G# 1
-	A_ 2
-	E_ 4
-	C# 2
-	E_ 2
-	A_ 2
-	G# 2
-	B_ 2
-	A_ 2
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
-	C# 2
-	D_ 2
-	E_ 2
-	F# 2
-	E_ 4
-	C# 1
-	D_ 1
-	E_ 2
-	A_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	A_ 4
-	F# 1
-	G# 1
-	A_ 2
-	E_ 4
-	C# 1
-	D_ 1
-	E_ 2
-	A_ 2
-	G# 2
-	F# 2
-	A_ 2
-	G# 2
-	E_ 2
-	F# 2
-	G# 2
-	F# 4
-	E_ 4
-	F# 2
-	G# 2
-	F# 2
-	A_ 2
-	G# 2
-	B_ 2
-	A_ 2
+	note E_, 4
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note A_, 4
+	note F#, 1
+	note G#, 1
+	note A_, 2
+	note E_, 4
+	note C#, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 4
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note A_, 4
+	note F#, 1
+	note G#, 1
+	note A_, 2
+	note E_, 4
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note F#, 4
+	note E_, 4
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note B_, 2
+	note A_, 2
 	octave 4
-	C# 2
-	D_ 2
-	C# 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G# 1
-	A_ 1
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G#, 1
+	note A_, 1
+	note B_, 2
 	octave 4
-	C# 2
-	E_ 2
+	note C#, 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	G# 2
+	note G#, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	F# 2
-	B_ 2
-	G# 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	B_ 2
-	loopchannel 0, Music_Vermilion_branch_b9f6
+	note F#, 2
+	note B_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note B_, 2
+	sound_loop 0, Music_Vermilion_branch_b9f6
 
 
-Music_Vermilion_Ch1::
-	duty 3
+Music_Vermilion_Ch2::
+	duty_cycle 3
 	vibrato 10, 2, 3
 
 Music_Vermilion_branch_ba66::
-	notetype 12, 12, 7
+	note_type 12, 12, 7
 	octave 3
-	A_ 8
+	note A_, 8
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 6
-	A_ 1
-	B_ 1
+	note B_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C# 8
+	note C#, 8
 	octave 3
-	A_ 8
+	note A_, 8
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	C# 1
+	note C#, 1
 	octave 3
-	B_ 1
-	A_ 8
-	A_ 8
+	note B_, 1
+	note A_, 8
+	note A_, 8
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 6
-	A_ 1
-	B_ 1
+	note B_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C# 8
+	note C#, 8
 	octave 3
-	A_ 8
+	note A_, 8
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	C# 1
+	note C#, 1
 	octave 3
-	B_ 1
-	A_ 8
-	B_ 4
+	note B_, 1
+	note A_, 8
+	note B_, 4
 	octave 4
-	C# 4
-	D_ 4
-	E_ 4
-	F# 8
-	B_ 8
-	A_ 4
-	G# 4
-	F# 4
-	E_ 4
-	F# 8
-	E_ 8
-	loopchannel 0, Music_Vermilion_branch_ba66
+	note C#, 4
+	note D_, 4
+	note E_, 4
+	note F#, 8
+	note B_, 8
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note F#, 8
+	note E_, 8
+	sound_loop 0, Music_Vermilion_branch_ba66
 
 
-Music_Vermilion_Ch2::
-	notetype 12, 1, 0
+Music_Vermilion_Ch3::
+	note_type 12, 1, 0
 
 Music_Vermilion_branch_baa8::
 	octave 4
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	G# 2
-	E_ 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	F# 2
-	E_ 2
-	G# 2
-	E_ 2
-	A_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	B_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	G# 2
-	E_ 2
-	loopchannel 0, Music_Vermilion_branch_baa8
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	sound_loop 0, Music_Vermilion_branch_baa8
 
 
-Music_Vermilion_Ch3::
+Music_Vermilion_Ch4::
 	dspeed 12
 
 Music_Vermilion_branch_bb0e::
-	callchannel Music_Vermilion_branch_bb3f
+	sound_call Music_Vermilion_branch_bb3f
 	triangle1 2
 	triangle1 1
 	triangle1 1
@@ -300,12 +300,12 @@ Music_Vermilion_branch_bb0e::
 	triangle1 1
 	triangle1 1
 	triangle1 1
-	loopchannel 4, Music_Vermilion_branch_bb0e
-	callchannel Music_Vermilion_branch_bb3f
-	callchannel Music_Vermilion_branch_bb3f
-	callchannel Music_Vermilion_branch_bb3f
-	callchannel Music_Vermilion_branch_bb3f
-	loopchannel 0, Music_Vermilion_branch_bb0e
+	sound_loop 4, Music_Vermilion_branch_bb0e
+	sound_call Music_Vermilion_branch_bb3f
+	sound_call Music_Vermilion_branch_bb3f
+	sound_call Music_Vermilion_branch_bb3f
+	sound_call Music_Vermilion_branch_bb3f
+	sound_loop 0, Music_Vermilion_branch_bb0e
 
 Music_Vermilion_branch_bb3f::
 	triangle1 2
@@ -320,4 +320,4 @@ Music_Vermilion_branch_bb3f::
 	triangle1 2
 	triangle1 1
 	triangle1 1
-	endchannel
+	sound_ret
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index e9aad529..582b55eb 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -1,738 +1,738 @@
-Music_WildBattle_Ch0::
+Music_WildBattle_Ch1::
 	tempo 104
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	A# 1
-	A_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	C_ 1
+	note C_, 1
 	octave 2
-	B_ 1
-	A# 1
-	A_ 1
-	A# 1
-	B_ 1
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
 	octave 3
-	C_ 1
-	C# 1
-	notetype 12, 11, 1
-	G_ 6
-	E_ 6
-	D# 12
-	C# 14
-	E_ 6
-	D# 10
-	notetype 12, 4, 15
-	C# 10
-	notetype 12, 11, 1
-	G_ 6
-	E_ 6
-	D# 12
-	C# 14
-	E_ 6
-	D# 10
-	C# 10
+	note C_, 1
+	note C#, 1
+	note_type 12, 11, 1
+	note G_, 6
+	note E_, 6
+	note D#, 12
+	note C#, 14
+	note E_, 6
+	note D#, 10
+	note_type 12, 4, 15
+	note C#, 10
+	note_type 12, 11, 1
+	note G_, 6
+	note E_, 6
+	note D#, 12
+	note C#, 14
+	note E_, 6
+	note D#, 10
+	note C#, 10
 
 Music_WildBattle_branch_230e0::
-	notetype 12, 11, 3
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	D_ 1
-	C# 1
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	C_ 1
+	note_type 12, 11, 3
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 2
-	B_ 1
+	note B_, 1
 	octave 3
-	C_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 1
-	C# 1
-	D_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	E_ 1
-	F_ 1
-	F# 1
-	G_ 1
-	G# 1
-	notetype 12, 11, 5
-	D_ 4
-	C_ 4
-	D_ 4
-	F_ 4
-	E_ 6
-	D_ 6
-	F_ 4
-	notetype 12, 11, 7
-	A_ 16
-	G_ 16
-	notetype 12, 11, 5
-	D_ 4
-	C_ 4
-	D_ 4
-	F_ 4
-	G_ 6
-	A_ 6
-	B_ 4
-	notetype 12, 11, 7
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note_type 12, 11, 5
+	note D_, 4
+	note C_, 4
+	note D_, 4
+	note F_, 4
+	note E_, 6
+	note D_, 6
+	note F_, 4
+	note_type 12, 11, 7
+	note A_, 16
+	note G_, 16
+	note_type 12, 11, 5
+	note D_, 4
+	note C_, 4
+	note D_, 4
+	note F_, 4
+	note G_, 6
+	note A_, 6
+	note B_, 4
+	note_type 12, 11, 7
 	octave 4
-	C_ 16
-	notetype 12, 3, 15
-	G_ 16
-	notetype 12, 11, 5
+	note C_, 16
+	note_type 12, 3, 15
+	note G_, 16
+	note_type 12, 11, 5
 	octave 3
-	C_ 12
-	C_ 2
+	note C_, 12
+	note C_, 2
 	rest 2
-	D_ 2
-	C_ 2
+	note D_, 2
+	note C_, 2
 	rest 12
-	C# 12
-	C# 2
+	note C#, 12
+	note C#, 2
 	rest 2
-	F_ 2
-	notetype 12, 10, 3
-	D# 6
-	notetype 12, 10, 7
-	C# 8
-	loopchannel 0, Music_WildBattle_branch_230e0
+	note F_, 2
+	note_type 12, 10, 3
+	note D#, 6
+	note_type 12, 10, 7
+	note C#, 8
+	sound_loop 0, Music_WildBattle_branch_230e0
 
 
-Music_WildBattle_Ch1::
-	duty 3
+Music_WildBattle_Ch2::
+	duty_cycle 3
 	vibrato 8, 2, 5
-	notetype 12, 12, 3
+	note_type 12, 12, 3
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
+	note G_, 1
 	octave 4
-	G_ 1
-	F# 1
-	F_ 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
 	octave 5
-	G_ 1
-	notetype 12, 12, 2
+	note G_, 1
+	note_type 12, 12, 2
 	octave 4
-	G_ 6
+	note G_, 6
 	octave 3
-	G_ 6
-	G_ 12
-	G_ 14
-	G_ 6
-	G_ 10
-	notetype 12, 9, 0
-	F# 10
-	notetype 12, 12, 2
-	G_ 6
-	G_ 6
-	G_ 12
-	G_ 14
-	G_ 6
-	G_ 10
-	G_ 10
+	note G_, 6
+	note G_, 12
+	note G_, 14
+	note G_, 6
+	note G_, 10
+	note_type 12, 9, 0
+	note F#, 10
+	note_type 12, 12, 2
+	note G_, 6
+	note G_, 6
+	note G_, 12
+	note G_, 14
+	note G_, 6
+	note G_, 10
+	note G_, 10
 
 Music_WildBattle_branch_23225::
-	notetype 12, 12, 5
-	G_ 6
-	F# 6
-	E_ 4
-	G_ 6
-	A_ 6
-	G_ 4
+	note_type 12, 12, 5
+	note G_, 6
+	note F#, 6
+	note E_, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
 	octave 4
-	G# 12
-	G_ 2
+	note G#, 12
+	note G_, 2
 	rest 2
-	G# 2
-	G_ 2
+	note G#, 2
+	note G_, 2
 	rest 4
-	notetype 12, 11, 7
+	note_type 12, 11, 7
 	octave 5
-	C# 8
-	notetype 12, 12, 5
+	note C#, 8
+	note_type 12, 12, 5
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A# 6
-	G# 4
+	note A#, 6
+	note G#, 4
 	octave 4
-	C# 6
-	C_ 6
+	note C#, 6
+	note C_, 6
 	octave 3
-	A# 4
+	note A#, 4
 	octave 4
-	F_ 6
-	E_ 6
-	D_ 4
-	notetype 12, 12, 7
+	note F_, 6
+	note E_, 6
+	note D_, 4
+	note_type 12, 12, 7
 	octave 3
-	A# 4
+	note A#, 4
 	octave 4
-	C_ 4
-	D_ 4
-	F_ 4
-	notetype 12, 12, 0
-	G# 16
-	notetype 12, 11, 0
-	G# 16
-	notetype 12, 4, 14
-	G_ 16
-	notetype 12, 12, 7
-	G_ 16
+	note C_, 4
+	note D_, 4
+	note F_, 4
+	note_type 12, 12, 0
+	note G#, 16
+	note_type 12, 11, 0
+	note G#, 16
+	note_type 12, 4, 14
+	note G_, 16
+	note_type 12, 12, 7
+	note G_, 16
 	octave 3
-	F_ 8
-	A# 8
+	note F_, 8
+	note A#, 8
 	octave 4
-	D_ 8
-	F_ 8
-	notetype 12, 12, 0
-	E_ 16
-	notetype 12, 12, 7
-	E_ 16
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 0
+	note E_, 16
+	note_type 12, 12, 7
+	note E_, 16
 	octave 3
-	F_ 8
-	A# 8
+	note F_, 8
+	note A#, 8
 	octave 4
-	D_ 8
-	F_ 8
-	notetype 12, 12, 0
-	G_ 16
-	notetype 12, 3, 15
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 0
+	note G_, 16
+	note_type 12, 3, 15
 	octave 5
-	C_ 16
-	notetype 12, 12, 5
+	note C_, 16
+	note_type 12, 12, 5
 	octave 4
-	E_ 12
-	E_ 2
+	note E_, 12
+	note E_, 2
 	rest 2
-	F_ 2
-	notetype 12, 12, 1
-	E_ 4
-	notetype 12, 12, 5
+	note F_, 2
+	note_type 12, 12, 1
+	note E_, 4
+	note_type 12, 12, 5
 	rest 10
-	F_ 12
-	F_ 2
+	note F_, 12
+	note F_, 2
 	rest 2
-	G# 2
-	notetype 12, 10, 3
-	G_ 6
-	notetype 12, 12, 7
-	F_ 8
-	loopchannel 0, Music_WildBattle_branch_23225
+	note G#, 2
+	note_type 12, 10, 3
+	note G_, 6
+	note_type 12, 12, 7
+	note F_, 8
+	sound_loop 0, Music_WildBattle_branch_23225
 
 
-Music_WildBattle_Ch2::
+Music_WildBattle_Ch3::
 	vibrato 0, 2, 0
-	notetype 12, 1, 1
+	note_type 12, 1, 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	C# 1
-	C_ 1
-	D_ 1
+	note C#, 1
+	note C_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	C_ 1
-	D# 1
+	note D_, 1
+	note C_, 1
+	note D#, 1
 	rest 1
-	D# 1
-	C_ 1
-	E_ 1
+	note D#, 1
+	note C_, 1
+	note E_, 1
 	rest 1
-	E_ 1
-	C_ 1
-	F_ 1
+	note E_, 1
+	note C_, 1
+	note F_, 1
 	rest 1
-	F_ 1
-	C_ 1
-	F# 1
+	note F_, 1
+	note C_, 1
+	note F#, 1
 	rest 1
-	F# 1
-	C_ 1
-	G_ 1
+	note F#, 1
+	note C_, 1
+	note G_, 1
 	rest 1
-	G_ 1
-	C_ 1
+	note G_, 1
+	note C_, 1
 	octave 3
-	A# 2
-	B_ 2
+	note A#, 2
+	note B_, 2
 
 Music_WildBattle_branch_232b5::
 	octave 4
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C# 2
-	G# 2
-	C# 4
-	G# 2
-	A# 2
-	G# 2
-	G_ 2
-	C# 2
-	G# 2
-	C# 4
-	G# 2
-	A# 2
-	G# 2
-	F_ 2
-	loopchannel 2, Music_WildBattle_branch_232b5
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 4
+	note G#, 2
+	note A#, 2
+	note G#, 2
+	note G_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 4
+	note G#, 2
+	note A#, 2
+	note G#, 2
+	note F_, 2
+	sound_loop 2, Music_WildBattle_branch_232b5
 
 Music_WildBattle_branch_232d8::
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	G# 12
-	G_ 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note G#, 12
+	note G_, 2
 	rest 2
-	G# 2
-	G_ 2
+	note G#, 2
+	note G_, 2
 	rest 4
-	F_ 2
-	E_ 2
-	D_ 2
-	C# 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	F_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	F_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C_ 2
-	G_ 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	C# 2
-	G# 2
-	loopchannel 0, Music_WildBattle_branch_232d8
+	note F_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C_, 2
+	note G_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note G#, 2
+	sound_loop 0, Music_WildBattle_branch_232d8
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm
index c904a18a..ef909832 100644
--- a/audio/sfx/59_1.asm
+++ b/audio/sfx/59_1.asm
@@ -1,11 +1,11 @@
-SFX_59_1_Ch4:
-	duty 2
-	squarenote 4, 15, 1, 1920
-	endchannel
+SFX_59_1_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 1, 1920
+	sound_ret
 
 
-SFX_59_1_Ch5:
-	duty 2
-	squarenote 1, 0, 8, 0
-	squarenote 4, 10, 1, 1889
-	endchannel
+SFX_59_1_Ch6:
+	duty_cycle 2
+	square_note 1, 0, 8, 0
+	square_note 4, 10, 1, 1889
+	sound_ret
diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm
index 7331f973..7510842f 100644
--- a/audio/sfx/59_3.asm
+++ b/audio/sfx/59_3.asm
@@ -1,11 +1,11 @@
-SFX_59_3_Ch4:
-	duty 2
-	squarenote 4, 15, 1, 1920
-	endchannel
+SFX_59_3_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 1, 1920
+	sound_ret
 
 
-SFX_59_3_Ch5:
-	duty 2
-	squarenote 1, 0, 8, 0
-	squarenote 4, 10, 1, 1889
-	endchannel
+SFX_59_3_Ch6:
+	duty_cycle 2
+	square_note 1, 0, 8, 0
+	square_note 4, 10, 1, 1889
+	sound_ret
diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm
index 0d45f451..0ab4cbe2 100644
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,6 +1,6 @@
-SFX_Arrow_Tiles_1_Ch4:
-	duty 0
-	pitchenvelope 1, 7
-	squarenote 15, 13, 2, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Arrow_Tiles_1_Ch5:
+	duty_cycle 0
+	pitch_sweep 1, 7
+	square_note 15, 13, 2, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm
index 2ee03ec0..787e431d 100644
--- a/audio/sfx/arrow_tiles_3.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,6 +1,6 @@
-SFX_Arrow_Tiles_3_Ch4:
-	duty 0
-	pitchenvelope 1, 7
-	squarenote 15, 13, 2, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Arrow_Tiles_3_Ch5:
+	duty_cycle 0
+	pitch_sweep 1, 7
+	square_note 15, 13, 2, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm
index c3fefdd2..9503c570 100644
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,11 +1,11 @@
-SFX_Ball_Poof_Ch4:
-	duty 2
-	pitchenvelope 1, 6
-	squarenote 15, 15, 2, 1024
-	pitchenvelope 0, 0
-	endchannel
+SFX_Ball_Poof_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 6
+	square_note 15, 15, 2, 1024
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Ball_Poof_Ch7:
-	noisenote 15, 10, 2, 34
-	endchannel
+SFX_Ball_Poof_Ch8:
+	noise_note 15, 10, 2, 34
+	sound_ret
diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm
index e4518dfc..207bf720 100644
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,11 +1,11 @@
-SFX_Ball_Toss_Ch4:
-	duty 2
-	pitchenvelope 2, -7
-	squarenote 15, 15, 2, 1920
-	endchannel
+SFX_Ball_Toss_Ch5:
+	duty_cycle 2
+	pitch_sweep 2, -7
+	square_note 15, 15, 2, 1920
+	sound_ret
 
 
-SFX_Ball_Toss_Ch5:
-	duty 2
-	squarenote 15, 12, 2, 1922
-	endchannel
+SFX_Ball_Toss_Ch6:
+	duty_cycle 2
+	square_note 15, 12, 2, 1922
+	sound_ret
diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm
index 2ab97942..ef3cf017 100644
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,6 +1,6 @@
-SFX_Battle_09_Ch4:
-	duty 1
-	pitchenvelope 9, 7
-	squarenote 15, 15, 2, 1280
-	pitchenvelope 0, 0
-	endchannel
+SFX_Battle_09_Ch5:
+	duty_cycle 1
+	pitch_sweep 9, 7
+	square_note 15, 15, 2, 1280
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm
index 06e2fa14..e60fe9c7 100644
--- a/audio/sfx/battle_0b.asm
+++ b/audio/sfx/battle_0b.asm
@@ -1,3 +1,3 @@
-SFX_Battle_0B_Ch7:
-	noisenote 8, 15, 1, 84
-	endchannel
+SFX_Battle_0B_Ch8:
+	noise_note 8, 15, 1, 84
+	sound_ret
diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm
index 67e910eb..285e0d52 100644
--- a/audio/sfx/battle_0c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,5 +1,5 @@
-SFX_Battle_0C_Ch7:
-	noisenote 15, 8, -7, 17
-	noisenote 4, 15, -7, 18
-	noisenote 10, 15, 1, 85
-	endchannel
+SFX_Battle_0C_Ch8:
+	noise_note 15, 8, -7, 17
+	noise_note 4, 15, -7, 18
+	noise_note 10, 15, 1, 85
+	sound_ret
diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm
index 231d324f..293d9743 100644
--- a/audio/sfx/battle_0d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,5 +1,5 @@
-SFX_Battle_0D_Ch7:
-	noisenote 15, 8, -7, 52
-	noisenote 8, 15, 2, 53
-	noisenote 10, 15, 1, 85
-	endchannel
+SFX_Battle_0D_Ch8:
+	noise_note 15, 8, -7, 52
+	noise_note 8, 15, 2, 53
+	noise_note 10, 15, 1, 85
+	sound_ret
diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm
index eb67a126..39d971c9 100644
--- a/audio/sfx/battle_0e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,4 +1,4 @@
-SFX_Battle_0E_Ch7:
-	noisenote 15, 9, -7, 35
-	noisenote 8, 15, 1, 33
-	endchannel
+SFX_Battle_0E_Ch8:
+	noise_note 15, 9, -7, 35
+	noise_note 8, 15, 1, 33
+	sound_ret
diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm
index 26386131..ae81e747 100644
--- a/audio/sfx/battle_0f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,6 +1,6 @@
-SFX_Battle_0F_Ch7:
-	noisenote 2, 14, 1, 75
-	noisenote 10, 15, 1, 68
-	noisenote 2, 14, 1, 58
-	noisenote 6, 15, 1, 52
-	endchannel
+SFX_Battle_0F_Ch8:
+	noise_note 2, 14, 1, 75
+	noise_note 10, 15, 1, 68
+	noise_note 2, 14, 1, 58
+	noise_note 6, 15, 1, 52
+	sound_ret
diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm
index 86d5a815..7a092bd3 100644
--- a/audio/sfx/battle_12.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,6 +1,6 @@
-SFX_Battle_12_Ch7:
-	noisenote 8, 4, -7, 35
-	noisenote 4, 12, 4, 34
-	noisenote 6, 15, 2, 35
-	loopchannel 4, SFX_Battle_12_Ch7
-	endchannel
+SFX_Battle_12_Ch8:
+	noise_note 8, 4, -7, 35
+	noise_note 4, 12, 4, 34
+	noise_note 6, 15, 2, 35
+	sound_loop 4, SFX_Battle_12_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm
index 882be8c7..0f910cec 100644
--- a/audio/sfx/battle_13.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,6 +1,6 @@
-SFX_Battle_13_Ch7:
-	noisenote 8, 4, -7, 51
-	noisenote 4, 12, 4, 34
-	noisenote 6, 15, 2, 35
-	noisenote 15, 15, 2, 34
-	endchannel
+SFX_Battle_13_Ch8:
+	noise_note 8, 4, -7, 51
+	noise_note 4, 12, 4, 34
+	noise_note 6, 15, 2, 35
+	noise_note 15, 15, 2, 34
+	sound_ret
diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm
index 97a88b95..7c3a7c68 100644
--- a/audio/sfx/battle_14.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,6 +1,6 @@
-SFX_Battle_14_Ch7:
-	noisenote 8, 15, -7, 50
-	noisenote 8, 15, 4, 67
-	noisenote 8, 15, 2, 84
-	noisenote 8, 15, 1, 101
-	endchannel
+SFX_Battle_14_Ch8:
+	noise_note 8, 15, -7, 50
+	noise_note 8, 15, 4, 67
+	noise_note 8, 15, 2, 84
+	noise_note 8, 15, 1, 101
+	sound_ret
diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm
index daa614cd..6e162cce 100644
--- a/audio/sfx/battle_16.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,5 +1,5 @@
-SFX_Battle_16_Ch7:
-	noisenote 1, 9, 4, 35
-	noisenote 1, 11, 4, 34
-	noisenote 8, 15, 1, 68
-	endchannel
+SFX_Battle_16_Ch8:
+	noise_note 1, 9, 4, 35
+	noise_note 1, 11, 4, 34
+	noise_note 8, 15, 1, 68
+	sound_ret
diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm
index b6cc787e..f863f8ee 100644
--- a/audio/sfx/battle_17.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,6 +1,6 @@
-SFX_Battle_17_Ch7:
-	noisenote 2, 9, 4, 51
-	noisenote 4, 11, 4, 34
-	noisenote 4, 15, 1, 68
-	noisenote 8, 15, 1, 85
-	endchannel
+SFX_Battle_17_Ch8:
+	noise_note 2, 9, 4, 51
+	noise_note 4, 11, 4, 34
+	noise_note 4, 15, 1, 68
+	noise_note 8, 15, 1, 85
+	sound_ret
diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm
index ced87cd8..f8ece58e 100644
--- a/audio/sfx/battle_18.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,4 +1,4 @@
-SFX_Battle_18_Ch7:
-	noisenote 4, 15, -7, 85
-	noisenote 8, 15, 1, 101
-	endchannel
+SFX_Battle_18_Ch8:
+	noise_note 4, 15, -7, 85
+	noise_note 8, 15, 1, 101
+	sound_ret
diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm
index 53de4341..a7cf5292 100644
--- a/audio/sfx/battle_19.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,5 +1,5 @@
-SFX_Battle_19_Ch7:
-	noisenote 2, 8, 4, 67
-	noisenote 2, 12, 4, 34
-	noisenote 8, 15, 2, 52
-	endchannel
+SFX_Battle_19_Ch8:
+	noise_note 2, 8, 4, 67
+	noise_note 2, 12, 4, 34
+	noise_note 8, 15, 2, 52
+	sound_ret
diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm
index 06c2b6f1..16ea584d 100644
--- a/audio/sfx/battle_1b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,4 +1,4 @@
-SFX_Battle_1B_Ch7:
-	noisenote 2, 15, 1, 34
-	noisenote 15, 15, 2, 18
-	endchannel
+SFX_Battle_1B_Ch8:
+	noise_note 2, 15, 1, 34
+	noise_note 15, 15, 2, 18
+	sound_ret
diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm
index 7518acd9..3045576b 100644
--- a/audio/sfx/battle_1c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,5 +1,5 @@
-SFX_Battle_1C_Ch7:
-	noisenote 2, 12, 2, 1
-	noisenote 15, 15, 4, 1
-	noisenote 15, 15, 2, 1
-	endchannel
+SFX_Battle_1C_Ch8:
+	noise_note 2, 12, 2, 1
+	noise_note 15, 15, 4, 1
+	noise_note 15, 15, 2, 1
+	sound_ret
diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm
index e924414a..ff4b0cbc 100644
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,16 +1,16 @@
-SFX_Battle_1E_Ch4:
-	duty 0
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 512
-	pitchenvelope 2, 2
-	squarenote 8, 14, 2, 512
-	pitchenvelope 0, 0
-	endchannel
+SFX_Battle_1E_Ch5:
+	duty_cycle 0
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 512
+	pitch_sweep 2, 2
+	square_note 8, 14, 2, 512
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Battle_1E_Ch7:
-	noisenote 0, 13, 1, 66
-	noisenote 4, 10, 1, 50
-	noisenote 0, 13, 1, 34
-	noisenote 6, 10, 1, 50
-	endchannel
+SFX_Battle_1E_Ch8:
+	noise_note 0, 13, 1, 66
+	noise_note 4, 10, 1, 50
+	noise_note 0, 13, 1, 34
+	noise_note 6, 10, 1, 50
+	sound_ret
diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm
index 4e5687d8..b73b0a8f 100644
--- a/audio/sfx/battle_20.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,4 +1,4 @@
-SFX_Battle_20_Ch7:
-	noisenote 12, 15, 1, 84
-	noisenote 8, 15, 1, 100
-	endchannel
+SFX_Battle_20_Ch8:
+	noise_note 12, 15, 1, 84
+	noise_note 8, 15, 1, 100
+	sound_ret
diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm
index 616b0c42..fc1b1186 100644
--- a/audio/sfx/battle_21.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,7 +1,7 @@
-SFX_Battle_21_Ch7:
-	noisenote 2, 15, 1, 51
-	noisenote 2, 12, 1, 50
-	noisenote 2, 10, 1, 49
-	noisenote 15, 8, 2, 50
-	noisenote 8, 15, 1, 52
-	endchannel
+SFX_Battle_21_Ch8:
+	noise_note 2, 15, 1, 51
+	noise_note 2, 12, 1, 50
+	noise_note 2, 10, 1, 49
+	noise_note 15, 8, 2, 50
+	noise_note 8, 15, 1, 52
+	sound_ret
diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm
index e19417e0..3c42996e 100644
--- a/audio/sfx/battle_22.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,4 +1,4 @@
-SFX_Battle_22_Ch7:
-	noisenote 2, 13, 2, 50
-	noisenote 15, 15, 2, 67
-	endchannel
+SFX_Battle_22_Ch8:
+	noise_note 2, 13, 2, 50
+	noise_note 15, 15, 2, 67
+	sound_ret
diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm
index febce65a..bf546248 100644
--- a/audio/sfx/battle_23.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,7 +1,7 @@
-SFX_Battle_23_Ch7:
-	noisenote 2, 15, 2, 67
-	noisenote 4, 11, 5, 50
-	noisenote 9, 8, 6, 49
-	noisenote 7, 6, 4, 0
-	noisenote 15, 15, 2, 85
-	endchannel
+SFX_Battle_23_Ch8:
+	noise_note 2, 15, 2, 67
+	noise_note 4, 11, 5, 50
+	noise_note 9, 8, 6, 49
+	noise_note 7, 6, 4, 0
+	noise_note 15, 15, 2, 85
+	sound_ret
diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm
index 5a9ab9ca..5b6c8e56 100644
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,12 +1,12 @@
-SFX_Battle_24_Ch4:
-	duty 1
-	pitchenvelope 9, 7
-	squarenote 15, 15, 2, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Battle_24_Ch5:
+	duty_cycle 1
+	pitch_sweep 9, 7
+	square_note 15, 15, 2, 1792
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Battle_24_Ch7:
-	noisenote 15, 3, -7, 34
-	noisenote 15, 15, 2, 33
-	endchannel
+SFX_Battle_24_Ch8:
+	noise_note 15, 3, -7, 34
+	noise_note 15, 15, 2, 33
+	sound_ret
diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm
index 1d50b391..54623b5f 100644
--- a/audio/sfx/battle_25.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,7 +1,7 @@
-SFX_Battle_25_Ch7:
-	noisenote 15, 4, -7, 65
-	noisenote 8, 8, -7, 65
-	noisenote 8, 12, -7, 65
-	noisenote 8, 15, 2, 66
-	noisenote 15, 15, 2, 65
-	endchannel
+SFX_Battle_25_Ch8:
+	noise_note 15, 4, -7, 65
+	noise_note 8, 8, -7, 65
+	noise_note 8, 12, -7, 65
+	noise_note 8, 15, 2, 66
+	noise_note 15, 15, 2, 65
+	sound_ret
diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm
index 0c0e21ae..f3baea99 100644
--- a/audio/sfx/battle_26.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,9 +1,9 @@
-SFX_Battle_26_Ch7:
-	noisenote 10, 15, -7, 80
-	noisenote 15, 15, -7, 81
-	noisenote 8, 15, 2, 81
-	noisenote 6, 15, -7, 82
-	noisenote 6, 15, -7, 83
-	noisenote 8, 15, -7, 84
-	noisenote 15, 15, 2, 84
-	endchannel
+SFX_Battle_26_Ch8:
+	noise_note 10, 15, -7, 80
+	noise_note 15, 15, -7, 81
+	noise_note 8, 15, 2, 81
+	noise_note 6, 15, -7, 82
+	noise_note 6, 15, -7, 83
+	noise_note 8, 15, -7, 84
+	noise_note 15, 15, 2, 84
+	sound_ret
diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm
index 4e02cfe9..19ce5bf7 100644
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,27 +1,27 @@
-SFX_Battle_27_Ch4:
-	duty 2
-	squarenote 15, 3, -7, 1984
+SFX_Battle_27_Ch5:
+	duty_cycle 2
+	square_note 15, 3, -7, 1984
 
 SFX_Battle_27_branch_2062a:
-	squarenote 15, 13, -7, 1984
-	loopchannel 4, SFX_Battle_27_branch_2062a
-	squarenote 15, 13, 1, 1984
-	endchannel
+	square_note 15, 13, -7, 1984
+	sound_loop 4, SFX_Battle_27_branch_2062a
+	square_note 15, 13, 1, 1984
+	sound_ret
 
 
-SFX_Battle_27_Ch5:
-	dutycycle 179
-	squarenote 15, 2, -7, 1992
+SFX_Battle_27_Ch6:
+	duty_cycle_pattern 179
+	square_note 15, 2, -7, 1992
 
 SFX_Battle_27_branch_2063d:
-	squarenote 15, 12, -7, 1991
-	loopchannel 4, SFX_Battle_27_branch_2063d
-	squarenote 15, 12, 1, 1992
-	endchannel
+	square_note 15, 12, -7, 1991
+	sound_loop 4, SFX_Battle_27_branch_2063d
+	square_note 15, 12, 1, 1992
+	sound_ret
 
 
-SFX_Battle_27_Ch7:
-	noisenote 3, 9, 7, 18
-	noisenote 3, 10, 1, 17
-	loopchannel 10, SFX_Battle_27_Ch7
-	endchannel
+SFX_Battle_27_Ch8:
+	noise_note 3, 9, 7, 18
+	noise_note 3, 10, 1, 17
+	sound_loop 10, SFX_Battle_27_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm
index c2f0c511..38646a09 100644
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,21 +1,21 @@
-SFX_Battle_28_Ch4:
-	duty 0
-	squarenote 0, 15, 1, 1984
-	squarenote 0, 15, 1, 1792
-	loopchannel 12, SFX_Battle_28_Ch4
-	endchannel
+SFX_Battle_28_Ch5:
+	duty_cycle 0
+	square_note 0, 15, 1, 1984
+	square_note 0, 15, 1, 1792
+	sound_loop 12, SFX_Battle_28_Ch5
+	sound_ret
 
 
-SFX_Battle_28_Ch5:
-	dutycycle 179
-	squarenote 0, 14, 1, 1985
-	squarenote 0, 14, 1, 1793
-	loopchannel 12, SFX_Battle_28_Ch5
-	endchannel
+SFX_Battle_28_Ch6:
+	duty_cycle_pattern 179
+	square_note 0, 14, 1, 1985
+	square_note 0, 14, 1, 1793
+	sound_loop 12, SFX_Battle_28_Ch6
+	sound_ret
 
 
-SFX_Battle_28_Ch7:
-	noisenote 1, 13, 1, 73
-	noisenote 1, 13, 1, 41
-	loopchannel 6, SFX_Battle_28_Ch7
-	endchannel
+SFX_Battle_28_Ch8:
+	noise_note 1, 13, 1, 73
+	noise_note 1, 13, 1, 41
+	sound_loop 6, SFX_Battle_28_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm
index 534826fe..f0d27ca7 100644
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,18 +1,18 @@
-SFX_Battle_29_Ch4:
-	dutycycle 201
-	squarenote 11, 15, 3, 288
-	squarenote 9, 13, 3, 336
-	loopchannel 5, SFX_Battle_29_Ch4
-	squarenote 8, 14, 3, 304
-	squarenote 15, 12, 2, 272
-	endchannel
+SFX_Battle_29_Ch5:
+	duty_cycle_pattern 201
+	square_note 11, 15, 3, 288
+	square_note 9, 13, 3, 336
+	sound_loop 5, SFX_Battle_29_Ch5
+	square_note 8, 14, 3, 304
+	square_note 15, 12, 2, 272
+	sound_ret
 
 
-SFX_Battle_29_Ch7:
-	noisenote 10, 15, 3, 53
-	noisenote 14, 15, 6, 69
-	loopchannel 4, SFX_Battle_29_Ch7
-	noisenote 12, 15, 4, 188
-	noisenote 12, 15, 5, 156
-	noisenote 15, 15, 4, 172
-	endchannel
+SFX_Battle_29_Ch8:
+	noise_note 10, 15, 3, 53
+	noise_note 14, 15, 6, 69
+	sound_loop 4, SFX_Battle_29_Ch8
+	noise_note 12, 15, 4, 188
+	noise_note 12, 15, 5, 156
+	noise_note 15, 15, 4, 172
+	sound_ret
diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm
index f4986805..ea4196a8 100644
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,28 +1,28 @@
-SFX_Battle_2A_Ch4:
-	dutycycle 57
-	squarenote 4, 15, 4, 1536
-	squarenote 3, 12, 4, 1280
-	squarenote 5, 11, 5, 1536
-	squarenote 13, 14, 2, 1728
-	loopchannel 3, SFX_Battle_2A_Ch4
-	squarenote 8, 13, 1, 1536
-	endchannel
+SFX_Battle_2A_Ch5:
+	duty_cycle_pattern 57
+	square_note 4, 15, 4, 1536
+	square_note 3, 12, 4, 1280
+	square_note 5, 11, 5, 1536
+	square_note 13, 14, 2, 1728
+	sound_loop 3, SFX_Battle_2A_Ch5
+	square_note 8, 13, 1, 1536
+	sound_ret
 
 
-SFX_Battle_2A_Ch5:
-	dutycycle 141
-	squarenote 5, 14, 4, 1504
-	squarenote 4, 11, 4, 1248
-	squarenote 6, 10, 5, 1512
-	squarenote 14, 13, 1, 1696
-	loopchannel 3, SFX_Battle_2A_Ch5
-	endchannel
+SFX_Battle_2A_Ch6:
+	duty_cycle_pattern 141
+	square_note 5, 14, 4, 1504
+	square_note 4, 11, 4, 1248
+	square_note 6, 10, 5, 1512
+	square_note 14, 13, 1, 1696
+	sound_loop 3, SFX_Battle_2A_Ch6
+	sound_ret
 
 
-SFX_Battle_2A_Ch7:
-	noisenote 5, 12, 3, 51
-	noisenote 3, 9, 2, 67
-	noisenote 10, 11, 5, 51
-	noisenote 15, 12, 3, 50
-	loopchannel 2, SFX_Battle_2A_Ch7
-	endchannel
+SFX_Battle_2A_Ch8:
+	noise_note 5, 12, 3, 51
+	noise_note 3, 9, 2, 67
+	noise_note 10, 11, 5, 51
+	noise_note 15, 12, 3, 50
+	sound_loop 2, SFX_Battle_2A_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm
index 418ab5cb..b9b20d1d 100644
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,21 +1,21 @@
-SFX_Battle_2B_Ch4:
-	dutycycle 210
-	squarenote 3, 8, 1, 768
-	squarenote 3, 12, 1, 1024
-	squarenote 3, 15, 1, 1280
-	squarenote 3, 11, 1, 1024
-	squarenote 3, 7, 1, 768
-	loopchannel 5, SFX_Battle_2B_Ch4
-	squarenote 8, 8, 1, 1024
-	endchannel
+SFX_Battle_2B_Ch5:
+	duty_cycle_pattern 210
+	square_note 3, 8, 1, 768
+	square_note 3, 12, 1, 1024
+	square_note 3, 15, 1, 1280
+	square_note 3, 11, 1, 1024
+	square_note 3, 7, 1, 768
+	sound_loop 5, SFX_Battle_2B_Ch5
+	square_note 8, 8, 1, 1024
+	sound_ret
 
 
-SFX_Battle_2B_Ch7:
-	noisenote 3, 6, 2, 34
-	noisenote 3, 10, 2, 50
-	noisenote 3, 13, 2, 51
-	noisenote 3, 9, 2, 35
-	noisenote 3, 5, 2, 18
-	loopchannel 5, SFX_Battle_2B_Ch7
-	noisenote 8, 8, 1, 18
-	endchannel
+SFX_Battle_2B_Ch8:
+	noise_note 3, 6, 2, 34
+	noise_note 3, 10, 2, 50
+	noise_note 3, 13, 2, 51
+	noise_note 3, 9, 2, 35
+	noise_note 3, 5, 2, 18
+	sound_loop 5, SFX_Battle_2B_Ch8
+	noise_note 8, 8, 1, 18
+	sound_ret
diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm
index aedb91bd..c6d47413 100644
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,25 +1,25 @@
-SFX_Battle_2C_Ch4:
-	dutycycle 57
-	squarenote 15, 15, 4, 1280
-	squarenote 15, 12, 4, 1024
-	squarenote 15, 14, 2, 1472
-	loopchannel 3, SFX_Battle_2C_Ch4
-	endchannel
+SFX_Battle_2C_Ch5:
+	duty_cycle_pattern 57
+	square_note 15, 15, 4, 1280
+	square_note 15, 12, 4, 1024
+	square_note 15, 14, 2, 1472
+	sound_loop 3, SFX_Battle_2C_Ch5
+	sound_ret
 
 
-SFX_Battle_2C_Ch5:
-	dutycycle 141
-	squarenote 7, 14, 4, 1072
-	squarenote 15, 11, 4, 816
-	squarenote 15, 10, 2, 1080
-	loopchannel 4, SFX_Battle_2C_Ch5
-	endchannel
+SFX_Battle_2C_Ch6:
+	duty_cycle_pattern 141
+	square_note 7, 14, 4, 1072
+	square_note 15, 11, 4, 816
+	square_note 15, 10, 2, 1080
+	sound_loop 4, SFX_Battle_2C_Ch6
+	sound_ret
 
 
-SFX_Battle_2C_Ch7:
-	noisenote 9, 15, 4, 68
-	noisenote 9, 15, 2, 67
-	noisenote 15, 15, 4, 66
-	noisenote 15, 15, 4, 65
-	loopchannel 3, SFX_Battle_2C_Ch7
-	endchannel
+SFX_Battle_2C_Ch8:
+	noise_note 9, 15, 4, 68
+	noise_note 9, 15, 2, 67
+	noise_note 15, 15, 4, 66
+	noise_note 15, 15, 4, 65
+	sound_loop 3, SFX_Battle_2C_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm
index ca1afc42..c509b8d5 100644
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,27 +1,27 @@
-SFX_Battle_2E_Ch4:
-	duty 0
-	squarenote 2, 15, 1, 512
-	squarenote 3, 15, 1, 1792
-	squarenote 4, 15, 1, 1280
-	squarenote 5, 15, 1, 2032
-	loopchannel 8, SFX_Battle_2E_Ch4
-	endchannel
+SFX_Battle_2E_Ch5:
+	duty_cycle 0
+	square_note 2, 15, 1, 512
+	square_note 3, 15, 1, 1792
+	square_note 4, 15, 1, 1280
+	square_note 5, 15, 1, 2032
+	sound_loop 8, SFX_Battle_2E_Ch5
+	sound_ret
 
 
-SFX_Battle_2E_Ch5:
-	dutycycle 179
-	squarenote 2, 14, 1, 770
-	squarenote 3, 14, 1, 2034
-	squarenote 4, 14, 1, 1538
-	squarenote 5, 14, 1, 1794
-	loopchannel 8, SFX_Battle_2E_Ch5
-	endchannel
+SFX_Battle_2E_Ch6:
+	duty_cycle_pattern 179
+	square_note 2, 14, 1, 770
+	square_note 3, 14, 1, 2034
+	square_note 4, 14, 1, 1538
+	square_note 5, 14, 1, 1794
+	sound_loop 8, SFX_Battle_2E_Ch6
+	sound_ret
 
 
-SFX_Battle_2E_Ch7:
-	noisenote 2, 13, 3, 16
-	noisenote 3, 13, 3, 17
-	noisenote 2, 13, 2, 16
-	noisenote 5, 13, 2, 18
-	loopchannel 9, SFX_Battle_2E_Ch7
-	endchannel
+SFX_Battle_2E_Ch8:
+	noise_note 2, 13, 3, 16
+	noise_note 3, 13, 3, 17
+	noise_note 2, 13, 2, 16
+	noise_note 5, 13, 2, 18
+	sound_loop 9, SFX_Battle_2E_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm
index d8c2bd91..a3138abb 100644
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,21 +1,21 @@
-SFX_Battle_2F_Ch4:
-	dutycycle 43
-	squarenote 3, 15, 1, 2032
-	squarenote 4, 15, 2, 512
-	loopchannel 8, SFX_Battle_2F_Ch4
-	endchannel
+SFX_Battle_2F_Ch5:
+	duty_cycle_pattern 43
+	square_note 3, 15, 1, 2032
+	square_note 4, 15, 2, 512
+	sound_loop 8, SFX_Battle_2F_Ch5
+	sound_ret
 
 
-SFX_Battle_2F_Ch5:
-	dutycycle 179
-	squarenote 4, 14, 2, 514
-	squarenote 4, 14, 1, 2018
-	loopchannel 9, SFX_Battle_2F_Ch5
-	endchannel
+SFX_Battle_2F_Ch6:
+	duty_cycle_pattern 179
+	square_note 4, 14, 2, 514
+	square_note 4, 14, 1, 2018
+	sound_loop 9, SFX_Battle_2F_Ch6
+	sound_ret
 
 
-SFX_Battle_2F_Ch7:
-	noisenote 4, 15, -7, 67
-	noisenote 4, 15, 2, 68
-	loopchannel 9, SFX_Battle_2F_Ch7
-	endchannel
+SFX_Battle_2F_Ch8:
+	noise_note 4, 15, -7, 67
+	noise_note 4, 15, 2, 68
+	sound_loop 9, SFX_Battle_2F_Ch8
+	sound_ret
diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm
index ee1cc671..83dc96f4 100644
--- a/audio/sfx/battle_31.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,18 +1,18 @@
-SFX_Battle_31_Ch4:
-	duty 2
-	squarenote 15, 15, -7, 2016
-	squarenote 15, 15, -7, 2016
-	squarenote 15, 15, -7, 2016
-	squarenote 15, 15, -7, 2016
-	squarenote 15, 15, 2, 2016
-	endchannel
+SFX_Battle_31_Ch5:
+	duty_cycle 2
+	square_note 15, 15, -7, 2016
+	square_note 15, 15, -7, 2016
+	square_note 15, 15, -7, 2016
+	square_note 15, 15, -7, 2016
+	square_note 15, 15, 2, 2016
+	sound_ret
 
 
-SFX_Battle_31_Ch5:
-	duty 3
-	squarenote 15, 15, -7, 2018
-	squarenote 15, 15, -7, 2017
-	squarenote 15, 15, -7, 2018
-	squarenote 15, 15, -7, 2017
-	squarenote 15, 15, 2, 2018
-	endchannel
+SFX_Battle_31_Ch6:
+	duty_cycle 3
+	square_note 15, 15, -7, 2018
+	square_note 15, 15, -7, 2017
+	square_note 15, 15, -7, 2018
+	square_note 15, 15, -7, 2017
+	square_note 15, 15, 2, 2018
+	sound_ret
diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm
index 92ea4661..53dfac32 100644
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,12 +1,12 @@
-SFX_Battle_32_Ch4:
-	duty 2
-	pitchenvelope 10, -7
-	squarenote 8, 15, 1, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Battle_32_Ch5:
+	duty_cycle 2
+	pitch_sweep 10, -7
+	square_note 8, 15, 1, 1792
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Battle_32_Ch5:
-	duty 3
-	squarenote 8, 15, 1, 1793
-	endchannel
+SFX_Battle_32_Ch6:
+	duty_cycle 3
+	square_note 8, 15, 1, 1793
+	sound_ret
diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm
index 5eee7b32..95afe045 100644
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,18 +1,18 @@
-SFX_Battle_33_Ch4:
-	duty 2
-	squarenote 6, 15, 1, 1280
-	squarenote 6, 15, 1, 1408
-	squarenote 6, 15, 1, 1536
-	squarenote 6, 15, 1, 1664
-	squarenote 8, 15, 1, 1792
-	endchannel
+SFX_Battle_33_Ch5:
+	duty_cycle 2
+	square_note 6, 15, 1, 1280
+	square_note 6, 15, 1, 1408
+	square_note 6, 15, 1, 1536
+	square_note 6, 15, 1, 1664
+	square_note 8, 15, 1, 1792
+	sound_ret
 
 
-SFX_Battle_33_Ch5:
-	duty 3
-	squarenote 6, 14, 1, 1296
-	squarenote 6, 14, 1, 1424
-	squarenote 6, 14, 1, 1552
-	squarenote 6, 14, 1, 1680
-	squarenote 8, 14, 1, 1808
-	endchannel
+SFX_Battle_33_Ch6:
+	duty_cycle 3
+	square_note 6, 14, 1, 1296
+	square_note 6, 14, 1, 1424
+	square_note 6, 14, 1, 1552
+	square_note 6, 14, 1, 1680
+	square_note 8, 14, 1, 1808
+	sound_ret
diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm
index af9d5b65..4abbdbc3 100644
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,22 +1,22 @@
-SFX_Battle_34_Ch4:
-	dutycycle 237
-	squarenote 8, 15, -7, 1016
-	squarenote 15, 15, -7, 1024
-	squarenote 15, 15, 3, 1024
-	endchannel
+SFX_Battle_34_Ch5:
+	duty_cycle_pattern 237
+	square_note 8, 15, -7, 1016
+	square_note 15, 15, -7, 1024
+	square_note 15, 15, 3, 1024
+	sound_ret
 
 
-SFX_Battle_34_Ch5:
-	dutycycle 180
-	squarenote 8, 14, -7, 960
-	squarenote 15, 14, -7, 960
-	squarenote 15, 14, 3, 960
-	endchannel
+SFX_Battle_34_Ch6:
+	duty_cycle_pattern 180
+	square_note 8, 14, -7, 960
+	square_note 15, 14, -7, 960
+	square_note 15, 14, 3, 960
+	sound_ret
 
 
-SFX_Battle_34_Ch7:
-	noisenote 4, 15, -7, 81
-	noisenote 8, 15, -7, 84
-	noisenote 15, 15, -7, 85
-	noisenote 15, 15, 3, 86
-	endchannel
+SFX_Battle_34_Ch8:
+	noise_note 4, 15, -7, 81
+	noise_note 8, 15, -7, 84
+	noise_note 15, 15, -7, 85
+	noise_note 15, 15, 3, 86
+	sound_ret
diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm
index 7ce3afb4..e9f78657 100644
--- a/audio/sfx/battle_35.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,29 +1,29 @@
-SFX_Battle_35_Ch4:
-	executemusic
+SFX_Battle_35_Ch5:
+	execute_music
 	vibrato 10, 2, 4
-	duty 2
-	notetype 10, 8, 7
+	duty_cycle 2
+	note_type 10, 8, 7
 	octave 5
-	G# 8
+	note G#, 8
 	octave 6
-	F# 4
-	E_ 4
+	note F#, 4
+	note E_, 4
 	octave 5
-	G# 8
-	endchannel
+	note G#, 8
+	sound_ret
 
 
-SFX_Battle_35_Ch5:
-	executemusic
+SFX_Battle_35_Ch6:
+	execute_music
 	vibrato 10, 2, 3
-	duty 2
-	notetype 11, 6, 7
+	duty_cycle 2
+	note_type 11, 6, 7
 	octave 5
-	G# 8
-	notetype 10, 6, 7
+	note G#, 8
+	note_type 10, 6, 7
 	octave 6
-	F# 4
-	E_ 4
+	note F#, 4
+	note E_, 4
 	octave 5
-	G# 8
-	endchannel
+	note G#, 8
+	sound_ret
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm
index 9d00fad9..2fd40bd3 100644
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,47 +1,47 @@
-SFX_Battle_36_Ch4:
-	duty 0
-	squarenote 2, 15, 1, 1920
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 1936
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 1952
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 1968
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 1984
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 2000
+SFX_Battle_36_Ch5:
+	duty_cycle 0
+	square_note 2, 15, 1, 1920
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 1936
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 1952
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 1968
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 1984
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 2000
 
 SFX_Battle_36_branch_20930:
-	squarenote 2, 15, 1, 1792
-	squarenote 2, 15, 1, 2016
-	loopchannel 12, SFX_Battle_36_branch_20930
-	squarenote 15, 15, 1, 1792
-	endchannel
+	square_note 2, 15, 1, 1792
+	square_note 2, 15, 1, 2016
+	sound_loop 12, SFX_Battle_36_branch_20930
+	square_note 15, 15, 1, 1792
+	sound_ret
 
 
-SFX_Battle_36_Ch5:
-	dutycycle 179
-	squarenote 2, 15, 1, 1921
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 1937
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 1953
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 1969
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 1985
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 2001
-	squarenote 2, 15, 1, 1793
-	squarenote 2, 15, 1, 2017
-	loopchannel 12, SFX_Battle_36_branch_20930
-	squarenote 15, 15, 1, 1793
-	endchannel
+SFX_Battle_36_Ch6:
+	duty_cycle_pattern 179
+	square_note 2, 15, 1, 1921
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 1937
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 1953
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 1969
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 1985
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 2001
+	square_note 2, 15, 1, 1793
+	square_note 2, 15, 1, 2017
+	sound_loop 12, SFX_Battle_36_branch_20930
+	square_note 15, 15, 1, 1793
+	sound_ret
 
 
-SFX_Battle_36_Ch7:
-	noisenote 1, 13, 1, 73
-	noisenote 1, 13, 1, 41
-	loopchannel 26, SFX_Battle_36_Ch7
-	endchannel
+SFX_Battle_36_Ch8:
+	noise_note 1, 13, 1, 73
+	noise_note 1, 13, 1, 41
+	sound_loop 26, SFX_Battle_36_Ch8
+	sound_ret
diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm
index b844a54a..3fe278f3 100644
--- a/audio/sfx/caught_mon.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,61 +1,61 @@
-SFX_Caught_Mon_Ch4:
-	executemusic
+SFX_Caught_Mon_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 6, 11, 2
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 6, 11, 2
 	octave 3
-	E_ 2
-	F# 2
-	G# 2
-	G# 1
-	G# 1
-	B_ 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	D# 1
-	D# 1
-	notetype 6, 11, 5
-	E_ 8
-	endchannel
+	note C#, 2
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	note_type 6, 11, 5
+	note E_, 8
+	sound_ret
 
 
-SFX_Caught_Mon_Ch5:
-	executemusic
-	duty 2
-	notetype 6, 12, 2
+SFX_Caught_Mon_Ch6:
+	execute_music
+	duty_cycle 2
+	note_type 6, 12, 2
 	octave 4
-	G# 2
-	G# 1
-	G# 1
-	E_ 2
-	E_ 1
-	E_ 1
-	B_ 2
-	B_ 1
-	B_ 1
-	A_ 2
-	A_ 1
-	A_ 1
-	notetype 6, 12, 5
-	G# 8
-	endchannel
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note E_, 2
+	note E_, 1
+	note E_, 1
+	note B_, 2
+	note B_, 1
+	note B_, 1
+	note A_, 2
+	note A_, 1
+	note A_, 1
+	note_type 6, 12, 5
+	note G#, 8
+	sound_ret
 
 
-SFX_Caught_Mon_Ch6:
-	executemusic
-	notetype 6, 1, 0
+SFX_Caught_Mon_Ch7:
+	execute_music
+	note_type 6, 1, 0
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 5
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	F# 2
-	G_ 2
-	G# 4
-	endchannel
+	note F#, 2
+	note G_, 2
+	note G#, 4
+	sound_ret
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
index a58adb8a..a6303265 100644
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,6 +1,6 @@
-SFX_Collision_1_Ch4:
-	duty 2
-	pitchenvelope 5, -2
-	squarenote 15, 15, 1, 768
-	pitchenvelope 0, 0
-	endchannel
+SFX_Collision_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 5, -2
+	square_note 15, 15, 1, 768
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm
index 60e8cde3..ae68314a 100644
--- a/audio/sfx/collision_3.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,6 +1,6 @@
-SFX_Collision_3_Ch4:
-	duty 2
-	pitchenvelope 5, -2
-	squarenote 15, 15, 1, 768
-	pitchenvelope 0, 0
-	endchannel
+SFX_Collision_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 5, -2
+	square_note 15, 15, 1, 768
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm
index c0c128c0..087ea06f 100644
--- a/audio/sfx/cry00_1.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_1_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_1_Ch5:
+	duty_cycle_pattern 245
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_1_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_1_Ch6:
+	duty_cycle_pattern 160
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_1_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_1_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm
index f9f104c0..0469948a 100644
--- a/audio/sfx/cry00_2.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_2_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_2_Ch5:
+	duty_cycle_pattern 245
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_2_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_2_Ch6:
+	duty_cycle_pattern 160
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_2_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_2_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm
index 3956e46c..f0389adf 100644
--- a/audio/sfx/cry00_3.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_3_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_3_Ch5:
+	duty_cycle_pattern 245
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_3_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_3_Ch6:
+	duty_cycle_pattern 160
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_3_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_3_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm
index 24ebcbc6..4f4ec4fa 100644
--- a/audio/sfx/cry01_1.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_1_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_1_Ch5:
+	duty_cycle_pattern 160
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_1_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_1_Ch6:
+	duty_cycle_pattern 90
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_1_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_1_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm
index e226ed44..55be1d01 100644
--- a/audio/sfx/cry01_2.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_2_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_2_Ch5:
+	duty_cycle_pattern 160
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_2_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_2_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_2_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm
index 43cf91df..f89ed321 100644
--- a/audio/sfx/cry01_3.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_3_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_3_Ch5:
+	duty_cycle_pattern 160
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_3_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_3_Ch6:
+	duty_cycle_pattern 90
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_3_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_3_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm
index 1cc710d2..c1eeac36 100644
--- a/audio/sfx/cry02_1.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_1_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_1_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_1_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_1_Ch6:
+	duty_cycle_pattern 165
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_1_Ch7:
-	endchannel
+SFX_Cry02_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm
index 6e9ff69f..f3718e57 100644
--- a/audio/sfx/cry02_2.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_2_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_2_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_2_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_2_Ch6:
+	duty_cycle_pattern 165
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_2_Ch7:
-	endchannel
+SFX_Cry02_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm
index 9f369ad7..2334ae7f 100644
--- a/audio/sfx/cry02_3.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_3_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_3_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_3_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_3_Ch6:
+	duty_cycle_pattern 165
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_3_Ch7:
-	endchannel
+SFX_Cry02_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm
index 5039203d..5cb3de34 100644
--- a/audio/sfx/cry03_1.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_1_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_1_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_1_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm
index 54375387..208492c1 100644
--- a/audio/sfx/cry03_2.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_2_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_2_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_2_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm
index 83e1bdd1..11ed4afa 100644
--- a/audio/sfx/cry03_3.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_3_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_3_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_3_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm
index c99f9582..7099c7cb 100644
--- a/audio/sfx/cry04_1.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_1_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_1_Ch6:
+	duty_cycle_pattern 90
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_1_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_1_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm
index def5b459..f2f2a0c7 100644
--- a/audio/sfx/cry04_2.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_2_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_2_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_2_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm
index 83e81ead..9e155fb4 100644
--- a/audio/sfx/cry04_3.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_3_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_3_Ch6:
+	duty_cycle_pattern 90
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_3_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_3_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm
index 525fdc2d..8db2db6a 100644
--- a/audio/sfx/cry05_1.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_1_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_1_Ch5:
+	duty_cycle_pattern 10
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_1_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_1_Ch6:
+	duty_cycle_pattern 245
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_1_Ch7:
-	endchannel
+SFX_Cry05_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm
index 44e8fb21..d9fe5208 100644
--- a/audio/sfx/cry05_2.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_2_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_2_Ch5:
+	duty_cycle_pattern 10
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_2_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_2_Ch6:
+	duty_cycle_pattern 245
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_2_Ch7:
-	endchannel
+SFX_Cry05_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm
index 2fcb4e1f..57479f06 100644
--- a/audio/sfx/cry05_3.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_3_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_3_Ch5:
+	duty_cycle_pattern 10
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_3_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_3_Ch6:
+	duty_cycle_pattern 245
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_3_Ch7:
-	endchannel
+SFX_Cry05_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm
index 09099504..5b184121 100644
--- a/audio/sfx/cry06_1.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_1_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_1_Ch5:
+	duty_cycle_pattern 250
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_1_Ch5:
-	endchannel
+SFX_Cry06_1_Ch6:
+	sound_ret
 
 
-SFX_Cry06_1_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_1_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm
index 75ca8228..3d32921b 100644
--- a/audio/sfx/cry06_2.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_2_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_2_Ch5:
+	duty_cycle_pattern 250
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_2_Ch5:
-	endchannel
+SFX_Cry06_2_Ch6:
+	sound_ret
 
 
-SFX_Cry06_2_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_2_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm
index 760ca4f1..c847b1ab 100644
--- a/audio/sfx/cry06_3.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_3_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_3_Ch5:
+	duty_cycle_pattern 250
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_3_Ch5:
-	endchannel
+SFX_Cry06_3_Ch6:
+	sound_ret
 
 
-SFX_Cry06_3_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_3_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm
index 8a736136..5918d4d8 100644
--- a/audio/sfx/cry07_1.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_1_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_1_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_1_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm
index 8ccba10c..fcd82c8d 100644
--- a/audio/sfx/cry07_2.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_2_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_2_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_2_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm
index bb90a016..a92dd02b 100644
--- a/audio/sfx/cry07_3.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_3_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_3_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_3_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm
index 18d324f4..044f4add 100644
--- a/audio/sfx/cry08_1.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_1_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_1_Ch6:
+	duty_cycle_pattern 90
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_1_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_1_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm
index 809ab706..50da09d9 100644
--- a/audio/sfx/cry08_2.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_2_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_2_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_2_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm
index 37e83796..b18c8b75 100644
--- a/audio/sfx/cry08_3.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_3_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_3_Ch6:
+	duty_cycle_pattern 90
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_3_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_3_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm
index 8b0178d6..02206052 100644
--- a/audio/sfx/cry09_1.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 165
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_1_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_1_Ch6:
+	duty_cycle_pattern 5
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 95
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_1_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_1_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm
index 378c07bd..545a77cc 100644
--- a/audio/sfx/cry09_2.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 165
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_2_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_2_Ch6:
+	duty_cycle_pattern 5
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 95
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_2_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_2_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm
index 7bf098b1..d842066c 100644
--- a/audio/sfx/cry09_3.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 165
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_3_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_3_Ch6:
+	duty_cycle_pattern 5
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 95
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_3_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_3_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm
index 45b293ca..fa1a0c31 100644
--- a/audio/sfx/cry0a_1.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_1_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_1_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_1_Ch6:
+	duty_cycle_pattern 5
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_1_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_1_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm
index a4d3b839..af07ff25 100644
--- a/audio/sfx/cry0a_2.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_2_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_2_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_2_Ch6:
+	duty_cycle_pattern 5
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_2_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_2_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm
index 5c6617fb..f0bb527a 100644
--- a/audio/sfx/cry0a_3.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_3_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_3_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_3_Ch6:
+	duty_cycle_pattern 5
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_3_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_3_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm
index ba8e1e1b..9b2104aa 100644
--- a/audio/sfx/cry0b_1.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_1_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_1_Ch5:
+	duty_cycle_pattern 204
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_1_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_1_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_1_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_1_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm
index 9cbf1ee5..37e17243 100644
--- a/audio/sfx/cry0b_2.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_2_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_2_Ch5:
+	duty_cycle_pattern 204
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_2_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_2_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_2_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_2_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm
index 559fbbe0..9e788f53 100644
--- a/audio/sfx/cry0b_3.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_3_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_3_Ch5:
+	duty_cycle_pattern 204
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_3_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_3_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_3_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_3_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm
index 25246488..67f30936 100644
--- a/audio/sfx/cry0c_1.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_1_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_1_Ch5:
+	duty_cycle_pattern 204
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_1_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_1_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_1_Ch7:
-	endchannel
+SFX_Cry0C_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm
index e94609c9..dd1a90c1 100644
--- a/audio/sfx/cry0c_2.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_2_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_2_Ch5:
+	duty_cycle_pattern 204
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_2_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_2_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_2_Ch7:
-	endchannel
+SFX_Cry0C_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm
index ac5296c6..024bab85 100644
--- a/audio/sfx/cry0c_3.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_3_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_3_Ch5:
+	duty_cycle_pattern 204
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_3_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_3_Ch6:
+	duty_cycle_pattern 68
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_3_Ch7:
-	endchannel
+SFX_Cry0C_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm
index 9403af3a..ac9963f2 100644
--- a/audio/sfx/cry0d_1.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_1_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_1_Ch4
-	endchannel
+SFX_Cry0D_1_Ch5:
+	duty_cycle_pattern 136
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_1_Ch5
+	sound_ret
 
 
-SFX_Cry0D_1_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_1_Ch6:
+	duty_cycle_pattern 64
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_1_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_1_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm
index 9d570892..8c6dd050 100644
--- a/audio/sfx/cry0d_2.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_2_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_2_Ch4
-	endchannel
+SFX_Cry0D_2_Ch5:
+	duty_cycle_pattern 136
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_2_Ch5
+	sound_ret
 
 
-SFX_Cry0D_2_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_2_Ch6:
+	duty_cycle_pattern 64
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_2_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_2_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm
index 18125238..487faa53 100644
--- a/audio/sfx/cry0d_3.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_3_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_3_Ch4
-	endchannel
+SFX_Cry0D_3_Ch5:
+	duty_cycle_pattern 136
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_3_Ch5
+	sound_ret
 
 
-SFX_Cry0D_3_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_3_Ch6:
+	duty_cycle_pattern 64
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_3_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_3_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm
index c5a166b7..3067b15a 100644
--- a/audio/sfx/cry0e_1.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_1_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_1_Ch5:
+	duty_cycle_pattern 165
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_1_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_1_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_1_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm
index 943b12f4..b3849fc5 100644
--- a/audio/sfx/cry0e_2.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_2_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_2_Ch5:
+	duty_cycle_pattern 165
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_2_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_2_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_2_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm
index c500b326..493f91e2 100644
--- a/audio/sfx/cry0e_3.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_3_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_3_Ch5:
+	duty_cycle_pattern 165
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_3_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_3_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_3_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm
index e959205e..9dbef1fb 100644
--- a/audio/sfx/cry0f_1.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_1_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_1_Ch5:
+	duty_cycle_pattern 241
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_1_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_1_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_1_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_1_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm
index dc052645..7de545a4 100644
--- a/audio/sfx/cry0f_2.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_2_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_2_Ch5:
+	duty_cycle_pattern 241
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_2_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_2_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_2_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_2_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm
index 2705d73d..0d3d68b0 100644
--- a/audio/sfx/cry0f_3.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_3_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_3_Ch5:
+	duty_cycle_pattern 241
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_3_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_3_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_3_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_3_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm
index 95c72f8a..bcaa75ac 100644
--- a/audio/sfx/cry10_1.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_1_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_1_Ch5:
+	duty_cycle_pattern 201
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_1_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_1_Ch6:
+	duty_cycle_pattern 121
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_1_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_1_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm
index 569e50e2..12c8322e 100644
--- a/audio/sfx/cry10_2.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_2_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_2_Ch5:
+	duty_cycle_pattern 201
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_2_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_2_Ch6:
+	duty_cycle_pattern 121
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_2_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_2_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm
index 1ac5776b..ac7b4655 100644
--- a/audio/sfx/cry10_3.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_3_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_3_Ch5:
+	duty_cycle_pattern 201
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_3_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_3_Ch6:
+	duty_cycle_pattern 121
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_3_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_3_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm
index 5af0fef3..5616317e 100644
--- a/audio/sfx/cry11_1.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_1_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_1_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_1_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_1_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm
index 6000549a..9ff4396d 100644
--- a/audio/sfx/cry11_2.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_2_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_2_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_2_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_2_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm
index c877f28a..43b95fe8 100644
--- a/audio/sfx/cry11_3.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_3_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_3_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_3_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_3_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm
index a453a110..c87d178d 100644
--- a/audio/sfx/cry12_1.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry12_1_Ch4:
-	dutycycle 165
-	squarenote 12, 15, 2, 1088
-	squarenote 15, 14, 3, 1184
-	squarenote 4, 13, 2, 1168
-	squarenote 8, 13, 1, 1152
-	endchannel
+SFX_Cry12_1_Ch5:
+	duty_cycle_pattern 165
+	square_note 12, 15, 2, 1088
+	square_note 15, 14, 3, 1184
+	square_note 4, 13, 2, 1168
+	square_note 8, 13, 1, 1152
+	sound_ret
 
 
-SFX_Cry12_1_Ch5:
-	dutycycle 238
-	squarenote 11, 13, 2, 1080
-	squarenote 14, 12, 6, 1176
-	squarenote 3, 11, 2, 1160
-	squarenote 8, 11, 1, 1144
-	endchannel
+SFX_Cry12_1_Ch6:
+	duty_cycle_pattern 238
+	square_note 11, 13, 2, 1080
+	square_note 14, 12, 6, 1176
+	square_note 3, 11, 2, 1160
+	square_note 8, 11, 1, 1144
+	sound_ret
 
 
-SFX_Cry12_1_Ch7:
-	noisenote 10, 14, 6, 108
-	noisenote 15, 13, 2, 92
-	noisenote 3, 12, 2, 108
-	noisenote 8, 13, 1, 92
-	endchannel
+SFX_Cry12_1_Ch8:
+	noise_note 10, 14, 6, 108
+	noise_note 15, 13, 2, 92
+	noise_note 3, 12, 2, 108
+	noise_note 8, 13, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm
index 4f3d39e4..921b27be 100644
--- a/audio/sfx/cry12_2.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry12_2_Ch4:
-	dutycycle 165
-	squarenote 12, 15, 2, 1088
-	squarenote 15, 14, 3, 1184
-	squarenote 4, 13, 2, 1168
-	squarenote 8, 13, 1, 1152
-	endchannel
+SFX_Cry12_2_Ch5:
+	duty_cycle_pattern 165
+	square_note 12, 15, 2, 1088
+	square_note 15, 14, 3, 1184
+	square_note 4, 13, 2, 1168
+	square_note 8, 13, 1, 1152
+	sound_ret
 
 
-SFX_Cry12_2_Ch5:
-	dutycycle 238
-	squarenote 11, 13, 2, 1080
-	squarenote 14, 12, 6, 1176
-	squarenote 3, 11, 2, 1160
-	squarenote 8, 11, 1, 1144
-	endchannel
+SFX_Cry12_2_Ch6:
+	duty_cycle_pattern 238
+	square_note 11, 13, 2, 1080
+	square_note 14, 12, 6, 1176
+	square_note 3, 11, 2, 1160
+	square_note 8, 11, 1, 1144
+	sound_ret
 
 
-SFX_Cry12_2_Ch7:
-	noisenote 10, 14, 6, 108
-	noisenote 15, 13, 2, 92
-	noisenote 3, 12, 2, 108
-	noisenote 8, 13, 1, 92
-	endchannel
+SFX_Cry12_2_Ch8:
+	noise_note 10, 14, 6, 108
+	noise_note 15, 13, 2, 92
+	noise_note 3, 12, 2, 108
+	noise_note 8, 13, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm
index 033b02bb..98569ea8 100644
--- a/audio/sfx/cry12_3.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry12_3_Ch4:
-	dutycycle 165
-	squarenote 12, 15, 2, 1088
-	squarenote 15, 14, 3, 1184
-	squarenote 4, 13, 2, 1168
-	squarenote 8, 13, 1, 1152
-	endchannel
+SFX_Cry12_3_Ch5:
+	duty_cycle_pattern 165
+	square_note 12, 15, 2, 1088
+	square_note 15, 14, 3, 1184
+	square_note 4, 13, 2, 1168
+	square_note 8, 13, 1, 1152
+	sound_ret
 
 
-SFX_Cry12_3_Ch5:
-	dutycycle 238
-	squarenote 11, 13, 2, 1080
-	squarenote 14, 12, 6, 1176
-	squarenote 3, 11, 2, 1160
-	squarenote 8, 11, 1, 1144
-	endchannel
+SFX_Cry12_3_Ch6:
+	duty_cycle_pattern 238
+	square_note 11, 13, 2, 1080
+	square_note 14, 12, 6, 1176
+	square_note 3, 11, 2, 1160
+	square_note 8, 11, 1, 1144
+	sound_ret
 
 
-SFX_Cry12_3_Ch7:
-	noisenote 10, 14, 6, 108
-	noisenote 15, 13, 2, 92
-	noisenote 3, 12, 2, 108
-	noisenote 8, 13, 1, 92
-	endchannel
+SFX_Cry12_3_Ch8:
+	noise_note 10, 14, 6, 108
+	noise_note 15, 13, 2, 92
+	noise_note 3, 12, 2, 108
+	noise_note 8, 13, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm
index 67db31fe..6392f327 100644
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry13_1_Ch4:
-	dutycycle 51
-	squarenote 15, 15, 6, 1472
-	squarenote 8, 14, 3, 1468
-	squarenote 6, 13, 2, 1488
-	squarenote 6, 11, 2, 1504
-	squarenote 6, 12, 2, 1520
-	squarenote 8, 11, 1, 1536
-	endchannel
+SFX_Cry13_1_Ch5:
+	duty_cycle_pattern 51
+	square_note 15, 15, 6, 1472
+	square_note 8, 14, 3, 1468
+	square_note 6, 13, 2, 1488
+	square_note 6, 11, 2, 1504
+	square_note 6, 12, 2, 1520
+	square_note 8, 11, 1, 1536
+	sound_ret
 
 
-SFX_Cry13_1_Ch5:
-	dutycycle 153
-	squarenote 14, 12, 6, 1201
-	squarenote 7, 12, 3, 1197
-	squarenote 5, 11, 2, 1217
-	squarenote 8, 9, 2, 1233
-	squarenote 6, 10, 2, 1249
-	squarenote 8, 9, 1, 1265
-	endchannel
+SFX_Cry13_1_Ch6:
+	duty_cycle_pattern 153
+	square_note 14, 12, 6, 1201
+	square_note 7, 12, 3, 1197
+	square_note 5, 11, 2, 1217
+	square_note 8, 9, 2, 1233
+	square_note 6, 10, 2, 1249
+	square_note 8, 9, 1, 1265
+	sound_ret
 
 
-SFX_Cry13_1_Ch7:
-	noisenote 10, 14, 6, 92
-	noisenote 10, 13, 6, 108
-	noisenote 4, 12, 2, 76
-	noisenote 6, 13, 3, 92
-	noisenote 8, 11, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry13_1_Ch8:
+	noise_note 10, 14, 6, 92
+	noise_note 10, 13, 6, 108
+	noise_note 4, 12, 2, 76
+	noise_note 6, 13, 3, 92
+	noise_note 8, 11, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm
index f1262bdc..0247bc39 100644
--- a/audio/sfx/cry13_2.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry13_2_Ch4:
-	dutycycle 51
-	squarenote 15, 15, 6, 1472
-	squarenote 8, 14, 3, 1468
-	squarenote 6, 13, 2, 1488
-	squarenote 6, 11, 2, 1504
-	squarenote 6, 12, 2, 1520
-	squarenote 8, 11, 1, 1536
-	endchannel
+SFX_Cry13_2_Ch5:
+	duty_cycle_pattern 51
+	square_note 15, 15, 6, 1472
+	square_note 8, 14, 3, 1468
+	square_note 6, 13, 2, 1488
+	square_note 6, 11, 2, 1504
+	square_note 6, 12, 2, 1520
+	square_note 8, 11, 1, 1536
+	sound_ret
 
 
-SFX_Cry13_2_Ch5:
-	dutycycle 153
-	squarenote 14, 12, 6, 1201
-	squarenote 7, 12, 3, 1197
-	squarenote 5, 11, 2, 1217
-	squarenote 8, 9, 2, 1233
-	squarenote 6, 10, 2, 1249
-	squarenote 8, 9, 1, 1265
-	endchannel
+SFX_Cry13_2_Ch6:
+	duty_cycle_pattern 153
+	square_note 14, 12, 6, 1201
+	square_note 7, 12, 3, 1197
+	square_note 5, 11, 2, 1217
+	square_note 8, 9, 2, 1233
+	square_note 6, 10, 2, 1249
+	square_note 8, 9, 1, 1265
+	sound_ret
 
 
-SFX_Cry13_2_Ch7:
-	noisenote 10, 14, 6, 92
-	noisenote 10, 13, 6, 108
-	noisenote 4, 12, 2, 76
-	noisenote 6, 13, 3, 92
-	noisenote 8, 11, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry13_2_Ch8:
+	noise_note 10, 14, 6, 92
+	noise_note 10, 13, 6, 108
+	noise_note 4, 12, 2, 76
+	noise_note 6, 13, 3, 92
+	noise_note 8, 11, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm
index f81dbe29..99871861 100644
--- a/audio/sfx/cry13_3.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,30 +1,30 @@
-SFX_Cry13_3_Ch4:
-	dutycycle 51
-	squarenote 15, 15, 6, 1472
-	squarenote 8, 14, 3, 1468
-	squarenote 6, 13, 2, 1488
-	squarenote 6, 11, 2, 1504
-	squarenote 6, 12, 2, 1520
-	squarenote 8, 11, 1, 1536
-	endchannel
+SFX_Cry13_3_Ch5:
+	duty_cycle_pattern 51
+	square_note 15, 15, 6, 1472
+	square_note 8, 14, 3, 1468
+	square_note 6, 13, 2, 1488
+	square_note 6, 11, 2, 1504
+	square_note 6, 12, 2, 1520
+	square_note 8, 11, 1, 1536
+	sound_ret
 
 
-SFX_Cry13_3_Ch5:
-	dutycycle 153
-	squarenote 14, 12, 6, 1201
-	squarenote 7, 12, 3, 1197
-	squarenote 5, 11, 2, 1217
-	squarenote 8, 9, 2, 1233
-	squarenote 6, 10, 2, 1249
-	squarenote 8, 9, 1, 1265
-	endchannel
+SFX_Cry13_3_Ch6:
+	duty_cycle_pattern 153
+	square_note 14, 12, 6, 1201
+	square_note 7, 12, 3, 1197
+	square_note 5, 11, 2, 1217
+	square_note 8, 9, 2, 1233
+	square_note 6, 10, 2, 1249
+	square_note 8, 9, 1, 1265
+	sound_ret
 
 
-SFX_Cry13_3_Ch7:
-	noisenote 10, 14, 6, 92
-	noisenote 10, 13, 6, 108
-	noisenote 4, 12, 2, 76
-	noisenote 6, 13, 3, 92
-	noisenote 8, 11, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry13_3_Ch8:
+	noise_note 10, 14, 6, 92
+	noise_note 10, 13, 6, 108
+	noise_note 4, 12, 2, 76
+	noise_note 6, 13, 3, 92
+	noise_note 8, 11, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm
index b066f5fc..99d8d8d3 100644
--- a/audio/sfx/cry14_1.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry14_1_Ch4:
-	dutycycle 240
-	squarenote 8, 14, 4, 1936
-	squarenote 15, 15, 5, 1984
-	squarenote 8, 13, 1, 2008
-	endchannel
+SFX_Cry14_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 14, 4, 1936
+	square_note 15, 15, 5, 1984
+	square_note 8, 13, 1, 2008
+	sound_ret
 
 
-SFX_Cry14_1_Ch5:
-	dutycycle 165
-	squarenote 10, 12, 4, 1905
-	squarenote 15, 11, 6, 1954
-	squarenote 8, 10, 1, 1975
-	endchannel
+SFX_Cry14_1_Ch6:
+	duty_cycle_pattern 165
+	square_note 10, 12, 4, 1905
+	square_note 15, 11, 6, 1954
+	square_note 8, 10, 1, 1975
+	sound_ret
 
 
-SFX_Cry14_1_Ch7:
-	noisenote 8, 14, 4, 76
-	noisenote 14, 12, 4, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry14_1_Ch8:
+	noise_note 8, 14, 4, 76
+	noise_note 14, 12, 4, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm
index 36c8e5aa..28062bc7 100644
--- a/audio/sfx/cry14_2.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry14_2_Ch4:
-	dutycycle 240
-	squarenote 8, 14, 4, 1936
-	squarenote 15, 15, 5, 1984
-	squarenote 8, 13, 1, 2008
-	endchannel
+SFX_Cry14_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 14, 4, 1936
+	square_note 15, 15, 5, 1984
+	square_note 8, 13, 1, 2008
+	sound_ret
 
 
-SFX_Cry14_2_Ch5:
-	dutycycle 165
-	squarenote 10, 12, 4, 1905
-	squarenote 15, 11, 6, 1954
-	squarenote 8, 10, 1, 1975
-	endchannel
+SFX_Cry14_2_Ch6:
+	duty_cycle_pattern 165
+	square_note 10, 12, 4, 1905
+	square_note 15, 11, 6, 1954
+	square_note 8, 10, 1, 1975
+	sound_ret
 
 
-SFX_Cry14_2_Ch7:
-	noisenote 8, 14, 4, 76
-	noisenote 14, 12, 4, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry14_2_Ch8:
+	noise_note 8, 14, 4, 76
+	noise_note 14, 12, 4, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm
index ce4a27b9..81bd63ca 100644
--- a/audio/sfx/cry14_3.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry14_3_Ch4:
-	dutycycle 240
-	squarenote 8, 14, 4, 1936
-	squarenote 15, 15, 5, 1984
-	squarenote 8, 13, 1, 2008
-	endchannel
+SFX_Cry14_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 8, 14, 4, 1936
+	square_note 15, 15, 5, 1984
+	square_note 8, 13, 1, 2008
+	sound_ret
 
 
-SFX_Cry14_3_Ch5:
-	dutycycle 165
-	squarenote 10, 12, 4, 1905
-	squarenote 15, 11, 6, 1954
-	squarenote 8, 10, 1, 1975
-	endchannel
+SFX_Cry14_3_Ch6:
+	duty_cycle_pattern 165
+	square_note 10, 12, 4, 1905
+	square_note 15, 11, 6, 1954
+	square_note 8, 10, 1, 1975
+	sound_ret
 
 
-SFX_Cry14_3_Ch7:
-	noisenote 8, 14, 4, 76
-	noisenote 14, 12, 4, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry14_3_Ch8:
+	noise_note 8, 14, 4, 76
+	noise_note 14, 12, 4, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm
index d9966782..aaa6656e 100644
--- a/audio/sfx/cry15_1.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry15_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1920
-	squarenote 15, 14, 7, 1792
-	squarenote 8, 13, 3, 1808
-	squarenote 4, 12, 2, 1792
-	squarenote 4, 13, 2, 1776
-	squarenote 8, 12, 1, 1760
-	endchannel
+SFX_Cry15_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1920
+	square_note 15, 14, 7, 1792
+	square_note 8, 13, 3, 1808
+	square_note 4, 12, 2, 1792
+	square_note 4, 13, 2, 1776
+	square_note 8, 12, 1, 1760
+	sound_ret
 
 
-SFX_Cry15_1_Ch5:
-	dutycycle 90
-	squarenote 6, 12, 3, 1793
-	squarenote 14, 11, 7, 1665
-	squarenote 7, 11, 3, 1682
-	squarenote 3, 10, 2, 1665
-	squarenote 4, 11, 2, 1650
-	squarenote 8, 10, 1, 1633
-	endchannel
+SFX_Cry15_1_Ch6:
+	duty_cycle_pattern 90
+	square_note 6, 12, 3, 1793
+	square_note 14, 11, 7, 1665
+	square_note 7, 11, 3, 1682
+	square_note 3, 10, 2, 1665
+	square_note 4, 11, 2, 1650
+	square_note 8, 10, 1, 1633
+	sound_ret
 
 
-SFX_Cry15_1_Ch7:
-	noisenote 6, 14, 3, 92
-	noisenote 14, 13, 6, 76
-	noisenote 6, 12, 6, 60
-	noisenote 3, 11, 3, 76
-	noisenote 3, 10, 2, 92
-	noisenote 8, 11, 1, 108
-	endchannel
+SFX_Cry15_1_Ch8:
+	noise_note 6, 14, 3, 92
+	noise_note 14, 13, 6, 76
+	noise_note 6, 12, 6, 60
+	noise_note 3, 11, 3, 76
+	noise_note 3, 10, 2, 92
+	noise_note 8, 11, 1, 108
+	sound_ret
diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm
index 0fa8daf0..77ac9ffb 100644
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry15_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1920
-	squarenote 15, 14, 7, 1792
-	squarenote 8, 13, 3, 1808
-	squarenote 4, 12, 2, 1792
-	squarenote 4, 13, 2, 1776
-	squarenote 8, 12, 1, 1760
-	endchannel
+SFX_Cry15_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1920
+	square_note 15, 14, 7, 1792
+	square_note 8, 13, 3, 1808
+	square_note 4, 12, 2, 1792
+	square_note 4, 13, 2, 1776
+	square_note 8, 12, 1, 1760
+	sound_ret
 
 
-SFX_Cry15_2_Ch5:
-	dutycycle 90
-	squarenote 6, 12, 3, 1793
-	squarenote 14, 11, 7, 1665
-	squarenote 7, 11, 3, 1682
-	squarenote 3, 10, 2, 1665
-	squarenote 4, 11, 2, 1650
-	squarenote 8, 10, 1, 1633
-	endchannel
+SFX_Cry15_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 6, 12, 3, 1793
+	square_note 14, 11, 7, 1665
+	square_note 7, 11, 3, 1682
+	square_note 3, 10, 2, 1665
+	square_note 4, 11, 2, 1650
+	square_note 8, 10, 1, 1633
+	sound_ret
 
 
-SFX_Cry15_2_Ch7:
-	noisenote 6, 14, 3, 92
-	noisenote 14, 13, 6, 76
-	noisenote 6, 12, 6, 60
-	noisenote 3, 11, 3, 76
-	noisenote 3, 10, 2, 92
-	noisenote 8, 11, 1, 108
-	endchannel
+SFX_Cry15_2_Ch8:
+	noise_note 6, 14, 3, 92
+	noise_note 14, 13, 6, 76
+	noise_note 6, 12, 6, 60
+	noise_note 3, 11, 3, 76
+	noise_note 3, 10, 2, 92
+	noise_note 8, 11, 1, 108
+	sound_ret
diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm
index 5c4fe877..2e6a9d71 100644
--- a/audio/sfx/cry15_3.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,30 +1,30 @@
-SFX_Cry15_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1920
-	squarenote 15, 14, 7, 1792
-	squarenote 8, 13, 3, 1808
-	squarenote 4, 12, 2, 1792
-	squarenote 4, 13, 2, 1776
-	squarenote 8, 12, 1, 1760
-	endchannel
+SFX_Cry15_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1920
+	square_note 15, 14, 7, 1792
+	square_note 8, 13, 3, 1808
+	square_note 4, 12, 2, 1792
+	square_note 4, 13, 2, 1776
+	square_note 8, 12, 1, 1760
+	sound_ret
 
 
-SFX_Cry15_3_Ch5:
-	dutycycle 90
-	squarenote 6, 12, 3, 1793
-	squarenote 14, 11, 7, 1665
-	squarenote 7, 11, 3, 1682
-	squarenote 3, 10, 2, 1665
-	squarenote 4, 11, 2, 1650
-	squarenote 8, 10, 1, 1633
-	endchannel
+SFX_Cry15_3_Ch6:
+	duty_cycle_pattern 90
+	square_note 6, 12, 3, 1793
+	square_note 14, 11, 7, 1665
+	square_note 7, 11, 3, 1682
+	square_note 3, 10, 2, 1665
+	square_note 4, 11, 2, 1650
+	square_note 8, 10, 1, 1633
+	sound_ret
 
 
-SFX_Cry15_3_Ch7:
-	noisenote 6, 14, 3, 92
-	noisenote 14, 13, 6, 76
-	noisenote 6, 12, 6, 60
-	noisenote 3, 11, 3, 76
-	noisenote 3, 10, 2, 92
-	noisenote 8, 11, 1, 108
-	endchannel
+SFX_Cry15_3_Ch8:
+	noise_note 6, 14, 3, 92
+	noise_note 14, 13, 6, 76
+	noise_note 6, 12, 6, 60
+	noise_note 3, 11, 3, 76
+	noise_note 3, 10, 2, 92
+	noise_note 8, 11, 1, 108
+	sound_ret
diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm
index c6dcac1b..e0bf7c61 100644
--- a/audio/sfx/cry16_1.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry16_1_Ch4:
-	dutycycle 240
-	squarenote 15, 13, 7, 1920
-	squarenote 4, 14, 6, 1952
-	squarenote 15, 13, 2, 1856
-	endchannel
+SFX_Cry16_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 13, 7, 1920
+	square_note 4, 14, 6, 1952
+	square_note 15, 13, 2, 1856
+	sound_ret
 
 
-SFX_Cry16_1_Ch5:
-	dutycycle 90
-	squarenote 15, 12, 7, 1875
-	squarenote 5, 11, 6, 1906
-	squarenote 15, 12, 2, 1809
-	endchannel
+SFX_Cry16_1_Ch6:
+	duty_cycle_pattern 90
+	square_note 15, 12, 7, 1875
+	square_note 5, 11, 6, 1906
+	square_note 15, 12, 2, 1809
+	sound_ret
 
 
-SFX_Cry16_1_Ch7:
-	noisenote 13, 15, 6, 76
-	noisenote 4, 14, 6, 60
-	noisenote 15, 15, 2, 76
-	endchannel
+SFX_Cry16_1_Ch8:
+	noise_note 13, 15, 6, 76
+	noise_note 4, 14, 6, 60
+	noise_note 15, 15, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm
index 1946c8f1..da03950f 100644
--- a/audio/sfx/cry16_2.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry16_2_Ch4:
-	dutycycle 240
-	squarenote 15, 13, 7, 1920
-	squarenote 4, 14, 6, 1952
-	squarenote 15, 13, 2, 1856
-	endchannel
+SFX_Cry16_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 13, 7, 1920
+	square_note 4, 14, 6, 1952
+	square_note 15, 13, 2, 1856
+	sound_ret
 
 
-SFX_Cry16_2_Ch5:
-	dutycycle 90
-	squarenote 15, 12, 7, 1875
-	squarenote 5, 11, 6, 1906
-	squarenote 15, 12, 2, 1809
-	endchannel
+SFX_Cry16_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 15, 12, 7, 1875
+	square_note 5, 11, 6, 1906
+	square_note 15, 12, 2, 1809
+	sound_ret
 
 
-SFX_Cry16_2_Ch7:
-	noisenote 13, 15, 6, 76
-	noisenote 4, 14, 6, 60
-	noisenote 15, 15, 2, 76
-	endchannel
+SFX_Cry16_2_Ch8:
+	noise_note 13, 15, 6, 76
+	noise_note 4, 14, 6, 60
+	noise_note 15, 15, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm
index bc8ff2ba..248163fe 100644
--- a/audio/sfx/cry16_3.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry16_3_Ch4:
-	dutycycle 240
-	squarenote 15, 13, 7, 1920
-	squarenote 4, 14, 6, 1952
-	squarenote 15, 13, 2, 1856
-	endchannel
+SFX_Cry16_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 13, 7, 1920
+	square_note 4, 14, 6, 1952
+	square_note 15, 13, 2, 1856
+	sound_ret
 
 
-SFX_Cry16_3_Ch5:
-	dutycycle 90
-	squarenote 15, 12, 7, 1875
-	squarenote 5, 11, 6, 1906
-	squarenote 15, 12, 2, 1809
-	endchannel
+SFX_Cry16_3_Ch6:
+	duty_cycle_pattern 90
+	square_note 15, 12, 7, 1875
+	square_note 5, 11, 6, 1906
+	square_note 15, 12, 2, 1809
+	sound_ret
 
 
-SFX_Cry16_3_Ch7:
-	noisenote 13, 15, 6, 76
-	noisenote 4, 14, 6, 60
-	noisenote 15, 15, 2, 76
-	endchannel
+SFX_Cry16_3_Ch8:
+	noise_note 13, 15, 6, 76
+	noise_note 4, 14, 6, 60
+	noise_note 15, 15, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm
index 29b6fff2..699de068 100644
--- a/audio/sfx/cry17_1.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry17_1_Ch4:
-	dutycycle 15
-	squarenote 15, 15, 7, 1280
-	squarenote 15, 14, 7, 1288
-	squarenote 8, 11, 4, 1152
-	squarenote 15, 10, 2, 1120
-	endchannel
+SFX_Cry17_1_Ch5:
+	duty_cycle_pattern 15
+	square_note 15, 15, 7, 1280
+	square_note 15, 14, 7, 1288
+	square_note 8, 11, 4, 1152
+	square_note 15, 10, 2, 1120
+	sound_ret
 
 
-SFX_Cry17_1_Ch5:
-	dutycycle 68
-	squarenote 14, 13, 7, 1153
-	squarenote 14, 12, 7, 1161
-	squarenote 10, 11, 4, 1025
-	squarenote 15, 12, 2, 993
-	endchannel
+SFX_Cry17_1_Ch6:
+	duty_cycle_pattern 68
+	square_note 14, 13, 7, 1153
+	square_note 14, 12, 7, 1161
+	square_note 10, 11, 4, 1025
+	square_note 15, 12, 2, 993
+	sound_ret
 
 
-SFX_Cry17_1_Ch7:
-	noisenote 14, 15, 7, 124
-	noisenote 12, 15, 6, 108
-	noisenote 9, 14, 4, 124
-	noisenote 15, 14, 2, 108
-	endchannel
+SFX_Cry17_1_Ch8:
+	noise_note 14, 15, 7, 124
+	noise_note 12, 15, 6, 108
+	noise_note 9, 14, 4, 124
+	noise_note 15, 14, 2, 108
+	sound_ret
diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm
index 4a42db48..2f143097 100644
--- a/audio/sfx/cry17_2.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry17_2_Ch4:
-	dutycycle 15
-	squarenote 15, 15, 7, 1280
-	squarenote 15, 14, 7, 1288
-	squarenote 8, 11, 4, 1152
-	squarenote 15, 10, 2, 1120
-	endchannel
+SFX_Cry17_2_Ch5:
+	duty_cycle_pattern 15
+	square_note 15, 15, 7, 1280
+	square_note 15, 14, 7, 1288
+	square_note 8, 11, 4, 1152
+	square_note 15, 10, 2, 1120
+	sound_ret
 
 
-SFX_Cry17_2_Ch5:
-	dutycycle 68
-	squarenote 14, 13, 7, 1153
-	squarenote 14, 12, 7, 1161
-	squarenote 10, 11, 4, 1025
-	squarenote 15, 12, 2, 993
-	endchannel
+SFX_Cry17_2_Ch6:
+	duty_cycle_pattern 68
+	square_note 14, 13, 7, 1153
+	square_note 14, 12, 7, 1161
+	square_note 10, 11, 4, 1025
+	square_note 15, 12, 2, 993
+	sound_ret
 
 
-SFX_Cry17_2_Ch7:
-	noisenote 14, 15, 7, 124
-	noisenote 12, 15, 6, 108
-	noisenote 9, 14, 4, 124
-	noisenote 15, 14, 2, 108
-	endchannel
+SFX_Cry17_2_Ch8:
+	noise_note 14, 15, 7, 124
+	noise_note 12, 15, 6, 108
+	noise_note 9, 14, 4, 124
+	noise_note 15, 14, 2, 108
+	sound_ret
diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm
index 4340c97f..32bee883 100644
--- a/audio/sfx/cry17_3.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry17_3_Ch4:
-	dutycycle 15
-	squarenote 15, 15, 7, 1280
-	squarenote 15, 14, 7, 1288
-	squarenote 8, 11, 4, 1152
-	squarenote 15, 10, 2, 1120
-	endchannel
+SFX_Cry17_3_Ch5:
+	duty_cycle_pattern 15
+	square_note 15, 15, 7, 1280
+	square_note 15, 14, 7, 1288
+	square_note 8, 11, 4, 1152
+	square_note 15, 10, 2, 1120
+	sound_ret
 
 
-SFX_Cry17_3_Ch5:
-	dutycycle 68
-	squarenote 14, 13, 7, 1153
-	squarenote 14, 12, 7, 1161
-	squarenote 10, 11, 4, 1025
-	squarenote 15, 12, 2, 993
-	endchannel
+SFX_Cry17_3_Ch6:
+	duty_cycle_pattern 68
+	square_note 14, 13, 7, 1153
+	square_note 14, 12, 7, 1161
+	square_note 10, 11, 4, 1025
+	square_note 15, 12, 2, 993
+	sound_ret
 
 
-SFX_Cry17_3_Ch7:
-	noisenote 14, 15, 7, 124
-	noisenote 12, 15, 6, 108
-	noisenote 9, 14, 4, 124
-	noisenote 15, 14, 2, 108
-	endchannel
+SFX_Cry17_3_Ch8:
+	noise_note 14, 15, 7, 124
+	noise_note 12, 15, 6, 108
+	noise_note 9, 14, 4, 124
+	noise_note 15, 14, 2, 108
+	sound_ret
diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm
index 8249731a..d326c2c3 100644
--- a/audio/sfx/cry18_1.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,34 +1,34 @@
-SFX_Cry18_1_Ch4:
-	dutycycle 80
-	squarenote 10, 15, 5, 1664
-	squarenote 3, 14, 2, 1696
-	squarenote 3, 15, 2, 1728
-	squarenote 3, 14, 2, 1760
-	squarenote 3, 13, 2, 1792
-	squarenote 3, 12, 2, 1760
-	squarenote 3, 13, 2, 1728
-	squarenote 8, 12, 1, 1696
-	endchannel
+SFX_Cry18_1_Ch5:
+	duty_cycle_pattern 80
+	square_note 10, 15, 5, 1664
+	square_note 3, 14, 2, 1696
+	square_note 3, 15, 2, 1728
+	square_note 3, 14, 2, 1760
+	square_note 3, 13, 2, 1792
+	square_note 3, 12, 2, 1760
+	square_note 3, 13, 2, 1728
+	square_note 8, 12, 1, 1696
+	sound_ret
 
 
-SFX_Cry18_1_Ch5:
-	dutycycle 15
-	squarenote 9, 13, 5, 1585
-	squarenote 3, 13, 2, 1618
-	squarenote 3, 14, 2, 1649
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1714
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1649
-	squarenote 8, 11, 1, 1617
-	endchannel
+SFX_Cry18_1_Ch6:
+	duty_cycle_pattern 15
+	square_note 9, 13, 5, 1585
+	square_note 3, 13, 2, 1618
+	square_note 3, 14, 2, 1649
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1714
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1649
+	square_note 8, 11, 1, 1617
+	sound_ret
 
 
-SFX_Cry18_1_Ch7:
-	noisenote 6, 14, 3, 76
-	noisenote 4, 12, 3, 60
-	noisenote 5, 13, 4, 60
-	noisenote 4, 12, 4, 44
-	noisenote 6, 11, 4, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry18_1_Ch8:
+	noise_note 6, 14, 3, 76
+	noise_note 4, 12, 3, 60
+	noise_note 5, 13, 4, 60
+	noise_note 4, 12, 4, 44
+	noise_note 6, 11, 4, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm
index 39f85b8f..1a81e1d3 100644
--- a/audio/sfx/cry18_2.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,34 +1,34 @@
-SFX_Cry18_2_Ch4:
-	dutycycle 80
-	squarenote 10, 15, 5, 1664
-	squarenote 3, 14, 2, 1696
-	squarenote 3, 15, 2, 1728
-	squarenote 3, 14, 2, 1760
-	squarenote 3, 13, 2, 1792
-	squarenote 3, 12, 2, 1760
-	squarenote 3, 13, 2, 1728
-	squarenote 8, 12, 1, 1696
-	endchannel
+SFX_Cry18_2_Ch5:
+	duty_cycle_pattern 80
+	square_note 10, 15, 5, 1664
+	square_note 3, 14, 2, 1696
+	square_note 3, 15, 2, 1728
+	square_note 3, 14, 2, 1760
+	square_note 3, 13, 2, 1792
+	square_note 3, 12, 2, 1760
+	square_note 3, 13, 2, 1728
+	square_note 8, 12, 1, 1696
+	sound_ret
 
 
-SFX_Cry18_2_Ch5:
-	dutycycle 15
-	squarenote 9, 13, 5, 1585
-	squarenote 3, 13, 2, 1618
-	squarenote 3, 14, 2, 1649
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1714
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1649
-	squarenote 8, 11, 1, 1617
-	endchannel
+SFX_Cry18_2_Ch6:
+	duty_cycle_pattern 15
+	square_note 9, 13, 5, 1585
+	square_note 3, 13, 2, 1618
+	square_note 3, 14, 2, 1649
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1714
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1649
+	square_note 8, 11, 1, 1617
+	sound_ret
 
 
-SFX_Cry18_2_Ch7:
-	noisenote 6, 14, 3, 76
-	noisenote 4, 12, 3, 60
-	noisenote 5, 13, 4, 60
-	noisenote 4, 12, 4, 44
-	noisenote 6, 11, 4, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry18_2_Ch8:
+	noise_note 6, 14, 3, 76
+	noise_note 4, 12, 3, 60
+	noise_note 5, 13, 4, 60
+	noise_note 4, 12, 4, 44
+	noise_note 6, 11, 4, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm
index 4bcf5b6d..7ca9f2c6 100644
--- a/audio/sfx/cry18_3.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,34 +1,34 @@
-SFX_Cry18_3_Ch4:
-	dutycycle 80
-	squarenote 10, 15, 5, 1664
-	squarenote 3, 14, 2, 1696
-	squarenote 3, 15, 2, 1728
-	squarenote 3, 14, 2, 1760
-	squarenote 3, 13, 2, 1792
-	squarenote 3, 12, 2, 1760
-	squarenote 3, 13, 2, 1728
-	squarenote 8, 12, 1, 1696
-	endchannel
+SFX_Cry18_3_Ch5:
+	duty_cycle_pattern 80
+	square_note 10, 15, 5, 1664
+	square_note 3, 14, 2, 1696
+	square_note 3, 15, 2, 1728
+	square_note 3, 14, 2, 1760
+	square_note 3, 13, 2, 1792
+	square_note 3, 12, 2, 1760
+	square_note 3, 13, 2, 1728
+	square_note 8, 12, 1, 1696
+	sound_ret
 
 
-SFX_Cry18_3_Ch5:
-	dutycycle 15
-	squarenote 9, 13, 5, 1585
-	squarenote 3, 13, 2, 1618
-	squarenote 3, 14, 2, 1649
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1714
-	squarenote 3, 11, 2, 1681
-	squarenote 3, 12, 2, 1649
-	squarenote 8, 11, 1, 1617
-	endchannel
+SFX_Cry18_3_Ch6:
+	duty_cycle_pattern 15
+	square_note 9, 13, 5, 1585
+	square_note 3, 13, 2, 1618
+	square_note 3, 14, 2, 1649
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1714
+	square_note 3, 11, 2, 1681
+	square_note 3, 12, 2, 1649
+	square_note 8, 11, 1, 1617
+	sound_ret
 
 
-SFX_Cry18_3_Ch7:
-	noisenote 6, 14, 3, 76
-	noisenote 4, 12, 3, 60
-	noisenote 5, 13, 4, 60
-	noisenote 4, 12, 4, 44
-	noisenote 6, 11, 4, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry18_3_Ch8:
+	noise_note 6, 14, 3, 76
+	noise_note 4, 12, 3, 60
+	noise_note 5, 13, 4, 60
+	noise_note 4, 12, 4, 44
+	noise_note 6, 11, 4, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm
index d0435941..6309f902 100644
--- a/audio/sfx/cry19_1.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,18 +1,18 @@
-SFX_Cry19_1_Ch4:
-	dutycycle 27
-	squarenote 7, 13, 2, 1856
-	squarenote 15, 14, 5, 1888
-	squarenote 15, 12, 1, 1840
-	endchannel
+SFX_Cry19_1_Ch5:
+	duty_cycle_pattern 27
+	square_note 7, 13, 2, 1856
+	square_note 15, 14, 5, 1888
+	square_note 15, 12, 1, 1840
+	sound_ret
 
 
-SFX_Cry19_1_Ch5:
-	dutycycle 129
-	squarenote 2, 12, 2, 1793
-	squarenote 4, 12, 2, 1800
-	squarenote 15, 13, 7, 1857
-	squarenote 15, 10, 2, 1793
+SFX_Cry19_1_Ch6:
+	duty_cycle_pattern 129
+	square_note 2, 12, 2, 1793
+	square_note 4, 12, 2, 1800
+	square_note 15, 13, 7, 1857
+	square_note 15, 10, 2, 1793
 
 
-SFX_Cry19_1_Ch7:
-	endchannel
+SFX_Cry19_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm
index b088c0de..e838612b 100644
--- a/audio/sfx/cry19_2.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,18 +1,18 @@
-SFX_Cry19_2_Ch4:
-	dutycycle 27
-	squarenote 7, 13, 2, 1856
-	squarenote 15, 14, 5, 1888
-	squarenote 15, 12, 1, 1840
-	endchannel
+SFX_Cry19_2_Ch5:
+	duty_cycle_pattern 27
+	square_note 7, 13, 2, 1856
+	square_note 15, 14, 5, 1888
+	square_note 15, 12, 1, 1840
+	sound_ret
 
 
-SFX_Cry19_2_Ch5:
-	dutycycle 129
-	squarenote 2, 12, 2, 1793
-	squarenote 4, 12, 2, 1800
-	squarenote 15, 13, 7, 1857
-	squarenote 15, 10, 2, 1793
+SFX_Cry19_2_Ch6:
+	duty_cycle_pattern 129
+	square_note 2, 12, 2, 1793
+	square_note 4, 12, 2, 1800
+	square_note 15, 13, 7, 1857
+	square_note 15, 10, 2, 1793
 
 
-SFX_Cry19_2_Ch7:
-	endchannel
+SFX_Cry19_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm
index e42489c4..51c113b6 100644
--- a/audio/sfx/cry19_3.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,18 +1,18 @@
-SFX_Cry19_3_Ch4:
-	dutycycle 27
-	squarenote 7, 13, 2, 1856
-	squarenote 15, 14, 5, 1888
-	squarenote 15, 12, 1, 1840
-	endchannel
+SFX_Cry19_3_Ch5:
+	duty_cycle_pattern 27
+	square_note 7, 13, 2, 1856
+	square_note 15, 14, 5, 1888
+	square_note 15, 12, 1, 1840
+	sound_ret
 
 
-SFX_Cry19_3_Ch5:
-	dutycycle 129
-	squarenote 2, 12, 2, 1793
-	squarenote 4, 12, 2, 1800
-	squarenote 15, 13, 7, 1857
-	squarenote 15, 10, 2, 1793
+SFX_Cry19_3_Ch6:
+	duty_cycle_pattern 129
+	square_note 2, 12, 2, 1793
+	square_note 4, 12, 2, 1800
+	square_note 15, 13, 7, 1857
+	square_note 15, 10, 2, 1793
 
 
-SFX_Cry19_3_Ch7:
-	endchannel
+SFX_Cry19_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm
index 8bbf8288..3209263a 100644
--- a/audio/sfx/cry1a_1.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry1A_1_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1856
-	squarenote 12, 14, 6, 1860
-	squarenote 6, 13, 5, 1872
-	squarenote 4, 12, 3, 1888
-	squarenote 3, 12, 3, 1920
-	squarenote 8, 13, 1, 1952
-	endchannel
+SFX_Cry1A_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1856
+	square_note 12, 14, 6, 1860
+	square_note 6, 13, 5, 1872
+	square_note 4, 12, 3, 1888
+	square_note 3, 12, 3, 1920
+	square_note 8, 13, 1, 1952
+	sound_ret
 
 
-SFX_Cry1A_1_Ch5:
-	dutycycle 10
-	squarenote 6, 12, 7, 1793
-	squarenote 11, 11, 6, 1794
-	squarenote 6, 10, 5, 1809
-	squarenote 4, 9, 3, 1825
-	squarenote 3, 10, 3, 1857
-	squarenote 8, 9, 1, 1890
-	endchannel
+SFX_Cry1A_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 6, 12, 7, 1793
+	square_note 11, 11, 6, 1794
+	square_note 6, 10, 5, 1809
+	square_note 4, 9, 3, 1825
+	square_note 3, 10, 3, 1857
+	square_note 8, 9, 1, 1890
+	sound_ret
 
 
-SFX_Cry1A_1_Ch7:
-	noisenote 3, 14, 2, 60
-	noisenote 8, 13, 6, 76
-	noisenote 5, 13, 4, 60
-	noisenote 12, 12, 7, 76
-	noisenote 2, 14, 2, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry1A_1_Ch8:
+	noise_note 3, 14, 2, 60
+	noise_note 8, 13, 6, 76
+	noise_note 5, 13, 4, 60
+	noise_note 12, 12, 7, 76
+	noise_note 2, 14, 2, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm
index b6ed820b..a8dca4fc 100644
--- a/audio/sfx/cry1a_2.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry1A_2_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1856
-	squarenote 12, 14, 6, 1860
-	squarenote 6, 13, 5, 1872
-	squarenote 4, 12, 3, 1888
-	squarenote 3, 12, 3, 1920
-	squarenote 8, 13, 1, 1952
-	endchannel
+SFX_Cry1A_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1856
+	square_note 12, 14, 6, 1860
+	square_note 6, 13, 5, 1872
+	square_note 4, 12, 3, 1888
+	square_note 3, 12, 3, 1920
+	square_note 8, 13, 1, 1952
+	sound_ret
 
 
-SFX_Cry1A_2_Ch5:
-	dutycycle 10
-	squarenote 6, 12, 7, 1793
-	squarenote 11, 11, 6, 1794
-	squarenote 6, 10, 5, 1809
-	squarenote 4, 9, 3, 1825
-	squarenote 3, 10, 3, 1857
-	squarenote 8, 9, 1, 1890
-	endchannel
+SFX_Cry1A_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 6, 12, 7, 1793
+	square_note 11, 11, 6, 1794
+	square_note 6, 10, 5, 1809
+	square_note 4, 9, 3, 1825
+	square_note 3, 10, 3, 1857
+	square_note 8, 9, 1, 1890
+	sound_ret
 
 
-SFX_Cry1A_2_Ch7:
-	noisenote 3, 14, 2, 60
-	noisenote 8, 13, 6, 76
-	noisenote 5, 13, 4, 60
-	noisenote 12, 12, 7, 76
-	noisenote 2, 14, 2, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry1A_2_Ch8:
+	noise_note 3, 14, 2, 60
+	noise_note 8, 13, 6, 76
+	noise_note 5, 13, 4, 60
+	noise_note 12, 12, 7, 76
+	noise_note 2, 14, 2, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm
index aee947cd..0fc9574d 100644
--- a/audio/sfx/cry1a_3.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,30 +1,30 @@
-SFX_Cry1A_3_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1856
-	squarenote 12, 14, 6, 1860
-	squarenote 6, 13, 5, 1872
-	squarenote 4, 12, 3, 1888
-	squarenote 3, 12, 3, 1920
-	squarenote 8, 13, 1, 1952
-	endchannel
+SFX_Cry1A_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1856
+	square_note 12, 14, 6, 1860
+	square_note 6, 13, 5, 1872
+	square_note 4, 12, 3, 1888
+	square_note 3, 12, 3, 1920
+	square_note 8, 13, 1, 1952
+	sound_ret
 
 
-SFX_Cry1A_3_Ch5:
-	dutycycle 10
-	squarenote 6, 12, 7, 1793
-	squarenote 11, 11, 6, 1794
-	squarenote 6, 10, 5, 1809
-	squarenote 4, 9, 3, 1825
-	squarenote 3, 10, 3, 1857
-	squarenote 8, 9, 1, 1890
-	endchannel
+SFX_Cry1A_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 6, 12, 7, 1793
+	square_note 11, 11, 6, 1794
+	square_note 6, 10, 5, 1809
+	square_note 4, 9, 3, 1825
+	square_note 3, 10, 3, 1857
+	square_note 8, 9, 1, 1890
+	sound_ret
 
 
-SFX_Cry1A_3_Ch7:
-	noisenote 3, 14, 2, 60
-	noisenote 8, 13, 6, 76
-	noisenote 5, 13, 4, 60
-	noisenote 12, 12, 7, 76
-	noisenote 2, 14, 2, 60
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry1A_3_Ch8:
+	noise_note 3, 14, 2, 60
+	noise_note 8, 13, 6, 76
+	noise_note 5, 13, 4, 60
+	noise_note 12, 12, 7, 76
+	noise_note 2, 14, 2, 60
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm
index 86f3d421..8a228ec3 100644
--- a/audio/sfx/cry1b_1.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,26 +1,26 @@
-SFX_Cry1B_1_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1728
-	squarenote 15, 14, 7, 1792
-	squarenote 4, 15, 4, 1776
-	squarenote 4, 14, 4, 1760
-	squarenote 8, 13, 1, 1744
-	endchannel
+SFX_Cry1B_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1728
+	square_note 15, 14, 7, 1792
+	square_note 4, 15, 4, 1776
+	square_note 4, 14, 4, 1760
+	square_note 8, 13, 1, 1744
+	sound_ret
 
 
-SFX_Cry1B_1_Ch5:
-	dutycycle 10
-	squarenote 7, 14, 6, 1665
-	squarenote 14, 13, 5, 1729
-	squarenote 4, 12, 4, 1713
-	squarenote 4, 13, 4, 1697
-	squarenote 8, 12, 1, 1681
-	endchannel
+SFX_Cry1B_1_Ch6:
+	duty_cycle_pattern 10
+	square_note 7, 14, 6, 1665
+	square_note 14, 13, 5, 1729
+	square_note 4, 12, 4, 1713
+	square_note 4, 13, 4, 1697
+	square_note 8, 12, 1, 1681
+	sound_ret
 
 
-SFX_Cry1B_1_Ch7:
-	noisenote 10, 10, 6, 60
-	noisenote 14, 9, 4, 44
-	noisenote 5, 10, 3, 60
-	noisenote 8, 9, 1, 44
-	endchannel
+SFX_Cry1B_1_Ch8:
+	noise_note 10, 10, 6, 60
+	noise_note 14, 9, 4, 44
+	noise_note 5, 10, 3, 60
+	noise_note 8, 9, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm
index 1faaf5bb..97f85337 100644
--- a/audio/sfx/cry1b_2.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,26 +1,26 @@
-SFX_Cry1B_2_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1728
-	squarenote 15, 14, 7, 1792
-	squarenote 4, 15, 4, 1776
-	squarenote 4, 14, 4, 1760
-	squarenote 8, 13, 1, 1744
-	endchannel
+SFX_Cry1B_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1728
+	square_note 15, 14, 7, 1792
+	square_note 4, 15, 4, 1776
+	square_note 4, 14, 4, 1760
+	square_note 8, 13, 1, 1744
+	sound_ret
 
 
-SFX_Cry1B_2_Ch5:
-	dutycycle 10
-	squarenote 7, 14, 6, 1665
-	squarenote 14, 13, 5, 1729
-	squarenote 4, 12, 4, 1713
-	squarenote 4, 13, 4, 1697
-	squarenote 8, 12, 1, 1681
-	endchannel
+SFX_Cry1B_2_Ch6:
+	duty_cycle_pattern 10
+	square_note 7, 14, 6, 1665
+	square_note 14, 13, 5, 1729
+	square_note 4, 12, 4, 1713
+	square_note 4, 13, 4, 1697
+	square_note 8, 12, 1, 1681
+	sound_ret
 
 
-SFX_Cry1B_2_Ch7:
-	noisenote 10, 10, 6, 60
-	noisenote 14, 9, 4, 44
-	noisenote 5, 10, 3, 60
-	noisenote 8, 9, 1, 44
-	endchannel
+SFX_Cry1B_2_Ch8:
+	noise_note 10, 10, 6, 60
+	noise_note 14, 9, 4, 44
+	noise_note 5, 10, 3, 60
+	noise_note 8, 9, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm
index 09196c26..27b7f633 100644
--- a/audio/sfx/cry1b_3.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,26 +1,26 @@
-SFX_Cry1B_3_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1728
-	squarenote 15, 14, 7, 1792
-	squarenote 4, 15, 4, 1776
-	squarenote 4, 14, 4, 1760
-	squarenote 8, 13, 1, 1744
-	endchannel
+SFX_Cry1B_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 7, 1728
+	square_note 15, 14, 7, 1792
+	square_note 4, 15, 4, 1776
+	square_note 4, 14, 4, 1760
+	square_note 8, 13, 1, 1744
+	sound_ret
 
 
-SFX_Cry1B_3_Ch5:
-	dutycycle 10
-	squarenote 7, 14, 6, 1665
-	squarenote 14, 13, 5, 1729
-	squarenote 4, 12, 4, 1713
-	squarenote 4, 13, 4, 1697
-	squarenote 8, 12, 1, 1681
-	endchannel
+SFX_Cry1B_3_Ch6:
+	duty_cycle_pattern 10
+	square_note 7, 14, 6, 1665
+	square_note 14, 13, 5, 1729
+	square_note 4, 12, 4, 1713
+	square_note 4, 13, 4, 1697
+	square_note 8, 12, 1, 1681
+	sound_ret
 
 
-SFX_Cry1B_3_Ch7:
-	noisenote 10, 10, 6, 60
-	noisenote 14, 9, 4, 44
-	noisenote 5, 10, 3, 60
-	noisenote 8, 9, 1, 44
-	endchannel
+SFX_Cry1B_3_Ch8:
+	noise_note 10, 10, 6, 60
+	noise_note 14, 9, 4, 44
+	noise_note 5, 10, 3, 60
+	noise_note 8, 9, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm
index 2fd4f7b2..50e29a0e 100644
--- a/audio/sfx/cry1c_1.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,31 +1,31 @@
-SFX_Cry1C_1_Ch4:
-	dutycycle 245
-	squarenote 7, 13, 6, 2017
-	squarenote 6, 12, 6, 2018
-	squarenote 9, 13, 6, 2017
-	squarenote 7, 12, 6, 2016
-	squarenote 5, 11, 6, 2018
-	squarenote 7, 12, 6, 2017
-	squarenote 6, 11, 6, 2016
-	squarenote 8, 10, 1, 2015
-	endchannel
+SFX_Cry1C_1_Ch5:
+	duty_cycle_pattern 245
+	square_note 7, 13, 6, 2017
+	square_note 6, 12, 6, 2018
+	square_note 9, 13, 6, 2017
+	square_note 7, 12, 6, 2016
+	square_note 5, 11, 6, 2018
+	square_note 7, 12, 6, 2017
+	square_note 6, 11, 6, 2016
+	square_note 8, 10, 1, 2015
+	sound_ret
 
 
-SFX_Cry1C_1_Ch5:
-	dutycycle 68
-	squarenote 6, 12, 3, 1993
-	squarenote 6, 11, 3, 1991
-	squarenote 10, 12, 4, 1987
-	squarenote 8, 11, 4, 1991
-	squarenote 6, 12, 3, 1993
-	squarenote 15, 10, 2, 1989
-	endchannel
+SFX_Cry1C_1_Ch6:
+	duty_cycle_pattern 68
+	square_note 6, 12, 3, 1993
+	square_note 6, 11, 3, 1991
+	square_note 10, 12, 4, 1987
+	square_note 8, 11, 4, 1991
+	square_note 6, 12, 3, 1993
+	square_note 15, 10, 2, 1989
+	sound_ret
 
 
-SFX_Cry1C_1_Ch7:
-	noisenote 13, 1, -1, 124
-	noisenote 13, 15, 7, 140
-	noisenote 12, 13, 6, 124
-	noisenote 8, 12, 4, 108
-	noisenote 15, 11, 3, 92
-	endchannel
+SFX_Cry1C_1_Ch8:
+	noise_note 13, 1, -1, 124
+	noise_note 13, 15, 7, 140
+	noise_note 12, 13, 6, 124
+	noise_note 8, 12, 4, 108
+	noise_note 15, 11, 3, 92
+	sound_ret
diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm
index 69a08eef..e73f557c 100644
--- a/audio/sfx/cry1c_2.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,31 +1,31 @@
-SFX_Cry1C_2_Ch4:
-	dutycycle 245
-	squarenote 7, 13, 6, 2017
-	squarenote 6, 12, 6, 2018
-	squarenote 9, 13, 6, 2017
-	squarenote 7, 12, 6, 2016
-	squarenote 5, 11, 6, 2018
-	squarenote 7, 12, 6, 2017
-	squarenote 6, 11, 6, 2016
-	squarenote 8, 10, 1, 2015
-	endchannel
+SFX_Cry1C_2_Ch5:
+	duty_cycle_pattern 245
+	square_note 7, 13, 6, 2017
+	square_note 6, 12, 6, 2018
+	square_note 9, 13, 6, 2017
+	square_note 7, 12, 6, 2016
+	square_note 5, 11, 6, 2018
+	square_note 7, 12, 6, 2017
+	square_note 6, 11, 6, 2016
+	square_note 8, 10, 1, 2015
+	sound_ret
 
 
-SFX_Cry1C_2_Ch5:
-	dutycycle 68
-	squarenote 6, 12, 3, 1993
-	squarenote 6, 11, 3, 1991
-	squarenote 10, 12, 4, 1987
-	squarenote 8, 11, 4, 1991
-	squarenote 6, 12, 3, 1993
-	squarenote 15, 10, 2, 1989
-	endchannel
+SFX_Cry1C_2_Ch6:
+	duty_cycle_pattern 68
+	square_note 6, 12, 3, 1993
+	square_note 6, 11, 3, 1991
+	square_note 10, 12, 4, 1987
+	square_note 8, 11, 4, 1991
+	square_note 6, 12, 3, 1993
+	square_note 15, 10, 2, 1989
+	sound_ret
 
 
-SFX_Cry1C_2_Ch7:
-	noisenote 13, 1, -1, 124
-	noisenote 13, 15, 7, 140
-	noisenote 12, 13, 6, 124
-	noisenote 8, 12, 4, 108
-	noisenote 15, 11, 3, 92
-	endchannel
+SFX_Cry1C_2_Ch8:
+	noise_note 13, 1, -1, 124
+	noise_note 13, 15, 7, 140
+	noise_note 12, 13, 6, 124
+	noise_note 8, 12, 4, 108
+	noise_note 15, 11, 3, 92
+	sound_ret
diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm
index 59f69402..282804b2 100644
--- a/audio/sfx/cry1c_3.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,31 +1,31 @@
-SFX_Cry1C_3_Ch4:
-	dutycycle 245
-	squarenote 7, 13, 6, 2017
-	squarenote 6, 12, 6, 2018
-	squarenote 9, 13, 6, 2017
-	squarenote 7, 12, 6, 2016
-	squarenote 5, 11, 6, 2018
-	squarenote 7, 12, 6, 2017
-	squarenote 6, 11, 6, 2016
-	squarenote 8, 10, 1, 2015
-	endchannel
+SFX_Cry1C_3_Ch5:
+	duty_cycle_pattern 245
+	square_note 7, 13, 6, 2017
+	square_note 6, 12, 6, 2018
+	square_note 9, 13, 6, 2017
+	square_note 7, 12, 6, 2016
+	square_note 5, 11, 6, 2018
+	square_note 7, 12, 6, 2017
+	square_note 6, 11, 6, 2016
+	square_note 8, 10, 1, 2015
+	sound_ret
 
 
-SFX_Cry1C_3_Ch5:
-	dutycycle 68
-	squarenote 6, 12, 3, 1993
-	squarenote 6, 11, 3, 1991
-	squarenote 10, 12, 4, 1987
-	squarenote 8, 11, 4, 1991
-	squarenote 6, 12, 3, 1993
-	squarenote 15, 10, 2, 1989
-	endchannel
+SFX_Cry1C_3_Ch6:
+	duty_cycle_pattern 68
+	square_note 6, 12, 3, 1993
+	square_note 6, 11, 3, 1991
+	square_note 10, 12, 4, 1987
+	square_note 8, 11, 4, 1991
+	square_note 6, 12, 3, 1993
+	square_note 15, 10, 2, 1989
+	sound_ret
 
 
-SFX_Cry1C_3_Ch7:
-	noisenote 13, 1, -1, 124
-	noisenote 13, 15, 7, 140
-	noisenote 12, 13, 6, 124
-	noisenote 8, 12, 4, 108
-	noisenote 15, 11, 3, 92
-	endchannel
+SFX_Cry1C_3_Ch8:
+	noise_note 13, 1, -1, 124
+	noise_note 13, 15, 7, 140
+	noise_note 12, 13, 6, 124
+	noise_note 8, 12, 4, 108
+	noise_note 15, 11, 3, 92
+	sound_ret
diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm
index 4cef3bf0..97fd2d31 100644
--- a/audio/sfx/cry1d_1.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,29 +1,29 @@
-SFX_Cry1D_1_Ch4:
-	dutycycle 244
-	squarenote 15, 15, 0, 1797
-	squarenote 10, 14, 0, 1792
-	squarenote 6, 11, 4, 1808
-	squarenote 4, 13, 3, 1792
-	squarenote 6, 11, 2, 1568
-	squarenote 8, 10, 1, 1572
-	endchannel
+SFX_Cry1D_1_Ch5:
+	duty_cycle_pattern 244
+	square_note 15, 15, 0, 1797
+	square_note 10, 14, 0, 1792
+	square_note 6, 11, 4, 1808
+	square_note 4, 13, 3, 1792
+	square_note 6, 11, 2, 1568
+	square_note 8, 10, 1, 1572
+	sound_ret
 
 
-SFX_Cry1D_1_Ch5:
-	dutycycle 34
-	squarenote 15, 11, 0, 1731
-	squarenote 10, 10, 0, 1729
-	squarenote 6, 8, 4, 1746
-	squarenote 4, 9, 3, 1729
-	squarenote 6, 8, 2, 1505
-	squarenote 8, 6, 1, 1512
-	endchannel
+SFX_Cry1D_1_Ch6:
+	duty_cycle_pattern 34
+	square_note 15, 11, 0, 1731
+	square_note 10, 10, 0, 1729
+	square_note 6, 8, 4, 1746
+	square_note 4, 9, 3, 1729
+	square_note 6, 8, 2, 1505
+	square_note 8, 6, 1, 1512
+	sound_ret
 
 
-SFX_Cry1D_1_Ch7:
-	noisenote 6, 14, 6, 76
-	noisenote 15, 13, 6, 60
-	noisenote 10, 12, 5, 74
-	noisenote 1, 11, 2, 91
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry1D_1_Ch8:
+	noise_note 6, 14, 6, 76
+	noise_note 15, 13, 6, 60
+	noise_note 10, 12, 5, 74
+	noise_note 1, 11, 2, 91
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm
index 874be61e..5fc0a453 100644
--- a/audio/sfx/cry1d_2.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,29 +1,29 @@
-SFX_Cry1D_2_Ch4:
-	dutycycle 244
-	squarenote 15, 15, 0, 1797
-	squarenote 10, 14, 0, 1792
-	squarenote 6, 11, 4, 1808
-	squarenote 4, 13, 3, 1792
-	squarenote 6, 11, 2, 1568
-	squarenote 8, 10, 1, 1572
-	endchannel
+SFX_Cry1D_2_Ch5:
+	duty_cycle_pattern 244
+	square_note 15, 15, 0, 1797
+	square_note 10, 14, 0, 1792
+	square_note 6, 11, 4, 1808
+	square_note 4, 13, 3, 1792
+	square_note 6, 11, 2, 1568
+	square_note 8, 10, 1, 1572
+	sound_ret
 
 
-SFX_Cry1D_2_Ch5:
-	dutycycle 34
-	squarenote 15, 11, 0, 1731
-	squarenote 10, 10, 0, 1729
-	squarenote 6, 8, 4, 1746
-	squarenote 4, 9, 3, 1729
-	squarenote 6, 8, 2, 1505
-	squarenote 8, 6, 1, 1512
-	endchannel
+SFX_Cry1D_2_Ch6:
+	duty_cycle_pattern 34
+	square_note 15, 11, 0, 1731
+	square_note 10, 10, 0, 1729
+	square_note 6, 8, 4, 1746
+	square_note 4, 9, 3, 1729
+	square_note 6, 8, 2, 1505
+	square_note 8, 6, 1, 1512
+	sound_ret
 
 
-SFX_Cry1D_2_Ch7:
-	noisenote 6, 14, 6, 76
-	noisenote 15, 13, 6, 60
-	noisenote 10, 12, 5, 74
-	noisenote 1, 11, 2, 91
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry1D_2_Ch8:
+	noise_note 6, 14, 6, 76
+	noise_note 15, 13, 6, 60
+	noise_note 10, 12, 5, 74
+	noise_note 1, 11, 2, 91
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm
index 991e44bb..f86dd102 100644
--- a/audio/sfx/cry1d_3.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,29 +1,29 @@
-SFX_Cry1D_3_Ch4:
-	dutycycle 244
-	squarenote 15, 15, 0, 1797
-	squarenote 10, 14, 0, 1792
-	squarenote 6, 11, 4, 1808
-	squarenote 4, 13, 3, 1792
-	squarenote 6, 11, 2, 1568
-	squarenote 8, 10, 1, 1572
-	endchannel
+SFX_Cry1D_3_Ch5:
+	duty_cycle_pattern 244
+	square_note 15, 15, 0, 1797
+	square_note 10, 14, 0, 1792
+	square_note 6, 11, 4, 1808
+	square_note 4, 13, 3, 1792
+	square_note 6, 11, 2, 1568
+	square_note 8, 10, 1, 1572
+	sound_ret
 
 
-SFX_Cry1D_3_Ch5:
-	dutycycle 34
-	squarenote 15, 11, 0, 1731
-	squarenote 10, 10, 0, 1729
-	squarenote 6, 8, 4, 1746
-	squarenote 4, 9, 3, 1729
-	squarenote 6, 8, 2, 1505
-	squarenote 8, 6, 1, 1512
-	endchannel
+SFX_Cry1D_3_Ch6:
+	duty_cycle_pattern 34
+	square_note 15, 11, 0, 1731
+	square_note 10, 10, 0, 1729
+	square_note 6, 8, 4, 1746
+	square_note 4, 9, 3, 1729
+	square_note 6, 8, 2, 1505
+	square_note 8, 6, 1, 1512
+	sound_ret
 
 
-SFX_Cry1D_3_Ch7:
-	noisenote 6, 14, 6, 76
-	noisenote 15, 13, 6, 60
-	noisenote 10, 12, 5, 74
-	noisenote 1, 11, 2, 91
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry1D_3_Ch8:
+	noise_note 6, 14, 6, 76
+	noise_note 15, 13, 6, 60
+	noise_note 10, 12, 5, 74
+	noise_note 1, 11, 2, 91
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm
index b028e616..c3106e7b 100644
--- a/audio/sfx/cry1e_1.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,38 +1,38 @@
-SFX_Cry1E_1_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 2, 1536
-	squarenote 6, 14, 2, 1600
-	squarenote 6, 13, 2, 1664
-	squarenote 6, 14, 2, 1728
-	squarenote 6, 13, 2, 1792
-	squarenote 6, 12, 2, 1856
-	squarenote 6, 11, 2, 1920
-	squarenote 8, 10, 1, 1984
-	endchannel
+SFX_Cry1E_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 2, 1536
+	square_note 6, 14, 2, 1600
+	square_note 6, 13, 2, 1664
+	square_note 6, 14, 2, 1728
+	square_note 6, 13, 2, 1792
+	square_note 6, 12, 2, 1856
+	square_note 6, 11, 2, 1920
+	square_note 8, 10, 1, 1984
+	sound_ret
 
 
-SFX_Cry1E_1_Ch5:
-	dutycycle 17
-	squarenote 3, 0, 8, 1
-	squarenote 6, 12, 2, 1473
-	squarenote 6, 11, 2, 1538
-	squarenote 6, 10, 2, 1601
-	squarenote 6, 11, 2, 1666
-	squarenote 6, 10, 2, 1730
-	squarenote 6, 9, 2, 1793
-	squarenote 6, 10, 2, 1858
-	squarenote 8, 8, 1, 1921
-	endchannel
+SFX_Cry1E_1_Ch6:
+	duty_cycle_pattern 17
+	square_note 3, 0, 8, 1
+	square_note 6, 12, 2, 1473
+	square_note 6, 11, 2, 1538
+	square_note 6, 10, 2, 1601
+	square_note 6, 11, 2, 1666
+	square_note 6, 10, 2, 1730
+	square_note 6, 9, 2, 1793
+	square_note 6, 10, 2, 1858
+	square_note 8, 8, 1, 1921
+	sound_ret
 
 
-SFX_Cry1E_1_Ch7:
-	noisenote 6, 0, 8, 1
-	noisenote 5, 14, 2, 92
-	noisenote 5, 12, 2, 76
-	noisenote 5, 13, 2, 60
-	noisenote 5, 11, 2, 44
-	noisenote 5, 12, 2, 28
-	noisenote 5, 10, 2, 27
-	noisenote 5, 9, 2, 26
-	noisenote 8, 8, 1, 24
-	endchannel
+SFX_Cry1E_1_Ch8:
+	noise_note 6, 0, 8, 1
+	noise_note 5, 14, 2, 92
+	noise_note 5, 12, 2, 76
+	noise_note 5, 13, 2, 60
+	noise_note 5, 11, 2, 44
+	noise_note 5, 12, 2, 28
+	noise_note 5, 10, 2, 27
+	noise_note 5, 9, 2, 26
+	noise_note 8, 8, 1, 24
+	sound_ret
diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm
index 783ee324..1c904ce4 100644
--- a/audio/sfx/cry1e_2.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,38 +1,38 @@
-SFX_Cry1E_2_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 2, 1536
-	squarenote 6, 14, 2, 1600
-	squarenote 6, 13, 2, 1664
-	squarenote 6, 14, 2, 1728
-	squarenote 6, 13, 2, 1792
-	squarenote 6, 12, 2, 1856
-	squarenote 6, 11, 2, 1920
-	squarenote 8, 10, 1, 1984
-	endchannel
+SFX_Cry1E_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 2, 1536
+	square_note 6, 14, 2, 1600
+	square_note 6, 13, 2, 1664
+	square_note 6, 14, 2, 1728
+	square_note 6, 13, 2, 1792
+	square_note 6, 12, 2, 1856
+	square_note 6, 11, 2, 1920
+	square_note 8, 10, 1, 1984
+	sound_ret
 
 
-SFX_Cry1E_2_Ch5:
-	dutycycle 17
-	squarenote 3, 0, 8, 1
-	squarenote 6, 12, 2, 1473
-	squarenote 6, 11, 2, 1538
-	squarenote 6, 10, 2, 1601
-	squarenote 6, 11, 2, 1666
-	squarenote 6, 10, 2, 1730
-	squarenote 6, 9, 2, 1793
-	squarenote 6, 10, 2, 1858
-	squarenote 8, 8, 1, 1921
-	endchannel
+SFX_Cry1E_2_Ch6:
+	duty_cycle_pattern 17
+	square_note 3, 0, 8, 1
+	square_note 6, 12, 2, 1473
+	square_note 6, 11, 2, 1538
+	square_note 6, 10, 2, 1601
+	square_note 6, 11, 2, 1666
+	square_note 6, 10, 2, 1730
+	square_note 6, 9, 2, 1793
+	square_note 6, 10, 2, 1858
+	square_note 8, 8, 1, 1921
+	sound_ret
 
 
-SFX_Cry1E_2_Ch7:
-	noisenote 6, 0, 8, 1
-	noisenote 5, 14, 2, 92
-	noisenote 5, 12, 2, 76
-	noisenote 5, 13, 2, 60
-	noisenote 5, 11, 2, 44
-	noisenote 5, 12, 2, 28
-	noisenote 5, 10, 2, 27
-	noisenote 5, 9, 2, 26
-	noisenote 8, 8, 1, 24
-	endchannel
+SFX_Cry1E_2_Ch8:
+	noise_note 6, 0, 8, 1
+	noise_note 5, 14, 2, 92
+	noise_note 5, 12, 2, 76
+	noise_note 5, 13, 2, 60
+	noise_note 5, 11, 2, 44
+	noise_note 5, 12, 2, 28
+	noise_note 5, 10, 2, 27
+	noise_note 5, 9, 2, 26
+	noise_note 8, 8, 1, 24
+	sound_ret
diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm
index f78e6d0a..6fae812c 100644
--- a/audio/sfx/cry1e_3.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,38 +1,38 @@
-SFX_Cry1E_3_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 2, 1536
-	squarenote 6, 14, 2, 1600
-	squarenote 6, 13, 2, 1664
-	squarenote 6, 14, 2, 1728
-	squarenote 6, 13, 2, 1792
-	squarenote 6, 12, 2, 1856
-	squarenote 6, 11, 2, 1920
-	squarenote 8, 10, 1, 1984
-	endchannel
+SFX_Cry1E_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 6, 15, 2, 1536
+	square_note 6, 14, 2, 1600
+	square_note 6, 13, 2, 1664
+	square_note 6, 14, 2, 1728
+	square_note 6, 13, 2, 1792
+	square_note 6, 12, 2, 1856
+	square_note 6, 11, 2, 1920
+	square_note 8, 10, 1, 1984
+	sound_ret
 
 
-SFX_Cry1E_3_Ch5:
-	dutycycle 17
-	squarenote 3, 0, 8, 1
-	squarenote 6, 12, 2, 1473
-	squarenote 6, 11, 2, 1538
-	squarenote 6, 10, 2, 1601
-	squarenote 6, 11, 2, 1666
-	squarenote 6, 10, 2, 1730
-	squarenote 6, 9, 2, 1793
-	squarenote 6, 10, 2, 1858
-	squarenote 8, 8, 1, 1921
-	endchannel
+SFX_Cry1E_3_Ch6:
+	duty_cycle_pattern 17
+	square_note 3, 0, 8, 1
+	square_note 6, 12, 2, 1473
+	square_note 6, 11, 2, 1538
+	square_note 6, 10, 2, 1601
+	square_note 6, 11, 2, 1666
+	square_note 6, 10, 2, 1730
+	square_note 6, 9, 2, 1793
+	square_note 6, 10, 2, 1858
+	square_note 8, 8, 1, 1921
+	sound_ret
 
 
-SFX_Cry1E_3_Ch7:
-	noisenote 6, 0, 8, 1
-	noisenote 5, 14, 2, 92
-	noisenote 5, 12, 2, 76
-	noisenote 5, 13, 2, 60
-	noisenote 5, 11, 2, 44
-	noisenote 5, 12, 2, 28
-	noisenote 5, 10, 2, 27
-	noisenote 5, 9, 2, 26
-	noisenote 8, 8, 1, 24
-	endchannel
+SFX_Cry1E_3_Ch8:
+	noise_note 6, 0, 8, 1
+	noise_note 5, 14, 2, 92
+	noise_note 5, 12, 2, 76
+	noise_note 5, 13, 2, 60
+	noise_note 5, 11, 2, 44
+	noise_note 5, 12, 2, 28
+	noise_note 5, 10, 2, 27
+	noise_note 5, 9, 2, 26
+	noise_note 8, 8, 1, 24
+	sound_ret
diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm
index f4596492..63148b92 100644
--- a/audio/sfx/cry1f_1.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry1F_1_Ch4:
-	dutycycle 165
-	squarenote 3, 15, 4, 1601
-	squarenote 13, 13, 6, 1825
-	squarenote 8, 15, 4, 1817
-	squarenote 8, 12, 1, 1818
-	endchannel
+SFX_Cry1F_1_Ch5:
+	duty_cycle_pattern 165
+	square_note 3, 15, 4, 1601
+	square_note 13, 13, 6, 1825
+	square_note 8, 15, 4, 1817
+	square_note 8, 12, 1, 1818
+	sound_ret
 
 
-SFX_Cry1F_1_Ch5:
-	dutycycle 204
-	squarenote 4, 15, 4, 1408
-	squarenote 14, 14, 6, 1760
-	squarenote 8, 13, 5, 1752
-	squarenote 8, 13, 1, 1756
-	endchannel
+SFX_Cry1F_1_Ch6:
+	duty_cycle_pattern 204
+	square_note 4, 15, 4, 1408
+	square_note 14, 14, 6, 1760
+	square_note 8, 13, 5, 1752
+	square_note 8, 13, 1, 1756
+	sound_ret
 
 
-SFX_Cry1F_1_Ch7:
-	noisenote 5, 12, 4, 70
-	noisenote 13, 10, 5, 68
-	noisenote 8, 12, 4, 69
-	noisenote 8, 11, 1, 68
-	endchannel
+SFX_Cry1F_1_Ch8:
+	noise_note 5, 12, 4, 70
+	noise_note 13, 10, 5, 68
+	noise_note 8, 12, 4, 69
+	noise_note 8, 11, 1, 68
+	sound_ret
diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm
index dc46f49a..868975f8 100644
--- a/audio/sfx/cry1f_2.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry1F_2_Ch4:
-	dutycycle 165
-	squarenote 3, 15, 4, 1601
-	squarenote 13, 13, 6, 1825
-	squarenote 8, 15, 4, 1817
-	squarenote 8, 12, 1, 1818
-	endchannel
+SFX_Cry1F_2_Ch5:
+	duty_cycle_pattern 165
+	square_note 3, 15, 4, 1601
+	square_note 13, 13, 6, 1825
+	square_note 8, 15, 4, 1817
+	square_note 8, 12, 1, 1818
+	sound_ret
 
 
-SFX_Cry1F_2_Ch5:
-	dutycycle 204
-	squarenote 4, 15, 4, 1408
-	squarenote 14, 14, 6, 1760
-	squarenote 8, 13, 5, 1752
-	squarenote 8, 13, 1, 1756
-	endchannel
+SFX_Cry1F_2_Ch6:
+	duty_cycle_pattern 204
+	square_note 4, 15, 4, 1408
+	square_note 14, 14, 6, 1760
+	square_note 8, 13, 5, 1752
+	square_note 8, 13, 1, 1756
+	sound_ret
 
 
-SFX_Cry1F_2_Ch7:
-	noisenote 5, 12, 4, 70
-	noisenote 13, 10, 5, 68
-	noisenote 8, 12, 4, 69
-	noisenote 8, 11, 1, 68
-	endchannel
+SFX_Cry1F_2_Ch8:
+	noise_note 5, 12, 4, 70
+	noise_note 13, 10, 5, 68
+	noise_note 8, 12, 4, 69
+	noise_note 8, 11, 1, 68
+	sound_ret
diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm
index 41c3b766..cc5a6192 100644
--- a/audio/sfx/cry1f_3.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry1F_3_Ch4:
-	dutycycle 165
-	squarenote 3, 15, 4, 1601
-	squarenote 13, 13, 6, 1825
-	squarenote 8, 15, 4, 1817
-	squarenote 8, 12, 1, 1818
-	endchannel
+SFX_Cry1F_3_Ch5:
+	duty_cycle_pattern 165
+	square_note 3, 15, 4, 1601
+	square_note 13, 13, 6, 1825
+	square_note 8, 15, 4, 1817
+	square_note 8, 12, 1, 1818
+	sound_ret
 
 
-SFX_Cry1F_3_Ch5:
-	dutycycle 204
-	squarenote 4, 15, 4, 1408
-	squarenote 14, 14, 6, 1760
-	squarenote 8, 13, 5, 1752
-	squarenote 8, 13, 1, 1756
-	endchannel
+SFX_Cry1F_3_Ch6:
+	duty_cycle_pattern 204
+	square_note 4, 15, 4, 1408
+	square_note 14, 14, 6, 1760
+	square_note 8, 13, 5, 1752
+	square_note 8, 13, 1, 1756
+	sound_ret
 
 
-SFX_Cry1F_3_Ch7:
-	noisenote 5, 12, 4, 70
-	noisenote 13, 10, 5, 68
-	noisenote 8, 12, 4, 69
-	noisenote 8, 11, 1, 68
-	endchannel
+SFX_Cry1F_3_Ch8:
+	noise_note 5, 12, 4, 70
+	noise_note 13, 10, 5, 68
+	noise_note 8, 12, 4, 69
+	noise_note 8, 11, 1, 68
+	sound_ret
diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm
index cd0b85ec..888aeb61 100644
--- a/audio/sfx/cry20_1.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry20_1_Ch4:
-	dutycycle 240
-	squarenote 13, 15, 1, 1297
-	squarenote 13, 14, 1, 1301
-	squarenote 13, 14, 1, 1297
-	squarenote 8, 13, 1, 1297
-	endchannel
+SFX_Cry20_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 13, 15, 1, 1297
+	square_note 13, 14, 1, 1301
+	square_note 13, 14, 1, 1297
+	square_note 8, 13, 1, 1297
+	sound_ret
 
 
-SFX_Cry20_1_Ch5:
-	dutycycle 21
-	squarenote 12, 14, 1, 1292
-	squarenote 12, 13, 1, 1296
-	squarenote 14, 12, 1, 1292
-	squarenote 8, 12, 1, 1290
-	endchannel
+SFX_Cry20_1_Ch6:
+	duty_cycle_pattern 21
+	square_note 12, 14, 1, 1292
+	square_note 12, 13, 1, 1296
+	square_note 14, 12, 1, 1292
+	square_note 8, 12, 1, 1290
+	sound_ret
 
 
-SFX_Cry20_1_Ch7:
-	noisenote 14, 15, 2, 101
-	noisenote 13, 14, 2, 85
-	noisenote 14, 13, 2, 86
-	noisenote 8, 13, 1, 102
-	endchannel
+SFX_Cry20_1_Ch8:
+	noise_note 14, 15, 2, 101
+	noise_note 13, 14, 2, 85
+	noise_note 14, 13, 2, 86
+	noise_note 8, 13, 1, 102
+	sound_ret
diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm
index 7bd21c47..ed22a3f0 100644
--- a/audio/sfx/cry20_2.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry20_2_Ch4:
-	dutycycle 240
-	squarenote 13, 15, 1, 1297
-	squarenote 13, 14, 1, 1301
-	squarenote 13, 14, 1, 1297
-	squarenote 8, 13, 1, 1297
-	endchannel
+SFX_Cry20_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 13, 15, 1, 1297
+	square_note 13, 14, 1, 1301
+	square_note 13, 14, 1, 1297
+	square_note 8, 13, 1, 1297
+	sound_ret
 
 
-SFX_Cry20_2_Ch5:
-	dutycycle 21
-	squarenote 12, 14, 1, 1292
-	squarenote 12, 13, 1, 1296
-	squarenote 14, 12, 1, 1292
-	squarenote 8, 12, 1, 1290
-	endchannel
+SFX_Cry20_2_Ch6:
+	duty_cycle_pattern 21
+	square_note 12, 14, 1, 1292
+	square_note 12, 13, 1, 1296
+	square_note 14, 12, 1, 1292
+	square_note 8, 12, 1, 1290
+	sound_ret
 
 
-SFX_Cry20_2_Ch7:
-	noisenote 14, 15, 2, 101
-	noisenote 13, 14, 2, 85
-	noisenote 14, 13, 2, 86
-	noisenote 8, 13, 1, 102
-	endchannel
+SFX_Cry20_2_Ch8:
+	noise_note 14, 15, 2, 101
+	noise_note 13, 14, 2, 85
+	noise_note 14, 13, 2, 86
+	noise_note 8, 13, 1, 102
+	sound_ret
diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm
index 89013d69..6295e936 100644
--- a/audio/sfx/cry20_3.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry20_3_Ch4:
-	dutycycle 240
-	squarenote 13, 15, 1, 1297
-	squarenote 13, 14, 1, 1301
-	squarenote 13, 14, 1, 1297
-	squarenote 8, 13, 1, 1297
-	endchannel
+SFX_Cry20_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 13, 15, 1, 1297
+	square_note 13, 14, 1, 1301
+	square_note 13, 14, 1, 1297
+	square_note 8, 13, 1, 1297
+	sound_ret
 
 
-SFX_Cry20_3_Ch5:
-	dutycycle 21
-	squarenote 12, 14, 1, 1292
-	squarenote 12, 13, 1, 1296
-	squarenote 14, 12, 1, 1292
-	squarenote 8, 12, 1, 1290
-	endchannel
+SFX_Cry20_3_Ch6:
+	duty_cycle_pattern 21
+	square_note 12, 14, 1, 1292
+	square_note 12, 13, 1, 1296
+	square_note 14, 12, 1, 1292
+	square_note 8, 12, 1, 1290
+	sound_ret
 
 
-SFX_Cry20_3_Ch7:
-	noisenote 14, 15, 2, 101
-	noisenote 13, 14, 2, 85
-	noisenote 14, 13, 2, 86
-	noisenote 8, 13, 1, 102
-	endchannel
+SFX_Cry20_3_Ch8:
+	noise_note 14, 15, 2, 101
+	noise_note 13, 14, 2, 85
+	noise_note 14, 13, 2, 86
+	noise_note 8, 13, 1, 102
+	sound_ret
diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm
index 7cfad5d5..d9df1eca 100644
--- a/audio/sfx/cry21_1.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,27 +1,27 @@
-SFX_Cry21_1_Ch4:
-	dutycycle 27
-	squarenote 3, 15, 3, 1380
-	squarenote 2, 14, 2, 1348
-	squarenote 5, 13, 1, 1314
-	squarenote 2, 11, 2, 1156
-	squarenote 8, 13, 1, 1186
-	squarenote 3, 15, 3, 1316
-	squarenote 4, 14, 4, 1252
-	squarenote 8, 13, 1, 1282
-	endchannel
+SFX_Cry21_1_Ch5:
+	duty_cycle_pattern 27
+	square_note 3, 15, 3, 1380
+	square_note 2, 14, 2, 1348
+	square_note 5, 13, 1, 1314
+	square_note 2, 11, 2, 1156
+	square_note 8, 13, 1, 1186
+	square_note 3, 15, 3, 1316
+	square_note 4, 14, 4, 1252
+	square_note 8, 13, 1, 1282
+	sound_ret
 
 
-SFX_Cry21_1_Ch5:
-	dutycycle 204
-	squarenote 3, 13, 3, 1376
-	squarenote 2, 12, 2, 1344
-	squarenote 5, 12, 1, 1312
-	squarenote 2, 9, 2, 1152
-	squarenote 8, 12, 1, 1184
-	squarenote 3, 13, 3, 1312
-	squarenote 3, 12, 4, 1248
-	squarenote 8, 12, 1, 1280
+SFX_Cry21_1_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 13, 3, 1376
+	square_note 2, 12, 2, 1344
+	square_note 5, 12, 1, 1312
+	square_note 2, 9, 2, 1152
+	square_note 8, 12, 1, 1184
+	square_note 3, 13, 3, 1312
+	square_note 3, 12, 4, 1248
+	square_note 8, 12, 1, 1280
 
 
-SFX_Cry21_1_Ch7:
-	endchannel
+SFX_Cry21_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm
index cb4b80d3..f506e124 100644
--- a/audio/sfx/cry21_2.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,27 +1,27 @@
-SFX_Cry21_2_Ch4:
-	dutycycle 27
-	squarenote 3, 15, 3, 1380
-	squarenote 2, 14, 2, 1348
-	squarenote 5, 13, 1, 1314
-	squarenote 2, 11, 2, 1156
-	squarenote 8, 13, 1, 1186
-	squarenote 3, 15, 3, 1316
-	squarenote 4, 14, 4, 1252
-	squarenote 8, 13, 1, 1282
-	endchannel
+SFX_Cry21_2_Ch5:
+	duty_cycle_pattern 27
+	square_note 3, 15, 3, 1380
+	square_note 2, 14, 2, 1348
+	square_note 5, 13, 1, 1314
+	square_note 2, 11, 2, 1156
+	square_note 8, 13, 1, 1186
+	square_note 3, 15, 3, 1316
+	square_note 4, 14, 4, 1252
+	square_note 8, 13, 1, 1282
+	sound_ret
 
 
-SFX_Cry21_2_Ch5:
-	dutycycle 204
-	squarenote 3, 13, 3, 1376
-	squarenote 2, 12, 2, 1344
-	squarenote 5, 12, 1, 1312
-	squarenote 2, 9, 2, 1152
-	squarenote 8, 12, 1, 1184
-	squarenote 3, 13, 3, 1312
-	squarenote 3, 12, 4, 1248
-	squarenote 8, 12, 1, 1280
+SFX_Cry21_2_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 13, 3, 1376
+	square_note 2, 12, 2, 1344
+	square_note 5, 12, 1, 1312
+	square_note 2, 9, 2, 1152
+	square_note 8, 12, 1, 1184
+	square_note 3, 13, 3, 1312
+	square_note 3, 12, 4, 1248
+	square_note 8, 12, 1, 1280
 
 
-SFX_Cry21_2_Ch7:
-	endchannel
+SFX_Cry21_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm
index 971a85dc..c93a4784 100644
--- a/audio/sfx/cry21_3.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,27 +1,27 @@
-SFX_Cry21_3_Ch4:
-	dutycycle 27
-	squarenote 3, 15, 3, 1380
-	squarenote 2, 14, 2, 1348
-	squarenote 5, 13, 1, 1314
-	squarenote 2, 11, 2, 1156
-	squarenote 8, 13, 1, 1186
-	squarenote 3, 15, 3, 1316
-	squarenote 4, 14, 4, 1252
-	squarenote 8, 13, 1, 1282
-	endchannel
+SFX_Cry21_3_Ch5:
+	duty_cycle_pattern 27
+	square_note 3, 15, 3, 1380
+	square_note 2, 14, 2, 1348
+	square_note 5, 13, 1, 1314
+	square_note 2, 11, 2, 1156
+	square_note 8, 13, 1, 1186
+	square_note 3, 15, 3, 1316
+	square_note 4, 14, 4, 1252
+	square_note 8, 13, 1, 1282
+	sound_ret
 
 
-SFX_Cry21_3_Ch5:
-	dutycycle 204
-	squarenote 3, 13, 3, 1376
-	squarenote 2, 12, 2, 1344
-	squarenote 5, 12, 1, 1312
-	squarenote 2, 9, 2, 1152
-	squarenote 8, 12, 1, 1184
-	squarenote 3, 13, 3, 1312
-	squarenote 3, 12, 4, 1248
-	squarenote 8, 12, 1, 1280
+SFX_Cry21_3_Ch6:
+	duty_cycle_pattern 204
+	square_note 3, 13, 3, 1376
+	square_note 2, 12, 2, 1344
+	square_note 5, 12, 1, 1312
+	square_note 2, 9, 2, 1152
+	square_note 8, 12, 1, 1184
+	square_note 3, 13, 3, 1312
+	square_note 3, 12, 4, 1248
+	square_note 8, 12, 1, 1280
 
 
-SFX_Cry21_3_Ch7:
-	endchannel
+SFX_Cry21_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm
index 77ba4679..72ea2db3 100644
--- a/audio/sfx/cry22_1.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry22_1_Ch4:
-	dutycycle 17
-	squarenote 2, 3, -5, 897
-	squarenote 7, 15, 5, 1537
-	squarenote 1, 12, 2, 1153
-	squarenote 8, 9, 1, 897
-	endchannel
+SFX_Cry22_1_Ch5:
+	duty_cycle_pattern 17
+	square_note 2, 3, -5, 897
+	square_note 7, 15, 5, 1537
+	square_note 1, 12, 2, 1153
+	square_note 8, 9, 1, 897
+	sound_ret
 
 
-SFX_Cry22_1_Ch5:
-	dutycycle 238
-	squarenote 2, 3, -6, 1456
-	squarenote 7, 13, 5, 1885
-	squarenote 1, 11, 2, 1712
-	squarenote 8, 6, 1, 1456
-	endchannel
+SFX_Cry22_1_Ch6:
+	duty_cycle_pattern 238
+	square_note 2, 3, -6, 1456
+	square_note 7, 13, 5, 1885
+	square_note 1, 11, 2, 1712
+	square_note 8, 6, 1, 1456
+	sound_ret
 
 
-SFX_Cry22_1_Ch7:
-	noisenote 2, 9, 2, 73
-	noisenote 7, 11, 5, 41
-	noisenote 1, 10, 2, 57
-	noisenote 8, 9, 1, 73
-	endchannel
+SFX_Cry22_1_Ch8:
+	noise_note 2, 9, 2, 73
+	noise_note 7, 11, 5, 41
+	noise_note 1, 10, 2, 57
+	noise_note 8, 9, 1, 73
+	sound_ret
diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm
index 05eb17a1..9492f818 100644
--- a/audio/sfx/cry22_2.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry22_2_Ch4:
-	dutycycle 17
-	squarenote 2, 3, -5, 897
-	squarenote 7, 15, 5, 1537
-	squarenote 1, 12, 2, 1153
-	squarenote 8, 9, 1, 897
-	endchannel
+SFX_Cry22_2_Ch5:
+	duty_cycle_pattern 17
+	square_note 2, 3, -5, 897
+	square_note 7, 15, 5, 1537
+	square_note 1, 12, 2, 1153
+	square_note 8, 9, 1, 897
+	sound_ret
 
 
-SFX_Cry22_2_Ch5:
-	dutycycle 238
-	squarenote 2, 3, -6, 1456
-	squarenote 7, 13, 5, 1885
-	squarenote 1, 11, 2, 1712
-	squarenote 8, 6, 1, 1456
-	endchannel
+SFX_Cry22_2_Ch6:
+	duty_cycle_pattern 238
+	square_note 2, 3, -6, 1456
+	square_note 7, 13, 5, 1885
+	square_note 1, 11, 2, 1712
+	square_note 8, 6, 1, 1456
+	sound_ret
 
 
-SFX_Cry22_2_Ch7:
-	noisenote 2, 9, 2, 73
-	noisenote 7, 11, 5, 41
-	noisenote 1, 10, 2, 57
-	noisenote 8, 9, 1, 73
-	endchannel
+SFX_Cry22_2_Ch8:
+	noise_note 2, 9, 2, 73
+	noise_note 7, 11, 5, 41
+	noise_note 1, 10, 2, 57
+	noise_note 8, 9, 1, 73
+	sound_ret
diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm
index 01cc5b28..55cce857 100644
--- a/audio/sfx/cry22_3.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry22_3_Ch4:
-	dutycycle 17
-	squarenote 2, 3, -5, 897
-	squarenote 7, 15, 5, 1537
-	squarenote 1, 12, 2, 1153
-	squarenote 8, 9, 1, 897
-	endchannel
+SFX_Cry22_3_Ch5:
+	duty_cycle_pattern 17
+	square_note 2, 3, -5, 897
+	square_note 7, 15, 5, 1537
+	square_note 1, 12, 2, 1153
+	square_note 8, 9, 1, 897
+	sound_ret
 
 
-SFX_Cry22_3_Ch5:
-	dutycycle 238
-	squarenote 2, 3, -6, 1456
-	squarenote 7, 13, 5, 1885
-	squarenote 1, 11, 2, 1712
-	squarenote 8, 6, 1, 1456
-	endchannel
+SFX_Cry22_3_Ch6:
+	duty_cycle_pattern 238
+	square_note 2, 3, -6, 1456
+	square_note 7, 13, 5, 1885
+	square_note 1, 11, 2, 1712
+	square_note 8, 6, 1, 1456
+	sound_ret
 
 
-SFX_Cry22_3_Ch7:
-	noisenote 2, 9, 2, 73
-	noisenote 7, 11, 5, 41
-	noisenote 1, 10, 2, 57
-	noisenote 8, 9, 1, 73
-	endchannel
+SFX_Cry22_3_Ch8:
+	noise_note 2, 9, 2, 73
+	noise_note 7, 11, 5, 41
+	noise_note 1, 10, 2, 57
+	noise_note 8, 9, 1, 73
+	sound_ret
diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm
index e87e2b41..bd93eb67 100644
--- a/audio/sfx/cry23_1.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,25 +1,25 @@
-SFX_Cry23_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1984
-	squarenote 6, 14, 4, 1985
-	squarenote 10, 15, 6, 1984
-	squarenote 4, 13, 3, 1986
-	squarenote 8, 12, 1, 1984
-	endchannel
+SFX_Cry23_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1984
+	square_note 6, 14, 4, 1985
+	square_note 10, 15, 6, 1984
+	square_note 4, 13, 3, 1986
+	square_note 8, 12, 1, 1984
+	sound_ret
 
 
-SFX_Cry23_1_Ch5:
-	dutycycle 95
-	squarenote 15, 9, 7, 1921
-	squarenote 6, 8, 4, 1920
-	squarenote 10, 9, 6, 1921
-	squarenote 15, 8, 3, 1921
-	endchannel
+SFX_Cry23_1_Ch6:
+	duty_cycle_pattern 95
+	square_note 15, 9, 7, 1921
+	square_note 6, 8, 4, 1920
+	square_note 10, 9, 6, 1921
+	square_note 15, 8, 3, 1921
+	sound_ret
 
 
-SFX_Cry23_1_Ch7:
-	noisenote 3, 15, 2, 60
-	noisenote 13, 14, 6, 44
-	noisenote 15, 13, 7, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry23_1_Ch8:
+	noise_note 3, 15, 2, 60
+	noise_note 13, 14, 6, 44
+	noise_note 15, 13, 7, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm
index 24dba11c..78932fd9 100644
--- a/audio/sfx/cry23_2.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,25 +1,25 @@
-SFX_Cry23_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1984
-	squarenote 6, 14, 4, 1985
-	squarenote 10, 15, 6, 1984
-	squarenote 4, 13, 3, 1986
-	squarenote 8, 12, 1, 1984
-	endchannel
+SFX_Cry23_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1984
+	square_note 6, 14, 4, 1985
+	square_note 10, 15, 6, 1984
+	square_note 4, 13, 3, 1986
+	square_note 8, 12, 1, 1984
+	sound_ret
 
 
-SFX_Cry23_2_Ch5:
-	dutycycle 95
-	squarenote 15, 9, 7, 1921
-	squarenote 6, 8, 4, 1920
-	squarenote 10, 9, 6, 1921
-	squarenote 15, 8, 3, 1921
-	endchannel
+SFX_Cry23_2_Ch6:
+	duty_cycle_pattern 95
+	square_note 15, 9, 7, 1921
+	square_note 6, 8, 4, 1920
+	square_note 10, 9, 6, 1921
+	square_note 15, 8, 3, 1921
+	sound_ret
 
 
-SFX_Cry23_2_Ch7:
-	noisenote 3, 15, 2, 60
-	noisenote 13, 14, 6, 44
-	noisenote 15, 13, 7, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry23_2_Ch8:
+	noise_note 3, 15, 2, 60
+	noise_note 13, 14, 6, 44
+	noise_note 15, 13, 7, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm
index e3c62be5..14b52850 100644
--- a/audio/sfx/cry23_3.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,25 +1,25 @@
-SFX_Cry23_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1984
-	squarenote 6, 14, 4, 1985
-	squarenote 10, 15, 6, 1984
-	squarenote 4, 13, 3, 1986
-	squarenote 8, 12, 1, 1984
-	endchannel
+SFX_Cry23_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1984
+	square_note 6, 14, 4, 1985
+	square_note 10, 15, 6, 1984
+	square_note 4, 13, 3, 1986
+	square_note 8, 12, 1, 1984
+	sound_ret
 
 
-SFX_Cry23_3_Ch5:
-	dutycycle 95
-	squarenote 15, 9, 7, 1921
-	squarenote 6, 8, 4, 1920
-	squarenote 10, 9, 6, 1921
-	squarenote 15, 8, 3, 1921
-	endchannel
+SFX_Cry23_3_Ch6:
+	duty_cycle_pattern 95
+	square_note 15, 9, 7, 1921
+	square_note 6, 8, 4, 1920
+	square_note 10, 9, 6, 1921
+	square_note 15, 8, 3, 1921
+	sound_ret
 
 
-SFX_Cry23_3_Ch7:
-	noisenote 3, 15, 2, 60
-	noisenote 13, 14, 6, 44
-	noisenote 15, 13, 7, 60
-	noisenote 8, 12, 1, 44
-	endchannel
+SFX_Cry23_3_Ch8:
+	noise_note 3, 15, 2, 60
+	noise_note 13, 14, 6, 44
+	noise_note 15, 13, 7, 60
+	noise_note 8, 12, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm
index 99218856..36654731 100644
--- a/audio/sfx/cry24_1.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,33 +1,33 @@
-SFX_Cry24_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1664
-	squarenote 10, 14, 6, 1668
-	squarenote 15, 13, 7, 1680
-	squarenote 8, 13, 5, 1680
-	squarenote 6, 12, 4, 1672
-	squarenote 5, 13, 3, 1648
-	squarenote 4, 13, 3, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry24_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1664
+	square_note 10, 14, 6, 1668
+	square_note 15, 13, 7, 1680
+	square_note 8, 13, 5, 1680
+	square_note 6, 12, 4, 1672
+	square_note 5, 13, 3, 1648
+	square_note 4, 13, 3, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry24_1_Ch5:
-	dutycycle 5
-	squarenote 15, 11, 7, 1601
-	squarenote 10, 9, 6, 1602
-	squarenote 15, 10, 7, 1617
-	squarenote 8, 10, 5, 1617
-	squarenote 6, 9, 4, 1607
-	squarenote 5, 10, 3, 1585
-	squarenote 4, 9, 3, 1570
-	squarenote 8, 7, 1, 1537
-	endchannel
+SFX_Cry24_1_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 11, 7, 1601
+	square_note 10, 9, 6, 1602
+	square_note 15, 10, 7, 1617
+	square_note 8, 10, 5, 1617
+	square_note 6, 9, 4, 1607
+	square_note 5, 10, 3, 1585
+	square_note 4, 9, 3, 1570
+	square_note 8, 7, 1, 1537
+	sound_ret
 
 
-SFX_Cry24_1_Ch7:
-	noisenote 15, 14, 4, 60
-	noisenote 10, 12, 7, 76
-	noisenote 10, 12, 7, 60
-	noisenote 12, 11, 7, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry24_1_Ch8:
+	noise_note 15, 14, 4, 60
+	noise_note 10, 12, 7, 76
+	noise_note 10, 12, 7, 60
+	noise_note 12, 11, 7, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm
index 9773793c..b23a020e 100644
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,33 +1,33 @@
-SFX_Cry24_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1664
-	squarenote 10, 14, 6, 1668
-	squarenote 15, 13, 7, 1680
-	squarenote 8, 13, 5, 1680
-	squarenote 6, 12, 4, 1672
-	squarenote 5, 13, 3, 1648
-	squarenote 4, 13, 3, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry24_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1664
+	square_note 10, 14, 6, 1668
+	square_note 15, 13, 7, 1680
+	square_note 8, 13, 5, 1680
+	square_note 6, 12, 4, 1672
+	square_note 5, 13, 3, 1648
+	square_note 4, 13, 3, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry24_2_Ch5:
-	dutycycle 5
-	squarenote 15, 11, 7, 1601
-	squarenote 10, 9, 6, 1602
-	squarenote 15, 10, 7, 1617
-	squarenote 8, 10, 5, 1617
-	squarenote 6, 9, 4, 1607
-	squarenote 5, 10, 3, 1585
-	squarenote 4, 9, 3, 1570
-	squarenote 8, 7, 1, 1537
-	endchannel
+SFX_Cry24_2_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 11, 7, 1601
+	square_note 10, 9, 6, 1602
+	square_note 15, 10, 7, 1617
+	square_note 8, 10, 5, 1617
+	square_note 6, 9, 4, 1607
+	square_note 5, 10, 3, 1585
+	square_note 4, 9, 3, 1570
+	square_note 8, 7, 1, 1537
+	sound_ret
 
 
-SFX_Cry24_2_Ch7:
-	noisenote 15, 14, 4, 60
-	noisenote 10, 12, 7, 76
-	noisenote 10, 12, 7, 60
-	noisenote 12, 11, 7, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry24_2_Ch8:
+	noise_note 15, 14, 4, 60
+	noise_note 10, 12, 7, 76
+	noise_note 10, 12, 7, 60
+	noise_note 12, 11, 7, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm
index 785f6e9b..6a9d5bf6 100644
--- a/audio/sfx/cry24_3.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,33 +1,33 @@
-SFX_Cry24_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1664
-	squarenote 10, 14, 6, 1668
-	squarenote 15, 13, 7, 1680
-	squarenote 8, 13, 5, 1680
-	squarenote 6, 12, 4, 1672
-	squarenote 5, 13, 3, 1648
-	squarenote 4, 13, 3, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry24_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1664
+	square_note 10, 14, 6, 1668
+	square_note 15, 13, 7, 1680
+	square_note 8, 13, 5, 1680
+	square_note 6, 12, 4, 1672
+	square_note 5, 13, 3, 1648
+	square_note 4, 13, 3, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry24_3_Ch5:
-	dutycycle 5
-	squarenote 15, 11, 7, 1601
-	squarenote 10, 9, 6, 1602
-	squarenote 15, 10, 7, 1617
-	squarenote 8, 10, 5, 1617
-	squarenote 6, 9, 4, 1607
-	squarenote 5, 10, 3, 1585
-	squarenote 4, 9, 3, 1570
-	squarenote 8, 7, 1, 1537
-	endchannel
+SFX_Cry24_3_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 11, 7, 1601
+	square_note 10, 9, 6, 1602
+	square_note 15, 10, 7, 1617
+	square_note 8, 10, 5, 1617
+	square_note 6, 9, 4, 1607
+	square_note 5, 10, 3, 1585
+	square_note 4, 9, 3, 1570
+	square_note 8, 7, 1, 1537
+	sound_ret
 
 
-SFX_Cry24_3_Ch7:
-	noisenote 15, 14, 4, 60
-	noisenote 10, 12, 7, 76
-	noisenote 10, 12, 7, 60
-	noisenote 12, 11, 7, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry24_3_Ch8:
+	noise_note 15, 14, 4, 60
+	noise_note 10, 12, 7, 76
+	noise_note 10, 12, 7, 60
+	noise_note 12, 11, 7, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm
index 9733b0f5..670cbaae 100644
--- a/audio/sfx/cry25_1.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,26 +1,26 @@
-SFX_Cry25_1_Ch4:
-	dutycycle 165
-	squarenote 6, 15, 4, 1856
-	squarenote 15, 14, 3, 1840
-	squarenote 4, 15, 4, 1856
-	squarenote 5, 11, 3, 1864
-	squarenote 8, 13, 1, 1872
-	endchannel
+SFX_Cry25_1_Ch5:
+	duty_cycle_pattern 165
+	square_note 6, 15, 4, 1856
+	square_note 15, 14, 3, 1840
+	square_note 4, 15, 4, 1856
+	square_note 5, 11, 3, 1864
+	square_note 8, 13, 1, 1872
+	sound_ret
 
 
-SFX_Cry25_1_Ch5:
-	dutycycle 119
-	squarenote 6, 12, 3, 1810
-	squarenote 15, 11, 3, 1796
-	squarenote 3, 12, 3, 1810
-	squarenote 4, 12, 3, 1825
-	squarenote 8, 11, 1, 1842
-	endchannel
+SFX_Cry25_1_Ch6:
+	duty_cycle_pattern 119
+	square_note 6, 12, 3, 1810
+	square_note 15, 11, 3, 1796
+	square_note 3, 12, 3, 1810
+	square_note 4, 12, 3, 1825
+	square_note 8, 11, 1, 1842
+	sound_ret
 
 
-SFX_Cry25_1_Ch7:
-	noisenote 8, 13, 6, 44
-	noisenote 12, 12, 6, 60
-	noisenote 10, 11, 6, 44
-	noisenote 8, 9, 1, 28
-	endchannel
+SFX_Cry25_1_Ch8:
+	noise_note 8, 13, 6, 44
+	noise_note 12, 12, 6, 60
+	noise_note 10, 11, 6, 44
+	noise_note 8, 9, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm
index c38fa988..6b52d9bf 100644
--- a/audio/sfx/cry25_2.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,26 +1,26 @@
-SFX_Cry25_2_Ch4:
-	dutycycle 165
-	squarenote 6, 15, 4, 1856
-	squarenote 15, 14, 3, 1840
-	squarenote 4, 15, 4, 1856
-	squarenote 5, 11, 3, 1864
-	squarenote 8, 13, 1, 1872
-	endchannel
+SFX_Cry25_2_Ch5:
+	duty_cycle_pattern 165
+	square_note 6, 15, 4, 1856
+	square_note 15, 14, 3, 1840
+	square_note 4, 15, 4, 1856
+	square_note 5, 11, 3, 1864
+	square_note 8, 13, 1, 1872
+	sound_ret
 
 
-SFX_Cry25_2_Ch5:
-	dutycycle 119
-	squarenote 6, 12, 3, 1810
-	squarenote 15, 11, 3, 1796
-	squarenote 3, 12, 3, 1810
-	squarenote 4, 12, 3, 1825
-	squarenote 8, 11, 1, 1842
-	endchannel
+SFX_Cry25_2_Ch6:
+	duty_cycle_pattern 119
+	square_note 6, 12, 3, 1810
+	square_note 15, 11, 3, 1796
+	square_note 3, 12, 3, 1810
+	square_note 4, 12, 3, 1825
+	square_note 8, 11, 1, 1842
+	sound_ret
 
 
-SFX_Cry25_2_Ch7:
-	noisenote 8, 13, 6, 44
-	noisenote 12, 12, 6, 60
-	noisenote 10, 11, 6, 44
-	noisenote 8, 9, 1, 28
-	endchannel
+SFX_Cry25_2_Ch8:
+	noise_note 8, 13, 6, 44
+	noise_note 12, 12, 6, 60
+	noise_note 10, 11, 6, 44
+	noise_note 8, 9, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm
index 610fa04b..22ce220d 100644
--- a/audio/sfx/cry25_3.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,26 +1,26 @@
-SFX_Cry25_3_Ch4:
-	dutycycle 165
-	squarenote 6, 15, 4, 1856
-	squarenote 15, 14, 3, 1840
-	squarenote 4, 15, 4, 1856
-	squarenote 5, 11, 3, 1864
-	squarenote 8, 13, 1, 1872
-	endchannel
+SFX_Cry25_3_Ch5:
+	duty_cycle_pattern 165
+	square_note 6, 15, 4, 1856
+	square_note 15, 14, 3, 1840
+	square_note 4, 15, 4, 1856
+	square_note 5, 11, 3, 1864
+	square_note 8, 13, 1, 1872
+	sound_ret
 
 
-SFX_Cry25_3_Ch5:
-	dutycycle 119
-	squarenote 6, 12, 3, 1810
-	squarenote 15, 11, 3, 1796
-	squarenote 3, 12, 3, 1810
-	squarenote 4, 12, 3, 1825
-	squarenote 8, 11, 1, 1842
-	endchannel
+SFX_Cry25_3_Ch6:
+	duty_cycle_pattern 119
+	square_note 6, 12, 3, 1810
+	square_note 15, 11, 3, 1796
+	square_note 3, 12, 3, 1810
+	square_note 4, 12, 3, 1825
+	square_note 8, 11, 1, 1842
+	sound_ret
 
 
-SFX_Cry25_3_Ch7:
-	noisenote 8, 13, 6, 44
-	noisenote 12, 12, 6, 60
-	noisenote 10, 11, 6, 44
-	noisenote 8, 9, 1, 28
-	endchannel
+SFX_Cry25_3_Ch8:
+	noise_note 8, 13, 6, 44
+	noise_note 12, 12, 6, 60
+	noise_note 10, 11, 6, 44
+	noise_note 8, 9, 1, 28
+	sound_ret
diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm
index b4466ca7..fd53e240 100644
--- a/audio/sfx/cut_1.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,7 +1,7 @@
-SFX_Cut_1_Ch7:
-	noisenote 2, 15, 7, 36
-	noisenote 2, 15, 7, 52
-	noisenote 4, 15, 7, 68
-	noisenote 8, 15, 4, 85
-	noisenote 8, 15, 1, 68
-	endchannel
+SFX_Cut_1_Ch8:
+	noise_note 2, 15, 7, 36
+	noise_note 2, 15, 7, 52
+	noise_note 4, 15, 7, 68
+	noise_note 8, 15, 4, 85
+	noise_note 8, 15, 1, 68
+	sound_ret
diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm
index ff7a0c4d..b223b99b 100644
--- a/audio/sfx/cut_3.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,7 +1,7 @@
-SFX_Cut_3_Ch7:
-	noisenote 2, 15, 7, 36
-	noisenote 2, 15, 7, 52
-	noisenote 4, 15, 7, 68
-	noisenote 8, 15, 4, 85
-	noisenote 8, 15, 1, 68
-	endchannel
+SFX_Cut_3_Ch8:
+	noise_note 2, 15, 7, 36
+	noise_note 2, 15, 7, 52
+	noise_note 4, 15, 7, 68
+	noise_note 8, 15, 4, 85
+	noise_note 8, 15, 1, 68
+	sound_ret
diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm
index 81351836..693bb0c5 100644
--- a/audio/sfx/cymbal1_1.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_1_Ch7:
-	noisenote 0, 10, 1, 16
-	endchannel
+SFX_Cymbal1_1_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm
index abae0e01..206d44ae 100644
--- a/audio/sfx/cymbal1_2.asm
+++ b/audio/sfx/cymbal1_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_2_Ch7:
-	noisenote 0, 10, 1, 16
-	endchannel
+SFX_Cymbal1_2_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm
index f76df305..9389cc6f 100644
--- a/audio/sfx/cymbal1_3.asm
+++ b/audio/sfx/cymbal1_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_3_Ch7:
-	noisenote 0, 10, 1, 16
-	endchannel
+SFX_Cymbal1_3_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm
index da3ba376..3f050d96 100644
--- a/audio/sfx/cymbal2_1.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_1_Ch7:
-	noisenote 0, 10, 2, 17
-	endchannel
+SFX_Cymbal2_1_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm
index c8fb1241..ab0a2edd 100644
--- a/audio/sfx/cymbal2_2.asm
+++ b/audio/sfx/cymbal2_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_2_Ch7:
-	noisenote 0, 10, 2, 17
-	endchannel
+SFX_Cymbal2_2_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm
index b34236d0..26f7048a 100644
--- a/audio/sfx/cymbal2_3.asm
+++ b/audio/sfx/cymbal2_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_3_Ch7:
-	noisenote 0, 10, 2, 17
-	endchannel
+SFX_Cymbal2_3_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm
index f9b8733e..179de2f0 100644
--- a/audio/sfx/cymbal3_1.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_1_Ch7:
-	noisenote 0, 10, 2, 80
-	endchannel
+SFX_Cymbal3_1_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm
index d80395a4..09e3b6e1 100644
--- a/audio/sfx/cymbal3_2.asm
+++ b/audio/sfx/cymbal3_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_2_Ch7:
-	noisenote 0, 10, 2, 80
-	endchannel
+SFX_Cymbal3_2_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm
index 1a9a07e2..a7af3bb0 100644
--- a/audio/sfx/cymbal3_3.asm
+++ b/audio/sfx/cymbal3_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_3_Ch7:
-	noisenote 0, 10, 2, 80
-	endchannel
+SFX_Cymbal3_3_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm
index c96300fe..5e0665f6 100644
--- a/audio/sfx/damage.asm
+++ b/audio/sfx/damage.asm
@@ -1,5 +1,5 @@
-SFX_Damage_Ch7:
-	noisenote 2, 15, 4, 68
-	noisenote 2, 15, 4, 20
-	noisenote 15, 15, 1, 50
-	endchannel
+SFX_Damage_Ch8:
+	noise_note 2, 15, 4, 68
+	noise_note 2, 15, 4, 20
+	noise_note 15, 15, 1, 50
+	sound_ret
diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm
index b8dabd64..fe822270 100644
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,18 +1,18 @@
-SFX_Denied_1_Ch4:
-	duty 3
-	pitchenvelope 5, -2
-	squarenote 4, 15, 0, 1280
-	pitchenvelope 0, 0
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1280
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Denied_1_Ch5:
+	duty_cycle 3
+	pitch_sweep 5, -2
+	square_note 4, 15, 0, 1280
+	pitch_sweep 0, 0
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1280
+	square_note 1, 0, 0, 0
+	sound_ret
 
 
-SFX_Denied_1_Ch5:
-	duty 3
-	squarenote 4, 15, 0, 1025
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1025
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Denied_1_Ch6:
+	duty_cycle 3
+	square_note 4, 15, 0, 1025
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1025
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm
index 0deb99eb..51b98de4 100644
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,18 +1,18 @@
-SFX_Denied_3_Ch4:
-	duty 3
-	pitchenvelope 5, -2
-	squarenote 4, 15, 0, 1280
-	pitchenvelope 0, 0
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1280
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Denied_3_Ch5:
+	duty_cycle 3
+	pitch_sweep 5, -2
+	square_note 4, 15, 0, 1280
+	pitch_sweep 0, 0
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1280
+	square_note 1, 0, 0, 0
+	sound_ret
 
 
-SFX_Denied_3_Ch5:
-	duty 3
-	squarenote 4, 15, 0, 1025
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1025
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Denied_3_Ch6:
+	duty_cycle 3
+	square_note 4, 15, 0, 1025
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1025
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm
index 46039163..147c3eb7 100644
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,15 +1,15 @@
-SFX_Dex_Page_Added_Ch4:
-	duty 2
-	pitchenvelope 4, 4
-	squarenote 15, 15, 0, 1264
-	pitchenvelope 1, 7
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Dex_Page_Added_Ch5:
+	duty_cycle 2
+	pitch_sweep 4, 4
+	square_note 15, 15, 0, 1264
+	pitch_sweep 1, 7
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Dex_Page_Added_Ch5:
-	duty 2
-	squarenote 15, 9, 2, 1536
-	squarenote 15, 9, 2, 1922
-	endchannel
+SFX_Dex_Page_Added_Ch6:
+	duty_cycle 2
+	square_note 15, 9, 2, 1536
+	square_note 15, 9, 2, 1922
+	sound_ret
diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm
index 82262b2e..14638602 100644
--- a/audio/sfx/doubleslap.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,4 +1,4 @@
-SFX_Doubleslap_Ch7:
-	noisenote 8, 15, 1, 50
-	noisenote 8, 15, 1, 51
-	endchannel
+SFX_Doubleslap_Ch8:
+	noise_note 8, 15, 1, 50
+	noise_note 8, 15, 1, 51
+	sound_ret
diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm
index dfae7edd..30c3ecd1 100644
--- a/audio/sfx/enter_pc_1.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,7 +1,7 @@
-SFX_Enter_PC_1_Ch4:
-	duty 2
-	squarenote 6, 15, 0, 1792
-	squarenote 4, 0, 0, 0
-	squarenote 6, 15, 0, 1792
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Enter_PC_1_Ch5:
+	duty_cycle 2
+	square_note 6, 15, 0, 1792
+	square_note 4, 0, 0, 0
+	square_note 6, 15, 0, 1792
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm
index e4372af9..9c741798 100644
--- a/audio/sfx/enter_pc_3.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,7 +1,7 @@
-SFX_Enter_PC_3_Ch4:
-	duty 2
-	squarenote 4, 15, 0, 1792
-	squarenote 4, 0, 0, 0
-	squarenote 4, 15, 0, 1792
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Enter_PC_3_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 0, 1792
+	square_note 4, 0, 0, 0
+	square_note 4, 15, 0, 1792
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm
index 00e9c255..6ce363e0 100644
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,6 +1,6 @@
-SFX_Faint_Fall_Ch4:
-	duty 1
-	pitchenvelope 10, -7
-	squarenote 15, 15, 2, 1920
-	pitchenvelope 0, 0
-	endchannel
+SFX_Faint_Fall_Ch5:
+	duty_cycle 1
+	pitch_sweep 10, -7
+	square_note 15, 15, 2, 1920
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm
index d866b588..d7449c84 100644
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,11 +1,11 @@
-SFX_Faint_Thud_Ch4:
-	squarenote 15, 13, 1, 512
-	pitchenvelope 0, 0
-	endchannel
+SFX_Faint_Thud_Ch5:
+	square_note 15, 13, 1, 512
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Faint_Thud_Ch7:
-	noisenote 4, 15, 5, 51
-	noisenote 8, 15, 4, 34
-	noisenote 15, 15, 2, 33
-	endchannel
+SFX_Faint_Thud_Ch8:
+	noise_note 4, 15, 5, 51
+	noise_note 8, 15, 4, 34
+	noise_note 15, 15, 2, 33
+	sound_ret
diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm
index 567485a5..40ebb966 100644
--- a/audio/sfx/fly_1.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,18 +1,18 @@
-SFX_Fly_1_Ch7:
-	noisenote 2, 15, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 10, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 13, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 8, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 11, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 6, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 9, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 4, 1, 18
-	noisenote 2, 0, 0, 0
-	endchannel
+SFX_Fly_1_Ch8:
+	noise_note 2, 15, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 10, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 13, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 8, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 11, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 6, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 9, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 4, 1, 18
+	noise_note 2, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm
index 30076475..e29b5654 100644
--- a/audio/sfx/fly_3.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,18 +1,18 @@
-SFX_Fly_3_Ch7:
-	noisenote 2, 15, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 10, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 13, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 8, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 11, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 6, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 9, 1, 18
-	noisenote 2, 0, 0, 0
-	noisenote 2, 4, 1, 18
-	noisenote 2, 0, 0, 0
-	endchannel
+SFX_Fly_3_Ch8:
+	noise_note 2, 15, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 10, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 13, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 8, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 11, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 6, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 9, 1, 18
+	noise_note 2, 0, 0, 0
+	noise_note 2, 4, 1, 18
+	noise_note 2, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm
index 2cf5e8c9..09f76c70 100644
--- a/audio/sfx/get_item1_1.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,47 +1,47 @@
-SFX_Get_Item1_1_Ch4:
-	executemusic
+SFX_Get_Item1_1_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
 	vibrato 6, 2, 6
-	duty 2
-	toggleperfectpitch
-	notetype 4, 11, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 4, 11, 1
 	octave 3
-	G# 2
-	G# 2
-	G# 2
-	notetype 12, 11, 3
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note_type 12, 11, 3
 	octave 4
-	E_ 4
-	endchannel
+	note E_, 4
+	sound_ret
 
 
-SFX_Get_Item1_1_Ch5:
-	executemusic
+SFX_Get_Item1_1_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 4, 12, 1
+	duty_cycle 2
+	note_type 4, 12, 1
 	octave 4
-	E_ 2
-	E_ 2
-	E_ 2
-	notetype 12, 12, 3
-	B_ 4
-	endchannel
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note_type 12, 12, 3
+	note B_, 4
+	sound_ret
 
 
-SFX_Get_Item1_1_Ch6:
-	executemusic
-	notetype 4, 1, 0
+SFX_Get_Item1_1_Ch7:
+	execute_music
+	note_type 4, 1, 0
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm
index 6c4c01b5..dfc1848f 100644
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,47 +1,47 @@
-SFX_Get_Item1_3_Ch4:
-	executemusic
+SFX_Get_Item1_3_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
 	vibrato 6, 2, 6
-	duty 2
-	toggleperfectpitch
-	notetype 4, 11, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 4, 11, 1
 	octave 3
-	G# 2
-	G# 2
-	G# 2
-	notetype 12, 11, 3
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note_type 12, 11, 3
 	octave 4
-	E_ 4
-	endchannel
+	note E_, 4
+	sound_ret
 
 
-SFX_Get_Item1_3_Ch5:
-	executemusic
+SFX_Get_Item1_3_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 4, 12, 1
+	duty_cycle 2
+	note_type 4, 12, 1
 	octave 4
-	E_ 2
-	E_ 2
-	E_ 2
-	notetype 12, 12, 3
-	B_ 4
-	endchannel
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note_type 12, 12, 3
+	note B_, 4
+	sound_ret
 
 
-SFX_Get_Item1_3_Ch6:
-	executemusic
-	notetype 4, 1, 0
+SFX_Get_Item1_3_Ch7:
+	execute_music
+	note_type 4, 1, 0
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm
index 01e66269..04bbdae2 100644
--- a/audio/sfx/get_item2_1.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,69 +1,69 @@
-SFX_Get_Item2_1_Ch4:
-	executemusic
+SFX_Get_Item2_1_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 5, 11, 4
 	octave 4
-	D_ 4
-	C_ 4
+	note D_, 4
+	note C_, 4
 	octave 3
-	A_ 8
-	notetype 5, 11, 2
+	note A_, 8
+	note_type 5, 11, 2
 	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note C_, 2
+	note C_, 2
 	octave 3
-	A# 2
-	notetype 5, 11, 4
+	note A#, 2
+	note_type 5, 11, 4
 	octave 4
-	C_ 8
-	endchannel
+	note C_, 8
+	sound_ret
 
 
-SFX_Get_Item2_1_Ch5:
-	executemusic
+SFX_Get_Item2_1_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
+	duty_cycle 2
+	note_type 5, 12, 5
 	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
+	note A_, 4
+	note F_, 4
+	note C_, 8
+	note_type 5, 12, 2
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
+	note_type 5, 12, 4
+	note A_, 8
+	sound_ret
 
 
-SFX_Get_Item2_1_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Get_Item2_1_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
+	note F_, 4
+	note D#, 4
+	note C_, 8
+	note D#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A_ 8
-	endchannel
+	note A_, 8
+	sound_ret
diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm
index 27c5864d..f05e0728 100644
--- a/audio/sfx/get_item2_2.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,69 +1,69 @@
-SFX_Get_Item2_2_Ch4:
-	executemusic
+SFX_Get_Item2_2_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 5, 11, 4
 	octave 4
-	D_ 4
-	C_ 4
+	note D_, 4
+	note C_, 4
 	octave 3
-	A_ 8
-	notetype 5, 11, 2
+	note A_, 8
+	note_type 5, 11, 2
 	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note C_, 2
+	note C_, 2
 	octave 3
-	A# 2
-	notetype 5, 11, 4
+	note A#, 2
+	note_type 5, 11, 4
 	octave 4
-	C_ 8
-	endchannel
+	note C_, 8
+	sound_ret
 
 
-SFX_Get_Item2_2_Ch5:
-	executemusic
+SFX_Get_Item2_2_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
+	duty_cycle 2
+	note_type 5, 12, 5
 	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
+	note A_, 4
+	note F_, 4
+	note C_, 8
+	note_type 5, 12, 2
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
+	note_type 5, 12, 4
+	note A_, 8
+	sound_ret
 
 
-SFX_Get_Item2_2_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Get_Item2_2_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
+	note F_, 4
+	note D#, 4
+	note C_, 8
+	note D#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A_ 8
-	endchannel
+	note A_, 8
+	sound_ret
diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm
index 42d74e8e..036d375b 100644
--- a/audio/sfx/get_item2_3.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,69 +1,69 @@
-SFX_Get_Item2_3_Ch4:
-	executemusic
+SFX_Get_Item2_3_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 5, 11, 4
 	octave 4
-	D_ 4
-	C_ 4
+	note D_, 4
+	note C_, 4
 	octave 3
-	A_ 8
-	notetype 5, 11, 2
+	note A_, 8
+	note_type 5, 11, 2
 	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note C_, 2
+	note C_, 2
 	octave 3
-	A# 2
-	notetype 5, 11, 4
+	note A#, 2
+	note_type 5, 11, 4
 	octave 4
-	C_ 8
-	endchannel
+	note C_, 8
+	sound_ret
 
 
-SFX_Get_Item2_3_Ch5:
-	executemusic
+SFX_Get_Item2_3_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
+	duty_cycle 2
+	note_type 5, 12, 5
 	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
+	note A_, 4
+	note F_, 4
+	note C_, 8
+	note_type 5, 12, 2
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
+	note_type 5, 12, 4
+	note A_, 8
+	sound_ret
 
 
-SFX_Get_Item2_3_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Get_Item2_3_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
+	note F_, 4
+	note D#, 4
+	note C_, 8
+	note D#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A_ 8
-	endchannel
+	note A_, 8
+	sound_ret
diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm
index b2ae3d57..a19f1143 100644
--- a/audio/sfx/get_key_item_1.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,59 +1,59 @@
-SFX_Get_Key_Item_1_Ch4:
-	executemusic
+SFX_Get_Key_Item_1_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 10, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 5, 10, 4
 	octave 3
-	A# 4
-	notetype 5, 11, 1
+	note A#, 4
+	note_type 5, 11, 1
 	octave 4
-	C_ 2
-	C_ 1
-	C_ 1
-	notetype 5, 10, 4
-	D# 4
-	notetype 5, 11, 1
-	F_ 2
-	F_ 1
-	F_ 1
-	notetype 5, 11, 4
-	A# 8
-	endchannel
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note_type 5, 10, 4
+	note D#, 4
+	note_type 5, 11, 1
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	note_type 5, 11, 4
+	note A#, 8
+	sound_ret
 
 
-SFX_Get_Key_Item_1_Ch5:
-	executemusic
+SFX_Get_Key_Item_1_Ch6:
+	execute_music
 	vibrato 4, 2, 3
-	duty 2
-	notetype 5, 13, 1
+	duty_cycle 2
+	note_type 5, 13, 1
 	octave 4
-	G_ 2
-	G_ 1
-	G_ 1
-	notetype 5, 12, 4
-	D# 4
-	notetype 5, 13, 1
-	G# 2
-	G# 1
-	G# 1
-	A# 2
-	A# 1
-	A# 1
-	notetype 5, 12, 4
+	note G_, 2
+	note G_, 1
+	note G_, 1
+	note_type 5, 12, 4
+	note D#, 4
+	note_type 5, 13, 1
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note A#, 2
+	note A#, 1
+	note A#, 1
+	note_type 5, 12, 4
 	octave 5
-	D# 8
-	endchannel
+	note D#, 8
+	sound_ret
 
 
-SFX_Get_Key_Item_1_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Get_Key_Item_1_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 4
-	D# 4
-	G# 4
-	G_ 4
-	F_ 4
-	D# 8
-	endchannel
+	note D#, 4
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note D#, 8
+	sound_ret
diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm
index aebae361..c1063a7f 100644
--- a/audio/sfx/get_key_item_3.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,59 +1,59 @@
-SFX_Get_Key_Item_3_Ch4:
-	executemusic
+SFX_Get_Key_Item_3_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 10, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 5, 10, 4
 	octave 3
-	A# 4
-	notetype 5, 11, 1
+	note A#, 4
+	note_type 5, 11, 1
 	octave 4
-	C_ 2
-	C_ 1
-	C_ 1
-	notetype 5, 10, 4
-	D# 4
-	notetype 5, 11, 1
-	F_ 2
-	F_ 1
-	F_ 1
-	notetype 5, 11, 4
-	A# 8
-	endchannel
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note_type 5, 10, 4
+	note D#, 4
+	note_type 5, 11, 1
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	note_type 5, 11, 4
+	note A#, 8
+	sound_ret
 
 
-SFX_Get_Key_Item_3_Ch5:
-	executemusic
+SFX_Get_Key_Item_3_Ch6:
+	execute_music
 	vibrato 4, 2, 3
-	duty 2
-	notetype 5, 13, 1
+	duty_cycle 2
+	note_type 5, 13, 1
 	octave 4
-	G_ 2
-	G_ 1
-	G_ 1
-	notetype 5, 12, 4
-	D# 4
-	notetype 5, 13, 1
-	G# 2
-	G# 1
-	G# 1
-	A# 2
-	A# 1
-	A# 1
-	notetype 5, 12, 4
+	note G_, 2
+	note G_, 1
+	note G_, 1
+	note_type 5, 12, 4
+	note D#, 4
+	note_type 5, 13, 1
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note A#, 2
+	note A#, 1
+	note A#, 1
+	note_type 5, 12, 4
 	octave 5
-	D# 8
-	endchannel
+	note D#, 8
+	sound_ret
 
 
-SFX_Get_Key_Item_3_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Get_Key_Item_3_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 4
-	D# 4
-	G# 4
-	G_ 4
-	F_ 4
-	D# 8
-	endchannel
+	note D#, 4
+	note G#, 4
+	note G_, 4
+	note F_, 4
+	note D#, 8
+	sound_ret
diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm
index f45c8399..b41dc94d 100644
--- a/audio/sfx/go_inside_1.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_1_Ch7:
-	noisenote 9, 15, 1, 68
-	noisenote 8, 13, 1, 67
-	endchannel
+SFX_Go_Inside_1_Ch8:
+	noise_note 9, 15, 1, 68
+	noise_note 8, 13, 1, 67
+	sound_ret
diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm
index cf69e4b7..5aab6564 100644
--- a/audio/sfx/go_inside_3.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,4 +1,4 @@
-SFX_Go_Inside_3_Ch7:
-	noisenote 9, 15, 1, 68
-	noisenote 8, 13, 1, 67
-	endchannel
+SFX_Go_Inside_3_Ch8:
+	noise_note 9, 15, 1, 68
+	noise_note 8, 13, 1, 67
+	sound_ret
diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm
index 3156eba7..2ac3542b 100644
--- a/audio/sfx/go_outside_1.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,7 +1,7 @@
-SFX_Go_Outside_1_Ch7:
-	noisenote 2, 15, 1, 84
-	noisenote 12, 7, 1, 35
-	noisenote 2, 11, 1, 84
-	noisenote 12, 6, 1, 35
-	noisenote 6, 4, 1, 84
-	endchannel
+SFX_Go_Outside_1_Ch8:
+	noise_note 2, 15, 1, 84
+	noise_note 12, 7, 1, 35
+	noise_note 2, 11, 1, 84
+	noise_note 12, 6, 1, 35
+	noise_note 6, 4, 1, 84
+	sound_ret
diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm
index 37952248..cd3543f2 100644
--- a/audio/sfx/go_outside_3.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,7 +1,7 @@
-SFX_Go_Outside_3_Ch7:
-	noisenote 2, 15, 1, 84
-	noisenote 12, 7, 1, 35
-	noisenote 2, 11, 1, 84
-	noisenote 12, 6, 1, 35
-	noisenote 6, 4, 1, 84
-	endchannel
+SFX_Go_Outside_3_Ch8:
+	noise_note 2, 15, 1, 84
+	noise_note 12, 7, 1, 35
+	noise_note 2, 11, 1, 84
+	noise_note 12, 6, 1, 35
+	noise_note 6, 4, 1, 84
+	sound_ret
diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm
index 656babad..a14afe1a 100644
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,9 +1,9 @@
-SFX_Heal_Ailment_1_Ch4:
-	duty 2
-	pitchenvelope 1, 4
-	squarenote 4, 15, 2, 1536
-	squarenote 4, 15, 2, 1536
-	pitchenvelope 1, 7
-	squarenote 15, 15, 2, 1536
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_Ailment_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 4
+	square_note 4, 15, 2, 1536
+	square_note 4, 15, 2, 1536
+	pitch_sweep 1, 7
+	square_note 15, 15, 2, 1536
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm
index bb06b360..81171c12 100644
--- a/audio/sfx/heal_ailment_2.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,9 +1,9 @@
-SFX_Heal_Ailment_2_Ch4:
-	duty 2
-	pitchenvelope 1, 4
-	squarenote 4, 15, 2, 1536
-	squarenote 4, 15, 2, 1536
-	pitchenvelope 1, 7
-	squarenote 15, 15, 2, 1536
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_Ailment_2_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 4
+	square_note 4, 15, 2, 1536
+	square_note 4, 15, 2, 1536
+	pitch_sweep 1, 7
+	square_note 15, 15, 2, 1536
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm
index ff1b1304..b1a0a570 100644
--- a/audio/sfx/heal_ailment_3.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,9 +1,9 @@
-SFX_Heal_Ailment_3_Ch4:
-	duty 2
-	pitchenvelope 1, 4
-	squarenote 4, 15, 2, 1536
-	squarenote 4, 15, 2, 1536
-	pitchenvelope 1, 7
-	squarenote 15, 15, 2, 1536
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_Ailment_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 4
+	square_note 4, 15, 2, 1536
+	square_note 4, 15, 2, 1536
+	pitch_sweep 1, 7
+	square_note 15, 15, 2, 1536
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm
index 1fdbdfea..f6413962 100644
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,7 +1,7 @@
-SFX_Heal_HP_1_Ch4:
-	duty 2
-	pitchenvelope 1, 7
-	squarenote 15, 15, 0, 1264
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_HP_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 7
+	square_note 15, 15, 0, 1264
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm
index befb3f01..c784c174 100644
--- a/audio/sfx/heal_hp_2.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,7 +1,7 @@
-SFX_Heal_HP_2_Ch4:
-	duty 2
-	pitchenvelope 1, 7
-	squarenote 15, 15, 0, 1264
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_HP_2_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 7
+	square_note 15, 15, 0, 1264
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm
index ba4d6739..7ca9d73b 100644
--- a/audio/sfx/heal_hp_3.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,7 +1,7 @@
-SFX_Heal_HP_3_Ch4:
-	duty 2
-	pitchenvelope 1, 7
-	squarenote 15, 15, 0, 1264
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Heal_HP_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 7
+	square_note 15, 15, 0, 1264
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm
index 095f7b7a..59d3f21a 100644
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,9 +1,9 @@
-SFX_Healing_Machine_1_Ch4:
-	duty 2
-	pitchenvelope 2, -4
-	squarenote 4, 15, 2, 1280
-	pitchenvelope 2, 2
-	squarenote 2, 15, 1, 1280
-	pitchenvelope 0, 0
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Healing_Machine_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 2, -4
+	square_note 4, 15, 2, 1280
+	pitch_sweep 2, 2
+	square_note 2, 15, 1, 1280
+	pitch_sweep 0, 0
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm
index a0501d8f..3078dba5 100644
--- a/audio/sfx/healing_machine_3.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,9 +1,9 @@
-SFX_Healing_Machine_3_Ch4:
-	duty 2
-	pitchenvelope 2, -4
-	squarenote 4, 15, 2, 1280
-	pitchenvelope 2, 2
-	squarenote 2, 15, 1, 1280
-	pitchenvelope 0, 0
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Healing_Machine_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 2, -4
+	square_note 4, 15, 2, 1280
+	pitch_sweep 2, 2
+	square_note 2, 15, 1, 1280
+	pitch_sweep 0, 0
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm
index 6f126626..32541241 100644
--- a/audio/sfx/horn_drill.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,6 +1,6 @@
-SFX_Horn_Drill_Ch7:
-	noisenote 3, 9, 2, 49
-	noisenote 3, 11, 2, 50
-	noisenote 3, 12, 2, 51
-	noisenote 8, 15, 1, 84
-	endchannel
+SFX_Horn_Drill_Ch8:
+	noise_note 3, 9, 2, 49
+	noise_note 3, 11, 2, 50
+	noise_note 3, 12, 2, 51
+	noise_note 8, 15, 1, 84
+	sound_ret
diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm
index 41a4db84..703edf41 100644
--- a/audio/sfx/intro_crash.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,4 +1,4 @@
-SFX_Intro_Crash_Ch7:
-	noisenote 2, 13, 2, 50
-	noisenote 15, 15, 2, 67
-	endchannel
+SFX_Intro_Crash_Ch8:
+	noise_note 2, 13, 2, 50
+	noise_note 15, 15, 2, 67
+	sound_ret
diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm
index 09af056f..47e37c21 100644
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,6 +1,6 @@
-SFX_Intro_Hip_Ch4:
-	duty 2
-	pitchenvelope 2, 6
-	squarenote 12, 12, 2, 1856
-	pitchenvelope 0, 0
-	endchannel
+SFX_Intro_Hip_Ch5:
+	duty_cycle 2
+	pitch_sweep 2, 6
+	square_note 12, 12, 2, 1856
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm
index 7dec29ae..1bee7a5c 100644
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,6 +1,6 @@
-SFX_Intro_Hop_Ch4:
-	duty 2
-	pitchenvelope 2, 6
-	squarenote 12, 12, 2, 1664
-	pitchenvelope 0, 0
-	endchannel
+SFX_Intro_Hop_Ch5:
+	duty_cycle 2
+	pitch_sweep 2, 6
+	square_note 12, 12, 2, 1664
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm
index ecdd9428..ee41e37c 100644
--- a/audio/sfx/intro_lunge.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,10 +1,10 @@
-SFX_Intro_Lunge_Ch7:
-	noisenote 6, 2, 0, 16
-	noisenote 6, 2, -7, 64
-	noisenote 6, 4, -7, 65
-	noisenote 6, 8, -7, 65
-	noisenote 6, 12, -7, 66
-	noisenote 8, 13, 7, 66
-	noisenote 15, 14, 7, 67
-	noisenote 15, 15, 2, 67
-	endchannel
+SFX_Intro_Lunge_Ch8:
+	noise_note 6, 2, 0, 16
+	noise_note 6, 2, -7, 64
+	noise_note 6, 4, -7, 65
+	noise_note 6, 8, -7, 65
+	noise_note 6, 12, -7, 66
+	noise_note 8, 13, 7, 66
+	noise_note 15, 14, 7, 67
+	noise_note 15, 15, 2, 67
+	sound_ret
diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm
index c972283d..1985878b 100644
--- a/audio/sfx/intro_raise.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,5 +1,5 @@
-SFX_Intro_Raise_Ch7:
-	noisenote 2, 6, -7, 33
-	noisenote 2, 10, -7, 49
-	noisenote 15, 15, 2, 65
-	endchannel
+SFX_Intro_Raise_Ch8:
+	noise_note 2, 6, -7, 33
+	noise_note 2, 10, -7, 49
+	noise_note 15, 15, 2, 65
+	sound_ret
diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm
index 647fcbd2..68ba128a 100644
--- a/audio/sfx/intro_whoosh.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,7 +1,7 @@
-SFX_Intro_Whoosh_Ch7:
-	noisenote 4, 2, -4, 32
-	noisenote 3, 10, 0, 32
-	noisenote 3, 11, 0, 33
-	noisenote 3, 12, 0, 34
-	noisenote 15, 13, 2, 36
-	endchannel
+SFX_Intro_Whoosh_Ch8:
+	noise_note 4, 2, -4, 32
+	noise_note 3, 10, 0, 32
+	noise_note 3, 11, 0, 33
+	noise_note 3, 12, 0, 34
+	noise_note 15, 13, 2, 36
+	sound_ret
diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm
index 0b2b478f..6cfb4d26 100644
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,6 +1,6 @@
-SFX_Ledge_1_Ch4:
-	duty 2
-	pitchenvelope 9, 5
-	squarenote 15, 15, 2, 1024
-	pitchenvelope 0, 0
-	endchannel
+SFX_Ledge_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 9, 5
+	square_note 15, 15, 2, 1024
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm
index 29b055a9..97627116 100644
--- a/audio/sfx/ledge_3.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,6 +1,6 @@
-SFX_Ledge_3_Ch4:
-	duty 2
-	pitchenvelope 9, 5
-	squarenote 15, 15, 2, 1024
-	pitchenvelope 0, 0
-	endchannel
+SFX_Ledge_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 9, 5
+	square_note 15, 15, 2, 1024
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm
index 5b3da83d..f1af4978 100644
--- a/audio/sfx/level_up.asm
+++ b/audio/sfx/level_up.asm
@@ -1,63 +1,63 @@
-SFX_Level_Up_Ch4:
-	executemusic
+SFX_Level_Up_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 6, 11, 4
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 6, 11, 4
 	octave 4
-	F_ 4
-	notetype 4, 11, 2
-	C_ 2
-	F_ 2
-	C_ 2
-	notetype 6, 11, 3
-	D# 2
-	D# 2
-	E_ 2
-	notetype 6, 11, 4
-	F_ 8
-	endchannel
+	note F_, 4
+	note_type 4, 11, 2
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note_type 6, 11, 3
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note_type 6, 11, 4
+	note F_, 8
+	sound_ret
 
 
-SFX_Level_Up_Ch5:
-	executemusic
+SFX_Level_Up_Ch6:
+	execute_music
 	vibrato 4, 2, 2
-	duty 2
-	notetype 6, 12, 4
+	duty_cycle 2
+	note_type 6, 12, 4
 	octave 4
-	A_ 4
-	notetype 4, 12, 2
-	A_ 2
-	A_ 2
-	A_ 2
-	notetype 6, 12, 4
-	A# 2
-	A# 2
-	A# 2
-	notetype 6, 12, 4
-	A_ 8
-	endchannel
+	note A_, 4
+	note_type 4, 12, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note_type 6, 12, 4
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note_type 6, 12, 4
+	note A_, 8
+	sound_ret
 
 
-SFX_Level_Up_Ch6:
-	executemusic
-	notetype 6, 1, 0
+SFX_Level_Up_Ch7:
+	execute_music
+	note_type 6, 1, 0
 	octave 5
-	A_ 4
-	notetype 4, 1, 0
-	F_ 1
+	note A_, 4
+	note_type 4, 1, 0
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	notetype 6, 1, 0
-	G_ 1
+	note_type 6, 1, 0
+	note G_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	A_ 8
-	endchannel
+	note A_, 8
+	sound_ret
diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm
index aa7787ff..52eb96d7 100644
--- a/audio/sfx/muted_snare1_1.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_1_Ch7:
-	noisenote 0, 10, 1, 24
-	noisenote 0, 3, 1, 51
-	endchannel
+SFX_Muted_Snare1_1_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm
index 8b0cbde3..c3e29c16 100644
--- a/audio/sfx/muted_snare1_2.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_2_Ch7:
-	noisenote 0, 10, 1, 24
-	noisenote 0, 3, 1, 51
-	endchannel
+SFX_Muted_Snare1_2_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm
index 7487c98f..a83ecd94 100644
--- a/audio/sfx/muted_snare1_3.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_3_Ch7:
-	noisenote 0, 10, 1, 24
-	noisenote 0, 3, 1, 51
-	endchannel
+SFX_Muted_Snare1_3_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm
index cca5a93e..a8066238 100644
--- a/audio/sfx/muted_snare2_1.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_1_Ch7:
-	noisenote 0, 9, 1, 34
-	endchannel
+SFX_Muted_Snare2_1_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm
index e33c7837..32bb41f5 100644
--- a/audio/sfx/muted_snare2_2.asm
+++ b/audio/sfx/muted_snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_2_Ch7:
-	noisenote 0, 9, 1, 34
-	endchannel
+SFX_Muted_Snare2_2_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
index d53965e4..5c3b743e 100644
--- a/audio/sfx/muted_snare2_3.asm
+++ b/audio/sfx/muted_snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_3_Ch7:
-	noisenote 0, 9, 1, 34
-	endchannel
+SFX_Muted_Snare2_3_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm
index 1140a92b..0538f8d5 100644
--- a/audio/sfx/muted_snare3_1.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_1_Ch7:
-	noisenote 0, 7, 1, 34
-	endchannel
+SFX_Muted_Snare3_1_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm
index 4e5eff53..20c3772c 100644
--- a/audio/sfx/muted_snare3_2.asm
+++ b/audio/sfx/muted_snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_2_Ch7:
-	noisenote 0, 7, 1, 34
-	endchannel
+SFX_Muted_Snare3_2_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
index d11099b5..2ac3f874 100644
--- a/audio/sfx/muted_snare3_3.asm
+++ b/audio/sfx/muted_snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_3_Ch7:
-	noisenote 0, 7, 1, 34
-	endchannel
+SFX_Muted_Snare3_3_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm
index aac775e4..575829ae 100644
--- a/audio/sfx/muted_snare4_1.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_1_Ch7:
-	noisenote 0, 6, 1, 34
-	endchannel
+SFX_Muted_Snare4_1_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
index 8cc7e02e..19744539 100644
--- a/audio/sfx/muted_snare4_2.asm
+++ b/audio/sfx/muted_snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_2_Ch7:
-	noisenote 0, 6, 1, 34
-	endchannel
+SFX_Muted_Snare4_2_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
index fcc7455b..188f9bff 100644
--- a/audio/sfx/muted_snare4_3.asm
+++ b/audio/sfx/muted_snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_3_Ch7:
-	noisenote 0, 6, 1, 34
-	endchannel
+SFX_Muted_Snare4_3_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm
index 2220bf03..c8dfe725 100644
--- a/audio/sfx/not_very_effective.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,6 +1,6 @@
-SFX_Not_Very_Effective_Ch7:
-	noisenote 4, 8, -7, 85
-	noisenote 2, 15, 4, 68
-	noisenote 8, 15, 4, 34
-	noisenote 15, 15, 2, 33
-	endchannel
+SFX_Not_Very_Effective_Ch8:
+	noise_note 4, 8, -7, 85
+	noise_note 2, 15, 4, 68
+	noise_note 8, 15, 4, 34
+	noise_note 15, 15, 2, 33
+	sound_ret
diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm
index c52ce4d0..d478dff6 100644
--- a/audio/sfx/peck.asm
+++ b/audio/sfx/peck.asm
@@ -1,3 +1,3 @@
-SFX_Peck_Ch7:
-	noisenote 2, 10, 1, 18
-	endchannel
+SFX_Peck_Ch8:
+	noise_note 2, 10, 1, 18
+	sound_ret
diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm
index 8deaafe5..2c922df7 100644
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,8 +1,8 @@
-SFX_Poisoned_1_Ch4:
-	duty 0
-	pitchenvelope 1, 4
-	squarenote 4, 15, 2, 1536
-	loopchannel 4, SFX_Poisoned_1_Ch4
-	squarenote 15, 15, 3, 1536
-	pitchenvelope 0, 0
-	endchannel
+SFX_Poisoned_1_Ch5:
+	duty_cycle 0
+	pitch_sweep 1, 4
+	square_note 4, 15, 2, 1536
+	sound_loop 4, SFX_Poisoned_1_Ch5
+	square_note 15, 15, 3, 1536
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm
index a66aaf7a..2c0b58cc 100644
--- a/audio/sfx/poisoned_3.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,8 +1,8 @@
-SFX_Poisoned_3_Ch4:
-	duty 0
-	pitchenvelope 1, 4
-	squarenote 4, 15, 2, 1536
-	loopchannel 4, SFX_Poisoned_3_Ch4
-	squarenote 15, 15, 3, 1536
-	pitchenvelope 0, 0
-	endchannel
+SFX_Poisoned_3_Ch5:
+	duty_cycle 0
+	pitch_sweep 1, 4
+	square_note 4, 15, 2, 1536
+	sound_loop 4, SFX_Poisoned_3_Ch5
+	square_note 15, 15, 3, 1536
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm
index 1e0f95f5..0df1138f 100644
--- a/audio/sfx/pokedex_rating_1.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,77 +1,77 @@
-SFX_Pokedex_Rating_1_Ch4:
-	executemusic
+SFX_Pokedex_Rating_1_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	notetype 5, 11, 1
+	duty_cycle 2
+	note_type 5, 11, 1
 	octave 3
-	A_ 2
-	A_ 2
-	G_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	A_ 2
+	note A_, 2
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	C_ 4
-	E_ 4
+	note C_, 4
+	note E_, 4
 	octave 3
-	F_ 4
-	endchannel
+	note F_, 4
+	sound_ret
 
 
-SFX_Pokedex_Rating_1_Ch5:
-	executemusic
-	duty 2
-	notetype 5, 12, 2
+SFX_Pokedex_Rating_1_Ch6:
+	execute_music
+	duty_cycle 2
+	note_type 5, 12, 2
 	octave 5
-	F_ 2
-	E_ 1
+	note F_, 2
+	note E_, 1
 	rest 1
-	D_ 2
-	C_ 1
+	note D_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	C_ 2
-	D_ 2
-	E_ 2
-	F_ 4
-	G_ 4
-	F_ 4
-	endchannel
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	sound_ret
 
 
-SFX_Pokedex_Rating_1_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Pokedex_Rating_1_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	A# 1
+	note A#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
-	C_ 1
+	note C_, 1
 	rest 3
 	octave 4
-	F_ 2
+	note F_, 2
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm
index 01ac0e1c..18dbcda2 100644
--- a/audio/sfx/pokedex_rating_3.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,77 +1,77 @@
-SFX_Pokedex_Rating_3_Ch4:
-	executemusic
+SFX_Pokedex_Rating_3_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 2
-	notetype 5, 11, 1
+	duty_cycle 2
+	note_type 5, 11, 1
 	octave 3
-	A_ 2
-	A_ 2
-	G_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	A_ 2
+	note A_, 2
+	note A_, 2
+	note G_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note A_, 2
 	octave 4
-	C_ 4
-	E_ 4
+	note C_, 4
+	note E_, 4
 	octave 3
-	F_ 4
-	endchannel
+	note F_, 4
+	sound_ret
 
 
-SFX_Pokedex_Rating_3_Ch5:
-	executemusic
-	duty 2
-	notetype 5, 12, 2
+SFX_Pokedex_Rating_3_Ch6:
+	execute_music
+	duty_cycle 2
+	note_type 5, 12, 2
 	octave 5
-	F_ 2
-	E_ 1
+	note F_, 2
+	note E_, 1
 	rest 1
-	D_ 2
-	C_ 1
+	note D_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	A# 2
+	note A#, 2
 	octave 5
-	C_ 2
-	D_ 2
-	E_ 2
-	F_ 4
-	G_ 4
-	F_ 4
-	endchannel
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note G_, 4
+	note F_, 4
+	sound_ret
 
 
-SFX_Pokedex_Rating_3_Ch6:
-	executemusic
-	notetype 5, 1, 0
+SFX_Pokedex_Rating_3_Ch7:
+	execute_music
+	note_type 5, 1, 0
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	F_ 2
+	note F_, 2
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
 	octave 4
-	A# 1
+	note A#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
-	C_ 1
+	note C_, 1
 	rest 3
 	octave 4
-	F_ 2
+	note F_, 2
 	rest 2
-	endchannel
+	sound_ret
diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm
index 272c114f..88f33d0b 100644
--- a/audio/sfx/pokeflute.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,21 +1,21 @@
-SFX_Pokeflute_Ch2:
+SFX_Pokeflute_Ch3:
 	vibrato 16, 1, 4
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 5
-	E_ 2
-	F_ 2
-	G_ 4
-	A_ 2
-	G_ 2
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
 	octave 6
-	C_ 4
-	C_ 2
-	D_ 2
-	C_ 2
+	note C_, 4
+	note C_, 2
+	note D_, 2
+	note C_, 2
 	octave 5
-	G_ 2
-	A_ 2
-	F_ 2
-	G_ 8
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	note G_, 8
 	rest 12
-	endchannel
+	sound_ret
diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm
deleted file mode 100644
index 146488d8..00000000
--- a/audio/sfx/pokeflute_ch4_ch5.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-SFX_08_PokeFlute_Ch4:
-	tempo 256
-
-
-SFX_08_PokeFlute_Ch5:
-	executemusic
-	notetype 8, 0, 0
-	rest 5
-	rest 7
-	rest 5
-	rest 5
-	rest 5
-	rest 5
-	endchannel
diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm
new file mode 100644
index 00000000..4f0e96a8
--- /dev/null
+++ b/audio/sfx/pokeflute_ch5_ch6.asm
@@ -0,0 +1,14 @@
+SFX_Pokeflute_Ch5:
+	tempo 256
+
+
+SFX_Pokeflute_Ch6:
+	execute_music
+	note_type 8, 0, 0
+	rest 5
+	rest 7
+	rest 5
+	rest 5
+	rest 5
+	rest 5
+	sound_ret
diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm
deleted file mode 100644
index 4d4e5bae..00000000
--- a/audio/sfx/pokeflute_ch6.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-SFX_08_PokeFlute_Ch6:
-	executemusic
-	vibrato 16, 1, 4
-	notetype 8, 1, 0
-	octave 5
-	E_ 3
-	F_ 3
-	G_ 7
-	A_ 3
-	G_ 3
-	octave 6
-	C_ 13
-	endchannel
diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm
new file mode 100644
index 00000000..4435c0fb
--- /dev/null
+++ b/audio/sfx/pokeflute_ch7.asm
@@ -0,0 +1,13 @@
+SFX_Pokeflute_Ch7:
+	execute_music
+	vibrato 16, 1, 4
+	note_type 8, 1, 0
+	octave 5
+	note E_, 3
+	note F_, 3
+	note G_, 7
+	note A_, 3
+	note G_, 3
+	octave 6
+	note C_, 13
+	sound_ret
diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm
index 3aee5836..d1891751 100644
--- a/audio/sfx/pound.asm
+++ b/audio/sfx/pound.asm
@@ -1,3 +1,3 @@
-SFX_Pound_Ch7:
-	noisenote 2, 10, 1, 34
-	endchannel
+SFX_Pound_Ch8:
+	noise_note 2, 10, 1, 34
+	sound_ret
diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm
index bfc9635b..7767547c 100644
--- a/audio/sfx/press_ab_1.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,7 +1,7 @@
-SFX_Press_AB_1_Ch4:
-	duty 2
-	squarenote 0, 9, 1, 1984
-	squarenote 0, 8, 1, 2000
-	squarenote 0, 9, 1, 1984
-	squarenote 12, 10, 1, 2000
-	endchannel
+SFX_Press_AB_1_Ch5:
+	duty_cycle 2
+	square_note 0, 9, 1, 1984
+	square_note 0, 8, 1, 2000
+	square_note 0, 9, 1, 1984
+	square_note 12, 10, 1, 2000
+	sound_ret
diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm
index 9ad03c67..7e01bce5 100644
--- a/audio/sfx/press_ab_2.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,7 +1,7 @@
-SFX_Press_AB_2_Ch4:
-	duty 2
-	squarenote 0, 9, 1, 1984
-	squarenote 0, 8, 1, 2000
-	squarenote 0, 9, 1, 1984
-	squarenote 12, 10, 1, 2000
-	endchannel
+SFX_Press_AB_2_Ch5:
+	duty_cycle 2
+	square_note 0, 9, 1, 1984
+	square_note 0, 8, 1, 2000
+	square_note 0, 9, 1, 1984
+	square_note 12, 10, 1, 2000
+	sound_ret
diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm
index 67306cbe..4b4c78b9 100644
--- a/audio/sfx/press_ab_3.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,7 +1,7 @@
-SFX_Press_AB_3_Ch4:
-	duty 2
-	squarenote 0, 9, 1, 1984
-	squarenote 0, 8, 1, 2000
-	squarenote 0, 9, 1, 1984
-	squarenote 12, 10, 1, 2000
-	endchannel
+SFX_Press_AB_3_Ch5:
+	duty_cycle 2
+	square_note 0, 9, 1, 1984
+	square_note 0, 8, 1, 2000
+	square_note 0, 9, 1, 1984
+	square_note 12, 10, 1, 2000
+	sound_ret
diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm
index 71c7119b..3142fca5 100644
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,25 +1,25 @@
-SFX_Psybeam_Ch4:
-	dutycycle 161
-	squarenote 10, 15, 1, 1600
-	squarenote 10, 15, 3, 1664
-	squarenote 10, 15, 2, 1568
-	loopchannel 4, SFX_Psybeam_Ch4
-	squarenote 10, 15, 1, 1600
-	endchannel
+SFX_Psybeam_Ch5:
+	duty_cycle_pattern 161
+	square_note 10, 15, 1, 1600
+	square_note 10, 15, 3, 1664
+	square_note 10, 15, 2, 1568
+	sound_loop 4, SFX_Psybeam_Ch5
+	square_note 10, 15, 1, 1600
+	sound_ret
 
 
-SFX_Psybeam_Ch5:
-	dutycycle 179
-	squarenote 10, 15, 3, 1393
-	squarenote 7, 14, 3, 1329
-	squarenote 10, 15, 1, 1361
-	loopchannel 4, SFX_Psybeam_Ch5
-	squarenote 10, 15, 1, 1393
-	endchannel
+SFX_Psybeam_Ch6:
+	duty_cycle_pattern 179
+	square_note 10, 15, 3, 1393
+	square_note 7, 14, 3, 1329
+	square_note 10, 15, 1, 1361
+	sound_loop 4, SFX_Psybeam_Ch6
+	square_note 10, 15, 1, 1393
+	sound_ret
 
 
-SFX_Psybeam_Ch7:
-	noisenote 2, 13, 1, 74
-	noisenote 2, 13, 2, 42
-	loopchannel 21, SFX_Psybeam_Ch7
-	endchannel
+SFX_Psybeam_Ch8:
+	noise_note 2, 13, 1, 74
+	noise_note 2, 13, 2, 42
+	sound_loop 21, SFX_Psybeam_Ch8
+	sound_ret
diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm
index a9cd5ec3..c6e11d42 100644
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,32 +1,32 @@
-SFX_Psychic_M_Ch4:
-	duty 2
-	pitchenvelope 15, 7
-	squarenote 8, 12, 4, 1981
-	squarenote 8, 12, 4, 1982
-	squarenote 8, 12, 4, 1983
-	squarenote 8, 12, 4, 1984
-	squarenote 15, 12, 4, 1985
-	squarenote 15, 15, 2, 1984
-	pitchenvelope 0, 0
-	endchannel
+SFX_Psychic_M_Ch5:
+	duty_cycle 2
+	pitch_sweep 15, 7
+	square_note 8, 12, 4, 1981
+	square_note 8, 12, 4, 1982
+	square_note 8, 12, 4, 1983
+	square_note 8, 12, 4, 1984
+	square_note 15, 12, 4, 1985
+	square_note 15, 15, 2, 1984
+	pitch_sweep 0, 0
+	sound_ret
 
 
-SFX_Psychic_M_Ch5:
-	duty 2
-	squarenote 8, 12, 4, 1904
-	squarenote 8, 12, 4, 1889
-	squarenote 8, 12, 4, 1890
-	squarenote 8, 12, 4, 1891
-	squarenote 15, 12, 4, 1892
-	squarenote 15, 15, 2, 1892
-	endchannel
+SFX_Psychic_M_Ch6:
+	duty_cycle 2
+	square_note 8, 12, 4, 1904
+	square_note 8, 12, 4, 1889
+	square_note 8, 12, 4, 1890
+	square_note 8, 12, 4, 1891
+	square_note 15, 12, 4, 1892
+	square_note 15, 15, 2, 1892
+	sound_ret
 
 
-SFX_Psychic_M_Ch7:
-	noisenote 15, 3, -7, 20
-	noisenote 15, 12, -7, 19
-	noisenote 15, 12, -7, 18
-	noisenote 15, 12, -7, 17
-	noisenote 15, 12, -7, 16
-	noisenote 15, 12, 2, 16
-	endchannel
+SFX_Psychic_M_Ch8:
+	noise_note 15, 3, -7, 20
+	noise_note 15, 12, -7, 19
+	noise_note 15, 12, -7, 18
+	noise_note 15, 12, -7, 17
+	noise_note 15, 12, -7, 16
+	noise_note 15, 12, 2, 16
+	sound_ret
diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm
index bb8c3cce..9dc06f0b 100644
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,13 +1,13 @@
-SFX_Purchase_1_Ch4:
-	duty 2
-	squarenote 4, 14, 1, 1792
-	squarenote 8, 15, 2, 2016
-	endchannel
+SFX_Purchase_1_Ch5:
+	duty_cycle 2
+	square_note 4, 14, 1, 1792
+	square_note 8, 15, 2, 2016
+	sound_ret
 
 
-SFX_Purchase_1_Ch5:
-	duty 2
-	squarenote 1, 0, 8, 0
-	squarenote 4, 9, 1, 1729
-	squarenote 8, 10, 2, 1953
-	endchannel
+SFX_Purchase_1_Ch6:
+	duty_cycle 2
+	square_note 1, 0, 8, 0
+	square_note 4, 9, 1, 1729
+	square_note 8, 10, 2, 1953
+	sound_ret
diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm
index 454e6f83..eaa4bb60 100644
--- a/audio/sfx/purchase_3.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,13 +1,13 @@
-SFX_Purchase_3_Ch4:
-	duty 2
-	squarenote 4, 14, 1, 1792
-	squarenote 8, 15, 2, 2016
-	endchannel
+SFX_Purchase_3_Ch5:
+	duty_cycle 2
+	square_note 4, 14, 1, 1792
+	square_note 8, 15, 2, 2016
+	sound_ret
 
 
-SFX_Purchase_3_Ch5:
-	duty 2
-	squarenote 1, 0, 8, 0
-	squarenote 4, 9, 1, 1729
-	squarenote 8, 10, 2, 1953
-	endchannel
+SFX_Purchase_3_Ch6:
+	duty_cycle 2
+	square_note 1, 0, 8, 0
+	square_note 4, 9, 1, 1729
+	square_note 8, 10, 2, 1953
+	sound_ret
diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm
index bf7bf116..c2155ca9 100644
--- a/audio/sfx/push_boulder_1.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,10 +1,10 @@
-SFX_Push_Boulder_1_Ch7:
-	noisenote 4, 10, 2, 35
-	noisenote 8, 15, 1, 52
-	noisenote 15, 0, 0, 0
-	noisenote 2, 15, 7, 36
-	noisenote 2, 15, 7, 52
-	noisenote 4, 15, 7, 68
-	noisenote 8, 15, 4, 85
-	noisenote 8, 15, 1, 68
-	endchannel
+SFX_Push_Boulder_1_Ch8:
+	noise_note 4, 10, 2, 35
+	noise_note 8, 15, 1, 52
+	noise_note 15, 0, 0, 0
+	noise_note 2, 15, 7, 36
+	noise_note 2, 15, 7, 52
+	noise_note 4, 15, 7, 68
+	noise_note 8, 15, 4, 85
+	noise_note 8, 15, 1, 68
+	sound_ret
diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm
index f554da55..5f084139 100644
--- a/audio/sfx/push_boulder_3.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,10 +1,10 @@
-SFX_Push_Boulder_3_Ch7:
-	noisenote 4, 10, 2, 35
-	noisenote 8, 15, 1, 52
-	noisenote 15, 0, 0, 0
-	noisenote 2, 15, 7, 36
-	noisenote 2, 15, 7, 52
-	noisenote 4, 15, 7, 68
-	noisenote 8, 15, 4, 85
-	noisenote 8, 15, 1, 68
-	endchannel
+SFX_Push_Boulder_3_Ch8:
+	noise_note 4, 10, 2, 35
+	noise_note 8, 15, 1, 52
+	noise_note 15, 0, 0, 0
+	noise_note 2, 15, 7, 36
+	noise_note 2, 15, 7, 52
+	noise_note 4, 15, 7, 68
+	noise_note 8, 15, 4, 85
+	noise_note 8, 15, 1, 68
+	sound_ret
diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm
index b59ceefa..b4ed791b 100644
--- a/audio/sfx/run.asm
+++ b/audio/sfx/run.asm
@@ -1,13 +1,13 @@
-SFX_Run_Ch7:
-	noisenote 2, 6, 1, 35
-	noisenote 2, 10, 1, 51
-	noisenote 2, 12, 1, 51
-	noisenote 2, 5, 1, 17
-	noisenote 2, 15, 1, 51
-	noisenote 2, 4, 1, 17
-	noisenote 2, 12, 1, 51
-	noisenote 2, 3, 1, 17
-	noisenote 2, 8, 1, 51
-	noisenote 2, 3, 1, 17
-	noisenote 8, 4, 1, 51
-	endchannel
+SFX_Run_Ch8:
+	noise_note 2, 6, 1, 35
+	noise_note 2, 10, 1, 51
+	noise_note 2, 12, 1, 51
+	noise_note 2, 5, 1, 17
+	noise_note 2, 15, 1, 51
+	noise_note 2, 4, 1, 17
+	noise_note 2, 12, 1, 51
+	noise_note 2, 3, 1, 17
+	noise_note 2, 8, 1, 51
+	noise_note 2, 3, 1, 17
+	noise_note 8, 4, 1, 51
+	sound_ret
diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm
index 5692b0d6..6ce7b7c3 100644
--- a/audio/sfx/safari_zone_pa.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,9 +1,9 @@
-SFX_Safari_Zone_PA_Ch4:
-	duty 2
-	squarenote 15, 15, 3, 1840
-	squarenote 8, 6, 5, 1840
-	squarenote 15, 15, 4, 1792
-	squarenote 15, 7, 4, 1792
-	squarenote 15, 4, 4, 1792
-	squarenote 15, 2, 4, 1792
-	endchannel
+SFX_Safari_Zone_PA_Ch5:
+	duty_cycle 2
+	square_note 15, 15, 3, 1840
+	square_note 8, 6, 5, 1840
+	square_note 15, 15, 4, 1792
+	square_note 15, 7, 4, 1792
+	square_note 15, 4, 4, 1792
+	square_note 15, 2, 4, 1792
+	sound_ret
diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm
index 07702b4d..d0849ff5 100644
--- a/audio/sfx/save_1.asm
+++ b/audio/sfx/save_1.asm
@@ -1,23 +1,23 @@
-SFX_Save_1_Ch4:
-	duty 2
-	squarenote 4, 15, 4, 1792
-	squarenote 2, 14, 4, 1536
-	squarenote 2, 14, 4, 1664
-	squarenote 2, 14, 4, 1728
-	squarenote 2, 14, 4, 1792
-	squarenote 2, 14, 4, 1952
-	squarenote 15, 15, 2, 2016
-	endchannel
+SFX_Save_1_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 4, 1792
+	square_note 2, 14, 4, 1536
+	square_note 2, 14, 4, 1664
+	square_note 2, 14, 4, 1728
+	square_note 2, 14, 4, 1792
+	square_note 2, 14, 4, 1952
+	square_note 15, 15, 2, 2016
+	sound_ret
 
 
-SFX_Save_1_Ch5:
-	duty 2
-	squarenote 4, 0, 8, 0
-	squarenote 2, 13, 4, 1793
-	squarenote 2, 12, 4, 1537
-	squarenote 2, 12, 4, 1665
-	squarenote 2, 12, 4, 1729
-	squarenote 2, 12, 4, 1793
-	squarenote 2, 12, 4, 1953
-	squarenote 15, 13, 2, 2017
-	endchannel
+SFX_Save_1_Ch6:
+	duty_cycle 2
+	square_note 4, 0, 8, 0
+	square_note 2, 13, 4, 1793
+	square_note 2, 12, 4, 1537
+	square_note 2, 12, 4, 1665
+	square_note 2, 12, 4, 1729
+	square_note 2, 12, 4, 1793
+	square_note 2, 12, 4, 1953
+	square_note 15, 13, 2, 2017
+	sound_ret
diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm
index eda54e9e..8db092b2 100644
--- a/audio/sfx/save_3.asm
+++ b/audio/sfx/save_3.asm
@@ -1,36 +1,36 @@
-SFX_Save_3_Ch4:
-	duty 2
+SFX_Save_3_Ch5:
+	duty_cycle 2
 IF DEF(_RED)
-	squarenote 4, 15, 4, 1792
-	squarenote 3, 14, 4, 1664
-	squarenote 3, 14, 4, 1728
-	squarenote 3, 14, 4, 1792
-	squarenote 2, 14, 4, 1952
+	square_note 4, 15, 4, 1792
+	square_note 3, 14, 4, 1664
+	square_note 3, 14, 4, 1728
+	square_note 3, 14, 4, 1792
+	square_note 2, 14, 4, 1952
 ELSE
-	squarenote 3, 14, 4, 1536
-	squarenote 3, 14, 4, 1664
-	squarenote 3, 14, 4, 1728
-	squarenote 3, 14, 4, 1792
-	squarenote 15, 15, 2, 2016
+	square_note 3, 14, 4, 1536
+	square_note 3, 14, 4, 1664
+	square_note 3, 14, 4, 1728
+	square_note 3, 14, 4, 1792
+	square_note 15, 15, 2, 2016
 ENDC
-	endchannel
+	sound_ret
 
 
-SFX_Save_3_Ch5:
-	duty 2
+SFX_Save_3_Ch6:
+	duty_cycle 2
 IF DEF(_RED)
-	squarenote 4, 0, 8, 0
-	squarenote 3, 13, 4, 1793
-	squarenote 3, 12, 4, 1665
-	squarenote 3, 12, 4, 1729
-	squarenote 3, 12, 4, 1793
-	squarenote 2, 12, 4, 1953
+	square_note 4, 0, 8, 0
+	square_note 3, 13, 4, 1793
+	square_note 3, 12, 4, 1665
+	square_note 3, 12, 4, 1729
+	square_note 3, 12, 4, 1793
+	square_note 2, 12, 4, 1953
 ELSE
-	squarenote 3, 0, 8, 0
-	squarenote 3, 12, 4, 1537
-	squarenote 3, 12, 4, 1665
-	squarenote 3, 12, 4, 1729
-	squarenote 3, 12, 4, 1793
-	squarenote 15, 13, 2, 2017
+	square_note 3, 0, 8, 0
+	square_note 3, 12, 4, 1537
+	square_note 3, 12, 4, 1665
+	square_note 3, 12, 4, 1729
+	square_note 3, 12, 4, 1793
+	square_note 15, 13, 2, 2017
 ENDC
-	endchannel
+	sound_ret
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index fbd158fd..796400a4 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,14 +1,14 @@
-SFX_Shooting_Star_Ch4:
-	dutycycle 228
-	pitchenvelope 2, -7
-	squarenote 4, 4, 0, 2016
-	squarenote 4, 6, 0, 2016
-	squarenote 4, 8, 0, 2016
-	squarenote 8, 10, 0, 2016
-	squarenote 8, 10, 0, 2016
-	squarenote 8, 8, 0, 2016
-	squarenote 8, 6, 0, 2016
-	squarenote 8, 3, 0, 2016
-	squarenote 15, 1, 2, 2016
-	pitchenvelope 0, 0
-	endchannel
+SFX_Shooting_Star_Ch5:
+	duty_cycle_pattern 228
+	pitch_sweep 2, -7
+	square_note 4, 4, 0, 2016
+	square_note 4, 6, 0, 2016
+	square_note 4, 8, 0, 2016
+	square_note 8, 10, 0, 2016
+	square_note 8, 10, 0, 2016
+	square_note 8, 8, 0, 2016
+	square_note 8, 6, 0, 2016
+	square_note 8, 3, 0, 2016
+	square_note 15, 1, 2, 2016
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm
index df1fb338..ae869564 100644
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,10 +1,10 @@
-SFX_Shrink_1_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1536
-	squarenote 15, 11, 7, 1408
-	squarenote 15, 8, 7, 1280
-	squarenote 15, 4, 7, 1152
-	squarenote 15, 1, 7, 1024
-	pitchenvelope 0, 0
-	endchannel
+SFX_Shrink_1_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1536
+	square_note 15, 11, 7, 1408
+	square_note 15, 8, 7, 1280
+	square_note 15, 4, 7, 1152
+	square_note 15, 1, 7, 1024
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm
index 37a8b572..b944680f 100644
--- a/audio/sfx/shrink_3.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,10 +1,10 @@
-SFX_Shrink_3_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1536
-	squarenote 15, 11, 7, 1408
-	squarenote 15, 8, 7, 1280
-	squarenote 15, 4, 7, 1152
-	squarenote 15, 1, 7, 1024
-	pitchenvelope 0, 0
-	endchannel
+SFX_Shrink_3_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1536
+	square_note 15, 11, 7, 1408
+	square_note 15, 8, 7, 1280
+	square_note 15, 4, 7, 1152
+	square_note 15, 1, 7, 1024
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm
index 94914320..4a565740 100644
--- a/audio/sfx/silph_scope.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,9 +1,9 @@
-SFX_Silph_Scope_Ch4:
-	duty 0
-	squarenote 0, 13, 2, 1792
-	squarenote 0, 13, 2, 1856
-	squarenote 0, 13, 2, 1920
-	squarenote 0, 13, 2, 1984
-	squarenote 10, 14, 1, 2016
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Silph_Scope_Ch5:
+	duty_cycle 0
+	square_note 0, 13, 2, 1792
+	square_note 0, 13, 2, 1856
+	square_note 0, 13, 2, 1920
+	square_note 0, 13, 2, 1984
+	square_note 10, 14, 1, 2016
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm
index df897225..a8b668b8 100644
--- a/audio/sfx/slots_new_spin.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,14 +1,14 @@
-SFX_Slots_New_Spin_Ch4:
-	duty 3
-	squarenote 5, 14, 1, 1792
-	squarenote 2, 14, 1, 1920
-	squarenote 15, 15, 1, 1984
-	endchannel
+SFX_Slots_New_Spin_Ch5:
+	duty_cycle 3
+	square_note 5, 14, 1, 1792
+	square_note 2, 14, 1, 1920
+	square_note 15, 15, 1, 1984
+	sound_ret
 
 
-SFX_Slots_New_Spin_Ch5:
-	duty 2
-	squarenote 4, 12, 1, 1729
-	squarenote 2, 12, 1, 1857
-	squarenote 15, 13, 1, 1921
-	endchannel
+SFX_Slots_New_Spin_Ch6:
+	duty_cycle 2
+	square_note 4, 12, 1, 1729
+	square_note 2, 12, 1, 1857
+	square_note 15, 13, 1, 1921
+	sound_ret
diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm
index b82db160..8f2d1829 100644
--- a/audio/sfx/slots_reward.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,5 +1,5 @@
-SFX_Slots_Reward_Ch4:
-	duty 2
-	squarenote 2, 15, 1, 1792
-	squarenote 8, 8, 1, 2016
-	endchannel
+SFX_Slots_Reward_Ch5:
+	duty_cycle 2
+	square_note 2, 15, 1, 1792
+	square_note 8, 8, 1, 2016
+	sound_ret
diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm
index 6c462c16..b9a69c19 100644
--- a/audio/sfx/slots_stop_wheel.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,6 +1,6 @@
-SFX_Slots_Stop_Wheel_Ch4:
-	duty 2
-	squarenote 1, 15, 2, 1696
-	squarenote 1, 15, 2, 1760
-	squarenote 8, 15, 1, 1792
-	endchannel
+SFX_Slots_Stop_Wheel_Ch5:
+	duty_cycle 2
+	square_note 1, 15, 2, 1696
+	square_note 1, 15, 2, 1760
+	square_note 8, 15, 1, 1792
+	sound_ret
diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm
index 999b91dc..a6e569a5 100644
--- a/audio/sfx/snare1_1.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_1_Ch7:
-	noisenote 0, 12, 1, 51
-	endchannel
+SFX_Snare1_1_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm
index 994ff3de..336c9f22 100644
--- a/audio/sfx/snare1_2.asm
+++ b/audio/sfx/snare1_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_2_Ch7:
-	noisenote 0, 12, 1, 51
-	endchannel
+SFX_Snare1_2_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm
index 87f4e817..84108aed 100644
--- a/audio/sfx/snare1_3.asm
+++ b/audio/sfx/snare1_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_3_Ch7:
-	noisenote 0, 12, 1, 51
-	endchannel
+SFX_Snare1_3_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm
index 6a9e5cd9..fddcfe01 100644
--- a/audio/sfx/snare2_1.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_1_Ch7:
-	noisenote 0, 11, 1, 51
-	endchannel
+SFX_Snare2_1_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm
index e8f7c5f9..522abb40 100644
--- a/audio/sfx/snare2_2.asm
+++ b/audio/sfx/snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_2_Ch7:
-	noisenote 0, 11, 1, 51
-	endchannel
+SFX_Snare2_2_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm
index 9775a6e9..c41fadbb 100644
--- a/audio/sfx/snare2_3.asm
+++ b/audio/sfx/snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_3_Ch7:
-	noisenote 0, 11, 1, 51
-	endchannel
+SFX_Snare2_3_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm
index 215eaec4..0c9cfbdb 100644
--- a/audio/sfx/snare3_1.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_1_Ch7:
-	noisenote 0, 10, 1, 51
-	endchannel
+SFX_Snare3_1_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm
index 18a301b5..d5990157 100644
--- a/audio/sfx/snare3_2.asm
+++ b/audio/sfx/snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_2_Ch7:
-	noisenote 0, 10, 1, 51
-	endchannel
+SFX_Snare3_2_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm
index decd3ab6..807cfd03 100644
--- a/audio/sfx/snare3_3.asm
+++ b/audio/sfx/snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_3_Ch7:
-	noisenote 0, 10, 1, 51
-	endchannel
+SFX_Snare3_3_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm
index 3cf12af2..fe2552d9 100644
--- a/audio/sfx/snare4_1.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_1_Ch7:
-	noisenote 0, 8, 1, 51
-	endchannel
+SFX_Snare4_1_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm
index f97fab11..0913ba2b 100644
--- a/audio/sfx/snare4_2.asm
+++ b/audio/sfx/snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_2_Ch7:
-	noisenote 0, 8, 1, 51
-	endchannel
+SFX_Snare4_2_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm
index 57b70600..3aeeb49b 100644
--- a/audio/sfx/snare4_3.asm
+++ b/audio/sfx/snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_3_Ch7:
-	noisenote 0, 8, 1, 51
-	endchannel
+SFX_Snare4_3_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm
index deb1bc43..21d4996d 100644
--- a/audio/sfx/snare5_1.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,8 +1,8 @@
-SFX_Snare5_1_Ch7:
-	noisenote 7, 8, 4, 55
-	noisenote 6, 8, 4, 54
-	noisenote 5, 8, 3, 53
-	noisenote 4, 8, 3, 52
-	noisenote 3, 8, 2, 51
-	noisenote 2, 8, 1, 50
-	endchannel
+SFX_Snare5_1_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm
index 5c45259b..c37865a0 100644
--- a/audio/sfx/snare5_2.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,8 +1,8 @@
-SFX_Snare5_2_Ch7:
-	noisenote 7, 8, 4, 55
-	noisenote 6, 8, 4, 54
-	noisenote 5, 8, 3, 53
-	noisenote 4, 8, 3, 52
-	noisenote 3, 8, 2, 51
-	noisenote 2, 8, 1, 50
-	endchannel
+SFX_Snare5_2_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm
index 22836d10..d49211d0 100644
--- a/audio/sfx/snare5_3.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,8 +1,8 @@
-SFX_Snare5_3_Ch7:
-	noisenote 7, 8, 4, 55
-	noisenote 6, 8, 4, 54
-	noisenote 5, 8, 3, 53
-	noisenote 4, 8, 3, 52
-	noisenote 3, 8, 2, 51
-	noisenote 2, 8, 1, 50
-	endchannel
+SFX_Snare5_3_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm
index 5ed7338f..03a63d40 100644
--- a/audio/sfx/snare6_1.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_1_Ch7:
-	noisenote 0, 8, 1, 16
-	endchannel
+SFX_Snare6_1_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm
index dc7b6f34..7adad3fb 100644
--- a/audio/sfx/snare6_2.asm
+++ b/audio/sfx/snare6_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_2_Ch7:
-	noisenote 0, 8, 1, 16
-	endchannel
+SFX_Snare6_2_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm
index 4d061316..9a6b7be3 100644
--- a/audio/sfx/snare6_3.asm
+++ b/audio/sfx/snare6_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_3_Ch7:
-	noisenote 0, 8, 1, 16
-	endchannel
+SFX_Snare6_3_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm
index 993a35de..1e216fea 100644
--- a/audio/sfx/snare7_1.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_1_Ch7:
-	noisenote 0, 8, 2, 35
-	endchannel
+SFX_Snare7_1_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm
index 46ed89a5..11a13239 100644
--- a/audio/sfx/snare7_2.asm
+++ b/audio/sfx/snare7_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_2_Ch7:
-	noisenote 0, 8, 2, 35
-	endchannel
+SFX_Snare7_2_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm
index 663fdf0c..c9d96902 100644
--- a/audio/sfx/snare7_3.asm
+++ b/audio/sfx/snare7_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_3_Ch7:
-	noisenote 0, 8, 2, 35
-	endchannel
+SFX_Snare7_3_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm
index 0c64b371..9dcc4381 100644
--- a/audio/sfx/snare8_1.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_1_Ch7:
-	noisenote 0, 8, 2, 37
-	endchannel
+SFX_Snare8_1_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm
index 88ece7c2..020de92f 100644
--- a/audio/sfx/snare8_2.asm
+++ b/audio/sfx/snare8_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_2_Ch7:
-	noisenote 0, 8, 2, 37
-	endchannel
+SFX_Snare8_2_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm
index 9abaa56e..ecb6a9a7 100644
--- a/audio/sfx/snare8_3.asm
+++ b/audio/sfx/snare8_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_3_Ch7:
-	noisenote 0, 8, 2, 37
-	endchannel
+SFX_Snare8_3_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm
index 58bfca9a..674efb12 100644
--- a/audio/sfx/snare9_1.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_1_Ch7:
-	noisenote 0, 8, 2, 38
-	endchannel
+SFX_Snare9_1_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm
index b8f43254..9d8f307d 100644
--- a/audio/sfx/snare9_2.asm
+++ b/audio/sfx/snare9_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_2_Ch7:
-	noisenote 0, 8, 2, 38
-	endchannel
+SFX_Snare9_2_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm
index 001ed29f..6bfd1973 100644
--- a/audio/sfx/snare9_3.asm
+++ b/audio/sfx/snare9_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_3_Ch7:
-	noisenote 0, 8, 2, 38
-	endchannel
+SFX_Snare9_3_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm
index d2c57bc3..7f5094f4 100644
--- a/audio/sfx/ss_anne_horn_1.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,22 +1,22 @@
-SFX_SS_Anne_Horn_1_Ch4:
-	duty 2
-	squarenote 15, 15, 0, 1280
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 2, 1280
-	endchannel
+SFX_SS_Anne_Horn_1_Ch5:
+	duty_cycle 2
+	square_note 15, 15, 0, 1280
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 2, 1280
+	sound_ret
 
 
-SFX_SS_Anne_Horn_1_Ch5:
-	duty 3
-	squarenote 15, 15, 0, 1154
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 2, 1154
-	endchannel
+SFX_SS_Anne_Horn_1_Ch6:
+	duty_cycle 3
+	square_note 15, 15, 0, 1154
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 2, 1154
+	sound_ret
diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm
index 3672d3d5..fda8e346 100644
--- a/audio/sfx/ss_anne_horn_3.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,22 +1,22 @@
-SFX_SS_Anne_Horn_3_Ch4:
-	duty 2
-	squarenote 15, 15, 0, 1280
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 0, 1280
-	squarenote 15, 15, 2, 1280
-	endchannel
+SFX_SS_Anne_Horn_3_Ch5:
+	duty_cycle 2
+	square_note 15, 15, 0, 1280
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 0, 1280
+	square_note 15, 15, 2, 1280
+	sound_ret
 
 
-SFX_SS_Anne_Horn_3_Ch5:
-	duty 3
-	squarenote 15, 15, 0, 1154
-	squarenote 4, 0, 0, 0
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 0, 1154
-	squarenote 15, 15, 2, 1154
-	endchannel
+SFX_SS_Anne_Horn_3_Ch6:
+	duty_cycle 3
+	square_note 15, 15, 0, 1154
+	square_note 4, 0, 0, 0
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 0, 1154
+	square_note 15, 15, 2, 1154
+	sound_ret
diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm
index 84c28d8a..c82e97e1 100644
--- a/audio/sfx/start_menu_1.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_1_Ch7:
-	noisenote 1, 14, 2, 51
-	noisenote 8, 14, 1, 34
-	endchannel
+SFX_Start_Menu_1_Ch8:
+	noise_note 1, 14, 2, 51
+	noise_note 8, 14, 1, 34
+	sound_ret
diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm
index a9689acf..9860346d 100644
--- a/audio/sfx/start_menu_2.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_2_Ch7:
-	noisenote 1, 14, 2, 51
-	noisenote 8, 14, 1, 34
-	endchannel
+SFX_Start_Menu_2_Ch8:
+	noise_note 1, 14, 2, 51
+	noise_note 8, 14, 1, 34
+	sound_ret
diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm
index f437a4c3..d114af51 100644
--- a/audio/sfx/start_menu_3.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,4 +1,4 @@
-SFX_Start_Menu_3_Ch7:
-	noisenote 1, 14, 2, 51
-	noisenote 8, 14, 1, 34
-	endchannel
+SFX_Start_Menu_3_Ch8:
+	noise_note 1, 14, 2, 51
+	noise_note 8, 14, 1, 34
+	sound_ret
diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm
index ebc1e0b7..c6e25dc9 100644
--- a/audio/sfx/super_effective.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,4 +1,4 @@
-SFX_Super_Effective_Ch7:
-	noisenote 4, 15, 1, 52
-	noisenote 15, 15, 2, 100
-	endchannel
+SFX_Super_Effective_Ch8:
+	noise_note 4, 15, 1, 52
+	noise_note 15, 15, 2, 100
+	sound_ret
diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm
index d200f3b8..98bfff72 100644
--- a/audio/sfx/swap_1.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,11 +1,11 @@
-SFX_Swap_1_Ch4:
-	duty 2
-	squarenote 8, 14, 1, 1856
-	endchannel
+SFX_Swap_1_Ch5:
+	duty_cycle 2
+	square_note 8, 14, 1, 1856
+	sound_ret
 
 
-SFX_Swap_1_Ch5:
-	duty 2
-	squarenote 2, 0, 8, 0
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Swap_1_Ch6:
+	duty_cycle 2
+	square_note 2, 0, 8, 0
+	square_note 8, 11, 1, 1857
+	sound_ret
diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm
index 04d795b6..8e86ac7c 100644
--- a/audio/sfx/swap_3.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,11 +1,11 @@
-SFX_Swap_3_Ch4:
-	duty 2
-	squarenote 8, 14, 1, 1856
-	endchannel
+SFX_Swap_3_Ch5:
+	duty_cycle 2
+	square_note 8, 14, 1, 1856
+	sound_ret
 
 
-SFX_Swap_3_Ch5:
-	duty 2
-	squarenote 2, 0, 8, 0
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Swap_3_Ch6:
+	duty_cycle 2
+	square_note 2, 0, 8, 0
+	square_note 8, 11, 1, 1857
+	sound_ret
diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm
index 76f64e04..145fd35a 100644
--- a/audio/sfx/switch_1.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,8 +1,8 @@
-SFX_Switch_1_Ch4:
-	duty 2
-	squarenote 4, 0, 0, 0
-	squarenote 2, 15, 1, 1664
-	squarenote 1, 0, 0, 0
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 0, 0, 0
-	endchannel
+SFX_Switch_1_Ch5:
+	duty_cycle 2
+	square_note 4, 0, 0, 0
+	square_note 2, 15, 1, 1664
+	square_note 1, 0, 0, 0
+	square_note 4, 15, 1, 1920
+	square_note 4, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm
index 0663b2ed..ce6f1f15 100644
--- a/audio/sfx/switch_3.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,8 +1,8 @@
-SFX_Switch_3_Ch4:
-	duty 2
-	squarenote 4, 0, 0, 0
-	squarenote 2, 15, 1, 1664
-	squarenote 1, 0, 0, 0
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 0, 0, 0
-	endchannel
+SFX_Switch_3_Ch5:
+	duty_cycle 2
+	square_note 4, 0, 0, 0
+	square_note 2, 15, 1, 1664
+	square_note 1, 0, 0, 0
+	square_note 4, 15, 1, 1920
+	square_note 4, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm
index fd94c086..4f99dae1 100644
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,10 +1,10 @@
-SFX_Teleport_Enter1_1_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1792
-	squarenote 15, 11, 7, 1664
-	squarenote 15, 8, 7, 1536
-	squarenote 15, 4, 7, 1408
-	squarenote 15, 1, 7, 1280
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Enter1_1_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1792
+	square_note 15, 11, 7, 1664
+	square_note 15, 8, 7, 1536
+	square_note 15, 4, 7, 1408
+	square_note 15, 1, 7, 1280
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm
index d7f8f076..c6502a29 100644
--- a/audio/sfx/teleport_enter1_3.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,10 +1,10 @@
-SFX_Teleport_Enter1_3_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1792
-	squarenote 15, 11, 7, 1664
-	squarenote 15, 8, 7, 1536
-	squarenote 15, 4, 7, 1408
-	squarenote 15, 1, 7, 1280
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Enter1_3_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1792
+	square_note 15, 11, 7, 1664
+	square_note 15, 8, 7, 1536
+	square_note 15, 4, 7, 1408
+	square_note 15, 1, 7, 1280
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm
index b0d61646..c7901999 100644
--- a/audio/sfx/teleport_enter2_1.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,6 +1,6 @@
-SFX_Teleport_Enter2_1_Ch7:
-	noisenote 2, 15, 1, 50
-	noisenote 2, 0, 0, 0
-	noisenote 2, 15, 1, 34
-	noisenote 1, 0, 0, 0
-	endchannel
+SFX_Teleport_Enter2_1_Ch8:
+	noise_note 2, 15, 1, 50
+	noise_note 2, 0, 0, 0
+	noise_note 2, 15, 1, 34
+	noise_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm
index cc883000..2c0414f3 100644
--- a/audio/sfx/teleport_enter2_3.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,6 +1,6 @@
-SFX_Teleport_Enter2_3_Ch7:
-	noisenote 2, 15, 1, 50
-	noisenote 2, 0, 0, 0
-	noisenote 2, 15, 1, 34
-	noisenote 1, 0, 0, 0
-	endchannel
+SFX_Teleport_Enter2_3_Ch8:
+	noise_note 2, 15, 1, 50
+	noise_note 2, 0, 0, 0
+	noise_note 2, 15, 1, 34
+	noise_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm
index dd986dca..b2511b1f 100644
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,10 +1,10 @@
-SFX_Teleport_Exit1_1_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1280
-	squarenote 15, 11, 7, 1408
-	squarenote 15, 8, 7, 1536
-	squarenote 15, 4, 7, 1664
-	squarenote 15, 1, 7, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Exit1_1_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1280
+	square_note 15, 11, 7, 1408
+	square_note 15, 8, 7, 1536
+	square_note 15, 4, 7, 1664
+	square_note 15, 1, 7, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm
index e3460ad2..6a3b2d96 100644
--- a/audio/sfx/teleport_exit1_3.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,10 +1,10 @@
-SFX_Teleport_Exit1_3_Ch4:
-	duty 1
-	pitchenvelope 1, 7
-	squarenote 15, 13, 7, 1280
-	squarenote 15, 11, 7, 1408
-	squarenote 15, 8, 7, 1536
-	squarenote 15, 4, 7, 1664
-	squarenote 15, 1, 7, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Exit1_3_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 7
+	square_note 15, 13, 7, 1280
+	square_note 15, 11, 7, 1408
+	square_note 15, 8, 7, 1536
+	square_note 15, 4, 7, 1664
+	square_note 15, 1, 7, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm
index 47d7c88b..23a6ea85 100644
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,6 +1,6 @@
-SFX_Teleport_Exit2_1_Ch4:
-	duty 1
-	pitchenvelope 1, 6
-	squarenote 15, 13, 2, 1280
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Exit2_1_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 6
+	square_note 15, 13, 2, 1280
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm
index dccc1d3c..178a4d78 100644
--- a/audio/sfx/teleport_exit2_3.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,6 +1,6 @@
-SFX_Teleport_Exit2_3_Ch4:
-	duty 1
-	pitchenvelope 1, 6
-	squarenote 15, 13, 2, 1280
-	pitchenvelope 0, 0
-	endchannel
+SFX_Teleport_Exit2_3_Ch5:
+	duty_cycle 1
+	pitch_sweep 1, 6
+	square_note 15, 13, 2, 1280
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm
index 8884a204..4e471fab 100644
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,8 +1,8 @@
-SFX_Tink_1_Ch4:
-	duty 2
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 512
-	pitchenvelope 2, 2
-	squarenote 8, 14, 2, 512
-	pitchenvelope 0, 0
-	endchannel
+SFX_Tink_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 512
+	pitch_sweep 2, 2
+	square_note 8, 14, 2, 512
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm
index f1cc705d..077d93be 100644
--- a/audio/sfx/tink_2.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,8 +1,8 @@
-SFX_Tink_2_Ch4:
-	duty 2
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 512
-	pitchenvelope 2, 2
-	squarenote 8, 14, 2, 512
-	pitchenvelope 0, 0
-	endchannel
+SFX_Tink_2_Ch5:
+	duty_cycle 2
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 512
+	pitch_sweep 2, 2
+	square_note 8, 14, 2, 512
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm
index 43d32f5b..e06ed62e 100644
--- a/audio/sfx/tink_3.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,8 +1,8 @@
-SFX_Tink_3_Ch4:
-	duty 2
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 512
-	pitchenvelope 2, 2
-	squarenote 8, 14, 2, 512
-	pitchenvelope 0, 0
-	endchannel
+SFX_Tink_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 512
+	pitch_sweep 2, 2
+	square_note 8, 14, 2, 512
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm
index 97c6d007..050182b7 100644
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,7 +1,7 @@
-SFX_Trade_Machine_1_Ch4:
-	duty 2
-	pitchenvelope 1, 5
-	squarenote 15, 15, 0, 1264
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Trade_Machine_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 5
+	square_note 15, 15, 0, 1264
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm
index 26e58263..d14fc4c1 100644
--- a/audio/sfx/trade_machine_3.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,7 +1,7 @@
-SFX_Trade_Machine_3_Ch4:
-	duty 2
-	pitchenvelope 1, 5
-	squarenote 15, 15, 0, 1264
-	squarenote 15, 15, 2, 1616
-	pitchenvelope 0, 0
-	endchannel
+SFX_Trade_Machine_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 1, 5
+	square_note 15, 15, 0, 1264
+	square_note 15, 15, 2, 1616
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm
index f4d08545..df952676 100644
--- a/audio/sfx/triangle1_1.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_1_Ch7:
-	noisenote 0, 5, 1, 42
-	endchannel
+SFX_Triangle1_1_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm
index 0517ba84..a90cec67 100644
--- a/audio/sfx/triangle1_2.asm
+++ b/audio/sfx/triangle1_2.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_2_Ch7:
-	noisenote 0, 5, 1, 42
-	endchannel
+SFX_Triangle1_2_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm
index 1979b3f9..e897dd61 100644
--- a/audio/sfx/triangle1_3.asm
+++ b/audio/sfx/triangle1_3.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_3_Ch7:
-	noisenote 0, 5, 1, 42
-	endchannel
+SFX_Triangle1_3_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm
index aa6b472e..df7e39ed 100644
--- a/audio/sfx/triangle2_1.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_1_Ch7:
-	noisenote 1, 4, 1, 43
-	noisenote 0, 6, 1, 42
-	endchannel
+SFX_Triangle2_1_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm
index b9f31022..39934efa 100644
--- a/audio/sfx/triangle2_2.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_2_Ch7:
-	noisenote 1, 4, 1, 43
-	noisenote 0, 6, 1, 42
-	endchannel
+SFX_Triangle2_2_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm
index 61dcb880..370e13e7 100644
--- a/audio/sfx/triangle2_3.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_3_Ch7:
-	noisenote 1, 4, 1, 43
-	noisenote 0, 6, 1, 42
-	endchannel
+SFX_Triangle2_3_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm
index 13700a11..18b140e2 100644
--- a/audio/sfx/triangle3_1.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_1_Ch7:
-	noisenote 2, 9, 1, 40
-	noisenote 0, 7, 1, 24
-	endchannel
+SFX_Triangle3_1_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm
index 5555fc40..c03be804 100644
--- a/audio/sfx/triangle3_2.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_2_Ch7:
-	noisenote 2, 9, 1, 40
-	noisenote 0, 7, 1, 24
-	endchannel
+SFX_Triangle3_2_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm
index 1237c952..95a047ae 100644
--- a/audio/sfx/triangle3_3.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_3_Ch7:
-	noisenote 2, 9, 1, 40
-	noisenote 0, 7, 1, 24
-	endchannel
+SFX_Triangle3_3_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm
index ad4ad076..429727b9 100644
--- a/audio/sfx/turn_off_pc_1.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,7 +1,7 @@
-SFX_Turn_Off_PC_1_Ch4:
-	duty 2
-	squarenote 4, 15, 0, 1536
-	squarenote 4, 15, 0, 1024
-	squarenote 4, 15, 0, 512
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Turn_Off_PC_1_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 0, 1536
+	square_note 4, 15, 0, 1024
+	square_note 4, 15, 0, 512
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm
index 842d6b9e..b6682ae2 100644
--- a/audio/sfx/turn_off_pc_3.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,7 +1,7 @@
-SFX_Turn_Off_PC_3_Ch4:
-	duty 2
-	squarenote 4, 15, 0, 1536
-	squarenote 4, 15, 0, 1024
-	squarenote 4, 15, 0, 512
-	squarenote 1, 0, 0, 0
-	endchannel
+SFX_Turn_Off_PC_3_Ch5:
+	duty_cycle 2
+	square_note 4, 15, 0, 1536
+	square_note 4, 15, 0, 1024
+	square_note 4, 15, 0, 512
+	square_note 1, 0, 0, 0
+	sound_ret
diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm
index 6b84b7f3..98c724b5 100644
--- a/audio/sfx/turn_on_pc_1.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,13 +1,13 @@
-SFX_Turn_On_PC_1_Ch4:
-	duty 2
-	squarenote 15, 15, 2, 1984
-	squarenote 15, 0, 0, 0
-	squarenote 3, 10, 1, 1920
-	squarenote 3, 10, 1, 1792
-	squarenote 3, 10, 1, 1856
-	squarenote 3, 10, 1, 1792
-	squarenote 3, 10, 1, 1920
-	squarenote 3, 10, 1, 1792
-	squarenote 3, 10, 1, 1984
-	squarenote 8, 10, 1, 1792
-	endchannel
+SFX_Turn_On_PC_1_Ch5:
+	duty_cycle 2
+	square_note 15, 15, 2, 1984
+	square_note 15, 0, 0, 0
+	square_note 3, 10, 1, 1920
+	square_note 3, 10, 1, 1792
+	square_note 3, 10, 1, 1856
+	square_note 3, 10, 1, 1792
+	square_note 3, 10, 1, 1920
+	square_note 3, 10, 1, 1792
+	square_note 3, 10, 1, 1984
+	square_note 8, 10, 1, 1792
+	sound_ret
diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm
index 281f4567..e33aefa1 100644
--- a/audio/sfx/turn_on_pc_3.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,14 +1,14 @@
-SFX_Turn_On_PC_3_Ch4:
-	duty 2
-	squarenote 15, 15, 2, 1984
-	squarenote 15, 0, 0, 0
-	squarenote 15, 0, 0, 0
-	squarenote 3, 8, 1, 1920
-	squarenote 3, 8, 1, 1792
-	squarenote 3, 8, 1, 1856
-	squarenote 3, 8, 1, 1792
-	squarenote 3, 8, 1, 1920
-	squarenote 3, 8, 1, 1792
-	squarenote 3, 8, 1, 1984
-	squarenote 3, 8, 1, 1792
-	endchannel
+SFX_Turn_On_PC_3_Ch5:
+	duty_cycle 2
+	square_note 15, 15, 2, 1984
+	square_note 15, 0, 0, 0
+	square_note 15, 0, 0, 0
+	square_note 3, 8, 1, 1920
+	square_note 3, 8, 1, 1792
+	square_note 3, 8, 1, 1856
+	square_note 3, 8, 1, 1792
+	square_note 3, 8, 1, 1920
+	square_note 3, 8, 1, 1792
+	square_note 3, 8, 1, 1984
+	square_note 3, 8, 1, 1792
+	sound_ret
diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm
index 36c10ba3..aa93f91c 100644
--- a/audio/sfx/unused2_2.asm
+++ b/audio/sfx/unused2_2.asm
@@ -1,56 +1,56 @@
-SFX_08_unused2_Ch4:
-	executemusic
+SFX_Unused2_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
 	vibrato 6, 2, 6
-	duty 2
-	toggleperfectpitch
-	notetype 6, 11, 1
+	duty_cycle 2
+	toggle_perfect_pitch
+	note_type 6, 11, 1
 	octave 3
-	G# 2
-	G# 2
-	notetype 6, 11, 3
-	G# 2
-	B_ 2
+	note G#, 2
+	note G#, 2
+	note_type 6, 11, 3
+	note G#, 2
+	note B_, 2
 	octave 4
-	E_ 8
-	endchannel
+	note E_, 8
+	sound_ret
 
 
-SFX_08_unused2_Ch5:
-	executemusic
+SFX_Unused2_Ch6:
+	execute_music
 	vibrato 8, 2, 7
-	duty 2
-	notetype 6, 12, 1
+	duty_cycle 2
+	note_type 6, 12, 1
 	octave 4
-	E_ 2
-	E_ 1
-	E_ 1
-	notetype 6, 12, 3
-	E_ 2
-	G# 2
-	B_ 8
-	endchannel
+	note E_, 2
+	note E_, 1
+	note E_, 1
+	note_type 6, 12, 3
+	note E_, 2
+	note G#, 2
+	note B_, 8
+	sound_ret
 
 
-SFX_08_unused2_Ch6:
-	executemusic
-	notetype 6, 1, 0
+SFX_Unused2_Ch7:
+	execute_music
+	note_type 6, 1, 0
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 3, 1, 0
-	B_ 1
+	note_type 3, 1, 0
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	notetype 6, 1, 0
-	B_ 1
+	note_type 6, 1, 0
+	note B_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	B_ 4
+	note B_, 4
 	rest 4
-	endchannel
+	sound_ret
diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm
index e805a333..6b237950 100644
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_1.asm
@@ -1,31 +1,31 @@
-SFX_Unused_1_Ch4:
-	dutycycle 240
-	squarenote 15, 14, 0, 1920
-	squarenote 15, 15, 0, 1924
-	squarenote 15, 12, 3, 1504
-	squarenote 15, 12, 4, 1536
-	squarenote 10, 6, -4, 1920
-	squarenote 8, 7, 1, 1924
-	endchannel
+SFX_Unused_1_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 14, 0, 1920
+	square_note 15, 15, 0, 1924
+	square_note 15, 12, 3, 1504
+	square_note 15, 12, 4, 1536
+	square_note 10, 6, -4, 1920
+	square_note 8, 7, 1, 1924
+	sound_ret
 
 
-SFX_Unused_1_Ch5:
-	dutycycle 5
-	squarenote 15, 10, 0, 1857
-	squarenote 15, 11, 0, 1859
-	squarenote 15, 9, 3, 1457
-	squarenote 15, 9, 4, 1473
-	squarenote 10, 4, -4, 1857
-	squarenote 8, 3, 1, 1862
-	endchannel
+SFX_Unused_1_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 10, 0, 1857
+	square_note 15, 11, 0, 1859
+	square_note 15, 9, 3, 1457
+	square_note 15, 9, 4, 1473
+	square_note 10, 4, -4, 1857
+	square_note 8, 3, 1, 1862
+	sound_ret
 
 
-SFX_Unused_1_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 0, 58
-	noisenote 15, 13, 0, 58
-	noisenote 8, 13, 0, 44
-	noisenote 6, 14, 6, 76
-	noisenote 12, 7, -5, 76
-	noisenote 15, 13, 3, 76
-	endchannel
+SFX_Unused_1_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 0, 58
+	noise_note 15, 13, 0, 58
+	noise_note 8, 13, 0, 44
+	noise_note 6, 14, 6, 76
+	noise_note 12, 7, -5, 76
+	noise_note 15, 13, 3, 76
+	sound_ret
diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm
index fb86989c..0a8fa9d9 100644
--- a/audio/sfx/unused_2.asm
+++ b/audio/sfx/unused_2.asm
@@ -1,31 +1,31 @@
-SFX_Unused_2_Ch4:
-	dutycycle 240
-	squarenote 15, 14, 0, 1920
-	squarenote 15, 15, 0, 1924
-	squarenote 15, 12, 3, 1504
-	squarenote 15, 12, 4, 1536
-	squarenote 10, 6, -4, 1920
-	squarenote 8, 7, 1, 1924
-	endchannel
+SFX_Unused_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 14, 0, 1920
+	square_note 15, 15, 0, 1924
+	square_note 15, 12, 3, 1504
+	square_note 15, 12, 4, 1536
+	square_note 10, 6, -4, 1920
+	square_note 8, 7, 1, 1924
+	sound_ret
 
 
-SFX_Unused_2_Ch5:
-	dutycycle 5
-	squarenote 15, 10, 0, 1857
-	squarenote 15, 11, 0, 1859
-	squarenote 15, 9, 3, 1457
-	squarenote 15, 9, 4, 1473
-	squarenote 10, 4, -4, 1857
-	squarenote 8, 3, 1, 1862
-	endchannel
+SFX_Unused_2_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 10, 0, 1857
+	square_note 15, 11, 0, 1859
+	square_note 15, 9, 3, 1457
+	square_note 15, 9, 4, 1473
+	square_note 10, 4, -4, 1857
+	square_note 8, 3, 1, 1862
+	sound_ret
 
 
-SFX_Unused_2_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 0, 58
-	noisenote 15, 13, 0, 58
-	noisenote 8, 13, 0, 44
-	noisenote 6, 14, 6, 76
-	noisenote 12, 7, -5, 76
-	noisenote 15, 13, 3, 76
-	endchannel
+SFX_Unused_2_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 0, 58
+	noise_note 15, 13, 0, 58
+	noise_note 8, 13, 0, 44
+	noise_note 6, 14, 6, 76
+	noise_note 12, 7, -5, 76
+	noise_note 15, 13, 3, 76
+	sound_ret
diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm
index 30d8e534..3710e797 100644
--- a/audio/sfx/unused_3.asm
+++ b/audio/sfx/unused_3.asm
@@ -1,31 +1,31 @@
-SFX_Unused_3_Ch4:
-	dutycycle 240
-	squarenote 15, 14, 0, 1920
-	squarenote 15, 15, 0, 1924
-	squarenote 15, 12, 3, 1504
-	squarenote 15, 12, 4, 1536
-	squarenote 10, 6, -4, 1920
-	squarenote 8, 7, 1, 1924
-	endchannel
+SFX_Unused_3_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 14, 0, 1920
+	square_note 15, 15, 0, 1924
+	square_note 15, 12, 3, 1504
+	square_note 15, 12, 4, 1536
+	square_note 10, 6, -4, 1920
+	square_note 8, 7, 1, 1924
+	sound_ret
 
 
-SFX_Unused_3_Ch5:
-	dutycycle 5
-	squarenote 15, 10, 0, 1857
-	squarenote 15, 11, 0, 1859
-	squarenote 15, 9, 3, 1457
-	squarenote 15, 9, 4, 1473
-	squarenote 10, 4, -4, 1857
-	squarenote 8, 3, 1, 1862
-	endchannel
+SFX_Unused_3_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 10, 0, 1857
+	square_note 15, 11, 0, 1859
+	square_note 15, 9, 3, 1457
+	square_note 15, 9, 4, 1473
+	square_note 10, 4, -4, 1857
+	square_note 8, 3, 1, 1862
+	sound_ret
 
 
-SFX_Unused_3_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 0, 58
-	noisenote 15, 13, 0, 58
-	noisenote 8, 13, 0, 44
-	noisenote 6, 14, 6, 76
-	noisenote 12, 7, -5, 76
-	noisenote 15, 13, 3, 76
-	endchannel
+SFX_Unused_3_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 0, 58
+	noise_note 15, 13, 0, 58
+	noise_note 8, 13, 0, 44
+	noise_note 6, 14, 6, 76
+	noise_note 12, 7, -5, 76
+	noise_note 15, 13, 3, 76
+	sound_ret
diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm
index 7699d841..c53a7d0a 100644
--- a/audio/sfx/vine_whip.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,10 +1,10 @@
-SFX_Vine_Whip_Ch7:
-	noisenote 1, 12, 2, 51
-	noisenote 2, 15, 2, 33
-	noisenote 1, 14, 2, 51
-	noisenote 1, 12, 2, 50
-	noisenote 1, 9, 2, 18
-	noisenote 1, 11, 2, 49
-	noisenote 12, 9, 1, 16
-	noisenote 8, 15, 2, 65
-	endchannel
+SFX_Vine_Whip_Ch8:
+	noise_note 1, 12, 2, 51
+	noise_note 2, 15, 2, 33
+	noise_note 1, 14, 2, 51
+	noise_note 1, 12, 2, 50
+	noise_note 1, 9, 2, 18
+	noise_note 1, 11, 2, 49
+	noise_note 12, 9, 1, 16
+	noise_note 8, 15, 2, 65
+	sound_ret
diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm
index fe1daefb..9c4f2868 100644
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,12 +1,12 @@
-SFX_Withdraw_Deposit_1_Ch4:
-	duty 1
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 1280
-	pitchenvelope 2, 2
-	squarenote 4, 14, 2, 1280
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 1792
-	pitchenvelope 2, 2
-	squarenote 15, 14, 2, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Withdraw_Deposit_1_Ch5:
+	duty_cycle 1
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 1280
+	pitch_sweep 2, 2
+	square_note 4, 14, 2, 1280
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 1792
+	pitch_sweep 2, 2
+	square_note 15, 14, 2, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm
index 3ed89f24..cd881753 100644
--- a/audio/sfx/withdraw_deposit_3.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,12 +1,12 @@
-SFX_Withdraw_Deposit_3_Ch4:
-	duty 1
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 1280
-	pitchenvelope 2, 2
-	squarenote 4, 14, 2, 1280
-	pitchenvelope 3, -2
-	squarenote 4, 15, 2, 1792
-	pitchenvelope 2, 2
-	squarenote 15, 14, 2, 1792
-	pitchenvelope 0, 0
-	endchannel
+SFX_Withdraw_Deposit_3_Ch5:
+	duty_cycle 1
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 1280
+	pitch_sweep 2, 2
+	square_note 4, 14, 2, 1280
+	pitch_sweep 3, -2
+	square_note 4, 15, 2, 1792
+	pitch_sweep 2, 2
+	square_note 15, 14, 2, 1792
+	pitch_sweep 0, 0
+	sound_ret
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 04336810..2b00a812 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -872,7 +872,7 @@ FaintEnemyPokemon:
 	ld a, SFX_FAINT_FALL
 	call PlaySoundWaitForCurrent
 .sfxwait
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp SFX_FAINT_FALL
 	jr z, .sfxwait
 	ld a, SFX_FAINT_THUD
@@ -956,7 +956,7 @@ EndLowHealthAlarm:
 ; the low health alarm and prevents it from reactivating until the next battle.
 	xor a
 	ld [wLowHealthAlarm], a ; turn off low health alarm
-	ld [wChannelSoundIDs + Ch4], a
+	ld [wChannelSoundIDs + Ch5], a
 	inc a
 	ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating
 	ret
@@ -1954,7 +1954,7 @@ DrawPlayerHUDAndHPBar:
 	ld [hl], $0
 	ret z
 	xor a
-	ld [wChannelSoundIDs + Ch4], a
+	ld [wChannelSoundIDs + Ch5], a
 	ret
 .setLowHealthAlarm
 	ld hl, wLowHealthAlarm
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index c77e3b39..830a23a1 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -46,7 +46,7 @@ EndOfBattle:
 .resetVariables
 	xor a
 	ld [wLowHealthAlarm], a ;disable low health alarm
-	ld [wChannelSoundIDs + Ch4], a
+	ld [wChannelSoundIDs + Ch5], a
 	ld [wIsInBattle], a
 	ld [wBattleType], a
 	ld [wMoveMissed], a
diff --git a/engine/evolution.asm b/engine/evolution.asm
index a2c52765..731735c5 100755
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -8,7 +8,7 @@ EvolveMon:
 	push af
 	xor a
 	ld [wLowHealthAlarm], a
-	ld [wChannelSoundIDs + Ch4], a
+	ld [wChannelSoundIDs + Ch5], a
 	dec a
 	ld [wNewSoundID], a
 	call PlaySound
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 491be861..89be94fc 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -71,7 +71,7 @@ SafariZoneGameOver:
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .waitForMusicToPlay
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp SFX_SAFARI_ZONE_PA
 	jr nz, .waitForMusicToPlay
 	ld a, TEXT_SAFARI_GAME_OVER
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 38e8a704..ec51a0d4 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -990,7 +990,7 @@ ItemUseMedicine:
 .notFullHP ; if the pokemon's current HP doesn't equal its max HP
 	xor a
 	ld [wLowHealthAlarm], a ;disable low health alarm
-	ld [wChannelSoundIDs + Ch4], a
+	ld [wChannelSoundIDs + Ch5], a
 	push hl
 	push de
 	ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1)
@@ -1777,7 +1777,7 @@ ItemUsePokeflute:
 	call WaitForSoundToFinish ; wait for sound to end
 	callba Music_PokeFluteInBattle ; play in-battle pokeflute music
 .musicWaitLoop ; wait for music to finish playing
-	ld a, [wChannelSoundIDs + Ch6]
+	ld a, [wChannelSoundIDs + Ch7]
 	and a ; music off?
 	jr nz, .musicWaitLoop
 .skipMusic
@@ -1850,7 +1850,7 @@ PlayedFluteHadEffectText:
 	ld c, BANK(SFX_Pokeflute)
 	call PlayMusic
 .musicWaitLoop ; wait for music to finish playing
-	ld a, [wChannelSoundIDs + Ch2]
+	ld a, [wChannelSoundIDs + Ch3]
 	cp SFX_POKEFLUTE
 	jr z, .musicWaitLoop
 	call PlayDefaultMusic ; start playing normal music again
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 7ff4ff71..d68e4f81 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -33,7 +33,7 @@ ShakeElevator:
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .musicLoop
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp SFX_SAFARI_ZONE_PA
 	jr z, .musicLoop
 	call UpdateSprites
diff --git a/home.asm b/home.asm
index 0397cb08..62be4371 100644
--- a/home.asm
+++ b/home.asm
@@ -3211,7 +3211,7 @@ WaitForSoundToFinish::
 	ret nz
 	push hl
 .waitLoop
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	xor a
 	or [hl]
 	inc hl
diff --git a/home/audio.asm b/home/audio.asm
index c982d9d6..242f038b 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -148,10 +148,10 @@ PlaySound::
 	and a
 	jr z, .next
 	xor a
-	ld [wChannelSoundIDs + Ch4], a
 	ld [wChannelSoundIDs + Ch5], a
 	ld [wChannelSoundIDs + Ch6], a
 	ld [wChannelSoundIDs + Ch7], a
+	ld [wChannelSoundIDs + Ch8], a
 .next
 	ld a, [wAudioFadeOutControl]
 	and a ; has a fade-out length been specified?
diff --git a/home/overworld.asm b/home/overworld.asm
index 9404a713..b96efcb4 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1244,7 +1244,7 @@ CollisionCheckOnLand::
 	call CheckTilePassable
 	jr nc, .noCollision
 .collision
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp SFX_COLLISION ; check if collision sound is already playing
 	jr z, .setCarry
 	ld a, SFX_COLLISION
@@ -1948,7 +1948,7 @@ CollisionCheckOnWater::
 	jr z, .stopSurfing ; stop surfing if the tile is passable
 	jr .loop
 .collision
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp SFX_COLLISION ; check if collision sound is already playing
 	jr z, .setCarry
 	ld a, SFX_COLLISION
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index d4914002..ae67491f 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -4,16 +4,16 @@ StopAllMusic: MACRO
 	call PlaySound
 ENDM
 
-Ch0    EQU 0
-Ch1    EQU 1
-Ch2    EQU 2
-Ch3    EQU 3
-Ch4    EQU 4
-Ch5    EQU 5
-Ch6    EQU 6
-Ch7    EQU 7
-
-audio: MACRO
+Ch1    EQU 0
+Ch2    EQU 1
+Ch3    EQU 2
+Ch4    EQU 3
+Ch5    EQU 4
+Ch6    EQU 5
+Ch7    EQU 6
+Ch8    EQU 7
+
+audio_header: MACRO
 	db (_NARG - 2) << 6 | \2
 	dw \1_\2
 	IF _NARG > 2
@@ -31,7 +31,7 @@ audio: MACRO
 ENDM
 
 ;format: length [0, 7], pitch change [-7, 7]
-pitchenvelope: MACRO
+pitch_sweep: MACRO
 	db $10
 	IF \2 > 0
 		db (\1 << 4) | \2
@@ -41,7 +41,7 @@ pitchenvelope: MACRO
 ENDM
 
 ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
-squarenote: MACRO
+square_note: MACRO
 	db $20 | \1
 	IF \3 < 0
 		db (\2 << 4) | (%1000 | (\3 * -1))
@@ -52,7 +52,7 @@ squarenote: MACRO
 ENDM
 
 ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
-noisenote: MACRO
+noise_note: MACRO
 	db $20 | \1
 	IF \3 < 0
 		db (\2 << 4) | (%1000 | (\3 * -1))
@@ -62,53 +62,22 @@ noisenote: MACRO
 	db \4
 ENDM
 
-;format: pitch length (in 16ths)
-C_: MACRO
-	db $00 | (\1 - 1)
-ENDM
-
-C#: MACRO
-	db $10 | (\1 - 1)
-ENDM
-
-D_: MACRO
-	db $20 | (\1 - 1)
-ENDM
-
-D#: MACRO
-	db $30 | (\1 - 1)
-ENDM
-
-E_: MACRO
-	db $40 | (\1 - 1)
-ENDM
-
-F_: MACRO
-	db $50 | (\1 - 1)
-ENDM
+C_ EQU $0
+C# EQU $1
+D_ EQU $2
+D# EQU $3
+E_ EQU $4
+F_ EQU $5
+F# EQU $6
+G_ EQU $7
+G# EQU $8
+A_ EQU $9
+A# EQU $A
+B_ EQU $B
 
-F#: MACRO
-	db $60 | (\1 - 1)
-ENDM
-
-G_: MACRO
-	db $70 | (\1 - 1)
-ENDM
-
-G#: MACRO
-	db $80 | (\1 - 1)
-ENDM
-
-A_: MACRO
-	db $90 | (\1 - 1)
-ENDM
-
-A#: MACRO
-	db $A0 | (\1 - 1)
-ENDM
-
-B_: MACRO
-	db $B0 | (\1 - 1)
+;format: pitch length (in 16ths)
+note: MACRO
+	db (\1 << 4) | (\2 - 1)
 ENDM
 
 ;format: instrument length (in 16ths)
@@ -213,7 +182,7 @@ rest: MACRO
 ENDM
 
 ; format: notetype speed, volume, fade
-notetype: MACRO
+note_type: MACRO
 	db $D0 | \1
 	db (\2 << 4) | \3
 ENDM
@@ -226,7 +195,7 @@ octave: MACRO
 	db $E8 - \1
 ENDM
 
-toggleperfectpitch: MACRO
+toggle_perfect_pitch: MACRO
 	db $E8
 ENDM
 
@@ -237,13 +206,13 @@ vibrato: MACRO
 	db (\2 << 4) | \3
 ENDM
 
-pitchbend: MACRO
+pitch_slide: MACRO
 	db $EB
 	db \1
 	db \2
 ENDM
 
-duty: MACRO
+duty_cycle: MACRO
 	db $EC
 	db \1
 ENDM
@@ -254,7 +223,7 @@ tempo: MACRO
 	db \1 % $100
 ENDM
 
-stereopanning: MACRO
+stereo_panning: MACRO
 	db $EE
 	db \1
 ENDM
@@ -264,28 +233,28 @@ volume: MACRO
 	db (\1 << 4) | \2
 ENDM
 
-executemusic: MACRO
+execute_music: MACRO
 	db $F8
 ENDM
 
-dutycycle: MACRO
+duty_cycle_pattern: MACRO
 	db $FC
 	db \1
 ENDM
 
 ;format: callchannel address
-callchannel: MACRO
+sound_call: MACRO
 	db $FD
 	dw \1
 ENDM
 
 ;format: loopchannel count, address
-loopchannel: MACRO
+sound_loop: MACRO
 	db $FE
 	db \1
 	dw \2
 ENDM
 
-endchannel: MACRO
+sound_ret: MACRO
 	db $FF
 ENDM
diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm
index 68115050..22d2fb6b 100755
--- a/scripts/PewterPokecenter.asm
+++ b/scripts/PewterPokecenter.asm
@@ -60,7 +60,7 @@ PewterJigglypuffText:
 
 	ld a, [wChannelSoundIDs]
 	ld b, a
-	ld a, [wChannelSoundIDs + Ch1]
+	ld a, [wChannelSoundIDs + Ch2]
 	or b
 	jr nz, .loop