shithub: pokecrystal

Download patch

ref: 8627d1760e760dff0809f88114b4903dc95acfb9
parent: 2143b5479ea9742226fec4e8be61e49f33cb301c
author: yenatch <[email protected]>
date: Wed Nov 6 20:18:50 EST 2013 

dump the music again


--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -1,73 +1,67 @@
-_Music_AfterTheRivalFight: ; 0xf5127
-	db $c0
-	dw _Music_AfterTheRivalFight_Ch1
-	db $01
-	dw _Music_AfterTheRivalFight_Ch2
-	db $02
-	dw _Music_AfterTheRivalFight_Ch3
-	db $03
-	dw _Music_AfterTheRivalFight_Ch4
-; 0xf5133
+Music_AfterTheRivalFight: ; f5127
+	dbw $c0, Music_AfterTheRivalFight_Ch1
+	dbw $01, Music_AfterTheRivalFight_Ch2
+	dbw $02, Music_AfterTheRivalFight_Ch3
+	dbw $03, Music_AfterTheRivalFight_Ch4
+; f5133
 
-_Music_AfterTheRivalFight_Ch1: ; 0xf5133
-	tempo $7000
+
+Music_AfterTheRivalFight_Ch1: ; f5133
+	tempo 112
 	volume $77
-	dutycycle $00
-	tone $0100
-	vibrato $08, $14
+	dutycycle $0
+	tone $0001
+	vibrato $8, $14
 	stereopanning $f0
-	notetype $0c, $b2
-	octave2
-	note $93
-	note $93
+	notetype $c, $b2
+	octave 2
+	note G#, 3
+	note G#, 3
 	intensity $82
-	octave3
-	note $91
-	note $91
-	note $91
-	note $91
-	loopchannel $00, $4fb1 ; end
-; 0xf5153
+	octave 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
 
-_Music_AfterTheRivalFight_Ch2: ; 0xf5153
-	dutycycle $01
-	vibrato $06, $35
-	stereopanning $0f
-	notetype $0c, $c2
-	octave4
-	note $93
-	note $93
+Music_AfterTheRivalFight_Ch2: ; f5153
+	dutycycle $1
+	vibrato $6, $35
+	stereopanning $f
+	notetype $c, $c2
+	octave 4
+	note G#, 3
+	note G#, 3
 	intensity $a2
-	note $91
-	note $91
-	note $91
-	note $91
-	loopchannel $00, $502e ; end
-; 0xf516a
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
 
-_Music_AfterTheRivalFight_Ch3: ; 0xf516a
-	notetype $0c, $28
-	octave3
-	note $41
-	note $01
-	note $41
-	note $01
-	note $91
-	note $71
-	note $61
-	note $41
-	loopchannel $00, $509d ; end
-; 0xf517a
+Music_AfterTheRivalFight_Ch3: ; f516a
+	notetype $c, $28
+	octave 3
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
 
-_Music_AfterTheRivalFight_Ch4: ; 0xf517a
-	togglenoise $03
-	stereopanning $0f
-	notetype $0c
-	note $33
-	note $33
-	note $41
-	note $31
-	note $31
-	note $31
-	loopchannel $00, $5118 ; end
-; 0xf518a
+Music_AfterTheRivalFight_Ch4: ; f517a
+	togglenoise $3
+	stereopanning $f
+	notetype $c
+	note D_, 3
+	note D_, 3
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
+; f518a
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -1,667 +1,666 @@
-_Music_AzaleaTown: ; 0xf57e8
-	db $c0
-	dw _Music_AzaleaTown_Ch1
-	db $01
-	dw _Music_AzaleaTown_Ch2
-	db $02
-	dw _Music_AzaleaTown_Ch3
-	db $03
-	dw _Music_AzaleaTown_Ch4
-; 0xf57f4
+Music_AzaleaTown: ; f57e8
+	dbw $c0, Music_AzaleaTown_Ch1
+	dbw $01, Music_AzaleaTown_Ch2
+	dbw $02, Music_AzaleaTown_Ch3
+	dbw $03, Music_AzaleaTown_Ch4
+; f57f4
 
-_Music_AzaleaTown_Ch1: ; 0xf57f4
-	tempo $a000
+
+Music_AzaleaTown_Ch1: ; f57f4
+	tempo 160
 	volume $77
-	dutycycle $02
-	stereopanning $0f
-	notetype $0c, $a1
-	note $01
+	dutycycle $2
+	stereopanning $f
+	notetype $c, $a1
+	note __, 1
+
+Music_AzaleaTown_branch_f5801: ; f5801
 	intensity $a1
-	octave3
-	note $61
+	octave 3
+	note F_, 1
 	intensity $61
-	note $61
-	note $61
+	note F_, 1
+	note F_, 1
 	intensity $a1
-	note $61
+	note F_, 1
 	intensity $61
-	note $61
-	note $61
-	note $61
-	note $61
-	loopchannel $02, $5801
-	callchannel _Music_AzaleaTown_sub_0xf588c
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	loopchannel 2, Music_AzaleaTown_branch_f5801
+
+Music_AzaleaTown_branch_f5816: ; f5816
+	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
 	intensity $a4
-	note $91
-	note $b0
-	note $02
-	octave4
-	note $13
-	notetype $06, $a4
-	note $80
-	note $92
-	note $73
-	note $41
-	note $01
-	stereopanning $0f
-	callchannel _Music_AzaleaTown_sub_0xf588c
+	note G#, 1
+	note A#, 0
+	note __, 2
+	octave 4
+	note C_, 3
+	notetype $6, $a4
+	note G_, 0
+	note G#, 2
+	note F#, 3
+	note D#, 1
+	note __, 1
+	stereopanning $f
+	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
-	notetype $06, $a4
-	note $43
-	note $13
-	note $02
-	note $c0
-	octave4
-	note $1b
-	octave3
-	note $b3
-	note $73
-	stereopanning $0f
-	callchannel _Music_AzaleaTown_sub_0xf5912
+	notetype $6, $a4
+	note D#, 3
+	note C_, 3
+	note __, 2
+	note B_, 0
+	octave 4
+	note C_, 11
+	octave 3
+	note A#, 3
+	note F#, 3
+	stereopanning $f
+	callchannel Music_AzaleaTown_branch_f5912
 	intensity $a3
-	note $b3
-	octave4
-	note $21
-	note $01
-	note $11
-	note $01
+	note A#, 3
+	octave 4
+	note C#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
 	intensity $a1
-	octave3
-	note $23
-	note $a1
-	note $0d
-	callchannel _Music_AzaleaTown_sub_0xf5912
+	octave 3
+	note C#, 3
+	note A_, 1
+	note __, 13
+	callchannel Music_AzaleaTown_branch_f5912
 	intensity $a3
-	octave4
-	note $10
-	note $22
-	note $61
-	note $01
-	note $21
-	note $01
+	octave 4
+	note C_, 0
+	note C#, 2
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	intensity $a1
-	octave3
-	note $83
-	note $b3
-	note $87
+	octave 3
+	note G_, 3
+	note A#, 3
+	note G_, 7
 	intensity $a2
-	note $b3
-	octave4
-	note $23
-	octave3
-	note $b3
-	note $73
-	note $27
-	note $73
-	note $03
-	note $b3
-	octave4
-	note $23
-	octave3
-	note $b3
-	note $83
-	note $23
-	note $03
-	note $83
-	note $03
-	octave4
-	note $23
-	note $43
-	note $23
-	octave3
-	note $93
-	note $43
-	note $23
-	octave2
-	note $93
-	note $07
-	notetype $0c, $2f
-	octave3
-	note $9d
-	note $01
-	loopchannel $00, $5816 ; end
-; 0xf588c
+	note A#, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note A#, 3
+	note F#, 3
+	note C#, 7
+	note F#, 3
+	note __, 3
+	note A#, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note A#, 3
+	note G_, 3
+	note C#, 3
+	note __, 3
+	note G_, 3
+	note __, 3
+	octave 4
+	note C#, 3
+	note D#, 3
+	note C#, 3
+	octave 3
+	note G#, 3
+	note D#, 3
+	note C#, 3
+	octave 2
+	note G#, 3
+	note __, 7
+	notetype $c, $2f
+	octave 3
+	note G#, 13
+	note __, 1
+	loopchannel 0, Music_AzaleaTown_branch_f5816
+; f588c
 
-_Music_AzaleaTown_sub_0xf588c: ; 0xf588c
-; subroutine
-	notetype $0c, $a1
-	octave4
-	note $61
+Music_AzaleaTown_branch_f588c: ; f588c
+	notetype $c, $a1
+	octave 4
+	note F_, 1
 	intensity $61
-	note $61
-	note $61
+	note F_, 1
+	note F_, 1
 	intensity $a1
-	note $41
+	note D#, 1
 	intensity $61
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $a1
-	note $61
+	note F_, 1
 	intensity $61
-	note $61
+	note F_, 1
 	intensity $a1
-	note $b1
+	note A#, 1
 	intensity $61
-	note $b1
-	note $b1
+	note A#, 1
+	note A#, 1
 	intensity $a1
-	note $91
+	note G#, 1
 	intensity $61
-	note $91
-	note $91
+	note G#, 1
+	note G#, 1
 	intensity $a1
-	note $a1
+	note A_, 1
 	intensity $61
-	note $a1
+	note A_, 1
 	intensity $a1
-	note $11
+	note C_, 1
 	intensity $61
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $a1
-	note $21
+	note C#, 1
 	intensity $61
-	note $21
-	note $21
-	note $21
-	note $21
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
 	intensity $a1
-	note $41
+	note D#, 1
 	intensity $61
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $a1
-	note $21
+	note C#, 1
 	intensity $61
-	note $21
-	note $21
-	note $21
-	note $01
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note __, 1
 	intensity $a1
-	octave3
-	note $61
+	octave 3
+	note F_, 1
 	intensity $61
-	note $61
-	note $61
+	note F_, 1
+	note F_, 1
 	intensity $a1
-	note $71
+	note F#, 1
 	intensity $61
-	note $71
-	note $71
-	note $71
-	note $71
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
 	intensity $a1
-	note $61
+	note F_, 1
 	intensity $61
-	note $61
-	note $61
+	note F_, 1
+	note F_, 1
 	intensity $a1
-	note $41
+	note D#, 1
 	intensity $61
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $a1
-	note $21
+	note C#, 1
 	intensity $61
-	note $21
+	note C#, 1
 	intensity $a1
-	note $11
+	note C_, 1
 	intensity $61
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $a1
-	octave2
-	note $b1
+	octave 2
+	note A#, 1
 	intensity $61
-	note $b1
-	note $b1
+	note A#, 1
+	note A#, 1
 	intensity $a1
-	octave3
-	note $21
+	octave 3
+	note C#, 1
 	intensity $61
-	note $21
-	endchannel ; end
-; 0xf5912
+	note C#, 1
+	endchannel
+; f5912
 
-_Music_AzaleaTown_sub_0xf5912: ; 0xf5912
-; subroutine
+Music_AzaleaTown_branch_f5912: ; f5912
 	intensity $61
-	note $97
-	note $97
+	note G#, 7
+	note G#, 7
 	intensity $81
-	note $a7
+	note A_, 7
 	intensity $a1
-	note $a7
-	endchannel ; end
-; 0xf591d
+	note A_, 7
+	endchannel
 
-_Music_AzaleaTown_Ch2: ; 0xf591d
+Music_AzaleaTown_Ch2: ; f591d
 	vibrato $12, $23
-	dutycycle $02
+	dutycycle $2
 	stereopanning $f0
-	notetype $0c, $62
-	note $00
-	octave4
-	note $30
+	notetype $c, $62
+	note __, 0
+	octave 4
+	note D_, 0
 	intensity $b1
-	note $41
+	note D#, 1
 	intensity $71
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $b1
-	note $21
+	note C#, 1
 	intensity $71
-	note $21
-	note $21
+	note C#, 1
+	note C#, 1
 	intensity $51
-	note $21
-	note $21
+	note C#, 1
+	note C#, 1
 	intensity $b1
-	note $11
+	note C_, 1
 	intensity $71
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $b1
-	note $21
+	note C#, 1
 	intensity $71
-	note $21
-	note $21
-	notetype $06, $b4
-	note $66
-	dutycycle $01
-	octave5
-	note $10
-	callchannel _Music_AzaleaTown_sub_0xf59c7
-	note $23
-	note $11
-	note $20
-	note $02
-	notetype $06, $b4
-	note $4a
-	note $07
-	dutycycle $01
-	octave5
-	note $10
-	callchannel _Music_AzaleaTown_sub_0xf59c7
-	note $01
-	note $21
-	note $11
-	octave3
-	note $91
-	notetype $06, $b4
-	note $02
-	octave4
-	note $80
-	note $9b
-	note $73
-	note $63
-	dutycycle $00
-	note $30
-	note $42
-	note $23
-	note $11
-	note $01
-	note $93
-	note $03
-	note $73
-	note $03
-	note $63
-	note $43
-	note $61
-	note $01
-	note $41
-	note $01
-	note $27
-	note $0b
-	note $30
-	note $42
-	note $23
-	note $11
-	note $01
-	note $93
-	note $03
-	note $a3
-	note $03
-	octave5
-	note $13
-	octave4
-	note $c0
-	octave5
-	note $12
-	note $21
-	note $01
-	note $11
-	note $01
-	octave4
-	note $63
-	note $03
-	note $43
-	note $03
-	note $23
-	dutycycle $02
-	note $63
-	note $43
-	note $23
-	note $63
-	note $03
-	note $43
-	note $03
-	note $23
-	note $63
-	note $43
-	note $23
-	note $63
-	note $03
-	note $b3
-	note $03
-	octave5
-	note $13
-	notetype $0c, $b7
-	octave4
-	note $9b
-	note $43
+	note C#, 1
+	note C#, 1
+	notetype $6, $b4
+	note F_, 6
+	dutycycle $1
+	octave 5
+	note C_, 0
+
+Music_AzaleaTown_branch_f5952: ; f5952
+	callchannel Music_AzaleaTown_branch_f59c7
+	note C#, 3
+	note C_, 1
+	note C#, 0
+	note __, 2
+	notetype $6, $b4
+	note D#, 10
+	note __, 7
+	dutycycle $1
+	octave 5
+	note C_, 0
+	callchannel Music_AzaleaTown_branch_f59c7
+	note __, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note G#, 1
+	notetype $6, $b4
+	note __, 2
+	octave 4
+	note G_, 0
+	note G#, 11
+	note F#, 3
+	note F_, 3
+	dutycycle $0
+	note D_, 0
+	note D#, 2
+	note C#, 3
+	note C_, 1
+	note __, 1
+	note G#, 3
+	note __, 3
+	note F#, 3
+	note __, 3
+	note F_, 3
+	note D#, 3
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 7
+	note __, 11
+	note D_, 0
+	note D#, 2
+	note C#, 3
+	note C_, 1
+	note __, 1
+	note G#, 3
+	note __, 3
+	note A_, 3
+	note __, 3
+	octave 5
+	note C_, 3
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 2
+	note C#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note F_, 3
+	note __, 3
+	note D#, 3
+	note __, 3
+	note C#, 3
+	dutycycle $2
+	note F_, 3
+	note D#, 3
+	note C#, 3
+	note F_, 3
+	note __, 3
+	note D#, 3
+	note __, 3
+	note C#, 3
+	note F_, 3
+	note D#, 3
+	note C#, 3
+	note F_, 3
+	note __, 3
+	note A#, 3
+	note __, 3
+	octave 5
+	note C_, 3
+	notetype $c, $b7
+	octave 4
+	note G#, 11
+	note D#, 3
 	intensity $1f
-	note $1d
-	notetype $06, $b4
-	dutycycle $01
-	note $91
-	octave5
-	note $11
-	loopchannel $00, $5952 ; end
-; 0xf59c7
+	note C_, 13
+	notetype $6, $b4
+	dutycycle $1
+	note G#, 1
+	octave 5
+	note C_, 1
+	loopchannel 0, Music_AzaleaTown_branch_f5952
+; f59c7
 
-_Music_AzaleaTown_sub_0xf59c7: ; 0xf59c7
-; subroutine
-	note $23
-	octave4
-	note $91
-	note $01
-	octave5
-	note $11
-	note $01
-	note $27
-	note $47
-	note $61
-	note $00
-	note $80
-	note $9b
-	note $61
-	note $05
-	note $47
-	note $61
-	note $00
-	note $10
-	notetype $0c, $a8
-	vibrato $00, $00
-	note $27
+Music_AzaleaTown_branch_f59c7: ; f59c7
+	note C#, 3
+	octave 4
+	note G#, 1
+	note __, 1
+	octave 5
+	note C_, 1
+	note __, 1
+	note C#, 7
+	note D#, 7
+	note F_, 1
+	note __, 0
+	note G_, 0
+	note G#, 11
+	note F_, 1
+	note __, 5
+	note D#, 7
+	note F_, 1
+	note __, 0
+	note C_, 0
+	notetype $c, $a8
+	vibrato $0, $0
+	note C#, 7
 	intensity $a7
 	vibrato $12, $23
-	note $2f
-	note $03
+	note C#, 15
+	note __, 3
 	intensity $b4
-	dutycycle $02
-	octave3
-	note $b1
-	octave4
-	note $20
-	note $00
-	note $77
-	note $01
-	note $71
-	note $61
-	note $40
-	note $00
-	note $25
-	note $11
-	note $01
-	note $13
-	note $20
-	notetype $06, $b4
-	note $00
-	note $30
-	notetype $0c, $b7
-	note $4b
+	dutycycle $2
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	note F#, 7
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note D#, 0
+	note __, 0
+	note C#, 5
+	note C_, 1
+	note __, 1
+	note C_, 3
+	note C#, 0
+	notetype $6, $b4
+	note __, 0
+	note D_, 0
+	notetype $c, $b7
+	note D#, 11
 	intensity $b4
-	endchannel ; end
-; 0xf5a08
+	endchannel
 
-_Music_AzaleaTown_Ch3: ; 0xf5a08
+Music_AzaleaTown_Ch3: ; f5a08
 	stereopanning $ff
-	vibrato $06, $26
-	notetype $0c, $25
-	octave2
-	note $90
-	octave3
-	note $10
-	note $20
-	note $04
-	note $20
-	note $02
-	note $20
-	note $00
-	octave2
-	note $93
-	octave3
-	note $20
-	note $04
-	note $20
-	note $02
-	note $20
-	note $00
-	note $93
-	callchannel _Music_AzaleaTown_sub_0xf5a86
-	note $93
-	note $41
-	callchannel _Music_AzaleaTown_sub_0xf5a86
-	note $91
-	note $01
-	note $71
-	callchannel _Music_AzaleaTown_sub_0xf5acf
-	note $b0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $61
-	octave3
-	note $a3
-	octave4
-	note $20
-	note $02
-	note $60
-	note $00
-	callchannel _Music_AzaleaTown_sub_0xf5acf
-	octave2
-	note $b1
-	octave3
-	note $60
-	note $00
-	note $b0
-	note $00
-	note $41
-	octave2
-	note $b1
-	octave3
-	note $40
-	note $02
-	note $81
-	octave2
-	note $70
-	note $04
-	note $70
-	note $70
-	note $70
-	note $00
-	octave3
-	note $21
-	note $01
-	octave2
-	note $60
-	note $70
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $00
-	octave3
-	note $21
-	note $01
-	octave2
-	note $70
-	note $80
-	note $90
-	note $04
-	note $90
-	note $90
-	note $90
-	note $00
-	octave3
-	note $41
-	note $01
-	octave2
-	note $70
-	note $80
-	note $90
-	note $04
-	note $90
-	note $90
-	note $90
-	note $00
-	octave3
-	note $41
-	note $01
-	octave2
-	note $c0
-	octave3
-	note $10
-	loopchannel $00, $5a24 ; end
-; 0xf5a86
+	vibrato $6, $26
+	notetype $c, $25
+	octave 2
+	note G#, 0
+	octave 3
+	note C_, 0
+	note C#, 0
+	note __, 4
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 0
+	octave 2
+	note G#, 3
+	octave 3
+	note C#, 0
+	note __, 4
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 0
+	note G#, 3
 
-_Music_AzaleaTown_sub_0xf5a86: ; 0xf5a86
-; subroutine
-	note $20
-	note $04
-	note $20
-	note $02
-	note $20
-	note $00
-	octave2
-	note $93
-	octave3
-	note $60
-	note $04
-	note $60
-	note $00
-	note $10
-	note $00
-	note $63
-	note $a1
+Music_AzaleaTown_branch_f5a24: ; f5a24
+	callchannel Music_AzaleaTown_branch_f5a86
+	note G#, 3
+	note D#, 1
+	callchannel Music_AzaleaTown_branch_f5a86
+	note G#, 1
+	note __, 1
+	note F#, 1
+	callchannel Music_AzaleaTown_branch_f5acf
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note F_, 1
+	octave 3
+	note A_, 3
+	octave 4
+	note C#, 0
+	note __, 2
+	note F_, 0
+	note __, 0
+	callchannel Music_AzaleaTown_branch_f5acf
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note D#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 0
+	note __, 2
+	note G_, 1
+	octave 2
+	note F#, 0
+	note __, 4
+	note F#, 0
+	note F#, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 2
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 2
+	note F#, 0
+	note G_, 0
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note F#, 0
+	note G_, 0
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	loopchannel 0, Music_AzaleaTown_branch_f5a24
+; f5a86
+
+Music_AzaleaTown_branch_f5a86: ; f5a86
+	note C#, 0
+	note __, 4
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 0
+	octave 2
+	note G#, 3
+	octave 3
+	note F_, 0
+	note __, 4
+	note F_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note A_, 1
 	intensity $15
-	note $b0
-	note $00
+	note A#, 0
+	note __, 0
 	intensity $25
-	octave4
-	note $20
-	note $00
-	note $60
-	note $00
-	octave3
-	note $a3
-	octave4
-	note $20
-	note $00
-	note $60
-	note $00
-	octave3
-	note $93
-	note $b0
-	note $00
-	note $90
-	note $00
-	note $85
-	note $03
-	note $70
-	note $04
-	note $70
-	note $02
-	note $70
-	note $00
-	note $23
-	note $80
-	note $04
-	note $80
-	note $02
-	note $23
-	note $80
-	note $00
-	note $90
-	note $04
-	note $90
-	note $00
-	note $40
-	note $00
-	note $23
-	note $90
-	note $00
-	note $90
-	note $04
-	note $90
-	note $00
-	note $10
-	note $00
-	endchannel ; end
-; 0xf5acf
+	octave 4
+	note C#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note A_, 3
+	octave 4
+	note C#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note G#, 3
+	note A#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G_, 5
+	note __, 3
+	note F#, 0
+	note __, 4
+	note F#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note C#, 3
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note __, 2
+	note C#, 3
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 3
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	endchannel
+; f5acf
 
-_Music_AzaleaTown_sub_0xf5acf: ; 0xf5acf
-; subroutine
+Music_AzaleaTown_branch_f5acf: ; f5acf
 	intensity $35
-	octave3
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $00
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
 	intensity $25
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $00
-	endchannel ; end
-; 0xf5ae5
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	endchannel
 
-_Music_AzaleaTown_Ch4: ; 0xf5ae5
-	togglenoise $03
-	notetype $0c
-	note $61
-	note $41
-	note $71
-	note $31
-	note $40
-	note $80
-	note $80
-	note $80
-	note $41
-	note $31
-	note $80
-	note $80
-	note $41
-	note $71
-	note $31
-	note $40
-	note $80
-	note $80
-	note $80
-	note $41
-	note $31
-	note $71
-	loopchannel $00, $5aea ; end
-; 0xf5b03
+Music_AzaleaTown_Ch4: ; f5ae5
+	togglenoise $3
+	notetype $c
+	note F_, 1
+
+Music_AzaleaTown_branch_f5aea: ; f5aea
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note D#, 1
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note D#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 0, Music_AzaleaTown_branch_f5aea
+; f5b03
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -1,313 +1,315 @@
-_Music_BattleTowerLobby: ; 0x17948b
-	db $c0
-	dw _Music_BattleTowerLobby_Ch1
-	db $01
-	dw _Music_BattleTowerLobby_Ch2
-	db $02
-	dw _Music_BattleTowerLobby_Ch3
-	db $03
-	dw _Music_BattleTowerLobby_Ch4
-; 0x179497
+Music_BattleTowerLobby: ; 17948b
+	dbw $c0, Music_BattleTowerLobby_Ch1
+	dbw $01, Music_BattleTowerLobby_Ch2
+	dbw $02, Music_BattleTowerLobby_Ch3
+	dbw $03, Music_BattleTowerLobby_Ch4
+; 179497
 
-_Music_BattleTowerLobby_Ch1: ; 0x179497
-	tempo $9800
+
+Music_BattleTowerLobby_Ch1: ; 179497
+	tempo 152
 	volume $77
-	dutycycle $03
-	tone $0100
-	vibrato $08, $22
+	dutycycle $3
+	tone $0001
+	vibrato $8, $22
 	stereopanning $f0
-	notetype $0c, $72
-	notetype $0c, $72
-	octave3
-	note $91
-	notetype $0c, $73
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $91
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $91
-	notetype $0c, $72
-	note $71
-	notetype $0c, $73
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $51
-	note $41
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $71
-	notetype $0c, $72
-	note $91
-	notetype $0c, $73
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $91
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $c1
-	octave4
-	note $51
-	notetype $0c, $72
-	note $72
-	notetype $0c, $73
-	note $30
-	note $51
-	octave3
-	note $c1
-	note $91
-	note $51
-	note $91
-	note $c1
-	notetype $0c, $72
-	note $21
-	notetype $0c, $73
-	note $41
-	note $51
-	note $20
-	octave2
-	note $c0
-	note $a3
-	notetype $0c, $62
-	note $a3
-	notetype $0c, $72
-	note $c1
-	notetype $0c, $73
-	octave3
-	note $21
-	note $41
-	note $50
-	note $70
-	note $93
-	notetype $0c, $62
-	octave2
-	note $93
-	notetype $0c, $72
-	note $a1
-	notetype $0c, $73
-	note $c1
-	octave3
-	note $21
-	note $30
-	note $50
-	note $31
-	note $51
-	note $71
-	note $a1
-	notetype $0c, $72
-	note $c1
-	notetype $0c, $73
-	note $c3
-	note $a0
-	note $90
-	notetype $0c, $72
-	note $73
-	notetype $0c, $75
-	octave2
-	note $c3
-	loopchannel $00, $54a9 ; end
-; 0x17953a
+	notetype $c, $72
 
-_Music_BattleTowerLobby_Ch2: ; 0x17953a
-	dutycycle $02
+Music_BattleTowerLobby_branch_1794a9: ; 1794a9
+	notetype $c, $72
+	octave 3
+	note G#, 1
+	notetype $c, $73
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	notetype $c, $72
+	note F#, 1
+	notetype $c, $73
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	notetype $c, $72
+	note G#, 1
+	notetype $c, $73
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	notetype $c, $72
+	note F#, 2
+	notetype $c, $73
+	note D_, 0
+	note E_, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	notetype $c, $72
+	note C#, 1
+	notetype $c, $73
+	note D#, 1
+	note E_, 1
+	note C#, 0
+	octave 2
+	note B_, 0
+	note A_, 3
+	notetype $c, $62
+	note A_, 3
+	notetype $c, $72
+	note B_, 1
+	notetype $c, $73
+	octave 3
+	note C#, 1
+	note D#, 1
+	note E_, 0
+	note F#, 0
+	note G#, 3
+	notetype $c, $62
+	octave 2
+	note G#, 3
+	notetype $c, $72
+	note A_, 1
+	notetype $c, $73
+	note B_, 1
+	octave 3
+	note C#, 1
+	note D_, 0
+	note E_, 0
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	notetype $c, $72
+	note B_, 1
+	notetype $c, $73
+	note B_, 3
+	note A_, 0
+	note G#, 0
+	notetype $c, $72
+	note F#, 3
+	notetype $c, $75
+	octave 2
+	note B_, 3
+	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
+
+Music_BattleTowerLobby_Ch2: ; 17953a
+	dutycycle $2
 	vibrato $10, $34
-	stereopanning $0f
-	notetype $0c, $82
-	notetype $0c, $82
-	octave4
-	note $51
-	note $53
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $c3
-	note $a1
-	note $91
-	note $a2
-	note $50
-	octave3
-	note $c3
-	notetype $0c, $65
-	note $73
-	octave2
-	note $c3
-	notetype $0c, $82
-	octave4
-	note $51
-	note $53
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $c3
-	note $a1
-	note $91
-	note $a2
-	note $70
-	notetype $0c, $87
-	note $9b
-	notetype $0c, $82
-	octave3
-	note $a1
-	notetype $0c, $84
-	note $a3
-	note $70
-	note $90
-	note $a3
-	notetype $0c, $82
-	note $23
-	octave4
-	note $91
-	notetype $0c, $84
-	note $93
-	note $70
-	note $90
-	note $53
-	notetype $0c, $82
-	octave3
-	note $53
-	octave4
-	note $71
-	notetype $0c, $84
-	note $73
-	note $a0
-	note $90
-	note $a3
-	note $33
-	notetype $0c, $82
-	note $51
-	notetype $0c, $84
-	note $53
-	note $70
-	note $50
-	note $43
-	notetype $0c, $73
-	octave3
-	note $40
-	note $70
-	note $c0
-	octave4
-	note $40
-	loopchannel $00, $5544 ; end
-; 0x1795ae
+	stereopanning $f
+	notetype $c, $82
 
-_Music_BattleTowerLobby_Ch3: ; 0x1795ae
-	notetype $0c, $11
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $41
-	note $01
-	note $41
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $01
-	octave2
-	note $a1
-	note $c1
-	octave3
-	note $51
-	note $01
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $51
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $51
-	note $01
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $51
-	octave3
-	note $51
-	octave2
-	note $91
-	note $c1
-	octave3
-	note $51
-	note $01
-	note $31
-	octave2
-	note $71
-	note $a1
-	octave3
-	note $71
-	octave2
-	note $71
-	note $a1
-	octave3
-	note $31
-	note $71
-	note $51
-	octave2
-	note $c1
-	note $51
-	note $c1
-	note $71
-	note $51
-	note $41
-	note $71
-	loopchannel $00, $55b1 ; end
-; 0x179610
+Music_BattleTowerLobby_branch_179544: ; 179544
+	notetype $c, $82
+	octave 4
+	note E_, 1
+	note E_, 3
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note B_, 3
+	note A_, 1
+	note G#, 1
+	note A_, 2
+	note E_, 0
+	octave 3
+	note B_, 3
+	notetype $c, $65
+	note F#, 3
+	octave 2
+	note B_, 3
+	notetype $c, $82
+	octave 4
+	note E_, 1
+	note E_, 3
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note B_, 3
+	note A_, 1
+	note G#, 1
+	note A_, 2
+	note F#, 0
+	notetype $c, $87
+	note G#, 11
+	notetype $c, $82
+	octave 3
+	note A_, 1
+	notetype $c, $84
+	note A_, 3
+	note F#, 0
+	note G#, 0
+	note A_, 3
+	notetype $c, $82
+	note C#, 3
+	octave 4
+	note G#, 1
+	notetype $c, $84
+	note G#, 3
+	note F#, 0
+	note G#, 0
+	note E_, 3
+	notetype $c, $82
+	octave 3
+	note E_, 3
+	octave 4
+	note F#, 1
+	notetype $c, $84
+	note F#, 3
+	note A_, 0
+	note G#, 0
+	note A_, 3
+	note D_, 3
+	notetype $c, $82
+	note E_, 1
+	notetype $c, $84
+	note E_, 3
+	note F#, 0
+	note E_, 0
+	note D#, 3
+	notetype $c, $73
+	octave 3
+	note D#, 0
+	note F#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	loopchannel 0, Music_BattleTowerLobby_branch_179544
 
-_Music_BattleTowerLobby_Ch4: ; 0x179610
-	togglenoise $00
-	notetype $0c
-	note $01
-	note $63
-	note $63
-	note $61
-	note $63
-	loopchannel $00, $5612 ; end
-; 0x17961d
+Music_BattleTowerLobby_Ch3: ; 1795ae
+	notetype $c, $11
+
+Music_BattleTowerLobby_branch_1795b1: ; 1795b1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note E_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note E_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note G#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note D_, 1
+	octave 2
+	note F#, 1
+	note A_, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note F#, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note E_, 1
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
+
+Music_BattleTowerLobby_Ch4: ; 179610
+	togglenoise $0
+
+Music_BattleTowerLobby_branch_179612: ; 179612
+	notetype $c
+	note __, 1
+	note F_, 3
+	note F_, 3
+	note F_, 1
+	note F_, 3
+	loopchannel 0, Music_BattleTowerLobby_branch_179612
+; 17961d
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -1,702 +1,701 @@
-_Music_BattleTowerTheme: ; 0x178889
-	db $c0
-	dw _Music_BattleTowerTheme_Ch1
-	db $01
-	dw _Music_BattleTowerTheme_Ch2
-	db $02
-	dw _Music_BattleTowerTheme_Ch3
-	db $03
-	dw _Music_BattleTowerTheme_Ch4
-; 0x178895
+Music_BattleTowerTheme: ; 178889
+	dbw $c0, Music_BattleTowerTheme_Ch1
+	dbw $01, Music_BattleTowerTheme_Ch2
+	dbw $02, Music_BattleTowerTheme_Ch3
+	dbw $03, Music_BattleTowerTheme_Ch4
+; 178895
 
-_Music_BattleTowerTheme_Ch1: ; 0x178895
-	tempo $8d00
+
+Music_BattleTowerTheme_Ch1: ; 178895
+	tempo 141
 	volume $77
-	tone $0100
+	tone $0001
 	vibrato $12, $34
-	stereopanning $0f
-	notetype $06, $94
-	note $0f
-	note $0f
-	note $0b
-	note $0b
-	dutycycle $02
-	octave3
-	note $11
-	note $51
-	note $83
-	callchannel _Music_BattleTowerTheme_sub_0x17895e
-	note $81
-	note $01
-	note $13
-	note $03
+	stereopanning $f
+	notetype $6, $94
+
+Music_BattleTowerTheme_branch_1788a5: ; 1788a5
+	note __, 15
+	note __, 15
+	note __, 11
+	note __, 11
+	dutycycle $2
+	octave 3
+	note C_, 1
+	note E_, 1
+	note G_, 3
+	callchannel Music_BattleTowerTheme_branch_17895e
+	note G_, 1
+	note __, 1
+	note C_, 3
+	note __, 3
 	intensity $92
-	note $81
-	note $61
-	note $11
-	note $51
-	note $81
-	octave4
-	note $51
-	note $81
-	note $51
-	octave3
-	note $81
-	note $51
-	callchannel _Music_BattleTowerTheme_sub_0x17895e
-	note $81
-	note $01
-	octave2
-	note $b3
-	note $03
+	note G_, 1
+	note F_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	octave 3
+	note G_, 1
+	note E_, 1
+	callchannel Music_BattleTowerTheme_branch_17895e
+	note G_, 1
+	note __, 1
+	octave 2
+	note A#, 3
+	note __, 3
 	intensity $92
-	octave3
-	note $81
-	note $41
-	note $11
-	note $61
-	note $a1
-	octave4
-	note $11
-	note $61
-	note $11
-	octave3
-	note $a1
-	note $61
+	octave 3
+	note G_, 1
+	note D#, 1
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
 	intensity $93
-	note $31
-	note $01
-	note $53
-	note $63
-	note $81
-	note $a1
-	note $b7
-	octave2
-	note $b7
-	octave3
-	note $11
-	note $01
-	note $33
-	note $53
-	note $61
-	note $81
-	note $a7
-	octave2
-	note $a7
-	note $b1
-	note $01
-	octave3
-	note $13
-	note $33
-	note $41
-	note $61
-	note $43
-	note $63
-	note $83
-	note $b3
-	octave4
-	note $11
-	note $01
-	octave3
-	note $63
-	note $03
-	octave2
-	note $a1
-	octave3
-	note $11
-	note $53
-	note $03
-	dutycycle $03
-	note $11
-	note $51
-	note $83
-	note $a3
-	note $67
-	note $61
-	note $81
-	note $a7
-	note $83
-	note $63
-	note $37
-	note $b1
-	note $31
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $b1
-	octave4
-	note $11
-	note $31
-	note $11
-	note $31
-	note $41
-	note $63
-	octave3
-	note $67
-	note $21
-	note $41
-	note $67
-	note $83
-	note $63
-	note $63
-	note $17
-	note $81
-	note $61
-	note $57
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $81
-	note $51
-	note $13
-	note $67
-	note $11
-	note $61
-	note $a7
-	note $b3
-	octave4
-	note $13
-	octave3
-	note $b3
-	note $67
-	note $b3
-	octave4
-	note $37
-	octave3
-	note $b1
-	note $a1
-	note $63
-	note $93
-	note $67
-	note $93
-	note $63
-	note $43
-	note $23
-	note $63
+	note D_, 1
+	note __, 1
+	note E_, 3
+	note F_, 3
+	note G_, 1
+	note A_, 1
+	note A#, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note C_, 1
+	note __, 1
+	note D_, 3
+	note E_, 3
+	note F_, 1
+	note G_, 1
+	note A_, 7
+	octave 2
+	note A_, 7
+	note A#, 1
+	note __, 1
+	octave 3
+	note C_, 3
+	note D_, 3
+	note D#, 1
+	note F_, 1
+	note D#, 3
+	note F_, 3
+	note G_, 3
+	note A#, 3
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note F_, 3
+	note __, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 1
+	note E_, 3
+	note __, 3
+	dutycycle $3
+	note C_, 1
+	note E_, 1
+	note G_, 3
+	note A_, 3
+	note F_, 7
+	note F_, 1
+	note G_, 1
+	note A_, 7
+	note G_, 3
+	note F_, 3
+	note D_, 7
+	note A#, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 3
+	octave 3
+	note F_, 7
+	note C#, 1
+	note D#, 1
+	note F_, 7
+	note G_, 3
+	note F_, 3
+	note F_, 3
+	note C_, 7
+	note G_, 1
+	note F_, 1
+	note E_, 7
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C_, 3
+	note F_, 7
+	note C_, 1
+	note F_, 1
+	note A_, 7
+	note A#, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	note F_, 7
+	note A#, 3
+	octave 4
+	note D_, 7
+	octave 3
+	note A#, 1
+	note A_, 1
+	note F_, 3
+	note G#, 3
+	note F_, 7
+	note G#, 3
+	note F_, 3
+	note D#, 3
+	note C#, 3
+	note F_, 3
 	intensity $94
-	octave4
-	note $13
-	octave3
-	note $55
-	note $01
-	note $50
-	note $00
-	note $50
-	note $00
-	note $53
-	note $0b
-	loopchannel $00, $48a5 ; end
-; 0x17895e
+	octave 4
+	note C_, 3
+	octave 3
+	note E_, 5
+	note __, 1
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 3
+	note __, 11
+	loopchannel 0, Music_BattleTowerTheme_branch_1788a5
+; 17895e
 
-_Music_BattleTowerTheme_sub_0x17895e: ; 0x17895e
-; subroutine
+Music_BattleTowerTheme_branch_17895e: ; 17895e
 	intensity $94
-	note $a1
-	note $01
-	note $13
-	note $03
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $13
-	note $63
-	note $03
-	note $a3
-	endchannel ; end
-; 0x17896d
+	note A_, 1
+	note __, 1
+	note C_, 3
+	note __, 3
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C_, 3
+	note F_, 3
+	note __, 3
+	note A_, 3
+	endchannel
 
-_Music_BattleTowerTheme_Ch2: ; 0x17896d
+Music_BattleTowerTheme_Ch2: ; 17896d
 	vibrato $12, $34
-	dutycycle $03
-	notetype $06, $b8
-	octave3
-	note $61
-	note $01
-	octave2
-	note $a3
-	note $03
-	octave3
-	note $60
-	note $00
-	note $60
-	note $00
-	octave2
-	note $a3
-	octave3
-	note $63
-	note $03
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $61
-	note $01
-	octave2
-	note $a3
-	note $03
-	tone $0100
-	note $a0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $63
-	note $03
+
+Music_BattleTowerTheme_branch_178970: ; 178970
+	dutycycle $3
+	notetype $6, $b8
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note A_, 3
+	note __, 3
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 2
+	note A_, 3
+	octave 3
+	note F_, 3
+	note __, 3
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note A_, 3
+	note __, 3
+	tone $0001
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note __, 3
 	tone $0000
 	intensity $b7
-	note $81
-	octave4
-	note $11
-	note $53
-	callchannel _Music_BattleTowerTheme_sub_0x178a15
-	note $b3
-	note $01
-	note $61
-	notetype $0c, $b7
-	note $1b
-	notetype $06, $b7
-	callchannel _Music_BattleTowerTheme_sub_0x178a15
-	notetype $0c, $b7
-	note $b1
-	note $00
-	note $80
-	note $ab
-	note $b0
-	note $00
-	note $b3
-	note $80
-	note $a0
-	note $b3
-	note $33
-	note $a0
-	note $00
-	note $a3
-	note $80
-	note $a0
-	note $67
-	note $80
-	note $00
-	note $83
-	note $b0
-	note $a0
-	note $b3
-	note $43
-	note $60
-	note $00
-	note $63
-	note $80
-	note $60
-	note $57
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 3
+	callchannel Music_BattleTowerTheme_branch_178a15
+	note A#, 3
+	note __, 1
+	note F_, 1
+	notetype $c, $b7
+	note C_, 11
+	notetype $6, $b7
+	callchannel Music_BattleTowerTheme_branch_178a15
+	notetype $c, $b7
+	note A#, 1
+	note __, 0
+	note G_, 0
+	note A_, 11
+	note A#, 0
+	note __, 0
+	note A#, 3
+	note G_, 0
+	note A_, 0
+	note A#, 3
+	note D_, 3
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note G_, 0
+	note A_, 0
+	note F_, 7
+	note G_, 0
+	note __, 0
+	note G_, 3
+	note A#, 0
+	note A_, 0
+	note A#, 3
+	note D#, 3
+	note F_, 0
+	note __, 0
+	note F_, 3
+	note G_, 0
+	note F_, 0
+	note E_, 7
 	stereopanning $f0
-	dutycycle $02
-	note $65
-	note $a0
-	note $b0
-	octave5
-	note $13
-	octave4
-	note $b1
-	note $a1
-	note $bf
-	note $b5
-	note $80
-	note $a0
-	note $b3
-	octave5
-	note $11
-	octave4
-	note $b1
-	note $a5
-	note $b0
-	note $a0
-	note $87
-	note $a5
-	note $60
-	note $a0
-	octave5
-	note $13
-	note $31
-	note $41
-	note $35
-	note $11
-	octave4
-	note $b7
-	octave5
-	note $25
-	note $11
-	octave4
-	note $b1
-	note $91
-	note $61
-	note $91
-	note $84
-	note $00
-	notetype $06, $b7
-	note $80
-	note $00
-	note $80
-	note $00
-	note $83
-	note $03
+	dutycycle $2
+	note F_, 5
+	note A_, 0
+	note A#, 0
+	octave 5
+	note C_, 3
+	octave 4
+	note A#, 1
+	note A_, 1
+	note A#, 15
+	note A#, 5
+	note G_, 0
+	note A_, 0
+	note A#, 3
+	octave 5
+	note C_, 1
+	octave 4
+	note A#, 1
+	note A_, 5
+	note A#, 0
+	note A_, 0
+	note G_, 7
+	note A_, 5
+	note F_, 0
+	note A_, 0
+	octave 5
+	note C_, 3
+	note D_, 1
+	note D#, 1
+	note D_, 5
+	note C_, 1
+	octave 4
+	note A#, 7
+	octave 5
+	note C#, 5
+	note C_, 1
+	octave 4
+	note A#, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note G_, 4
+	note __, 0
+	notetype $6, $b7
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 3
+	note __, 3
 	stereopanning $ff
-	dutycycle $03
-	octave3
-	note $11
-	note $31
-	note $53
-	loopchannel $00, $4970 ; end
-; 0x178a15
+	dutycycle $3
+	octave 3
+	note C_, 1
+	note D_, 1
+	note E_, 3
+	loopchannel 0, Music_BattleTowerTheme_branch_178970
+; 178a15
 
-_Music_BattleTowerTheme_sub_0x178a15: ; 0x178a15
-; subroutine
-	note $61
-	note $01
-	note $67
-	note $11
-	note $61
-	octave5
-	note $17
-	octave4
-	note $b3
-	note $a3
-	endchannel ; end
-; 0x178a20
+Music_BattleTowerTheme_branch_178a15: ; 178a15
+	note F_, 1
+	note __, 1
+	note F_, 7
+	note C_, 1
+	note F_, 1
+	octave 5
+	note C_, 7
+	octave 4
+	note A#, 3
+	note A_, 3
+	endchannel
 
-_Music_BattleTowerTheme_Ch3: ; 0x178a20
+Music_BattleTowerTheme_Ch3: ; 178a20
 	vibrato $12, $34
-	notetype $06, $16
+	notetype $6, $16
+
+Music_BattleTowerTheme_branch_178a26: ; 178a26
 	stereopanning $ff
-	callchannel _Music_BattleTowerTheme_sub_0x178afe
-	note $11
-	note $01
-	note $63
-	note $03
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $63
-	note $03
+	callchannel Music_BattleTowerTheme_branch_178afe
+	note C_, 1
+	note __, 1
+	note F_, 3
+	note __, 3
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note __, 3
 	stereopanning $f0
-	note $17
-	callchannel _Music_BattleTowerTheme_sub_0x178afe
-	note $11
-	note $01
-	note $63
-	note $03
-	note $10
-	note $00
-	note $10
-	note $00
-	note $53
-	note $13
-	note $03
-	note $11
-	note $01
-	callchannel _Music_BattleTowerTheme_sub_0x178afe
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $43
-	note $03
-	octave2
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $13
-	note $63
-	note $03
-	note $10
-	note $00
-	note $11
-	octave2
-	note $b1
-	note $01
-	note $b3
-	note $63
-	octave3
-	note $60
-	note $00
-	note $61
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $31
-	note $01
-	note $67
-	note $11
-	note $01
-	note $13
-	octave2
-	note $63
-	octave3
-	note $60
-	note $00
-	note $60
-	note $00
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $11
-	note $01
-	note $67
-	note $41
-	note $01
-	note $43
-	octave2
-	note $83
-	octave3
-	note $80
-	note $00
-	note $80
-	note $00
-	octave2
-	note $81
-	note $01
-	note $b1
-	note $01
-	octave3
-	note $47
-	note $61
-	note $01
-	note $13
-	note $03
-	note $11
-	octave2
-	note $61
-	note $83
-	note $03
+	note C_, 7
+	callchannel Music_BattleTowerTheme_branch_178afe
+	note C_, 1
+	note __, 1
+	note F_, 3
+	note __, 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note E_, 3
+	note C_, 3
+	note __, 3
+	note C_, 1
+	note __, 1
+	callchannel Music_BattleTowerTheme_branch_178afe
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note D#, 3
+	note __, 3
+	octave 2
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note C_, 3
+	note F_, 3
+	note __, 3
+	note C_, 0
+	note __, 0
+	note C_, 1
+	octave 2
+	note A#, 1
+	note __, 1
+	note A#, 3
+	note F_, 3
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 1
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	note F_, 7
+	note C_, 1
+	note __, 1
+	note C_, 3
+	octave 2
+	note F_, 3
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	note F_, 7
+	note D#, 1
+	note __, 1
+	note D#, 3
+	octave 2
+	note G_, 3
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	octave 3
+	note D#, 7
+	note F_, 1
+	note __, 1
+	note C_, 3
+	note __, 3
+	note C_, 1
+	octave 2
+	note F_, 1
+	note G_, 3
+	note __, 3
 	stereopanning $ff
-	note $81
-	octave3
-	note $11
-	note $53
-	note $63
-	note $17
-	note $60
-	note $00
-	note $60
-	note $00
-	note $a3
-	note $15
-	note $01
-	note $10
-	note $00
-	note $10
-	note $00
-	note $63
-	note $37
-	note $60
-	note $00
-	note $60
-	note $00
-	note $b3
-	note $a3
-	note $63
-	note $33
-	note $63
-	note $27
-	note $60
-	note $00
-	note $60
-	note $00
-	note $b3
-	note $67
-	note $20
-	note $00
-	note $20
-	note $00
-	note $13
-	note $67
-	note $10
-	note $00
-	note $10
-	note $00
-	note $83
-	note $13
-	note $33
-	note $53
-	note $63
-	note $17
-	note $60
-	note $00
-	note $60
-	note $00
-	note $a3
-	note $17
-	note $61
-	note $01
-	note $63
-	octave2
-	note $b7
-	octave3
-	note $60
-	note $00
-	note $60
-	note $00
-	note $b3
-	octave2
-	note $b3
-	octave3
-	note $33
-	note $53
-	note $63
-	octave2
-	note $97
-	octave3
-	note $20
-	note $00
-	note $20
-	note $00
-	note $93
-	octave2
-	note $97
-	octave3
-	note $23
-	note $13
-	note $87
-	note $10
-	note $00
-	note $10
-	note $00
-	note $83
-	note $0b
-	loopchannel $00, $4a26 ; end
-; 0x178afe
+	note G_, 1
+	octave 3
+	note C_, 1
+	note E_, 3
+	note F_, 3
+	note C_, 7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 3
+	note C_, 5
+	note __, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note D_, 7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A#, 3
+	note A_, 3
+	note F_, 3
+	note D_, 3
+	note F_, 3
+	note C#, 7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A#, 3
+	note F_, 7
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C_, 3
+	note F_, 7
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 3
+	note C_, 3
+	note D_, 3
+	note E_, 3
+	note F_, 3
+	note C_, 7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 3
+	note C_, 7
+	note F_, 1
+	note __, 1
+	note F_, 3
+	octave 2
+	note A#, 7
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A#, 3
+	octave 2
+	note A#, 3
+	octave 3
+	note D_, 3
+	note E_, 3
+	note F_, 3
+	octave 2
+	note G#, 7
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note G#, 3
+	octave 2
+	note G#, 7
+	octave 3
+	note C#, 3
+	note C_, 3
+	note G_, 7
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 3
+	note __, 11
+	loopchannel 0, Music_BattleTowerTheme_branch_178a26
+; 178afe
 
-_Music_BattleTowerTheme_sub_0x178afe: ; 0x178afe
-; subroutine
-	octave3
-	note $11
-	note $01
-	note $63
-	note $03
-	note $10
-	note $00
-	note $10
-	note $00
-	note $63
-	note $13
-	note $03
-	note $11
-	note $01
-	endchannel ; end
-; 0x178b0d
+Music_BattleTowerTheme_branch_178afe: ; 178afe
+	octave 3
+	note C_, 1
+	note __, 1
+	note F_, 3
+	note __, 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note C_, 3
+	note __, 3
+	note C_, 1
+	note __, 1
+	endchannel
 
-_Music_BattleTowerTheme_Ch4: ; 0x178b0d
-	togglenoise $03
-	notetype $0c
-	callchannel _Music_BattleTowerTheme_sub_0x178b58
-	note $31
-	note $33
-	note $30
-	note $30
-	note $33
-	note $30
-	note $20
-	note $30
-	note $20
-	callchannel _Music_BattleTowerTheme_sub_0x178b58
-	callchannel _Music_BattleTowerTheme_sub_0x178b61
-	loopchannel $02, $4b1d
-	callchannel _Music_BattleTowerTheme_sub_0x178b6c
-	callchannel _Music_BattleTowerTheme_sub_0x178b61
-	callchannel _Music_BattleTowerTheme_sub_0x178b6c
-	note $31
-	note $33
-	note $30
-	note $30
-	note $37
-	callchannel _Music_BattleTowerTheme_sub_0x178b76
-	note $31
-	note $31
-	note $31
-	note $30
-	note $30
-	note $31
-	note $31
-	note $30
-	note $20
-	note $30
-	note $20
-	loopchannel $03, $4b35
-	callchannel _Music_BattleTowerTheme_sub_0x178b76
-	note $31
-	note $31
-	note $31
-	note $30
-	note $30
-	note $33
-	note $30
-	note $20
-	note $30
-	note $20
-	loopchannel $00, $4b11 ; end
-; 0x178b58
+Music_BattleTowerTheme_Ch4: ; 178b0d
+	togglenoise $3
+	notetype $c
 
-_Music_BattleTowerTheme_sub_0x178b58: ; 0x178b58
-; subroutine
-	note $31
-	note $33
-	note $30
-	note $30
-	note $31
-	note $33
-	note $30
-	note $30
-	endchannel ; end
-; 0x178b61
+Music_BattleTowerTheme_branch_178b11: ; 178b11
+	callchannel Music_BattleTowerTheme_branch_178b58
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 3
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
 
-_Music_BattleTowerTheme_sub_0x178b61: ; 0x178b61
-; subroutine
-	note $31
-	note $33
-	note $30
-	note $30
-	note $31
-	note $31
-	note $30
-	note $20
-	note $30
-	note $20
-	endchannel ; end
-; 0x178b6c
+Music_BattleTowerTheme_branch_178b1d: ; 178b1d
+	callchannel Music_BattleTowerTheme_branch_178b58
+	callchannel Music_BattleTowerTheme_branch_178b61
+	loopchannel 2, Music_BattleTowerTheme_branch_178b1d
+	callchannel Music_BattleTowerTheme_branch_178b6c
+	callchannel Music_BattleTowerTheme_branch_178b61
+	callchannel Music_BattleTowerTheme_branch_178b6c
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 7
 
-_Music_BattleTowerTheme_sub_0x178b6c: ; 0x178b6c
-; subroutine
-	note $31
-	note $33
-	note $30
-	note $30
-	note $31
-	note $31
-	note $31
-	note $30
-	note $30
-	endchannel ; end
-; 0x178b76
+Music_BattleTowerTheme_branch_178b35: ; 178b35
+	callchannel Music_BattleTowerTheme_branch_178b76
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	loopchannel 3, Music_BattleTowerTheme_branch_178b35
+	callchannel Music_BattleTowerTheme_branch_178b76
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note D_, 3
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	loopchannel 0, Music_BattleTowerTheme_branch_178b11
+; 178b58
 
-_Music_BattleTowerTheme_sub_0x178b76: ; 0x178b76
-; subroutine
-	note $31
-	note $21
-	note $31
-	note $30
-	note $20
-	note $31
-	note $21
-	note $31
-	note $30
-	note $20
-	endchannel ; end
-; 0x178b81
+Music_BattleTowerTheme_branch_178b58: ; 178b58
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	endchannel
+; 178b61
+
+Music_BattleTowerTheme_branch_178b61: ; 178b61
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	endchannel
+; 178b6c
+
+Music_BattleTowerTheme_branch_178b6c: ; 178b6c
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	endchannel
+; 178b76
+
+Music_BattleTowerTheme_branch_178b76: ; 178b76
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D_, 0
+	note C#, 0
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D_, 0
+	note C#, 0
+	endchannel
+; 178b81
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -1,521 +1,525 @@
-_Music_Bicycle: ; 0xee119
-	db $c0
-	dw _Music_Bicycle_Ch1
-	db $01
-	dw _Music_Bicycle_Ch2
-	db $02
-	dw _Music_Bicycle_Ch3
-	db $03
-	dw _Music_Bicycle_Ch4
-; 0xee125
+Music_Bicycle: ; ee119
+	dbw $c0, Music_Bicycle_Ch1
+	dbw $01, Music_Bicycle_Ch2
+	dbw $02, Music_Bicycle_Ch3
+	dbw $03, Music_Bicycle_Ch4
+; ee125
 
-_Music_Bicycle_Ch1: ; 0xee125
-	tempo $8c00
+
+Music_Bicycle_Ch1: ; ee125
+	tempo 140
 	volume $77
-	dutycycle $03
-	tone $0100
-	stereopanning $0f
-	vibrato $08, $15
-	notetype $0c, $b4
-	octave3
-	note $c5
-	note $a5
-	note $83
+	dutycycle $3
+	tone $0001
+	stereopanning $f
+	vibrato $8, $15
+	notetype $c, $b4
+	octave 3
+	note B_, 5
+	note A_, 5
+	note G_, 3
 	intensity $b0
-	note $a5
+	note A_, 5
 	intensity $b6
-	note $a7
+	note A_, 7
 	intensity $b2
-	note $71
-	stereopanning $0f
+	note F#, 1
+
+Music_Bicycle_branch_ee144: ; ee144
+	stereopanning $f
 	intensity $b2
-	note $81
-	note $81
-	note $51
-	note $51
-	note $70
-	note $50
-	note $41
-	note $31
-	note $31
-	note $51
-	note $51
-	note $11
-	note $11
-	octave2
-	note $c1
-	note $81
-	note $a1
-	note $c1
-	octave3
-	note $11
-	note $11
-	note $51
-	note $51
-	note $21
-	note $51
-	note $71
-	note $51
-	note $31
-	note $51
-	note $31
-	note $21
-	note $31
-	note $31
-	note $21
-	note $31
-	note $81
-	note $81
-	note $51
-	note $51
-	note $70
-	note $50
-	note $41
-	note $31
-	note $31
-	note $51
-	note $51
-	note $11
-	note $11
-	octave2
-	note $c1
-	note $c1
-	note $b1
-	note $c1
-	octave3
-	note $11
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $51
-	note $11
-	note $51
-	note $71
-	note $81
-	note $71
+	note G_, 1
+	note G_, 1
+	note E_, 1
+	note E_, 1
+	note F#, 0
+	note E_, 0
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note E_, 1
+	note E_, 1
+	note C_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	note C_, 1
+	note E_, 1
+	note E_, 1
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note E_, 1
+	note E_, 1
+	note F#, 0
+	note E_, 0
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note E_, 1
+	note E_, 1
+	note C_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
 	intensity $82
-	note $71
+	note F#, 1
 	intensity $b2
-	note $a1
-	note $81
-	note $71
-	note $81
-	note $91
-	note $a1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
 	stereopanning $f0
 	intensity $b6
-	note $c3
-	note $83
-	octave4
-	note $33
-	octave3
-	note $83
-	note $a3
-	note $73
-	octave4
-	note $33
-	octave3
-	note $73
-	note $83
-	note $53
-	octave4
-	note $13
-	octave3
-	note $53
-	note $73
-	note $31
-	note $71
-	note $81
-	note $91
-	note $a3
-	octave4
-	note $31
-	octave3
-	note $c1
-	note $81
-	note $c1
-	octave4
-	note $31
-	note $81
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $a1
-	note $71
-	note $a1
-	octave4
-	note $11
-	note $71
-	note $11
-	octave3
-	note $a1
-	note $81
-	note $51
-	note $11
-	note $51
-	note $81
-	note $91
-	note $a1
-	note $c1
-	octave4
-	note $11
-	note $11
-	octave3
-	note $a1
-	note $81
-	note $71
-	note $81
-	note $91
-	note $a1
-	loopchannel $00, $6144 ; end
-; 0xee1de
+	note B_, 3
+	note G_, 3
+	octave 4
+	note D_, 3
+	octave 3
+	note G_, 3
+	note A_, 3
+	note F#, 3
+	octave 4
+	note D_, 3
+	octave 3
+	note F#, 3
+	note G_, 3
+	note E_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note E_, 3
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 3
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note F#, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	loopchannel 0, Music_Bicycle_branch_ee144
 
-_Music_Bicycle_Ch2: ; 0xee1de
-	dutycycle $02
+Music_Bicycle_Ch2: ; ee1de
+	dutycycle $2
 	vibrato $10, $24
 	stereopanning $f0
-	notetype $0c, $c6
-	octave4
-	note $35
-	note $15
-	octave3
-	note $c3
+	notetype $c, $c6
+	octave 4
+	note D_, 5
+	note C_, 5
+	octave 3
+	note B_, 3
 	intensity $c2
-	octave4
-	note $31
-	note $30
-	note $50
-	note $31
-	note $30
-	note $50
-	note $31
+	octave 4
+	note D_, 1
+	note D_, 0
+	note E_, 0
+	note D_, 1
+	note D_, 0
+	note E_, 0
+	note D_, 1
 	intensity $c3
-	note $11
-	octave3
-	note $c1
-	note $a1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+
+Music_Bicycle_branch_ee1fd: ; ee1fd
 	stereopanning $ff
-	dutycycle $02
+	dutycycle $2
 	intensity $c3
-	octave3
-	note $c3
-	note $83
-	note $a3
-	note $73
+	octave 3
+	note B_, 3
+	note G_, 3
+	note A_, 3
+	note F#, 3
 	intensity $c2
-	note $81
-	note $71
-	note $51
-	note $71
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
 	intensity $c5
-	note $37
+	note D_, 7
 	intensity $c4
-	note $53
-	note $83
+	note E_, 3
+	note G_, 3
 	intensity $c2
-	note $51
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $81
-	note $a1
-	note $81
+	note E_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
 	intensity $c5
-	note $77
+	note F#, 7
 	intensity $c3
-	note $c3
-	note $83
-	note $a3
-	note $73
+	note B_, 3
+	note G_, 3
+	note A_, 3
+	note F#, 3
 	intensity $c2
-	note $81
-	note $71
-	note $51
-	note $71
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
 	intensity $c5
-	note $37
+	note D_, 7
 	intensity $c4
-	note $53
-	note $83
+	note E_, 3
+	note G_, 3
 	intensity $c2
-	note $51
-	octave4
-	note $51
-	note $31
-	note $11
-	octave3
-	note $c1
-	octave4
-	note $11
-	note $31
-	note $51
+	note E_, 1
+	octave 4
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note E_, 1
 	intensity $c7
-	note $77
-	stereopanning $0f
-	callchannel _Music_Bicycle_sub_0xee263
-	note $73
+	note F#, 7
+	stereopanning $f
+	callchannel Music_Bicycle_branch_ee263
+	note F#, 3
 	intensity $c3
-	note $a1
-	note $31
-	note $51
-	note $61
-	note $73
+	note A_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 3
 	intensity $c7
-	callchannel _Music_Bicycle_sub_0xee263
-	note $73
+	callchannel Music_Bicycle_branch_ee263
+	note F#, 3
 	intensity $c3
-	note $a1
-	note $c1
-	note $a1
-	note $81
-	note $73
-	loopchannel $00, $61fd ; end
-; 0xee263
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 3
+	loopchannel 0, Music_Bicycle_branch_ee1fd
+; ee263
 
-_Music_Bicycle_sub_0xee263: ; 0xee263
-; subroutine
-	note $85
-	note $c5
-	note $83
-	note $75
-	note $a5
-	note $73
-	note $55
-	note $85
-	note $53
-	endchannel ; end
-; 0xee26d
+Music_Bicycle_branch_ee263: ; ee263
+	note G_, 5
+	note B_, 5
+	note G_, 3
+	note F#, 5
+	note A_, 5
+	note F#, 3
+	note E_, 5
+	note G_, 5
+	note E_, 3
+	endchannel
 
-_Music_Bicycle_Ch3: ; 0xee26d
-	notetype $0c, $14
-	note $0f
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $11
-	note $51
-	note $31
-	octave3
-	note $a0
-	note $00
-	callchannel _Music_Bicycle_sub_0xee333
-	note $50
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $30
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $30
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	note $50
-	note $00
-	note $70
-	note $00
-	callchannel _Music_Bicycle_sub_0xee333
-	note $50
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $30
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $60
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $30
-	note $00
-	note $10
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $30
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $30
-	note $00
-	note $c0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $a0
-	note $00
-	loopchannel $02, $62e9
-	loopchannel $00, $627f ; end
-; 0xee333
+Music_Bicycle_Ch3: ; ee26d
+	notetype $c, $14
+	note __, 15
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	note E_, 1
+	note D_, 1
+	octave 3
+	note A_, 0
+	note __, 0
 
-_Music_Bicycle_sub_0xee333: ; 0xee333
-; subroutine
-	octave3
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $30
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $30
-	note $00
-	note $c0
-	note $00
-	endchannel ; end
-; 0xee345
+Music_Bicycle_branch_ee27f: ; ee27f
+	callchannel Music_Bicycle_branch_ee333
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	callchannel Music_Bicycle_branch_ee333
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
 
-_Music_Bicycle_Ch4: ; 0xee345
-	togglenoise $00
-	notetype $0c
-	note $0f
-	note $0f
-	note $01
+Music_Bicycle_branch_ee2e9: ; ee2e9
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	loopchannel 2, Music_Bicycle_branch_ee2e9
+	loopchannel 0, Music_Bicycle_branch_ee27f
+; ee333
+
+Music_Bicycle_branch_ee333: ; ee333
+	octave 3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	endchannel
+
+Music_Bicycle_Ch4: ; ee345
+	togglenoise $0
+	notetype $c
+	note __, 15
+	note __, 15
+
+Music_Bicycle_branch_ee34b: ; ee34b
+	note __, 1
+
+Music_Bicycle_branch_ee34c: ; ee34c
 	stereopanning $f0
-	note $63
-	loopchannel $0c, $634c
-	note $63
-	note $63
+	note F_, 3
+	loopchannel 12, Music_Bicycle_branch_ee34c
+	note F_, 3
+	note F_, 3
 	stereopanning $ff
-	note $61
-	note $61
-	note $61
-	loopchannel $00, $634b ; end
-; 0xee35e
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	loopchannel 0, Music_Bicycle_branch_ee34b
+; ee35e
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -1,654 +1,648 @@
-_Music_BuenasPassword: ; 0x178153
-	db $c0
-	dw _Music_BuenasPassword_Ch1
-	db $01
-	dw _Music_BuenasPassword_Ch2
-	db $02
-	dw _Music_BuenasPassword_Ch3
-	db $03
-	dw _Music_BuenasPassword_Ch4
-; 0x17815f
+Music_BuenasPassword: ; 178153
+	dbw $c0, Music_BuenasPassword_Ch1
+	dbw $01, Music_BuenasPassword_Ch2
+	dbw $02, Music_BuenasPassword_Ch3
+	dbw $03, Music_BuenasPassword_Ch4
+; 17815f
 
-_Music_BuenasPassword_Ch1: ; 0x17815f
-	tempo $8800
+
+Music_BuenasPassword_Ch1: ; 17815f
+	tempo 136
 	volume $77
-	tone $0100
-	notetype $0c, $b3
-	note $07
+	tone $0001
+	notetype $c, $b3
+	note __, 7
+
+Music_BuenasPassword_branch_17816b: ; 17816b
 	stereopanning $ff
-	note $0f
-	note $0f
-	dutycycle $03
-	notetype $06, $97
-	stereopanning $0f
-	octave4
-	note $90
-	note $00
-	note $90
-	note $00
-	note $71
-	note $91
-	note $09
-	note $09
+	note __, 15
+	note __, 15
+	dutycycle $3
+	notetype $6, $97
+	stereopanning $f
+	octave 4
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 1
+	note G#, 1
+	note __, 9
+	note __, 9
 	stereopanning $f0
-	note $21
-	note $61
-	note $90
-	note $00
-	note $90
-	note $00
-	note $71
-	note $91
-	note $0b
-	dutycycle $02
-	callchannel _Music_BuenasPassword_sub_0x178204
+	note C#, 1
+	note F_, 1
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 1
+	note G#, 1
+	note __, 11
+	dutycycle $2
+	callchannel Music_BuenasPassword_branch_178204
 	stereopanning $ff
-	callchannel _Music_BuenasPassword_sub_0x1782df
-	callchannel _Music_BuenasPassword_sub_0x178222
-	callchannel _Music_BuenasPassword_sub_0x178204
+	callchannel Music_BuenasPassword_branch_1782df
+	callchannel Music_BuenasPassword_branch_178222
+	callchannel Music_BuenasPassword_branch_178204
 	stereopanning $ff
-	callchannel _Music_BuenasPassword_sub_0x1782df
-	callchannel _Music_BuenasPassword_sub_0x178222
-	callchannel _Music_BuenasPassword_sub_0x178204
-	dutycycle $01
-	note $21
-	note $01
-	note $41
-	note $01
-	note $71
-	note $00
-	note $91
-	note $00
-	note $b1
-	note $c0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $40
-	note $00
-	octave3
-	note $c1
-	note $01
-	note $c1
-	note $91
-	note $c1
-	note $b1
-	note $91
-	note $80
-	note $42
-	note $21
-	octave2
-	note $c1
-	note $b0
-	note $92
-	note $b1
-	note $81
-	note $b0
-	octave3
-	note $22
-	note $41
-	note $21
-	note $40
-	note $82
-	note $c1
-	note $01
-	note $b1
-	note $01
-	note $91
-	note $00
-	note $71
-	note $00
-	note $41
-	note $20
-	note $00
-	note $40
-	note $00
-	note $60
-	note $00
-	note $21
-	note $01
-	note $91
-	octave4
-	note $21
-	note $61
-	note $90
-	note $00
-	note $40
-	note $00
-	note $90
-	note $72
-	note $60
-	note $00
-	note $40
-	note $00
-	octave3
-	note $c0
-	note $92
-	note $70
-	note $00
-	note $40
-	note $00
-	note $90
-	note $41
-	note $70
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
-	loopchannel $00, $416b ; end
-; 0x178204
+	callchannel Music_BuenasPassword_branch_1782df
+	callchannel Music_BuenasPassword_branch_178222
+	callchannel Music_BuenasPassword_branch_178204
+	dutycycle $1
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 0
+	note G#, 1
+	note __, 0
+	note A#, 1
+	note B_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	note G_, 0
+	note D#, 2
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A#, 0
+	note G#, 2
+	note A#, 1
+	note G_, 1
+	note A#, 0
+	octave 3
+	note C#, 2
+	note D#, 1
+	note C#, 1
+	note D#, 0
+	note G_, 2
+	note B_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note G#, 1
+	note __, 0
+	note F#, 1
+	note __, 0
+	note D#, 1
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note C#, 1
+	note __, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	note F_, 1
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G#, 0
+	note F#, 2
+	note F_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note G#, 2
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G#, 0
+	note D#, 1
+	note F#, 0
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_BuenasPassword_branch_17816b
+; 178204
 
-_Music_BuenasPassword_sub_0x178204: ; 0x178204
-; subroutine
-	stereopanning $0f
-	notetype $06, $84
-	octave4
-	note $41
+Music_BuenasPassword_branch_178204: ; 178204
+	stereopanning $f
+	notetype $6, $84
+	octave 4
+	note D#, 1
 	intensity $71
-	note $20
-	note $10
+	note C#, 0
+	note C_, 0
 	intensity $51
-	octave3
-	note $b0
-	note $90
+	octave 3
+	note A#, 0
+	note G#, 0
 	intensity $31
-	note $80
-	note $60
+	note G_, 0
+	note F_, 0
 	intensity $11
-	note $40
-	note $20
-	note $10
-	note $00
-	notetype $0c, $84
-	endchannel ; end
-; 0x178222
+	note D#, 0
+	note C#, 0
+	note C_, 0
+	note __, 0
+	notetype $c, $84
+	endchannel
+; 178222
 
-_Music_BuenasPassword_sub_0x178222: ; 0x178222
-; subroutine
-	octave3
-	note $40
-	note $00
-	octave2
-	note $90
-	note $00
-	octave3
-	note $40
-	octave2
-	note $90
-	note $00
-	octave3
-	note $40
-	note $01
-	endchannel ; end
-; 0x178231
+Music_BuenasPassword_branch_178222: ; 178222
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 1
+	endchannel
+; 178231
 
-_Music_BuenasPassword_Ch2: ; 0x178231
+Music_BuenasPassword_Ch2: ; 178231
 	vibrato $12, $34
-	dutycycle $02
-	notetype $0c, $a5
-	note $06
-	octave3
-	note $70
+	dutycycle $2
+	notetype $c, $a5
+	note __, 6
+	octave 3
+	note F#, 0
+
+Music_BuenasPassword_branch_17823c: ; 17823c
 	stereopanning $ff
-	callchannel _Music_BuenasPassword_sub_0x1782df
-	callchannel _Music_BuenasPassword_sub_0x1782a4
+	callchannel Music_BuenasPassword_branch_1782df
+	callchannel Music_BuenasPassword_branch_1782a4
 	stereopanning $ff
-	callchannel _Music_BuenasPassword_sub_0x1782cc
-	octave3
-	note $c1
-	note $b1
-	note $c1
-	note $9f
-	callchannel _Music_BuenasPassword_sub_0x1782a4
+	callchannel Music_BuenasPassword_branch_1782cc
+	octave 3
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note G#, 15
+	callchannel Music_BuenasPassword_branch_1782a4
 	stereopanning $ff
-	callchannel _Music_BuenasPassword_sub_0x1782cc
-	note $c1
-	note $b1
-	note $c1
-	note $9f
-	callchannel _Music_BuenasPassword_sub_0x1782a4
-	note $71
-	note $01
-	note $91
-	note $01
-	note $b1
-	note $00
-	note $c1
-	note $00
-	octave4
-	note $21
-	note $40
-	note $00
-	note $60
-	note $00
-	note $70
-	note $00
-	note $41
-	note $01
-	note $91
-	note $71
-	note $91
-	note $4d
-	note $20
-	note $40
-	note $25
-	octave3
-	note $c0
-	octave4
-	note $20
-	note $47
-	note $71
-	note $01
-	note $61
-	note $01
-	note $41
-	note $00
-	note $21
-	note $00
-	octave3
-	note $c1
-	note $90
-	note $00
-	note $b0
-	note $00
-	note $c0
-	note $00
-	note $91
-	note $01
-	octave4
-	note $21
-	note $61
-	note $91
-	note $cd
-	note $b0
-	note $c0
-	note $99
+	callchannel Music_BuenasPassword_branch_1782cc
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note G#, 15
+	callchannel Music_BuenasPassword_branch_1782a4
+	note F#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note A#, 1
+	note __, 0
+	note B_, 1
+	note __, 0
+	octave 4
+	note C#, 1
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D#, 1
+	note __, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note D#, 13
+	note C#, 0
+	note D#, 0
+	note C#, 5
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D#, 7
+	note F#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 0
+	note C#, 1
+	note __, 0
+	octave 3
+	note B_, 1
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G#, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note B_, 13
+	note A#, 0
+	note B_, 0
+	note G#, 9
 	intensity $84
-	octave2
-	note $40
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
+	octave 2
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	intensity $a5
-	loopchannel $00, $423c ; end
-; 0x1782a4
+	loopchannel 0, Music_BuenasPassword_branch_17823c
+; 1782a4
 
-_Music_BuenasPassword_sub_0x1782a4: ; 0x1782a4
-; subroutine
-	octave3
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $40
-	note $00
-	note $70
-	note $01
+Music_BuenasPassword_branch_1782a4: ; 1782a4
+	octave 3
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 1
 	stereopanning $f0
-	octave4
-	note $90
-	notetype $06, $81
-	note $80
-	note $60
+	octave 4
+	note G#, 0
+	notetype $6, $81
+	note G_, 0
+	note F_, 0
 	intensity $71
-	note $40
-	note $20
+	note D#, 0
+	note C#, 0
 	intensity $61
-	note $10
-	octave3
-	note $b0
+	note C_, 0
+	octave 3
+	note A#, 0
 	intensity $41
-	note $90
+	note G#, 0
 	intensity $21
-	note $80
-	note $60
-	note $00
-	notetype $0c, $a5
-	endchannel ; end
-; 0x1782cc
+	note G_, 0
+	note F_, 0
+	note __, 0
+	notetype $c, $a5
+	endchannel
+; 1782cc
 
-_Music_BuenasPassword_sub_0x1782cc: ; 0x1782cc
-; subroutine
-	octave4
-	note $91
-	note $01
-	note $71
-	note $01
-	note $61
-	note $00
-	note $41
-	note $00
-	note $21
-	note $40
-	note $00
-	note $40
-	note $00
-	note $20
-	note $00
-	note $41
-	note $01
-	endchannel ; end
-; 0x1782df
+Music_BuenasPassword_branch_1782cc: ; 1782cc
+	octave 4
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F_, 1
+	note __, 0
+	note D#, 1
+	note __, 0
+	note C#, 1
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note D#, 1
+	note __, 1
+	endchannel
+; 1782df
 
-_Music_BuenasPassword_sub_0x1782df: ; 0x1782df
-; subroutine
-	octave3
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $40
-	note $00
-	note $70
-	note $60
-	note $00
-	note $20
-	note $00
-	octave2
-	note $c0
-	note $92
-	octave3
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $40
-	note $00
-	note $70
-	note $60
-	note $00
-	note $20
-	note $00
-	octave2
-	note $c0
-	note $91
-	octave3
-	note $70
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $40
-	note $00
-	note $70
-	note $60
-	note $00
-	note $20
-	note $00
-	octave2
-	note $c0
-	note $92
-	endchannel ; end
-; 0x178311
+Music_BuenasPassword_branch_1782df: ; 1782df
+	octave 3
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note G#, 2
+	octave 3
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note G#, 1
+	octave 3
+	note F#, 0
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note G#, 2
+	endchannel
 
-_Music_BuenasPassword_Ch3: ; 0x178311
-	notetype $0c, $14
-	note $07
-	callchannel _Music_BuenasPassword_sub_0x1783a7
-	callchannel _Music_BuenasPassword_sub_0x1783a7
-	callchannel _Music_BuenasPassword_sub_0x1783a7
-	octave2
-	note $90
-	note $00
-	octave3
-	note $70
-	note $00
-	octave2
-	note $90
-	octave3
-	note $41
-	octave2
-	note $90
-	note $01
-	note $c0
-	note $00
-	note $93
-	loopchannel $03, $4315
-	note $70
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $20
-	octave2
-	note $70
-	note $00
-	octave3
-	note $20
-	octave2
-	note $70
-	note $00
-	note $b1
-	octave3
-	note $20
-	note $00
-	octave2
-	note $71
-	note $90
-	note $00
-	note $90
-	note $00
-	note $c0
-	note $90
-	note $00
-	octave3
-	note $40
-	octave2
-	note $90
-	note $00
-	octave3
-	note $91
-	octave2
-	note $90
-	note $00
-	octave3
-	note $41
-	octave2
-	note $40
-	note $00
-	note $40
-	note $00
-	note $90
-	note $40
-	note $00
-	note $b0
-	note $40
-	note $00
-	note $91
-	note $b0
-	note $00
-	note $40
-	note $00
-	note $40
-	note $00
-	note $40
-	note $00
-	note $80
-	note $40
-	note $00
-	note $b0
-	note $40
-	note $00
-	octave3
-	note $41
-	octave2
-	note $40
-	note $00
-	note $81
-	callchannel _Music_BuenasPassword_sub_0x1783bc
-	octave3
-	note $20
-	note $00
-	note $20
-	note $00
-	note $60
-	note $20
-	note $00
-	note $90
-	octave2
-	note $90
-	note $00
-	octave3
-	note $61
-	octave2
-	note $90
-	note $00
-	octave3
-	note $21
-	callchannel _Music_BuenasPassword_sub_0x1783bc
-	note $90
-	note $00
-	note $90
-	note $00
-	note $c0
-	note $91
-	octave3
-	note $40
-	octave2
-	note $90
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
-	loopchannel $00, $4315 ; end
-; 0x1783a7
+Music_BuenasPassword_Ch3: ; 178311
+	notetype $c, $14
+	note __, 7
 
-_Music_BuenasPassword_sub_0x1783a7: ; 0x1783a7
-; subroutine
-	octave2
-	note $90
-	note $00
-	octave3
-	note $70
-	note $00
-	octave2
-	note $90
-	octave3
-	note $41
-	octave2
-	note $90
-	octave3
-	note $20
-	note $00
-	note $c0
-	note $00
-	note $20
-	note $61
-	note $20
-	endchannel ; end
-; 0x1783bc
+Music_BuenasPassword_branch_178315: ; 178315
+	callchannel Music_BuenasPassword_branch_1783a7
+	callchannel Music_BuenasPassword_branch_1783a7
+	callchannel Music_BuenasPassword_branch_1783a7
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	octave 3
+	note D#, 1
+	octave 2
+	note G#, 0
+	note __, 1
+	note B_, 0
+	note __, 0
+	note G#, 3
+	loopchannel 3, Music_BuenasPassword_branch_178315
+	note F#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	octave 2
+	note F#, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	octave 2
+	note F#, 0
+	note __, 0
+	note A#, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 2
+	note F#, 1
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note B_, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note G#, 1
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	octave 2
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G#, 0
+	note D#, 0
+	note __, 0
+	note A#, 0
+	note D#, 0
+	note __, 0
+	note G#, 1
+	note A#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note D#, 0
+	note __, 0
+	note A#, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	octave 2
+	note D#, 0
+	note __, 0
+	note G_, 1
+	callchannel Music_BuenasPassword_branch_1783bc
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note F_, 0
+	note C#, 0
+	note __, 0
+	note G#, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note F_, 1
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note C#, 1
+	callchannel Music_BuenasPassword_branch_1783bc
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note B_, 0
+	note G#, 1
+	octave 3
+	note D#, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_BuenasPassword_branch_178315
+; 1783a7
 
-_Music_BuenasPassword_sub_0x1783bc: ; 0x1783bc
-; subroutine
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $c0
-	note $90
-	note $00
-	octave3
-	note $40
-	octave2
-	note $90
-	note $00
-	note $c1
-	octave3
-	note $40
-	note $00
-	octave2
-	note $91
-	endchannel ; end
-; 0x1783d0
+Music_BuenasPassword_branch_1783a7: ; 1783a7
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	octave 3
+	note D#, 1
+	octave 2
+	note G#, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note C#, 0
+	note F_, 1
+	note C#, 0
+	endchannel
+; 1783bc
 
-_Music_BuenasPassword_Ch4: ; 0x1783d0
-	togglenoise $03
-	notetype $0c
-	note $41
-	note $31
-	note $31
-	note $30
-	note $30
-	callchannel _Music_BuenasPassword_sub_0x17840c
-	callchannel _Music_BuenasPassword_sub_0x17840c
-	callchannel _Music_BuenasPassword_sub_0x17840c
-	callchannel _Music_BuenasPassword_sub_0x178424
-	loopchannel $04, $43d9
-	callchannel _Music_BuenasPassword_sub_0x17840c
-	callchannel _Music_BuenasPassword_sub_0x17840c
-	callchannel _Music_BuenasPassword_sub_0x17840c
+Music_BuenasPassword_branch_1783bc: ; 1783bc
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note B_, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	note B_, 1
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G#, 1
+	endchannel
+
+Music_BuenasPassword_Ch4: ; 1783d0
+	togglenoise $3
+	notetype $c
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+
+Music_BuenasPassword_branch_1783d9: ; 1783d9
+	callchannel Music_BuenasPassword_branch_17840c
+	callchannel Music_BuenasPassword_branch_17840c
+	callchannel Music_BuenasPassword_branch_17840c
+	callchannel Music_BuenasPassword_branch_178424
+	loopchannel 4, Music_BuenasPassword_branch_1783d9
+	callchannel Music_BuenasPassword_branch_17840c
+	callchannel Music_BuenasPassword_branch_17840c
+	callchannel Music_BuenasPassword_branch_17840c
 	stereopanning $ff
-	note $41
+	note D#, 1
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $31
-	stereopanning $0f
-	note $80
-	note $80
+	note D_, 1
+	stereopanning $f
+	note G_, 0
+	note G_, 0
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $31
-	note $31
-	note $30
-	note $30
-	loopchannel $00, $43d9 ; end
-; 0x17840c
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	loopchannel 0, Music_BuenasPassword_branch_1783d9
+; 17840c
 
-_Music_BuenasPassword_sub_0x17840c: ; 0x17840c
-; subroutine
+Music_BuenasPassword_branch_17840c: ; 17840c
 	stereopanning $ff
-	note $41
+	note D#, 1
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $31
-	stereopanning $0f
-	note $80
-	note $80
+	note D_, 1
+	stereopanning $f
+	note G_, 0
+	note G_, 0
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $41
-	note $31
-	stereopanning $0f
-	note $81
-	endchannel ; end
-; 0x178424
+	note D#, 1
+	note D_, 1
+	stereopanning $f
+	note G_, 1
+	endchannel
+; 178424
 
-_Music_BuenasPassword_sub_0x178424: ; 0x178424
-; subroutine
+Music_BuenasPassword_branch_178424: ; 178424
 	stereopanning $ff
-	note $41
+	note D#, 1
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $31
-	stereopanning $0f
-	note $80
-	note $80
+	note D_, 1
+	stereopanning $f
+	note G_, 0
+	note G_, 0
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $41
-	note $31
-	note $30
-	note $30
-	endchannel ; end
-; 0x17843b
+	note D#, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	endchannel
+; 17843b
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -1,671 +1,681 @@
-_Music_BugCatchingContest: ; 0xf7c16
-	db $c0
-	dw _Music_BugCatchingContest_Ch1
-	db $01
-	dw _Music_BugCatchingContest_Ch2
-	db $02
-	dw _Music_BugCatchingContest_Ch3
-	db $03
-	dw _Music_BugCatchingContest_Ch4
-; 0xf7c22
+Music_BugCatchingContest: ; f7c16
+	dbw $c0, Music_BugCatchingContest_Ch1
+	dbw $01, Music_BugCatchingContest_Ch2
+	dbw $02, Music_BugCatchingContest_Ch3
+	dbw $03, Music_BugCatchingContest_Ch4
+; f7c22
 
-_Music_BugCatchingContest_Ch1: ; 0xf7c22
-	tempo $9000
+
+Music_BugCatchingContest_Ch1: ; f7c22
+	tempo 144
 	volume $77
-	stereopanning $0f
-	vibrato $08, $24
-	dutycycle $02
-	notetype $0c, $b7
-	note $07
-	octave4
-	note $20
-	note $00
-	note $22
-	note $00
-	note $20
-	note $20
-	note $30
-	note $00
-	note $32
-	note $00
-	note $30
-	note $30
-	note $40
-	note $00
-	note $42
-	note $00
-	note $40
-	note $40
-	note $50
-	note $00
-	note $52
-	note $00
-	note $50
-	note $50
-	notetype $0c, $b1
-	note $01
-	octave2
-	note $a1
-	loopchannel $04, $7c4e
-	note $01
-	note $c1
-	loopchannel $08, $7c55
+	stereopanning $f
+	vibrato $8, $24
+	dutycycle $2
+	notetype $c, $b7
+	note __, 7
+	octave 4
+	note C#, 0
+	note __, 0
+	note C#, 2
+	note __, 0
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note __, 0
+	note D_, 2
+	note __, 0
+	note D_, 0
+	note D_, 0
+	note D#, 0
+	note __, 0
+	note D#, 2
+	note __, 0
+	note D#, 0
+	note D#, 0
+	note E_, 0
+	note __, 0
+	note E_, 2
+	note __, 0
+	note E_, 0
+	note E_, 0
+
+Music_BugCatchingContest_branch_f7c4b: ; f7c4b
+	notetype $c, $b1
+
+Music_BugCatchingContest_branch_f7c4e: ; f7c4e
+	note __, 1
+	octave 2
+	note A_, 1
+	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
+
+Music_BugCatchingContest_branch_f7c55: ; f7c55
+	note __, 1
+	note B_, 1
+	loopchannel 8, Music_BugCatchingContest_branch_f7c55
 	intensity $b4
-	dutycycle $01
-	octave3
-	note $c5
-	note $a0
-	note $c0
-	note $a5
-	octave4
-	note $30
-	note $50
+	dutycycle $1
+	octave 3
+	note B_, 5
+	note A_, 0
+	note B_, 0
+	note A_, 5
+	octave 4
+	note D_, 0
+	note E_, 0
 	intensity $b1
-	dutycycle $02
-	note $01
-	octave2
-	note $a1
-	loopchannel $04, $7c6b
-	note $01
-	note $c1
-	note $01
-	note $c1
-	notetype $06, $b7
-	octave4
-	note $53
-	note $00
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $80
-	note $c7
-	octave5
-	note $57
+	dutycycle $2
+
+Music_BugCatchingContest_branch_f7c6b: ; f7c6b
+	note __, 1
+	octave 2
+	note A_, 1
+	loopchannel 4, Music_BugCatchingContest_branch_f7c6b
+	note __, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	notetype $6, $b7
+	octave 4
+	note E_, 3
+	note __, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note G_, 0
+	note B_, 7
+	octave 5
+	note E_, 7
 	intensity $b1
-	note $03
-	octave2
-	note $c3
-	note $03
-	octave3
-	note $53
-	note $03
-	note $53
-	note $03
-	octave2
-	note $a3
-	loopchannel $03, $7c8e
+	note __, 3
+	octave 2
+	note B_, 3
+	note __, 3
+	octave 3
+	note E_, 3
+	note __, 3
+	note E_, 3
+
+Music_BugCatchingContest_branch_f7c8e: ; f7c8e
+	note __, 3
+	octave 2
+	note A_, 3
+	loopchannel 3, Music_BugCatchingContest_branch_f7c8e
 	intensity $a7
-	octave4
-	note $73
-	note $a3
-	note $03
-	octave3
-	note $81
-	note $c1
-	octave4
-	note $31
-	note $01
-	octave3
-	note $c1
-	note $81
-	octave4
-	note $80
-	note $a0
-	note $80
-	note $a0
-	note $80
-	note $a0
-	note $80
-	note $a0
-	note $87
-	note $03
-	octave3
-	note $71
-	note $a1
-	octave4
-	note $31
-	note $01
-	octave3
-	note $a1
-	note $71
-	octave4
-	note $70
-	note $80
-	note $70
-	note $80
-	note $70
-	note $80
-	note $70
-	note $80
-	note $77
-	note $31
-	note $01
-	octave3
-	note $c1
-	note $81
-	octave4
-	note $81
-	note $01
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $c1
-	note $01
-	note $91
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $91
-	note $c1
-	note $21
-	note $01
-	note $25
-	note $01
-	note $21
-	note $21
-	note $31
-	note $01
-	note $35
-	note $01
-	note $31
-	note $31
-	note $41
-	note $01
-	note $45
-	note $01
-	note $41
-	note $41
-	note $51
-	note $01
-	note $55
-	note $01
-	note $51
-	note $51
-	loopchannel $00, $7c4b ; end
-; 0xf7cf4
+	octave 4
+	note F#, 3
+	note A_, 3
+	note __, 3
+	octave 3
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	octave 4
+	note G_, 0
+	note A_, 0
+	note G_, 0
+	note A_, 0
+	note G_, 0
+	note A_, 0
+	note G_, 0
+	note A_, 0
+	note G_, 7
+	note __, 3
+	octave 3
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	octave 4
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 7
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	octave 4
+	note G_, 1
+	note __, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note B_, 1
+	note __, 1
+	note G#, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note G#, 1
+	note B_, 1
+	note C#, 1
+	note __, 1
+	note C#, 5
+	note __, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note __, 1
+	note D_, 5
+	note __, 1
+	note D_, 1
+	note D_, 1
+	note D#, 1
+	note __, 1
+	note D#, 5
+	note __, 1
+	note D#, 1
+	note D#, 1
+	note E_, 1
+	note __, 1
+	note E_, 5
+	note __, 1
+	note E_, 1
+	note E_, 1
+	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
 
-_Music_BugCatchingContest_Ch2: ; 0xf7cf4
+Music_BugCatchingContest_Ch2: ; f7cf4
 	stereopanning $f0
-	vibrato $08, $23
-	dutycycle $01
-	notetype $0c, $c7
-	note $07
-	octave4
-	note $a0
-	note $00
-	note $a2
-	note $00
-	note $a0
-	note $a0
-	loopchannel $04, $7cff
-	dutycycle $00
-	callchannel _Music_BugCatchingContest_sub_0xf7d8e
-	octave2
-	note $51
-	octave3
-	note $80
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $80
-	note $00
-	octave2
-	note $51
-	octave3
-	note $80
-	note $00
-	octave2
-	note $81
-	octave3
-	note $80
-	note $00
-	octave2
-	note $a1
-	octave3
-	note $a0
-	note $00
-	octave2
-	note $91
-	octave3
-	note $90
-	note $00
-	octave2
-	note $81
-	octave3
-	note $80
-	note $00
-	octave2
-	note $51
-	octave3
-	note $50
-	note $00
-	callchannel _Music_BugCatchingContest_sub_0xf7d8e
-	octave2
-	note $51
-	octave3
-	note $80
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $80
-	note $00
-	octave2
-	note $a1
-	octave4
-	note $20
-	note $00
-	octave2
-	note $51
-	octave4
-	note $20
-	note $00
-	octave2
-	note $31
-	octave3
-	note $70
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $70
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $70
-	note $00
-	octave2
-	note $41
-	octave3
-	note $a0
-	note $00
-	dutycycle $00
-	note $01
-	octave5
-	note $30
-	note $00
-	note $21
-	note $30
-	note $00
-	octave4
-	note $c7
-	note $01
-	octave5
-	note $30
-	note $00
-	note $21
-	note $30
-	note $00
-	octave4
-	note $a7
-	note $01
-	octave5
-	note $33
-	note $71
-	note $51
-	note $30
-	note $00
-	note $21
-	note $30
-	note $00
-	note $50
-	note $00
-	note $50
-	note $02
-	note $59
-	note $a0
-	note $00
-	note $a0
-	note $02
-	note $a9
-	loopchannel $00, $7d0a ; end
-; 0xf7d8e
+	vibrato $8, $23
+	dutycycle $1
+	notetype $c, $c7
+	note __, 7
 
-_Music_BugCatchingContest_sub_0xf7d8e: ; 0xf7d8e
-; subroutine
-	octave2
-	note $31
-	octave3
-	note $70
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $70
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $70
-	note $00
-	octave2
-	note $21
-	octave3
-	note $70
-	note $00
-	octave2
-	note $51
-	octave3
-	note $80
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $80
-	note $00
-	octave2
-	note $21
-	octave3
-	note $80
-	note $00
-	octave2
-	note $41
-	octave3
-	note $80
-	note $00
-	endchannel ; end
-; 0xf7db7
+Music_BugCatchingContest_branch_f7cff: ; f7cff
+	octave 4
+	note A_, 0
+	note __, 0
+	note A_, 2
+	note __, 0
+	note A_, 0
+	note A_, 0
+	loopchannel 4, Music_BugCatchingContest_branch_f7cff
 
-_Music_BugCatchingContest_Ch3: ; 0xf7db7
+Music_BugCatchingContest_branch_f7d0a: ; f7d0a
+	dutycycle $0
+	callchannel Music_BugCatchingContest_branch_f7d8e
+	octave 2
+	note E_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note E_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 2
+	note G#, 1
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note E_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	callchannel Music_BugCatchingContest_branch_f7d8e
+	octave 2
+	note E_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 2
+	note E_, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 2
+	note D_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note D#, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	dutycycle $0
+	note __, 1
+	octave 5
+	note D_, 0
+	note __, 0
+	note C#, 1
+	note D_, 0
+	note __, 0
+	octave 4
+	note B_, 7
+	note __, 1
+	octave 5
+	note D_, 0
+	note __, 0
+	note C#, 1
+	note D_, 0
+	note __, 0
+	octave 4
+	note A_, 7
+	note __, 1
+	octave 5
+	note D_, 3
+	note F#, 1
+	note E_, 1
+	note D_, 0
+	note __, 0
+	note C#, 1
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 9
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	note A_, 9
+	loopchannel 0, Music_BugCatchingContest_branch_f7d0a
+; f7d8e
+
+Music_BugCatchingContest_branch_f7d8e: ; f7d8e
+	octave 2
+	note D_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note C#, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note E_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note C#, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note D#, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	endchannel
+
+Music_BugCatchingContest_Ch3: ; f7db7
 	stereopanning $ff
 	vibrato $10, $23
-	notetype $0c, $14
-	note $07
-	octave3
-	note $a0
-	note $00
-	note $a2
-	note $00
-	note $a0
-	note $a0
-	note $c0
-	note $00
-	note $c2
-	note $00
-	note $c0
-	note $c0
-	octave4
-	note $10
-	note $00
-	note $12
-	note $00
-	note $10
-	note $10
-	note $20
-	note $00
-	note $22
-	note $00
-	note $20
-	note $20
-	notetype $0c, $14
-	note $74
-	note $00
-	note $70
-	note $80
-	note $a3
-	octave5
-	note $33
-	note $21
+	notetype $c, $14
+	note __, 7
+	octave 3
+	note A_, 0
+	note __, 0
+	note A_, 2
+	note __, 0
+	note A_, 0
+	note A_, 0
+	note B_, 0
+	note __, 0
+	note B_, 2
+	note __, 0
+	note B_, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note C_, 2
+	note __, 0
+	note C_, 0
+	note C_, 0
+	note C#, 0
+	note __, 0
+	note C#, 2
+	note __, 0
+	note C#, 0
+	note C#, 0
+
+Music_BugCatchingContest_branch_f7dda: ; f7dda
+	notetype $c, $14
+	note F#, 4
+	note __, 0
+	note F#, 0
+	note G_, 0
+	note A_, 3
+	octave 5
+	note D_, 3
+	note C#, 1
 	intensity $10
-	note $50
-	note $80
-	note $c0
-	note $00
-	note $80
-	note $50
-	notetype $06, $20
-	octave6
-	note $50
-	note $70
-	note $50
-	note $70
-	note $50
-	note $70
-	note $50
-	note $70
-	note $57
+	note E_, 0
+	note G_, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note E_, 0
+	notetype $6, $20
+	octave 6
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note E_, 7
 	intensity $14
-	octave4
-	note $59
-	note $01
-	note $51
-	note $71
-	note $87
-	octave5
-	note $27
-	note $03
+	octave 4
+	note E_, 9
+	note __, 1
+	note E_, 1
+	note F#, 1
+	note G_, 7
+	octave 5
+	note C#, 7
+	note __, 3
 	intensity $10
-	note $51
-	note $81
-	note $a1
-	note $01
-	note $51
-	note $11
-	octave6
-	note $20
-	note $30
-	note $20
-	note $30
-	note $20
-	note $30
-	note $20
-	note $30
-	note $27
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note __, 1
+	note E_, 1
+	note C_, 1
+	octave 6
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 7
 	intensity $15
-	octave5
-	note $73
-	note $03
-	note $83
-	note $03
-	note $a3
-	note $03
-	octave6
-	note $33
-	note $03
-	note $2b
-	octave5
-	note $c1
-	octave6
-	note $21
-	octave5
-	note $c3
-	note $03
-	octave6
-	note $83
-	note $73
-	note $03
-	octave5
-	note $83
-	note $a3
-	note $c3
-	octave6
-	note $53
-	note $33
-	note $23
-	octave5
-	note $c1
-	octave6
-	note $21
-	note $33
-	note $07
-	octave5
-	note $c3
-	note $a3
-	note $00
-	note $40
-	note $70
-	note $a0
-	octave6
-	note $17
-	octave3
-	note $81
-	note $01
-	note $c1
-	note $01
-	note $31
-	note $01
-	note $c1
-	note $01
-	note $51
-	note $01
-	note $c1
-	note $01
-	note $81
-	note $01
-	note $c1
-	note $01
-	note $31
-	note $01
-	note $71
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $71
-	note $01
-	note $41
-	note $01
-	octave4
-	note $11
-	note $01
-	octave3
-	note $a1
-	note $01
-	octave4
-	note $11
-	note $01
-	octave3
-	note $81
-	note $01
-	note $c1
-	note $01
-	note $31
-	note $01
-	note $c1
-	note $01
-	note $91
-	note $01
-	note $c1
-	note $01
-	note $51
-	note $01
-	note $c1
-	note $01
-	note $a1
-	note $01
-	note $a5
-	note $01
-	note $a1
-	note $a1
-	note $c1
-	note $01
-	note $c5
-	note $01
-	note $c1
-	note $c1
-	octave4
-	note $11
-	note $01
-	note $15
-	note $01
-	note $11
-	note $11
-	note $21
-	note $01
-	note $25
-	note $01
-	note $21
-	note $21
-	loopchannel $00, $7dda ; end
-; 0xf7e9a
+	octave 5
+	note F#, 3
+	note __, 3
+	note G_, 3
+	note __, 3
+	note A_, 3
+	note __, 3
+	octave 6
+	note D_, 3
+	note __, 3
+	note C#, 11
+	octave 5
+	note B_, 1
+	octave 6
+	note C#, 1
+	octave 5
+	note B_, 3
+	note __, 3
+	octave 6
+	note G_, 3
+	note F#, 3
+	note __, 3
+	octave 5
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	octave 6
+	note E_, 3
+	note D_, 3
+	note C#, 3
+	octave 5
+	note B_, 1
+	octave 6
+	note C#, 1
+	note D_, 3
+	note __, 7
+	octave 5
+	note B_, 3
+	note A_, 3
+	note __, 0
+	note D#, 0
+	note F#, 0
+	note A_, 0
+	octave 6
+	note C_, 7
+	octave 3
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 5
+	note __, 1
+	note A_, 1
+	note A_, 1
+	note B_, 1
+	note __, 1
+	note B_, 5
+	note __, 1
+	note B_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note C_, 5
+	note __, 1
+	note C_, 1
+	note C_, 1
+	note C#, 1
+	note __, 1
+	note C#, 5
+	note __, 1
+	note C#, 1
+	note C#, 1
+	loopchannel 0, Music_BugCatchingContest_branch_f7dda
 
-_Music_BugCatchingContest_Ch4: ; 0xf7e9a
-	togglenoise $04
-	notetype $06
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $51
-	note $51
-	callchannel _Music_BugCatchingContest_sub_0xf7ee2
-	note $33
-	note $33
-	note $31
-	note $21
-	note $31
-	note $21
-	note $33
-	note $33
-	note $31
-	note $21
-	note $31
-	note $21
-	note $33
-	note $33
-	note $31
-	note $21
-	note $31
-	note $21
-	note $33
-	note $33
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	loopchannel $05, $7eaf
-	note $33
-	note $33
-	note $31
-	note $31
-	note $31
-	note $31
-	note $33
-	note $33
-	note $31
-	note $31
-	note $31
-	note $31
-	callchannel _Music_BugCatchingContest_sub_0xf7ee2
-	loopchannel $00, $7eaf ; end
-; 0xf7ee2
+Music_BugCatchingContest_Ch4: ; f7e9a
+	togglenoise $4
+	notetype $6
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note E_, 1
+	note E_, 1
+	callchannel Music_BugCatchingContest_branch_f7ee2
 
-_Music_BugCatchingContest_sub_0xf7ee2: ; 0xf7ee2
-; subroutine
-	note $33
-	note $c7
-	note $31
-	note $31
-	note $33
-	note $c7
-	note $31
-	note $31
-	note $33
-	note $c7
-	note $31
-	note $31
-	note $33
-	note $c7
-	note $31
-	note $31
-	endchannel ; end
-; 0xf7ef3
+Music_BugCatchingContest_branch_f7eaf: ; f7eaf
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 3
+	note D_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	loopchannel 5, Music_BugCatchingContest_branch_f7eaf
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	callchannel Music_BugCatchingContest_branch_f7ee2
+	loopchannel 0, Music_BugCatchingContest_branch_f7eaf
+; f7ee2
+
+Music_BugCatchingContest_branch_f7ee2: ; f7ee2
+	note D_, 3
+	note B_, 7
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note B_, 7
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note B_, 7
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note B_, 7
+	note D_, 1
+	note D_, 1
+	endchannel
+; f7ef3
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -1,262 +1,271 @@
-_Music_BurnedTower: ; 0xf6a99
-	db $c0
-	dw _Music_BurnedTower_Ch1
-	db $01
-	dw _Music_BurnedTower_Ch2
-	db $02
-	dw _Music_BurnedTower_Ch3
-	db $03
-	dw _Music_BurnedTower_Ch4
-; 0xf6aa5
+Music_BurnedTower: ; f6a99
+	dbw $c0, Music_BurnedTower_Ch1
+	dbw $01, Music_BurnedTower_Ch2
+	dbw $02, Music_BurnedTower_Ch3
+	dbw $03, Music_BurnedTower_Ch4
+; f6aa5
 
-_Music_BurnedTower_Ch1: ; 0xf6aa5
-	tempo $a800
+
+Music_BurnedTower_Ch1: ; f6aa5
+	tempo 168
 	volume $77
-	dutycycle $01
-	tone $0400
-	vibrato $08, $45
+	dutycycle $1
+	tone $0004
+	vibrato $8, $45
 	stereopanning $f0
-	notetype $0c, $91
-	note $01
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	notetype $c, $91
+	note __, 1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $80
-	octave3
-	note $45
+	octave 3
+	note D#, 5
 	intensity $91
-	note $33
-	note $33
-	note $31
+	note D_, 3
+	note D_, 3
+	note D_, 1
 	intensity $80
-	note $25
+	note C#, 5
+
+Music_BurnedTower_branch_f6ac8: ; f6ac8
 	intensity $91
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $80
-	note $b5
-	loopchannel $02, $6ac8
-	tempo $9600
+	note A#, 5
+	loopchannel 2, Music_BurnedTower_branch_f6ac8
+	tempo 150
+
+Music_BurnedTower_branch_f6ad8: ; f6ad8
 	intensity $b1
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $a0
-	octave3
-	note $45
+	octave 3
+	note D#, 5
 	intensity $b1
-	note $33
-	note $33
-	note $31
+	note D_, 3
+	note D_, 3
+	note D_, 1
 	intensity $a0
-	note $25
+	note C#, 5
 	intensity $b1
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $a0
-	note $b5
+	note A#, 5
 	intensity $b1
-	note $a3
-	note $a3
-	note $a1
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $b3
-	note $bf
-	note $bf
-	note $bf
-	note $95
+	note A#, 15
+	note A#, 15
+	note A#, 15
+	note G#, 5
 	intensity $b1
-	note $a3
-	note $a3
-	note $a1
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $a0
-	note $b5
+	note A#, 5
 	intensity $b1
-	note $c3
-	note $c3
-	note $c1
+	note B_, 3
+	note B_, 3
+	note B_, 1
 	intensity $a0
-	octave3
-	note $65
+	octave 3
+	note F_, 5
 	intensity $b1
-	note $53
-	note $53
-	note $51
+	note E_, 3
+	note E_, 3
+	note E_, 1
 	intensity $a0
-	note $45
+	note D#, 5
+
+Music_BurnedTower_branch_f6b17: ; f6b17
 	intensity $b1
-	octave2
-	note $c3
-	note $c3
-	note $c1
+	octave 2
+	note B_, 3
+	note B_, 3
+	note B_, 1
 	intensity $a0
-	octave3
-	note $15
-	loopchannel $02, $6b17
-	loopchannel $00, $6ad8 ; end
-; 0xf6b29
+	octave 3
+	note C_, 5
+	loopchannel 2, Music_BurnedTower_branch_f6b17
+	loopchannel 0, Music_BurnedTower_branch_f6ad8
 
-_Music_BurnedTower_Ch2: ; 0xf6b29
-	dutycycle $02
+Music_BurnedTower_Ch2: ; f6b29
+	dutycycle $2
 	vibrato $20, $82
-	tone $0200
-	notetype $0c, $70
-	callchannel _Music_BurnedTower_sub_0xf6b8e
+	tone $0002
+	notetype $c, $70
+	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c5
-	callchannel _Music_BurnedTower_sub_0xf6b8e
+
+Music_BurnedTower_branch_f6b39: ; f6b39
+	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
-	dutycycle $03
-	note $01
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	dutycycle $3
+	note __, 1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $b0
-	octave3
-	note $45
+	octave 3
+	note D#, 5
 	intensity $c1
-	note $33
-	note $33
-	note $31
+	note D_, 3
+	note D_, 3
+	note D_, 1
 	intensity $b0
-	note $25
+	note C#, 5
 	intensity $c1
-	octave2
-	note $a3
-	note $a3
-	note $a1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $b0
-	note $b3
+	note A#, 3
 	intensity $c1
 	intensity $c2
-	octave3
-	note $a0
-	note $80
-	note $a0
-	octave4
-	note $10
-	vibrato $00, $00
+	octave 3
+	note A_, 0
+	note G_, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	vibrato $0, $0
 	intensity $3d
-	note $57
+	note E_, 7
 	vibrato $20, $83
 	intensity $b0
-	octave2
-	note $83
-	dutycycle $02
+	octave 2
+	note G_, 3
+	dutycycle $2
 	intensity $b0
-	octave3
-	note $73
-	note $51
-	note $71
-	note $83
-	note $c3
-	octave4
-	note $23
-	note $31
-	note $21
-	octave3
-	note $c3
-	note $83
-	note $73
-	note $51
-	note $71
-	note $83
-	note $53
+	octave 3
+	note F#, 3
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note B_, 3
+	octave 4
+	note C#, 3
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note E_, 3
 	intensity $b7
-	note $7f
-	loopchannel $00, $6b39 ; end
-; 0xf6b8e
+	note F#, 15
+	loopchannel 0, Music_BurnedTower_branch_f6b39
+; f6b8e
 
-_Music_BurnedTower_sub_0xf6b8e: ; 0xf6b8e
-; subroutine
-	octave3
-	note $53
-	note $31
-	note $51
-	note $63
-	note $a3
-	note $c3
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a3
-	note $63
-	note $53
-	note $31
-	note $51
-	note $63
-	note $33
-	note $5f
-	endchannel ; end
-; 0xf6ba2
+Music_BurnedTower_branch_f6b8e: ; f6b8e
+	octave 3
+	note E_, 3
+	note D_, 1
+	note E_, 1
+	note F_, 3
+	note A_, 3
+	note B_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 3
+	note F_, 3
+	note E_, 3
+	note D_, 1
+	note E_, 1
+	note F_, 3
+	note D_, 3
+	note E_, 15
+	endchannel
 
-_Music_BurnedTower_Ch3: ; 0xf6ba2
-	stereopanning $0f
-	notetype $0c, $14
-	note $0f
-	note $0f
-	note $0f
-	note $0b
-	octave3
-	note $43
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $63
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $43
-	loopchannel $04, $6bad
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	note $83
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	note $63
-	loopchannel $02, $6bc3
-	loopchannel $00, $6bad ; end
-; 0xf6bdd
+Music_BurnedTower_Ch3: ; f6ba2
+	stereopanning $f
+	notetype $c, $14
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 11
+	octave 3
+	note D#, 3
 
-_Music_BurnedTower_Ch4: ; 0xf6bdd
-	togglenoise $00
-	notetype $0c
-	note $0f
-	loopchannel $04, $6be1
-	note $01
+Music_BurnedTower_branch_f6bad: ; f6bad
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note F_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note D#, 3
+	loopchannel 4, Music_BurnedTower_branch_f6bad
+
+Music_BurnedTower_branch_f6bc3: ; f6bc3
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note G_, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note F_, 3
+	loopchannel 2, Music_BurnedTower_branch_f6bc3
+	loopchannel 0, Music_BurnedTower_branch_f6bad
+
+Music_BurnedTower_Ch4: ; f6bdd
+	togglenoise $0
+	notetype $c
+
+Music_BurnedTower_branch_f6be1: ; f6be1
+	note __, 15
+	loopchannel 4, Music_BurnedTower_branch_f6be1
+	note __, 1
+
+Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
-	note $81
-	note $91
-	note $83
-	note $91
-	note $83
-	loopchannel $00, $6be7 ; end
-; 0xf6bf2
+	note G_, 1
+	note G#, 1
+	note G_, 3
+	note G#, 1
+	note G_, 3
+	loopchannel 0, Music_BurnedTower_branch_f6be7
+; f6bf2
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -1,401 +1,400 @@
-_Music_CeladonCity: ; 0xf435b
-	db $80
-	dw _Music_CeladonCity_Ch1
-	db $01
-	dw _Music_CeladonCity_Ch2
-	db $02
-	dw _Music_CeladonCity_Ch3
-; 0xf4364
+Music_CeladonCity: ; f435b
+	dbw $80, Music_CeladonCity_Ch1
+	dbw $01, Music_CeladonCity_Ch2
+	dbw $02, Music_CeladonCity_Ch3
+; f4364
 
-_Music_CeladonCity_Ch1: ; 0xf4364
-	tempo $9200
+
+Music_CeladonCity_Ch1: ; f4364
+	tempo 146
 	volume $77
-	tone $0100
-	stereopanning $0f
-	notetype $0c, $a6
-	octave3
-	note $a6
+	tone $0001
+
+Music_CeladonCity_branch_f436c: ; f436c
+	stereopanning $f
+	notetype $c, $a6
+	octave 3
+	note A_, 6
 	intensity $a1
-	note $90
-	note $a0
-	note $32
-	note $51
-	note $71
-	callchannel _Music_CeladonCity_sub_0xf43cc
-	note $31
-	note $70
-	note $a0
-	note $30
-	note $70
-	note $a0
-	note $70
-	loopchannel $03, $437d
-	note $31
-	note $80
-	note $c0
-	octave4
-	note $30
-	note $10
-	octave3
-	note $c0
-	note $80
-	callchannel _Music_CeladonCity_sub_0xf43cc
-	note $30
-	note $20
-	note $30
-	note $50
-	note $70
-	note $80
-	note $a0
-	note $c0
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $7f
-	callchannel _Music_CeladonCity_sub_0xf43e1
-	callchannel _Music_CeladonCity_sub_0xf43fe
-	octave2
-	note $c1
-	note $b0
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $a0
-	note $80
-	note $70
-	note $80
-	note $a0
-	note $90
-	note $a0
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $a0
-	callchannel _Music_CeladonCity_sub_0xf43e1
-	callchannel _Music_CeladonCity_sub_0xf43fe
-	note $31
-	note $20
-	note $30
-	note $70
-	note $80
-	note $a0
-	note $80
-	note $a7
-	loopchannel $00, $436c ; end
-; 0xf43cc
+	note G#, 0
+	note A_, 0
+	note D_, 2
+	note E_, 1
+	note F#, 1
+	callchannel Music_CeladonCity_branch_f43cc
 
-_Music_CeladonCity_sub_0xf43cc: ; 0xf43cc
-; subroutine
-	note $31
-	note $80
-	note $c0
-	note $30
-	note $80
-	note $c0
-	note $80
-	loopchannel $03, $43cc
-	note $31
-	note $70
-	note $a0
-	octave4
-	note $30
-	note $20
-	note $30
-	octave3
-	note $a0
-	endchannel ; end
-; 0xf43e1
+Music_CeladonCity_branch_f437d: ; f437d
+	note D_, 1
+	note F#, 0
+	note A_, 0
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	note F#, 0
+	loopchannel 3, Music_CeladonCity_branch_f437d
+	note D_, 1
+	note G_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note G_, 0
+	callchannel Music_CeladonCity_branch_f43cc
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 15
+	callchannel Music_CeladonCity_branch_f43e1
+	callchannel Music_CeladonCity_branch_f43fe
+	octave 2
+	note B_, 1
+	note A#, 0
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note A_, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note G#, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	callchannel Music_CeladonCity_branch_f43e1
+	callchannel Music_CeladonCity_branch_f43fe
+	note D_, 1
+	note C#, 0
+	note D_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note G_, 0
+	note A_, 7
+	loopchannel 0, Music_CeladonCity_branch_f436c
+; f43cc
 
-_Music_CeladonCity_sub_0xf43e1: ; 0xf43e1
-; subroutine
-	octave2
-	note $81
-	note $c0
-	octave3
-	note $30
-	loopchannel $04, $43e1
-	note $11
-	octave2
-	note $c0
-	octave3
-	note $10
-	note $30
-	note $50
-	note $70
-	note $a0
-	note $80
-	note $a0
-	note $c0
-	octave4
-	note $10
-	note $30
-	note $20
-	note $30
-	octave3
-	note $c0
-	endchannel ; end
-; 0xf43fe
+Music_CeladonCity_branch_f43cc: ; f43cc
+	note D_, 1
+	note G_, 0
+	note B_, 0
+	note D_, 0
+	note G_, 0
+	note B_, 0
+	note G_, 0
+	loopchannel 3, Music_CeladonCity_branch_f43cc
+	note D_, 1
+	note F#, 0
+	note A_, 0
+	octave 4
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	octave 3
+	note A_, 0
+	endchannel
+; f43e1
 
-_Music_CeladonCity_sub_0xf43fe: ; 0xf43fe
-; subroutine
-	note $31
-	note $70
-	note $a0
-	loopchannel $04, $43fe
-	endchannel ; end
-; 0xf4406
+Music_CeladonCity_branch_f43e1: ; f43e1
+	octave 2
+	note G_, 1
+	note B_, 0
+	octave 3
+	note D_, 0
+	loopchannel 4, Music_CeladonCity_branch_f43e1
+	note C_, 1
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note A_, 0
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	endchannel
+; f43fe
 
-_Music_CeladonCity_Ch2: ; 0xf4406
+Music_CeladonCity_branch_f43fe: ; f43fe
+	note D_, 1
+	note F#, 0
+	note A_, 0
+	loopchannel 4, Music_CeladonCity_branch_f43fe
+	endchannel
+
+Music_CeladonCity_Ch2: ; f4406
 	vibrato $12, $34
-	dutycycle $02
+	dutycycle $2
 	stereopanning $f0
-	notetype $0c, $b7
-	octave4
-	note $30
-	note $20
-	note $30
-	note $50
-	note $70
-	note $50
-	note $70
-	note $80
-	note $a7
-	callchannel _Music_CeladonCity_sub_0xf4463
-	note $a3
-	note $73
-	note $a1
-	note $75
-	note $a0
-	note $80
-	note $70
-	note $80
-	note $a1
-	note $c1
-	note $83
-	note $c3
-	callchannel _Music_CeladonCity_sub_0xf4463
+	notetype $c, $b7
+	octave 4
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 7
+
+Music_CeladonCity_branch_f441a: ; f441a
+	callchannel Music_CeladonCity_branch_f4463
+	note A_, 3
+	note F#, 3
+	note A_, 1
+	note F#, 5
+	note A_, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 1
+	note B_, 1
+	note G_, 3
+	note B_, 3
+	callchannel Music_CeladonCity_branch_f4463
 	intensity $c1
-	note $a1
-	note $81
-	note $71
-	note $81
-	note $71
-	note $51
-	note $31
-	note $21
-	note $33
-	note $30
-	note $50
-	note $70
-	note $a0
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 3
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note A_, 0
 	intensity $b3
-	octave5
-	note $35
+	octave 5
+	note D_, 5
 	intensity $a2
-	octave1
-	note $71
-	callchannel _Music_CeladonCity_sub_0xf4474
-	octave1
-	note $82
-	note $c0
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a5
-	note $71
-	callchannel _Music_CeladonCity_sub_0xf4474
-	octave1
-	note $a2
-	octave2
-	note $30
-	note $a3
-	note $35
+	octave 1
+	note F#, 1
+	callchannel Music_CeladonCity_branch_f4474
+	octave 1
+	note G_, 2
+	note B_, 0
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 5
+	note F#, 1
+	callchannel Music_CeladonCity_branch_f4474
+	octave 1
+	note A_, 2
+	octave 2
+	note D_, 0
+	note A_, 3
+	note D_, 5
 	intensity $97
-	octave4
-	note $70
-	note $a0
-	octave5
-	note $3f
-	loopchannel $00, $441a ; end
-; 0xf4463
+	octave 4
+	note F#, 0
+	note A_, 0
+	octave 5
+	note D_, 15
+	loopchannel 0, Music_CeladonCity_branch_f441a
+; f4463
 
-_Music_CeladonCity_sub_0xf4463: ; 0xf4463
-; subroutine
+Music_CeladonCity_branch_f4463: ; f4463
 	intensity $b2
-	octave4
-	note $c3
-	note $83
-	note $c1
-	note $85
-	note $c0
-	note $80
-	note $a0
-	note $c0
-	octave5
-	note $11
-	octave4
-	note $c1
-	note $a7
-	endchannel ; end
-; 0xf4474
+	octave 4
+	note B_, 3
+	note G_, 3
+	note B_, 1
+	note G_, 5
+	note B_, 0
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 7
+	endchannel
+; f4474
 
-_Music_CeladonCity_sub_0xf4474: ; 0xf4474
-; subroutine
-	note $82
-	note $c0
-	octave2
-	note $33
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $33
-	octave1
-	note $82
-	octave2
-	note $10
-	note $33
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $33
-	octave1
-	note $a2
-	octave2
-	note $30
-	note $73
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $73
-	endchannel ; end
-; 0xf4492
+Music_CeladonCity_branch_f4474: ; f4474
+	note G_, 2
+	note B_, 0
+	octave 2
+	note D_, 3
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note D_, 3
+	octave 1
+	note G_, 2
+	octave 2
+	note C_, 0
+	note D_, 3
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note D_, 3
+	octave 1
+	note A_, 2
+	octave 2
+	note D_, 0
+	note F#, 3
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note F#, 3
+	endchannel
 
-_Music_CeladonCity_Ch3: ; 0xf4492
+Music_CeladonCity_Ch3: ; f4492
 	vibrato $12, $24
-	notetype $0c, $25
-	octave3
-	note $a1
-	note $01
-	note $71
-	note $01
-	note $37
-	callchannel _Music_CeladonCity_sub_0xf44fd
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $33
-	loopchannel $03, $44a1
-	octave2
-	note $80
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $32
-	octave2
-	note $70
-	callchannel _Music_CeladonCity_sub_0xf44fd
-	note $a0
-	note $00
-	octave3
-	note $30
-	note $00
-	octave3
-	note $72
-	octave2
-	note $90
-	note $a0
-	note $00
-	octave3
-	note $20
-	note $00
-	note $51
-	note $21
-	note $31
-	note $05
-	octave2
-	note $a1
-	note $05
+
+Music_CeladonCity_branch_f4495: ; f4495
+	notetype $c, $25
+	octave 3
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 7
+	callchannel Music_CeladonCity_branch_f44fd
+
+Music_CeladonCity_branch_f44a1: ; f44a1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 3
+	loopchannel 3, Music_CeladonCity_branch_f44a1
+	octave 2
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 2
+	octave 2
+	note F#, 0
+	callchannel Music_CeladonCity_branch_f44fd
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 3
+	note F#, 2
+	octave 2
+	note G#, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	note E_, 1
+	note C#, 1
+	note D_, 1
+	note __, 5
+	octave 2
+	note A_, 1
+	note __, 5
 	intensity $10
-	callchannel _Music_CeladonCity_sub_0xf4510
-	octave5
-	note $51
-	note $01
-	note $71
-	note $01
-	note $33
-	note $03
-	note $17
-	octave4
-	note $a1
-	note $c1
-	octave5
-	note $11
-	note $31
-	note $51
-	note $01
-	note $31
-	note $51
-	note $33
-	note $03
-	callchannel _Music_CeladonCity_sub_0xf4510
-	octave5
-	note $51
-	note $01
-	note $31
-	note $51
-	note $33
-	note $03
-	note $17
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $71
-	note $51
-	note $31
-	note $51
-	note $31
-	note $05
-	loopchannel $00, $4495 ; end
-; 0xf44fd
+	callchannel Music_CeladonCity_branch_f4510
+	octave 5
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D_, 3
+	note __, 3
+	note C_, 7
+	octave 4
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note E_, 1
+	note D_, 3
+	note __, 3
+	callchannel Music_CeladonCity_branch_f4510
+	octave 5
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note E_, 1
+	note D_, 3
+	note __, 3
+	note C_, 7
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note __, 5
+	loopchannel 0, Music_CeladonCity_branch_f4495
+; f44fd
 
-_Music_CeladonCity_sub_0xf44fd: ; 0xf44fd
-; subroutine
-	octave2
-	note $81
-	note $01
-	octave3
-	note $33
-	loopchannel $03, $44fd
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $30
-	note $00
-	note $72
-	octave2
-	note $90
-	endchannel ; end
-; 0xf4510
+Music_CeladonCity_branch_f44fd: ; f44fd
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 3
+	note D_, 3
+	loopchannel 3, Music_CeladonCity_branch_f44fd
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note F#, 2
+	octave 2
+	note G#, 0
+	endchannel
+; f4510
 
-_Music_CeladonCity_sub_0xf4510: ; 0xf4510
-; subroutine
-	octave5
-	note $37
-	note $11
-	octave4
-	note $c1
-	note $a1
-	note $c1
-	endchannel ; end
-; 0xf4518
+Music_CeladonCity_branch_f4510: ; f4510
+	octave 5
+	note D_, 7
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	endchannel
+; f4518
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -1,786 +1,811 @@
-_Music_ChampionBattle: ; 0xea9c1
-	db $80
-	dw _Music_ChampionBattle_Ch1
-	db $01
-	dw _Music_ChampionBattle_Ch2
-	db $02
-	dw _Music_ChampionBattle_Ch3
-; 0xea9ca
+Music_ChampionBattle: ; ea9c1
+	dbw $80, Music_ChampionBattle_Ch1
+	dbw $01, Music_ChampionBattle_Ch2
+	dbw $02, Music_ChampionBattle_Ch3
+; ea9ca
 
-_Music_ChampionBattle_Ch1: ; 0xea9ca
-	tempo $6200
+
+Music_ChampionBattle_Ch1: ; ea9ca
+	tempo 98
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $b2
-	octave2
-	note $b7
-	note $b7
-	note $b7
-	note $b3
+	notetype $c, $b2
+	octave 2
+	note A#, 7
+	note A#, 7
+	note A#, 7
+	note A#, 3
 	intensity $b7
-	note $c3
-	callchannel _Music_ChampionBattle_sub_0xeaaee
-	octave3
-	note $43
-	loopchannel $02, $69e2
-	callchannel _Music_ChampionBattle_sub_0xeaaee
-	octave3
-	note $53
-	callchannel _Music_ChampionBattle_sub_0xeaafc
-	loopchannel $03, $69f0
-	callchannel _Music_ChampionBattle_sub_0xeab06
-	callchannel _Music_ChampionBattle_sub_0xeaafc
-	loopchannel $07, $69fa
-	callchannel _Music_ChampionBattle_sub_0xeab06
+	note B_, 3
+
+Music_ChampionBattle_branch_ea9e2: ; ea9e2
+	callchannel Music_ChampionBattle_branch_eaaee
+	octave 3
+	note D#, 3
+	loopchannel 2, Music_ChampionBattle_branch_ea9e2
+	callchannel Music_ChampionBattle_branch_eaaee
+	octave 3
+	note E_, 3
+
+Music_ChampionBattle_branch_ea9f0: ; ea9f0
+	callchannel Music_ChampionBattle_branch_eaafc
+	loopchannel 3, Music_ChampionBattle_branch_ea9f0
+	callchannel Music_ChampionBattle_branch_eab06
+
+Music_ChampionBattle_branch_ea9fa: ; ea9fa
+	callchannel Music_ChampionBattle_branch_eaafc
+	loopchannel 7, Music_ChampionBattle_branch_ea9fa
+	callchannel Music_ChampionBattle_branch_eab06
 	intensity $b2
-	note $b1
-	note $b1
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $43
+	octave 3
+	note D#, 3
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $53
+	octave 3
+	note E_, 3
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $73
+	octave 3
+	note F#, 3
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $93
+	octave 3
+	note G#, 3
 	intensity $a0
-	note $b7
-	octave2
-	note $b7
-	octave3
-	note $cb
+	note A#, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note B_, 11
 	intensity $b2
-	note $b0
-	note $c0
-	octave4
-	note $10
-	note $20
-	callchannel _Music_ChampionBattle_sub_0xeab0f
-	note $51
-	note $51
+	note A#, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note C#, 0
+
+Music_ChampionBattle_branch_eaa35: ; eaa35
+	callchannel Music_ChampionBattle_branch_eab0f
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $73
+	note F#, 3
+
+Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $b2
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $93
-	loopchannel $02, $6a3d
+	note G#, 3
+	loopchannel 2, Music_ChampionBattle_branch_eaa3d
 	intensity $b2
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $c3
-	callchannel _Music_ChampionBattle_sub_0xeab0f
-	note $51
-	note $51
+	note B_, 3
+	callchannel Music_ChampionBattle_branch_eab0f
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $73
+	note F#, 3
 	intensity $b2
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $93
+	note G#, 3
 	intensity $b2
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	note $c3
+	note B_, 3
 	intensity $b2
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $b7
-	octave4
-	note $53
-	callchannel _Music_ChampionBattle_sub_0xeab24
-	note $c3
-	note $93
-	callchannel _Music_ChampionBattle_sub_0xeab24
-	octave4
-	note $33
-	note $33
+	octave 4
+	note E_, 3
+	callchannel Music_ChampionBattle_branch_eab24
+	note B_, 3
+	note G#, 3
+	callchannel Music_ChampionBattle_branch_eab24
+	octave 4
+	note D_, 3
+	note D_, 3
 	intensity $a0
-	octave3
-	note $b7
-	octave2
-	note $b7
-	octave3
-	note $77
-	octave2
-	note $77
+	octave 3
+	note A#, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note F#, 7
+	octave 2
+	note F#, 7
 	intensity $60
-	note $cf
+	note B_, 15
 	intensity $70
-	note $cf
+	note B_, 15
 	intensity $80
-	octave3
-	note $2f
+	octave 3
+	note C#, 15
 	intensity $a0
-	note $4f
+	note D#, 15
 	intensity $b4
-	octave4
-	note $73
-	note $63
-	note $53
-	note $43
-	note $33
-	note $23
-	note $73
-	note $73
-	note $73
-	note $63
-	note $53
-	note $43
-	note $71
-	note $91
-	note $41
-	note $51
-	note $73
-	note $73
-	note $0f
+	octave 4
+	note F#, 3
+	note F_, 3
+	note E_, 3
+	note D#, 3
+	note D_, 3
+	note C#, 3
+	note F#, 3
+	note F#, 3
+	note F#, 3
+	note F_, 3
+	note E_, 3
+	note D#, 3
+	note F#, 1
+	note G#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 3
+	note F#, 3
+	note __, 15
 	intensity $90
-	octave3
-	note $77
+	octave 3
+	note F#, 7
 	intensity $b4
-	note $53
-	note $53
+	note E_, 3
+	note E_, 3
 	intensity $90
-	note $4f
-	note $2f
+	note D#, 15
+	note C#, 15
+
+Music_ChampionBattle_branch_eaab1: ; eaab1
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $43
-	loopchannel $04, $6ab1
+	octave 3
+	note D#, 3
+	loopchannel 4, Music_ChampionBattle_branch_eaab1
+
+Music_ChampionBattle_branch_eaabe: ; eaabe
 	intensity $b2
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $b7
-	note $43
-	loopchannel $02, $6abe
+	note D#, 3
+	loopchannel 2, Music_ChampionBattle_branch_eaabe
 	intensity $b2
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $b7
-	note $73
+	note F#, 3
 	intensity $b2
-	note $11
-	note $11
+	note C_, 1
+	note C_, 1
 	intensity $b7
-	note $93
-	callchannel _Music_ChampionBattle_sub_0xeab31
-	octave3
-	note $41
-	note $41
+	note G#, 3
+	callchannel Music_ChampionBattle_branch_eab31
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $b7
-	note $c3
-	callchannel _Music_ChampionBattle_sub_0xeab31
-	octave3
-	note $41
-	note $41
+	note B_, 3
+	callchannel Music_ChampionBattle_branch_eab31
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $b7
-	octave4
-	note $33
-	loopchannel $00, $6a35 ; end
-; 0xeaaee
+	octave 4
+	note D_, 3
+	loopchannel 0, Music_ChampionBattle_branch_eaa35
+; eaaee
 
-_Music_ChampionBattle_sub_0xeaaee: ; 0xeaaee
-; subroutine
+Music_ChampionBattle_branch_eaaee: ; eaaee
 	intensity $b2
-	octave2
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	endchannel ; end
-; 0xeaafc
+	endchannel
+; eaafc
 
-_Music_ChampionBattle_sub_0xeaafc: ; 0xeaafc
-; subroutine
+Music_ChampionBattle_branch_eaafc: ; eaafc
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $43
-	endchannel ; end
-; 0xeab06
+	octave 3
+	note D#, 3
+	endchannel
+; eab06
 
-_Music_ChampionBattle_sub_0xeab06: ; 0xeab06
-; subroutine
+Music_ChampionBattle_branch_eab06: ; eab06
 	intensity $b2
-	octave2
-	note $b1
-	note $b1
+	octave 2
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	note $c3
-	endchannel ; end
-; 0xeab0f
+	note B_, 3
+	endchannel
+; eab0f
 
-_Music_ChampionBattle_sub_0xeab0f: ; 0xeab0f
-; subroutine
+Music_ChampionBattle_branch_eab0f: ; eab0f
 	intensity $b5
-	octave3
-	note $41
-	note $b1
-	note $41
-	note $73
-	note $61
-	note $51
-	note $c1
-	note $71
-	note $b1
-	note $61
-	note $a1
-	note $51
-	note $91
-	note $41
-	note $81
+	octave 3
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note F#, 3
+	note F_, 1
+	note E_, 1
+	note B_, 1
+	note F#, 1
+	note A#, 1
+	note F_, 1
+	note A_, 1
+	note E_, 1
+	note G#, 1
+	note D#, 1
+	note G_, 1
 	intensity $b2
-	endchannel ; end
-; 0xeab24
+	endchannel
+; eab24
 
-_Music_ChampionBattle_sub_0xeab24: ; 0xeab24
-; subroutine
+Music_ChampionBattle_branch_eab24: ; eab24
 	intensity $b2
-	octave3
-	note $b1
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $b1
+	octave 3
+	note A#, 1
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 1
 	intensity $b7
-	endchannel ; end
-; 0xeab31
+	endchannel
+; eab31
 
-_Music_ChampionBattle_sub_0xeab31: ; 0xeab31
-; subroutine
+Music_ChampionBattle_branch_eab31: ; eab31
 	intensity $b2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $b7
-	note $b3
+	note A#, 3
 	intensity $b2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $b7
-	note $c3
+	note B_, 3
 	intensity $b2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $b7
-	octave4
-	note $23
+	octave 4
+	note C#, 3
 	intensity $b2
-	endchannel ; end
-; 0xeab4a
+	endchannel
 
-_Music_ChampionBattle_Ch2: ; 0xeab4a
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $c2
-	octave3
-	note $47
-	note $47
-	note $47
-	note $43
-	intensity $c7
-	note $33
-	callchannel _Music_ChampionBattle_sub_0xeac4f
-	note $b3
-	callchannel _Music_ChampionBattle_sub_0xeac4f
-	note $c3
-	callchannel _Music_ChampionBattle_sub_0xeac4f
-	octave4
-	note $23
-	callchannel _Music_ChampionBattle_sub_0xeac5c
-	note $33
-	callchannel _Music_ChampionBattle_sub_0xeac5c
-	note $63
-	callchannel _Music_ChampionBattle_sub_0xeac5c
-	note $33
+Music_ChampionBattle_Ch2: ; eab4a
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $c2
+	octave 3
+	note D#, 7
+	note D#, 7
+	note D#, 7
+	note D#, 3
+	intensity $c7
+	note D_, 3
+	callchannel Music_ChampionBattle_branch_eac4f
+	note A#, 3
+	callchannel Music_ChampionBattle_branch_eac4f
+	note B_, 3
+	callchannel Music_ChampionBattle_branch_eac4f
+	octave 4
+	note C#, 3
+	callchannel Music_ChampionBattle_branch_eac5c
+	note D_, 3
+	callchannel Music_ChampionBattle_branch_eac5c
+	note F_, 3
+	callchannel Music_ChampionBattle_branch_eac5c
+	note D_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $c3
+	note B_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	octave4
-	note $13
+	octave 4
+	note C_, 3
 	intensity $c2
-	octave3
-	note $41
-	note $41
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	octave4
-	note $23
-	note $47
-	octave3
-	note $47
-	octave4
-	note $57
+	octave 4
+	note C#, 3
+	note D#, 7
+	octave 3
+	note D#, 7
+	octave 4
+	note E_, 7
 	intensity $3c
-	note $57
+	note E_, 7
+
+Music_ChampionBattle_branch_eab9d: ; eab9d
 	intensity $c5
-	note $45
-	octave3
-	note $b5
-	octave4
-	note $41
-	note $31
-	note $23
-	note $13
-	octave3
-	note $c3
-	note $b3
+	note D#, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C#, 3
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A#, 3
 	intensity $c7
-	note $c7
-	octave4
-	note $57
+	note B_, 7
+	octave 4
+	note E_, 7
 	intensity $c2
-	octave3
-	note $91
-	note $91
+	octave 3
+	note G#, 1
+	note G#, 1
 	intensity $c7
-	note $c3
+	note B_, 3
 	intensity $c2
-	note $91
-	note $91
+	note G#, 1
+	note G#, 1
 	intensity $c7
-	octave4
-	note $23
+	octave 4
+	note C#, 3
 	intensity $c5
-	note $45
-	octave3
-	note $b5
-	octave4
-	note $41
-	note $31
-	note $23
-	note $13
-	octave3
-	note $c3
-	note $b1
-	note $c1
+	note D#, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C#, 3
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A#, 1
+	note B_, 1
 	intensity $c7
-	octave4
-	note $57
-	note $97
-	note $57
-	note $c7
-	callchannel _Music_ChampionBattle_sub_0xeac79
-	note $53
-	note $53
-	callchannel _Music_ChampionBattle_sub_0xeac79
-	note $73
-	note $73
+	octave 4
+	note E_, 7
+	note G#, 7
+	note E_, 7
+	note B_, 7
+	callchannel Music_ChampionBattle_branch_eac79
+	note E_, 3
+	note E_, 3
+	callchannel Music_ChampionBattle_branch_eac79
+	note F#, 3
+	note F#, 3
 	intensity $c7
-	note $47
-	octave3
-	note $47
-	octave4
-	note $27
-	octave3
-	note $27
+	note D#, 7
+	octave 3
+	note D#, 7
+	octave 4
+	note C#, 7
+	octave 3
+	note C#, 7
 	intensity $b0
-	note $4f
-	note $4f
-	note $6f
-	note $7f
+	note D#, 15
+	note D#, 15
+	note F_, 15
+	note F#, 15
 	intensity $c4
-	octave5
-	note $43
-	note $33
-	note $23
-	note $13
-	note $41
-	note $31
-	note $21
-	note $11
-	octave4
-	note $c3
-	note $c3
-	loopchannel $02, $6bef
+
+Music_ChampionBattle_branch_eabef: ; eabef
+	octave 5
+	note D#, 3
+	note D_, 3
+	note C#, 3
+	note C_, 3
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 4
+	note B_, 3
+	note B_, 3
+	loopchannel 2, Music_ChampionBattle_branch_eabef
 	intensity $b0
-	octave3
-	note $4f
-	note $cf
-	note $bf
-	note $9f
+	octave 3
+	note D#, 15
+	note B_, 15
+	note A#, 15
+	note G#, 15
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $c3
+	note B_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $a3
+	note A_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $c3
+	note B_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	octave4
-	note $23
+	octave 4
+	note C#, 3
 	intensity $c2
-	octave3
-	note $41
-	note $41
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $b0
-	note $47
-	note $57
-	note $77
-	note $57
-	note $47
-	note $57
-	note $77
-	note $97
-	loopchannel $00, $6b9d ; end
-; 0xeac4f
+	note D#, 7
+	note E_, 7
+	note F#, 7
+	note E_, 7
+	note D#, 7
+	note E_, 7
+	note F#, 7
+	note G#, 7
+	loopchannel 0, Music_ChampionBattle_branch_eab9d
+; eac4f
 
-_Music_ChampionBattle_sub_0xeac4f: ; 0xeac4f
-; subroutine
+Music_ChampionBattle_branch_eac4f: ; eac4f
 	intensity $c2
-	note $41
-	note $45
-	note $41
-	note $45
-	note $41
-	note $45
-	note $41
-	note $41
+	note D#, 1
+	note D#, 5
+	note D#, 1
+	note D#, 5
+	note D#, 1
+	note D#, 5
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	endchannel ; end
-; 0xeac5c
+	endchannel
+; eac5c
 
-_Music_ChampionBattle_sub_0xeac5c: ; 0xeac5c
-; subroutine
+Music_ChampionBattle_branch_eac5c: ; eac5c
 	intensity $c2
-	octave3
-	note $41
-	note $41
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $c3
+	note B_, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c2
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	endchannel ; end
-; 0xeac79
+	endchannel
+; eac79
 
-_Music_ChampionBattle_sub_0xeac79: ; 0xeac79
-; subroutine
+Music_ChampionBattle_branch_eac79: ; eac79
 	intensity $c1
-	note $41
-	note $43
-	note $43
-	note $43
-	note $43
-	note $43
-	note $41
+	note D#, 1
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note D#, 1
 	intensity $c5
-	endchannel ; end
-; 0xeac85
+	endchannel
 
-_Music_ChampionBattle_Ch3: ; 0xeac85
-	notetype $0c, $14
-	octave3
-	note $40
-	note $06
-	loopchannel $03, $6c88
-	note $40
-	note $02
-	note $53
-	callchannel _Music_ChampionBattle_sub_0xead61
-	callchannel _Music_ChampionBattle_sub_0xead61
-	callchannel _Music_ChampionBattle_sub_0xead61
-	callchannel _Music_ChampionBattle_sub_0xead6f
-	note $33
-	callchannel _Music_ChampionBattle_sub_0xead6f
-	note $a3
-	callchannel _Music_ChampionBattle_sub_0xead6f
-	note $33
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	note $40
-	note $00
-	note $40
-	note $00
-	octave4
-	note $23
-	note $47
-	octave3
-	note $47
-	note $c3
-	note $81
-	note $c1
-	note $71
-	note $b1
-	note $61
-	note $a1
-	note $41
-	note $b1
-	loopchannel $08, $6cc6
-	note $51
-	note $c1
-	loopchannel $05, $6ccc
-	note $51
-	octave4
-	note $11
-	octave3
-	note $a1
-	note $c1
-	note $81
-	note $a1
-	note $41
-	note $b1
-	loopchannel $08, $6cda
-	note $51
-	note $c1
-	loopchannel $08, $6ce0
-	callchannel _Music_ChampionBattle_sub_0xead83
-	octave3
-	note $41
-	note $51
-	note $41
-	note $51
-	note $41
-	octave4
-	note $31
-	note $21
-	note $11
-	callchannel _Music_ChampionBattle_sub_0xead83
-	octave3
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	octave4
-	note $31
-	note $21
-	note $11
-	octave3
-	note $b7
-	note $47
-	note $c7
-	note $47
-	note $41
-	note $71
-	loopchannel $10, $6d05
-	callchannel _Music_ChampionBattle_sub_0xead8e
-	octave3
-	note $51
-	note $c1
-	octave4
-	note $41
-	note $51
-	note $71
-	octave3
-	note $c1
-	octave4
-	note $41
-	note $51
-	callchannel _Music_ChampionBattle_sub_0xead8e
-	octave3
-	note $51
-	note $c1
-	loopchannel $04, $6d1d
-	note $41
-	note $b1
-	loopchannel $05, $6d24
-	note $c1
-	octave4
-	note $41
-	octave3
-	note $41
-	note $01
-	note $41
-	note $01
-	note $51
-	note $c1
-	loopchannel $05, $6d32
-	octave4
-	note $21
-	note $51
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $41
-	note $91
-	loopchannel $08, $6d40
-	note $41
-	note $b1
-	loopchannel $07, $6d46
-	note $c1
-	note $b1
-	octave3
-	note $41
-	note $b1
-	octave4
-	note $31
-	note $41
-	loopchannel $07, $6d4e
-	note $21
-	octave3
-	note $c1
-	note $b1
-	note $91
-	loopchannel $00, $6cc6 ; end
-; 0xead61
+Music_ChampionBattle_Ch3: ; eac85
+	notetype $c, $14
 
-_Music_ChampionBattle_sub_0xead61: ; 0xead61
-; subroutine
-	note $40
-	note $00
-	note $40
-	note $04
-	loopchannel $03, $6d61
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	endchannel ; end
-; 0xead6f
+Music_ChampionBattle_branch_eac88: ; eac88
+	octave 3
+	note D#, 0
+	note __, 6
+	loopchannel 3, Music_ChampionBattle_branch_eac88
+	note D#, 0
+	note __, 2
+	note E_, 3
+	callchannel Music_ChampionBattle_branch_ead61
+	callchannel Music_ChampionBattle_branch_ead61
+	callchannel Music_ChampionBattle_branch_ead61
+	callchannel Music_ChampionBattle_branch_ead6f
+	note D_, 3
+	callchannel Music_ChampionBattle_branch_ead6f
+	note A_, 3
+	callchannel Music_ChampionBattle_branch_ead6f
+	note D_, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 4
+	note C#, 3
+	note D#, 7
+	octave 3
+	note D#, 7
+	note B_, 3
+	note G_, 1
+	note B_, 1
+	note F#, 1
+	note A#, 1
+	note F_, 1
+	note A_, 1
 
-_Music_ChampionBattle_sub_0xead6f: ; 0xead6f
-; subroutine
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	endchannel ; end
-; 0xead83
+Music_ChampionBattle_branch_eacc6: ; eacc6
+	note D#, 1
+	note A#, 1
+	loopchannel 8, Music_ChampionBattle_branch_eacc6
 
-_Music_ChampionBattle_sub_0xead83: ; 0xead83
-; subroutine
-	octave3
-	note $41
-	note $71
-	note $41
-	note $71
-	note $41
-	octave4
-	note $31
-	note $21
-	note $11
-	endchannel ; end
-; 0xead8e
+Music_ChampionBattle_branch_eaccc: ; eaccc
+	note E_, 1
+	note B_, 1
+	loopchannel 5, Music_ChampionBattle_branch_eaccc
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
 
-_Music_ChampionBattle_sub_0xead8e: ; 0xead8e
-; subroutine
-	octave3
-	note $51
-	note $c1
-	note $51
-	note $c1
-	note $51
-	note $c1
-	octave4
-	note $41
-	note $51
-	endchannel ; end
-; 0xead99
+Music_ChampionBattle_branch_eacda: ; eacda
+	note D#, 1
+	note A#, 1
+	loopchannel 8, Music_ChampionBattle_branch_eacda
+
+Music_ChampionBattle_branch_eace0: ; eace0
+	note E_, 1
+	note B_, 1
+	loopchannel 8, Music_ChampionBattle_branch_eace0
+	callchannel Music_ChampionBattle_branch_ead83
+	octave 3
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	octave 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	callchannel Music_ChampionBattle_branch_ead83
+	octave 3
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	octave 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 7
+	note D#, 7
+	note B_, 7
+	note D#, 7
+
+Music_ChampionBattle_branch_ead05: ; ead05
+	note D#, 1
+	note F#, 1
+	loopchannel 16, Music_ChampionBattle_branch_ead05
+	callchannel Music_ChampionBattle_branch_ead8e
+	octave 3
+	note E_, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	callchannel Music_ChampionBattle_branch_ead8e
+
+Music_ChampionBattle_branch_ead1d: ; ead1d
+	octave 3
+	note E_, 1
+	note B_, 1
+	loopchannel 4, Music_ChampionBattle_branch_ead1d
+
+Music_ChampionBattle_branch_ead24: ; ead24
+	note D#, 1
+	note A#, 1
+	loopchannel 5, Music_ChampionBattle_branch_ead24
+	note B_, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+
+Music_ChampionBattle_branch_ead32: ; ead32
+	note E_, 1
+	note B_, 1
+	loopchannel 5, Music_ChampionBattle_branch_ead32
+	octave 4
+	note C#, 1
+	note E_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+
+Music_ChampionBattle_branch_ead40: ; ead40
+	note D#, 1
+	note G#, 1
+	loopchannel 8, Music_ChampionBattle_branch_ead40
+
+Music_ChampionBattle_branch_ead46: ; ead46
+	note D#, 1
+	note A#, 1
+	loopchannel 7, Music_ChampionBattle_branch_ead46
+	note B_, 1
+	note A#, 1
+
+Music_ChampionBattle_branch_ead4e: ; ead4e
+	octave 3
+	note D#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	note D#, 1
+	loopchannel 7, Music_ChampionBattle_branch_ead4e
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note G#, 1
+	loopchannel 0, Music_ChampionBattle_branch_eacc6
+; ead61
+
+Music_ChampionBattle_branch_ead61: ; ead61
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 4
+	loopchannel 3, Music_ChampionBattle_branch_ead61
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	endchannel
+; ead6f
+
+Music_ChampionBattle_branch_ead6f: ; ead6f
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	endchannel
+; ead83
+
+Music_ChampionBattle_branch_ead83: ; ead83
+	octave 3
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	octave 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	endchannel
+; ead8e
+
+Music_ChampionBattle_branch_ead8e: ; ead8e
+	octave 3
+	note E_, 1
+	note B_, 1
+	note E_, 1
+	note B_, 1
+	note E_, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	endchannel
+; ead99
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -1,310 +1,312 @@
-_Music_CherrygroveCity: ; 0xf5b03
-	db $c0
-	dw _Music_CherrygroveCity_Ch1
-	db $01
-	dw _Music_CherrygroveCity_Ch2
-	db $02
-	dw _Music_CherrygroveCity_Ch3
-	db $03
-	dw _Music_CherrygroveCity_Ch4
-; 0xf5b0f
+Music_CherrygroveCity: ; f5b03
+	dbw $c0, Music_CherrygroveCity_Ch1
+	dbw $01, Music_CherrygroveCity_Ch2
+	dbw $02, Music_CherrygroveCity_Ch3
+	dbw $03, Music_CherrygroveCity_Ch4
+; f5b0f
 
-_Music_CherrygroveCity_Ch1: ; 0xf5b0f
-	tempo $9800
+
+Music_CherrygroveCity_Ch1: ; f5b0f
+	tempo 152
 	volume $77
-	dutycycle $03
-	tone $0100
-	vibrato $08, $15
+	dutycycle $3
+	tone $0001
+	vibrato $8, $15
 	stereopanning $f0
-	notetype $0c, $b5
-	note $09
-	octave3
-	note $11
-	note $31
-	note $51
-	note $a3
-	note $91
-	note $a1
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $a5
-	note $61
-	note $11
-	octave2
-	note $b1
-	octave3
-	note $11
-	note $51
-	note $83
-	note $71
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $85
-	note $51
-	note $11
-	octave2
-	note $b1
-	note $a1
-	octave3
-	note $11
+	notetype $c, $b5
+	note __, 9
+	octave 3
+	note C_, 1
+	note D_, 1
+	note E_, 1
+
+Music_CherrygroveCity_branch_f5b26: ; f5b26
+	note A_, 3
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 5
+	note F_, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note G_, 3
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 5
+	note E_, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	octave 3
+	note C_, 1
 	intensity $b7
-	octave2
-	note $b5
-	octave3
-	note $35
-	note $b3
-	note $a5
-	note $61
-	note $17
-	octave2
-	note $b5
-	octave3
-	note $35
+	octave 2
+	note A#, 5
+	octave 3
+	note D_, 5
+	note A#, 3
+	note A_, 5
+	note F_, 1
+	note C_, 7
+	octave 2
+	note A#, 5
+	octave 3
+	note D_, 5
 	intensity $b5
-	note $a3
-	note $83
-	note $53
-	note $33
-	note $53
-	octave2
-	note $b5
-	octave3
-	note $35
-	note $b3
-	note $a5
-	note $61
-	note $13
-	octave2
-	note $c3
-	note $b5
-	octave3
-	note $21
-	octave2
-	note $b3
-	note $83
-	note $a3
-	octave3
-	note $13
-	octave2
-	note $a3
-	octave3
-	note $13
-	loopchannel $00, $5b26 ; end
-; 0xf5b74
+	note A_, 3
+	note G_, 3
+	note E_, 3
+	note D_, 3
+	note E_, 3
+	octave 2
+	note A#, 5
+	octave 3
+	note D_, 5
+	note A#, 3
+	note A_, 5
+	note F_, 1
+	note C_, 3
+	octave 2
+	note B_, 3
+	note A#, 5
+	octave 3
+	note C#, 1
+	octave 2
+	note A#, 3
+	note G_, 3
+	note A_, 3
+	octave 3
+	note C_, 3
+	octave 2
+	note A_, 3
+	octave 3
+	note C_, 3
+	loopchannel 0, Music_CherrygroveCity_branch_f5b26
 
-_Music_CherrygroveCity_Ch2: ; 0xf5b74
-	dutycycle $03
+Music_CherrygroveCity_Ch2: ; f5b74
+	dutycycle $3
 	vibrato $10, $36
-	stereopanning $0f
-	notetype $0c, $c3
-	octave3
-	note $11
-	note $31
-	note $51
-	note $31
-	note $51
-	note $81
-	note $a1
-	note $b1
+	stereopanning $f
+	notetype $c, $c3
+	octave 3
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+
+Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $c6
-	octave4
-	note $15
-	note $33
+	octave 4
+	note C_, 5
+	note D_, 3
 	intensity $b3
-	note $31
-	note $11
-	octave3
-	note $b1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
 	intensity $c7
-	octave4
-	note $15
-	octave3
-	note $a1
-	note $67
+	octave 4
+	note C_, 5
+	octave 3
+	note A_, 1
+	note F_, 7
 	intensity $c6
-	note $b5
-	octave4
-	note $13
+	note A#, 5
+	octave 4
+	note C_, 3
 	intensity $b3
-	note $11
-	octave3
-	note $b1
-	note $a1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
 	intensity $c7
-	note $b5
-	note $81
-	note $57
+	note A#, 5
+	note G_, 1
+	note E_, 7
 	intensity $a0
-	note $35
-	note $65
-	octave4
-	note $33
-	note $15
+	note D_, 5
+	note F_, 5
+	octave 4
+	note D_, 3
+	note C_, 5
 	intensity $a5
-	octave3
-	note $a1
+	octave 3
+	note A_, 1
 	intensity $c7
-	note $67
+	note F_, 7
 	intensity $a0
-	note $35
-	note $65
-	octave4
-	note $33
+	note D_, 5
+	note F_, 5
+	octave 4
+	note D_, 3
 	intensity $c7
-	note $1f
+	note C_, 15
 	intensity $b5
-	octave3
-	note $35
-	note $65
-	octave4
-	note $33
-	note $15
-	octave3
-	note $a1
-	note $67
-	note $25
-	note $65
-	note $83
+	octave 3
+	note D_, 5
+	note F_, 5
+	octave 4
+	note D_, 3
+	note C_, 5
+	octave 3
+	note A_, 1
+	note F_, 7
+	note C#, 5
+	note F_, 5
+	note G_, 3
 	intensity $a0
-	note $67
+	note F_, 7
 	intensity $a7
-	note $67
-	loopchannel $00, $5b87 ; end
-; 0xf5bd8
+	note F_, 7
+	loopchannel 0, Music_CherrygroveCity_branch_f5b87
 
-_Music_CherrygroveCity_Ch3: ; 0xf5bd8
-	notetype $0c, $16
-	note $03
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $a1
-	note $61
-	note $a1
-	octave4
-	note $13
-	octave3
-	note $61
-	note $81
-	note $a1
-	note $a1
-	note $61
-	note $a1
-	octave4
-	note $13
-	octave3
-	note $61
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $b1
-	octave4
-	note $13
-	octave3
-	note $61
-	note $81
-	note $a1
-	note $b3
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $63
-	note $b1
-	note $61
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $a3
-	note $61
-	note $a1
-	note $61
-	note $51
-	note $41
-	note $31
-	note $63
-	note $b1
-	note $61
-	note $b1
-	note $a1
-	note $81
-	note $51
-	note $81
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $31
-	note $63
-	note $b1
-	note $61
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $a3
-	note $61
-	note $a1
-	note $61
-	note $51
-	note $41
-	note $21
-	note $63
-	note $b1
-	note $61
-	note $b1
-	note $a1
-	note $81
-	note $61
-	note $a1
-	note $61
-	note $a1
-	note $61
-	note $a1
-	note $61
-	note $a1
-	loopchannel $00, $5be4 ; end
-; 0xf5c48
+Music_CherrygroveCity_Ch3: ; f5bd8
+	notetype $c, $16
+	note __, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
 
-_Music_CherrygroveCity_Ch4: ; 0xf5c48
-	togglenoise $03
-	notetype $0c
-	note $0f
-	note $21
-	note $01
-	note $81
-	note $21
-	note $21
-	note $71
-	note $23
-	note $21
-	note $01
-	note $81
-	note $20
-	note $20
-	note $73
-	note $21
-	note $81
-	loopchannel $00, $5c4d ; end
-; 0xf5c60
+Music_CherrygroveCity_branch_f5be4: ; f5be4
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note F_, 3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note F_, 3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	loopchannel 0, Music_CherrygroveCity_branch_f5be4
+
+Music_CherrygroveCity_Ch4: ; f5c48
+	togglenoise $3
+	notetype $c
+	note __, 15
+
+Music_CherrygroveCity_branch_f5c4d: ; f5c4d
+	note C#, 1
+	note __, 1
+	note G_, 1
+	note C#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 3
+	note C#, 1
+	note __, 1
+	note G_, 1
+	note C#, 0
+	note C#, 0
+	note F#, 3
+	note C#, 1
+	note G_, 1
+	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
+; f5c60
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -1,446 +1,447 @@
-_Music_Clair: ; 0x1fa8d
-	db $c0
-	dw _Music_Clair_Ch1
-	db $01
-	dw _Music_Clair_Ch2
-	db $02
-	dw _Music_Clair_Ch3
-	db $03
-	dw _Music_Clair_Ch4
-; 0x1fa99
+Music_Clair: ; 1fa8d
+	dbw $c0, Music_Clair_Ch1
+	dbw $01, Music_Clair_Ch2
+	dbw $02, Music_Clair_Ch3
+	dbw $03, Music_Clair_Ch4
+; 1fa99
 
-_Music_Clair_Ch1: ; 0x1fa99
-	tempo $8800
+
+Music_Clair_Ch1: ; 1fa99
+	tempo 136
 	volume $77
-	tone $0100
+	tone $0001
 	vibrato $12, $34
-	stereopanning $0f
-	notetype $0c, $93
-	dutycycle $03
-	octave4
-	note $60
-	note $70
-	note $60
-	note $00
-	note $20
-	note $00
-	loopchannel $02, $7aab
-	octave3
-	note $c0
-	note $00
-	note $90
-	dutycycle $02
+	stereopanning $f
+	notetype $c, $93
+	dutycycle $3
+
+Music_Clair_branch_1faab: ; 1faab
+	octave 4
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	loopchannel 2, Music_Clair_branch_1faab
+	octave 3
+	note B_, 0
+	note __, 0
+	note G#, 0
+	dutycycle $2
 	intensity $92
-	octave5
-	note $60
-	note $83
+	octave 5
+	note F_, 0
+	note G_, 3
 	intensity $a7
-	dutycycle $03
-	octave3
-	note $43
-	note $63
-	note $83
+	dutycycle $3
+	octave 3
+	note D#, 3
+	note F_, 3
+	note G_, 3
+
+Music_Clair_branch_1fac9: ; 1fac9
 	intensity $93
-	callchannel _Music_Clair_sub_0x1fb12
-	octave2
-	note $c0
-	octave3
-	note $20
-	note $41
-	octave2
-	note $80
-	note $b0
-	octave3
-	note $21
-	octave2
-	note $b0
-	note $80
-	callchannel _Music_Clair_sub_0x1fb12
-	note $40
-	note $20
-	note $41
-	octave4
-	note $b0
-	note $90
-	note $80
-	note $90
-	note $b0
-	octave5
-	note $40
-	callchannel _Music_Clair_sub_0x1fb2e
-	dutycycle $03
-	note $92
-	note $61
-	note $00
-	note $b3
-	dutycycle $02
-	note $40
-	note $20
-	note $40
-	note $80
-	note $b0
-	octave5
-	note $40
-	callchannel _Music_Clair_sub_0x1fb2e
-	dutycycle $03
-	note $42
-	note $21
-	note $00
-	octave3
-	note $c3
-	dutycycle $02
-	note $90
-	note $20
-	note $40
-	note $90
-	note $c0
-	octave4
-	note $40
-	loopchannel $00, $7ac9 ; end
-; 0x1fb12
+	callchannel Music_Clair_branch_1fb12
+	octave 2
+	note B_, 0
+	octave 3
+	note C#, 0
+	note D#, 1
+	octave 2
+	note G_, 0
+	note A#, 0
+	octave 3
+	note C#, 1
+	octave 2
+	note A#, 0
+	note G_, 0
+	callchannel Music_Clair_branch_1fb12
+	note D#, 0
+	note C#, 0
+	note D#, 1
+	octave 4
+	note A#, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note A#, 0
+	octave 5
+	note D#, 0
+	callchannel Music_Clair_branch_1fb2e
+	dutycycle $3
+	note G#, 2
+	note F_, 1
+	note __, 0
+	note A#, 3
+	dutycycle $2
+	note D#, 0
+	note C#, 0
+	note D#, 0
+	note G_, 0
+	note A#, 0
+	octave 5
+	note D#, 0
+	callchannel Music_Clair_branch_1fb2e
+	dutycycle $3
+	note D#, 2
+	note C#, 1
+	note __, 0
+	octave 3
+	note B_, 3
+	dutycycle $2
+	note G#, 0
+	note C#, 0
+	note D#, 0
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	loopchannel 0, Music_Clair_branch_1fac9
+; 1fb12
 
-_Music_Clair_sub_0x1fb12: ; 0x1fb12
-; subroutine
-	dutycycle $03
+Music_Clair_branch_1fb12: ; 1fb12
+	dutycycle $3
 	stereopanning $ff
-	octave3
-	note $c0
-	note $01
-	note $94
-	dutycycle $02
-	stereopanning $0f
-	octave2
-	note $c1
-	note $90
-	note $c0
-	octave3
-	note $40
-	note $00
-	note $40
-	note $70
-	note $60
-	note $20
-	note $00
-	note $60
-	note $20
-	note $00
-	endchannel ; end
-; 0x1fb2e
+	octave 3
+	note B_, 0
+	note __, 1
+	note G#, 4
+	dutycycle $2
+	stereopanning $f
+	octave 2
+	note B_, 1
+	note G#, 0
+	note B_, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note F#, 0
+	note F_, 0
+	note C#, 0
+	note __, 0
+	note F_, 0
+	note C#, 0
+	note __, 0
+	endchannel
+; 1fb2e
 
-_Music_Clair_sub_0x1fb2e: ; 0x1fb2e
-; subroutine
-	octave4
-	note $70
-	note $40
-	note $00
-	note $70
-	note $40
-	note $00
-	octave3
-	note $40
-	note $90
-	note $c1
-	note $90
-	note $c0
-	octave4
-	note $40
-	note $00
-	note $40
-	note $70
-	endchannel ; end
-; 0x1fb41
+Music_Clair_branch_1fb2e: ; 1fb2e
+	octave 4
+	note F#, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note G#, 0
+	note B_, 1
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note F#, 0
+	endchannel
 
-_Music_Clair_Ch2: ; 0x1fb41
-	dutycycle $03
+Music_Clair_Ch2: ; 1fb41
+	dutycycle $3
 	vibrato $12, $34
-	notetype $06, $b7
-	octave3
-	note $b1
-	note $c1
-	note $b1
-	note $01
-	note $91
-	note $01
-	loopchannel $02, $7b49
-	note $61
-	note $01
-	note $21
-	note $01
+	notetype $6, $b7
+
+Music_Clair_branch_1fb49: ; 1fb49
+	octave 3
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	loopchannel 2, Music_Clair_branch_1fb49
+	note F_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
 	intensity $82
-	note $41
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
 	intensity $92
-	note $81
-	octave4
-	note $21
-	note $41
-	octave3
-	note $b1
+	note G_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
 	intensity $b2
-	octave4
-	note $21
-	note $41
-	note $81
-	note $41
+	octave 4
+	note C#, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
 	intensity $c2
-	note $21
-	note $41
-	note $81
-	note $b1
+	note C#, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
 	intensity $b7
-	callchannel _Music_Clair_sub_0x1fba6
-	note $71
-	note $03
-	note $4b
-	note $01
-	note $43
-	note $23
-	octave3
-	note $c2
-	note $b0
-	note $c5
-	octave4
-	note $23
-	note $01
-	octave3
-	note $bf
-	note $03
-	forceoctave $0c
-	callchannel _Music_Clair_sub_0x1fba6
-	forceoctave $00
-	octave5
-	note $71
-	note $03
-	note $4b
-	note $01
-	octave4
-	note $93
-	note $b3
-	note $c2
-	octave5
-	note $10
-	note $25
-	octave4
-	note $b3
-	note $01
-	note $9f
-	note $03
-	loopchannel $00, $7b77 ; end
-; 0x1fba6
 
-_Music_Clair_sub_0x1fba6: ; 0x1fba6
-; subroutine
-	octave4
-	note $71
-	note $03
-	note $4b
-	note $01
-	octave3
-	note $93
-	note $b3
-	note $c2
-	octave4
-	note $10
-	note $25
-	octave3
-	note $c3
-	note $01
-	octave4
-	note $4f
-	note $03
-	endchannel ; end
-; 0x1fbb9
+Music_Clair_branch_1fb77: ; 1fb77
+	callchannel Music_Clair_branch_1fba6
+	note F#, 1
+	note __, 3
+	note D#, 11
+	note __, 1
+	note D#, 3
+	note C#, 3
+	octave 3
+	note B_, 2
+	note A#, 0
+	note B_, 5
+	octave 4
+	note C#, 3
+	note __, 1
+	octave 3
+	note A#, 15
+	note __, 3
+	forceoctave $c
+	callchannel Music_Clair_branch_1fba6
+	forceoctave $0
+	octave 5
+	note F#, 1
+	note __, 3
+	note D#, 11
+	note __, 1
+	octave 4
+	note G#, 3
+	note A#, 3
+	note B_, 2
+	octave 5
+	note C_, 0
+	note C#, 5
+	octave 4
+	note A#, 3
+	note __, 1
+	note G#, 15
+	note __, 3
+	loopchannel 0, Music_Clair_branch_1fb77
+; 1fba6
 
-_Music_Clair_Ch3: ; 0x1fbb9
-	notetype $0c, $14
-	forceoctave $0c
-	octave3
-	note $21
-	note $03
-	octave2
-	note $90
-	note $c0
-	octave3
-	note $21
-	note $03
-	octave2
-	note $90
-	note $c0
-	octave3
-	note $41
-	note $01
-	octave2
-	note $b3
-	note $93
-	note $83
-	callchannel _Music_Clair_sub_0x1fc3c
-	octave2
-	note $21
-	note $00
-	note $91
-	note $00
-	note $21
-	note $01
-	note $41
-	note $b1
-	note $41
-	callchannel _Music_Clair_sub_0x1fc3c
-	octave2
-	note $91
-	note $00
-	note $21
-	note $00
-	note $41
-	note $01
-	note $40
-	note $20
-	note $40
-	note $60
-	note $80
-	note $b0
-	octave1
-	note $91
-	note $00
-	octave2
-	note $41
-	note $00
-	octave1
-	note $91
-	octave3
-	note $70
-	note $00
-	octave1
-	note $90
-	octave3
-	note $40
-	octave2
-	note $41
-	octave1
-	note $91
-	octave2
-	note $21
-	note $00
-	note $91
-	note $00
-	note $21
-	octave3
-	note $40
-	note $00
-	octave2
-	note $40
-	octave3
-	note $b0
-	octave2
-	note $b1
-	octave3
-	note $80
-	octave2
-	note $40
-	octave1
-	note $91
-	note $00
-	octave2
-	note $41
-	note $00
-	octave1
-	note $91
-	octave3
-	note $70
-	note $00
-	octave1
-	note $90
-	octave3
-	note $40
-	octave2
-	note $41
-	octave1
-	note $91
-	octave2
-	note $41
-	note $00
-	note $81
-	note $00
-	note $91
-	octave2
-	note $c0
-	note $00
-	octave1
-	note $90
-	octave2
-	note $b0
-	note $41
-	note $90
-	octave1
-	note $90
-	loopchannel $00, $7bd1 ; end
-; 0x1fc3c
+Music_Clair_branch_1fba6: ; 1fba6
+	octave 4
+	note F#, 1
+	note __, 3
+	note D#, 11
+	note __, 1
+	octave 3
+	note G#, 3
+	note A#, 3
+	note B_, 2
+	octave 4
+	note C_, 0
+	note C#, 5
+	octave 3
+	note B_, 3
+	note __, 1
+	octave 4
+	note D#, 15
+	note __, 3
+	endchannel
 
-_Music_Clair_sub_0x1fc3c: ; 0x1fc3c
-; subroutine
-	octave1
-	note $91
-	note $00
-	octave2
-	note $41
-	note $00
-	octave1
-	note $91
-	note $01
-	note $91
-	octave2
-	note $41
-	octave1
-	note $91
-	endchannel ; end
-; 0x1fc4b
+Music_Clair_Ch3: ; 1fbb9
+	notetype $c, $14
+	forceoctave $c
+	octave 3
+	note C#, 1
+	note __, 3
+	octave 2
+	note G#, 0
+	note B_, 0
+	octave 3
+	note C#, 1
+	note __, 3
+	octave 2
+	note G#, 0
+	note B_, 0
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note A#, 3
+	note G#, 3
+	note G_, 3
 
-_Music_Clair_Ch4: ; 0x1fc4b
-	togglenoise $03
-	notetype $0c
+Music_Clair_branch_1fbd1: ; 1fbd1
+	callchannel Music_Clair_branch_1fc3c
+	octave 2
+	note C#, 1
+	note __, 0
+	note G#, 1
+	note __, 0
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	callchannel Music_Clair_branch_1fc3c
+	octave 2
+	note G#, 1
+	note __, 0
+	note C#, 1
+	note __, 0
+	note D#, 1
+	note __, 1
+	note D#, 0
+	note C#, 0
+	note D#, 0
+	note F_, 0
+	note G_, 0
+	note A#, 0
+	octave 1
+	note G#, 1
+	note __, 0
+	octave 2
+	note D#, 1
+	note __, 0
+	octave 1
+	note G#, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note G#, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note D#, 1
+	octave 1
+	note G#, 1
+	octave 2
+	note C#, 1
+	note __, 0
+	note G#, 1
+	note __, 0
+	note C#, 1
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note D#, 0
+	octave 3
+	note A#, 0
+	octave 2
+	note A#, 1
+	octave 3
+	note G_, 0
+	octave 2
+	note D#, 0
+	octave 1
+	note G#, 1
+	note __, 0
+	octave 2
+	note D#, 1
+	note __, 0
+	octave 1
+	note G#, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 1
+	note G#, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note D#, 1
+	octave 1
+	note G#, 1
+	octave 2
+	note D#, 1
+	note __, 0
+	note G_, 1
+	note __, 0
+	note G#, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 1
+	note G#, 0
+	octave 2
+	note A#, 0
+	note D#, 1
+	note G#, 0
+	octave 1
+	note G#, 0
+	loopchannel 0, Music_Clair_branch_1fbd1
+; 1fc3c
+
+Music_Clair_branch_1fc3c: ; 1fc3c
+	octave 1
+	note G#, 1
+	note __, 0
+	octave 2
+	note D#, 1
+	note __, 0
+	octave 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	octave 2
+	note D#, 1
+	octave 1
+	note G#, 1
+	endchannel
+
+Music_Clair_Ch4: ; 1fc4b
+	togglenoise $3
+	notetype $c
 	stereopanning $f0
-	note $c7
-	note $c7
-	note $c5
+	note B_, 7
+	note B_, 7
+	note B_, 5
 	stereopanning $ff
-	note $40
-	note $40
-	note $31
-	note $40
-	note $40
-	note $31
-	note $30
-	note $30
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D_, 0
+	note D_, 0
+
+Music_Clair_branch_1fc5e: ; 1fc5e
 	stereopanning $ff
-	callchannel _Music_Clair_sub_0x1fc6e
-	note $80
+	callchannel Music_Clair_branch_1fc6e
+	note G_, 0
 	stereopanning $ff
-	callchannel _Music_Clair_sub_0x1fc6e
-	note $70
-	loopchannel $00, $7c5e ; end
-; 0x1fc6e
+	callchannel Music_Clair_branch_1fc6e
+	note F#, 0
+	loopchannel 0, Music_Clair_branch_1fc5e
+; 1fc6e
 
-_Music_Clair_sub_0x1fc6e: ; 0x1fc6e
-; subroutine
-	note $41
+Music_Clair_branch_1fc6e: ; 1fc6e
+	note D#, 1
 	stereopanning $f0
-	note $81
+	note G_, 1
 	stereopanning $ff
-	note $31
+	note D_, 1
 	stereopanning $f0
-	note $80
-	note $80
-	note $81
+	note G_, 0
+	note G_, 0
+	note G_, 1
 	stereopanning $ff
-	note $40
+	note D#, 0
 	stereopanning $f0
-	note $80
+	note G_, 0
 	stereopanning $ff
-	note $31
+	note D_, 1
 	stereopanning $f0
-	note $80
-	endchannel ; end
-; 0x1fc87
+	note G_, 0
+	endchannel
+; 1fc87
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -1,177 +1,181 @@
-_Music_BugCatchingContestResults: ; 0xefb3e
-	db $c0
-	dw _Music_BugCatchingContestResults_Ch1
-	db $01
-	dw _Music_BugCatchingContestResults_Ch2
-	db $02
-	dw _Music_BugCatchingContestResults_Ch3
-	db $03
-	dw _Music_BugCatchingContestResults_Ch4
-; 0xefb4a
+Music_ContestResults: ; efb3e
+	dbw $c0, Music_ContestResults_Ch1
+	dbw $01, Music_ContestResults_Ch2
+	dbw $02, Music_ContestResults_Ch3
+	dbw $03, Music_ContestResults_Ch4
+; efb4a
 
-_Music_BugCatchingContestResults_Ch1: ; 0xefb4a
-	tempo $9000
+
+Music_ContestResults_Ch1: ; efb4a
+	tempo 144
 	volume $77
-	notetype $0c, $51
-	note $01
-	octave2
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $00
-	note $01
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $01
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $01
-	note $c0
-	note $02
-	note $b0
-	note $02
-	note $a0
-	note $02
-	note $80
-	note $00
-	loopchannel $00, $7b52 ; end
-; 0xefb7b
+	notetype $c, $51
 
-_Music_BugCatchingContestResults_Ch2: ; 0xefb7b
-	notetype $0c, $61
-	octave2
-	note $11
-	octave3
-	note $50
-	note $00
-	octave1
-	note $81
-	octave3
-	note $50
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $50
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $50
-	note $00
-	octave2
-	note $31
-	octave3
-	note $60
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $60
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $60
-	note $00
-	octave2
-	note $21
-	octave3
-	note $60
-	note $00
-	octave2
-	note $31
-	octave3
-	note $60
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $60
-	note $00
-	loopchannel $02, $7ba6
-	octave2
-	note $81
-	octave3
-	note $80
-	note $00
-	octave2
-	note $31
-	octave3
-	note $70
-	note $00
-	octave2
-	note $81
-	octave3
-	note $60
-	note $00
-	octave2
-	note $31
-	octave3
-	note $30
-	note $00
-	loopchannel $00, $7b7e ; end
-; 0xefbcc
+Music_ContestResults_branch_efb52: ; efb52
+	note __, 1
+	octave 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	note __, 1
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note __, 1
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note __, 1
+	note B_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_ContestResults_branch_efb52
 
-_Music_BugCatchingContestResults_Ch3: ; 0xefbcc
-	vibrato $08, $24
-	notetype $0c, $23
-	octave4
-	note $54
-	note $00
-	note $50
-	note $60
-	note $83
-	octave5
-	note $13
-	octave4
-	note $c7
-	note $a7
-	note $34
-	note $00
-	note $30
-	note $50
-	note $63
-	note $c3
-	note $a7
-	note $87
-	loopchannel $00, $7bd2 ; end
-; 0xefbe9
+Music_ContestResults_Ch2: ; efb7b
+	notetype $c, $61
 
-_Music_BugCatchingContestResults_Ch4: ; 0xefbe9
-	togglenoise $04
-	notetype $06
-	note $23
-	note $23
-	note $21
-	note $21
-	note $21
-	note $21
-	note $23
-	note $23
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	loopchannel $00, $7bed ; end
-; 0xefc01
+Music_ContestResults_branch_efb7e: ; efb7e
+	octave 2
+	note C_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note G_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 2
+	note D_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 2
+	note C#, 1
+	octave 3
+	note F_, 0
+	note __, 0
+
+Music_ContestResults_branch_efba6: ; efba6
+	octave 2
+	note D_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	loopchannel 2, Music_ContestResults_branch_efba6
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note D_, 1
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 2
+	note D_, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	loopchannel 0, Music_ContestResults_branch_efb7e
+
+Music_ContestResults_Ch3: ; efbcc
+	vibrato $8, $24
+	notetype $c, $23
+
+Music_ContestResults_branch_efbd2: ; efbd2
+	octave 4
+	note E_, 4
+	note __, 0
+	note E_, 0
+	note F_, 0
+	note G_, 3
+	octave 5
+	note C_, 3
+	octave 4
+	note B_, 7
+	note A_, 7
+	note D_, 4
+	note __, 0
+	note D_, 0
+	note E_, 0
+	note F_, 3
+	note B_, 3
+	note A_, 7
+	note G_, 7
+	loopchannel 0, Music_ContestResults_branch_efbd2
+
+Music_ContestResults_Ch4: ; efbe9
+	togglenoise $4
+	notetype $6
+
+Music_ContestResults_branch_efbed: ; efbed
+	note C#, 3
+	note C#, 3
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 3
+	note C#, 3
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	loopchannel 0, Music_ContestResults_branch_efbed
+; efc01
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,1708 +1,1697 @@
-_Music_Credits: ; 0x1f31c
-	db $c0
-	dw _Music_Credits_Ch1
-	db $01
-	dw _Music_Credits_Ch2
-	db $02
-	dw _Music_Credits_Ch3
-	db $03
-	dw _Music_Credits_Ch4
-; 0x1f328
+Music_Credits: ; 1f31c
+	dbw $c0, Music_Credits_Ch1
+	dbw $01, Music_Credits_Ch2
+	dbw $02, Music_Credits_Ch3
+	dbw $03, Music_Credits_Ch4
+; 1f328
 
-_Music_Credits_Ch1: ; 0x1f328
-	tempo $8b00
+
+Music_Credits_Ch1: ; 1f328
+	tempo 139
 	volume $77
-	stereopanning $0f
-	dutycycle $03
-	notetype $0c, $2f
-	octave2
-	note $8f
-	notetype $06, $a7
-	octave3
-	note $cb
-	note $b1
-	note $a1
-	note $c0
-	octave4
-	note $16
-	note $37
-	callchannel _Music_Credits_sub_0x1f483
-	note $03
-	octave3
-	note $c1
-	note $01
-	note $a1
-	note $c1
-	note $01
-	note $a1
-	note $c1
+	stereopanning $f
+	dutycycle $3
+	notetype $c, $2f
+	octave 2
+	note G_, 15
+	notetype $6, $a7
+	octave 3
+	note B_, 11
+	note A#, 1
+	note A_, 1
+	note B_, 0
+	octave 4
+	note C_, 6
+	note D_, 7
+	callchannel Music_Credits_branch_1f483
+	note __, 3
+	octave 3
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note B_, 1
 	intensity $96
-	note $a0
-	note $80
-	octave3
-	note $30
-	note $10
-	octave2
-	note $c0
-	note $a0
+	note A_, 0
+	note G_, 0
+	octave 3
+	note D_, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+	note A_, 0
 	intensity $94
-	note $80
-	note $60
-	note $50
-	note $30
-	note $10
-	octave1
-	note $c0
-	note $a0
-	octave3
-	note $00
+	note G_, 0
+	note F_, 0
+	note E_, 0
+	note D_, 0
+	note C_, 0
+	octave 1
+	note B_, 0
+	note A_, 0
+	octave 3
+	note __, 0
 	intensity $a7
-	callchannel _Music_Credits_sub_0x1f483
-	callchannel _Music_Credits_sub_0x1f4ed
+	callchannel Music_Credits_branch_1f483
+	callchannel Music_Credits_branch_1f4ed
 	intensity $97
-	callchannel _Music_Credits_sub_0x1f4f8
-	octave3
-	note $c1
-	octave4
-	note $81
-	note $31
-	note $81
-	note $61
-	note $81
-	note $31
-	note $81
-	octave3
-	note $c1
-	octave4
-	note $81
-	note $31
-	note $81
-	octave3
-	note $c1
-	octave4
-	note $81
-	note $31
-	note $81
-	octave3
-	note $81
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $51
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $c1
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $c1
-	note $81
-	note $a1
-	note $51
-	note $11
-	note $51
-	note $91
-	note $51
-	note $11
-	note $51
-	note $81
-	note $51
-	note $11
-	note $51
-	note $71
-	note $51
-	note $11
-	octave3
-	note $c1
-	callchannel _Music_Credits_sub_0x1f4f8
-	callchannel _Music_Credits_sub_0x1f559
-	note $c0
-	octave4
-	note $16
-	note $37
+	callchannel Music_Credits_branch_1f4f8
+	octave 3
+	note B_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note B_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	callchannel Music_Credits_branch_1f4f8
+	callchannel Music_Credits_branch_1f559
+	note B_, 0
+	octave 4
+	note C_, 6
+	note D_, 7
 	intensity $a7
-	octave5
-	note $51
-	note $21
-	octave4
-	note $a1
-	note $51
-	octave5
-	note $21
-	octave4
-	note $a1
-	note $51
-	note $21
-	note $20
-	note $36
-	note $56
-	octave3
-	note $00
-	forceoctave $02
-	callchannel _Music_Credits_sub_0x1f483
-	callchannel _Music_Credits_sub_0x1f4ed
-	callchannel _Music_Credits_sub_0x1f4f8
-	callchannel _Music_Credits_sub_0x1f559
-	forceoctave $00
-	octave3
-	note $ab
-	notetype $08, $a7
-	note $30
-	note $30
-	note $30
-	callchannel _Music_Credits_sub_0x1f582
-	octave3
-	note $c5
-	note $a5
-	note $a5
-	note $85
-	note $b5
-	note $b5
-	note $a5
-	octave4
-	note $25
-	callchannel _Music_Credits_sub_0x1f582
-	tempo $8f00
-	octave4
-	note $35
-	octave3
-	note $c5
-	note $85
-	octave4
-	note $35
-	tempo $9200
-	note $55
-	note $75
-	note $a5
-	octave5
-	note $25
-	notetype $0c, $a7
-	octave3
-	note $a0
-	octave4
-	note $30
-	loopchannel $06, $7407
-	notetype $08, $a7
-	note $80
-	note $00
-	note $80
-	note $00
-	note $90
-	note $00
-	tempo $9900
-	notetype $0c, $a7
-	octave3
-	note $10
-	note $50
-	note $80
-	octave4
-	note $10
-	octave3
-	note $50
-	note $80
-	octave4
-	note $10
-	note $50
-	octave3
-	note $80
-	octave4
-	note $10
-	note $50
-	note $80
-	notetype $08, $a7
-	note $10
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	notetype $0c, $a7
-	octave3
-	note $30
-	note $70
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $70
-	note $a0
-	octave4
-	note $30
-	note $50
-	note $70
-	note $00
-	note $70
-	note $00
-	notetype $08, $a7
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	tempo $a000
-	notetype $0c, $a7
-	octave2
-	note $80
-	note $02
-	note $50
-	note $02
-	notetype $08, $a7
-	octave1
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	note $20
-	note $00
-	notetype $0c, $a7
-	octave2
-	note $30
-	note $06
+	octave 5
+	note E_, 1
+	note C#, 1
+	octave 4
+	note A_, 1
+	note E_, 1
+	octave 5
+	note C#, 1
+	octave 4
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note C#, 0
+	note D_, 6
+	note E_, 6
+	octave 3
+	note __, 0
+	forceoctave $2
+	callchannel Music_Credits_branch_1f483
+	callchannel Music_Credits_branch_1f4ed
+	callchannel Music_Credits_branch_1f4f8
+	callchannel Music_Credits_branch_1f559
+	forceoctave $0
+	octave 3
+	note A_, 11
+	notetype $8, $a7
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	callchannel Music_Credits_branch_1f582
+	octave 3
+	note B_, 5
+	note A_, 5
+	note A_, 5
+	note G_, 5
+	note A#, 5
+	note A#, 5
+	note A_, 5
+	octave 4
+	note C#, 5
+	callchannel Music_Credits_branch_1f582
+	tempo 143
+	octave 4
+	note D_, 5
+	octave 3
+	note B_, 5
+	note G_, 5
+	octave 4
+	note D_, 5
+	tempo 146
+	note E_, 5
+	note F#, 5
+	note A_, 5
+	octave 5
+	note C#, 5
+	notetype $c, $a7
+
+Music_Credits_branch_1f407: ; 1f407
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	loopchannel 6, Music_Credits_branch_1f407
+	notetype $8, $a7
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	tempo 153
+	notetype $c, $a7
+	octave 3
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note E_, 0
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	notetype $8, $a7
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	notetype $c, $a7
+	octave 3
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F#, 0
+	note A_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	notetype $8, $a7
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	tempo 160
+	notetype $c, $a7
+	octave 2
+	note G_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	notetype $8, $a7
+	octave 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	notetype $c, $a7
+	octave 2
+	note D_, 0
+	note __, 6
 	intensity $c7
-	octave2
-	note $3f
+	octave 2
+	note D_, 15
 	intensity $b8
 	intensity $b7
-	note $0f
-	note $0f
-	note $0f
-	endchannel ; end
-; 0x1f483
+	note __, 15
+	note __, 15
+	note __, 15
+	endchannel
+; 1f483
 
-_Music_Credits_sub_0x1f483: ; 0x1f483
-; subroutine
-	note $1f
-	note $70
-	note $82
-	note $53
-	note $33
-	note $53
-	note $33
-	octave3
-	note $c1
-	note $01
-	note $b1
-	note $c1
-	note $01
-	note $b1
-	note $c3
-	note $83
-	note $03
-	octave4
-	note $33
-	note $03
-	note $53
-	octave3
-	note $b3
-	note $83
-	note $53
-	note $83
-	octave4
-	note $83
-	note $13
-	note $33
-	note $11
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $11
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $13
-	octave3
-	note $a3
-	note $03
-	octave4
-	note $13
-	octave3
-	note $97
-	note $63
-	note $16
-	note $90
-	note $a0
-	note $b6
-	note $93
-	note $03
-	octave4
-	note $13
-	octave3
-	note $83
-	note $53
-	note $13
-	note $53
-	note $83
-	octave4
-	note $13
-	octave5
-	note $30
-	note $00
-	octave4
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	octave5
-	note $30
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	octave6
-	note $10
-	note $00
-	endchannel ; end
-; 0x1f4ed
+Music_Credits_branch_1f483: ; 1f483
+	note C_, 15
+	note F#, 0
+	note G_, 2
+	note E_, 3
+	note D_, 3
+	note E_, 3
+	note D_, 3
+	octave 3
+	note B_, 1
+	note __, 1
+	note A#, 1
+	note B_, 1
+	note __, 1
+	note A#, 1
+	note B_, 3
+	note G_, 3
+	note __, 3
+	octave 4
+	note D_, 3
+	note __, 3
+	note E_, 3
+	octave 3
+	note A#, 3
+	note G_, 3
+	note E_, 3
+	note G_, 3
+	octave 4
+	note G_, 3
+	note C_, 3
+	note D_, 3
+	note C_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A_, 3
+	note __, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note G#, 7
+	note F_, 3
+	note C_, 6
+	note G#, 0
+	note A_, 0
+	note A#, 6
+	note G#, 3
+	note __, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 3
+	note E_, 3
+	note C_, 3
+	note E_, 3
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 6
+	note C_, 0
+	note __, 0
+	endchannel
+; 1f4ed
 
-_Music_Credits_sub_0x1f4ed: ; 0x1f4ed
-; subroutine
-	octave4
-	note $13
-	octave3
-	note $33
-	note $83
-	note $c7
-	octave4
-	note $33
-	note $13
-	note $43
-	endchannel ; end
-; 0x1f4f8
+Music_Credits_branch_1f4ed: ; 1f4ed
+	octave 4
+	note C_, 3
+	octave 3
+	note D_, 3
+	note G_, 3
+	note B_, 7
+	octave 4
+	note D_, 3
+	note C_, 3
+	note D#, 3
+	endchannel
+; 1f4f8
 
-_Music_Credits_sub_0x1f4f8: ; 0x1f4f8
-; subroutine
-	octave3
-	note $a1
-	octave4
-	note $51
-	note $11
-	note $51
-	note $31
-	note $51
-	note $11
-	note $51
-	octave3
-	note $a1
-	octave4
-	note $51
-	note $31
-	note $51
-	note $a3
-	note $c1
-	octave5
-	note $11
-	octave4
-	note $c1
-	note $81
-	note $61
-	note $31
-	note $81
-	note $61
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $61
-	note $31
-	octave3
-	note $c1
-	note $81
-	note $c1
-	octave4
-	note $31
-	note $61
-	note $71
-	octave3
-	note $81
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $11
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	octave3
-	note $81
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	note $83
-	note $a1
-	note $c1
-	octave3
-	note $a3
-	octave4
-	note $13
-	note $53
-	octave3
-	note $97
-	octave4
-	note $17
-	note $53
-	octave3
-	note $a1
-	octave4
-	note $61
-	note $11
-	note $61
-	note $31
-	note $61
-	note $11
-	note $61
-	octave3
-	note $a1
-	octave4
-	note $61
-	note $11
-	note $61
-	note $51
-	note $61
-	note $11
-	note $61
-	endchannel ; end
-; 0x1f559
+Music_Credits_branch_1f4f8: ; 1f4f8
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 3
+	note B_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	note F#, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note G_, 3
+	note A_, 1
+	note B_, 1
+	octave 3
+	note A_, 3
+	octave 4
+	note C_, 3
+	note E_, 3
+	octave 3
+	note G#, 7
+	octave 4
+	note C_, 7
+	note E_, 3
+	octave 3
+	note A_, 1
+	octave 4
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	endchannel
+; 1f559
 
-_Music_Credits_sub_0x1f559: ; 0x1f559
-; subroutine
-	octave3
-	note $a1
-	octave4
-	note $71
-	note $11
-	note $71
-	note $31
-	note $71
-	note $11
-	note $71
-	note $51
-	note $71
-	note $11
-	note $71
-	octave3
-	note $a1
-	octave4
-	note $71
-	note $11
-	note $71
-	note $11
-	note $81
-	note $31
-	note $81
-	note $61
-	note $81
-	note $31
-	note $81
-	note $61
-	note $81
-	note $31
-	note $81
-	note $11
-	note $81
-	note $31
-	note $81
-	octave3
-	note $cb
-	note $b1
-	note $a1
-	endchannel ; end
-; 0x1f582
+Music_Credits_branch_1f559: ; 1f559
+	octave 3
+	note A_, 1
+	octave 4
+	note F#, 1
+	note C_, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note C_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note C_, 1
+	note F#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note F#, 1
+	note C_, 1
+	note F#, 1
+	note C_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note B_, 11
+	note A#, 1
+	note A_, 1
+	endchannel
+; 1f582
 
-_Music_Credits_sub_0x1f582: ; 0x1f582
-; subroutine
-	note $05
-	octave3
-	note $35
-	note $55
-	note $65
-	note $75
-	note $a5
-	octave4
-	note $75
-	note $25
-	endchannel ; end
-; 0x1f58d
+Music_Credits_branch_1f582: ; 1f582
+	note __, 5
+	octave 3
+	note D_, 5
+	note E_, 5
+	note F_, 5
+	note F#, 5
+	note A_, 5
+	octave 4
+	note F#, 5
+	note C#, 5
+	endchannel
 
-_Music_Credits_Ch2: ; 0x1f58d
-	dutycycle $01
+Music_Credits_Ch2: ; 1f58d
+	dutycycle $1
 	vibrato $14, $23
-	notetype $0c, $2f
+	notetype $c, $2f
 	stereopanning $f0
-	octave4
-	note $8f
+	octave 4
+	note G_, 15
 	intensity $c7
-	octave5
-	note $87
-	octave3
-	note $83
-	note $63
-	notetype $06, $c7
-	callchannel _Music_Credits_sub_0x1f6cb
-	octave1
-	note $81
-	note $01
-	octave2
-	note $81
-	note $01
-	note $71
-	note $81
-	note $01
-	octave3
-	note $11
-	octave2
-	note $81
-	note $01
-	note $81
-	note $01
-	note $81
+	octave 5
+	note G_, 7
+	octave 3
+	note G_, 3
+	note F_, 3
+	notetype $6, $c7
+	callchannel Music_Credits_branch_1f6cb
+	octave 1
+	note G_, 1
+	note __, 1
+	octave 2
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
 	intensity $97
-	note $70
-	note $60
-	note $50
-	note $40
-	note $30
-	note $20
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
 	intensity $c7
-	callchannel _Music_Credits_sub_0x1f6cb
-	callchannel _Music_Credits_sub_0x1f73f
-	callchannel _Music_Credits_sub_0x1f748
-	octave4
-	note $c0
-	octave5
-	note $1a
-	octave4
-	note $c7
-	note $a7
-	note $c3
-	note $70
-	note $8e
-	notetype $0c, $c7
-	octave5
-	note $5e
-	notetype $06, $c7
-	note $80
-	note $90
-	note $a1
-	note $51
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $51
-	note $11
-	octave4
-	note $a1
-	note $51
-	callchannel _Music_Credits_sub_0x1f748
-	octave4
-	note $c0
-	octave5
-	note $1a
-	octave4
-	note $c7
-	octave5
-	note $1b
-	notetype $0c, $c7
-	note $3f
-	note $87
-	octave3
-	note $83
-	note $63
-	octave5
-	note $a0
-	note $50
-	note $20
-	octave4
-	note $a0
-	octave5
-	note $50
-	note $20
-	octave4
-	note $a0
-	note $50
-	octave3
-	note $a3
-	note $83
-	notetype $06, $c7
-	forceoctave $02
-	callchannel _Music_Credits_sub_0x1f6cb
-	callchannel _Music_Credits_sub_0x1f73f
-	callchannel _Music_Credits_sub_0x1f748
-	forceoctave $00
-	octave5
-	note $20
-	note $3a
-	note $27
-	note $3b
-	notetype $0c, $c7
-	note $5f
-	note $ad
-	notetype $08, $c7
-	octave2
-	note $30
-	note $30
-	note $30
-	note $35
-	octave3
-	note $75
-	note $85
-	note $95
-	note $a5
-	octave4
-	note $25
-	note $a5
-	note $85
-	note $85
-	note $75
-	note $75
-	note $55
-	note $55
-	note $35
-	note $25
-	note $55
-	octave1
-	note $32
-	note $02
-	note $32
-	note $02
-	note $32
-	note $02
-	note $32
-	note $02
-	note $72
-	note $02
-	note $72
-	note $02
-	note $72
-	notetype $0c, $c7
-	octave2
-	note $70
-	note $00
-	octave1
-	note $71
-	octave2
-	note $70
-	note $00
-	octave1
-	note $81
-	octave2
-	note $80
-	note $00
-	loopchannel $04, $7657
-	octave1
-	note $a0
-	octave2
-	note $a0
-	note $50
-	note $a0
-	octave1
-	note $a0
-	octave2
-	note $a0
-	note $50
-	note $a0
-	octave1
-	note $a0
-	octave3
-	note $20
-	note $50
-	note $80
-	note $50
-	note $80
-	note $a0
-	octave4
-	note $20
-	octave5
-	note $3b
-	notetype $08, $c7
-	note $10
-	note $00
-	note $10
-	note $00
-	note $20
-	note $00
-	notetype $0c, $c7
-	note $3b
-	notetype $08, $c7
-	note $10
-	note $00
-	note $10
-	note $00
-	note $20
-	note $00
-	note $38
-	notetype $0c, $c7
-	octave4
-	note $70
-	note $a0
-	octave5
-	note $30
-	note $00
-	note $30
-	note $00
-	notetype $08, $c7
-	note $30
-	note $00
-	note $30
-	note $00
-	note $30
-	note $00
-	notetype $0c, $c7
-	note $10
-	note $02
-	note $10
-	note $02
-	notetype $08, $c7
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $20
-	note $00
-	notetype $0c, $c7
-	note $30
-	note $06
+	callchannel Music_Credits_branch_1f6cb
+	callchannel Music_Credits_branch_1f73f
+	callchannel Music_Credits_branch_1f748
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 10
+	octave 4
+	note B_, 7
+	note A_, 7
+	note B_, 3
+	note F#, 0
+	note G_, 14
+	notetype $c, $c7
+	octave 5
+	note E_, 14
+	notetype $6, $c7
+	note G_, 0
+	note G#, 0
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note E_, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	note E_, 1
+	callchannel Music_Credits_branch_1f748
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 10
+	octave 4
+	note B_, 7
+	octave 5
+	note C_, 11
+	notetype $c, $c7
+	note D_, 15
+	note G_, 7
+	octave 3
+	note G_, 3
+	note F_, 3
+	octave 5
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	octave 4
+	note A_, 0
+	octave 5
+	note E_, 0
+	note C#, 0
+	octave 4
+	note A_, 0
+	note E_, 0
+	octave 3
+	note A_, 3
+	note G_, 3
+	notetype $6, $c7
+	forceoctave $2
+	callchannel Music_Credits_branch_1f6cb
+	callchannel Music_Credits_branch_1f73f
+	callchannel Music_Credits_branch_1f748
+	forceoctave $0
+	octave 5
+	note C#, 0
+	note D_, 10
+	note C#, 7
+	note D_, 11
+	notetype $c, $c7
+	note E_, 15
+	note A_, 13
+	notetype $8, $c7
+	octave 2
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 5
+	octave 3
+	note F#, 5
+	note G_, 5
+	note G#, 5
+	note A_, 5
+	octave 4
+	note C#, 5
+	note A_, 5
+	note G_, 5
+	note G_, 5
+	note F#, 5
+	note F#, 5
+	note E_, 5
+	note E_, 5
+	note D_, 5
+	note C#, 5
+	note E_, 5
+	octave 1
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	notetype $c, $c7
+	octave 2
+	note F#, 0
+	note __, 0
+	octave 1
+	note F#, 1
+	octave 2
+	note F#, 0
+	note __, 0
+
+Music_Credits_branch_1f657: ; 1f657
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	loopchannel 4, Music_Credits_branch_1f657
+	octave 1
+	note A_, 0
+	octave 2
+	note A_, 0
+	note E_, 0
+	note A_, 0
+	octave 1
+	note A_, 0
+	octave 2
+	note A_, 0
+	note E_, 0
+	note A_, 0
+	octave 1
+	note A_, 0
+	octave 3
+	note C#, 0
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note G_, 0
+	note A_, 0
+	octave 4
+	note C#, 0
+	octave 5
+	note D_, 11
+	notetype $8, $c7
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	notetype $c, $c7
+	note D_, 11
+	notetype $8, $c7
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note D_, 8
+	notetype $c, $c7
+	octave 4
+	note F#, 0
+	note A_, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	notetype $8, $c7
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	notetype $c, $c7
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 2
+	notetype $8, $c7
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	notetype $c, $c7
+	note D_, 0
+	note __, 6
 	intensity $c8
 	intensity $c7
-	octave1
-	note $3f
+	octave 1
+	note D_, 15
 	intensity $c7
-	note $0f
-	note $0f
-	note $0f
-	endchannel ; end
-; 0x1f6cb
+	note __, 15
+	note __, 15
+	note __, 15
+	endchannel
+; 1f6cb
 
-_Music_Credits_sub_0x1f6cb: ; 0x1f6cb
-; subroutine
-	octave2
-	note $13
+Music_Credits_branch_1f6cb: ; 1f6cb
+	octave 2
+	note C_, 3
 	intensity $b1
-	octave5
-	note $80
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $81
-	note $01
+	octave 5
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 1
+	note __, 1
 	intensity $c7
-	octave2
-	note $10
-	note $00
-	note $13
-	note $0b
-	octave1
-	note $c3
-	note $09
-	note $c0
-	note $00
-	note $c1
-	note $01
-	note $c1
-	note $01
-	octave2
-	note $81
-	octave1
-	note $c5
-	note $b3
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 3
+	note __, 11
+	octave 1
+	note B_, 3
+	note __, 9
+	note B_, 0
+	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	octave 2
+	note G_, 1
+	octave 1
+	note B_, 5
+	note A#, 3
 	intensity $b1
-	octave5
-	note $50
-	note $00
-	note $50
-	note $00
-	note $40
-	note $00
-	note $51
-	note $01
+	octave 5
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note E_, 1
+	note __, 1
 	intensity $c7
-	octave1
-	note $b0
-	note $00
-	note $b3
-	note $0b
-	note $a3
-	note $09
-	note $a0
-	note $00
-	note $a1
-	note $01
-	note $a1
-	note $01
-	octave2
-	note $61
-	octave1
-	note $a5
-	note $93
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 3
+	note __, 11
+	note A_, 3
+	note __, 9
+	note A_, 0
+	note __, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 2
+	note F_, 1
+	octave 1
+	note A_, 5
+	note G#, 3
 	intensity $b1
-	octave5
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $c0
-	note $00
-	octave5
-	note $11
-	note $01
+	octave 5
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 5
+	note C_, 1
+	note __, 1
 	intensity $c7
-	octave1
-	note $90
-	note $00
-	note $93
-	note $0b
-	note $83
-	note $09
-	note $80
-	note $00
-	note $81
-	note $01
-	note $81
-	note $01
-	octave2
-	note $51
-	octave1
-	note $85
-	note $73
-	note $01
-	note $71
-	note $71
-	octave2
-	note $31
-	octave1
-	note $73
-	note $a1
-	octave2
-	note $31
-	note $71
-	note $a1
-	note $31
-	note $71
-	note $a1
-	octave3
-	note $11
-	endchannel ; end
-; 0x1f73f
+	octave 1
+	note G#, 0
+	note __, 0
+	note G#, 3
+	note __, 11
+	note G_, 3
+	note __, 9
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note G_, 5
+	note F#, 3
+	note __, 1
+	note F#, 1
+	note F#, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note F#, 3
+	note A_, 1
+	octave 2
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	endchannel
+; 1f73f
 
-_Music_Credits_sub_0x1f73f: ; 0x1f73f
-; subroutine
-	octave1
-	note $83
-	note $03
-	note $81
-	note $01
-	octave2
-	note $8b
-	note $77
-	endchannel ; end
-; 0x1f748
+Music_Credits_branch_1f73f: ; 1f73f
+	octave 1
+	note G_, 3
+	note __, 3
+	note G_, 1
+	note __, 1
+	octave 2
+	note G_, 11
+	note F#, 7
+	endchannel
+; 1f748
 
-_Music_Credits_sub_0x1f748: ; 0x1f748
-; subroutine
-	octave4
-	note $a7
-	note $c7
-	octave5
-	note $17
-	note $57
-	notetype $0c, $c7
-	note $3f
-	octave4
-	note $83
-	note $a3
-	note $c3
-	octave5
-	note $33
-	note $19
-	notetype $06, $c7
-	octave4
-	note $c0
-	octave5
-	note $12
-	octave4
-	note $c3
-	octave5
-	note $13
-	notetype $0c, $c7
-	octave4
-	note $a9
-	notetype $06, $c7
-	note $90
-	note $a2
-	note $c3
-	octave5
-	note $13
-	endchannel ; end
-; 0x1f772
+Music_Credits_branch_1f748: ; 1f748
+	octave 4
+	note A_, 7
+	note B_, 7
+	octave 5
+	note C_, 7
+	note E_, 7
+	notetype $c, $c7
+	note D_, 15
+	octave 4
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	octave 5
+	note D_, 3
+	note C_, 9
+	notetype $6, $c7
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 3
+	octave 5
+	note C_, 3
+	notetype $c, $c7
+	octave 4
+	note A_, 9
+	notetype $6, $c7
+	note G#, 0
+	note A_, 2
+	note B_, 3
+	octave 5
+	note C_, 3
+	endchannel
 
-_Music_Credits_Ch3: ; 0x1f772
+Music_Credits_Ch3: ; 1f772
 	vibrato $16, $23
-	notetype $0c, $34
+	notetype $c, $34
 	stereopanning $ff
-	octave6
-	note $80
-	note $30
-	note $10
-	octave5
-	note $80
-	octave6
-	note $80
-	note $30
-	note $10
-	octave5
-	note $80
+	octave 6
+	note G_, 0
+	note D_, 0
+	note C_, 0
+	octave 5
+	note G_, 0
+	octave 6
+	note G_, 0
+	note D_, 0
+	note C_, 0
+	octave 5
+	note G_, 0
 	intensity $24
-	octave6
-	note $80
-	note $30
-	note $10
-	octave5
-	note $80
+	octave 6
+	note G_, 0
+	note D_, 0
+	note C_, 0
+	octave 5
+	note G_, 0
 	intensity $14
-	octave6
-	note $80
-	note $30
-	note $10
-	octave5
-	note $80
-	octave6
-	note $80
-	note $30
-	octave5
-	note $c0
-	note $80
-	octave6
-	note $30
-	octave5
-	note $c0
-	note $80
-	note $30
-	notetype $06, $14
-	note $40
-	note $56
-	note $67
-	callchannel _Music_Credits_sub_0x1f8aa
-	octave4
-	note $80
-	note $00
-	octave5
-	note $80
-	note $00
-	note $70
-	note $80
-	note $00
-	note $70
-	note $80
-	notetype $06, $14
+	octave 6
+	note G_, 0
+	note D_, 0
+	note C_, 0
+	octave 5
+	note G_, 0
+	octave 6
+	note G_, 0
+	note D_, 0
+	octave 5
+	note B_, 0
+	note G_, 0
+	octave 6
+	note D_, 0
+	octave 5
+	note B_, 0
+	note G_, 0
+	note D_, 0
+	notetype $6, $14
+	note D#, 0
+	note E_, 6
+	note F_, 7
+	callchannel Music_Credits_branch_1f8aa
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 5
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note G_, 0
+	notetype $6, $14
 	intensity $24
-	note $60
-	note $50
+	note F_, 0
+	note E_, 0
 	intensity $14
-	note $53
-	note $03
-	note $63
-	callchannel _Music_Credits_sub_0x1f8aa
-	callchannel _Music_Credits_sub_0x1f8db
-	callchannel _Music_Credits_sub_0x1f8e7
-	callchannel _Music_Credits_sub_0x1f934
-	octave2
-	note $83
-	note $01
-	note $80
-	note $00
-	note $81
-	octave3
-	note $81
-	note $01
-	octave2
-	note $80
-	note $00
-	note $81
-	octave3
-	note $81
-	octave2
-	note $83
-	note $c1
-	octave3
-	note $31
-	note $71
-	note $81
-	octave2
-	note $53
-	note $01
-	note $50
-	note $00
-	note $51
-	octave3
-	note $51
-	note $01
-	octave2
-	note $50
-	note $00
-	note $51
-	octave3
-	note $51
-	octave2
-	note $53
-	note $91
-	note $c1
-	octave3
-	note $41
-	note $51
-	octave2
-	note $a3
-	octave3
-	note $51
-	note $01
-	octave2
-	note $91
-	octave3
-	note $51
-	note $01
-	octave2
-	note $91
-	note $81
-	octave3
-	note $51
-	note $01
-	octave2
-	note $81
-	note $73
-	octave3
-	note $53
-	callchannel _Music_Credits_sub_0x1f8e7
-	callchannel _Music_Credits_sub_0x1f934
-	callchannel _Music_Credits_sub_0x1f94b
-	octave5
-	note $40
-	note $56
-	note $67
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $51
-	note $01
-	note $a1
-	note $01
-	octave4
-	note $21
-	note $01
-	octave5
-	note $60
-	note $76
-	note $87
-	forceoctave $02
-	callchannel _Music_Credits_sub_0x1f8aa
-	callchannel _Music_Credits_sub_0x1f8db
+	note E_, 3
+	note __, 3
+	note F_, 3
+	callchannel Music_Credits_branch_1f8aa
+	callchannel Music_Credits_branch_1f8db
+	callchannel Music_Credits_branch_1f8e7
+	callchannel Music_Credits_branch_1f934
+	octave 2
+	note G_, 3
+	note __, 1
+	note G_, 0
+	note __, 0
+	note G_, 1
+	octave 3
+	note G_, 1
+	note __, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 1
+	octave 3
+	note G_, 1
+	octave 2
+	note G_, 3
+	note B_, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note G_, 1
+	octave 2
+	note E_, 3
+	note __, 1
+	note E_, 0
+	note __, 0
+	note E_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note E_, 0
+	note __, 0
+	note E_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note E_, 3
+	note G#, 1
+	note B_, 1
+	octave 3
+	note D#, 1
+	note E_, 1
+	octave 2
+	note A_, 3
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note G_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note G_, 1
+	note F#, 3
+	octave 3
+	note E_, 3
+	callchannel Music_Credits_branch_1f8e7
+	callchannel Music_Credits_branch_1f934
+	callchannel Music_Credits_branch_1f94b
+	octave 5
+	note D#, 0
+	note E_, 6
+	note F_, 7
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	note __, 1
+	octave 5
+	note F_, 0
+	note F#, 6
+	note G_, 7
+	forceoctave $2
+	callchannel Music_Credits_branch_1f8aa
+	callchannel Music_Credits_branch_1f8db
 	forceoctave $12
-	callchannel _Music_Credits_sub_0x1f8e7
-	forceoctave $02
-	callchannel _Music_Credits_sub_0x1f934
-	callchannel _Music_Credits_sub_0x1f94b
-	forceoctave $00
-	octave6
-	note $21
-	octave5
-	note $a1
-	note $51
-	note $21
-	note $a1
-	note $51
-	notetype $08, $14
-	octave2
-	note $30
-	note $30
-	note $30
-	notetype $0c, $14
-	note $3f
-	note $7f
-	note $8f
-	note $87
-	note $a7
-	note $03
-	octave4
-	note $73
-	note $83
-	note $93
-	note $a3
-	octave5
-	note $23
-	note $a3
-	note $83
-	note $83
-	note $73
-	note $53
-	note $83
-	note $a3
-	note $c3
-	octave6
-	note $23
-	note $53
+	callchannel Music_Credits_branch_1f8e7
+	forceoctave $2
+	callchannel Music_Credits_branch_1f934
+	callchannel Music_Credits_branch_1f94b
+	forceoctave $0
+	octave 6
+	note C#, 1
+	octave 5
+	note A_, 1
+	note E_, 1
+	note C#, 1
+	note A_, 1
+	note E_, 1
+	notetype $8, $14
+	octave 2
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	notetype $c, $14
+	note D_, 15
+	note F#, 15
+	note G_, 15
+	note G_, 7
+	note A_, 7
+	note __, 3
+	octave 4
+	note F#, 3
+	note G_, 3
+	note G#, 3
+	note A_, 3
+	octave 5
+	note C#, 3
+	note A_, 3
+	note G_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	octave 6
+	note C#, 3
+	note E_, 3
 	intensity $15
-	octave4
-	note $35
-	note $71
-	note $a7
-	note $55
-	note $81
-	octave5
-	note $15
-	octave4
-	note $c0
-	note $b0
-	note $a7
+	octave 4
+	note D_, 5
+	note F#, 1
+	note A_, 7
+	note E_, 5
+	note G_, 1
+	octave 5
+	note C_, 5
+	octave 4
+	note B_, 0
+	note A#, 0
+	note A_, 7
 	intensity $14
-	octave2
-	note $a0
-	note $00
-	note $a0
-	note $00
-	notetype $08, $14
-	octave3
-	note $70
-	note $00
-	note $70
-	note $00
-	note $70
-	note $00
-	notetype $0c, $14
-	octave5
-	note $80
-	note $02
-	note $50
-	note $02
-	notetype $08, $14
-	note $50
-	note $00
-	note $50
-	note $00
-	note $50
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $90
-	note $00
-	notetype $0c, $14
-	note $a0
-	note $0f
-	note $0f
-	note $0f
-	endchannel ; end
-; 0x1f8aa
+	octave 2
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	notetype $8, $14
+	octave 3
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	notetype $c, $14
+	octave 5
+	note G_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	notetype $8, $14
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	notetype $c, $14
+	note A_, 0
+	note __, 15
+	note __, 15
+	note __, 15
+	endchannel
+; 1f8aa
 
-_Music_Credits_sub_0x1f8aa: ; 0x1f8aa
-; subroutine
-	note $8f
-	octave6
-	note $20
-	note $32
-	note $13
-	octave5
-	note $c3
-	octave6
-	note $13
-	notetype $0c, $14
-	octave5
-	note $89
-	note $51
-	note $01
-	note $61
-	note $89
-	notetype $06, $14
-	note $90
-	note $a6
-	note $53
-	note $8b
-	note $67
-	note $33
-	note $03
-	note $53
-	notetype $0c, $14
-	note $69
-	notetype $06, $14
-	note $70
-	note $86
-	note $63
-	note $53
-	note $43
-	note $53
-	note $cb
-	note $a7
-	notetype $0c, $14
-	note $3f
-	endchannel ; end
-; 0x1f8db
+Music_Credits_branch_1f8aa: ; 1f8aa
+	note G_, 15
+	octave 6
+	note C#, 0
+	note D_, 2
+	note C_, 3
+	octave 5
+	note B_, 3
+	octave 6
+	note C_, 3
+	notetype $c, $14
+	octave 5
+	note G_, 9
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note G_, 9
+	notetype $6, $14
+	note G#, 0
+	note A_, 6
+	note E_, 3
+	note G_, 11
+	note F_, 7
+	note D_, 3
+	note __, 3
+	note E_, 3
+	notetype $c, $14
+	note F_, 9
+	notetype $6, $14
+	note F#, 0
+	note G_, 6
+	note F_, 3
+	note E_, 3
+	note D#, 3
+	note E_, 3
+	note B_, 11
+	note A_, 7
+	notetype $c, $14
+	note D_, 15
+	endchannel
+; 1f8db
 
-_Music_Credits_sub_0x1f8db: ; 0x1f8db
-; subroutine
-	notetype $06, $14
-	note $70
-	note $82
-	octave4
-	note $83
-	octave5
-	note $33
-	note $8b
-	note $97
-	endchannel ; end
-; 0x1f8e7
+Music_Credits_branch_1f8db: ; 1f8db
+	notetype $6, $14
+	note F#, 0
+	note G_, 2
+	octave 4
+	note G_, 3
+	octave 5
+	note D_, 3
+	note G_, 11
+	note G#, 7
+	endchannel
+; 1f8e7
 
-_Music_Credits_sub_0x1f8e7: ; 0x1f8e7
-; subroutine
-	octave3
-	note $63
-	note $01
-	note $61
-	note $01
-	octave4
-	note $11
-	octave3
-	note $a1
-	note $61
-	octave4
-	note $11
-	note $01
-	note $11
-	note $01
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $63
-	note $83
-	note $01
-	note $81
-	note $01
-	octave4
-	note $31
-	octave3
-	note $c1
-	note $81
-	octave4
-	note $31
-	note $01
-	note $31
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $31
-	octave3
-	note $83
-	note $53
-	note $01
-	note $51
-	note $01
-	note $c1
-	note $81
-	note $51
-	note $c1
-	note $01
-	note $c1
-	note $01
-	note $81
-	note $c1
-	note $53
-	note $a3
-	note $01
-	note $a1
-	note $01
-	octave4
-	note $51
-	note $11
-	octave3
-	note $91
-	octave4
-	note $11
-	octave3
-	note $91
-	note $01
-	note $91
-	octave4
-	note $11
-	note $51
-	note $11
-	octave3
-	note $91
-	endchannel ; end
-; 0x1f934
+Music_Credits_branch_1f8e7: ; 1f8e7
+	octave 3
+	note F_, 3
+	note __, 1
+	note F_, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note F_, 3
+	note G_, 3
+	note __, 1
+	note G_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note G_, 3
+	note E_, 3
+	note __, 1
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note G_, 1
+	note E_, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note G_, 1
+	note B_, 1
+	note E_, 3
+	note A_, 3
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 1
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	octave 3
+	note G#, 1
+	endchannel
+; 1f934
 
-_Music_Credits_sub_0x1f934: ; 0x1f934
-; subroutine
-	octave2
-	note $63
-	note $01
-	note $60
-	note $00
-	note $61
-	octave3
-	note $61
-	note $01
-	octave2
-	note $60
-	note $00
-	note $61
-	octave3
-	note $61
-	octave2
-	note $63
-	note $a1
-	octave3
-	note $11
-	note $51
-	note $61
-	endchannel ; end
-; 0x1f94b
+Music_Credits_branch_1f934: ; 1f934
+	octave 2
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note F_, 1
+	octave 3
+	note F_, 1
+	octave 2
+	note F_, 3
+	note A_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	endchannel
+; 1f94b
 
-_Music_Credits_sub_0x1f94b: ; 0x1f94b
-; subroutine
-	octave2
-	note $73
-	note $01
-	note $70
-	note $00
-	note $71
-	octave3
-	note $71
-	note $01
-	octave2
-	note $70
-	note $00
-	note $71
-	octave3
-	note $71
-	octave2
-	note $73
-	note $a1
-	octave3
-	note $11
-	note $61
-	note $71
-	note $87
-	octave4
-	note $17
-	note $37
-	note $67
-	octave6
-	note $81
-	note $31
-	octave5
-	note $c1
-	note $81
-	octave6
-	note $31
-	octave5
-	note $c1
-	note $81
-	note $31
-	endchannel ; end
-; 0x1f973
+Music_Credits_branch_1f94b: ; 1f94b
+	octave 2
+	note F#, 3
+	note __, 1
+	note F#, 0
+	note __, 0
+	note F#, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	octave 2
+	note F#, 0
+	note __, 0
+	note F#, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note F#, 3
+	note A_, 1
+	octave 3
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 7
+	octave 4
+	note C_, 7
+	note D_, 7
+	note F_, 7
+	octave 6
+	note G_, 1
+	note D_, 1
+	octave 5
+	note B_, 1
+	note G_, 1
+	octave 6
+	note D_, 1
+	octave 5
+	note B_, 1
+	note G_, 1
+	note D_, 1
+	endchannel
 
-_Music_Credits_Ch4: ; 0x1f973
-	togglenoise $03
-	notetype $0c
-	note $90
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $90
-	note $80
-	note $c1
-	note $90
-	note $80
-	note $90
-	note $80
-	note $b3
-	note $b3
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa6d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa6d
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $71
-	loopchannel $07, $79a8
-	note $90
-	note $80
-	note $30
-	note $80
-	note $80
-	note $30
-	note $71
-	note $30
-	note $80
-	note $30
-	note $80
-	note $20
-	note $20
-	note $30
-	note $30
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $71
-	loopchannel $07, $79c6
-	note $90
-	note $80
-	note $71
-	note $80
-	note $80
-	note $80
-	note $80
-	note $b3
-	note $23
-	note $90
-	note $80
-	note $c1
-	note $90
-	note $80
-	note $c1
-	note $b3
-	note $b3
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa4d
-	callchannel _Music_Credits_sub_0x1fa6d
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $71
-	loopchannel $07, $79f2
-	note $90
-	note $80
-	note $71
-	note $80
-	note $80
-	note $80
-	note $86
-	notetype $08
-	note $b0
-	note $b0
-	note $b0
-	notetype $0c
-	note $cf
-	note $0f
-	note $ce
-	note $00
-	note $c7
-	note $c7
-	note $cf
-	note $0f
-	note $cf
-	note $c7
-	note $c5
-	note $30
-	note $30
-	note $cb
-	notetype $08
-	note $31
-	note $31
-	note $31
-	notetype $0c
-	note $cb
-	notetype $08
-	note $31
-	note $31
-	note $31
-	note $cb
-	notetype $0c
-	note $30
-	note $00
-	note $30
-	note $00
-	notetype $08
-	note $21
-	note $21
-	note $31
-	notetype $0c
-	note $30
-	note $02
-	note $30
-	note $02
-	notetype $08
-	note $21
-	note $21
-	note $21
-	note $31
-	note $31
-	note $31
-	notetype $0c
-	note $30
-	note $06
-	note $b7
-	note $0f
-	note $0f
-	note $0f
-	endchannel ; end
-; 0x1fa4d
+Music_Credits_Ch4: ; 1f973
+	togglenoise $3
+	notetype $c
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note B_, 1
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note A#, 3
+	note A#, 3
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa6d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa6d
 
-_Music_Credits_sub_0x1fa4d: ; 0x1fa4d
-; subroutine
-	note $90
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $30
-	note $80
-	note $80
-	note $80
-	note $90
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $30
-	note $80
-	note $71
-	endchannel ; end
-; 0x1fa6d
+Music_Credits_branch_1f9a8: ; 1f9a8
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note F#, 1
+	loopchannel 7, Music_Credits_branch_1f9a8
+	note G#, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note F#, 1
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note D_, 0
 
-_Music_Credits_sub_0x1fa6d: ; 0x1fa6d
-; subroutine
-	note $90
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $30
-	note $80
-	note $30
-	note $80
-	note $90
-	note $80
-	note $30
-	note $80
-	note $90
-	note $30
-	note $71
-	note $30
-	note $80
-	note $30
-	note $80
-	note $30
-	note $30
-	note $b0
-	note $30
-	endchannel ; end
-; 0x1fa8d
+Music_Credits_branch_1f9c6: ; 1f9c6
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note F#, 1
+	loopchannel 7, Music_Credits_branch_1f9c6
+	note G#, 0
+	note G_, 0
+	note F#, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note A#, 3
+	note C#, 3
+	note G#, 0
+	note G_, 0
+	note B_, 1
+	note G#, 0
+	note G_, 0
+	note B_, 1
+	note A#, 3
+	note A#, 3
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa4d
+	callchannel Music_Credits_branch_1fa6d
+
+Music_Credits_branch_1f9f2: ; 1f9f2
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note F#, 1
+	loopchannel 7, Music_Credits_branch_1f9f2
+	note G#, 0
+	note G_, 0
+	note F#, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 6
+	notetype $8
+	note A#, 0
+	note A#, 0
+	note A#, 0
+	notetype $c
+	note B_, 15
+	note __, 15
+	note B_, 14
+	note __, 0
+	note B_, 7
+	note B_, 7
+	note B_, 15
+	note __, 15
+	note B_, 15
+	note B_, 7
+	note B_, 5
+	note D_, 0
+	note D_, 0
+	note B_, 11
+	notetype $8
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	notetype $c
+	note B_, 11
+	notetype $8
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note B_, 11
+	notetype $c
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	notetype $8
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	notetype $c
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 2
+	notetype $8
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	notetype $c
+	note D_, 0
+	note __, 6
+	note A#, 7
+	note __, 15
+	note __, 15
+	note __, 15
+	endchannel
+; 1fa4d
+
+Music_Credits_branch_1fa4d: ; 1fa4d
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note F#, 1
+	endchannel
+; 1fa6d
+
+Music_Credits_branch_1fa6d: ; 1fa6d
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note G#, 0
+	note D_, 0
+	note F#, 1
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note D_, 0
+	note A#, 0
+	note D_, 0
+	endchannel
+; 1fa8d
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -1,368 +1,362 @@
-_Music_CrystalOpening: ; 0x1786e8
-	db $c0
-	dw _Music_CrystalOpening_Ch1
-	db $01
-	dw _Music_CrystalOpening_Ch2
-	db $02
-	dw _Music_CrystalOpening_Ch3
-	db $03
-	dw _Music_CrystalOpening_Ch4
-; 0x1786f4
+Music_CrystalOpening: ; 1786e8
+	dbw $c0, Music_CrystalOpening_Ch1
+	dbw $01, Music_CrystalOpening_Ch2
+	dbw $02, Music_CrystalOpening_Ch3
+	dbw $03, Music_CrystalOpening_Ch4
+; 1786f4
 
-_Music_CrystalOpening_Ch1: ; 0x1786f4
-	tempo $8800
+
+Music_CrystalOpening_Ch1: ; 1786f4
+	tempo 136
 	volume $77
-	tone $0200
+	tone $0002
 	vibrato $10, $34
-	dutycycle $03
+	dutycycle $3
 	stereopanning $f0
-	notetype $0c, $92
-	octave2
-	note $71
-	note $73
-	note $71
-	note $71
-	note $73
-	note $71
-	note $71
-	note $73
-	note $71
-	note $71
-	note $75
-	notetype $0c, $b4
-	octave2
-	note $c1
-	note $71
-	note $51
-	note $c1
-	octave3
-	note $21
-	octave2
-	note $91
-	note $71
-	octave3
-	note $21
-	octave2
-	note $71
-	note $21
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave3
-	note $71
-	octave2
-	note $71
-	note $c1
-	octave3
-	note $51
-	note $71
-	note $51
-	octave2
-	note $c1
-	note $71
-	note $c1
-	octave3
-	note $51
-	note $71
-	note $51
-	octave2
-	note $c1
-	note $71
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $37
-	octave3
-	note $31
-	octave2
-	note $a1
-	note $81
-	octave3
-	note $31
-	note $51
-	octave2
-	note $c1
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	note $51
-	note $31
-	note $a1
-	octave3
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	octave4
-	note $11
-	octave3
-	note $81
-	note $71
-	octave4
-	note $11
-	notetype $0c, $a0
-	note $37
-	note $37
-	notetype $0c, $a7
-	note $37
-	notetype $0c, $b2
-	octave2
-	note $3f
-	endchannel ; end
-; 0x17877a
+	notetype $c, $92
+	octave 2
+	note F#, 1
+	note F#, 3
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	note F#, 1
+	note F#, 1
+	note F#, 5
+	notetype $c, $b4
+	octave 2
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 1
+	note F#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note F#, 1
+	note C#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note F#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note D_, 7
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	note G_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note A_, 1
+	octave 3
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note F#, 1
+	octave 4
+	note C_, 1
+	notetype $c, $a0
+	note D_, 7
+	note D_, 7
+	notetype $c, $a7
+	note D_, 7
+	notetype $c, $b2
+	octave 2
+	note D_, 15
+	endchannel
 
-_Music_CrystalOpening_Ch2: ; 0x17877a
-	notetype $0c, $a2
-	dutycycle $03
-	vibrato $08, $44
-	octave2
-	note $c1
-	note $c3
-	note $c1
-	note $c1
-	note $c3
-	note $c1
-	note $c1
-	note $c3
-	note $c1
-	note $c1
-	note $c1
-	notetype $0c, $a2
-	octave2
-	note $50
-	note $c0
-	octave3
-	note $50
-	note $70
-	notetype $0c, $c7
-	note $57
-	note $77
-	octave2
-	note $c7
-	notetype $0c, $b0
-	octave3
-	note $c7
-	notetype $0c, $c7
-	note $cf
-	note $0f
-	note $87
-	note $a7
-	note $37
-	notetype $0c, $c7
-	octave4
-	note $37
-	notetype $0c, $7c
-	note $37
-	notetype $0c, $c7
-	note $37
-	note $87
-	notetype $0c, $b0
-	note $77
-	note $77
-	notetype $0c, $c7
-	note $77
-	notetype $0c, $c2
-	octave3
-	note $3f
-	endchannel ; end
-; 0x1787c8
+Music_CrystalOpening_Ch2: ; 17877a
+	notetype $c, $a2
+	dutycycle $3
+	vibrato $8, $44
+	octave 2
+	note B_, 1
+	note B_, 3
+	note B_, 1
+	note B_, 1
+	note B_, 3
+	note B_, 1
+	note B_, 1
+	note B_, 3
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	notetype $c, $a2
+	octave 2
+	note E_, 0
+	note B_, 0
+	octave 3
+	note E_, 0
+	note F#, 0
+	notetype $c, $c7
+	note E_, 7
+	note F#, 7
+	octave 2
+	note B_, 7
+	notetype $c, $b0
+	octave 3
+	note B_, 7
+	notetype $c, $c7
+	note B_, 15
+	note __, 15
+	note G_, 7
+	note A_, 7
+	note D_, 7
+	notetype $c, $c7
+	octave 4
+	note D_, 7
+	notetype $c, $7c
+	note D_, 7
+	notetype $c, $c7
+	note D_, 7
+	note G_, 7
+	notetype $c, $b0
+	note F#, 7
+	note F#, 7
+	notetype $c, $c7
+	note F#, 7
+	notetype $c, $c2
+	octave 3
+	note D_, 15
+	endchannel
 
-_Music_CrystalOpening_Ch3: ; 0x1787c8
-	notetype $0c, $16
-	octave1
-	note $c3
-	notetype $06, $16
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $70
-	note $60
-	note $50
-	notetype $0c, $16
-	note $c3
-	note $c3
-	note $c3
-	notetype $06, $16
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $70
-	note $60
-	note $50
-	notetype $0c, $16
-	note $c3
-	note $c3
-	octave2
-	note $c7
-	note $77
-	note $47
-	note $c3
-	note $73
-	note $c3
-	octave3
-	note $53
-	note $73
-	note $53
-	note $33
-	note $23
-	octave2
-	note $a7
-	octave3
-	note $37
-	octave2
-	note $a7
-	note $77
-	octave3
-	note $33
-	note $53
-	note $73
-	note $53
-	note $33
-	note $23
-	note $17
-	note $37
-	note $3f
-	octave2
-	note $30
-	note $0e
-	endchannel ; end
-; 0x178810
+Music_CrystalOpening_Ch3: ; 1787c8
+	notetype $c, $16
+	octave 1
+	note B_, 3
+	notetype $6, $16
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	notetype $c, $16
+	note B_, 3
+	note B_, 3
+	note B_, 3
+	notetype $6, $16
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	notetype $c, $16
+	note B_, 3
+	note B_, 3
+	octave 2
+	note B_, 7
+	note F#, 7
+	note D#, 7
+	note B_, 3
+	note F#, 3
+	note B_, 3
+	octave 3
+	note E_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
+	note C#, 3
+	octave 2
+	note A_, 7
+	octave 3
+	note D_, 7
+	octave 2
+	note A_, 7
+	note F#, 7
+	octave 3
+	note D_, 3
+	note E_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
+	note C#, 3
+	note C_, 7
+	note D_, 7
+	note D_, 15
+	octave 2
+	note D_, 0
+	note __, 14
+	endchannel
 
-_Music_CrystalOpening_Ch4: ; 0x178810
-	stereopanning $0f
-	togglenoise $03
-	notetype $0c
-	note $0f
-	note $0b
-	octave2
-	note $20
-	note $20
-	note $20
-	note $20
-	note $33
-	notetype $08
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $35
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $32
-	notetype $0c
-	note $20
-	note $20
-	note $80
-	note $80
-	note $20
-	note $20
-	note $21
-	note $20
-	note $20
-	note $81
-	note $30
-	note $20
-	note $a0
-	note $80
-	note $30
-	note $30
-	note $80
-	note $00
-	note $20
-	note $20
-	note $a0
-	note $80
-	note $20
-	note $30
-	note $80
-	note $80
-	note $30
-	note $30
-	note $a1
-	note $21
-	note $21
-	note $21
-	note $a1
-	note $31
-	note $20
-	note $20
-	note $20
-	note $20
-	note $33
-	note $20
-	note $20
-	note $20
-	note $20
-	note $33
-	note $20
-	note $20
-	note $20
-	note $20
-	note $a0
-	note $80
-	note $30
-	note $20
-	note $80
-	note $80
-	note $20
-	note $20
-	note $a0
-	note $80
-	note $30
-	note $20
-	note $80
-	note $80
-	note $30
-	note $20
-	note $a0
-	note $80
-	note $20
-	note $20
-	note $30
-	note $20
-	note $20
-	note $30
-	note $a0
-	note $80
-	note $30
-	note $20
-	note $20
-	note $80
-	note $30
-	note $20
-	note $21
-	note $31
-	note $01
-	note $31
-	note $31
-	note $05
-	note $0f
-	note $0f
-	endchannel ; end
-; 0x178889
+Music_CrystalOpening_Ch4: ; 178810
+	stereopanning $f
+	togglenoise $3
+	notetype $c
+	note __, 15
+	note __, 11
+	octave 2
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	notetype $8
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 5
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 2
+	notetype $c
+	note C#, 0
+	note C#, 0
+	note G_, 0
+	note G_, 0
+	note C#, 0
+	note C#, 0
+	note C#, 1
+	note C#, 0
+	note C#, 0
+	note G_, 1
+	note D_, 0
+	note C#, 0
+	note A_, 0
+	note G_, 0
+	note D_, 0
+	note D_, 0
+	note G_, 0
+	note __, 0
+	note C#, 0
+	note C#, 0
+	note A_, 0
+	note G_, 0
+	note C#, 0
+	note D_, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note D_, 0
+	note A_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note A_, 1
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note A_, 0
+	note G_, 0
+	note D_, 0
+	note C#, 0
+	note G_, 0
+	note G_, 0
+	note C#, 0
+	note C#, 0
+	note A_, 0
+	note G_, 0
+	note D_, 0
+	note C#, 0
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note C#, 0
+	note A_, 0
+	note G_, 0
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note A_, 0
+	note G_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note G_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note D_, 1
+	note __, 5
+	note __, 15
+	note __, 15
+	endchannel
+; 178889
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -1,315 +1,312 @@
-_Music_DancingHall: ; 0xef9bc
-	db $80
-	dw _Music_DancingHall_Ch1
-	db $01
-	dw _Music_DancingHall_Ch2
-	db $02
-	dw _Music_DancingHall_Ch3
-; 0xef9c5
+Music_DancingHall: ; ef9bc
+	dbw $80, Music_DancingHall_Ch1
+	dbw $01, Music_DancingHall_Ch2
+	dbw $02, Music_DancingHall_Ch3
+; ef9c5
 
-; 0xef9c5
-	db $03
-; 0xef9c6
+INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
 
-_Music_DancingHall_Ch1: ; 0xef9c6
-	tempo $d000
+Music_DancingHall_Ch1: ; ef9c6
+	tempo 208
 	volume $77
-	stereopanning $0f
-	notetype $06, $b7
-	note $02
-	dutycycle $00
-	notetype $0c, $b7
-	callchannel _Music_DancingHall_sub_0xefa17
-	note $0f
-	callchannel _Music_DancingHall_sub_0xefa17
-	note $0f
-	note $0f
-	note $0f
+	stereopanning $f
+	notetype $6, $b7
+	note __, 2
+	dutycycle $0
+
+Music_DancingHall_branch_ef9d3: ; ef9d3
+	notetype $c, $b7
+	callchannel Music_DancingHall_branch_efa17
+	note __, 15
+	callchannel Music_DancingHall_branch_efa17
+	note __, 15
+	note __, 15
+	note __, 15
 	intensity $b1
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $60
-	note $a0
-	note $c0
-	note $a0
-	note $c0
-	octave4
-	note $30
-	note $61
-	notetype $08, $b1
-	note $30
-	note $50
-	note $30
-	octave3
-	note $c2
-	note $a2
-	notetype $0c, $b1
-	note $c0
-	note $a0
-	note $30
-	note $50
-	octave4
-	note $61
-	notetype $08, $b1
-	octave3
-	note $c0
-	octave4
-	note $30
-	octave3
-	note $c0
-	notetype $0c, $b5
-	note $a0
-	note $00
-	note $c0
-	note $c0
-	note $a0
-	note $00
-	note $61
-	loopchannel $00, $79d3 ; end
-; 0xefa17
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note F_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note F_, 1
+	notetype $8, $b1
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	octave 3
+	note B_, 2
+	note A_, 2
+	notetype $c, $b1
+	note B_, 0
+	note A_, 0
+	note D_, 0
+	note E_, 0
+	octave 4
+	note F_, 1
+	notetype $8, $b1
+	octave 3
+	note B_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note B_, 0
+	notetype $c, $b5
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note B_, 0
+	note A_, 0
+	note __, 0
+	note F_, 1
+	loopchannel 0, Music_DancingHall_branch_ef9d3
+; efa17
 
-_Music_DancingHall_sub_0xefa17: ; 0xefa17
-; subroutine
-	octave3
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $c0
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $50
-	note $00
-	note $30
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $00
-	endchannel ; end
-; 0xefa2c
+Music_DancingHall_branch_efa17: ; efa17
+	octave 3
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	endchannel
 
-_Music_DancingHall_Ch2: ; 0xefa2c
+Music_DancingHall_Ch2: ; efa2c
 	stereopanning $f0
-	notetype $06, $a1
-	dutycycle $00
+	notetype $6, $a1
+	dutycycle $0
 	vibrato $10, $24
-	note $02
-	notetype $06, $a2
-	callchannel _Music_DancingHall_sub_0xefa7a
-	callchannel _Music_DancingHall_sub_0xefa7a
+	note __, 2
+
+Music_DancingHall_branch_efa37: ; efa37
+	notetype $6, $a2
+	callchannel Music_DancingHall_branch_efa7a
+	callchannel Music_DancingHall_branch_efa7a
 	intensity $a7
-	octave2
-	note $3f
-	note $6f
-	notetype $0c, $a7
-	note $5f
-	octave3
-	note $60
-	note $a0
-	note $c0
-	octave4
-	note $30
-	note $50
-	note $30
-	note $50
-	note $a0
-	note $c1
-	notetype $08, $a7
-	note $a0
-	note $c0
-	note $a0
-	note $62
-	note $32
-	notetype $0c, $a7
-	note $50
-	note $30
-	octave3
-	note $a0
-	note $c0
-	octave4
-	note $a1
-	notetype $08, $a7
-	note $60
-	note $a0
-	note $60
-	notetype $0c, $a7
-	note $50
-	note $00
-	note $60
-	note $60
-	note $50
-	note $00
-	note $31
-	loopchannel $00, $7a37 ; end
-; 0xefa7a
+	octave 2
+	note D_, 15
+	note F_, 15
+	notetype $c, $a7
+	note E_, 15
+	octave 3
+	note F_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note A_, 0
+	note B_, 1
+	notetype $8, $a7
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 2
+	note D_, 2
+	notetype $c, $a7
+	note E_, 0
+	note D_, 0
+	octave 3
+	note A_, 0
+	note B_, 0
+	octave 4
+	note A_, 1
+	notetype $8, $a7
+	note F_, 0
+	note A_, 0
+	note F_, 0
+	notetype $c, $a7
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note F_, 0
+	note E_, 0
+	note __, 0
+	note D_, 1
+	loopchannel 0, Music_DancingHall_branch_efa37
+; efa7a
 
-_Music_DancingHall_sub_0xefa7a: ; 0xefa7a
-; subroutine
+Music_DancingHall_branch_efa7a: ; efa7a
 	intensity $a1
-	octave4
-	note $53
-	octave2
-	note $53
-	octave4
-	note $53
-	octave2
-	note $53
-	octave4
-	note $c3
-	note $a3
-	note $63
-	note $a3
+	octave 4
+	note E_, 3
+	octave 2
+	note E_, 3
+	octave 4
+	note E_, 3
+	octave 2
+	note E_, 3
+	octave 4
+	note B_, 3
+	note A_, 3
+	note F_, 3
+	note A_, 3
 	intensity $33
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $63
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $93
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $c3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $e3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $a3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $83
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $53
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $73
-	octave3
-	note $c0
-	octave4
-	note $50
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
 	intensity $a3
-	octave3
-	note $c0
-	octave4
-	note $50
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
 	intensity $b3
-	octave3
-	note $a0
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $c3
-	octave3
-	note $a0
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $d3
-	octave3
-	note $50
-	note $c0
+	octave 3
+	note E_, 0
+	note B_, 0
 	intensity $e3
-	note $50
-	note $c0
+	note E_, 0
+	note B_, 0
 	intensity $f3
-	note $a0
-	octave4
-	note $30
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $f3
-	octave3
-	note $a0
-	octave4
-	note $30
-	endchannel ; end
-; 0xefad6
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	endchannel
 
-_Music_DancingHall_Ch3: ; 0xefad6
+Music_DancingHall_Ch3: ; efad6
 	stereopanning $ff
 	vibrato $16, $24
-	notetype $06, $10
-	octave5
-	note $a0
-	note $c0
-	octave6
-	note $30
-	note $5c
-	note $30
-	note $50
-	note $a0
-	note $cf
+	notetype $6, $10
+	octave 5
+	note A_, 0
+	note B_, 0
+	octave 6
+	note D_, 0
+
+Music_DancingHall_branch_efae3: ; efae3
+	note E_, 12
+	note D_, 0
+	note E_, 0
+	note A_, 0
+	note B_, 15
 	intensity $14
-	octave3
-	note $6f
-	note $5d
+	octave 3
+	note F_, 15
+	note E_, 13
 	intensity $10
-	octave6
-	note $50
-	note $60
-	note $5c
-	note $30
-	note $50
-	note $a0
-	note $cf
+	octave 6
+	note E_, 0
+	note F_, 0
+	note E_, 12
+	note D_, 0
+	note E_, 0
+	note A_, 0
+	note B_, 15
 	intensity $14
-	octave3
-	note $6f
-	note $5f
+	octave 3
+	note F_, 15
+	note E_, 15
 	intensity $13
-	octave4
-	note $61
-	note $a1
-	note $c1
-	octave5
-	note $31
-	note $51
-	note $31
-	note $51
-	note $a1
-	note $b0
-	note $c2
-	notetype $08, $13
-	note $a0
-	note $c0
-	note $a0
-	note $62
-	note $32
-	notetype $0c, $13
-	note $50
-	note $30
-	octave4
-	note $a0
-	note $c0
-	octave5
-	note $a1
-	notetype $08, $13
-	note $60
-	note $a0
-	note $60
-	notetype $06, $13
-	note $40
-	note $52
-	note $33
-	octave4
-	note $c3
-	octave5
-	note $33
+	octave 4
+	note F_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note A#, 0
+	note B_, 2
+	notetype $8, $13
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 2
+	note D_, 2
+	notetype $c, $13
+	note E_, 0
+	note D_, 0
+	octave 4
+	note A_, 0
+	note B_, 0
+	octave 5
+	note A_, 1
+	notetype $8, $13
+	note F_, 0
+	note A_, 0
+	note F_, 0
+	notetype $6, $13
+	note D#, 0
+	note E_, 2
+	note D_, 3
+	octave 4
+	note B_, 3
+	octave 5
+	note D_, 3
 	intensity $14
-	octave3
-	note $3f
-	note $6f
-	note $5f
-	note $5c
+	octave 3
+	note D_, 15
+	note F_, 15
+	note E_, 15
+	note E_, 12
 	intensity $10
-	octave5
-	note $a0
-	note $c0
-	octave6
-	note $30
-	loopchannel $00, $7ae3 ; end
-; 0xefb3e
+	octave 5
+	note A_, 0
+	note B_, 0
+	octave 6
+	note D_, 0
+	loopchannel 0, Music_DancingHall_branch_efae3
+; efb3e
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -1,491 +1,499 @@
-_Music_DarkCave: ; 0xea2be
-	db $c0
-	dw _Music_DarkCave_Ch1
-	db $01
-	dw _Music_DarkCave_Ch2
-	db $02
-	dw _Music_DarkCave_Ch3
-	db $03
-	dw _Music_DarkCave_Ch4
-; 0xea2ca
+Music_DarkCave: ; ea2be
+	dbw $c0, Music_DarkCave_Ch1
+	dbw $01, Music_DarkCave_Ch2
+	dbw $02, Music_DarkCave_Ch3
+	dbw $03, Music_DarkCave_Ch4
+; ea2ca
 
-_Music_DarkCave_Ch1: ; 0xea2ca
-	tempo $8000
+
+Music_DarkCave_Ch1: ; ea2ca
+	tempo 128
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $11, $15
 	stereopanning $f0
-	notetype $0c, $a7
-	note $0f
-	loopchannel $04, $62dc
-	octave3
-	note $4f
-	note $3f
-	note $2f
-	note $1f
+	notetype $c, $a7
+
+Music_DarkCave_branch_ea2dc: ; ea2dc
+	note __, 15
+	loopchannel 4, Music_DarkCave_branch_ea2dc
+	octave 3
+	note D#, 15
+	note D_, 15
+	note C#, 15
+	note C_, 15
 	intensity $a3
-	callchannel _Music_DarkCave_sub_0xea333
-	loopchannel $03, $62e8
+
+Music_DarkCave_branch_ea2e8: ; ea2e8
+	callchannel Music_DarkCave_branch_ea333
+	loopchannel 3, Music_DarkCave_branch_ea2e8
 	intensity $b7
-	note $97
-	note $47
-	note $87
-	note $37
-	note $67
-	note $27
-	note $47
-	note $87
-	note $97
-	note $47
-	note $87
-	note $37
-	note $67
-	note $27
-	note $47
-	note $17
+	note G#, 7
+	note D#, 7
+	note G_, 7
+	note D_, 7
+	note F_, 7
+	note C#, 7
+	note D#, 7
+	note G_, 7
+	note G#, 7
+	note D#, 7
+	note G_, 7
+	note D_, 7
+	note F_, 7
+	note C#, 7
+	note D#, 7
+	note C_, 7
 	intensity $a3
-	callchannel _Music_DarkCave_sub_0xea333
-	loopchannel $02, $6303
-	note $0f
-	note $07
+
+Music_DarkCave_branch_ea303: ; ea303
+	callchannel Music_DarkCave_branch_ea333
+	loopchannel 2, Music_DarkCave_branch_ea303
+	note __, 15
+	note __, 7
 	intensity $b7
-	octave2
-	note $61
-	note $81
-	note $93
-	octave3
-	note $4f
-	note $07
-	octave2
-	note $91
-	note $81
-	note $93
-	octave3
-	note $4f
-	note $81
-	note $05
-	note $61
-	note $81
-	note $93
-	note $8f
-	note $61
-	note $05
-	note $91
-	note $81
-	note $93
+	octave 2
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	octave 3
+	note D#, 15
+	note __, 7
+	octave 2
+	note G#, 1
+	note G_, 1
+	note G#, 3
+	octave 3
+	note D#, 15
+	note G_, 1
+	note __, 5
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note G_, 15
+	note F_, 1
+	note __, 5
+	note G#, 1
+	note G_, 1
+	note G#, 3
 	intensity $a3
-	callchannel _Music_DarkCave_sub_0xea333
-	loopchannel $02, $6328
-	loopchannel $00, $62e8 ; end
-; 0xea333
 
-_Music_DarkCave_sub_0xea333: ; 0xea333
-; subroutine
-	octave4
-	note $41
-	octave3
-	note $91
-	octave4
-	note $11
-	note $41
-	octave3
-	note $91
-	octave4
-	note $11
-	note $41
-	note $11
-	note $31
-	octave3
-	note $81
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $81
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $61
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $61
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $81
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $81
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $b1
-	endchannel ; end
-; 0xea36a
+Music_DarkCave_branch_ea328: ; ea328
+	callchannel Music_DarkCave_branch_ea333
+	loopchannel 2, Music_DarkCave_branch_ea328
+	loopchannel 0, Music_DarkCave_branch_ea2e8
+; ea333
 
-_Music_DarkCave_Ch2: ; 0xea36a
-	dutycycle $01
+Music_DarkCave_branch_ea333: ; ea333
+	octave 4
+	note D#, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	note D#, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	endchannel
+
+Music_DarkCave_Ch2: ; ea36a
+	dutycycle $1
 	vibrato $12, $36
-	stereopanning $0f
-	notetype $0c, $a7
-	note $0f
-	loopchannel $04, $6374
-	octave3
-	note $8f
-	note $bf
-	note $6f
-	note $8f
-	note $0f
-	loopchannel $04, $637e
-	note $07
+	stereopanning $f
+	notetype $c, $a7
+
+Music_DarkCave_branch_ea374: ; ea374
+	note __, 15
+	loopchannel 4, Music_DarkCave_branch_ea374
+	octave 3
+	note G_, 15
+	note A#, 15
+	note F_, 15
+	note G_, 15
+
+Music_DarkCave_branch_ea37e: ; ea37e
+	note __, 15
+	loopchannel 4, Music_DarkCave_branch_ea37e
+	note __, 7
 	stereopanning $ff
 	intensity $c7
-	octave5
-	note $17
+	octave 5
+	note C_, 7
 	intensity $c4
-	note $31
-	note $11
-	octave4
-	note $b1
-	note $83
-	note $b1
-	octave5
-	note $33
+	note D_, 1
+	note C_, 1
+	octave 4
+	note A#, 1
+	note G_, 3
+	note A#, 1
+	octave 5
+	note D_, 3
 	intensity $b0
-	note $23
+	note C#, 3
 	intensity $b7
-	note $2b
+	note C#, 11
 	intensity $59
-	note $17
+	note C_, 7
 	intensity $c7
-	note $17
-	note $07
+	note C_, 7
+	note __, 7
 	intensity $c7
-	note $17
+	note C_, 7
 	intensity $c4
-	note $31
-	note $11
-	octave4
-	note $b1
-	note $81
-	note $81
-	note $b1
-	octave5
-	note $33
+	note D_, 1
+	note C_, 1
+	octave 4
+	note A#, 1
+	note G_, 1
+	note G_, 1
+	note A#, 1
+	octave 5
+	note D_, 3
 	intensity $c7
-	note $2b
+	note C#, 11
 	intensity $c3
-	note $11
-	note $21
+	note C_, 1
+	note C#, 1
 	intensity $b0
-	note $49
+	note D#, 9
 	intensity $b7
-	note $45
-	stereopanning $0f
+	note D#, 5
+	stereopanning $f
 	intensity $c4
-	octave4
-	note $63
-	note $41
-	note $31
-	note $43
-	note $31
-	note $11
-	note $31
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $33
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $27
-	octave3
-	note $b7
+	octave 4
+	note F_, 3
+	note D#, 1
+	note D_, 1
+	note D#, 3
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 3
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 7
+	octave 3
+	note A#, 7
 	intensity $b0
-	octave4
-	note $41
-	note $31
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $17
-	note $63
-	note $41
-	note $31
-	note $43
-	note $31
-	note $11
-	note $31
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $33
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $23
-	note $11
-	note $21
-	note $11
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 7
+	note F_, 3
+	note D#, 1
+	note D_, 1
+	note D#, 3
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 3
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 3
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
 	intensity $b0
-	note $17
+	note C_, 7
 	intensity $b7
-	note $17
+	note C_, 7
 	intensity $c7
 	stereopanning $ff
-	note $07
-	octave5
-	note $17
+	note __, 7
+	octave 5
+	note C_, 7
 	intensity $c4
-	note $31
-	note $11
-	octave4
-	note $b1
-	note $83
-	note $b1
-	octave5
-	note $33
+	note D_, 1
+	note C_, 1
+	octave 4
+	note A#, 1
+	note G_, 3
+	note A#, 1
+	octave 5
+	note D_, 3
 	intensity $49
-	note $27
+	note C#, 7
 	intensity $c7
-	note $27
+	note C#, 7
 	intensity $b0
-	note $17
+	note C_, 7
 	intensity $b7
-	note $17
-	note $07
+	note C_, 7
+	note __, 7
 	intensity $c7
-	note $17
+	note C_, 7
 	intensity $c4
-	note $31
-	note $11
-	octave4
-	note $b1
-	note $81
-	note $81
-	note $b1
-	octave5
-	note $33
+	note D_, 1
+	note C_, 1
+	octave 4
+	note A#, 1
+	note G_, 1
+	note G_, 1
+	note A#, 1
+	octave 5
+	note D_, 3
 	intensity $b0
-	note $27
+	note C#, 7
 	intensity $b7
-	note $27
+	note C#, 7
 	intensity $b0
-	note $17
+	note C_, 7
 	intensity $b7
-	note $17
+	note C_, 7
 	intensity $c7
-	note $0f
-	stereopanning $0f
-	note $07
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $23
-	note $1f
-	note $07
-	note $21
-	note $11
-	note $23
-	note $1f
+	note __, 15
+	stereopanning $f
+	note __, 7
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 3
+	note C_, 15
+	note __, 7
+	note C#, 1
+	note C_, 1
+	note C#, 3
+	note C_, 15
 	intensity $c2
-	note $47
+	note D#, 7
 	intensity $c7
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $23
-	note $1f
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 3
+	note C_, 15
 	intensity $c2
-	octave3
-	note $b7
+	octave 3
+	note A#, 7
 	intensity $c7
-	octave4
-	note $21
-	note $11
+	octave 4
+	note C#, 1
+	note C_, 1
 	intensity $c4
-	note $2f
-	note $03
-	note $0f
-	note $0f
-	note $0f
+	note C#, 15
+	note __, 3
+	note __, 15
+	note __, 15
+	note __, 15
 	intensity $b7
-	octave5
-	note $4f
-	note $3f
-	note $6f
-	note $4f
-	loopchannel $00, $637e ; end
-; 0xea46e
+	octave 5
+	note D#, 15
+	note D_, 15
+	note F_, 15
+	note D#, 15
+	loopchannel 0, Music_DarkCave_branch_ea37e
 
-_Music_DarkCave_Ch3: ; 0xea46e
-	notetype $0c, $27
-	callchannel _Music_DarkCave_sub_0xea4ce
-	loopchannel $02, $6471
-	callchannel _Music_DarkCave_sub_0xea4ce
-	loopchannel $07, $6478
-	callchannel _Music_DarkCave_sub_0xea4c3
-	octave3
-	note $13
-	note $81
-	note $43
-	note $81
-	note $43
-	note $61
-	note $01
-	octave2
-	note $bb
-	callchannel _Music_DarkCave_sub_0xea4c3
-	octave3
-	note $13
-	note $81
-	note $43
-	note $81
-	note $43
-	note $61
-	note $01
-	octave2
-	note $b3
-	octave3
-	note $21
-	note $11
-	note $23
-	callchannel _Music_DarkCave_sub_0xea4a7
-	callchannel _Music_DarkCave_sub_0xea4a7
-	loopchannel $00, $6478 ; end
-; 0xea4a7
+Music_DarkCave_Ch3: ; ea46e
+	notetype $c, $27
 
-_Music_DarkCave_sub_0xea4a7: ; 0xea4a7
-; subroutine
-	octave3
-	note $13
-	note $81
-	note $43
-	note $81
-	note $63
-	note $41
-	note $01
-	octave2
-	note $b3
-	note $b1
-	octave3
-	note $11
-	note $23
-	note $13
-	note $81
-	note $43
-	note $81
-	note $43
-	note $61
-	note $01
-	octave2
-	note $b3
-	octave3
-	note $21
-	note $11
-	note $23
-	endchannel ; end
-; 0xea4c3
+Music_DarkCave_branch_ea471: ; ea471
+	callchannel Music_DarkCave_branch_ea4ce
+	loopchannel 2, Music_DarkCave_branch_ea471
 
-_Music_DarkCave_sub_0xea4c3: ; 0xea4c3
-; subroutine
-	octave3
-	note $13
-	note $81
-	note $43
-	note $81
-	note $63
-	note $41
-	note $01
-	octave2
-	note $bb
-	endchannel ; end
-; 0xea4ce
+Music_DarkCave_branch_ea478: ; ea478
+	callchannel Music_DarkCave_branch_ea4ce
+	loopchannel 7, Music_DarkCave_branch_ea478
+	callchannel Music_DarkCave_branch_ea4c3
+	octave 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note D#, 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note A#, 11
+	callchannel Music_DarkCave_branch_ea4c3
+	octave 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note D#, 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note A#, 3
+	octave 3
+	note C#, 1
+	note C_, 1
+	note C#, 3
+	callchannel Music_DarkCave_branch_ea4a7
+	callchannel Music_DarkCave_branch_ea4a7
+	loopchannel 0, Music_DarkCave_branch_ea478
+; ea4a7
 
-_Music_DarkCave_sub_0xea4ce: ; 0xea4ce
-; subroutine
-	octave2
-	note $13
-	note $81
-	note $43
-	note $81
-	note $63
-	note $41
-	note $01
-	octave1
-	note $b3
-	note $b1
-	octave2
-	note $11
-	note $23
-	note $13
-	note $81
-	note $43
-	note $81
-	note $43
-	note $61
-	note $01
-	octave1
-	note $b3
-	octave2
-	note $21
-	note $11
-	note $23
-	endchannel ; end
-; 0xea4ea
+Music_DarkCave_branch_ea4a7: ; ea4a7
+	octave 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note F_, 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note A#, 3
+	note A#, 1
+	octave 3
+	note C_, 1
+	note C#, 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note D#, 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note A#, 3
+	octave 3
+	note C#, 1
+	note C_, 1
+	note C#, 3
+	endchannel
+; ea4c3
 
-_Music_DarkCave_Ch4: ; 0xea4ea
-	togglenoise $03
-	notetype $0c
+Music_DarkCave_branch_ea4c3: ; ea4c3
+	octave 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note F_, 3
+	note D#, 1
+	note __, 1
+	octave 2
+	note A#, 11
+	endchannel
+; ea4ce
+
+Music_DarkCave_branch_ea4ce: ; ea4ce
+	octave 2
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note F_, 3
+	note D#, 1
+	note __, 1
+	octave 1
+	note A#, 3
+	note A#, 1
+	octave 2
+	note C_, 1
+	note C#, 3
+	note C_, 3
+	note G_, 1
+	note D#, 3
+	note G_, 1
+	note D#, 3
+	note F_, 1
+	note __, 1
+	octave 1
+	note A#, 3
+	octave 2
+	note C#, 1
+	note C_, 1
+	note C#, 3
+	endchannel
+
+Music_DarkCave_Ch4: ; ea4ea
+	togglenoise $3
+	notetype $c
+
+Music_DarkCave_branch_ea4ee: ; ea4ee
 	stereopanning $ff
-	note $47
-	note $47
-	note $43
+	note D#, 7
+	note D#, 7
+	note D#, 3
 	stereopanning $f0
-	note $23
-	stereopanning $0f
-	note $21
-	note $21
+	note C#, 3
+	stereopanning $f
+	note C#, 1
+	note C#, 1
 	stereopanning $f0
-	note $23
+	note C#, 3
 	stereopanning $ff
-	note $47
-	note $47
-	note $43
-	stereopanning $0f
-	note $27
+	note D#, 7
+	note D#, 7
+	note D#, 3
+	stereopanning $f
+	note C#, 7
 	stereopanning $f0
-	note $21
-	note $21
-	loopchannel $00, $64ee ; end
-; 0xea50d
+	note C#, 1
+	note C#, 1
+	loopchannel 0, Music_DarkCave_branch_ea4ee
+; ea50d
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -1,182 +1,184 @@
-_Music_DragonsDen: ; 0xeece8
-	db $c0
-	dw _Music_DragonsDen_Ch1
-	db $01
-	dw _Music_DragonsDen_Ch2
-	db $02
-	dw _Music_DragonsDen_Ch3
-	db $03
-	dw _Music_DragonsDen_Ch4
-; 0xeecf4
+Music_DragonsDen: ; eece8
+	dbw $c0, Music_DragonsDen_Ch1
+	dbw $01, Music_DragonsDen_Ch2
+	dbw $02, Music_DragonsDen_Ch3
+	dbw $03, Music_DragonsDen_Ch4
+; eecf4
 
-_Music_DragonsDen_Ch1: ; 0xeecf4
-	tempo $9000
+
+Music_DragonsDen_Ch1: ; eecf4
+	tempo 144
 	volume $77
-	dutycycle $00
-	tone $0400
+	dutycycle $0
+	tone $0004
 	stereopanning $f0
-	notetype $0c, $80
-	callchannel _Music_DragonsDen_sub_0xeed1e
-	note $0f
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $09
-	notetype $0c, $b7
-	loopchannel $00, $6d03 ; end
-; 0xeed1e
+	notetype $c, $80
 
-_Music_DragonsDen_sub_0xeed1e: ; 0xeed1e
-; subroutine
-	octave3
-	note $bb
-	note $a3
-	note $bb
-	note $a3
-	note $b5
-	octave4
-	note $13
-	note $25
-	note $5f
-	note $4b
-	note $33
-	octave3
-	note $9f
-	endchannel ; end
-; 0xeed2d
+Music_DragonsDen_branch_eed03: ; eed03
+	callchannel Music_DragonsDen_branch_eed1e
+	note __, 15
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 9
+	notetype $c, $b7
+	loopchannel 0, Music_DragonsDen_branch_eed03
+; eed1e
 
-_Music_DragonsDen_sub_0xeed2d: ; 0xeed2d
-; subroutine
+Music_DragonsDen_branch_eed1e: ; eed1e
+	octave 3
+	note A#, 11
+	note A_, 3
+	note A#, 11
+	note A_, 3
+	note A#, 5
+	octave 4
+	note C_, 3
+	note C#, 5
+	note E_, 15
+	note D#, 11
+	note D_, 3
+	octave 3
+	note G#, 15
+	endchannel
+; eed2d
+
+Music_DragonsDen_branch_eed2d: ; eed2d
 	intensity $b1
-	note $01
-	octave4
-	note $22
-	note $22
-	note $22
-	note $22
-	note $23
-	note $22
-	note $22
-	note $23
-	note $21
-	note $21
-	endchannel ; end
-; 0xeed3c
+	note __, 1
+	octave 4
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 3
+	note C#, 2
+	note C#, 2
+	note C#, 3
+	note C#, 1
+	note C#, 1
+	endchannel
 
-_Music_DragonsDen_Ch2: ; 0xeed3c
-	dutycycle $00
-	tone $0400
-	stereopanning $0f
-	notetype $0c, $90
-	callchannel _Music_DragonsDen_sub_0xeed5e
-	note $0f
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	note $0f
-	notetype $0c, $c7
-	loopchannel $00, $6d46 ; end
-; 0xeed5e
+Music_DragonsDen_Ch2: ; eed3c
+	dutycycle $0
+	tone $0004
+	stereopanning $f
+	notetype $c, $90
 
-_Music_DragonsDen_sub_0xeed5e: ; 0xeed5e
-; subroutine
-	octave4
-	note $4b
-	note $33
-	note $4b
-	note $33
-	note $45
-	note $63
-	note $75
-	note $af
-	note $9b
-	note $83
-	note $2f
-	endchannel ; end
-; 0xeed6b
+Music_DragonsDen_branch_eed46: ; eed46
+	callchannel Music_DragonsDen_branch_eed5e
+	note __, 15
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	note __, 15
+	notetype $c, $c7
+	loopchannel 0, Music_DragonsDen_branch_eed46
+; eed5e
 
-_Music_DragonsDen_sub_0xeed6b: ; 0xeed6b
-; subroutine
+Music_DragonsDen_branch_eed5e: ; eed5e
+	octave 4
+	note D#, 11
+	note D_, 3
+	note D#, 11
+	note D_, 3
+	note D#, 5
+	note F_, 3
+	note F#, 5
+	note A_, 15
+	note G#, 11
+	note G_, 3
+	note C#, 15
+	endchannel
+; eed6b
+
+Music_DragonsDen_branch_eed6b: ; eed6b
 	intensity $c1
-	octave5
-	note $23
-	octave4
-	note $93
-	note $93
-	note $93
-	loopchannel $02, $6d6d
-	endchannel ; end
-; 0xeed78
 
-_Music_DragonsDen_Ch3: ; 0xeed78
-	notetype $0c, $14
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	loopchannel $0f, $6d78
-	note $0f
-	notetype $06, $27
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	octave2
-	note $93
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	octave2
-	note $93
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	loopchannel $10, $6d99
-	loopchannel $00, $6d78 ; end
-; 0xeedb7
+Music_DragonsDen_branch_eed6d: ; eed6d
+	octave 5
+	note C#, 3
+	octave 4
+	note G#, 3
+	note G#, 3
+	note G#, 3
+	loopchannel 2, Music_DragonsDen_branch_eed6d
+	endchannel
 
-_Music_DragonsDen_Ch4: ; 0xeedb7
-	togglenoise $00
-	notetype $0c
-	note $0f
-	note $0f
+Music_DragonsDen_Ch3: ; eed78
+
+Music_DragonsDen_branch_eed78: ; eed78
+	notetype $c, $14
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	loopchannel 15, Music_DragonsDen_branch_eed78
+	note __, 15
+	notetype $6, $27
+
+Music_DragonsDen_branch_eed99: ; eed99
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 3
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 3
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	loopchannel 16, Music_DragonsDen_branch_eed99
+	loopchannel 0, Music_DragonsDen_branch_eed78
+
+Music_DragonsDen_Ch4: ; eedb7
+	togglenoise $0
+	notetype $c
+	note __, 15
+	note __, 15
+
+Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
-	note $63
-	stereopanning $0f
-	note $73
-	note $73
+	note F_, 3
+	stereopanning $f
+	note F#, 3
+	note F#, 3
 	stereopanning $f0
-	note $73
-	loopchannel $00, $6dbd ; end
-; 0xeedcb
+	note F#, 3
+	loopchannel 0, Music_DragonsDen_branch_eedbd
+; eedcb
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -1,675 +1,678 @@
-_Music_EcruteakCity: ; 0xef2d0
-	db $80
-	dw _Music_EcruteakCity_Ch1
-	db $01
-	dw _Music_EcruteakCity_Ch2
-	db $02
-	dw _Music_EcruteakCity_Ch3
-; 0xef2d9
+Music_EcruteakCity: ; ef2d0
+	dbw $80, Music_EcruteakCity_Ch1
+	dbw $01, Music_EcruteakCity_Ch2
+	dbw $02, Music_EcruteakCity_Ch3
+; ef2d9
 
-_Music_EcruteakCity_Ch1: ; 0xef2d9
-	tempo $c500
+
+Music_EcruteakCity_Ch1: ; ef2d9
+	tempo 197
 	volume $77
-	stereopanning $0f
+	stereopanning $f
 	vibrato $12, $25
-	dutycycle $02
-	notetype $0c, $57
-	note $09
-	octave4
-	note $15
-	note $09
-	note $15
-	note $0f
-	octave3
-	note $c3
-	octave4
-	note $13
-	note $33
+	dutycycle $2
+
+Music_EcruteakCity_branch_ef2e5: ; ef2e5
+	notetype $c, $57
+	note __, 9
+	octave 4
+	note C_, 5
+	note __, 9
+	note C_, 5
+	note __, 15
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	note D_, 3
 	intensity $60
-	note $03
-	note $0f
-	note $09
-	note $81
-	note $a1
-	note $b1
-	note $07
-	note $91
-	note $81
-	note $61
-	octave5
-	note $15
-	notetype $06, $67
-	note $23
-	note $39
-	note $01
+	note __, 3
+	note __, 15
+	note __, 9
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note __, 7
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	octave 5
+	note C_, 5
+	notetype $6, $67
+	note C#, 3
+	note D_, 9
+	note __, 1
 	stereopanning $ff
-	octave4
-	note $c7
-	stereopanning $0f
-	octave3
-	note $b0
-	note $ca
-	octave4
-	note $13
-	note $53
-	note $8b
-	note $bb
-	note $83
-	note $03
-	note $b3
-	octave5
-	note $23
-	note $51
-	note $01
-	octave3
-	note $a7
-	octave4
-	note $17
-	note $63
-	note $0b
-	note $50
-	note $6a
-	note $81
-	note $01
-	note $a3
-	note $83
-	note $07
+	octave 4
+	note B_, 7
+	stereopanning $f
+	octave 3
+	note A#, 0
+	note B_, 10
+	octave 4
+	note C_, 3
+	note E_, 3
+	note G_, 11
+	note A#, 11
+	note G_, 3
+	note __, 3
+	note A#, 3
+	octave 5
+	note C#, 3
+	note E_, 1
+	note __, 1
+	octave 3
+	note A_, 7
+	octave 4
+	note C_, 7
+	note F_, 3
+	note __, 11
+	note E_, 0
+	note F_, 10
+	note G_, 1
+	note __, 1
+	note A_, 3
+	note G_, 3
+	note __, 7
 	intensity $52
-	callchannel _Music_EcruteakCity_sub_0xef37f
-	note $31
-	octave4
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	callchannel _Music_EcruteakCity_sub_0xef391
+	callchannel Music_EcruteakCity_branch_ef37f
+	note D_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	callchannel Music_EcruteakCity_branch_ef391
 	intensity $52
-	note $b1
-	note $81
-	note $51
-	note $21
-	note $81
-	note $51
-	note $21
-	octave4
-	note $b1
-	octave5
-	note $51
-	note $21
-	octave4
-	note $b1
-	note $81
-	note $b1
-	note $81
-	note $51
-	note $21
-	callchannel _Music_EcruteakCity_sub_0xef37f
-	note $31
-	note $11
-	octave4
-	note $91
-	octave5
-	note $11
-	octave4
-	note $91
-	octave5
-	note $11
-	note $31
-	note $11
-	note $31
-	note $11
-	octave4
-	note $91
-	octave5
-	note $11
-	octave4
-	note $91
-	octave5
-	note $11
-	octave4
-	note $91
-	octave5
-	note $11
-	callchannel _Music_EcruteakCity_sub_0xef391
-	loopchannel $00, $72e5 ; end
-; 0xef37f
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	octave 4
+	note A#, 1
+	octave 5
+	note E_, 1
+	note C#, 1
+	octave 4
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	callchannel Music_EcruteakCity_branch_ef37f
+	note D_, 1
+	note C_, 1
+	octave 4
+	note G#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	octave 5
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note G#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	octave 5
+	note C_, 1
+	callchannel Music_EcruteakCity_branch_ef391
+	loopchannel 0, Music_EcruteakCity_branch_ef2e5
+; ef37f
 
-_Music_EcruteakCity_sub_0xef37f: ; 0xef37f
-; subroutine
-	octave5
-	note $51
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $11
-	note $51
-	note $11
-	loopchannel $02, $737f
-	endchannel ; end
-; 0xef391
+Music_EcruteakCity_branch_ef37f: ; ef37f
+	octave 5
+	note E_, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	loopchannel 2, Music_EcruteakCity_branch_ef37f
+	endchannel
+; ef391
 
-_Music_EcruteakCity_sub_0xef391: ; 0xef391
-; subroutine
-	octave5
-	note $31
-	octave4
-	note $c1
-	note $81
-	note $c1
-	note $81
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	note $81
-	note $c1
-	note $81
-	note $c1
-	octave5
-	note $31
-	note $61
-	note $a1
-	note $51
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $51
-	note $11
-	octave4
-	note $a1
-	note $51
-	octave5
-	note $11
-	octave4
-	note $a1
-	note $51
-	note $11
-	note $a1
-	note $51
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $61
-	note $a1
-	octave5
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $11
-	octave4
-	note $a1
-	octave5
-	note $11
-	note $61
-	loopchannel $02, $73be
-	octave4
-	note $81
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $c1
-	octave5
-	note $31
-	note $81
-	loopchannel $02, $73d0
+Music_EcruteakCity_branch_ef391: ; ef391
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	note F_, 1
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note E_, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	note E_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+
+Music_EcruteakCity_branch_ef3be: ; ef3be
+	octave 4
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	note F_, 1
+	loopchannel 2, Music_EcruteakCity_branch_ef3be
+
+Music_EcruteakCity_branch_ef3d0: ; ef3d0
+	octave 4
+	note G_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	note G_, 1
+	loopchannel 2, Music_EcruteakCity_branch_ef3d0
 	intensity $50
-	dutycycle $00
-	note $5f
-	note $8f
-	dutycycle $02
-	endchannel ; end
-; 0xef3eb
+	dutycycle $0
+	note E_, 15
+	note G_, 15
+	dutycycle $2
+	endchannel
 
-_Music_EcruteakCity_Ch2: ; 0xef3eb
+Music_EcruteakCity_Ch2: ; ef3eb
 	vibrato $12, $25
-	dutycycle $03
+	dutycycle $3
 	stereopanning $f0
-	notetype $06, $67
-	note $0f
-	note $04
-	octave4
-	note $80
-	octave5
-	note $30
-	note $58
-	note $0f
-	note $04
-	octave4
-	note $a0
-	octave5
-	note $50
-	note $68
-	notetype $0c, $77
-	note $09
-	note $31
-	note $11
-	octave4
-	note $91
-	note $83
-	note $a3
-	note $c3
-	notetype $06, $93
+
+Music_EcruteakCity_branch_ef3f2: ; ef3f2
+	notetype $6, $67
+	note __, 15
+	note __, 4
+	octave 4
+	note G_, 0
+	octave 5
+	note D_, 0
+	note E_, 8
+	note __, 15
+	note __, 4
+	octave 4
+	note A_, 0
+	octave 5
+	note E_, 0
+	note F_, 8
+	notetype $c, $77
+	note __, 9
+	note D_, 1
+	note C_, 1
+	octave 4
+	note G#, 1
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	notetype $6, $93
 	intensity $97
-	dutycycle $02
-	octave3
-	note $86
-	octave4
-	note $20
-	note $3a
-	note $00
-	note $11
-	note $01
-	note $1f
-	note $67
-	note $03
-	note $53
-	note $03
-	note $53
-	note $63
-	note $83
-	note $53
-	note $11
-	note $01
-	note $13
-	octave3
-	note $a1
-	note $60
-	note $a0
-	octave4
-	note $1f
-	note $53
-	note $81
-	note $01
-	note $53
-	note $39
-	note $00
+	dutycycle $2
+	octave 3
+	note G_, 6
+	octave 4
+	note C#, 0
+	note D_, 10
+	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 15
+	note F_, 7
+	note __, 3
+	note E_, 3
+	note __, 3
+	note E_, 3
+	note F_, 3
+	note G_, 3
+	note E_, 3
+	note C_, 1
+	note __, 1
+	note C_, 3
+	octave 3
+	note A_, 1
+	note F_, 0
+	note A_, 0
+	octave 4
+	note C_, 15
+	note E_, 3
+	note G_, 1
+	note __, 1
+	note E_, 3
+	note D_, 9
+	note __, 0
 	stereopanning $ff
-	note $48
+	note D#, 8
 	stereopanning $f0
-	dutycycle $00
-	octave5
-	note $20
-	note $3a
-	note $11
-	note $01
-	note $1f
-	note $6b
-	note $53
-	note $03
-	note $53
-	note $63
-	note $81
-	octave4
-	note $a0
-	octave5
-	note $10
-	note $50
-	note $a2
-	note $51
-	note $01
-	note $53
-	note $11
-	note $01
-	note $13
-	octave4
-	note $a1
-	note $01
-	note $c3
-	octave5
-	note $11
-	octave4
-	note $80
-	note $c0
-	octave5
-	note $40
-	note $5a
-	note $31
-	note $01
-	note $37
-	dutycycle $01
-	octave4
-	note $53
-	note $82
-	note $90
-	note $af
-	octave3
-	note $a3
-	octave4
-	note $11
-	note $01
-	note $53
-	note $3b
-	note $13
-	note $03
-	octave3
-	note $c3
-	note $03
-	octave4
-	note $67
-	note $8b
-	note $67
-	note $03
-	note $57
-	note $33
-	note $11
-	note $01
-	octave3
-	note $c3
-	octave4
-	note $11
-	note $05
-	octave3
-	note $c3
-	note $03
-	octave4
-	note $13
-	octave3
-	note $af
-	note $03
-	octave4
-	note $63
-	note $53
-	note $33
-	note $1b
-	octave3
-	note $c3
-	note $03
-	octave4
-	note $13
-	note $33
-	note $43
-	notetype $0c, $83
-	note $5f
+	dutycycle $0
+	octave 5
+	note C#, 0
+	note D_, 10
+	note C_, 1
+	note __, 1
+	note C_, 15
+	note F_, 11
+	note E_, 3
+	note __, 3
+	note E_, 3
+	note F_, 3
+	note G_, 1
+	octave 4
+	note A_, 0
+	octave 5
+	note C_, 0
+	note E_, 0
+	note A_, 2
+	note E_, 1
+	note __, 1
+	note E_, 3
+	note C_, 1
+	note __, 1
+	note C_, 3
+	octave 4
+	note A_, 1
+	note __, 1
+	note B_, 3
+	octave 5
+	note C_, 1
+	octave 4
+	note G_, 0
+	note B_, 0
+	octave 5
+	note D#, 0
+	note E_, 10
+	note D_, 1
+	note __, 1
+	note D_, 7
+	dutycycle $1
+	octave 4
+	note E_, 3
+	note G_, 2
+	note G#, 0
+	note A_, 15
+	octave 3
+	note A_, 3
+	octave 4
+	note C_, 1
+	note __, 1
+	note E_, 3
+	note D_, 11
+	note C_, 3
+	note __, 3
+	octave 3
+	note B_, 3
+	note __, 3
+	octave 4
+	note F_, 7
+	note G_, 11
+	note F_, 7
+	note __, 3
+	note E_, 7
+	note D_, 3
+	note C_, 1
+	note __, 1
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 1
+	note __, 5
+	octave 3
+	note B_, 3
+	note __, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note A_, 15
+	note __, 3
+	octave 4
+	note F_, 3
+	note E_, 3
+	note D_, 3
+	note C_, 11
+	octave 3
+	note B_, 3
+	note __, 3
+	octave 4
+	note C_, 3
+	note D_, 3
+	note D#, 3
+	notetype $c, $83
+	note E_, 15
 	intensity $80
-	note $33
-	note $23
-	note $63
-	notetype $06, $80
-	note $86
-	note $90
+	note D_, 3
+	note C#, 3
+	note F_, 3
+	notetype $6, $80
+	note G_, 6
+	note G#, 0
 	intensity $87
-	note $ab
-	note $51
-	note $01
-	note $51
-	note $01
-	note $52
-	note $90
-	note $a3
-	note $51
-	note $01
-	note $53
-	note $31
-	note $01
-	note $23
-	note $3b
-	octave3
-	note $c3
-	octave4
-	note $63
-	note $8b
-	note $31
-	note $01
-	note $31
-	note $01
-	note $33
-	note $83
-	note $31
-	note $00
-	note $b0
-	note $cb
-	octave5
-	note $13
-	octave4
-	note $a7
-	octave3
-	note $a3
-	octave4
-	note $13
-	notetype $0c, $87
-	note $69
-	note $81
-	note $61
-	note $51
-	note $37
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $11
-	note $31
-	note $5f
-	loopchannel $00, $73f2 ; end
-; 0xef4e1
+	note A_, 11
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 2
+	note G#, 0
+	note A_, 3
+	note E_, 1
+	note __, 1
+	note E_, 3
+	note D_, 1
+	note __, 1
+	note C#, 3
+	note D_, 11
+	octave 3
+	note B_, 3
+	octave 4
+	note F_, 3
+	note G_, 11
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 3
+	note G_, 3
+	note D_, 1
+	note __, 0
+	note A#, 0
+	note B_, 11
+	octave 5
+	note C_, 3
+	octave 4
+	note A_, 7
+	octave 3
+	note A_, 3
+	octave 4
+	note C_, 3
+	notetype $c, $87
+	note F_, 9
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 7
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note E_, 15
+	loopchannel 0, Music_EcruteakCity_branch_ef3f2
 
-_Music_EcruteakCity_Ch3: ; 0xef4e1
+Music_EcruteakCity_Ch3: ; ef4e1
 	stereopanning $ff
+
+Music_EcruteakCity_branch_ef4e3: ; ef4e3
 	vibrato $12, $25
-	notetype $0c, $25
-	octave3
-	note $11
-	note $81
-	octave4
-	note $31
-	note $59
-	octave3
-	note $11
-	note $a1
-	octave4
-	note $51
-	note $69
-	octave3
-	note $11
-	note $81
-	octave4
-	note $31
-	note $59
-	note $83
-	note $73
-	note $63
-	octave3
-	note $c1
-	note $81
-	note $11
-	note $81
-	octave4
-	note $31
-	note $59
-	octave3
-	note $21
-	note $81
-	note $b1
-	octave4
-	note $31
-	note $01
-	note $21
-	note $31
-	note $51
-	octave3
-	note $31
-	note $a0
-	note $00
-	octave4
-	note $51
-	note $60
-	note $00
-	note $97
-	octave3
-	note $81
-	octave4
-	note $31
-	note $61
-	note $91
-	note $c1
-	note $80
-	note $94
-	octave3
-	note $11
-	note $81
-	octave4
-	note $31
-	note $51
-	note $81
-	octave5
-	note $11
-	note $31
-	note $51
-	octave3
-	note $21
-	note $b1
-	octave4
-	note $31
-	note $21
-	note $51
-	note $31
-	note $61
-	note $80
-	note $00
-	octave3
-	note $67
-	octave4
-	note $a1
-	octave5
-	note $10
-	note $00
-	note $31
-	note $50
-	note $00
-	octave2
-	note $81
-	octave3
-	note $31
-	note $81
-	note $71
-	note $a1
-	note $81
-	note $c1
-	octave4
-	note $31
-	callchannel _Music_EcruteakCity_sub_0xef569
-	octave4
-	note $17
-	note $57
-	note $87
-	note $c7
-	note $b7
-	note $87
-	note $57
-	note $27
-	notetype $0c, $25
-	callchannel _Music_EcruteakCity_sub_0xef569
-	octave4
-	note $17
-	octave3
-	note $87
-	note $57
-	note $37
-	loopchannel $00, $74e3 ; end
-; 0xef569
+	notetype $c, $25
+	octave 3
+	note C_, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note E_, 9
+	octave 3
+	note C_, 1
+	note A_, 1
+	octave 4
+	note E_, 1
+	note F_, 9
+	octave 3
+	note C_, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note E_, 9
+	note G_, 3
+	note F#, 3
+	note F_, 3
+	octave 3
+	note B_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note E_, 9
+	octave 3
+	note C#, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	octave 3
+	note D_, 1
+	note A_, 0
+	note __, 0
+	octave 4
+	note E_, 1
+	note F_, 0
+	note __, 0
+	note G#, 7
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
+	note G_, 0
+	note G#, 4
+	octave 3
+	note C_, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note E_, 1
+	note G_, 1
+	octave 5
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	octave 3
+	note C#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	note C#, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 0
+	note __, 0
+	octave 3
+	note F_, 7
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 0
+	note __, 0
+	note D_, 1
+	note E_, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note F#, 1
+	note A_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	callchannel Music_EcruteakCity_branch_ef569
+	octave 4
+	note C_, 7
+	note E_, 7
+	note G_, 7
+	note B_, 7
+	note A#, 7
+	note G_, 7
+	note E_, 7
+	note C#, 7
+	notetype $c, $25
+	callchannel Music_EcruteakCity_branch_ef569
+	octave 4
+	note C_, 7
+	octave 3
+	note G_, 7
+	note E_, 7
+	note D_, 7
+	loopchannel 0, Music_EcruteakCity_branch_ef4e3
+; ef569
 
-_Music_EcruteakCity_sub_0xef569: ; 0xef569
-; subroutine
-	octave3
-	note $63
-	note $01
-	note $60
-	note $00
-	note $63
-	note $01
-	note $10
-	note $00
-	note $63
-	note $01
-	note $60
-	note $00
-	note $60
-	note $00
-	note $61
-	note $01
-	note $60
-	note $00
-	note $53
-	note $01
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $51
-	note $01
-	note $c0
-	note $00
-	note $a3
-	note $01
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $30
-	note $00
-	note $50
-	note $00
-	note $60
-	note $00
-	note $83
-	note $01
-	octave4
-	note $30
-	note $00
-	octave3
-	note $80
-	note $00
-	note $80
-	note $00
-	note $a0
-	note $00
-	note $b0
-	notetype $06, $25
-	note $00
-	note $c0
-	endchannel ; end
-; 0xef5b1
+Music_EcruteakCity_branch_ef569: ; ef569
+	octave 3
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note C_, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 0
+	note __, 0
+	note E_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 1
+	note __, 1
+	note B_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A#, 0
+	notetype $6, $25
+	note __, 0
+	note B_, 0
+	endchannel
+; ef5b1
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -1,542 +1,544 @@
-_Music_ElmsLab: ; 0xea040
-	db $c0
-	dw _Music_ElmsLab_Ch1
-	db $01
-	dw _Music_ElmsLab_Ch2
-	db $02
-	dw _Music_ElmsLab_Ch3
-	db $03
-	dw _Music_ElmsLab_Ch4
-; 0xea04c
+Music_ElmsLab: ; ea040
+	dbw $c0, Music_ElmsLab_Ch1
+	dbw $01, Music_ElmsLab_Ch2
+	dbw $02, Music_ElmsLab_Ch3
+	dbw $03, Music_ElmsLab_Ch4
+; ea04c
 
-_Music_ElmsLab_Ch1: ; 0xea04c
-	tempo $9000
+
+Music_ElmsLab_Ch1: ; ea04c
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $10, $15
 	stereopanning $f0
-	notetype $0c, $b2
-	octave2
-	note $61
-	note $81
-	note $a1
-	note $c1
+	notetype $c, $b2
+	octave 2
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	intensity $b6
-	octave3
-	note $17
+	octave 3
+	note C_, 7
 	intensity $b2
-	octave2
-	note $b1
-	note $a1
-	note $81
-	octave3
-	note $17
-	note $63
-	note $63
-	note $67
-	note $a3
-	note $a3
-	note $a1
-	note $01
-	note $a1
-	note $91
-	note $a1
+	octave 2
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	octave 3
+	note C_, 7
+	note F_, 3
+	note F_, 3
+	note F_, 7
+	note A_, 3
+	note A_, 3
+	note A_, 1
+
+Music_ElmsLab_branch_ea075: ; ea075
+	note __, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	intensity $b7
-	octave4
-	note $13
+	octave 4
+	note C_, 3
 	intensity $b5
-	octave3
-	note $c1
-	octave4
-	note $11
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
 	intensity $b4
-	note $67
+	note F_, 7
 	intensity $b5
-	octave3
-	note $a1
-	note $91
-	note $a1
-	note $61
+	octave 3
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note F_, 1
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b5
-	note $a1
-	note $81
-	note $61
+	note A_, 1
+	note G_, 1
+	note F_, 1
 	intensity $b2
-	note $83
+	note G_, 3
 	intensity $b5
-	note $a1
-	note $91
-	note $a1
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	intensity $b7
-	note $63
+	note F_, 3
 	intensity $b5
-	note $13
+	note C_, 3
 	intensity $b7
-	note $37
+	note D_, 7
 	intensity $b4
-	note $61
-	note $51
-	note $31
-	note $61
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
 	intensity $b7
-	note $57
+	note E_, 7
 	intensity $b4
-	note $81
-	note $61
-	note $51
-	note $81
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b4
-	note $81
-	note $a1
-	note $b1
-	note $a1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
 	intensity $b2
-	note $83
+	note G_, 3
 	intensity $b4
-	note $61
-	note $a1
-	note $81
-	note $61
-	note $51
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
 	intensity $b2
-	note $85
+	note G_, 5
 	intensity $b7
-	note $63
-	octave4
-	note $11
-	octave3
-	note $63
-	note $31
-	note $b3
-	note $a3
+	note F_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note F_, 3
+	note D_, 1
+	note A#, 3
+	note A_, 3
 	intensity $b4
-	note $81
-	note $61
-	note $81
+	note G_, 1
+	note F_, 1
+	note G_, 1
 	intensity $b2
-	note $a5
+	note A_, 5
 	intensity $b7
-	note $53
-	note $b1
-	note $55
+	note E_, 3
+	note A#, 1
+	note E_, 5
 	intensity $b3
-	note $61
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $a1
-	note $81
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	note G_, 1
 	intensity $b2
-	note $55
+	note E_, 5
 	intensity $b4
-	note $63
-	octave4
-	note $13
-	octave3
-	note $61
-	octave4
-	note $11
-	note $31
-	note $11
-	octave3
-	note $b1
-	note $a1
+	note F_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note F_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
 	intensity $b7
-	note $b7
-	octave4
-	note $53
-	note $33
-	note $13
-	octave3
-	note $b3
-	octave4
-	note $13
-	note $33
-	note $43
-	note $53
+	note A#, 7
+	octave 4
+	note E_, 3
+	note D_, 3
+	note C_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C_, 3
+	note D_, 3
+	note D#, 3
+	note E_, 3
 	intensity $b4
-	octave3
-	note $a1
-	note $61
-	octave4
-	note $11
-	octave3
-	note $61
-	note $a1
-	note $61
-	octave4
-	note $11
-	octave3
-	note $61
-	note $a1
-	note $61
-	octave4
-	note $11
-	octave3
-	note $61
-	note $a1
+	octave 3
+	note A_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note F_, 1
+	note A_, 1
 	intensity $b2
-	note $61
-	note $63
-	loopchannel $00, $6075 ; end
-; 0xea128
+	note F_, 1
+	note F_, 3
+	loopchannel 0, Music_ElmsLab_branch_ea075
 
-_Music_ElmsLab_Ch2: ; 0xea128
-	dutycycle $03
+Music_ElmsLab_Ch2: ; ea128
+	dutycycle $3
 	vibrato $10, $26
-	stereopanning $0f
-	notetype $0c, $c3
-	octave4
-	note $61
-	note $51
-	note $31
-	octave3
-	note $c1
+	stereopanning $f
+	notetype $c, $c3
+	octave 4
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
 	intensity $c5
-	octave4
-	note $17
+	octave 4
+	note C_, 7
 	intensity $c3
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $51
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
 	intensity $c2
-	note $65
-	octave4
-	note $13
-	note $13
-	note $17
-	note $13
-	note $13
-	note $11
+	note F_, 5
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C_, 7
+	note C_, 3
+	note C_, 3
+	note C_, 1
 	stereopanning $ff
+
+Music_ElmsLab_branch_ea14f: ; ea14f
 	intensity $c6
-	octave4
-	note $65
+	octave 4
+	note F_, 5
 	intensity $c2
-	note $51
-	note $61
-	note $51
-	note $61
-	note $81
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
 	intensity $c7
-	note $a5
+	note A_, 5
 	intensity $c2
-	note $61
+	note F_, 1
 	intensity $c7
-	note $17
+	note C_, 7
 	intensity $c7
-	note $35
+	note D_, 5
 	intensity $c3
-	note $21
-	note $31
-	note $21
-	note $31
-	note $51
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
 	intensity $c7
-	note $65
+	note F_, 5
 	intensity $c3
-	note $11
+	note C_, 1
 	intensity $c7
-	octave3
-	note $a9
+	octave 3
+	note A_, 9
 	intensity $c3
-	note $b1
-	note $b1
-	octave4
-	note $31
+	note A#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
 	intensity $c5
-	note $13
-	octave3
-	note $b5
+	note C_, 3
+	octave 3
+	note A#, 5
 	intensity $c3
-	octave4
-	note $11
-	note $11
-	note $51
+	octave 4
+	note C_, 1
+	note C_, 1
+	note E_, 1
 	intensity $c4
-	note $33
-	note $15
+	note D_, 3
+	note C_, 5
 	intensity $c2
-	note $31
-	note $31
-	note $61
-	note $81
-	note $61
-	note $51
-	note $61
+	note D_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
 	intensity $c2
-	note $83
+	note G_, 3
 	intensity $c6
-	note $13
-	note $33
+	note C_, 3
+	note D_, 3
 	intensity $c4
-	note $55
+	note E_, 5
 	intensity $c3
-	note $61
-	note $61
-	note $81
+	note F_, 1
+	note F_, 1
+	note G_, 1
 	intensity $c7
-	note $a3
+	note A_, 3
 	intensity $c3
-	note $81
-	note $71
-	note $81
-	note $71
-	note $80
-	note $61
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note G_, 0
+	note F_, 1
 	intensity $c7
-	note $3a
+	note D_, 10
 	intensity $c3
-	note $51
-	note $51
-	note $61
+	note E_, 1
+	note E_, 1
+	note F_, 1
 	intensity $c7
-	note $83
+	note G_, 3
 	intensity $c3
-	note $61
-	note $51
-	note $61
-	note $81
-	note $60
-	note $31
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 0
+	note D_, 1
 	intensity $c7
-	note $1a
+	note C_, 10
 	intensity $c4
-	note $61
-	note $61
-	note $81
+	note F_, 1
+	note F_, 1
+	note G_, 1
 	intensity $c7
-	note $a3
+	note A_, 3
 	intensity $c4
-	note $81
-	note $61
-	note $b1
-	note $a1
-	note $b0
-	octave5
-	note $11
-	note $34
+	note G_, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 0
+	octave 5
+	note C_, 1
+	note D_, 4
 	intensity $c3
-	note $51
-	note $31
+	note E_, 1
+	note D_, 1
 	intensity $c7
-	note $13
-	octave4
-	note $b3
-	note $a3
-	note $83
-	octave5
-	note $13
-	octave4
-	note $b3
-	note $a3
-	note $83
+	note C_, 3
+	octave 4
+	note A#, 3
+	note A_, 3
+	note G_, 3
+	octave 5
+	note C_, 3
+	octave 4
+	note A#, 3
+	note A_, 3
+	note G_, 3
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $a0
-	note $67
+	note F_, 7
 	intensity $a7
-	note $69
+	note F_, 9
 	intensity $c2
-	note $11
-	note $61
+	note C_, 1
+	note F_, 1
 	intensity $c4
-	octave3
-	note $51
-	loopchannel $00, $614f ; end
-; 0xea1fd
+	octave 3
+	note E_, 1
+	loopchannel 0, Music_ElmsLab_branch_ea14f
 
-_Music_ElmsLab_Ch3: ; 0xea1fd
-	stereopanning $0f
-	notetype $0c, $25
-	note $07
-	note $0d
-	octave3
-	note $11
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $11
-	note $31
-	note $51
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $51
-	octave4
-	note $11
-	octave3
-	note $31
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $51
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $11
-	note $31
-	note $51
-	note $61
-	note $b1
-	note $31
-	note $b1
-	note $61
-	note $b1
-	note $31
-	note $b1
-	note $81
-	octave4
-	note $11
-	octave3
-	note $51
-	octave4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $11
-	octave3
-	note $51
-	note $a1
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $61
-	octave4
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $61
-	note $c1
-	octave4
-	note $11
-	note $01
-	note $13
-	octave3
-	note $b3
-	note $83
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $81
-	note $b1
-	note $31
-	note $b1
-	note $81
-	note $b1
-	note $31
-	note $a1
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $81
-	note $11
-	note $81
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $81
-	note $51
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $81
-	note $b1
-	note $31
-	note $b1
-	note $81
-	note $b1
-	note $a1
-	note $81
-	note $13
-	note $33
-	note $53
-	note $83
-	note $53
-	note $63
-	note $73
-	note $83
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $11
-	note $61
-	note $a1
-	loopchannel $00, $6216 ; end
-; 0xea2b1
+Music_ElmsLab_Ch3: ; ea1fd
+	stereopanning $f
+	notetype $c, $25
+	note __, 7
+	note __, 13
+	octave 3
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
 
-_Music_ElmsLab_Ch4: ; 0xea2b1
+Music_ElmsLab_branch_ea216: ; ea216
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note D_, 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note A#, 1
+	note D_, 1
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note D_, 1
+	note A#, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G_, 3
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	note D_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	note D_, 1
+	note A_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	note D_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note C_, 3
+	note D_, 3
+	note E_, 3
+	note G_, 3
+	note E_, 3
+	note F_, 3
+	note F#, 3
+	note G_, 3
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	loopchannel 0, Music_ElmsLab_branch_ea216
+
+Music_ElmsLab_Ch4: ; ea2b1
 	stereopanning $f0
-	togglenoise $00
-	notetype $0c
-	note $0f
-	note $01
-	note $83
-	loopchannel $00, $62b9 ; end
-; 0xea2be
+	togglenoise $0
+	notetype $c
+	note __, 15
+	note __, 1
+
+Music_ElmsLab_branch_ea2b9: ; ea2b9
+	note G_, 3
+	loopchannel 0, Music_ElmsLab_branch_ea2b9
+; ea2be
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -1,216 +1,212 @@
-_Music_Evolution: ; 0xf06e1
-	db $c0
-	dw _Music_Evolution_Ch1
-	db $01
-	dw _Music_Evolution_Ch2
-	db $02
-	dw _Music_Evolution_Ch3
-	db $03
-	dw _Music_Evolution_Ch4
-; 0xf06ed
+Music_Evolution: ; f06e1
+	dbw $c0, Music_Evolution_Ch1
+	dbw $01, Music_Evolution_Ch2
+	dbw $02, Music_Evolution_Ch3
+	dbw $03, Music_Evolution_Ch4
+; f06ed
 
-_Music_Evolution_Ch1: ; 0xf06ed
-	tempo $8400
+
+Music_Evolution_Ch1: ; f06ed
+	tempo 132
 	volume $77
-	vibrato $06, $34
-	tone $0100
-	dutycycle $02
-	notetype $0c, $92
-	octave3
-	unknownmusic0xe0 $00, $4a
-	note $10
-	unknownmusic0xe0 $00, $4a
-	note $80
-	unknownmusic0xe0 $00, $4a
-	note $10
-	unknownmusic0xe0 $00, $4a
-	note $80
-	note $03
-	dutycycle $03
-	stereopanning $0f
-	callchannel _Music_Evolution_sub_0xf0737
-	notetype $0c, $a4
-	note $73
-	callchannel _Music_Evolution_sub_0xf0737
-	notetype $0c, $a4
-	note $73
-	loopchannel $02, $4713
-	callchannel _Music_Evolution_sub_0xf0743
-	notetype $0c, $a4
-	note $93
-	callchannel _Music_Evolution_sub_0xf0743
-	notetype $0c, $a4
-	note $93
-	loopchannel $00, $4713 ; end
-; 0xf0737
+	vibrato $6, $34
+	tone $0001
+	dutycycle $2
+	notetype $c, $92
+	octave 3
+	unknownmusic0xe0 $0, $4a
+	note C_, 0
+	unknownmusic0xe0 $0, $4a
+	note G_, 0
+	unknownmusic0xe0 $0, $4a
+	note C_, 0
+	unknownmusic0xe0 $0, $4a
+	note G_, 0
+	note __, 3
+	dutycycle $3
+	stereopanning $f
 
-_Music_Evolution_sub_0xf0737: ; 0xf0737
-; subroutine
-	notetype $0c, $a2
-	octave3
-	note $13
-	note $83
-	note $13
-	note $83
-	note $13
-	note $83
-	note $13
-	endchannel ; end
-; 0xf0743
+Music_Evolution_branch_f0713: ; f0713
+	callchannel Music_Evolution_branch_f0737
+	notetype $c, $a4
+	note F#, 3
+	callchannel Music_Evolution_branch_f0737
+	notetype $c, $a4
+	note F#, 3
+	loopchannel 2, Music_Evolution_branch_f0713
+	callchannel Music_Evolution_branch_f0743
+	notetype $c, $a4
+	note G#, 3
+	callchannel Music_Evolution_branch_f0743
+	notetype $c, $a4
+	note G#, 3
+	loopchannel 0, Music_Evolution_branch_f0713
+; f0737
 
-_Music_Evolution_sub_0xf0743: ; 0xf0743
-; subroutine
-	notetype $0c, $a2
-	octave3
-	note $33
-	note $a3
-	note $33
-	note $a3
-	note $33
-	note $a3
-	note $33
-	endchannel ; end
-; 0xf074f
+Music_Evolution_branch_f0737: ; f0737
+	notetype $c, $a2
+	octave 3
+	note C_, 3
+	note G_, 3
+	note C_, 3
+	note G_, 3
+	note C_, 3
+	note G_, 3
+	note C_, 3
+	endchannel
+; f0743
 
-_Music_Evolution_Ch2: ; 0xf074f
-	dutycycle $02
-	vibrato $08, $25
-	notetype $0c, $a2
-	octave4
-	note $80
-	note $30
-	note $80
-	note $30
-	note $03
-	dutycycle $03
+Music_Evolution_branch_f0743: ; f0743
+	notetype $c, $a2
+	octave 3
+	note D_, 3
+	note A_, 3
+	note D_, 3
+	note A_, 3
+	note D_, 3
+	note A_, 3
+	note D_, 3
+	endchannel
+
+Music_Evolution_Ch2: ; f074f
+	dutycycle $2
+	vibrato $8, $25
+	notetype $c, $a2
+	octave 4
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note __, 3
+	dutycycle $3
 	stereopanning $f0
-	callchannel _Music_Evolution_sub_0xf0787
-	notetype $0c, $b5
-	note $a3
-	callchannel _Music_Evolution_sub_0xf0787
-	notetype $0c, $b5
-	note $c3
-	loopchannel $02, $4761
-	callchannel _Music_Evolution_sub_0xf0793
-	notetype $0c, $b5
-	note $c3
-	callchannel _Music_Evolution_sub_0xf0793
-	notetype $0c, $b5
-	octave4
-	note $23
-	octave3
-	loopchannel $00, $4761 ; end
-; 0xf0787
 
-_Music_Evolution_sub_0xf0787: ; 0xf0787
-; subroutine
-	notetype $0c, $b2
-	octave3
-	note $83
-	note $33
-	note $83
-	note $33
-	note $83
-	note $33
-	note $83
-	endchannel ; end
-; 0xf0793
+Music_Evolution_branch_f0761: ; f0761
+	callchannel Music_Evolution_branch_f0787
+	notetype $c, $b5
+	note A_, 3
+	callchannel Music_Evolution_branch_f0787
+	notetype $c, $b5
+	note B_, 3
+	loopchannel 2, Music_Evolution_branch_f0761
+	callchannel Music_Evolution_branch_f0793
+	notetype $c, $b5
+	note B_, 3
+	callchannel Music_Evolution_branch_f0793
+	notetype $c, $b5
+	octave 4
+	note C#, 3
+	octave 3
+	loopchannel 0, Music_Evolution_branch_f0761
+; f0787
 
-_Music_Evolution_sub_0xf0793: ; 0xf0793
-; subroutine
-	notetype $0c, $b2
-	octave3
-	note $a3
-	note $53
-	note $a3
-	note $53
-	note $a3
-	note $53
-	note $a3
-	endchannel ; end
-; 0xf079f
+Music_Evolution_branch_f0787: ; f0787
+	notetype $c, $b2
+	octave 3
+	note G_, 3
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 3
+	endchannel
+; f0793
 
-_Music_Evolution_Ch3: ; 0xf079f
-	notetype $0c, $16
-	note $07
-	callchannel _Music_Evolution_sub_0xf07bf
-	octave3
-	note $a3
-	callchannel _Music_Evolution_sub_0xf07bf
-	octave3
-	note $c3
-	loopchannel $02, $47a3
-	callchannel _Music_Evolution_sub_0xf07d5
-	octave3
-	note $c3
-	callchannel _Music_Evolution_sub_0xf07d5
-	octave4
-	note $23
-	loopchannel $00, $47a3 ; end
-; 0xf07bf
+Music_Evolution_branch_f0793: ; f0793
+	notetype $c, $b2
+	octave 3
+	note A_, 3
+	note E_, 3
+	note A_, 3
+	note E_, 3
+	note A_, 3
+	note E_, 3
+	note A_, 3
+	endchannel
 
-_Music_Evolution_sub_0xf07bf: ; 0xf07bf
-; subroutine
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave2
-	note $a1
-	note $01
-	endchannel ; end
-; 0xf07d5
+Music_Evolution_Ch3: ; f079f
+	notetype $c, $16
+	note __, 7
 
-_Music_Evolution_sub_0xf07d5: ; 0xf07d5
-; subroutine
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $51
-	note $01
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $51
-	note $01
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $51
-	note $01
-	octave2
-	note $a1
-	note $01
-	endchannel ; end
-; 0xf07eb
+Music_Evolution_branch_f07a3: ; f07a3
+	callchannel Music_Evolution_branch_f07bf
+	octave 3
+	note A_, 3
+	callchannel Music_Evolution_branch_f07bf
+	octave 3
+	note B_, 3
+	loopchannel 2, Music_Evolution_branch_f07a3
+	callchannel Music_Evolution_branch_f07d5
+	octave 3
+	note B_, 3
+	callchannel Music_Evolution_branch_f07d5
+	octave 4
+	note C#, 3
+	loopchannel 0, Music_Evolution_branch_f07a3
+; f07bf
 
-_Music_Evolution_Ch4: ; 0xf07eb
-	togglenoise $05
-	notetype $0c
-	note $07
+Music_Evolution_branch_f07bf: ; f07bf
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	endchannel
+; f07d5
+
+Music_Evolution_branch_f07d5: ; f07d5
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	endchannel
+
+Music_Evolution_Ch4: ; f07eb
+	togglenoise $5
+	notetype $c
+	note __, 7
+
+Music_Evolution_branch_f07f0: ; f07f0
 	stereopanning $f0
-	note $b5
-	note $b3
-	stereopanning $0f
-	note $51
-	note $51
-	note $51
-	loopchannel $00, $47f0 ; end
-; 0xf07fd
+	note A#, 5
+	note A#, 3
+	stereopanning $f
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	loopchannel 0, Music_Evolution_branch_f07f0
+; f07fd
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,818 +1,836 @@
-_Music_GameCorner: ; 0xedd6d
-	db $c0
-	dw _Music_GameCorner_Ch1
-	db $01
-	dw _Music_GameCorner_Ch2
-	db $02
-	dw _Music_GameCorner_Ch3
-	db $03
-	dw _Music_GameCorner_Ch4
-; 0xedd79
+Music_GameCorner: ; edd6d
+	dbw $c0, Music_GameCorner_Ch1
+	dbw $01, Music_GameCorner_Ch2
+	dbw $02, Music_GameCorner_Ch3
+	dbw $03, Music_GameCorner_Ch4
+; edd79
 
-_Music_GameCorner_Ch1: ; 0xedd79
-	tempo $9300
+
+Music_GameCorner_Ch1: ; edd79
+	tempo 147
 	volume $77
-	stereopanning $0f
-	notetype $0c, $91
-	note $07
+	stereopanning $f
+	notetype $c, $91
+	note __, 7
+
+Music_GameCorner_branch_edd84: ; edd84
 	intensity $91
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede13
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede03
-	callchannel _Music_GameCorner_sub_0xede13
-	octave3
-	note $01
-	note $92
-	note $92
-	note $b1
-	note $b1
-	note $91
-	note $81
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede13
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede03
+	callchannel Music_GameCorner_branch_ede13
+	octave 3
+	note __, 1
+	note G#, 2
+	note G#, 2
+	note A#, 1
+	note A#, 1
+	note G#, 1
+	note G_, 1
 	intensity $71
-	octave4
-	note $90
-	octave5
-	note $10
-	note $60
-	note $10
-	loopchannel $04, $5db1
-	octave4
-	note $b0
-	octave5
-	note $30
-	note $80
-	note $30
-	loopchannel $04, $5dbb
-	octave4
-	note $40
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
-	loopchannel $04, $5dc5
-	octave4
-	note $60
-	note $a0
-	octave5
-	note $10
-	octave4
-	note $a0
-	loopchannel $04, $5dd0
-	octave4
-	note $90
-	octave5
-	note $10
-	note $60
-	note $10
-	loopchannel $04, $5ddb
-	octave4
-	note $b0
-	octave5
-	note $30
-	note $80
-	note $30
-	loopchannel $04, $5de5
-	octave4
-	note $c0
-	octave5
-	note $30
-	note $80
-	note $30
-	loopchannel $04, $5def
-	octave3
-	note $30
-	note $30
-	note $32
-	note $61
-	note $68
-	loopchannel $00, $5d84 ; end
-; 0xede03
 
-_Music_GameCorner_sub_0xede03: ; 0xede03
-; subroutine
-	note $01
-	octave4
-	note $b2
-	note $82
-	note $42
-	octave3
-	note $62
-	note $61
-	note $01
-	note $92
-	note $92
-	note $b1
-	note $b1
-	note $90
-	note $b2
-	endchannel ; end
-; 0xede13
+Music_GameCorner_branch_eddb1: ; eddb1
+	octave 4
+	note G#, 0
+	octave 5
+	note C_, 0
+	note F_, 0
+	note C_, 0
+	loopchannel 4, Music_GameCorner_branch_eddb1
 
-_Music_GameCorner_sub_0xede13: ; 0xede13
-; subroutine
-	note $01
-	octave4
-	note $b2
-	note $82
-	note $42
-	octave3
-	note $62
-	note $61
-	endchannel ; end
-; 0xede1c
+Music_GameCorner_branch_eddbb: ; eddbb
+	octave 4
+	note A#, 0
+	octave 5
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	loopchannel 4, Music_GameCorner_branch_eddbb
 
-_Music_GameCorner_Ch2: ; 0xede1c
+Music_GameCorner_branch_eddc5: ; eddc5
+	octave 4
+	note D#, 0
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
+	loopchannel 4, Music_GameCorner_branch_eddc5
+
+Music_GameCorner_branch_eddd0: ; eddd0
+	octave 4
+	note F_, 0
+	note A_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note A_, 0
+	loopchannel 4, Music_GameCorner_branch_eddd0
+
+Music_GameCorner_branch_edddb: ; edddb
+	octave 4
+	note G#, 0
+	octave 5
+	note C_, 0
+	note F_, 0
+	note C_, 0
+	loopchannel 4, Music_GameCorner_branch_edddb
+
+Music_GameCorner_branch_edde5: ; edde5
+	octave 4
+	note A#, 0
+	octave 5
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	loopchannel 4, Music_GameCorner_branch_edde5
+
+Music_GameCorner_branch_eddef: ; eddef
+	octave 4
+	note B_, 0
+	octave 5
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	loopchannel 4, Music_GameCorner_branch_eddef
+	octave 3
+	note D_, 0
+	note D_, 0
+	note D_, 2
+	note F_, 1
+	note F_, 8
+	loopchannel 0, Music_GameCorner_branch_edd84
+; ede03
+
+Music_GameCorner_branch_ede03: ; ede03
+	note __, 1
+	octave 4
+	note A#, 2
+	note G_, 2
+	note D#, 2
+	octave 3
+	note F_, 2
+	note F_, 1
+	note __, 1
+	note G#, 2
+	note G#, 2
+	note A#, 1
+	note A#, 1
+	note G#, 0
+	note A#, 2
+	endchannel
+; ede13
+
+Music_GameCorner_branch_ede13: ; ede13
+	note __, 1
+	octave 4
+	note A#, 2
+	note G_, 2
+	note D#, 2
+	octave 3
+	note F_, 2
+	note F_, 1
+	endchannel
+
+Music_GameCorner_Ch2: ; ede1c
 	stereopanning $ff
-	vibrato $08, $24
-	notetype $0c, $a1
-	note $07
+	vibrato $8, $24
+	notetype $c, $a1
+	note __, 7
+
+Music_GameCorner_branch_ede25: ; ede25
 	intensity $92
-	dutycycle $01
-	callchannel _Music_GameCorner_sub_0xede75
-	octave1
-	note $61
-	octave3
-	note $91
-	octave1
-	note $60
-	octave3
-	note $91
+	dutycycle $1
+	callchannel Music_GameCorner_branch_ede75
+	octave 1
+	note F_, 1
+	octave 3
+	note G#, 1
+	octave 1
+	note F_, 0
+	octave 3
+	note G#, 1
 	intensity $a4
-	note $92
+	note G#, 2
 	intensity $92
-	note $81
-	note $b0
-	octave4
-	note $12
-	callchannel _Music_GameCorner_sub_0xede75
-	octave4
-	note $61
-	note $41
-	note $60
-	note $41
+	note G_, 1
+	note A#, 0
+	octave 4
+	note C_, 2
+	callchannel Music_GameCorner_branch_ede75
+	octave 4
+	note F_, 1
+	note D#, 1
+	note F_, 0
+	note D#, 1
 	intensity $a4
-	note $82
-	note $63
-	dutycycle $02
+	note G_, 2
+	note F_, 3
+	dutycycle $2
 	intensity $c7
-	octave3
-	note $40
-	note $60
-	note $85
-	note $65
-	note $13
-	note $35
-	note $45
-	note $63
-	note $35
-	note $15
-	octave2
-	note $b3
-	note $a3
-	note $09
-	octave3
-	note $40
-	note $60
-	note $85
-	note $65
-	note $13
-	note $35
-	note $45
-	note $61
-	note $40
-	note $60
-	note $8f
+	octave 3
+	note D#, 0
+	note F_, 0
+	note G_, 5
+	note F_, 5
+	note C_, 3
+	note D_, 5
+	note D#, 5
+	note F_, 3
+	note D_, 5
+	note C_, 5
+	octave 2
+	note A#, 3
+	note A_, 3
+	note __, 9
+	octave 3
+	note D#, 0
+	note F_, 0
+	note G_, 5
+	note F_, 5
+	note C_, 3
+	note D_, 5
+	note D#, 5
+	note F_, 1
+	note D#, 0
+	note F_, 0
+	note G_, 15
 	intensity $92
-	note $80
-	note $80
-	note $82
-	note $b1
-	note $b8
+	note G_, 0
+	note G_, 0
+	note G_, 2
+	note A#, 1
+	note A#, 8
 	intensity $a4
-	loopchannel $00, $5e25 ; end
-; 0xede75
+	loopchannel 0, Music_GameCorner_branch_ede25
+; ede75
 
-_Music_GameCorner_sub_0xede75: ; 0xede75
-; subroutine
-	octave1
-	note $11
-	octave3
-	note $42
-	note $42
-	note $42
-	note $62
-	note $61
-	octave1
-	note $11
-	octave3
-	note $42
-	note $42
-	note $61
-	note $61
-	note $40
-	note $62
-	octave1
-	note $11
-	octave3
-	note $42
-	note $42
-	note $42
-	note $62
-	note $61
-	octave1
-	note $11
-	octave3
-	note $42
-	note $42
-	note $61
-	note $11
-	note $40
-	note $62
-	octave1
-	note $11
-	octave5
-	note $32
-	octave4
-	note $b2
-	note $81
-	note $11
-	note $31
-	note $41
-	note $61
-	note $41
-	note $60
-	note $41
+Music_GameCorner_branch_ede75: ; ede75
+	octave 1
+	note C_, 1
+	octave 3
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note F_, 2
+	note F_, 1
+	octave 1
+	note C_, 1
+	octave 3
+	note D#, 2
+	note D#, 2
+	note F_, 1
+	note F_, 1
+	note D#, 0
+	note F_, 2
+	octave 1
+	note C_, 1
+	octave 3
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note F_, 2
+	note F_, 1
+	octave 1
+	note C_, 1
+	octave 3
+	note D#, 2
+	note D#, 2
+	note F_, 1
+	note C_, 1
+	note D#, 0
+	note F_, 2
+	octave 1
+	note C_, 1
+	octave 5
+	note D_, 2
+	octave 4
+	note A#, 2
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 0
+	note D#, 1
 	intensity $a4
-	note $62
-	note $83
+	note F_, 2
+	note G_, 3
 	intensity $92
-	note $70
-	note $60
-	octave1
-	note $11
-	octave5
-	note $32
-	octave4
-	note $b2
-	note $81
-	note $11
-	note $31
-	note $41
-	octave1
-	note $60
-	octave4
-	note $60
-	note $41
-	note $80
-	note $41
+	note F#, 0
+	note F_, 0
+	octave 1
+	note C_, 1
+	octave 5
+	note D_, 2
+	octave 4
+	note A#, 2
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	octave 1
+	note F_, 0
+	octave 4
+	note F_, 0
+	note D#, 1
+	note G_, 0
+	note D#, 1
 	intensity $a4
-	note $b2
-	note $a1
+	note A#, 2
+	note A_, 1
 	intensity $92
-	note $b0
-	octave5
-	note $12
-	octave1
-	note $11
-	octave5
-	note $32
-	octave4
-	note $b2
-	note $81
-	note $11
-	note $31
-	note $41
-	note $61
-	note $41
-	note $60
-	note $41
+	note A#, 0
+	octave 5
+	note C_, 2
+	octave 1
+	note C_, 1
+	octave 5
+	note D_, 2
+	octave 4
+	note A#, 2
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 0
+	note D#, 1
 	intensity $a4
-	note $62
-	note $83
+	note F_, 2
+	note G_, 3
 	intensity $92
-	note $70
-	note $60
-	octave1
-	note $11
-	octave5
-	note $32
-	octave4
-	note $b2
-	note $81
-	note $11
-	note $31
-	note $41
-	endchannel ; end
-; 0xedee8
+	note F#, 0
+	note F_, 0
+	octave 1
+	note C_, 1
+	octave 5
+	note D_, 2
+	octave 4
+	note A#, 2
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	endchannel
 
-_Music_GameCorner_Ch3: ; 0xedee8
-	vibrato $08, $22
-	notetype $0c, $14
-	note $07
+Music_GameCorner_Ch3: ; edee8
+	vibrato $8, $22
+	notetype $c, $14
+	note __, 7
+
+Music_GameCorner_branch_edeef: ; edeef
 	stereopanning $ff
-	notetype $0c, $14
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xedff8
-	octave4
-	note $80
-	note $a2
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xedff8
-	octave4
-	note $b0
-	octave5
-	note $12
+	notetype $c, $14
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_edff8
+	octave 4
+	note G_, 0
+	note A_, 2
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_edff8
+	octave 4
+	note A#, 0
+	octave 5
+	note C_, 2
 	stereopanning $f0
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee00c
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee024
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee00c
-	callchannel _Music_GameCorner_sub_0xedfdd
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee00c
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee024
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee00c
+	callchannel Music_GameCorner_branch_edfdd
 	stereopanning $ff
-	octave2
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave2
-	note $60
-	octave5
-	note $10
-	octave3
-	note $60
-	octave5
-	note $42
-	note $30
-	note $00
-	note $40
-	note $60
-	note $01
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xedff8
-	octave4
-	note $80
-	note $a2
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xedff8
-	octave4
-	note $b0
-	octave5
-	note $12
+	octave 2
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 2
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note D#, 2
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note F_, 0
+	note __, 1
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_edff8
+	octave 4
+	note G_, 0
+	note A_, 2
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_edff8
+	octave 4
+	note A#, 0
+	octave 5
+	note C_, 2
 	stereopanning $f0
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee00c
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee024
-	callchannel _Music_GameCorner_sub_0xedfdd
-	callchannel _Music_GameCorner_sub_0xee00c
-	callchannel _Music_GameCorner_sub_0xedfdd
-	octave2
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $40
-	note $00
-	note $30
-	note $00
-	note $10
-	note $00
-	octave4
-	note $b0
-	note $00
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee00c
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee024
+	callchannel Music_GameCorner_branch_edfdd
+	callchannel Music_GameCorner_branch_ee00c
+	callchannel Music_GameCorner_branch_edfdd
+	octave 2
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
 	intensity $15
-	callchannel _Music_GameCorner_sub_0xee03f
-	octave2
-	note $11
-	note $00
-	note $10
-	octave3
-	note $10
-	octave2
-	note $10
-	note $00
-	note $10
-	note $10
-	octave3
-	note $10
-	octave2
-	note $11
-	octave3
-	note $10
-	octave2
-	note $10
-	note $00
-	octave3
-	note $10
-	octave2
-	note $61
-	note $00
-	note $60
-	octave3
-	note $60
-	octave2
-	note $60
-	note $00
-	note $60
-	note $60
-	octave3
-	note $60
-	octave2
-	note $61
-	octave3
-	note $60
-	octave2
-	note $60
-	note $00
-	octave3
-	note $60
-	callchannel _Music_GameCorner_sub_0xee03f
-	octave2
-	note $81
-	note $00
-	note $80
-	octave3
-	note $80
-	octave2
-	note $80
-	note $00
-	note $80
-	note $80
-	octave3
-	note $80
-	octave2
-	note $81
-	octave3
-	note $80
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	octave2
-	note $c0
-	note $c0
-	note $c0
-	note $01
-	note $c0
-	note $00
-	note $c0
-	note $03
-	notetype $06, $15
-	octave3
-	note $30
-	note $10
-	octave2
-	note $c0
-	note $a0
-	note $80
-	note $60
-	note $50
-	note $30
-	loopchannel $00, $5eef ; end
-; 0xedfdd
+	callchannel Music_GameCorner_branch_ee03f
+	octave 2
+	note C_, 1
+	note __, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note C_, 1
+	octave 3
+	note C_, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note F_, 1
+	note __, 0
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 1
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	callchannel Music_GameCorner_branch_ee03f
+	octave 2
+	note G_, 1
+	note __, 0
+	note G_, 0
+	octave 3
+	note G_, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note G_, 0
+	octave 3
+	note G_, 0
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	octave 2
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note __, 1
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 3
+	notetype $6, $15
+	octave 3
+	note D_, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	note F_, 0
+	note E_, 0
+	note D_, 0
+	loopchannel 0, Music_GameCorner_branch_edeef
+; edfdd
 
-_Music_GameCorner_sub_0xedfdd: ; 0xedfdd
-; subroutine
-	octave2
-	note $10
-	octave3
-	note $10
-	octave4
-	note $80
-	note $10
-	octave3
-	note $10
-	octave4
-	note $80
-	note $10
-	octave3
-	note $10
-	octave4
-	note $80
-	note $10
-	octave3
-	note $10
-	octave4
-	note $a0
-	note $10
-	octave3
-	note $10
-	octave4
-	note $a1
-	endchannel ; end
-; 0xedff8
+Music_GameCorner_branch_edfdd: ; edfdd
+	octave 2
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note G_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note G_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note G_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note A_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note A_, 1
+	endchannel
+; edff8
 
-_Music_GameCorner_sub_0xedff8: ; 0xedff8
-; subroutine
-	octave2
-	note $10
-	octave3
-	note $10
-	octave4
-	note $80
-	note $10
-	octave3
-	note $10
-	octave4
-	note $80
-	note $10
-	octave3
-	note $10
-	octave4
-	note $b0
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xee00c
+Music_GameCorner_branch_edff8: ; edff8
+	octave 2
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note G_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note G_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	endchannel
+; ee00c
 
-_Music_GameCorner_sub_0xee00c: ; 0xee00c
-; subroutine
-	octave2
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $40
-	note $00
-	note $30
-	note $00
-	note $10
-	note $32
-	endchannel ; end
-; 0xee024
+Music_GameCorner_branch_ee00c: ; ee00c
+	octave 2
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note D_, 2
+	endchannel
+; ee024
 
-_Music_GameCorner_sub_0xee024: ; 0xee024
-; subroutine
-	octave2
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $10
-	octave4
-	note $60
-	octave3
-	note $60
-	octave5
-	note $40
-	note $00
-	note $30
-	note $00
-	note $10
-	note $30
-	octave3
-	note $60
-	note $00
-	endchannel ; end
-; 0xee03f
+Music_GameCorner_branch_ee024: ; ee024
+	octave 2
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 5
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note D_, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	endchannel
+; ee03f
 
-_Music_GameCorner_sub_0xee03f: ; 0xee03f
-; subroutine
-	octave2
-	note $61
-	note $00
-	note $60
-	octave3
-	note $60
-	octave2
-	note $60
-	note $00
-	note $60
-	note $60
-	octave3
-	note $60
-	octave2
-	note $61
-	octave3
-	note $60
-	octave2
-	note $60
-	note $00
-	octave3
-	note $60
-	octave2
-	note $81
-	note $00
-	note $80
-	octave3
-	note $80
-	octave2
-	note $80
-	note $00
-	note $80
-	note $80
-	octave3
-	note $80
-	octave2
-	note $60
-	octave3
-	note $60
-	octave2
-	note $40
-	octave3
-	note $40
-	octave2
-	note $30
-	octave3
-	note $30
-	endchannel ; end
-; 0xee06f
+Music_GameCorner_branch_ee03f: ; ee03f
+	octave 2
+	note F_, 1
+	note __, 0
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 1
+	octave 3
+	note F_, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note G_, 1
+	note __, 0
+	note G_, 0
+	octave 3
+	note G_, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note G_, 0
+	octave 3
+	note G_, 0
+	octave 2
+	note F_, 0
+	octave 3
+	note F_, 0
+	octave 2
+	note D#, 0
+	octave 3
+	note D#, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	endchannel
 
-_Music_GameCorner_Ch4: ; 0xee06f
-	togglenoise $03
-	notetype $0c
-	notetype $08
-	note $30
-	note $30
-	note $30
-	notetype $0c
-	note $30
-	note $30
-	note $31
-	note $30
-	note $30
-	callchannel _Music_GameCorner_sub_0xee106
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	loopchannel $06, $6082
-	callchannel _Music_GameCorner_sub_0xee10f
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	loopchannel $03, $6091
-	note $0b
-	note $30
-	note $30
-	note $71
-	callchannel _Music_GameCorner_sub_0xee106
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	loopchannel $06, $60a4
-	callchannel _Music_GameCorner_sub_0xee10f
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	loopchannel $03, $60b3
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $30
-	note $30
-	note $30
-	note $30
-	note $b1
-	note $70
-	note $40
-	note $30
-	note $40
-	note $70
-	note $40
-	note $40
-	note $30
-	note $70
-	note $40
-	note $31
-	note $71
-	loopchannel $03, $60c9
-	note $b1
-	note $70
-	note $40
-	note $30
-	note $40
-	note $70
-	note $40
-	note $40
-	note $30
-	note $70
-	note $40
-	note $31
-	note $30
-	note $30
-	note $b1
-	note $70
-	note $40
-	note $30
-	note $40
-	note $70
-	note $40
-	note $40
-	note $30
-	note $70
-	note $40
-	note $31
-	note $71
-	loopchannel $03, $60e8
-	note $30
-	note $30
-	note $31
-	note $b0
-	note $71
-	note $74
-	note $30
-	note $30
-	note $41
-	loopchannel $00, $607f ; end
-; 0xee106
+Music_GameCorner_Ch4: ; ee06f
+	togglenoise $3
+	notetype $c
+	notetype $8
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	notetype $c
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 0
+	note D_, 0
 
-_Music_GameCorner_sub_0xee106: ; 0xee106
-; subroutine
-	note $11
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	endchannel ; end
-; 0xee10f
+Music_GameCorner_branch_ee07f: ; ee07f
+	callchannel Music_GameCorner_branch_ee106
 
-_Music_GameCorner_sub_0xee10f: ; 0xee10f
-; subroutine
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $30
-	note $30
-	note $71
-	endchannel ; end
-; 0xee119
+Music_GameCorner_branch_ee082: ; ee082
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 6, Music_GameCorner_branch_ee082
+	callchannel Music_GameCorner_branch_ee10f
+
+Music_GameCorner_branch_ee091: ; ee091
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GameCorner_branch_ee091
+	note __, 11
+	note D_, 0
+	note D_, 0
+	note F#, 1
+	callchannel Music_GameCorner_branch_ee106
+
+Music_GameCorner_branch_ee0a4: ; ee0a4
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 6, Music_GameCorner_branch_ee0a4
+	callchannel Music_GameCorner_branch_ee10f
+
+Music_GameCorner_branch_ee0b3: ; ee0b3
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GameCorner_branch_ee0b3
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+
+Music_GameCorner_branch_ee0c9: ; ee0c9
+	note A#, 1
+	note F#, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note F#, 0
+	note D#, 0
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GameCorner_branch_ee0c9
+	note A#, 1
+	note F#, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note F#, 0
+	note D#, 0
+	note D_, 1
+	note D_, 0
+	note D_, 0
+
+Music_GameCorner_branch_ee0e8: ; ee0e8
+	note A#, 1
+	note F#, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note F#, 0
+	note D#, 0
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GameCorner_branch_ee0e8
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note A#, 0
+	note F#, 1
+	note F#, 4
+	note D_, 0
+	note D_, 0
+	note D#, 1
+	loopchannel 0, Music_GameCorner_branch_ee07f
+; ee106
+
+Music_GameCorner_branch_ee106: ; ee106
+	note C_, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	endchannel
+; ee10f
+
+Music_GameCorner_branch_ee10f: ; ee10f
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note F#, 1
+	endchannel
+; ee119
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -1,494 +1,490 @@
-_Music_GoldenrodCity: ; 0xeb453
-	db $c0
-	dw _Music_GoldenrodCity_Ch1
-	db $01
-	dw _Music_GoldenrodCity_Ch2
-	db $02
-	dw _Music_GoldenrodCity_Ch3
-	db $03
-	dw _Music_GoldenrodCity_Ch4
-; 0xeb45f
+Music_GoldenrodCity: ; eb453
+	dbw $c0, Music_GoldenrodCity_Ch1
+	dbw $01, Music_GoldenrodCity_Ch2
+	dbw $02, Music_GoldenrodCity_Ch3
+	dbw $03, Music_GoldenrodCity_Ch4
+; eb45f
 
-_Music_GoldenrodCity_Ch1: ; 0xeb45f
-	stereopanning $0f
-	tempo $b000
+
+Music_GoldenrodCity_Ch1: ; eb45f
+	stereopanning $f
+	tempo 176
 	volume $77
-	notetype $0c, $97
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	dutycycle $00
-	callchannel _Music_GoldenrodCity_sub_0xeb4a9
-	octave3
-	note $90
-	octave4
-	note $10
-	note $40
-	note $70
-	note $40
-	note $70
-	note $90
-	octave5
-	note $10
+	notetype $c, $97
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+
+Music_GoldenrodCity_branch_eb46d: ; eb46d
+	dutycycle $0
+	callchannel Music_GoldenrodCity_branch_eb4a9
+	octave 3
+	note G#, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note F#, 0
+	note G#, 0
+	octave 5
+	note C_, 0
 	intensity $71
-	dutycycle $00
-	callchannel _Music_GoldenrodCity_sub_0xeb4d1
+	dutycycle $0
+	callchannel Music_GoldenrodCity_branch_eb4d1
 	intensity $77
-	note $41
-	note $61
-	note $71
-	note $93
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note G#, 3
 	intensity $71
-	callchannel _Music_GoldenrodCity_sub_0xeb4d1
-	note $40
-	note $70
+	callchannel Music_GoldenrodCity_branch_eb4d1
+	note D#, 0
+	note F#, 0
 	intensity $77
-	octave5
-	note $11
-	octave4
-	note $91
-	note $71
-	note $41
-	dutycycle $02
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	note F#, 1
+	note D#, 1
+	dutycycle $2
 	intensity $97
-	callchannel _Music_GoldenrodCity_sub_0xeb4a9
-	note $13
-	octave3
-	note $91
-	octave4
-	note $11
-	loopchannel $00, $746d ; end
-; 0xeb4a9
+	callchannel Music_GoldenrodCity_branch_eb4a9
+	note C_, 3
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	loopchannel 0, Music_GoldenrodCity_branch_eb46d
+; eb4a9
 
-_Music_GoldenrodCity_sub_0xeb4a9: ; 0xeb4a9
-; subroutine
-	octave4
-	note $21
-	octave3
-	note $90
-	note $02
-	note $90
-	note $00
-	octave4
-	note $11
-	octave3
-	note $90
-	note $02
-	note $90
-	note $00
-	note $b1
-	note $60
-	note $00
-	note $21
-	note $60
-	note $00
-	note $41
-	note $11
-	note $21
-	note $41
-	note $71
-	note $20
-	note $02
-	note $20
-	note $00
-	note $71
-	note $20
-	note $00
-	note $71
-	note $b1
-	note $21
-	note $41
-	note $91
-	octave4
-	note $21
-	endchannel ; end
-; 0xeb4d1
+Music_GoldenrodCity_branch_eb4a9: ; eb4a9
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	note __, 2
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 0
+	note __, 2
+	note G#, 0
+	note __, 0
+	note A#, 1
+	note F_, 0
+	note __, 0
+	note C#, 1
+	note F_, 0
+	note __, 0
+	note D#, 1
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note F#, 1
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 0
+	note F#, 1
+	note C#, 0
+	note __, 0
+	note F#, 1
+	note A#, 1
+	note C#, 1
+	note D#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	endchannel
+; eb4d1
 
-_Music_GoldenrodCity_sub_0xeb4d1: ; 0xeb4d1
-; subroutine
-	octave4
-	note $60
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	note $60
-	note $90
-	note $60
-	note $90
-	note $20
-	octave3
-	note $90
-	note $60
-	note $90
-	octave4
-	note $20
-	note $60
-	note $20
-	note $60
-	note $40
-	note $10
-	octave3
-	note $90
-	octave4
-	note $10
-	note $40
-	note $70
-	note $40
-	note $70
-	note $10
-	octave3
-	note $90
-	note $70
-	note $90
-	octave4
-	note $10
-	note $40
-	note $10
-	note $40
-	note $20
-	octave3
-	note $b0
-	note $70
-	note $b0
-	octave4
-	note $20
-	note $60
-	note $20
-	note $60
-	octave3
-	note $b0
-	note $70
-	note $20
-	note $70
-	note $b0
-	octave4
-	note $20
-	octave3
-	note $b0
-	octave4
-	note $20
-	note $40
-	note $10
-	octave3
-	note $90
-	octave4
-	note $10
-	note $40
-	note $70
-	endchannel ; end
-; 0xeb519
+Music_GoldenrodCity_branch_eb4d1: ; eb4d1
+	octave 4
+	note F_, 0
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	note F_, 0
+	note G#, 0
+	note F_, 0
+	note G#, 0
+	note C#, 0
+	octave 3
+	note G#, 0
+	note F_, 0
+	note G#, 0
+	octave 4
+	note C#, 0
+	note F_, 0
+	note C#, 0
+	note F_, 0
+	note D#, 0
+	note C_, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note F#, 0
+	note C_, 0
+	octave 3
+	note G#, 0
+	note F#, 0
+	note G#, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note C_, 0
+	note D#, 0
+	note C#, 0
+	octave 3
+	note A#, 0
+	note F#, 0
+	note A#, 0
+	octave 4
+	note C#, 0
+	note F_, 0
+	note C#, 0
+	note F_, 0
+	octave 3
+	note A#, 0
+	note F#, 0
+	note C#, 0
+	note F#, 0
+	note A#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note A#, 0
+	octave 4
+	note C#, 0
+	note D#, 0
+	note C_, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note F#, 0
+	endchannel
 
-_Music_GoldenrodCity_Ch2: ; 0xeb519
+Music_GoldenrodCity_Ch2: ; eb519
 	stereopanning $f0
 	vibrato $12, $23
-	dutycycle $02
-	notetype $0c, $97
+	dutycycle $2
+	notetype $c, $97
+
+Music_GoldenrodCity_branch_eb523: ; eb523
 	intensity $97
-	callchannel _Music_GoldenrodCity_sub_0xeb555
-	octave4
-	note $61
-	note $71
-	note $91
-	note $61
-	note $47
-	callchannel _Music_GoldenrodCity_sub_0xeb555
-	note $91
-	note $b1
-	octave5
-	note $11
-	note $21
-	note $47
-	dutycycle $02
+	callchannel Music_GoldenrodCity_branch_eb555
+	octave 4
+	note F_, 1
+	note F#, 1
+	note G#, 1
+	note F_, 1
+	note D#, 7
+	callchannel Music_GoldenrodCity_branch_eb555
+	note G#, 1
+	note A#, 1
+	octave 5
+	note C_, 1
+	note C#, 1
+	note D#, 7
+	dutycycle $2
 	intensity $77
-	callchannel _Music_GoldenrodCity_sub_0xeb572
-	octave4
-	note $91
-	note $b1
-	note $c1
-	octave5
-	note $13
-	dutycycle $03
+	callchannel Music_GoldenrodCity_branch_eb572
+	octave 4
+	note G#, 1
+	note A#, 1
+	note B_, 1
+	octave 5
+	note C_, 3
+	dutycycle $3
 	intensity $77
-	callchannel _Music_GoldenrodCity_sub_0xeb572
-	note $61
-	note $41
-	note $21
-	note $11
-	octave4
-	note $91
-	loopchannel $00, $7523 ; end
-; 0xeb555
+	callchannel Music_GoldenrodCity_branch_eb572
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	octave 4
+	note G#, 1
+	loopchannel 0, Music_GoldenrodCity_branch_eb523
+; eb555
 
-_Music_GoldenrodCity_sub_0xeb555: ; 0xeb555
-; subroutine
-	octave4
-	note $63
-	note $23
-	note $43
-	note $13
-	note $21
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $95
-	octave3
-	note $90
-	octave3
-	note $a0
-	note $b3
-	octave4
-	note $23
-	octave3
-	note $b1
-	octave4
-	note $b1
-	note $91
-	note $71
-	dutycycle $01
-	endchannel ; end
-; 0xeb572
+Music_GoldenrodCity_branch_eb555: ; eb555
+	octave 4
+	note F_, 3
+	note C#, 3
+	note D#, 3
+	note C_, 3
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 5
+	octave 3
+	note G#, 0
+	octave 3
+	note A_, 0
+	note A#, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	dutycycle $1
+	endchannel
+; eb572
 
-_Music_GoldenrodCity_sub_0xeb572: ; 0xeb572
-; subroutine
-	note $25
-	note $65
-	note $23
-	note $15
-	note $45
-	note $11
-	octave4
-	note $90
-	note $a0
-	note $b5
-	octave5
-	note $25
-	octave4
-	note $b3
-	octave5
-	note $13
-	note $41
-	endchannel ; end
-; 0xeb584
+Music_GoldenrodCity_branch_eb572: ; eb572
+	note C#, 5
+	note F_, 5
+	note C#, 3
+	note C_, 5
+	note D#, 5
+	note C_, 1
+	octave 4
+	note G#, 0
+	note A_, 0
+	note A#, 5
+	octave 5
+	note C#, 5
+	octave 4
+	note A#, 3
+	octave 5
+	note C_, 3
+	note D#, 1
+	endchannel
 
-_Music_GoldenrodCity_Ch3: ; 0xeb584
+Music_GoldenrodCity_Ch3: ; eb584
 	stereopanning $ff
-	vibrato $08, $23
-	notetype $0c, $25
-	callchannel _Music_GoldenrodCity_sub_0xeb5aa
-	callchannel _Music_GoldenrodCity_sub_0xeb5aa
-	callchannel _Music_GoldenrodCity_sub_0xeb5d2
-	note $02
-	octave3
-	note $10
-	note $40
-	note $80
-	note $90
-	note $41
-	callchannel _Music_GoldenrodCity_sub_0xeb5d2
-	note $00
-	octave3
-	note $91
-	note $71
-	note $41
-	octave2
-	note $91
-	loopchannel $00, $758c ; end
-; 0xeb5aa
+	vibrato $8, $23
+	notetype $c, $25
 
-_Music_GoldenrodCity_sub_0xeb5aa: ; 0xeb5aa
-; subroutine
-	octave3
-	note $23
-	note $01
-	note $20
-	note $00
-	note $13
-	note $01
-	note $10
-	note $00
-	octave2
-	note $b3
-	note $01
-	note $b0
-	note $00
-	note $93
-	note $01
-	note $90
-	note $00
-	note $73
-	note $01
-	note $70
-	note $00
-	octave3
-	note $43
-	note $01
-	note $40
-	note $00
-	note $93
-	note $01
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	note $92
-	note $00
-	octave3
-	note $90
-	note $00
-	endchannel ; end
-; 0xeb5d2
+Music_GoldenrodCity_branch_eb58c: ; eb58c
+	callchannel Music_GoldenrodCity_branch_eb5aa
+	callchannel Music_GoldenrodCity_branch_eb5aa
+	callchannel Music_GoldenrodCity_branch_eb5d2
+	note __, 2
+	octave 3
+	note C_, 0
+	note D#, 0
+	note G_, 0
+	note G#, 0
+	note D#, 1
+	callchannel Music_GoldenrodCity_branch_eb5d2
+	note __, 0
+	octave 3
+	note G#, 1
+	note F#, 1
+	note D#, 1
+	octave 2
+	note G#, 1
+	loopchannel 0, Music_GoldenrodCity_branch_eb58c
+; eb5aa
 
-_Music_GoldenrodCity_sub_0xeb5d2: ; 0xeb5d2
-; subroutine
-	note $20
-	note $00
-	octave4
-	note $20
-	octave3
-	note $20
-	note $01
-	note $20
-	note $04
-	octave4
-	note $10
-	note $20
-	octave3
-	note $91
-	note $10
-	note $00
-	octave4
-	note $10
-	octave3
-	note $10
-	note $01
-	note $10
-	note $04
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $91
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $b0
-	octave2
-	note $b0
-	note $01
-	note $b0
-	note $04
-	octave3
-	note $a0
-	note $b0
-	note $71
-	octave2
-	note $90
-	note $00
-	octave3
-	note $90
-	octave2
-	note $90
-	note $01
-	note $90
-	endchannel ; end
-; 0xeb606
+Music_GoldenrodCity_branch_eb5aa: ; eb5aa
+	octave 3
+	note C#, 3
+	note __, 1
+	note C#, 0
+	note __, 0
+	note C_, 3
+	note __, 1
+	note C_, 0
+	note __, 0
+	octave 2
+	note A#, 3
+	note __, 1
+	note A#, 0
+	note __, 0
+	note G#, 3
+	note __, 1
+	note G#, 0
+	note __, 0
+	note F#, 3
+	note __, 1
+	note F#, 0
+	note __, 0
+	octave 3
+	note D#, 3
+	note __, 1
+	note D#, 0
+	note __, 0
+	note G#, 3
+	note __, 1
+	note G#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 2
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	endchannel
+; eb5d2
 
-_Music_GoldenrodCity_Ch4: ; 0xeb606
-	togglenoise $03
-	notetype $0c
-	note $0f
-	note $0f
-	note $0f
-	note $07
-	note $31
-	note $71
-	note $30
-	note $30
-	note $71
-	note $41
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $31
-	note $71
-	loopchannel $03, $7613
-	callchannel _Music_GoldenrodCity_sub_0xeb663
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $80
-	note $80
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $31
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $30
-	note $30
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $31
-	note $30
-	note $30
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $80
-	note $80
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $31
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $30
-	note $30
-	note $71
-	callchannel _Music_GoldenrodCity_sub_0xeb66d
-	note $31
-	note $30
-	note $30
-	note $41
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $31
-	note $71
-	loopchannel $03, $7650
-	callchannel _Music_GoldenrodCity_sub_0xeb663
-	loopchannel $00, $7613 ; end
-; 0xeb663
+Music_GoldenrodCity_branch_eb5d2: ; eb5d2
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note C#, 0
+	note __, 1
+	note C#, 0
+	note __, 4
+	octave 4
+	note C_, 0
+	note C#, 0
+	octave 3
+	note G#, 1
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note C_, 0
+	note __, 1
+	note C_, 0
+	note __, 4
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G#, 1
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	octave 2
+	note A#, 0
+	note __, 1
+	note A#, 0
+	note __, 4
+	octave 3
+	note A_, 0
+	note A#, 0
+	note F#, 1
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	octave 2
+	note G#, 0
+	note __, 1
+	note G#, 0
+	endchannel
 
-_Music_GoldenrodCity_sub_0xeb663: ; 0xeb663
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $30
-	note $30
-	note $71
-	endchannel ; end
-; 0xeb66d
+Music_GoldenrodCity_Ch4: ; eb606
+	togglenoise $3
+	notetype $c
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 7
+	note D_, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note F#, 1
 
-_Music_GoldenrodCity_sub_0xeb66d: ; 0xeb66d
-; subroutine
-	note $41
-	note $30
-	note $42
-	note $41
-	note $80
-	note $80
-	note $80
-	note $80
-	endchannel ; end
-; 0xeb676
+Music_GoldenrodCity_branch_eb613: ; eb613
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GoldenrodCity_branch_eb613
+	callchannel Music_GoldenrodCity_branch_eb663
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note G_, 0
+	note G_, 0
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 1
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 0
+	note D_, 0
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note G_, 0
+	note G_, 0
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 1
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 0
+	note D_, 0
+	note F#, 1
+	callchannel Music_GoldenrodCity_branch_eb66d
+	note D_, 1
+	note D_, 0
+	note D_, 0
+
+Music_GoldenrodCity_branch_eb650: ; eb650
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 3, Music_GoldenrodCity_branch_eb650
+	callchannel Music_GoldenrodCity_branch_eb663
+	loopchannel 0, Music_GoldenrodCity_branch_eb613
+; eb663
+
+Music_GoldenrodCity_branch_eb663: ; eb663
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note F#, 1
+	endchannel
+; eb66d
+
+Music_GoldenrodCity_branch_eb66d: ; eb66d
+	note D#, 1
+	note D_, 0
+	note D#, 2
+	note D#, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	endchannel
+; eb676
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -1,622 +1,618 @@
-_Music_GoldSilverOpening: ; 0xf7055
-	db $80
-	dw _Music_GoldSilverOpening_Ch1
-	db $01
-	dw _Music_GoldSilverOpening_Ch2
-	db $02
-	dw _Music_GoldSilverOpening_Ch3
-; 0xf705e
+Music_GoldSilverOpening: ; f7055
+	dbw $80, Music_GoldSilverOpening_Ch1
+	dbw $01, Music_GoldSilverOpening_Ch2
+	dbw $02, Music_GoldSilverOpening_Ch3
+; f705e
 
-_Music_GoldSilverOpening_Ch1: ; 0xf705e
-	tempo $0001
+
+Music_GoldSilverOpening_Ch1: ; f705e
+	tempo 256
 	volume $77
-	tone $0100
-	dutycycle $02
+	tone $0001
+	dutycycle $2
 	stereopanning $f0
-	notetype $0c, $b7
-	octave1
-	note $9f
-	note $9f
-	tempo $a800
-	dutycycle $03
-	notetype $06, $c7
-	octave3
-	note $6b
-	note $a3
-	octave4
-	note $1b
-	octave3
-	note $c1
-	note $b1
-	note $8b
-	note $b3
-	octave4
-	note $4b
-	note $31
-	note $21
-	notetype $06, $b5
-	note $17
-	octave3
-	note $67
-	note $a7
-	note $c3
-	octave4
-	note $13
-	notetype $06, $b3
-	octave3
-	note $b7
-	note $27
-	octave2
-	note $77
-	octave1
-	note $c7
-	notetype $06, $b2
-	note $03
-	octave3
-	note $b3
-	note $b7
-	note $93
-	note $97
-	note $83
-	note $87
-	note $73
-	note $77
-	octave2
-	note $a3
-	note $a7
-	note $93
-	note $97
-	note $83
-	note $87
-	note $73
-	note $a7
-	note $a3
-	note $a7
-	note $95
-	note $95
-	note $73
-	note $83
-	note $63
-	notetype $08, $b3
-	octave4
-	note $60
-	note $80
-	note $a0
-	note $b0
-	note $c0
-	octave5
-	note $10
-	dutycycle $02
-	notetype $0c, $b3
-	note $30
-	note $20
-	note $33
-	note $a0
-	note $90
-	note $a3
-	octave4
-	note $b1
-	octave5
-	note $31
-	note $61
-	note $85
-	note $41
-	note $31
-	note $11
-	note $43
-	note $71
-	dutycycle $03
-	notetype $08, $92
-	note $a0
-	note $60
-	note $40
-	note $10
-	octave4
-	note $a0
-	note $80
-	note $60
-	note $40
-	note $10
-	octave3
-	note $a2
-	notetype $0c, $b2
-	note $b1
-	note $c1
-	octave4
-	note $11
-	note $31
-	note $41
+	notetype $c, $b7
+	octave 1
+	note G#, 15
+	note G#, 15
+	tempo 168
+	dutycycle $3
+	notetype $6, $c7
+	octave 3
+	note F_, 11
+	note A_, 3
+	octave 4
+	note C_, 11
+	octave 3
+	note B_, 1
+	note A#, 1
+	note G_, 11
+	note A#, 3
+	octave 4
+	note D#, 11
+	note D_, 1
+	note C#, 1
+	notetype $6, $b5
+	note C_, 7
+	octave 3
+	note F_, 7
+	note A_, 7
+	note B_, 3
+	octave 4
+	note C_, 3
+	notetype $6, $b3
+	octave 3
+	note A#, 7
+	note C#, 7
+	octave 2
+	note F#, 7
+	octave 1
+	note B_, 7
+	notetype $6, $b2
+	note __, 3
+	octave 3
+	note A#, 3
+	note A#, 7
+	note G#, 3
+	note G#, 7
+	note G_, 3
+	note G_, 7
+	note F#, 3
+	note F#, 7
+	octave 2
+	note A_, 3
+	note A_, 7
+	note G#, 3
+	note G#, 7
+	note G_, 3
+	note G_, 7
+	note F#, 3
+	note A_, 7
+	note A_, 3
+	note A_, 7
+	note G#, 5
+	note G#, 5
+	note F#, 3
+	note G_, 3
+	note F_, 3
+	notetype $8, $b3
+	octave 4
+	note F_, 0
+	note G_, 0
+	note A_, 0
+	note A#, 0
+	note B_, 0
+	octave 5
+	note C_, 0
+	dutycycle $2
+	notetype $c, $b3
+	note D_, 0
+	note C#, 0
+	note D_, 3
+	note A_, 0
+	note G#, 0
+	note A_, 3
+	octave 4
+	note A#, 1
+	octave 5
+	note D_, 1
+	note F_, 1
+	note G_, 5
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	note D#, 3
+	note F#, 1
+	dutycycle $3
+	notetype $8, $92
+	note A_, 0
+	note F_, 0
+	note D#, 0
+	note C_, 0
+	octave 4
+	note A_, 0
+	note G_, 0
+	note F_, 0
+	note D#, 0
+	note C_, 0
+	octave 3
+	note A_, 2
+	notetype $c, $b2
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note D#, 1
 	intensity $c2
-	note $61
-	note $81
-	note $af
-	endchannel ; end
-; 0xf70f8
+	note F_, 1
+	note G_, 1
+	note A_, 15
+	endchannel
 
-_Music_GoldSilverOpening_Ch2: ; 0xf70f8
-	tone $0100
-	stereopanning $0f
-	notetype $0c, $b7
-	dutycycle $02
-	octave2
-	note $1f
-	note $1f
-	dutycycle $03
-	notetype $0c, $b2
-	note $01
-	notetype $06, $62
-	octave1
-	note $61
-	note $a1
-	octave2
-	note $11
-	note $51
-	note $61
-	note $a1
-	octave3
-	note $11
-	note $51
-	note $61
-	note $a1
-	octave4
-	note $11
-	note $51
-	note $61
-	note $a1
-	octave5
-	note $11
-	note $51
-	octave1
-	note $41
-	note $81
-	note $b1
-	octave2
-	note $31
-	note $41
-	note $81
-	note $b1
-	octave3
-	note $31
-	note $41
-	note $81
-	note $b1
-	octave4
-	note $31
-	note $41
-	note $81
-	notetype $0c, $b7
-	octave1
-	note $6f
+Music_GoldSilverOpening_Ch2: ; f70f8
+	tone $0001
+	stereopanning $f
+	notetype $c, $b7
+	dutycycle $2
+	octave 2
+	note C_, 15
+	note C_, 15
+	dutycycle $3
+	notetype $c, $b2
+	note __, 1
+	notetype $6, $62
+	octave 1
+	note F_, 1
+	note A_, 1
+	octave 2
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
+	note E_, 1
+	octave 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	octave 2
+	note D_, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	octave 3
+	note D_, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	note D#, 1
+	note G_, 1
+	notetype $c, $b7
+	octave 1
+	note F_, 15
 	intensity $83
-	octave4
-	note $61
+	octave 4
+	note F_, 1
 	intensity $81
-	note $31
+	note D_, 1
 	intensity $93
-	note $91
+	note G#, 1
 	intensity $91
-	note $61
+	note F_, 1
 	intensity $a3
-	octave5
-	note $21
+	octave 5
+	note C#, 1
 	intensity $a1
-	octave4
-	note $b1
+	octave 4
+	note A#, 1
 	intensity $b3
-	octave5
-	note $71
+	octave 5
+	note F#, 1
 	intensity $c1
-	note $41
+	note D#, 1
 	intensity $b3
-	octave1
-	note $b1
-	notetype $06, $b2
-	octave4
-	note $33
-	note $33
-	octave1
-	note $63
-	octave4
-	note $33
-	note $33
-	octave2
-	note $13
-	octave4
-	note $43
-	note $43
-	octave1
-	note $63
-	octave4
-	note $43
-	note $43
-	octave1
-	note $b3
-	octave3
-	note $33
-	note $33
-	octave1
-	note $c3
-	octave3
-	note $33
-	note $33
-	octave2
-	note $13
-	octave3
-	note $43
-	note $43
-	octave1
-	note $c3
-	octave3
-	note $43
-	note $73
-	octave1
-	note $b3
-	octave3
-	note $33
-	note $33
-	octave1
-	note $c3
-	octave3
-	note $35
-	note $31
-	octave2
-	note $13
-	octave3
-	note $43
-	note $4f
-	octave2
-	note $41
-	octave3
-	note $83
-	note $83
-	note $81
-	octave2
-	note $43
-	octave3
-	note $73
-	note $73
-	octave2
-	note $31
-	octave3
-	note $63
-	note $63
-	note $61
-	octave2
-	note $83
-	octave3
-	note $c3
-	note $c3
-	octave2
-	note $13
-	octave3
-	note $43
-	note $43
-	octave2
-	note $13
-	octave3
-	note $43
-	note $4f
-	notetype $06, $a2
-	note $63
-	note $83
-	note $93
-	notetype $06, $c2
-	note $a3
-	note $b3
-	octave4
-	note $13
-	notetype $06, $d2
-	octave3
-	note $a3
-	octave4
-	note $13
-	note $4f
-	endchannel ; end
-; 0xf71c8
+	octave 1
+	note A#, 1
+	notetype $6, $b2
+	octave 4
+	note D_, 3
+	note D_, 3
+	octave 1
+	note F_, 3
+	octave 4
+	note D_, 3
+	note D_, 3
+	octave 2
+	note C_, 3
+	octave 4
+	note D#, 3
+	note D#, 3
+	octave 1
+	note F_, 3
+	octave 4
+	note D#, 3
+	note D#, 3
+	octave 1
+	note A#, 3
+	octave 3
+	note D_, 3
+	note D_, 3
+	octave 1
+	note B_, 3
+	octave 3
+	note D_, 3
+	note D_, 3
+	octave 2
+	note C_, 3
+	octave 3
+	note D#, 3
+	note D#, 3
+	octave 1
+	note B_, 3
+	octave 3
+	note D#, 3
+	note F#, 3
+	octave 1
+	note A#, 3
+	octave 3
+	note D_, 3
+	note D_, 3
+	octave 1
+	note B_, 3
+	octave 3
+	note D_, 5
+	note D_, 1
+	octave 2
+	note C_, 3
+	octave 3
+	note D#, 3
+	note D#, 15
+	octave 2
+	note D#, 1
+	octave 3
+	note G_, 3
+	note G_, 3
+	note G_, 1
+	octave 2
+	note D#, 3
+	octave 3
+	note F#, 3
+	note F#, 3
+	octave 2
+	note D_, 1
+	octave 3
+	note F_, 3
+	note F_, 3
+	note F_, 1
+	octave 2
+	note G_, 3
+	octave 3
+	note B_, 3
+	note B_, 3
+	octave 2
+	note C_, 3
+	octave 3
+	note D#, 3
+	note D#, 3
+	octave 2
+	note C_, 3
+	octave 3
+	note D#, 3
+	note D#, 15
+	notetype $6, $a2
+	note F_, 3
+	note G_, 3
+	note G#, 3
+	notetype $6, $c2
+	note A_, 3
+	note A#, 3
+	octave 4
+	note C_, 3
+	notetype $6, $d2
+	octave 3
+	note A_, 3
+	octave 4
+	note C_, 3
+	note D#, 15
+	endchannel
 
-_Music_GoldSilverOpening_Ch3: ; 0xf71c8
-	notetype $06, $10
-	octave2
-	note $33
-	notetype $06, $20
-	note $33
-	notetype $06, $30
-	note $33
-	note $0b
-	note $07
-	notetype $06, $10
-	octave2
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave4
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave6
-	note $30
-	note $00
-	octave2
-	note $60
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $50
-	note $00
-	note $60
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $10
-	note $00
-	note $50
-	note $00
-	note $60
-	note $00
-	note $a0
-	note $00
-	octave5
-	note $10
-	note $00
-	note $50
-	note $00
-	note $60
-	note $00
-	note $a0
-	note $00
-	octave6
-	note $10
-	note $00
-	note $50
-	note $00
-	octave2
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave4
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	octave6
-	note $30
-	note $00
-	notetype $08, $10
-	note $60
-	octave5
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $60
-	note $a0
-	note $60
-	octave4
-	note $c0
-	octave5
-	note $60
-	octave4
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $60
-	note $a0
-	note $60
-	octave3
-	note $c0
-	octave4
-	note $60
-	octave3
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $60
-	octave5
-	note $a2
-	notetype $0c, $10
-	note $80
-	note $00
-	octave6
-	note $11
-	octave5
-	note $b0
-	note $00
-	octave6
-	note $61
-	note $40
-	note $00
-	note $b1
-	note $90
-	note $00
-	note $0f
-	note $03
-	notetype $06, $10
-	octave2
-	note $80
-	note $02
-	note $a1
-	note $01
-	octave5
-	note $6b
-	note $33
-	note $35
-	note $61
-	note $4b
-	note $91
-	note $01
-	note $75
-	note $41
-	note $6b
-	note $31
-	note $01
-	note $45
-	note $61
-	note $81
-	note $01
-	note $71
-	note $01
-	note $81
-	note $01
-	note $a3
-	note $43
-	note $61
-	note $01
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $10
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $10
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $10
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $10
-	note $00
-	note $30
-	note $00
-	note $60
-	note $00
-	note $30
-	note $00
-	note $60
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $70
-	note $00
-	note $b0
-	note $00
-	note $70
-	note $00
-	note $b0
-	note $00
-	note $70
-	note $00
-	note $b0
-	note $08
-	notetype $0c, $10
-	note $0d
-	octave3
-	note $61
-	note $40
-	note $00
-	note $10
-	note $0c
-	endchannel ; end
-; 0xf7308
+Music_GoldSilverOpening_Ch3: ; f71c8
+	notetype $6, $10
+	octave 2
+	note D_, 3
+	notetype $6, $20
+	note D_, 3
+	notetype $6, $30
+	note D_, 3
+	note __, 11
+	note __, 7
+	notetype $6, $10
+	octave 2
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 6
+	note D_, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 6
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 2
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 6
+	note D_, 0
+	note __, 0
+	notetype $8, $10
+	note F_, 0
+	octave 5
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 0
+	note A_, 0
+	note F_, 0
+	octave 4
+	note B_, 0
+	octave 5
+	note F_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 0
+	note A_, 0
+	note F_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 0
+	octave 5
+	note A_, 2
+	notetype $c, $10
+	note G_, 0
+	note __, 0
+	octave 6
+	note C_, 1
+	octave 5
+	note A#, 0
+	note __, 0
+	octave 6
+	note F_, 1
+	note D#, 0
+	note __, 0
+	note A#, 1
+	note G#, 0
+	note __, 0
+	note __, 15
+	note __, 3
+	notetype $6, $10
+	octave 2
+	note G_, 0
+	note __, 2
+	note A_, 1
+	note __, 1
+	octave 5
+	note F_, 11
+	note D_, 3
+	note D_, 5
+	note F_, 1
+	note D#, 11
+	note G#, 1
+	note __, 1
+	note F#, 5
+	note D#, 1
+	note F_, 11
+	note D_, 1
+	note __, 1
+	note D#, 5
+	note F_, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 3
+	note D#, 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A#, 0
+	note __, 8
+	notetype $c, $10
+	note __, 13
+	octave 3
+	note F_, 1
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 12
+	endchannel
+; f7308
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -1,224 +1,222 @@
-_Music_GoldSilverOpening2: ; 0xf7308
-	db $c0
-	dw _Music_GoldSilverOpening2_Ch1
-	db $01
-	dw _Music_GoldSilverOpening2_Ch2
-	db $02
-	dw _Music_GoldSilverOpening2_Ch3
-	db $03
-	dw _Music_GoldSilverOpening2_Ch4
-; 0xf7314
+Music_GoldSilverOpening2: ; f7308
+	dbw $c0, Music_GoldSilverOpening2_Ch1
+	dbw $01, Music_GoldSilverOpening2_Ch2
+	dbw $02, Music_GoldSilverOpening2_Ch3
+	dbw $03, Music_GoldSilverOpening2_Ch4
+; f7314
 
-_Music_GoldSilverOpening2_Ch1: ; 0xf7314
-	tempo $5c00
+
+Music_GoldSilverOpening2_Ch1: ; f7314
+	tempo 92
 	volume $77
-	dutycycle $03
-	tone $0200
-	stereopanning $0f
-	notetype $0c, $3d
-	octave3
-	note $47
-	notetype $0c, $c1
-	octave3
-	note $31
-	note $31
-	note $31
+	dutycycle $3
+	tone $0002
+	stereopanning $f
+	notetype $c, $3d
+	octave 3
+	note D#, 7
+
+Music_GoldSilverOpening2_branch_f7325: ; f7325
+	notetype $c, $c1
+	octave 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	intensity $b7
-	note $49
+	note D#, 9
 	intensity $c1
-	note $31
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	intensity $b7
-	note $63
-	note $43
-	note $11
-	loopchannel $02, $7325
+	note F_, 3
+	note D#, 3
+	note C_, 1
+	loopchannel 2, Music_GoldSilverOpening2_branch_f7325
 	intensity $c1
-	note $31
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	intensity $b7
-	note $49
+	note D#, 9
 	intensity $c1
-	note $31
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	intensity $b7
-	note $63
-	note $83
-	note $b1
+	note F_, 3
+	note G_, 3
+	note A#, 1
 	intensity $b0
-	note $af
-	note $af
+	note A_, 15
+	note A_, 15
 	intensity $b2
-	octave4
-	note $3f
-	endchannel ; end
-; 0xf7358
+	octave 4
+	note D_, 15
+	endchannel
 
-_Music_GoldSilverOpening2_Ch2: ; 0xf7358
-	dutycycle $03
+Music_GoldSilverOpening2_Ch2: ; f7358
+	dutycycle $3
 	vibrato $14, $14
 	stereopanning $f0
-	notetype $0c, $3f
-	octave3
-	note $b7
-	notetype $0c, $d1
-	octave3
-	note $a1
-	note $a1
-	note $a1
+	notetype $c, $3f
+	octave 3
+	note A#, 7
+	notetype $c, $d1
+	octave 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	intensity $c7
-	note $b9
+	note A#, 9
 	intensity $d1
-	note $a1
-	note $a1
-	note $a1
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	intensity $c7
-	octave4
-	note $13
-	octave3
-	note $b3
-	note $81
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G_, 1
 	intensity $d1
-	note $a1
-	note $a1
-	note $a1
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	intensity $c7
-	note $b9
+	note A#, 9
 	intensity $d1
-	note $a1
-	note $a1
-	note $a1
+	note A_, 1
+	note A_, 1
+	note A_, 1
 	intensity $c7
-	octave4
-	note $13
-	note $23
-	note $41
+	octave 4
+	note C_, 3
+	note C#, 3
+	note D#, 1
 	intensity $c7
-	note $37
-	note $47
-	note $67
-	note $b7
+	note D_, 7
+	note D#, 7
+	note F_, 7
+	note A#, 7
 	intensity $b0
-	octave5
-	note $3f
-	note $3f
+	octave 5
+	note D_, 15
+	note D_, 15
 	intensity $c2
-	note $3f
-	endchannel ; end
-; 0xf739c
+	note D_, 15
+	endchannel
 
-_Music_GoldSilverOpening2_Ch3: ; 0xf739c
-	notetype $0c, $17
-	note $07
-	octave2
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $b7
-	note $01
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $33
-	note $63
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $91
-	note $51
-	note $81
-	note $61
-	note $31
-	note $a1
-	note $91
-	note $51
-	note $81
-	note $61
-	note $11
-	note $41
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $91
-	note $51
-	note $81
-	note $61
-	note $31
-	note $a1
-	note $91
-	note $51
-	note $81
-	note $61
-	note $11
-	note $41
-	note $31
-	note $71
-	note $b1
-	octave3
-	note $31
-	octave2
-	note $b1
-	note $a1
-	note $71
-	note $41
-	note $31
-	note $71
-	note $b1
-	octave3
-	note $31
-	octave2
-	note $b1
-	note $71
-	note $b1
-	octave3
-	note $21
-	note $31
-	note $0d
-	endchannel ; end
-; 0xf73ea
+Music_GoldSilverOpening2_Ch3: ; f739c
+	notetype $c, $17
+	note __, 7
+	octave 2
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A#, 7
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 3
+	note F_, 3
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note C_, 1
+	note D#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	note F#, 1
+	note D#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A#, 1
+	note F#, 1
+	note A#, 1
+	octave 3
+	note C#, 1
+	note D_, 1
+	note __, 13
+	endchannel
 
-_Music_GoldSilverOpening2_Ch4: ; 0xf73ea
-	togglenoise $00
-	notetype $06
-	note $41
-	note $41
-	note $41
-	note $41
-	note $41
-	note $31
-	note $31
-	note $31
-	notetype $0c
-	note $31
-	note $31
-	note $31
-	note $23
-	note $41
-	note $41
-	note $41
-	note $31
-	note $31
-	note $31
-	note $25
-	notetype $06
-	note $41
-	note $41
-	note $41
-	note $41
-	notetype $0c
-	loopchannel $04, $73f8
-	note $1f
-	endchannel ; end
-; 0xf7411
+Music_GoldSilverOpening2_Ch4: ; f73ea
+	togglenoise $0
+	notetype $6
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	notetype $c
+
+Music_GoldSilverOpening2_branch_f73f8: ; f73f8
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note C#, 3
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note C#, 5
+	notetype $6
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	notetype $c
+	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
+	note C_, 15
+	endchannel
+; f7411
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,575 +1,578 @@
-_Music_Gym: ; 0xf48ae
-	db $c0
-	dw _Music_Gym_Ch1
-	db $01
-	dw _Music_Gym_Ch2
-	db $02
-	dw _Music_Gym_Ch3
-	db $03
-	dw _Music_Gym_Ch4
-; 0xf48ba
+Music_Gym: ; f48ae
+	dbw $c0, Music_Gym_Ch1
+	dbw $01, Music_Gym_Ch2
+	dbw $02, Music_Gym_Ch3
+	dbw $03, Music_Gym_Ch4
+; f48ba
 
-_Music_Gym_Ch1: ; 0xf48ba
-	tempo $9c00
+
+Music_Gym_Ch1: ; f48ba
+	tempo 156
 	volume $77
-	stereopanning $0f
+	stereopanning $f
 	vibrato $12, $24
-	dutycycle $01
-	notetype $0c, $b7
-	octave4
-	note $71
-	octave2
-	note $a0
-	note $a0
-	note $a0
-	note $02
-	octave4
-	note $51
-	octave2
-	note $80
-	note $80
-	note $80
-	note $02
-	octave4
-	note $31
-	octave2
-	note $30
-	note $30
-	note $30
-	note $00
-	octave3
-	note $30
-	note $30
-	note $c0
-	note $80
-	note $30
-	note $c0
-	octave4
-	note $20
-	octave3
-	note $a0
-	note $50
-	octave4
-	note $50
-	octave3
-	note $ab
-	note $71
-	note $a1
-	note $80
-	note $01
-	note $50
-	note $51
-	note $11
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $77
-	note $a3
-	note $71
-	note $a1
-	note $50
-	note $00
-	note $50
-	note $70
-	note $83
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	octave4
-	note $11
-	note $35
-	octave3
-	note $a1
-	note $71
-	note $51
-	note $81
-	note $a1
-	note $c0
-	note $01
-	note $80
-	note $83
-	octave4
-	note $50
-	note $01
-	note $10
-	note $11
-	octave3
-	note $c0
-	note $b0
-	note $ab
-	note $71
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $80
-	octave4
-	note $10
-	note $51
-	note $11
-	note $51
-	note $10
-	note $50
-	note $83
-	note $35
-	octave3
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $a0
-	octave4
-	note $72
-	note $83
-	note $73
-	note $53
-	note $13
-	note $30
-	note $00
-	note $30
-	note $50
-	note $01
-	octave3
-	note $c3
-	note $71
-	note $31
-	note $71
-	note $b0
-	note $a0
-	note $80
-	note $60
-	octave4
-	note $33
-	note $10
-	octave3
-	note $b0
-	note $a0
-	note $80
-	octave4
-	note $53
-	note $75
-	octave3
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $a0
-	octave4
-	note $72
-	note $a3
-	note $83
-	note $73
-	note $53
-	note $30
-	octave3
-	note $c0
-	note $70
-	octave4
-	note $50
-	note $73
-	note $50
-	note $10
-	octave3
-	note $80
-	octave4
-	note $70
-	note $83
-	note $a0
-	note $80
-	note $70
-	note $50
-	note $a3
-	octave5
-	note $33
-	octave4
-	note $a0
-	note $80
-	note $70
-	note $50
-	loopchannel $00, $48c9 ; end
-; 0xf497c
+	dutycycle $1
+	notetype $c, $b7
 
-_Music_Gym_Ch2: ; 0xf497c
-	dutycycle $01
+Music_Gym_branch_f48c9: ; f48c9
+	octave 4
+	note F#, 1
+	octave 2
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 2
+	octave 4
+	note E_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	octave 4
+	note D_, 1
+	octave 2
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note D_, 0
+	note B_, 0
+	note G_, 0
+	note D_, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note A_, 0
+	note E_, 0
+	octave 4
+	note E_, 0
+	octave 3
+	note A_, 11
+	note F#, 1
+	note A_, 1
+	note G_, 0
+	note __, 1
+	note E_, 0
+	note E_, 1
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 7
+	note A_, 3
+	note F#, 1
+	note A_, 1
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note F#, 0
+	note G_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note D_, 5
+	octave 3
+	note A_, 1
+	note F#, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 0
+	note __, 1
+	note G_, 0
+	note G_, 3
+	octave 4
+	note E_, 0
+	note __, 1
+	note C_, 0
+	note C_, 1
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 11
+	note F#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note C_, 0
+	note E_, 0
+	note G_, 3
+	note D_, 5
+	octave 3
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note A_, 0
+	octave 4
+	note F#, 2
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note C_, 3
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note E_, 0
+	note __, 1
+	octave 3
+	note B_, 3
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 0
+	note A_, 0
+	note G_, 0
+	note F_, 0
+	octave 4
+	note D_, 3
+	note C_, 0
+	octave 3
+	note A#, 0
+	note A_, 0
+	note G_, 0
+	octave 4
+	note E_, 3
+	note F#, 5
+	octave 3
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note A_, 0
+	octave 4
+	note F#, 2
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 0
+	octave 3
+	note B_, 0
+	note F#, 0
+	octave 4
+	note E_, 0
+	note F#, 3
+	note E_, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note F#, 0
+	note G_, 3
+	note A_, 0
+	note G_, 0
+	note F#, 0
+	note E_, 0
+	note A_, 3
+	octave 5
+	note D_, 3
+	octave 4
+	note A_, 0
+	note G_, 0
+	note F#, 0
+	note E_, 0
+	loopchannel 0, Music_Gym_branch_f48c9
+
+Music_Gym_Ch2: ; f497c
+	dutycycle $1
 	stereopanning $f0
-	notetype $0c, $c3
-	octave2
-	note $31
-	octave1
-	note $30
-	note $30
-	note $31
-	note $a0
-	octave2
-	note $70
-	note $11
-	octave1
-	note $10
-	note $10
-	note $11
-	octave2
-	note $80
-	note $50
-	octave1
-	note $81
-	octave1
-	note $80
-	note $80
-	note $81
-	octave1
-	note $80
-	note $80
-	note $a3
-	octave2
-	note $a1
-	octave3
-	note $10
-	note $20
-	callchannel _Music_Gym_sub_0xf49e9
-	octave3
-	note $51
-	note $10
-	note $20
-	callchannel _Music_Gym_sub_0xf49e9
-	octave3
-	note $10
-	note $50
-	note $80
-	octave4
-	note $10
+
+Music_Gym_branch_f4980: ; f4980
+	notetype $c, $c3
+	octave 2
+	note D_, 1
+	octave 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note A_, 0
+	octave 2
+	note F#, 0
+	note C_, 1
+	octave 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	octave 2
+	note G_, 0
+	note E_, 0
+	octave 1
+	note G_, 1
+	octave 1
+	note G_, 0
+	note G_, 0
+	note G_, 1
+	octave 1
+	note G_, 0
+	note G_, 0
+	note A_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 0
+	note C#, 0
+	callchannel Music_Gym_branch_f49e9
+	octave 3
+	note E_, 1
+	note C_, 0
+	note C#, 0
+	callchannel Music_Gym_branch_f49e9
+	octave 3
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 4
+	note C_, 0
 	intensity $d2
-	callchannel _Music_Gym_sub_0xf4a15
-	octave1
-	note $70
-	note $c0
-	note $71
-	octave2
-	note $71
-	octave1
-	note $c1
-	note $b3
-	note $b1
-	note $60
-	note $60
-	note $80
-	octave2
-	note $10
-	octave1
-	note $81
-	octave2
-	note $81
-	note $51
-	callchannel _Music_Gym_sub_0xf4a15
-	octave1
-	note $80
-	octave2
-	note $10
-	octave1
-	note $81
-	octave2
-	note $51
-	note $11
-	note $33
-	note $31
-	octave1
-	note $a0
-	note $a0
-	note $a0
-	octave2
-	note $30
-	octave1
-	note $a1
-	octave2
-	note $71
-	note $31
-	loopchannel $00, $4980 ; end
-; 0xf49e9
+	callchannel Music_Gym_branch_f4a15
+	octave 1
+	note F#, 0
+	note B_, 0
+	note F#, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note B_, 1
+	note A#, 3
+	note A#, 1
+	note F_, 0
+	note F_, 0
+	note G_, 0
+	octave 2
+	note C_, 0
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note E_, 1
+	callchannel Music_Gym_branch_f4a15
+	octave 1
+	note G_, 0
+	octave 2
+	note C_, 0
+	octave 1
+	note G_, 1
+	octave 2
+	note E_, 1
+	note C_, 1
+	note D_, 3
+	note D_, 1
+	octave 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	octave 2
+	note D_, 0
+	octave 1
+	note A_, 1
+	octave 2
+	note F#, 1
+	note D_, 1
+	loopchannel 0, Music_Gym_branch_f4980
+; f49e9
 
-_Music_Gym_sub_0xf49e9: ; 0xf49e9
-; subroutine
-	octave3
-	note $32
-	octave2
-	note $32
-	note $31
-	note $30
-	note $30
-	note $31
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $12
-	octave2
-	note $12
-	note $11
-	note $10
-	note $10
-	note $11
-	octave3
-	note $51
-	note $10
-	note $20
-	note $32
-	octave2
-	note $32
-	note $31
-	note $30
-	note $30
-	note $31
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $12
-	octave2
-	note $12
-	note $11
-	note $10
-	note $10
-	note $11
-	endchannel ; end
-; 0xf4a15
+Music_Gym_branch_f49e9: ; f49e9
+	octave 3
+	note D_, 2
+	octave 2
+	note D_, 2
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 2
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	octave 3
+	note E_, 1
+	note C_, 0
+	note C#, 0
+	note D_, 2
+	octave 2
+	note D_, 2
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 2
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	endchannel
+; f4a15
 
-_Music_Gym_sub_0xf4a15: ; 0xf4a15
-; subroutine
-	octave2
-	note $33
-	note $31
-	octave1
-	note $a0
-	note $a0
-	note $a0
-	octave2
-	note $30
-	octave1
-	note $a1
-	octave2
-	note $a1
-	note $31
-	note $13
-	note $11
-	octave1
-	note $80
-	note $80
-	note $80
-	octave2
-	note $10
-	octave1
-	note $81
-	octave2
-	note $81
-	note $11
-	octave1
-	note $c1
-	note $01
-	note $c1
-	note $70
-	note $70
-	endchannel ; end
-; 0xf4a37
+Music_Gym_branch_f4a15: ; f4a15
+	octave 2
+	note D_, 3
+	note D_, 1
+	octave 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	octave 2
+	note D_, 0
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note C_, 3
+	note C_, 1
+	octave 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	octave 2
+	note C_, 0
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note C_, 1
+	octave 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note F#, 0
+	note F#, 0
+	endchannel
 
-_Music_Gym_Ch3: ; 0xf4a37
+Music_Gym_Ch3: ; f4a37
 	vibrato $14, $23
 	stereopanning $ff
-	notetype $0c, $14
-	octave6
-	note $31
-	octave4
-	note $30
-	note $30
-	note $30
-	note $00
-	octave5
-	note $a0
-	octave6
-	note $30
-	note $11
-	octave4
-	note $10
-	note $10
-	note $10
-	note $00
-	octave5
-	note $a0
-	octave6
-	note $10
-	octave5
-	note $c1
-	octave3
-	note $80
-	note $80
-	note $80
-	note $00
-	octave5
-	note $c0
-	note $c0
-	note $c3
-	octave6
-	note $23
-	octave5
-	note $3b
-	octave4
-	note $a1
-	octave5
-	note $31
-	note $50
-	note $01
-	note $10
-	note $13
-	note $83
-	note $53
-	note $3b
-	octave4
-	note $a1
-	octave5
-	note $31
-	note $10
-	note $00
-	note $10
-	note $30
-	note $57
-	note $03
-	note $7b
-	note $51
-	note $71
-	note $80
-	note $01
-	note $50
-	note $53
-	octave6
-	note $10
-	note $01
-	octave5
-	note $80
-	note $83
-	note $7b
-	note $51
-	note $71
-	note $81
-	note $50
-	note $80
-	octave6
-	note $17
-	octave5
-	note $c3
+
+Music_Gym_branch_f4a3c: ; f4a3c
+	notetype $c, $14
+	octave 6
+	note D_, 1
+	octave 4
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note __, 0
+	octave 5
+	note A_, 0
+	octave 6
+	note D_, 0
+	note C_, 1
+	octave 4
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note __, 0
+	octave 5
+	note A_, 0
+	octave 6
+	note C_, 0
+	octave 5
+	note B_, 1
+	octave 3
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	octave 5
+	note B_, 0
+	note B_, 0
+	note B_, 3
+	octave 6
+	note C#, 3
+	octave 5
+	note D_, 11
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note E_, 0
+	note __, 1
+	note C_, 0
+	note C_, 3
+	note G_, 3
+	note E_, 3
+	note D_, 11
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note D_, 0
+	note E_, 7
+	note __, 3
+	note F#, 11
+	note E_, 1
+	note F#, 1
+	note G_, 0
+	note __, 1
+	note E_, 0
+	note E_, 3
+	octave 6
+	note C_, 0
+	note __, 1
+	octave 5
+	note G_, 0
+	note G_, 3
+	note F#, 11
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 0
+	note G_, 0
+	octave 6
+	note C_, 7
+	octave 5
+	note B_, 3
 	intensity $13
-	callchannel _Music_Gym_sub_0xf4ab3
-	note $01
-	note $a1
-	octave6
-	note $31
-	octave5
-	note $a1
-	octave6
-	note $13
-	octave5
-	note $b3
-	note $a3
-	note $83
-	callchannel _Music_Gym_sub_0xf4ab3
-	note $a0
-	note $00
-	note $a0
-	note $c0
-	octave6
-	note $13
-	note $30
-	note $00
-	note $30
-	note $50
-	note $77
-	note $53
-	loopchannel $00, $4a3c ; end
-; 0xf4ab3
+	callchannel Music_Gym_branch_f4ab3
+	note __, 1
+	note A_, 1
+	octave 6
+	note D_, 1
+	octave 5
+	note A_, 1
+	octave 6
+	note C_, 3
+	octave 5
+	note A#, 3
+	note A_, 3
+	note G_, 3
+	callchannel Music_Gym_branch_f4ab3
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note B_, 0
+	octave 6
+	note C_, 3
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note E_, 0
+	note F#, 7
+	note E_, 3
+	loopchannel 0, Music_Gym_branch_f4a3c
+; f4ab3
 
-_Music_Gym_sub_0xf4ab3: ; 0xf4ab3
-; subroutine
-	octave5
-	note $a5
-	octave6
-	note $35
-	octave5
-	note $a3
-	octave6
-	note $13
-	octave5
-	note $c3
-	note $a3
-	note $83
-	note $70
-	note $00
-	note $70
-	note $80
-	note $a3
-	endchannel ; end
-; 0xf4ac5
+Music_Gym_branch_f4ab3: ; f4ab3
+	octave 5
+	note A_, 5
+	octave 6
+	note D_, 5
+	octave 5
+	note A_, 3
+	octave 6
+	note C_, 3
+	octave 5
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note G_, 0
+	note A_, 3
+	endchannel
 
-_Music_Gym_Ch4: ; 0xf4ac5
-	togglenoise $04
-	notetype $0c
-	note $31
-	note $20
-	note $20
-	note $c3
-	note $31
-	note $20
-	note $20
-	note $c3
-	note $31
-	note $20
-	note $20
-	note $31
-	note $20
-	note $20
-	note $b0
-	note $40
-	note $40
-	note $40
-	note $20
-	note $20
-	note $30
-	note $30
-	notetype $06
-	note $35
-	note $35
-	note $33
-	note $31
-	note $31
-	note $33
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $35
-	note $35
-	note $33
-	note $31
-	note $31
-	note $33
-	note $c7
-	loopchannel $04, $4ae1
-	note $43
-	note $73
-	note $33
-	note $41
-	note $31
-	note $41
-	note $31
-	note $43
-	note $33
-	note $73
-	loopchannel $08, $4afa
-	loopchannel $00, $4ac7 ; end
-; 0xf4b0c
+Music_Gym_Ch4: ; f4ac5
+	togglenoise $4
+
+Music_Gym_branch_f4ac7: ; f4ac7
+	notetype $c
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note B_, 3
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note B_, 3
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note A#, 0
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note D_, 0
+	notetype $6
+
+Music_Gym_branch_f4ae1: ; f4ae1
+	note D_, 5
+	note D_, 5
+	note D_, 3
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note D_, 5
+	note D_, 5
+	note D_, 3
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note B_, 7
+	loopchannel 4, Music_Gym_branch_f4ae1
+
+Music_Gym_branch_f4afa: ; f4afa
+	note D#, 3
+	note F#, 3
+	note D_, 3
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 3
+	note D_, 3
+	note F#, 3
+	loopchannel 8, Music_Gym_branch_f4afa
+	loopchannel 0, Music_Gym_branch_f4ac7
+; f4b0c
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -1,435 +1,433 @@
-_Music_GymLeaderVictory: ; 0xf462c
-	db $c0
-	dw _Music_GymLeaderVictory_Ch1
-	db $01
-	dw _Music_GymLeaderVictory_Ch2
-	db $02
-	dw _Music_GymLeaderVictory_Ch3
-	db $03
-	dw _Music_GymLeaderVictory_Ch4
-; 0xf4638
+Music_GymLeaderVictory: ; f462c
+	dbw $c0, Music_GymLeaderVictory_Ch1
+	dbw $01, Music_GymLeaderVictory_Ch2
+	dbw $02, Music_GymLeaderVictory_Ch3
+	dbw $03, Music_GymLeaderVictory_Ch4
+; f4638
 
-_Music_GymLeaderVictory_Ch1: ; 0xf4638
-	tempo $7400
+
+Music_GymLeaderVictory_Ch1: ; f4638
+	tempo 116
 	volume $77
 	vibrato $12, $34
-	dutycycle $03
-	tone $0100
-	notetype $0c, $b7
-	octave4
-	note $35
-	octave3
-	note $a0
-	octave4
-	note $30
-	note $75
-	note $30
-	note $70
-	note $a5
-	note $70
-	note $a0
-	octave5
-	note $37
-	stereopanning $0f
-	dutycycle $01
-	callchannel _Music_GymLeaderVictory_sub_0xf4689
-	octave4
-	note $23
-	note $53
-	callchannel _Music_GymLeaderVictory_sub_0xf4689
-	note $77
-	loopchannel $02, $4658
-	dutycycle $02
-	callchannel _Music_GymLeaderVictory_sub_0xf46a0
-	note $a3
-	note $83
-	note $75
-	note $30
-	note $50
-	note $75
-	note $51
-	note $37
-	note $27
-	dutycycle $03
-	callchannel _Music_GymLeaderVictory_sub_0xf46a0
-	note $23
-	note $53
-	note $85
-	note $a0
-	note $80
-	note $a5
-	note $81
+	dutycycle $3
+	tone $0001
+	notetype $c, $b7
+	octave 4
+	note D_, 5
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	note F#, 5
+	note D_, 0
+	note F#, 0
+	note A_, 5
+	note F#, 0
+	note A_, 0
+	octave 5
+	note D_, 7
+	stereopanning $f
+
+Music_GymLeaderVictory_branch_f4658: ; f4658
+	dutycycle $1
+	callchannel Music_GymLeaderVictory_branch_f4689
+	octave 4
+	note C#, 3
+	note E_, 3
+	callchannel Music_GymLeaderVictory_branch_f4689
+	note F#, 7
+	loopchannel 2, Music_GymLeaderVictory_branch_f4658
+	dutycycle $2
+	callchannel Music_GymLeaderVictory_branch_f46a0
+	note A_, 3
+	note G_, 3
+	note F#, 5
+	note D_, 0
+	note E_, 0
+	note F#, 5
+	note E_, 1
+	note D_, 7
+	note C#, 7
+	dutycycle $3
+	callchannel Music_GymLeaderVictory_branch_f46a0
+	note C#, 3
+	note E_, 3
+	note G_, 5
+	note A_, 0
+	note G_, 0
+	note A_, 5
+	note G_, 1
 	intensity $87
-	note $7f
-	loopchannel $00, $4658 ; end
-; 0xf4689
+	note F#, 15
+	loopchannel 0, Music_GymLeaderVictory_branch_f4658
+; f4689
 
-_Music_GymLeaderVictory_sub_0xf4689: ; 0xf4689
-; subroutine
+Music_GymLeaderVictory_branch_f4689: ; f4689
 	intensity $91
-	octave3
-	note $71
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $a0
-	note $70
-	note $51
-	note $a1
-	octave4
-	note $21
-	octave3
-	note $a0
-	note $50
-	note $31
-	note $81
-	note $c1
-	note $80
-	note $30
-	endchannel ; end
-; 0xf46a0
+	octave 3
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 0
+	note F#, 0
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 0
+	note E_, 0
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 0
+	note D_, 0
+	endchannel
+; f46a0
 
-_Music_GymLeaderVictory_sub_0xf46a0: ; 0xf46a0
-; subroutine
+Music_GymLeaderVictory_branch_f46a0: ; f46a0
 	intensity $87
-	octave3
-	note $7d
-	note $30
-	note $70
-	note $a7
-	note $73
-	note $a0
-	note $90
-	note $70
-	note $a0
-	note $9d
-	note $50
-	note $90
-	note $c7
-	octave4
-	note $33
-	note $50
-	note $30
-	note $50
-	note $30
-	note $2d
-	octave3
-	note $a0
-	octave4
-	note $20
-	note $57
-	endchannel ; end
-; 0xf46bd
+	octave 3
+	note F#, 13
+	note D_, 0
+	note F#, 0
+	note A_, 7
+	note F#, 3
+	note A_, 0
+	note G#, 0
+	note F#, 0
+	note A_, 0
+	note G#, 13
+	note E_, 0
+	note G#, 0
+	note B_, 7
+	octave 4
+	note D_, 3
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note C#, 13
+	octave 3
+	note A_, 0
+	octave 4
+	note C#, 0
+	note E_, 7
+	endchannel
 
-_Music_GymLeaderVictory_Ch2: ; 0xf46bd
+Music_GymLeaderVictory_Ch2: ; f46bd
 	vibrato $12, $34
-	dutycycle $03
-	notetype $0c, $d7
-	octave4
-	note $a5
-	note $70
-	note $a0
-	octave5
-	note $35
-	octave4
-	note $a0
-	octave5
-	note $30
-	note $7f
-	dutycycle $03
+	dutycycle $3
+	notetype $c, $d7
+	octave 4
+	note A_, 5
+	note F#, 0
+	note A_, 0
+	octave 5
+	note D_, 5
+	octave 4
+	note A_, 0
+	octave 5
+	note D_, 0
+	note F#, 15
+
+Music_GymLeaderVictory_branch_f46d0: ; f46d0
+	dutycycle $3
 	intensity $a1
-	callchannel _Music_GymLeaderVictory_sub_0xf4711
-	note $a3
-	note $a3
-	callchannel _Music_GymLeaderVictory_sub_0xf4711
-	note $35
-	dutycycle $02
-	note $c0
-	octave5
-	note $20
-	callchannel _Music_GymLeaderVictory_sub_0xf4711
-	note $a3
-	note $a3
-	callchannel _Music_GymLeaderVictory_sub_0xf4711
-	note $37
-	dutycycle $03
-	callchannel _Music_GymLeaderVictory_sub_0xf4720
-	note $73
-	note $53
-	note $3d
-	octave4
-	note $c1
+	callchannel Music_GymLeaderVictory_branch_f4711
+	note A_, 3
+	note A_, 3
+	callchannel Music_GymLeaderVictory_branch_f4711
+	note D_, 5
+	dutycycle $2
+	note B_, 0
+	octave 5
+	note C#, 0
+	callchannel Music_GymLeaderVictory_branch_f4711
+	note A_, 3
+	note A_, 3
+	callchannel Music_GymLeaderVictory_branch_f4711
+	note D_, 7
+	dutycycle $3
+	callchannel Music_GymLeaderVictory_branch_f4720
+	note F#, 3
+	note E_, 3
+	note D_, 13
+	octave 4
+	note B_, 1
 	intensity $a7
-	note $af
-	dutycycle $02
-	callchannel _Music_GymLeaderVictory_sub_0xf4720
-	octave4
-	note $a3
-	octave5
-	note $23
-	note $3d
-	note $51
+	note A_, 15
+	dutycycle $2
+	callchannel Music_GymLeaderVictory_branch_f4720
+	octave 4
+	note A_, 3
+	octave 5
+	note C#, 3
+	note D_, 13
+	note E_, 1
 	intensity $a6
-	note $3b
-	note $01
-	dutycycle $03
-	octave4
-	note $c0
-	octave5
-	note $20
-	loopchannel $00, $46d0 ; end
-; 0xf4711
+	note D_, 11
+	note __, 1
+	dutycycle $3
+	octave 4
+	note B_, 0
+	octave 5
+	note C#, 0
+	loopchannel 0, Music_GymLeaderVictory_branch_f46d0
+; f4711
 
-_Music_GymLeaderVictory_sub_0xf4711: ; 0xf4711
-; subroutine
-	octave5
-	note $31
-	note $21
-	octave4
-	note $c3
-	octave5
-	note $21
-	octave4
-	note $c1
-	note $a3
-	note $c1
-	note $a1
-	note $81
-	note $71
-	endchannel ; end
-; 0xf4720
+Music_GymLeaderVictory_branch_f4711: ; f4711
+	octave 5
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 3
+	octave 5
+	note C#, 1
+	octave 4
+	note B_, 1
+	note A_, 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	endchannel
+; f4720
 
-_Music_GymLeaderVictory_sub_0xf4720: ; 0xf4720
-; subroutine
+Music_GymLeaderVictory_branch_f4720: ; f4720
 	intensity $98
-	note $a5
-	note $70
-	note $a0
-	octave5
-	note $37
-	note $3f
-	octave4
-	note $c5
-	note $90
-	note $c0
-	octave5
-	note $57
-	note $5f
-	octave4
-	note $85
-	note $50
-	note $80
-	octave5
-	note $27
-	note $27
-	endchannel ; end
-; 0xf4737
+	note A_, 5
+	note F#, 0
+	note A_, 0
+	octave 5
+	note D_, 7
+	note D_, 15
+	octave 4
+	note B_, 5
+	note G#, 0
+	note B_, 0
+	octave 5
+	note E_, 7
+	note E_, 15
+	octave 4
+	note G_, 5
+	note E_, 0
+	note G_, 0
+	octave 5
+	note C#, 7
+	note C#, 7
+	endchannel
 
-_Music_GymLeaderVictory_Ch3: ; 0xf4737
-	notetype $0c, $25
-	octave3
-	note $7f
-	note $39
-	octave2
-	note $a1
-	note $c1
-	octave3
-	note $21
+Music_GymLeaderVictory_Ch3: ; f4737
+	notetype $c, $25
+	octave 3
+	note F#, 15
+	note D_, 9
+	octave 2
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C#, 1
 	stereopanning $f0
-	note $31
-	note $03
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $03
-	octave2
-	note $a1
-	note $c1
-	note $03
-	note $81
-	note $a1
-	note $01
-	octave3
-	note $23
-	note $31
-	note $03
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $03
-	octave2
-	note $a1
-	note $c1
-	note $03
-	note $81
-	octave3
-	note $31
-	note $05
-	loopchannel $02, $4744
-	callchannel _Music_GymLeaderVictory_sub_0xf479e
-	octave3
-	note $31
-	note $01
-	note $31
-	octave4
-	note $31
-	note $01
-	octave3
-	note $31
-	note $71
-	note $31
-	note $a1
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $a1
-	callchannel _Music_GymLeaderVictory_sub_0xf479e
-	octave3
-	note $31
-	note $01
-	note $81
-	octave4
-	note $31
-	note $01
-	octave3
-	note $31
-	note $81
-	note $51
-	note $31
-	note $01
-	note $31
-	note $a1
-	note $01
-	octave2
-	note $a1
-	note $c1
-	octave3
-	note $21
-	loopchannel $00, $4744 ; end
-; 0xf479e
 
-_Music_GymLeaderVictory_sub_0xf479e: ; 0xf479e
-; subroutine
-	octave3
-	note $31
-	note $01
-	note $31
-	octave4
-	note $31
-	note $01
-	octave3
-	note $31
-	note $71
-	note $31
-	note $a1
-	note $01
-	note $31
-	note $71
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	note $51
-	octave4
-	note $51
-	note $01
-	octave3
-	note $51
-	note $91
-	note $51
-	note $c1
-	note $01
-	note $51
-	note $91
-	note $01
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $a1
-	note $01
-	note $a1
-	octave3
-	note $a1
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $a1
-	octave3
-	note $a1
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	octave2
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $a1
-	endchannel ; end
-; 0xf47e5
+Music_GymLeaderVictory_branch_f4744: ; f4744
+	note D_, 1
+	note __, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note __, 3
+	octave 2
+	note A_, 1
+	note B_, 1
+	note __, 3
+	note G_, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note C#, 3
+	note D_, 1
+	note __, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note __, 3
+	octave 2
+	note A_, 1
+	note B_, 1
+	note __, 3
+	note G_, 1
+	octave 3
+	note D_, 1
+	note __, 5
+	loopchannel 2, Music_GymLeaderVictory_branch_f4744
+	callchannel Music_GymLeaderVictory_branch_f479e
+	octave 3
+	note D_, 1
+	note __, 1
+	note D_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note A_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note A_, 1
+	callchannel Music_GymLeaderVictory_branch_f479e
+	octave 3
+	note D_, 1
+	note __, 1
+	note G_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note E_, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note A_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C#, 1
+	loopchannel 0, Music_GymLeaderVictory_branch_f4744
+; f479e
 
-_Music_GymLeaderVictory_Ch4: ; 0xf47e5
-	togglenoise $04
-	notetype $0c
-	note $cf
-	note $cf
-	callchannel _Music_GymLeaderVictory_sub_0xf480b
-	note $45
-	note $41
-	note $47
-	callchannel _Music_GymLeaderVictory_sub_0xf480b
-	note $45
-	note $41
-	note $43
-	note $20
-	note $20
-	note $20
-	note $20
-	note $41
-	note $81
-	note $31
-	note $41
-	note $81
-	note $41
-	note $31
-	note $81
-	loopchannel $10, $47fb
-	loopchannel $00, $47eb ; end
-; 0xf480b
+Music_GymLeaderVictory_branch_f479e: ; f479e
+	octave 3
+	note D_, 1
+	note __, 1
+	note D_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note A_, 1
+	note __, 1
+	note D_, 1
+	note F#, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	octave 4
+	note E_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	note B_, 1
+	note __, 1
+	note E_, 1
+	note G#, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note A_, 1
+	endchannel
 
-_Music_GymLeaderVictory_sub_0xf480b: ; 0xf480b
-; subroutine
-	note $45
-	note $41
-	note $43
-	note $31
-	note $41
-	loopchannel $03, $480b
-	endchannel ; end
-; 0xf4815
+Music_GymLeaderVictory_Ch4: ; f47e5
+	togglenoise $4
+	notetype $c
+	note B_, 15
+	note B_, 15
+
+Music_GymLeaderVictory_branch_f47eb: ; f47eb
+	callchannel Music_GymLeaderVictory_branch_f480b
+	note D#, 5
+	note D#, 1
+	note D#, 7
+	callchannel Music_GymLeaderVictory_branch_f480b
+	note D#, 5
+	note D#, 1
+	note D#, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+
+Music_GymLeaderVictory_branch_f47fb: ; f47fb
+	note D#, 1
+	note G_, 1
+	note D_, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note D_, 1
+	note G_, 1
+	loopchannel 16, Music_GymLeaderVictory_branch_f47fb
+	loopchannel 0, Music_GymLeaderVictory_branch_f47eb
+; f480b
+
+Music_GymLeaderVictory_branch_f480b: ; f480b
+	note D#, 5
+	note D#, 1
+	note D#, 3
+	note D_, 1
+	note D#, 1
+	loopchannel 3, Music_GymLeaderVictory_branch_f480b
+	endchannel
+; f4815
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,176 +1,180 @@
-_Music_HallOfFame: ; 0xf05bf
-	db $c0
-	dw _Music_HallOfFame_Ch1
-	db $01
-	dw _Music_HallOfFame_Ch2
-	db $02
-	dw _Music_HallOfFame_Ch3
-	db $03
-	dw _Music_HallOfFame_Ch4
-; 0xf05cb
+Music_HallOfFame: ; f05bf
+	dbw $c0, Music_HallOfFame_Ch1
+	dbw $01, Music_HallOfFame_Ch2
+	dbw $02, Music_HallOfFame_Ch3
+	dbw $03, Music_HallOfFame_Ch4
+; f05cb
 
-_Music_HallOfFame_Ch1: ; 0xf05cb
-	tempo $7000
+
+Music_HallOfFame_Ch1: ; f05cb
+	tempo 112
 	volume $77
-	dutycycle $02
-	vibrato $0c, $22
-	tone $0100
+	dutycycle $2
+	vibrato $c, $22
+	tone $0001
 	stereopanning $f0
-	notetype $0c, $93
-	note $0f
-	note $0f
-	note $0f
-	note $0b
-	octave3
-	note $30
-	note $50
-	note $60
-	note $70
+	notetype $c, $93
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 11
+	octave 3
+	note D_, 0
+	note E_, 0
+	note F_, 0
+	note F#, 0
+
+Music_HallOfFame_branch_f05e6: ; f05e6
 	intensity $97
-	octave4
-	note $17
+	octave 4
+	note C_, 7
 	intensity $77
-	note $17
+	note C_, 7
 	intensity $97
-	note $57
+	note E_, 7
 	intensity $77
-	note $57
+	note E_, 7
 	intensity $97
-	note $77
+	note F#, 7
 	intensity $77
-	note $77
+	note F#, 7
 	intensity $77
-	note $67
+	note F_, 7
 	intensity $57
-	note $67
-	loopchannel $03, $45e6
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	loopchannel $00, $45e6 ; end
-; 0xf060b
+	note F_, 7
+	loopchannel 3, Music_HallOfFame_branch_f05e6
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	loopchannel 0, Music_HallOfFame_branch_f05e6
 
-_Music_HallOfFame_Ch2: ; 0xf060b
-	vibrato $08, $25
-	dutycycle $03
-	notetype $0c, $c4
-	octave3
-	note $81
-	note $31
-	note $81
-	note $a9
-	note $81
-	note $31
-	note $81
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $a1
-	note $81
-	note $31
-	note $81
-	note $a9
-	note $61
-	note $11
-	note $61
-	note $b3
-	note $a3
-	note $61
-	loopchannel $00, $4610 ; end
-; 0xf062e
+Music_HallOfFame_Ch2: ; f060b
+	vibrato $8, $25
+	dutycycle $3
 
-_Music_HallOfFame_Ch3: ; 0xf062e
-	notetype $0c, $28
-	octave3
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	octave3
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	octave3
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	octave3
-	note $11
-	note $61
-	note $11
-	note $61
-	note $11
-	note $61
-	note $11
-	note $61
-	loopchannel $03, $4631
-	note $33
-	note $83
-	note $33
-	note $83
-	note $53
-	note $83
-	note $53
-	note $83
-	note $73
-	note $a3
-	note $73
-	note $a3
-	note $53
-	note $83
-	note $53
-	note $83
-	loopchannel $00, $462e ; end
-; 0xf066d
+Music_HallOfFame_branch_f0610: ; f0610
+	notetype $c, $c4
+	octave 3
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note A_, 9
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note A_, 9
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note A#, 3
+	note A_, 3
+	note F_, 1
+	loopchannel 0, Music_HallOfFame_branch_f0610
 
-_Music_HallOfFame_Ch4: ; 0xf066d
-	togglenoise $05
-	notetype $0c
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	notetype $06
-	stereopanning $0f
-	note $b3
-	note $b7
-	note $b3
-	note $b3
-	note $b3
+Music_HallOfFame_branch_f062e: ; f062e
+
+Music_HallOfFame_Ch3: ; f062e
+	notetype $c, $28
+
+Music_HallOfFame_branch_f0631: ; f0631
+	octave 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note F_, 1
+	loopchannel 3, Music_HallOfFame_branch_f0631
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 3
+	note E_, 3
+	note G_, 3
+	note E_, 3
+	note G_, 3
+	note F#, 3
+	note A_, 3
+	note F#, 3
+	note A_, 3
+	note E_, 3
+	note G_, 3
+	note E_, 3
+	note G_, 3
+	loopchannel 0, Music_HallOfFame_branch_f062e
+
+Music_HallOfFame_Ch4: ; f066d
+	togglenoise $5
+	notetype $c
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	notetype $6
+
+Music_HallOfFame_branch_f0677: ; f0677
+	stereopanning $f
+	note A#, 3
+	note A#, 7
+	note A#, 3
+	note A#, 3
+	note A#, 3
 	stereopanning $f0
-	note $a1
-	note $a1
-	note $b1
-	note $b1
-	note $b3
-	note $b3
-	note $b7
-	note $b3
-	note $b3
-	stereopanning $0f
-	note $b0
-	note $b0
-	note $a0
-	note $a0
-	note $b0
-	note $b0
-	note $b0
-	note $b0
-	loopchannel $00, $4677 ; end
-; 0xf0697
+	note A_, 1
+	note A_, 1
+	note A#, 1
+	note A#, 1
+	note A#, 3
+	note A#, 3
+	note A#, 7
+	note A#, 3
+	note A#, 3
+	stereopanning $f
+	note A#, 0
+	note A#, 0
+	note A_, 0
+	note A_, 0
+	note A#, 0
+	note A#, 0
+	note A#, 0
+	note A#, 0
+	loopchannel 0, Music_HallOfFame_branch_f0677
+; f0697
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -1,57 +1,53 @@
-_Music_HealPokemon: ; 0xf0697
-	db $80
-	dw _Music_HealPokemon_Ch1
-	db $01
-	dw _Music_HealPokemon_Ch2
-	db $02
-	dw _Music_HealPokemon_Ch3
-; 0xf06a0
+Music_HealPokemon: ; f0697
+	dbw $80, Music_HealPokemon_Ch1
+	dbw $01, Music_HealPokemon_Ch2
+	dbw $02, Music_HealPokemon_Ch3
+; f06a0
 
-_Music_HealPokemon_Ch1: ; 0xf06a0
-	tempo $9000
+
+Music_HealPokemon_Ch1: ; f06a0
+	tempo 144
 	volume $77
-	dutycycle $02
-	tone $0100
-	notetype $0c, $81
-	note $01
-	unknownmusic0xe0 $00, $40
-	note $c1
-	unknownmusic0xe0 $00, $55
-	note $c1
-	unknownmusic0xe0 $00, $45
-	note $51
-	note $03
-	unknownmusic0xe0 $00, $30
-	note $53
-	unknownmusic0xe0 $00, $40
-	note $c3
-	endchannel ; end
-; 0xf06c4
+	dutycycle $2
+	tone $0001
+	notetype $c, $81
+	note __, 1
+	unknownmusic0xe0 $0, $40
+	note B_, 1
+	unknownmusic0xe0 $0, $55
+	note B_, 1
+	unknownmusic0xe0 $0, $45
+	note E_, 1
+	note __, 3
+	unknownmusic0xe0 $0, $30
+	note E_, 3
+	unknownmusic0xe0 $0, $40
+	note B_, 3
+	endchannel
 
-_Music_HealPokemon_Ch2: ; 0xf06c4
-	dutycycle $02
-	notetype $0c, $c3
-	octave4
-	note $c3
-	note $c3
-	note $c1
-	note $91
-	notetype $0c, $c4
-	octave5
-	note $57
-	endchannel ; end
-; 0xf06d4
+Music_HealPokemon_Ch2: ; f06c4
+	dutycycle $2
+	notetype $c, $c3
+	octave 4
+	note B_, 3
+	note B_, 3
+	note B_, 1
+	note G#, 1
+	notetype $c, $c4
+	octave 5
+	note E_, 7
+	endchannel
 
-_Music_HealPokemon_Ch3: ; 0xf06d4
-	notetype $0c, $10
-	octave4
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $91
-	note $55
-	note $01
-	endchannel ; end
-; 0xf06e1
+Music_HealPokemon_Ch3: ; f06d4
+	notetype $c, $10
+	octave 4
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note G#, 1
+	note E_, 5
+	note __, 1
+	endchannel
+; f06e1
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,193 +1,192 @@
-_Music_IndigoPlateau: ; 0xee852
-	db $c0
-	dw _Music_IndigoPlateau_Ch1
-	db $01
-	dw _Music_IndigoPlateau_Ch2
-	db $02
-	dw _Music_IndigoPlateau_Ch3
-	db $03
-	dw _Music_IndigoPlateau_Ch4
-; 0xee85e
+Music_IndigoPlateau: ; ee852
+	dbw $c0, Music_IndigoPlateau_Ch1
+	dbw $01, Music_IndigoPlateau_Ch2
+	dbw $02, Music_IndigoPlateau_Ch3
+	dbw $03, Music_IndigoPlateau_Ch4
+; ee85e
 
-_Music_IndigoPlateau_Ch1: ; 0xee85e
-	tempo $8000
+
+Music_IndigoPlateau_Ch1: ; ee85e
+	tempo 128
 	volume $77
-	dutycycle $03
-	tone $0200
-	stereopanning $0f
-	callchannel _Music_IndigoPlateau_sub_0xee881
-	octave3
-	note $33
-	callchannel _Music_IndigoPlateau_sub_0xee881
-	octave3
-	note $43
-	callchannel _Music_IndigoPlateau_sub_0xee881
-	octave3
-	note $43
-	callchannel _Music_IndigoPlateau_sub_0xee881
-	note $b3
-	loopchannel $00, $686a ; end
-; 0xee881
+	dutycycle $3
+	tone $0002
+	stereopanning $f
 
-_Music_IndigoPlateau_sub_0xee881: ; 0xee881
-; subroutine
-	notetype $0c, $b6
-	octave2
-	note $a3
+Music_IndigoPlateau_branch_ee86a: ; ee86a
+	callchannel Music_IndigoPlateau_branch_ee881
+	octave 3
+	note D_, 3
+	callchannel Music_IndigoPlateau_branch_ee881
+	octave 3
+	note D#, 3
+	callchannel Music_IndigoPlateau_branch_ee881
+	octave 3
+	note D#, 3
+	callchannel Music_IndigoPlateau_branch_ee881
+	note A#, 3
+	loopchannel 0, Music_IndigoPlateau_branch_ee86a
+; ee881
+
+Music_IndigoPlateau_branch_ee881: ; ee881
+	notetype $c, $b6
+	octave 2
+	note A_, 3
 	intensity $b2
-	note $a1
-	note $a1
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
 	intensity $a0
-	endchannel ; end
-; 0xee892
+	endchannel
 
-_Music_IndigoPlateau_Ch2: ; 0xee892
-	dutycycle $03
+Music_IndigoPlateau_Ch2: ; ee892
+	dutycycle $3
 	vibrato $10, $22
 	stereopanning $f0
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $b3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $23
+
+Music_IndigoPlateau_branch_ee899: ; ee899
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note A#, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note C#, 3
 	intensity $c7
-	note $a5
-	note $31
-	note $81
-	note $b1
-	note $a7
+	note A_, 5
+	note D_, 1
+	note G_, 1
+	note A#, 1
+	note A_, 7
 	intensity $b0
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $b3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note A#, 3
 	intensity $c7
-	octave4
-	note $35
-	note $41
-	note $13
-	note $37
+	octave 4
+	note D_, 5
+	note D#, 1
+	note C_, 3
+	note D_, 7
 	intensity $b0
-	octave3
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $23
+	octave 3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note C#, 3
 	intensity $c7
-	octave4
-	note $15
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $77
+	octave 4
+	note C_, 5
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note F#, 7
 	intensity $b0
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $b3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note A#, 3
 	intensity $c7
-	octave4
-	note $35
-	note $41
-	note $63
-	note $77
+	octave 4
+	note D_, 5
+	note D#, 1
+	note F_, 3
+	note F#, 7
 	intensity $b0
-	octave3
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee8e9
-	note $23
-	loopchannel $00, $6899 ; end
-; 0xee8e9
+	octave 3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee8e9
+	note C#, 3
+	loopchannel 0, Music_IndigoPlateau_branch_ee899
+; ee8e9
 
-_Music_IndigoPlateau_sub_0xee8e9: ; 0xee8e9
-; subroutine
-	notetype $0c, $c6
-	octave3
-	note $33
+Music_IndigoPlateau_branch_ee8e9: ; ee8e9
+	notetype $c, $c6
+	octave 3
+	note D_, 3
 	intensity $c2
-	note $31
-	note $31
-	note $31
-	note $31
-	note $33
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 1
+	note D_, 1
 	intensity $b0
-	endchannel ; end
-; 0xee8fa
+	endchannel
 
-_Music_IndigoPlateau_Ch3: ; 0xee8fa
-	notetype $0c, $19
-	callchannel _Music_IndigoPlateau_sub_0xee915
-	octave3
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee915
-	octave3
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee915
-	octave3
-	note $a3
-	callchannel _Music_IndigoPlateau_sub_0xee915
-	octave3
-	note $73
-	loopchannel $00, $68fd ; end
-; 0xee915
+Music_IndigoPlateau_Ch3: ; ee8fa
+	notetype $c, $19
 
-_Music_IndigoPlateau_sub_0xee915: ; 0xee915
-; subroutine
-	octave3
-	note $30
-	note $02
-	octave2
-	note $a0
-	note $02
-	octave3
-	note $10
-	note $02
-	note $30
-	note $02
-	octave2
-	note $a0
-	note $02
-	endchannel ; end
-; 0xee924
+Music_IndigoPlateau_branch_ee8fd: ; ee8fd
+	callchannel Music_IndigoPlateau_branch_ee915
+	octave 3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee915
+	octave 3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee915
+	octave 3
+	note A_, 3
+	callchannel Music_IndigoPlateau_branch_ee915
+	octave 3
+	note F#, 3
+	loopchannel 0, Music_IndigoPlateau_branch_ee8fd
+; ee915
 
-_Music_IndigoPlateau_Ch4: ; 0xee924
+Music_IndigoPlateau_branch_ee915: ; ee915
+	octave 3
+	note D_, 0
+	note __, 2
+	octave 2
+	note A_, 0
+	note __, 2
+	octave 3
+	note C_, 0
+	note __, 2
+	note D_, 0
+	note __, 2
+	octave 2
+	note A_, 0
+	note __, 2
+	endchannel
+
+Music_IndigoPlateau_Ch4: ; ee924
 	stereopanning $f0
-	togglenoise $00
-	notetype $0c
-	note $43
-	note $31
-	note $41
-	note $41
-	note $41
-	note $33
-	note $31
-	note $31
-	notetype $06
-	note $30
-	note $30
-	note $40
-	note $40
-	note $40
-	note $40
-	note $30
-	note $30
-	notetype $0c
-	note $43
-	note $31
-	note $41
-	note $41
-	note $31
-	note $23
-	note $31
-	note $31
-	note $23
-	loopchannel $00, $692a ; end
-; 0xee94b
+	togglenoise $0
+	notetype $c
+
+Music_IndigoPlateau_branch_ee92a: ; ee92a
+	note D#, 3
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D_, 3
+	note D_, 1
+	note D_, 1
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note D_, 0
+	notetype $c
+	note D#, 3
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note C#, 3
+	note D_, 1
+	note D_, 1
+	note C#, 3
+	loopchannel 0, Music_IndigoPlateau_branch_ee92a
+; ee94b
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -1,1039 +1,1038 @@
-_Music_JohtoGymLeaderBattle: ; 0xea50d
-	db $80
-	dw _Music_JohtoGymLeaderBattle_Ch1
-	db $01
-	dw _Music_JohtoGymLeaderBattle_Ch2
-	db $02
-	dw _Music_JohtoGymLeaderBattle_Ch3
-; 0xea516
+Music_JohtoGymBattle: ; ea50d
+	dbw $80, Music_JohtoGymBattle_Ch1
+	dbw $01, Music_JohtoGymBattle_Ch2
+	dbw $02, Music_JohtoGymBattle_Ch3
+; ea516
 
-_Music_JohtoGymLeaderBattle_Ch1: ; 0xea516
-	tempo $6500
+
+Music_JohtoGymBattle_Ch1: ; ea516
+	tempo 101
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $b2
-	octave3
-	note $b0
-	note $a0
-	note $90
-	note $a0
-	loopchannel $04, $6526
-	note $20
-	note $10
-	octave2
-	note $b0
-	octave3
-	note $10
-	loopchannel $03, $652f
+	notetype $c, $b2
+
+Music_JohtoGymBattle_branch_ea526: ; ea526
+	octave 3
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note A_, 0
+	loopchannel 4, Music_JohtoGymBattle_branch_ea526
+
+Music_JohtoGymBattle_branch_ea52f: ; ea52f
+	note C#, 0
+	note C_, 0
+	octave 2
+	note A#, 0
+	octave 3
+	note C_, 0
+	loopchannel 3, Music_JohtoGymBattle_branch_ea52f
 	intensity $4b
-	note $23
+	note C#, 3
 	intensity $b2
-	note $35
-	note $45
-	note $13
-	note $65
-	note $35
-	note $43
-	note $35
-	note $45
-	note $13
-	note $65
-	note $85
+	note D_, 5
+	note D#, 5
+	note C_, 3
+	note F_, 5
+	note D_, 5
+	note D#, 3
+	note D_, 5
+	note D#, 5
+	note C_, 3
+	note F_, 5
+	note G_, 5
 	intensity $b7
-	note $13
+	note C_, 3
 	intensity $b2
-	note $85
-	note $95
-	note $63
-	note $95
-	note $65
-	note $93
-	note $85
-	note $95
-	note $63
-	note $95
-	octave4
-	note $15
-	octave3
-	note $91
-	note $61
+	note G_, 5
+	note G#, 5
+	note F_, 3
+	note G#, 5
+	note F_, 5
+	note G#, 3
+	note G_, 5
+	note G#, 5
+	note F_, 3
+	note G#, 5
+	octave 4
+	note C_, 5
+	octave 3
+	note G#, 1
+	note F_, 1
+
+Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	intensity $b5
-	note $35
-	note $85
-	note $61
-	note $81
-	note $93
-	note $83
-	note $63
-	note $83
+	note D_, 5
+	note G_, 5
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note G_, 3
+	note F_, 3
+	note G_, 3
 	intensity $b7
-	note $9b
+	note G#, 11
 	intensity $b2
-	note $83
+	note G_, 3
 	intensity $b7
-	octave4
-	note $2b
+	octave 4
+	note C#, 11
 	intensity $b2
-	note $13
+	note C_, 3
 	intensity $b5
-	octave3
-	note $35
-	note $85
-	note $61
-	note $81
-	note $93
-	note $83
-	note $63
-	note $83
+	octave 3
+	note D_, 5
+	note G_, 5
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note G_, 3
+	note F_, 3
+	note G_, 3
 	intensity $b7
-	note $97
-	note $87
-	note $67
-	note $47
+	note G#, 7
+	note G_, 7
+	note F_, 7
+	note D#, 7
 	intensity $70
-	note $17
+	note C_, 7
 	intensity $77
-	note $17
+	note C_, 7
 	intensity $b4
-	note $41
-	note $51
-	note $65
-	note $81
-	note $43
+	note D#, 1
+	note E_, 1
+	note F_, 5
+	note G_, 1
+	note D#, 3
 	intensity $77
-	octave2
-	note $b7
-	note $b7
+	octave 2
+	note A#, 7
+	note A#, 7
 	intensity $c5
-	octave3
-	note $81
-	note $91
-	note $b5
-	note $b1
-	note $93
+	octave 3
+	note G_, 1
+	note G#, 1
+	note A#, 5
+	note A#, 1
+	note G#, 3
 	intensity $c7
-	note $87
-	note $63
-	note $51
-	note $21
+	note G_, 7
+	note F_, 3
+	note E_, 1
+	note C#, 1
 	intensity $a0
-	note $17
+	note C_, 7
 	intensity $a7
-	note $17
+	note C_, 7
 	intensity $b2
-	note $65
-	note $63
-	note $51
-	note $63
-	note $65
-	note $65
-	note $61
-	note $91
-	note $55
-	note $53
-	note $61
-	note $51
-	note $21
-	note $15
-	note $15
-	note $13
-	note $65
-	note $61
-	note $91
-	note $51
-	note $61
-	note $91
-	note $61
-	note $13
-	note $65
-	note $51
-	note $91
-	note $51
-	note $83
-	note $53
-	note $61
-	note $51
-	note $61
-	note $85
-	note $83
-	octave4
-	note $11
-	octave3
-	note $81
-	note $11
-	note $15
-	note $15
-	note $13
-	note $25
-	note $25
-	note $23
-	note $35
-	note $35
-	note $33
-	note $45
-	note $45
-	note $43
+	note F_, 5
+	note F_, 3
+	note E_, 1
+	note F_, 3
+	note F_, 5
+	note F_, 5
+	note F_, 1
+	note G#, 1
+	note E_, 5
+	note E_, 3
+	note F_, 1
+	note E_, 1
+	note C#, 1
+	note C_, 5
+	note C_, 5
+	note C_, 3
+	note F_, 5
+	note F_, 1
+	note G#, 1
+	note E_, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note C_, 3
+	note F_, 5
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	note G_, 3
+	note E_, 3
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 5
+	note G_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note C_, 1
+	note C_, 5
+	note C_, 5
+	note C_, 3
+	note C#, 5
+	note C#, 5
+	note C#, 3
+	note D_, 5
+	note D_, 5
+	note D_, 3
+	note D#, 5
+	note D#, 5
+	note D#, 3
 	intensity $80
-	note $8f
+	note G_, 15
 	intensity $90
-	note $9f
+	note G#, 15
 	intensity $a0
-	note $a7
-	note $b1
-	note $a1
-	note $91
-	note $a1
+	note A_, 7
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	intensity $b0
-	note $b7
-	note $c1
-	note $b1
-	note $a1
-	octave4
-	note $21
+	note A#, 7
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	octave 4
+	note C#, 1
 	intensity $b7
-	note $17
-	note $23
-	note $13
-	octave3
-	note $91
-	octave4
-	note $11
-	octave3
-	note $91
-	octave4
-	note $41
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $91
-	octave4
-	note $11
-	note $93
-	note $43
-	note $93
-	note $43
-	note $43
-	octave3
-	note $93
-	octave4
-	note $43
-	octave3
-	note $93
-	note $97
-	note $a3
-	note $93
-	note $41
-	note $91
-	note $41
-	octave4
-	note $21
-	octave3
-	note $41
-	note $a1
-	note $41
-	note $81
-	octave4
-	note $23
-	octave3
-	note $93
-	octave4
-	note $23
-	octave3
-	note $93
-	note $93
-	note $23
-	note $93
-	note $23
-	note $c7
-	note $a7
-	note $97
-	note $77
+	note C_, 7
+	note C#, 3
+	note C_, 3
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	note G#, 3
+	note D#, 3
+	note G#, 3
+	note D#, 3
+	note D#, 3
+	octave 3
+	note G#, 3
+	octave 4
+	note D#, 3
+	octave 3
+	note G#, 3
+	note G#, 7
+	note A_, 3
+	note G#, 3
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note D#, 1
+	note A_, 1
+	note D#, 1
+	note G_, 1
+	octave 4
+	note C#, 3
+	octave 3
+	note G#, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note G#, 3
+	note G#, 3
+	note C#, 3
+	note G#, 3
+	note C#, 3
+	note B_, 7
+	note A_, 7
+	note G#, 7
+	note F#, 7
 	intensity $b4
-	note $a3
-	octave4
-	note $23
-	octave3
-	note $c3
-	octave4
-	note $53
+	note A_, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note E_, 3
 	intensity $92
-	note $41
-	note $41
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
 	intensity $b2
-	note $41
-	note $41
-	note $41
-	note $41
+	note D#, 1
+	note D#, 1
+	note D#, 1
+	note D#, 1
 	intensity $c2
-	note $4f
+	note D#, 15
 	intensity $50
-	octave3
-	note $1f
-	note $6f
-	note $5f
+	octave 3
+	note C_, 15
+	note F_, 15
+	note E_, 15
 	intensity $97
-	note $49
+	note D#, 9
 	intensity $b4
-	octave2
-	note $b1
-	octave3
-	note $41
-	note $71
-	loopchannel $00, $655d ; end
-; 0xea65f
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
 
-_Music_JohtoGymLeaderBattle_Ch2: ; 0xea65f
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $c2
-	octave4
-	note $70
-	note $60
-	note $50
-	note $b0
-	loopchannel $04, $666a
-	note $70
-	note $60
-	note $70
-	note $b0
-	loopchannel $04, $6673
-	note $a5
-	octave3
-	note $b5
-	note $83
-	octave4
-	note $35
-	octave3
-	note $a5
-	note $b3
-	note $a5
-	note $b5
-	note $83
-	octave4
-	note $35
-	note $45
+Music_JohtoGymBattle_Ch2: ; ea65f
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $c2
+
+Music_JohtoGymBattle_branch_ea66a: ; ea66a
+	octave 4
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note A#, 0
+	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
+
+Music_JohtoGymBattle_branch_ea673: ; ea673
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note A#, 0
+	loopchannel 4, Music_JohtoGymBattle_branch_ea673
+	note A_, 5
+	octave 3
+	note A#, 5
+	note G_, 3
+	octave 4
+	note D_, 5
+	octave 3
+	note A_, 5
+	note A#, 3
+	note A_, 5
+	note A#, 5
+	note G_, 3
+	octave 4
+	note D_, 5
+	note D#, 5
 	intensity $b0
-	octave3
-	note $43
+	octave 3
+	note D#, 3
 	intensity $c2
-	octave4
-	note $31
+	octave 4
+	note D_, 1
 	intensity $92
-	octave3
-	note $31
-	note $31
+	octave 3
+	note D_, 1
+	note D_, 1
 	intensity $c2
-	octave4
-	note $43
+	octave 4
+	note D#, 3
 	intensity $92
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $c2
-	octave4
-	note $13
-	note $81
-	notetype $0c, $92
-	octave3
-	note $31
-	note $31
+	octave 4
+	note C_, 3
+	note G_, 1
+	notetype $c, $92
+	octave 3
+	note D_, 1
+	note D_, 1
 	intensity $c2
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $92
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $c2
-	octave4
-	note $41
+	octave 4
+	note D#, 1
 	intensity $92
-	octave3
-	note $41
+	octave 3
+	note D#, 1
 	intensity $c2
-	octave4
-	note $31
+	octave 4
+	note D_, 1
 	intensity $92
-	octave3
-	note $31
-	note $31
+	octave 3
+	note D_, 1
+	note D_, 1
 	intensity $c2
-	octave4
-	note $43
+	octave 4
+	note D#, 3
 	intensity $92
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $c2
-	octave4
-	note $11
+	octave 4
+	note C_, 1
 	intensity $92
-	octave3
-	note $41
+	octave 3
+	note D#, 1
 	intensity $c2
-	octave4
-	note $81
+	octave 4
+	note G_, 1
 	intensity $92
-	octave3
-	note $61
-	note $61
+	octave 3
+	note F_, 1
+	note F_, 1
 	intensity $c2
-	octave4
-	note $91
+	octave 4
+	note G#, 1
 	intensity $92
-	octave3
-	note $61
-	note $61
+	octave 3
+	note F_, 1
+	note F_, 1
 	intensity $c2
-	octave4
-	note $71
+	octave 4
+	note F#, 1
 	intensity $b2
-	octave3
-	note $90
-	note $a0
+	octave 3
+	note G#, 0
+	note A_, 0
+
+Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	intensity $c7
-	note $b7
+	note A#, 7
 	intensity $c4
-	octave4
-	note $31
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
 	intensity $c7
-	note $27
+	note C#, 7
 	intensity $c4
-	note $61
-	note $41
-	note $21
-	note $41
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note D#, 1
 	intensity $b0
-	note $65
+	note F_, 5
 	intensity $b7
-	note $65
+	note F_, 5
 	intensity $c2
-	note $43
+	note D#, 3
 	intensity $b0
-	note $95
+	note G#, 5
 	intensity $b7
-	note $95
+	note G#, 5
 	intensity $c2
-	note $63
+	note F_, 3
 	intensity $c7
-	octave3
-	note $b7
+	octave 3
+	note A#, 7
 	intensity $c4
-	octave4
-	note $31
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
 	intensity $c7
-	note $27
+	note C#, 7
 	intensity $c4
-	note $61
-	note $41
-	note $21
-	note $41
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note D#, 1
 	intensity $b0
-	note $2f
+	note C#, 15
 	intensity $b7
-	note $2f
+	note C#, 15
 	intensity $a4
-	octave3
-	note $65
-	note $45
-	note $63
+	octave 3
+	note F_, 5
+	note D#, 5
+	note F_, 3
 	intensity $c6
-	octave4
-	note $15
-	octave3
-	note $b5
-	octave4
-	note $13
+	octave 4
+	note C_, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note C_, 3
 	intensity $a4
-	octave3
-	note $25
-	note $15
-	note $23
+	octave 3
+	note C#, 5
+	note C_, 5
+	note C#, 3
 	intensity $c6
-	octave4
-	note $25
-	note $15
-	note $23
+	octave 4
+	note C#, 5
+	note C_, 5
+	note C#, 3
 	intensity $3c
-	note $19
+	note C_, 9
 	intensity $b7
-	note $15
+	note C_, 5
 	intensity $b0
-	note $57
+	note E_, 7
 	intensity $b7
-	note $57
+	note E_, 7
 	intensity $b0
-	octave3
-	note $2f
-	octave2
-	note $b7
-	octave3
-	note $25
-	note $41
-	note $1f
-	note $5f
+	octave 3
+	note C#, 15
+	octave 2
+	note A#, 7
+	octave 3
+	note C#, 5
+	note D#, 1
+	note C_, 15
+	note E_, 15
 	intensity $a0
-	octave5
-	note $23
+	octave 5
+	note C#, 3
 	intensity $a7
-	octave5
-	note $2b
+	octave 5
+	note C#, 11
 	intensity $b7
-	octave4
-	note $b7
-	octave5
-	note $25
-	note $41
+	octave 4
+	note A#, 7
+	octave 5
+	note C#, 5
+	note D#, 1
 	intensity $a0
-	note $17
+	note C_, 7
 	intensity $a7
-	note $17
+	note C_, 7
 	intensity $3e
-	note $55
+	note E_, 5
 	intensity $a6
-	note $59
+	note E_, 9
 	intensity $c2
-	octave3
-	note $65
-	note $65
-	note $63
-	note $75
-	note $75
-	note $73
-	note $85
-	note $85
-	note $83
-	note $95
-	note $95
-	note $93
+	octave 3
+	note F_, 5
+	note F_, 5
+	note F_, 3
+	note F#, 5
+	note F#, 5
+	note F#, 3
+	note G_, 5
+	note G_, 5
+	note G_, 3
+	note G#, 5
+	note G#, 5
+	note G#, 3
 	intensity $90
-	octave4
-	note $1f
+	octave 4
+	note C_, 15
 	intensity $a0
-	note $2f
+	note C#, 15
 	intensity $b0
-	note $3f
+	note D_, 15
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $4c
-	note $45
+	note D#, 5
 	intensity $c2
-	note $70
-	note $80
+	note F#, 0
+	note G_, 0
 	intensity $c7
-	note $97
-	note $a1
-	note $91
-	note $71
-	note $a1
-	note $93
-	octave5
-	note $13
-	octave4
-	note $a3
-	note $93
-	octave5
-	note $43
-	octave4
-	note $93
-	octave5
-	note $43
-	octave4
-	note $93
-	octave5
-	note $41
-	note $21
-	note $11
-	note $21
-	note $11
-	octave4
-	note $a1
-	note $91
-	note $a1
-	note $47
-	note $51
-	note $41
-	note $21
-	note $51
-	note $43
-	note $93
-	note $53
-	note $23
-	note $93
-	note $23
-	note $93
-	note $23
-	note $a1
-	note $91
-	note $71
-	note $51
-	note $41
-	note $51
-	note $41
-	note $21
-	note $47
-	note $27
-	octave3
-	note $c7
-	note $a7
-	octave4
-	note $43
-	note $93
-	note $53
-	note $a3
+	note G#, 7
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note A_, 1
+	note G#, 3
+	octave 5
+	note C_, 3
+	octave 4
+	note A_, 3
+	note G#, 3
+	octave 5
+	note D#, 3
+	octave 4
+	note G#, 3
+	octave 5
+	note D#, 3
+	octave 4
+	note G#, 3
+	octave 5
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 4
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note D#, 7
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note E_, 1
+	note D#, 3
+	note G#, 3
+	note E_, 3
+	note C#, 3
+	note G#, 3
+	note C#, 3
+	note G#, 3
+	note C#, 3
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note D#, 7
+	note C#, 7
+	octave 3
+	note B_, 7
+	note A_, 7
+	octave 4
+	note D#, 3
+	note G#, 3
+	note E_, 3
+	note A_, 3
 	intensity $c0
-	note $97
+	note G#, 7
 	intensity $c7
-	note $97
+	note G#, 7
 	intensity $c2
-	note $9f
+	note G#, 15
 	intensity $80
-	octave3
-	note $6f
-	octave4
-	note $1f
-	octave3
-	note $cf
-	note $8f
-	loopchannel $00, $66ee ; end
-; 0xea7f4
+	octave 3
+	note F_, 15
+	octave 4
+	note C_, 15
+	octave 3
+	note B_, 15
+	note G_, 15
+	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
 
-_Music_JohtoGymLeaderBattle_Ch3: ; 0xea7f4
-	notetype $0c, $19
-	octave4
-	note $60
-	note $00
-	octave3
-	note $a1
-	octave4
-	note $60
-	note $00
-	octave3
-	note $91
-	octave4
-	note $60
-	note $00
-	octave3
-	note $81
-	octave4
-	note $60
-	note $00
-	octave3
-	note $71
-	octave4
-	note $90
-	note $00
-	octave3
-	note $61
-	octave4
-	note $90
-	note $00
-	octave3
-	note $51
-	note $61
-	note $81
-	note $93
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
-	note $81
-	note $31
-	note $61
-	note $81
-	note $91
-	note $91
-	note $81
-	note $61
-	note $81
-	note $31
-	note $61
-	note $81
-	note $91
-	note $41
-	note $73
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea952
-	note $81
-	note $31
-	note $61
-	note $81
-	note $91
-	note $91
-	note $81
-	note $61
-	note $81
-	note $31
-	note $61
-	note $81
-	note $91
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	note $21
-	note $91
-	note $21
-	note $91
-	note $21
-	note $b1
-	note $a1
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea963
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $91
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	note $11
-	note $81
-	note $b1
-	note $11
-	note $41
-	note $61
-	note $81
-	note $b1
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
-	octave3
-	note $81
-	note $91
-	note $61
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $51
-	note $61
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
-	octave3
-	note $11
-	note $21
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
-	note $11
-	note $81
-	note $11
-	note $81
-	note $61
-	note $51
-	note $61
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea96a
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea978
-	octave3
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea971
-	note $11
-	note $81
-	note $11
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $81
-	note $61
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
-	note $01
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
-	octave4
-	note $21
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
-	note $01
-	note $41
-	note $b1
-	octave4
-	note $41
-	octave3
-	note $41
-	note $b1
-	octave4
-	note $41
-	octave3
-	note $41
-	octave4
-	note $41
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea983
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea990
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea99c
-	note $a1
-	octave4
-	note $41
-	octave3
-	note $b1
-	note $41
-	octave4
-	note $41
-	octave3
-	note $41
-	octave4
-	note $41
-	note $33
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
-	note $41
-	note $91
-	note $41
-	octave4
-	note $21
-	octave3
-	note $41
-	note $a1
-	note $41
-	note $91
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $a1
-	note $91
-	note $71
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
-	note $21
-	note $71
-	note $21
-	octave4
-	note $21
-	octave3
-	note $21
-	note $a1
-	note $21
-	note $81
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b1
-	note $21
-	note $71
-	note $21
-	note $71
-	note $21
-	note $41
-	note $51
-	note $a1
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9a9
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $91
-	note $a1
-	octave4
-	note $21
-	octave3
-	note $41
-	note $91
-	note $41
-	note $a1
-	note $41
-	note $c1
-	note $41
-	octave4
-	note $21
-	octave3
-	note $91
-	note $41
-	note $71
-	note $91
-	note $a1
-	note $a1
-	note $91
-	note $71
-	note $91
-	note $41
-	note $71
-	note $91
-	note $71
-	note $71
-	note $51
-	note $71
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
-	note $61
-	note $11
-	note $41
-	note $61
-	note $41
-	note $41
-	note $21
-	note $41
-	callchannel _Music_JohtoGymLeaderBattle_sub_0xea9b8
-	note $61
-	note $11
-	note $41
-	note $61
-	note $41
-	note $71
-	note $61
-	note $41
-	loopchannel $00, $683f ; end
-; 0xea952
+Music_JohtoGymBattle_Ch3: ; ea7f4
+	notetype $c, $19
+	octave 4
+	note F_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 4
+	note F_, 0
+	note __, 0
+	octave 3
+	note G#, 1
+	octave 4
+	note F_, 0
+	note __, 0
+	octave 3
+	note G_, 1
+	octave 4
+	note F_, 0
+	note __, 0
+	octave 3
+	note F#, 1
+	octave 4
+	note G#, 0
+	note __, 0
+	octave 3
+	note F_, 1
+	octave 4
+	note G#, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	callchannel Music_JohtoGymBattle_branch_ea952
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note D#, 1
+	note F#, 3
+	callchannel Music_JohtoGymBattle_branch_ea952
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
 
-_Music_JohtoGymLeaderBattle_sub_0xea952: ; 0xea952
-; subroutine
-	note $81
-	note $31
-	note $61
-	note $81
-	note $91
-	note $91
-	note $81
-	note $61
-	note $81
-	note $31
-	note $61
-	note $81
-	note $61
-	note $61
-	note $41
-	note $61
-	endchannel ; end
-; 0xea963
+Music_JohtoGymBattle_branch_ea83f: ; ea83f
+	callchannel Music_JohtoGymBattle_branch_ea963
+	callchannel Music_JohtoGymBattle_branch_ea963
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	note C#, 1
+	note G#, 1
+	note C#, 1
+	note G#, 1
+	note C#, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	callchannel Music_JohtoGymBattle_branch_ea963
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	note C_, 1
+	note G_, 1
+	note A#, 1
+	note C_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note A#, 1
+	callchannel Music_JohtoGymBattle_branch_ea971
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	callchannel Music_JohtoGymBattle_branch_ea978
+	octave 3
+	note G_, 1
+	note G#, 1
+	note F_, 1
+	callchannel Music_JohtoGymBattle_branch_ea971
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	callchannel Music_JohtoGymBattle_branch_ea978
+	octave 3
+	note C_, 1
+	note C#, 1
+	note G#, 1
+	callchannel Music_JohtoGymBattle_branch_ea971
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea96a
+	callchannel Music_JohtoGymBattle_branch_ea978
+	octave 3
+	note F_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G#, 1
+	callchannel Music_JohtoGymBattle_branch_ea971
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea983
+	note __, 1
+	callchannel Music_JohtoGymBattle_branch_ea990
+	octave 4
+	note C#, 1
+	callchannel Music_JohtoGymBattle_branch_ea99c
+	note __, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	octave 4
+	note D#, 1
+	callchannel Music_JohtoGymBattle_branch_ea983
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea990
+	note G#, 1
+	callchannel Music_JohtoGymBattle_branch_ea99c
+	note A_, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note A#, 1
+	note D#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	octave 4
+	note D#, 1
+	note D_, 3
+	callchannel Music_JohtoGymBattle_branch_ea9a9
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note D#, 1
+	note A_, 1
+	note D#, 1
+	note G#, 1
+	callchannel Music_JohtoGymBattle_branch_ea9a9
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	callchannel Music_JohtoGymBattle_branch_ea9b1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note C#, 1
+	note A_, 1
+	note C#, 1
+	note G_, 1
+	callchannel Music_JohtoGymBattle_branch_ea9b1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note A_, 1
+	callchannel Music_JohtoGymBattle_branch_ea9a9
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note A_, 1
+	note D#, 1
+	note B_, 1
+	note D#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 1
+	note D#, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note D#, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	callchannel Music_JohtoGymBattle_branch_ea9b8
+	note F_, 1
+	note C_, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	callchannel Music_JohtoGymBattle_branch_ea9b8
+	note F_, 1
+	note C_, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	loopchannel 0, Music_JohtoGymBattle_branch_ea83f
+; ea952
 
-_Music_JohtoGymLeaderBattle_sub_0xea963: ; 0xea963
-; subroutine
-	note $31
-	note $81
-	loopchannel $04, $6963
-	endchannel ; end
-; 0xea96a
+Music_JohtoGymBattle_branch_ea952: ; ea952
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
+	endchannel
+; ea963
 
-_Music_JohtoGymLeaderBattle_sub_0xea96a: ; 0xea96a
-; subroutine
-	note $21
-	note $91
-	loopchannel $04, $696a
-	endchannel ; end
-; 0xea971
+Music_JohtoGymBattle_branch_ea963: ; ea963
+	note D_, 1
+	note G_, 1
+	loopchannel 4, Music_JohtoGymBattle_branch_ea963
+	endchannel
+; ea96a
 
-_Music_JohtoGymLeaderBattle_sub_0xea971: ; 0xea971
-; subroutine
-	note $11
-	note $81
-	loopchannel $04, $6971
-	endchannel ; end
-; 0xea978
+Music_JohtoGymBattle_branch_ea96a: ; ea96a
+	note C#, 1
+	note G#, 1
+	loopchannel 4, Music_JohtoGymBattle_branch_ea96a
+	endchannel
+; ea971
 
-_Music_JohtoGymLeaderBattle_sub_0xea978: ; 0xea978
-; subroutine
-	octave2
-	note $b1
-	octave3
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	octave2
-	note $b1
-	endchannel ; end
-; 0xea983
+Music_JohtoGymBattle_branch_ea971: ; ea971
+	note C_, 1
+	note G_, 1
+	loopchannel 4, Music_JohtoGymBattle_branch_ea971
+	endchannel
+; ea978
 
-_Music_JohtoGymLeaderBattle_sub_0xea983: ; 0xea983
-; subroutine
-	octave3
-	note $11
-	note $81
-	octave4
-	note $11
-	octave3
-	note $11
-	note $81
-	octave4
-	note $11
-	octave3
-	note $11
-	endchannel ; end
-; 0xea990
+Music_JohtoGymBattle_branch_ea978: ; ea978
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	octave 2
+	note A#, 1
+	endchannel
+; ea983
 
-_Music_JohtoGymLeaderBattle_sub_0xea990: ; 0xea990
-; subroutine
-	note $21
-	note $91
-	octave4
-	note $21
-	octave3
-	note $21
-	note $91
-	octave4
-	note $21
-	octave3
-	note $21
-	endchannel ; end
-; 0xea99c
+Music_JohtoGymBattle_branch_ea983: ; ea983
+	octave 3
+	note C_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note C_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note C_, 1
+	endchannel
+; ea990
 
-_Music_JohtoGymLeaderBattle_sub_0xea99c: ; 0xea99c
-; subroutine
-	octave3
-	note $31
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $31
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $31
-	endchannel ; end
-; 0xea9a9
+Music_JohtoGymBattle_branch_ea990: ; ea990
+	note C#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note C#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note C#, 1
+	endchannel
+; ea99c
 
-_Music_JohtoGymLeaderBattle_sub_0xea9a9: ; 0xea9a9
-; subroutine
-	octave3
-	note $41
-	note $91
-	loopchannel $04, $69a9
-	endchannel ; end
-; 0xea9b1
+Music_JohtoGymBattle_branch_ea99c: ; ea99c
+	octave 3
+	note D_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note D_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note D_, 1
+	endchannel
+; ea9a9
 
-_Music_JohtoGymLeaderBattle_sub_0xea9b1: ; 0xea9b1
-; subroutine
-	note $21
-	note $71
-	loopchannel $04, $69b1
-	endchannel ; end
-; 0xea9b8
+Music_JohtoGymBattle_branch_ea9a9: ; ea9a9
+	octave 3
+	note D#, 1
+	note G#, 1
+	loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
+	endchannel
+; ea9b1
 
-_Music_JohtoGymLeaderBattle_sub_0xea9b8: ; 0xea9b8
-; subroutine
-	note $61
-	note $11
-	note $41
-	note $61
-	note $71
-	note $71
-	note $61
-	note $41
-	endchannel ; end
-; 0xea9c1
+Music_JohtoGymBattle_branch_ea9b1: ; ea9b1
+	note C#, 1
+	note F#, 1
+	loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
+	endchannel
+; ea9b8
+
+Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
+	note F_, 1
+	note C_, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	endchannel
+; ea9c1
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -1,1346 +1,1365 @@
-_Music_JohtoTrainerBattle: ; 0xf6096
-	db $80
-	dw _Music_JohtoTrainerBattle_Ch1
-	db $01
-	dw _Music_JohtoTrainerBattle_Ch2
-	db $02
-	dw _Music_JohtoTrainerBattle_Ch3
-; 0xf609f
+Music_JohtoTrainerBattle: ; f6096
+	dbw $80, Music_JohtoTrainerBattle_Ch1
+	dbw $01, Music_JohtoTrainerBattle_Ch2
+	dbw $02, Music_JohtoTrainerBattle_Ch3
+; f609f
 
-_Music_JohtoTrainerBattle_Ch1: ; 0xf609f
-	tempo $6600
+
+Music_JohtoTrainerBattle_Ch1: ; f609f
+	tempo 102
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $92
-	note $07
-	octave3
-	note $a0
-	note $90
-	note $80
-	note $90
+	notetype $c, $92
+	note __, 7
+	octave 3
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
 	intensity $b2
-	note $10
-	octave2
-	note $c0
-	note $b0
-	note $c0
-	octave3
-	note $20
-	note $10
-	octave2
-	note $c0
-	octave3
-	note $10
-	note $30
-	note $20
-	note $10
-	note $20
-	note $40
-	note $30
-	note $20
-	note $30
-	note $50
-	note $40
-	note $30
-	note $40
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
+	note C_, 0
+	octave 2
+	note B_, 0
+	note A#, 0
+	note B_, 0
+	octave 3
+	note C#, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	note C#, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note E_, 5
+	note E_, 5
+	note E_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 5
 	intensity $b7
-	note $33
+	note D_, 3
 	intensity $b2
-	note $55
-	note $35
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
+	note E_, 5
+	note D_, 5
+	note E_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 5
 	intensity $b7
-	note $63
+	note F_, 3
 	intensity $b2
-	octave4
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $61
-	octave3
-	note $a1
-	note $b1
+	octave 4
+	note E_, 5
+	note E_, 5
+	note E_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	octave 3
+	note A_, 1
+	note A#, 1
 	intensity $b7
-	note $c3
+	note B_, 3
 	intensity $b2
-	octave4
-	note $55
-	note $55
-	note $53
-	note $51
-	note $31
-	note $51
-	note $65
+	octave 4
+	note E_, 5
+	note E_, 5
+	note E_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 5
 	intensity $b7
-	note $83
+	note G_, 3
+
+Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $b4
-	callchannel _Music_JohtoTrainerBattle_sub_0xf629f
+	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
-	note $b3
+	note A#, 3
 	intensity $b3
-	note $80
-	note $60
-	note $50
-	note $80
+	note G_, 0
+	note F_, 0
+	note E_, 0
+	note G_, 0
 	intensity $b7
-	octave4
-	note $13
+	octave 4
+	note C_, 3
 	intensity $b3
-	octave3
-	note $a0
-	note $80
-	note $60
-	note $a0
+	octave 3
+	note A_, 0
+	note G_, 0
+	note F_, 0
+	note A_, 0
 	intensity $b7
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $b3
-	note $10
-	octave3
-	note $b0
-	note $a0
-	octave4
-	note $10
+	note C_, 0
+	octave 3
+	note A#, 0
+	note A_, 0
+	octave 4
+	note C_, 0
 	intensity $b5
-	note $61
-	note $51
-	note $31
-	note $11
-	callchannel _Music_JohtoTrainerBattle_sub_0xf629f
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
-	note $63
-	note $51
-	note $61
-	octave4
-	note $13
-	octave3
-	note $b1
-	octave4
-	note $11
+	note F_, 3
+	note E_, 1
+	note F_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
 	intensity $a0
-	octave3
-	note $67
+	octave 3
+	note F_, 7
 	intensity $a7
-	note $67
+	note F_, 7
 	intensity $b7
-	note $a5
-	note $55
-	note $b3
-	octave4
-	note $25
-	note $63
-	note $51
-	note $31
-	note $61
-	note $51
-	note $61
-	note $51
-	note $31
-	note $21
-	octave3
-	note $b1
-	note $a1
-	note $b1
+	note A_, 5
+	note E_, 5
+	note A#, 3
+	octave 4
+	note C#, 5
+	note F_, 3
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note A#, 1
 	intensity $a0
-	note $a7
+	note A_, 7
 	intensity $a7
-	note $a7
+	note A_, 7
 	intensity $b7
-	note $57
-	note $37
-	note $57
-	note $67
-	note $57
-	note $37
-	note $87
-	note $67
-	note $37
-	note $17
-	note $37
-	note $47
-	note $37
-	note $17
-	note $37
-	note $47
-	note $37
-	note $47
-	note $57
-	note $67
+	note E_, 7
+	note D_, 7
+	note E_, 7
+	note F_, 7
+	note E_, 7
+	note D_, 7
+	note G_, 7
+	note F_, 7
+	note D_, 7
+	note C_, 7
+	note D_, 7
+	note D#, 7
+	note D_, 7
+	note C_, 7
+	note D_, 7
+	note D#, 7
+	note D_, 7
+	note D#, 7
+	note E_, 7
+	note F_, 7
 	intensity $b4
-	note $81
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $61
-	note $81
-	octave4
-	note $21
-	note $11
-	note $21
-	note $41
-	note $21
-	note $11
-	octave3
-	note $b1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
 	intensity $b5
-	note $41
-	note $31
+	note D#, 1
+	note D_, 1
 	intensity $b2
-	note $43
+	note D#, 3
 	intensity $b7
-	note $17
-	note $43
-	note $23
-	note $13
-	note $43
+	note C_, 7
+	note D#, 3
+	note C#, 3
+	note C_, 3
+	note D#, 3
 	intensity $b5
-	note $51
-	note $41
+	note E_, 1
+	note D#, 1
 	intensity $b2
-	note $53
+	note E_, 3
 	intensity $b7
-	note $27
-	note $63
-	note $43
-	note $23
-	note $63
+	note C#, 7
+	note F_, 3
+	note D#, 3
+	note C#, 3
+	note F_, 3
 	intensity $b5
-	note $71
-	note $61
+	note F#, 1
+	note F_, 1
 	intensity $b2
-	note $73
+	note F#, 3
 	intensity $b7
-	note $37
-	note $73
-	note $53
-	note $33
-	note $73
-	note $87
-	note $47
-	note $b7
-	note $87
+	note D_, 7
+	note F#, 3
+	note E_, 3
+	note D_, 3
+	note F#, 3
+	note G_, 7
+	note D#, 7
+	note A#, 7
+	note G_, 7
 	intensity $a0
-	note $43
+	note D#, 3
 	intensity $a7
-	note $4b
-	note $0f
+	note D#, 11
+	note __, 15
+
+Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	note $63
-	octave2
-	note $b3
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 1
+	note D#, 1
+	note F_, 3
+	octave 2
+	note A#, 3
 	intensity $b7
-	octave3
-	note $67
+	octave 3
+	note F_, 7
 	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
-	note $63
-	note $63
-	loopchannel $02, $61bd
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 1
+	note D#, 1
+	note F_, 3
+	note F_, 3
+	loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b4
-	note $83
-	note $43
-	note $63
-	note $91
-	note $81
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	note G#, 1
+	note G_, 1
 	intensity $b7
-	note $67
-	note $67
+	note F_, 7
+	note F_, 7
 	intensity $b5
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 1
+	note D#, 1
 	intensity $b7
-	note $67
-	note $67
+	note F_, 7
+	note F_, 7
 	intensity $b5
-	note $83
-	note $43
-	note $63
-	note $81
-	note $41
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 1
+	note D#, 1
 	intensity $3f
-	note $97
+	note G#, 7
 	intensity $b7
-	note $97
+	note G#, 7
 	intensity $a0
-	octave4
-	note $17
+	octave 4
+	note C_, 7
 	intensity $a7
-	note $17
+	note C_, 7
 	intensity $b2
-	octave3
-	note $45
-	note $45
-	note $43
-	note $45
-	note $45
+	octave 3
+	note D#, 5
+	note D#, 5
+	note D#, 3
+	note D#, 5
+	note D#, 5
 	intensity $b7
-	note $63
+	note F_, 3
 	intensity $b2
-	note $45
-	note $45
-	note $43
-	note $45
-	note $45
+	note D#, 5
+	note D#, 5
+	note D#, 3
+	note D#, 5
+	note D#, 5
 	intensity $4c
-	note $63
+	note F_, 3
 	intensity $b7
-	note $95
-	note $85
-	note $63
-	note $43
-	note $63
-	note $83
-	note $43
-	note $63
-	octave4
-	note $21
-	note $11
-	octave3
-	note $63
-	octave4
-	note $21
-	note $11
-	octave3
-	note $61
-	note $81
-	note $91
-	octave4
-	note $11
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $85
-	note $45
-	note $83
-	octave4
-	note $23
-	note $13
-	octave3
-	note $b3
-	note $93
-	note $63
-	note $21
-	note $41
-	note $63
-	note $21
-	note $41
-	note $b3
-	note $93
-	note $83
-	note $63
+	note G#, 5
+	note G_, 5
+	note F_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 3
+	note D#, 3
+	note F_, 3
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note F_, 3
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 5
+	note D#, 5
+	note G_, 3
+	octave 4
+	note C#, 3
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G#, 3
+	note F_, 3
+	note C#, 1
+	note D#, 1
+	note F_, 3
+	note C#, 1
+	note D#, 1
+	note A#, 3
+	note G#, 3
+	note G_, 3
+	note F_, 3
 	intensity $90
-	octave2
-	note $b7
-	octave3
-	note $47
-	octave2
-	note $b7
-	octave3
-	note $87
+	octave 2
+	note A#, 7
+	octave 3
+	note D#, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note G_, 7
 	intensity $a0
-	note $47
-	note $b7
-	note $87
-	octave4
-	note $47
+	note D#, 7
+	note A#, 7
+	note G_, 7
+	octave 4
+	note D#, 7
 	intensity $a0
-	octave3
-	note $b7
+	octave 3
+	note A#, 7
 	intensity $a7
-	note $b7
+	note A#, 7
 	intensity $b7
-	note $85
-	note $b5
-	note $91
-	note $81
+	note G_, 5
+	note A#, 5
+	note G#, 1
+	note G_, 1
 	intensity $a0
-	note $47
+	note D#, 7
 	intensity $a7
-	note $47
+	note D#, 7
 	intensity $b4
-	note $b5
-	note $83
-	note $81
-	note $bb
-	note $0f
-	note $07
+	note A#, 5
+	note G_, 3
+	note G_, 1
+	note A#, 11
+	note __, 15
+	note __, 7
 	intensity $a0
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $a7
-	note $3b
+	note D_, 11
 	intensity $a0
-	note $67
+	note F_, 7
 	intensity $a7
-	note $67
+	note F_, 7
 	intensity $b3
-	callchannel _Music_JohtoTrainerBattle_sub_0xf629f
-	note $63
-	note $51
-	note $61
-	octave4
-	note $13
-	octave3
-	note $b1
-	octave4
-	note $11
+	callchannel Music_JohtoTrainerBattle_branch_f629f
+	note F_, 3
+	note E_, 1
+	note F_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
 	intensity $a0
-	octave3
-	note $69
+	octave 3
+	note F_, 9
 	intensity $a7
-	note $65
-	loopchannel $00, $6102 ; end
-; 0xf629f
+	note F_, 5
+	loopchannel 0, Music_JohtoTrainerBattle_branch_f6102
+; f629f
 
-_Music_JohtoTrainerBattle_sub_0xf629f: ; 0xf629f
-; subroutine
-	octave3
-	note $51
-	note $31
-	note $51
-	note $a1
-	note $c1
-	note $a1
-	note $81
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $a1
-	note $c1
-	note $81
-	note $a1
-	note $51
-	note $61
-	note $31
-	endchannel ; end
-; 0xf62b3
+Music_JohtoTrainerBattle_branch_f629f: ; f629f
+	octave 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note E_, 1
+	note F_, 1
+	note D_, 1
+	endchannel
 
-_Music_JohtoTrainerBattle_Ch2: ; 0xf62b3
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $c2
-	octave4
-	note $90
-	note $80
-	note $70
-	note $60
-	note $90
-	note $30
-	note $40
-	note $50
-	note $90
-	note $40
-	note $30
-	note $40
-	note $90
-	note $30
-	note $20
-	note $30
-	note $90
-	note $20
-	note $10
-	note $20
-	note $90
-	octave3
-	note $b0
-	note $c0
-	octave4
-	note $10
-	note $90
-	octave3
-	note $c0
-	note $b0
-	note $c0
-	octave4
-	note $90
-	octave3
-	note $b0
-	note $a0
-	note $b0
+Music_JohtoTrainerBattle_Ch2: ; f62b3
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $c2
+	octave 4
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note G#, 0
+	note D_, 0
+	note D#, 0
+	note E_, 0
+	note G#, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note G#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note G#, 0
+	note C#, 0
+	note C_, 0
+	note C#, 0
+	note G#, 0
+	octave 3
+	note A#, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note G#, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note B_, 0
+	octave 4
+	note G#, 0
+	octave 3
+	note A#, 0
+	note A_, 0
+	note A#, 0
 	intensity $c2
-	octave4
-	note $a5
-	callchannel _Music_JohtoTrainerBattle_sub_0xf649a
+	octave 4
+	note A_, 5
+	callchannel Music_JohtoTrainerBattle_branch_f649a
 	intensity $c2
-	note $a5
-	callchannel _Music_JohtoTrainerBattle_sub_0xf649a
+	note A_, 5
+	callchannel Music_JohtoTrainerBattle_branch_f649a
 	intensity $c2
-	octave5
-	note $15
-	note $15
-	note $13
-	note $15
-	note $15
+	octave 5
+	note C_, 5
+	note C_, 5
+	note C_, 3
+	note C_, 5
+	note C_, 5
 	intensity $c7
-	note $23
+	note C#, 3
 	intensity $c2
-	note $11
+	note C_, 1
 	intensity $a4
-	octave3
-	note $51
-	note $a1
+	octave 3
+	note E_, 1
+	note A_, 1
 	intensity $c2
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $a4
-	octave3
-	note $51
-	note $a1
+	octave 3
+	note E_, 1
+	note A_, 1
 	intensity $c2
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $a4
-	octave3
-	note $51
+	octave 3
+	note E_, 1
 	intensity $c2
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $a4
-	octave3
-	note $51
-	note $c1
+	octave 3
+	note E_, 1
+	note B_, 1
 	intensity $c2
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $a4
-	octave4
-	note $11
-	note $51
+	octave 4
+	note C_, 1
+	note E_, 1
 	intensity $c7
-	note $c3
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64a3
+	note B_, 3
+
+Music_JohtoTrainerBattle_branch_f632a: ; f632a
+	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
-	note $b7
+	note A#, 7
 	intensity $c7
-	note $b7
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64a3
+	note A#, 7
+	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $c4
-	note $33
-	octave3
-	note $b1
-	octave4
-	note $31
-	note $61
-	note $51
-	note $31
-	note $61
-	note $51
-	note $31
-	note $51
-	note $61
-	note $b1
-	note $a1
-	note $b1
-	octave5
-	note $31
+	note D_, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note A#, 1
+	note A_, 1
+	note A#, 1
+	octave 5
+	note D_, 1
 	intensity $b0
-	note $27
+	note C#, 7
 	intensity $b7
-	note $23
+	note C#, 3
 	intensity $c7
-	octave4
-	note $b3
+	octave 4
+	note A#, 3
 	intensity $b0
-	note $af
+	note A_, 15
 	intensity $b7
-	note $af
+	note A_, 15
+
+Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	intensity $c3
-	octave3
-	note $a1
-	note $81
-	note $a1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note A_, 1
 	intensity $c7
-	note $b3
+	note A#, 3
 	intensity $c3
-	note $a1
-	note $81
-	note $b1
-	loopchannel $03, $635a
-	note $a1
-	octave4
-	note $31
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $61
-	note $81
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	loopchannel 3, Music_JohtoTrainerBattle_branch_f635a
+	note A_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+
+Music_JohtoTrainerBattle_branch_f6376: ; f6376
+	note G_, 1
+	note F_, 1
+	note G_, 1
 	intensity $c7
-	note $93
+	note G#, 3
 	intensity $c3
-	note $81
-	note $61
-	note $91
-	loopchannel $03, $6376
-	note $61
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $81
-	note $91
+	note G_, 1
+	note F_, 1
+	note G#, 1
+	loopchannel 3, Music_JohtoTrainerBattle_branch_f6376
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
 	intensity $c7
-	note $85
-	octave4
-	note $35
-	note $11
-	note $31
-	note $63
-	note $53
-	note $33
-	note $13
+	note G_, 5
+	octave 4
+	note D_, 5
+	note C_, 1
+	note D_, 1
+	note F_, 3
+	note E_, 3
+	note D_, 3
+	note C_, 3
 	intensity $b0
-	note $49
+	note D#, 9
 	intensity $b7
-	note $45
+	note D#, 5
 	intensity $90
-	note $87
+	note G_, 7
 	intensity $97
-	note $87
+	note G_, 7
 	intensity $c7
-	octave3
-	note $67
-	note $43
-	note $63
-	note $83
-	note $63
-	note $43
-	note $83
-	note $97
-	note $63
-	note $83
-	note $93
-	note $83
-	note $63
-	note $93
-	note $a7
-	note $73
-	note $93
-	note $a3
-	note $93
-	note $73
-	note $a3
+	octave 3
+	note F_, 7
+	note D#, 3
+	note F_, 3
+	note G_, 3
+	note F_, 3
+	note D#, 3
+	note G_, 3
+	note G#, 7
+	note F_, 3
+	note G_, 3
+	note G#, 3
+	note G_, 3
+	note F_, 3
+	note G#, 3
+	note A_, 7
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	note G#, 3
+	note F#, 3
+	note A_, 3
 	intensity $b0
-	note $b7
-	note $b7
+	note A#, 7
+	note A#, 7
 	intensity $b0
-	octave4
-	note $47
+	octave 4
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $62
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64b6
+	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $82
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64b6
+	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $92
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64b6
+	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $a2
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64b6
-	octave4
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $81
-	octave3
-	note $b1
-	octave4
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $81
-	octave3
-	note $b1
-	loopchannel $08, $63dd
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64be
-	octave3
-	note $b1
+	callchannel Music_JohtoTrainerBattle_branch_f64b6
+
+Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
+	octave 4
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note G_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note G_, 1
+	octave 3
+	note A#, 1
+	loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd
+	callchannel Music_JohtoTrainerBattle_branch_f64be
+	octave 3
+	note A#, 1
 	intensity $c7
-	octave4
-	note $17
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64be
-	note $81
+	octave 4
+	note C_, 7
+	callchannel Music_JohtoTrainerBattle_branch_f64be
+	note G_, 1
 	intensity $c7
-	note $67
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64be
-	octave3
-	note $b1
+	note F_, 7
+	callchannel Music_JohtoTrainerBattle_branch_f64be
+	octave 3
+	note A#, 1
 	intensity $b0
-	octave4
-	note $17
+	octave 4
+	note C_, 7
 	intensity $b7
-	note $17
+	note C_, 7
 	intensity $1f
-	note $4b
+	note D#, 11
 	intensity $c7
-	note $43
+	note D#, 3
 	intensity $c2
-	octave3
-	note $83
-	note $41
-	note $85
-	note $83
-	note $81
-	note $61
-	note $41
-	note $85
+	octave 3
+	note G_, 3
+	note D#, 1
+	note G_, 5
+	note G_, 3
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note G_, 5
 	intensity $c7
-	note $93
+	note G#, 3
 	intensity $c2
-	note $83
-	note $41
-	note $85
-	note $83
-	note $85
-	note $85
+	note G_, 3
+	note D#, 1
+	note G_, 5
+	note G_, 3
+	note G_, 5
+	note G_, 5
 	intensity $4c
-	note $93
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64d2
+	note G#, 3
+	callchannel Music_JohtoTrainerBattle_branch_f64d2
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b0
-	note $97
+	note G#, 7
 	intensity $b7
-	note $97
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64d2
+	note G#, 7
+	callchannel Music_JohtoTrainerBattle_branch_f64d2
 	intensity $b0
-	note $27
+	note C#, 7
 	intensity $b7
-	note $27
+	note C#, 7
 	intensity $c7
-	note $23
-	note $13
-	octave3
-	note $b3
-	note $93
-	note $85
-	note $41
-	note $b7
-	note $b5
-	note $81
-	octave4
-	note $47
-	note $45
-	octave3
-	note $b1
-	octave4
-	note $87
-	note $85
-	note $41
-	note $b7
-	note $85
-	note $b5
-	note $91
-	note $81
+	note C#, 3
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G#, 3
+	note G_, 5
+	note D#, 1
+	note A#, 7
+	note A#, 5
+	note G_, 1
+	octave 4
+	note D#, 7
+	note D#, 5
+	octave 3
+	note A#, 1
+	octave 4
+	note G_, 7
+	note G_, 5
+	note D#, 1
+	note A#, 7
+	note G_, 5
+	note A#, 5
+	note G#, 1
+	note G_, 1
 	intensity $b0
-	note $47
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $c7
-	note $45
-	note $b5
-	note $91
-	note $81
+	note D#, 5
+	note A#, 5
+	note G#, 1
+	note G_, 1
 	intensity $b0
-	note $47
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $c7
-	octave3
-	note $a5
-	octave4
-	note $55
-	note $31
-	note $51
-	note $83
-	note $73
-	note $53
-	note $33
+	octave 3
+	note A_, 5
+	octave 4
+	note E_, 5
+	note D_, 1
+	note E_, 1
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b0
-	note $b7
+	note A#, 7
 	intensity $b7
-	note $b7
-	callchannel _Music_JohtoTrainerBattle_sub_0xf64a3
+	note A#, 7
+	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $c7
-	note $33
-	octave3
-	note $b1
-	octave4
-	note $31
-	note $61
-	note $51
-	note $31
-	note $61
-	loopchannel $00, $632a ; end
-; 0xf649a
+	note D_, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	loopchannel 0, Music_JohtoTrainerBattle_branch_f632a
+; f649a
 
-_Music_JohtoTrainerBattle_sub_0xf649a: ; 0xf649a
-; subroutine
-	octave3
-	note $a5
-	note $a3
-	note $a5
-	note $a5
+Music_JohtoTrainerBattle_branch_f649a: ; f649a
+	octave 3
+	note A_, 5
+	note A_, 3
+	note A_, 5
+	note A_, 5
 	intensity $c7
-	note $b3
-	endchannel ; end
-; 0xf64a3
+	note A#, 3
+	endchannel
+; f64a3
 
-_Music_JohtoTrainerBattle_sub_0xf64a3: ; 0xf64a3
-; subroutine
+Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
 	intensity $c7
-	octave3
-	note $a5
-	octave4
-	note $55
-	note $31
-	note $51
-	note $83
-	note $73
-	note $53
-	note $33
+	octave 3
+	note A_, 5
+	octave 4
+	note E_, 5
+	note D_, 1
+	note E_, 1
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
-	endchannel ; end
-; 0xf64b6
+	note F_, 7
+	endchannel
+; f64b6
 
-_Music_JohtoTrainerBattle_sub_0xf64b6: ; 0xf64b6
-; subroutine
-	octave3
-	note $b1
-	note $41
-	octave4
-	note $41
-	octave3
-	note $41
-	endchannel ; end
-; 0xf64be
+Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
+	octave 3
+	note A#, 1
+	note D#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	endchannel
+; f64be
 
-_Music_JohtoTrainerBattle_sub_0xf64be: ; 0xf64be
-; subroutine
+Music_JohtoTrainerBattle_branch_f64be: ; f64be
 	intensity $c7
-	octave4
-	note $63
+	octave 4
+	note F_, 3
 	intensity $c4
-	octave3
-	note $b1
-	octave4
-	note $61
-	note $91
-	note $81
-	note $61
-	note $41
-	note $30
-	note $40
-	note $30
-	note $40
-	note $61
-	endchannel ; end
-; 0xf64d2
+	octave 3
+	note A#, 1
+	octave 4
+	note F_, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note F_, 1
+	endchannel
+; f64d2
 
-_Music_JohtoTrainerBattle_sub_0xf64d2: ; 0xf64d2
-; subroutine
+Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
 	intensity $c7
-	octave4
-	note $45
-	note $b5
-	note $91
-	note $81
-	note $93
-	note $83
-	note $63
-	note $43
-	endchannel ; end
-; 0xf64de
+	octave 4
+	note D#, 5
+	note A#, 5
+	note G#, 1
+	note G_, 1
+	note G#, 3
+	note G_, 3
+	note F_, 3
+	note D#, 3
+	endchannel
 
-_Music_JohtoTrainerBattle_Ch3: ; 0xf64de
-	notetype $0c, $19
-	octave4
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $51
-	note $b1
-	note $a1
-	note $91
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $51
-	note $71
-	note $81
-	note $51
-	loopchannel $03, $6501
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $51
-	note $71
-	note $81
-	note $91
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6676
-	octave4
-	note $11
-	octave3
-	note $81
-	note $a1
-	note $b1
-	octave4
-	note $11
-	note $21
-	note $11
-	octave3
-	note $b1
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6676
-	octave4
-	note $11
-	octave3
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6681
-	note $51
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6692
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6692
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6681
-	note $a1
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6692
-	callchannel _Music_JohtoTrainerBattle_sub_0xf6692
-	callchannel _Music_JohtoTrainerBattle_sub_0xf669d
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $61
-	callchannel _Music_JohtoTrainerBattle_sub_0xf669d
-	note $51
-	octave4
-	note $61
-	note $51
-	note $31
-	octave3
-	note $a1
-	note $91
-	note $a1
-	note $b1
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66a5
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $81
-	note $a1
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66a5
-	note $31
-	octave4
-	note $31
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $a1
-	note $b1
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66ac
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $61
-	note $81
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66ac
-	note $11
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $31
-	note $87
-	note $67
-	note $57
-	note $47
-	octave3
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $a1
-	octave4
-	note $11
-	loopchannel $02, $6591
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66ac
-	note $11
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $81
-	note $21
-	note $91
-	loopchannel $07, $65ac
-	note $c1
-	note $a1
-	note $31
-	note $a1
-	loopchannel $05, $65b4
-	note $c1
-	note $a1
-	note $91
-	note $71
-	note $91
-	note $a1
-	note $b3
-	note $43
-	loopchannel $04, $65c0
-	octave4
-	note $83
-	octave3
-	note $b3
-	loopchannel $04, $65c6
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66b4
-	note $41
-	note $67
-	callchannel _Music_JohtoTrainerBattle_sub_0xf66b4
-	octave4
-	note $11
-	octave3
-	note $b7
-	loopchannel $02, $65ce
-	octave4
-	note $27
-	note $17
-	octave3
-	note $b7
-	note $97
-	note $67
-	note $87
-	note $97
-	note $b7
-	note $67
-	note $87
-	note $93
-	note $41
-	note $91
-	octave4
-	note $17
-	note $17
-	note $47
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $61
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	note $41
-	note $b1
-	octave4
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $91
-	note $41
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	note $41
-	note $b1
-	octave4
-	note $11
-	note $21
-	note $41
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $41
-	note $b1
-	loopchannel $08, $661e
-	note $21
-	note $91
-	loopchannel $06, $6624
-	note $21
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $41
-	note $b1
-	loopchannel $08, $6630
-	note $21
-	note $91
-	loopchannel $04, $6636
-	note $21
-	octave4
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $81
-	note $91
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $47
-	note $27
-	note $17
-	octave2
-	note $b7
-	octave3
-	note $b7
-	note $97
-	note $87
-	note $67
-	octave4
-	note $47
-	note $47
-	octave3
-	note $b7
-	note $b7
-	note $87
-	note $87
-	note $47
-	note $43
-	note $b3
-	note $af
-	octave4
-	note $1f
-	octave3
-	note $bf
-	octave4
-	note $3f
-	octave3
-	note $af
-	octave4
-	note $1f
-	octave3
-	note $bf
-	octave4
-	note $37
-	note $01
-	octave3
-	note $a1
-	note $b1
-	octave4
-	note $31
-	loopchannel $00, $6531 ; end
-; 0xf6676
+Music_JohtoTrainerBattle_Ch3: ; f64de
+	notetype $c, $19
+	octave 4
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+
+Music_JohtoTrainerBattle_branch_f6501: ; f6501
+	note A_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 1
+	loopchannel 3, Music_JohtoTrainerBattle_branch_f6501
+	note A_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	callchannel Music_JohtoTrainerBattle_branch_f6676
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	callchannel Music_JohtoTrainerBattle_branch_f6676
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note G_, 1
+
+Music_JohtoTrainerBattle_branch_f6531: ; f6531
+	callchannel Music_JohtoTrainerBattle_branch_f6681
+	note E_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f6692
+	callchannel Music_JohtoTrainerBattle_branch_f6692
+	callchannel Music_JohtoTrainerBattle_branch_f6681
+	note A_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f6692
+	callchannel Music_JohtoTrainerBattle_branch_f6692
+	callchannel Music_JohtoTrainerBattle_branch_f669d
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f669d
+	note E_, 1
+	octave 4
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	callchannel Music_JohtoTrainerBattle_branch_f66a5
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f66a5
+	note D_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	callchannel Music_JohtoTrainerBattle_branch_f66ac
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoTrainerBattle_branch_f66ac
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note G_, 7
+	note F_, 7
+	note E_, 7
+	note D#, 7
+
+Music_JohtoTrainerBattle_branch_f6591: ; f6591
+	octave 3
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	loopchannel 2, Music_JohtoTrainerBattle_branch_f6591
+	callchannel Music_JohtoTrainerBattle_branch_f66ac
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note G_, 1
+
+Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
+	note C#, 1
+	note G#, 1
+	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
+	note B_, 1
+	note A_, 1
+
+Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
+	note D_, 1
+	note A_, 1
+	loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+
+Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
+	note A#, 3
+	note D#, 3
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
+
+Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
+	octave 4
+	note G_, 3
+	octave 3
+	note A#, 3
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
+
+Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
+	callchannel Music_JohtoTrainerBattle_branch_f66b4
+	note D#, 1
+	note F_, 7
+	callchannel Music_JohtoTrainerBattle_branch_f66b4
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 7
+	loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce
+	octave 4
+	note C#, 7
+	note C_, 7
+	octave 3
+	note A#, 7
+	note G#, 7
+	note F_, 7
+	note G_, 7
+	note G#, 7
+	note A#, 7
+	note F_, 7
+	note G_, 7
+	note G#, 3
+	note D#, 1
+	note G#, 1
+	octave 4
+	note C_, 7
+	note C_, 7
+	note D#, 7
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
 
-_Music_JohtoTrainerBattle_sub_0xf6676: ; 0xf6676
-; subroutine
-	octave4
-	note $11
-	octave3
-	note $81
-	note $a1
-	note $b1
-	note $81
-	note $a1
-	note $b1
-	note $81
-	endchannel ; end
-; 0xf6681
+Music_JohtoTrainerBattle_branch_f661e: ; f661e
+	note D#, 1
+	note A#, 1
+	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
 
-_Music_JohtoTrainerBattle_sub_0xf6681: ; 0xf6681
-; subroutine
-	octave3
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $a1
-	note $51
-	note $71
-	note $81
-	endchannel ; end
-; 0xf6692
+Music_JohtoTrainerBattle_branch_f6624: ; f6624
+	note C#, 1
+	note G#, 1
+	loopchannel 6, Music_JohtoTrainerBattle_branch_f6624
+	note C#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
 
-_Music_JohtoTrainerBattle_sub_0xf6692: ; 0xf6692
-; subroutine
-	octave3
-	note $61
-	note $b1
-	note $61
-	note $b1
-	note $61
-	note $a1
-	note $b1
-	octave4
-	note $31
-	endchannel ; end
-; 0xf669d
+Music_JohtoTrainerBattle_branch_f6630: ; f6630
+	note D#, 1
+	note A#, 1
+	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
 
-_Music_JohtoTrainerBattle_sub_0xf669d: ; 0xf669d
-; subroutine
-	octave3
-	note $51
-	note $a1
-	loopchannel $04, $669d
-	endchannel ; end
-; 0xf66a5
+Music_JohtoTrainerBattle_branch_f6636: ; f6636
+	note C#, 1
+	note G#, 1
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f6636
+	note C#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note D#, 7
+	note C#, 7
+	note C_, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note A#, 7
+	note G#, 7
+	note G_, 7
+	note F_, 7
+	octave 4
+	note D#, 7
+	note D#, 7
+	octave 3
+	note A#, 7
+	note A#, 7
+	note G_, 7
+	note G_, 7
+	note D#, 7
+	note D#, 3
+	note A#, 3
+	note A_, 15
+	octave 4
+	note C_, 15
+	octave 3
+	note A#, 15
+	octave 4
+	note D_, 15
+	octave 3
+	note A_, 15
+	octave 4
+	note C_, 15
+	octave 3
+	note A#, 15
+	octave 4
+	note D_, 7
+	note __, 1
+	octave 3
+	note A_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	loopchannel 0, Music_JohtoTrainerBattle_branch_f6531
+; f6676
 
-_Music_JohtoTrainerBattle_sub_0xf66a5: ; 0xf66a5
-; subroutine
-	note $31
-	note $a1
-	loopchannel $04, $66a5
-	endchannel ; end
-; 0xf66ac
+Music_JohtoTrainerBattle_branch_f6676: ; f6676
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note G_, 1
+	endchannel
+; f6681
 
-_Music_JohtoTrainerBattle_sub_0xf66ac: ; 0xf66ac
-; subroutine
-	octave3
-	note $11
-	note $81
-	loopchannel $04, $66ac
-	endchannel ; end
-; 0xf66b4
+Music_JohtoTrainerBattle_branch_f6681: ; f6681
+	octave 3
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	endchannel
+; f6692
 
-_Music_JohtoTrainerBattle_sub_0xf66b4: ; 0xf66b4
-; subroutine
-	note $b3
-	note $41
-	note $b1
-	octave4
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $80
-	note $90
-	note $80
-	note $90
-	note $b1
-	endchannel ; end
-; 0xf66c3
+Music_JohtoTrainerBattle_branch_f6692: ; f6692
+	octave 3
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	endchannel
+; f669d
+
+Music_JohtoTrainerBattle_branch_f669d: ; f669d
+	octave 3
+	note E_, 1
+	note A_, 1
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f669d
+	endchannel
+; f66a5
+
+Music_JohtoTrainerBattle_branch_f66a5: ; f66a5
+	note D_, 1
+	note A_, 1
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5
+	endchannel
+; f66ac
+
+Music_JohtoTrainerBattle_branch_f66ac: ; f66ac
+	octave 3
+	note C_, 1
+	note G_, 1
+	loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac
+	endchannel
+; f66b4
+
+Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
+	note A#, 3
+	note D#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note A#, 1
+	endchannel
+; f66c3
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -1,579 +1,605 @@
-_Music_JohtoWildPokemonBattle: ; 0xf5dc5
-	db $80
-	dw _Music_JohtoWildPokemonBattle_Ch1
-	db $01
-	dw _Music_JohtoWildPokemonBattle_Ch2
-	db $02
-	dw _Music_JohtoWildPokemonBattle_Ch3
-; 0xf5dce
+Music_JohtoWildBattle: ; f5dc5
+	dbw $80, Music_JohtoWildBattle_Ch1
+	dbw $01, Music_JohtoWildBattle_Ch2
+	dbw $02, Music_JohtoWildBattle_Ch3
+; f5dce
 
-_Music_JohtoWildPokemonBattle_Ch1: ; 0xf5dce
-	tempo $6800
+
+Music_JohtoWildBattle_Ch1: ; f5dce
+	tempo 104
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $b2
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave2
-	note $c0
-	octave3
-	note $10
-	octave2
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $c0
-	octave3
-	note $10
-	note $20
+
+Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
+	notetype $c, $b2
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note B_, 0
+	octave 3
+	note C_, 0
+	note C#, 0
 	intensity $b2
-	note $85
-	octave2
-	note $b5
-	octave3
-	note $33
-	note $13
-	note $23
-	note $37
-	note $45
-	octave2
-	note $b5
-	octave3
-	note $43
-	note $13
-	note $33
+	note G_, 5
+	octave 2
+	note A#, 5
+	octave 3
+	note D_, 3
+	note C_, 3
+	note C#, 3
+	note D_, 7
+	note D#, 5
+	octave 2
+	note A#, 5
+	octave 3
+	note D#, 3
+	note C_, 3
+	note D_, 3
 	intensity $b5
-	note $47
+	note D#, 7
 	intensity $b2
-	octave4
-	note $35
-	octave3
-	note $b5
-	octave4
-	note $33
-	note $13
-	note $23
-	note $37
-	note $45
-	octave3
-	note $b5
-	octave4
-	note $43
-	note $13
-	note $33
+	octave 4
+	note D_, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note D_, 3
+	note C_, 3
+	note C#, 3
+	note D_, 7
+	note D#, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note D#, 3
+	note C_, 3
+	note D_, 3
 	intensity $6f
-	note $47
+	note D#, 7
+
+Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	intensity $b6
-	octave3
-	note $35
-	octave2
-	note $c5
-	note $c3
-	octave3
-	note $65
-	note $55
-	note $13
-	note $97
-	note $b0
-	note $a0
-	note $80
-	note $70
-	note $80
-	note $90
-	note $a0
-	note $b0
-	octave4
-	note $17
-	octave3
-	note $c0
-	note $b0
-	note $90
-	note $80
-	note $90
-	note $a0
-	note $b0
-	note $c0
-	note $35
-	octave2
-	note $c5
-	note $c3
-	octave3
-	note $65
-	note $55
-	note $33
-	note $57
-	note $37
-	note $17
-	note $67
-	note $45
-	note $15
-	note $13
-	note $75
-	note $65
-	note $23
-	note $a7
-	note $c0
-	note $b0
-	note $90
-	note $80
-	note $90
-	note $a0
-	note $b0
-	note $c0
-	octave4
-	note $27
-	note $10
-	octave3
-	note $c0
-	note $a0
-	note $90
-	note $a0
-	note $b0
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $45
-	note $15
-	note $13
-	note $75
-	note $65
-	note $23
-	note $67
-	note $47
-	note $27
-	note $77
+	octave 3
+	note D_, 5
+	octave 2
+	note B_, 5
+	note B_, 3
+	octave 3
+	note F_, 5
+	note E_, 5
+	note C_, 3
+	note G#, 7
+	note A#, 0
+	note A_, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	octave 4
+	note C_, 7
+	octave 3
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	note B_, 0
+	note D_, 5
+	octave 2
+	note B_, 5
+	note B_, 3
+	octave 3
+	note F_, 5
+	note E_, 5
+	note D_, 3
+	note E_, 7
+	note D_, 7
+	note C_, 7
+	note F_, 7
+	note D#, 5
+	note C_, 5
+	note C_, 3
+	note F#, 5
+	note F_, 5
+	note C#, 3
+	note A_, 7
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	note B_, 0
+	octave 4
+	note C#, 7
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 5
+	note C_, 5
+	note C_, 3
+	note F#, 5
+	note F_, 5
+	note C#, 3
+	note F_, 7
+	note D#, 7
+	note C#, 7
+	note F#, 7
 	intensity $b7
-	note $55
-	note $35
-	note $53
-	note $65
-	note $55
-	note $13
-	note $67
-	note $17
-	note $55
-	note $35
-	note $63
-	note $8f
-	octave4
-	note $37
-	note $87
-	note $8f
-	note $3f
-	octave3
-	note $13
-	note $33
-	note $13
-	octave2
-	note $c3
-	octave3
-	note $1f
-	note $33
-	note $53
-	note $33
-	note $73
-	note $8f
-	loopchannel $00, $5e2d ; end
-; 0xf5ea2
+	note E_, 5
+	note D_, 5
+	note E_, 3
+	note F_, 5
+	note E_, 5
+	note C_, 3
+	note F_, 7
+	note C_, 7
+	note E_, 5
+	note D_, 5
+	note F_, 3
+	note G_, 15
+	octave 4
+	note D_, 7
+	note G_, 7
+	note G_, 15
+	note D_, 15
+	octave 3
+	note C_, 3
+	note D_, 3
+	note C_, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 15
+	note D_, 3
+	note E_, 3
+	note D_, 3
+	note F#, 3
+	note G_, 15
+	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
 
-_Music_JohtoWildPokemonBattle_Ch2: ; 0xf5ea2
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
-	notetype $0c, $c2
-	octave4
-	note $85
-	octave3
-	note $35
-	note $83
-	note $63
-	note $73
-	note $87
-	note $95
-	note $35
-	note $93
-	note $63
-	note $83
+Music_JohtoWildBattle_Ch2: ; f5ea2
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	callchannel Music_JohtoWildBattle_branch_f5f5d
+	notetype $c, $c2
+	octave 4
+	note G_, 5
+
+Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
+	octave 3
+	note D_, 5
+	note G_, 3
+	note F_, 3
+	note F#, 3
+	note G_, 7
+	note G#, 5
+	note D_, 5
+	note G#, 3
+	note F_, 3
+	note G_, 3
 	intensity $c7
-	note $97
+	note G#, 7
 	intensity $c2
-	octave4
-	note $85
-	note $35
-	note $83
-	note $63
-	note $73
-	note $87
-	note $95
-	note $35
-	note $93
-	note $63
-	note $83
+	octave 4
+	note G_, 5
+	note D_, 5
+	note G_, 3
+	note F_, 3
+	note F#, 3
+	note G_, 7
+	note G#, 5
+	note D_, 5
+	note G#, 3
+	note F_, 3
+	note G_, 3
 	intensity $6f
-	note $97
+	note G#, 7
+
+Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	intensity $c4
-	octave3
-	note $85
-	note $35
-	note $31
-	note $81
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $61
-	note $81
-	note $a1
-	octave4
-	note $21
+	octave 3
+	note G_, 5
+	note D_, 5
+	note D_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
 	intensity $b0
-	note $4f
+	note D#, 15
 	intensity $b7
-	note $4f
+	note D#, 15
 	intensity $c4
-	octave3
-	note $85
-	note $35
-	note $31
-	note $81
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $a3
-	note $c3
+	octave 3
+	note G_, 5
+	note D_, 5
+	note D_, 1
+	note G_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note B_, 3
 	intensity $b0
-	note $af
+	note A_, 15
 	intensity $b6
-	note $af
+	note A_, 15
 	intensity $c4
-	note $95
-	note $45
-	note $41
-	note $91
-	octave4
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $91
-	note $71
-	note $91
-	note $b1
-	octave4
-	note $31
+	note G#, 5
+	note D#, 5
+	note D#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
 	intensity $b0
-	note $5f
+	note E_, 15
 	intensity $b7
-	note $5f
+	note E_, 15
 	intensity $c4
-	octave3
-	note $95
-	note $45
-	note $41
-	note $91
-	octave4
-	note $23
-	note $13
-	octave3
-	note $b3
-	note $93
+	octave 3
+	note G#, 5
+	note D#, 5
+	note D#, 1
+	note G#, 1
+	octave 4
+	note C#, 3
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G#, 3
 	intensity $b0
-	note $bf
+	note A#, 15
 	intensity $b5
-	note $bf
+	note A#, 15
 	intensity $c6
-	octave4
-	note $cb
-	note $81
-	note $c1
-	octave5
-	note $31
-	note $11
-	octave4
-	note $c1
-	note $a1
-	note $81
-	note $a1
-	note $c1
-	note $81
-	note $ab
-	octave3
-	note $61
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $61
-	note $81
-	note $a1
-	octave4
-	note $11
+	octave 4
+	note B_, 11
+	note G_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 11
+	octave 3
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
 	intensity $c7
-	note $3f
-	note $87
-	octave5
-	note $17
-	octave4
-	note $cf
-	note $8f
-	octave3
-	note $53
-	note $73
-	note $53
-	note $33
-	note $5f
-	note $83
-	note $a3
-	note $83
-	note $b3
-	note $cf
-	loopchannel $00, $5ed1 ; end
-; 0xf5f5d
+	note D_, 15
+	note G_, 7
+	octave 5
+	note C_, 7
+	octave 4
+	note B_, 15
+	note G_, 15
+	octave 3
+	note E_, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
+	note E_, 15
+	note G_, 3
+	note A_, 3
+	note G_, 3
+	note A#, 3
+	note B_, 15
+	loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
+; f5f5d
 
-_Music_JohtoWildPokemonBattle_sub_0xf5f5d: ; 0xf5f5d
-; subroutine
-	notetype $0c, $c2
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	octave4
-	note $60
-	note $70
-	note $80
-	octave5
-	note $80
-	endchannel ; end
-; 0xf5f91
+Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 
-_Music_JohtoWildPokemonBattle_Ch3: ; 0xf5f91
-	notetype $0c, $14
-	octave4
-	note $81
-	octave5
-	note $31
-	octave4
-	note $81
-	octave5
-	note $21
-	octave4
-	note $71
-	octave5
-	note $11
-	octave4
-	note $71
-	note $c1
-	note $61
-	note $b1
-	note $61
-	note $a1
-	note $61
-	note $31
-	note $81
-	note $61
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $81
-	note $31
-	note $51
-	note $61
-	note $81
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $41
-	note $81
-	note $61
-	note $31
-	note $81
-	loopchannel $06, $5fc6
-	note $31
-	note $51
-	note $61
-	note $81
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	note $61
-	note $61
-	note $81
-	note $81
-	note $91
-	note $81
-	note $61
-	note $41
-	note $31
-	note $81
-	loopchannel $07, $5fdb
-	note $73
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	note $31
-	note $81
-	loopchannel $07, $5fe8
-	note $31
-	note $a1
-	note $11
-	note $61
-	loopchannel $05, $5ff0
-	note $51
-	note $31
-	note $11
-	note $31
-	note $51
-	note $61
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $91
-	note $83
-	note $51
-	note $a1
-	loopchannel $08, $6006
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf6055
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $91
-	note $41
-	note $b1
-	note $21
-	note $71
-	note $21
-	note $71
-	note $21
-	note $71
-	note $21
-	note $71
-	note $21
-	note $71
-	note $61
-	note $71
-	note $91
-	note $71
-	note $61
-	note $41
-	note $31
-	note $81
-	loopchannel $08, $6027
-	note $11
-	note $61
-	loopchannel $07, $602d
-	note $51
-	note $11
-	note $33
-	note $83
-	note $33
-	note $83
-	note $31
-	note $81
-	loopchannel $0c, $6039
-	note $11
-	note $51
-	loopchannel $07, $603f
-	note $61
-	note $71
-	note $31
-	note $81
-	loopchannel $06, $6047
-	note $a1
-	note $81
-	note $71
-	note $51
-	loopchannel $00, $5fdb ; end
-; 0xf6055
+Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
+	notetype $c, $c2
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note F_, 0
+	note F#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	endchannel
 
-_Music_JohtoWildPokemonBattle_sub_0xf6055: ; 0xf6055
-; subroutine
-	note $41
-	note $91
-	loopchannel $04, $6055
-	endchannel ; end
-; 0xf605c
+Music_JohtoWildBattle_Ch3: ; f5f91
+	notetype $c, $14
+
+Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
+	octave 4
+	note G_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note G_, 1
+	octave 5
+	note C#, 1
+	octave 4
+	note F#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note F#, 1
+	note B_, 1
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoWildBattle_branch_f6055
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note D#, 1
+	note G_, 1
+	note F_, 1
+
+Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
+	note D_, 1
+	note G_, 1
+	loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_JohtoWildBattle_branch_f6055
+	note F_, 1
+	note F_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+
+Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
+	note D_, 1
+	note G_, 1
+	loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
+	note F#, 3
+	callchannel Music_JohtoWildBattle_branch_f6055
+	callchannel Music_JohtoWildBattle_branch_f6055
+
+Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
+	note D_, 1
+	note G_, 1
+	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
+	note D_, 1
+	note A_, 1
+
+Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
+	note C_, 1
+	note F_, 1
+	loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	callchannel Music_JohtoWildBattle_branch_f6055
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note G_, 3
+
+Music_JohtoWildBattle_branch_f6006: ; f6006
+	note E_, 1
+	note A_, 1
+	loopchannel 8, Music_JohtoWildBattle_branch_f6006
+	callchannel Music_JohtoWildBattle_branch_f6055
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note A#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note C#, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+
+Music_JohtoWildBattle_branch_f6027: ; f6027
+	note D_, 1
+	note G_, 1
+	loopchannel 8, Music_JohtoWildBattle_branch_f6027
+
+Music_JohtoWildBattle_branch_f602d: ; f602d
+	note C_, 1
+	note F_, 1
+	loopchannel 7, Music_JohtoWildBattle_branch_f602d
+	note E_, 1
+	note C_, 1
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 3
+
+Music_JohtoWildBattle_branch_f6039: ; f6039
+	note D_, 1
+	note G_, 1
+	loopchannel 12, Music_JohtoWildBattle_branch_f6039
+
+Music_JohtoWildBattle_branch_f603f: ; f603f
+	note C_, 1
+	note E_, 1
+	loopchannel 7, Music_JohtoWildBattle_branch_f603f
+	note F_, 1
+	note F#, 1
+
+Music_JohtoWildBattle_branch_f6047: ; f6047
+	note D_, 1
+	note G_, 1
+	loopchannel 6, Music_JohtoWildBattle_branch_f6047
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
+; f6055
+
+Music_JohtoWildBattle_branch_f6055: ; f6055
+	note D#, 1
+	note G#, 1
+	loopchannel 4, Music_JohtoWildBattle_branch_f6055
+	endchannel
+; f605c
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -1,35 +1,31 @@
-_Music_JohtoWildPokemonBattleNight: ; 0xf605c
-	db $80
-	dw _Music_JohtoWildPokemonBattleNight_Ch1
-	db $01
-	dw _Music_JohtoWildPokemonBattleNight_Ch2
-	db $02
-	dw _Music_JohtoWildPokemonBattleNight_Ch3
-; 0xf6065
+Music_JohtoWildBattleNight: ; f605c
+	dbw $80, Music_JohtoWildBattleNight_Ch1
+	dbw $01, Music_JohtoWildBattleNight_Ch2
+	dbw $02, Music_JohtoWildBattleNight_Ch3
+; f6065
 
-_Music_JohtoWildPokemonBattleNight_Ch1: ; 0xf6065
-	tempo $6b00
+
+Music_JohtoWildBattleNight_Ch1: ; f6065
+	tempo 107
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $10, $25
-	loopchannel $00, $5ddb ; end
-; 0xf6076
+	loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
 
-_Music_JohtoWildPokemonBattleNight_Ch2: ; 0xf6076
-	dutycycle $03
+Music_JohtoWildBattleNight_Ch2: ; f6076
+	dutycycle $3
 	vibrato $20, $36
-	tone $0100
-	callchannel _Music_JohtoWildPokemonBattle_sub_0xf5f5d
-	notetype $0c, $c2
-	octave4
-	note $85
-	tone $0100
-	dutycycle $02
-	loopchannel $00, $5eb2 ; end
-; 0xf608f
+	tone $0001
+	callchannel Music_JohtoWildBattleNight_branch_f5f5d
+	notetype $c, $c2
+	octave 4
+	note G_, 5
+	tone $0001
+	dutycycle $2
+	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
 
-_Music_JohtoWildPokemonBattleNight_Ch3: ; 0xf608f
-	notetype $0c, $11
-	loopchannel $00, $5f94 ; end
-; 0xf6096
+Music_JohtoWildBattleNight_Ch3: ; f608f
+	notetype $c, $11
+	loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
+; f6096
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -1,604 +1,632 @@
-_Music_KantoGymLeaderBattle: ; 0xec720
-	db $80
-	dw _Music_KantoGymLeaderBattle_Ch1
-	db $01
-	dw _Music_KantoGymLeaderBattle_Ch2
-	db $02
-	dw _Music_KantoGymLeaderBattle_Ch3
-; 0xec729
+Music_KantoGymBattle: ; ec720
+	dbw $80, Music_KantoGymBattle_Ch1
+	dbw $01, Music_KantoGymBattle_Ch2
+	dbw $02, Music_KantoGymBattle_Ch3
+; ec729
 
-_Music_KantoGymLeaderBattle_Ch1: ; 0xec729
-	tempo $6500
+
+Music_KantoGymBattle_Ch1: ; ec729
+	tempo 101
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $b2
-	octave3
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $60
-	note $50
-	note $40
-	note $50
-	note $40
-	note $30
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	note $20
-	note $10
-	octave2
-	note $c0
-	octave3
-	note $10
-	octave2
-	note $c0
-	note $b0
-	note $c0
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
-	note $b7
+	notetype $c, $b2
+	octave 3
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	note C#, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note B_, 0
+	note A#, 0
+	note B_, 0
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 7
 	intensity $b7
-	note $c1
+	note B_, 1
 	intensity $b2
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
-	note $b7
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 7
 	intensity $b7
-	octave3
-	note $51
+	octave 3
+	note E_, 1
 	intensity $b2
-	octave2
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
-	note $b7
+	octave 2
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 7
 	intensity $b7
-	note $c1
+	note B_, 1
 	intensity $b2
-	note $b1
-	note $b5
-	note $b1
-	note $b5
-	note $b1
+	note A#, 1
+	note A#, 5
+	note A#, 1
+	note A#, 5
+	note A#, 1
 	intensity $b4
-	octave3
-	note $53
-	note $53
-	note $51
-	callchannel _Music_KantoGymLeaderBattle_sub_0xec832
-	octave2
-	note $b1
+	octave 3
+	note E_, 3
+	note E_, 3
+	note E_, 1
+
+Music_KantoGymBattle_branch_ec78b: ; ec78b
+	callchannel Music_KantoGymBattle_branch_ec832
+	octave 2
+	note A#, 1
 	intensity $b7
-	note $97
-	note $c7
-	octave3
-	note $49
-	note $55
-	callchannel _Music_KantoGymLeaderBattle_sub_0xec832
-	note $41
+	note G#, 7
+	note B_, 7
+	octave 3
+	note D#, 9
+	note E_, 5
+	callchannel Music_KantoGymBattle_branch_ec832
+	note D#, 1
 	intensity $b7
-	note $27
-	octave2
-	note $c7
-	note $99
-	octave3
-	note $55
+	note C#, 7
+	octave 2
+	note B_, 7
+	note G#, 9
+	octave 3
+	note E_, 5
 	intensity $b2
-	note $41
-	note $41
-	note $80
-	note $50
-	note $40
-	note $80
-	note $41
-	note $41
-	note $b0
-	note $90
-	note $50
-	note $b0
-	note $41
-	note $41
-	note $c0
-	note $b0
-	note $90
-	note $c0
-	note $41
+	note D#, 1
+	note D#, 1
+	note G_, 0
+	note E_, 0
+	note D#, 0
+	note G_, 0
+	note D#, 1
+	note D#, 1
+	note A#, 0
+	note G#, 0
+	note E_, 0
+	note A#, 0
+	note D#, 1
+	note D#, 1
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note B_, 0
+	note D#, 1
 	intensity $b7
-	note $51
+	note E_, 1
 	intensity $b2
-	note $41
-	note $41
-	note $80
-	note $50
-	note $40
-	note $80
-	note $41
-	note $41
-	note $b0
-	note $90
-	note $50
-	note $b0
-	note $41
-	note $41
-	note $c0
-	note $b0
-	note $90
-	note $c0
-	note $91
+	note D#, 1
+	note D#, 1
+	note G_, 0
+	note E_, 0
+	note D#, 0
+	note G_, 0
+	note D#, 1
+	note D#, 1
+	note A#, 0
+	note G#, 0
+	note E_, 0
+	note A#, 0
+	note D#, 1
+	note D#, 1
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note B_, 0
+	note G#, 1
 	intensity $b5
-	note $c1
-	note $41
-	note $21
-	octave2
-	note $b3
-	note $41
-	note $91
-	note $c1
-	octave3
-	note $51
-	note $43
-	note $21
-	octave2
-	note $b1
-	note $b1
-	note $41
-	note $b1
-	octave3
-	note $21
+	note B_, 1
+	note D#, 1
+	note C#, 1
+	octave 2
+	note A#, 3
+	note D#, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note D#, 3
+	note C#, 1
+	octave 2
+	note A#, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 3
+	note C#, 1
 	intensity $b7
-	octave2
-	note $c7
-	note $b7
-	note $99
-	note $c5
+	octave 2
+	note B_, 7
+	note A#, 7
+	note G#, 9
+	note B_, 5
 	intensity $b5
-	octave3
-	note $41
-	note $21
-	octave2
-	note $b3
-	note $41
-	note $91
-	note $c1
-	octave3
-	note $51
-	note $43
-	note $21
-	octave2
-	note $b1
-	note $b1
-	note $91
-	note $b1
-	octave3
-	note $21
+	octave 3
+	note D#, 1
+	note C#, 1
+	octave 2
+	note A#, 3
+	note D#, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note D#, 3
+	note C#, 1
+	octave 2
+	note A#, 1
+	note A#, 1
+	note G#, 1
+	note A#, 1
+	octave 3
+	note C#, 1
 	intensity $b7
-	note $57
-	note $77
-	note $8f
+	note E_, 7
+	note F#, 7
+	note G_, 15
 	intensity $b2
-	octave2
-	note $91
-	note $91
+	octave 2
+	note G#, 1
+	note G#, 1
 	intensity $b7
-	octave3
-	note $2b
+	octave 3
+	note C#, 11
 	intensity $b2
-	note $91
-	note $63
+	note G#, 1
+	note F_, 3
 	intensity $b5
-	octave2
-	note $63
-	note $81
-	note $91
-	note $b1
+	octave 2
+	note F_, 3
+	note G_, 1
+	note G#, 1
+	note A#, 1
 	intensity $b2
-	note $b1
-	note $b1
+	note A#, 1
+	note A#, 1
 	intensity $b7
-	octave3
-	note $4b
+	octave 3
+	note D#, 11
 	intensity $b2
-	note $b1
-	note $83
+	note A#, 1
+	note G_, 3
 	intensity $b7
-	octave4
-	note $45
+	octave 4
+	note D#, 5
 	intensity $4c
-	octave3
-	note $33
-	loopchannel $00, $478b ; end
-; 0xec832
+	octave 3
+	note D_, 3
+	loopchannel 0, Music_KantoGymBattle_branch_ec78b
+; ec832
 
-_Music_KantoGymLeaderBattle_sub_0xec832: ; 0xec832
-; subroutine
+Music_KantoGymBattle_branch_ec832: ; ec832
 	intensity $b5
-	note $41
-	octave2
-	note $b1
-	octave3
-	note $41
-	note $53
-	note $41
-	note $21
-	octave2
-	note $b1
-	note $41
-	note $91
-	note $b1
-	octave3
-	note $41
-	note $51
-	note $41
-	note $21
-	endchannel ; end
-; 0xec847
+	note D#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	note E_, 3
+	note D#, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	note D#, 1
+	note G#, 1
+	note A#, 1
+	octave 3
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	endchannel
 
-_Music_KantoGymLeaderBattle_Ch2: ; 0xec847
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $c2
-	octave4
-	note $b0
-	note $90
-	note $b0
-	octave5
-	note $40
-	loopchannel $08, $4852
-	octave3
+Music_KantoGymBattle_Ch2: ; ec847
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $c2
+
+Music_KantoGymBattle_branch_ec852: ; ec852
+	octave 4
+	note A#, 0
+	note G#, 0
+	note A#, 0
+	octave 5
+	note D#, 0
+	loopchannel 8, Music_KantoGymBattle_branch_ec852
+	octave 3
+
+Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
-	note $41
-	note $41
-	note $70
-	note $50
-	note $40
-	note $70
-	note $41
-	note $41
-	note $b0
-	note $90
-	note $70
-	note $b0
-	note $41
-	note $41
-	note $c0
-	note $b0
-	note $90
-	note $c0
-	note $31
+	note D#, 1
+	note D#, 1
+	note F#, 0
+	note E_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 1
+	note D#, 1
+	note A#, 0
+	note G#, 0
+	note F#, 0
+	note A#, 0
+	note D#, 1
+	note D#, 1
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note B_, 0
+	note D_, 1
 	intensity $c7
-	note $51
+	note E_, 1
 	intensity $c2
-	note $41
-	note $41
-	note $70
-	note $50
-	note $40
-	note $70
-	note $41
-	note $41
-	note $b0
-	note $90
-	note $70
-	note $b0
-	note $41
-	note $41
-	note $c0
-	note $b0
-	note $90
-	note $c0
-	note $91
+	note D#, 1
+	note D#, 1
+	note F#, 0
+	note E_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 1
+	note D#, 1
+	note A#, 0
+	note G#, 0
+	note F#, 0
+	note A#, 0
+	note D#, 1
+	note D#, 1
+	note B_, 0
+	note A#, 0
+	note G#, 0
+	note B_, 0
+	note G#, 1
 	intensity $c7
-	note $c1
+	note B_, 1
 	intensity $c2
-	octave4
-	loopchannel $02, $485d
-	callchannel _Music_KantoGymLeaderBattle_sub_0xec907
-	note $57
-	note $97
-	note $c9
-	note $95
-	callchannel _Music_KantoGymLeaderBattle_sub_0xec907
-	note $57
-	note $97
-	note $c9
-	octave4
-	note $55
-	note $47
+	octave 4
+	loopchannel 2, Music_KantoGymBattle_branch_ec85d
+
+Music_KantoGymBattle_branch_ec894: ; ec894
+	callchannel Music_KantoGymBattle_branch_ec907
+	note E_, 7
+	note G#, 7
+	note B_, 9
+	note G#, 5
+	callchannel Music_KantoGymBattle_branch_ec907
+	note E_, 7
+	note G#, 7
+	note B_, 9
+	octave 4
+	note E_, 5
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $a2
-	note $05
-	octave5
-	note $53
-	note $53
-	note $51
+	note __, 5
+	octave 5
+	note E_, 3
+	note E_, 3
+	note E_, 1
 	intensity $a0
-	note $47
+	note D#, 7
 	intensity $a7
-	note $47
-	note $0b
+	note D#, 7
+	note __, 11
 	intensity $c5
-	octave3
-	note $b3
-	note $c3
-	note $93
-	note $b3
-	note $c3
-	note $93
-	note $53
+	octave 3
+	note A#, 3
+	note B_, 3
+	note G#, 3
+	note A#, 3
+	note B_, 3
+	note G#, 3
+	note E_, 3
 	intensity $b0
-	note $47
-	note $4f
+	note D#, 7
+	note D#, 15
 	intensity $b7
-	note $4b
+	note D#, 11
 	intensity $c5
-	note $b3
-	note $c3
-	note $93
-	note $b3
-	note $c3
-	note $93
-	note $c3
+	note A#, 3
+	note B_, 3
+	note G#, 3
+	note A#, 3
+	note B_, 3
+	note G#, 3
+	note B_, 3
 	intensity $b0
-	note $b7
+	note A#, 7
 	intensity $b7
-	note $b7
+	note A#, 7
 	intensity $b0
-	octave4
-	note $47
+	octave 4
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $c2
-	octave3
-	note $21
-	note $21
+	octave 3
+	note C#, 1
+	note C#, 1
 	intensity $c7
-	note $67
+	note F_, 7
 	intensity $c2
-	octave4
-	note $23
-	note $61
-	note $23
+	octave 4
+	note C#, 3
+	note F_, 1
+	note C#, 3
 	intensity $c7
-	note $93
-	note $81
-	note $61
-	note $41
+	note G#, 3
+	note G_, 1
+	note F_, 1
+	note D#, 1
 	intensity $c2
-	octave3
-	note $41
-	note $41
+	octave 3
+	note D#, 1
+	note D#, 1
 	intensity $c7
-	note $87
+	note G_, 7
 	intensity $c2
-	octave4
-	note $43
-	note $81
-	note $43
+	octave 4
+	note D#, 3
+	note G_, 1
+	note D#, 3
 	intensity $c7
-	note $b5
-	octave3
-	note $a3
-	loopchannel $00, $4894 ; end
-; 0xec907
+	note A#, 5
+	octave 3
+	note A_, 3
+	loopchannel 0, Music_KantoGymBattle_branch_ec894
+; ec907
 
-_Music_KantoGymLeaderBattle_sub_0xec907: ; 0xec907
-; subroutine
-	dutycycle $02
+Music_KantoGymBattle_branch_ec907: ; ec907
+	dutycycle $2
 	intensity $d1
-	octave3
-	note $b1
+	octave 3
+	note A#, 1
 	intensity $a2
-	note $b1
+	note A#, 1
 	intensity $d1
-	note $91
+	note G#, 1
 	intensity $a2
-	note $91
+	note G#, 1
 	intensity $d1
-	note $b1
+	note A#, 1
 	intensity $a2
-	note $b1
+	note A#, 1
 	intensity $c5
-	note $c1
-	octave4
-	note $21
-	note $21
-	octave3
-	note $c3
-	note $b1
-	note $91
-	note $71
-	note $91
-	note $b1
-	dutycycle $03
+	note B_, 1
+	octave 4
+	note C#, 1
+	note C#, 1
+	octave 3
+	note B_, 3
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A#, 1
+	dutycycle $3
 	intensity $b0
-	endchannel ; end
-; 0xec92e
+	endchannel
 
-_Music_KantoGymLeaderBattle_Ch3: ; 0xec92e
-	notetype $0c, $19
-	octave2
-	note $50
-	note $00
-	note $c2
-	note $00
-	loopchannel $06, $4934
-	note $c1
-	note $91
-	note $c1
-	note $40
-	note $00
-	note $40
-	note $00
-	note $73
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	note $30
-	note $00
-	note $61
-	note $40
-	note $00
-	note $40
-	note $00
-	note $73
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	note $40
-	note $00
-	note $51
-	loopchannel $02, $493d
-	octave2
-	note $41
-	note $b1
-	loopchannel $08, $4965
-	note $51
-	note $c1
-	loopchannel $04, $496c
-	octave1
-	note $c1
-	octave2
-	note $51
-	octave1
-	note $c1
-	octave2
-	note $53
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	octave2
-	note $71
-	octave3
-	note $21
-	loopchannel $08, $497f
-	octave2
-	note $51
-	note $c1
-	loopchannel $07, $4987
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $c3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $40
-	note $00
-	note $51
-	loopchannel $02, $4992
-	note $41
-	note $b1
-	loopchannel $07, $49a8
-	octave3
-	note $21
-	octave2
-	note $b1
-	note $51
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $51
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $51
-	note $c1
-	loopchannel $05, $49bb
-	octave2
-	note $71
-	octave3
-	note $21
-	loopchannel $07, $49c2
-	octave2
-	note $b1
-	octave3
-	note $21
-	octave2
-	note $51
-	note $b1
-	octave3
-	note $51
-	note $71
-	note $91
-	note $71
-	note $51
-	note $21
-	octave2
-	note $41
-	note $b1
-	loopchannel $04, $49d8
-	note $21
-	note $91
-	loopchannel $08, $49df
-	note $41
-	note $b1
-	loopchannel $04, $49e5
-	octave3
-	note $41
-	octave2
-	note $b1
-	note $41
-	note $31
-	note $31
-	note $b1
-	octave3
-	note $41
-	note $61
-	loopchannel $00, $4965 ; end
-; 0xec9fa
+Music_KantoGymBattle_Ch3: ; ec92e
+	notetype $c, $19
+	octave 2
+	note E_, 0
+	note __, 0
+
+Music_KantoGymBattle_branch_ec934: ; ec934
+	note B_, 2
+	note __, 0
+	loopchannel 6, Music_KantoGymBattle_branch_ec934
+	note B_, 1
+	note G#, 1
+	note B_, 1
+
+Music_KantoGymBattle_branch_ec93d: ; ec93d
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note D_, 0
+	note __, 0
+	note F_, 1
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note D#, 0
+	note __, 0
+	note E_, 1
+	loopchannel 2, Music_KantoGymBattle_branch_ec93d
+
+Music_KantoGymBattle_branch_ec965: ; ec965
+	octave 2
+	note D#, 1
+	note A#, 1
+	loopchannel 8, Music_KantoGymBattle_branch_ec965
+
+Music_KantoGymBattle_branch_ec96c: ; ec96c
+	note E_, 1
+	note B_, 1
+	loopchannel 4, Music_KantoGymBattle_branch_ec96c
+	octave 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note E_, 3
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+
+Music_KantoGymBattle_branch_ec97f: ; ec97f
+	octave 2
+	note F#, 1
+	octave 3
+	note C#, 1
+	loopchannel 8, Music_KantoGymBattle_branch_ec97f
+
+Music_KantoGymBattle_branch_ec987: ; ec987
+	octave 2
+	note E_, 1
+	note B_, 1
+	loopchannel 7, Music_KantoGymBattle_branch_ec987
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+
+Music_KantoGymBattle_branch_ec992: ; ec992
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note D#, 0
+	note __, 0
+	note E_, 1
+	loopchannel 2, Music_KantoGymBattle_branch_ec992
+
+Music_KantoGymBattle_branch_ec9a8: ; ec9a8
+	note D#, 1
+	note A#, 1
+	loopchannel 7, Music_KantoGymBattle_branch_ec9a8
+	octave 3
+	note C#, 1
+	octave 2
+	note A#, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note E_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+
+Music_KantoGymBattle_branch_ec9bb: ; ec9bb
+	octave 2
+	note E_, 1
+	note B_, 1
+	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
+
+Music_KantoGymBattle_branch_ec9c2: ; ec9c2
+	octave 2
+	note F#, 1
+	octave 3
+	note C#, 1
+	loopchannel 7, Music_KantoGymBattle_branch_ec9c2
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note E_, 1
+	note A#, 1
+	octave 3
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+
+Music_KantoGymBattle_branch_ec9d8: ; ec9d8
+	octave 2
+	note D#, 1
+	note A#, 1
+	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
+
+Music_KantoGymBattle_branch_ec9df: ; ec9df
+	note C#, 1
+	note G#, 1
+	loopchannel 8, Music_KantoGymBattle_branch_ec9df
+
+Music_KantoGymBattle_branch_ec9e5: ; ec9e5
+	note D#, 1
+	note A#, 1
+	loopchannel 4, Music_KantoGymBattle_branch_ec9e5
+	octave 3
+	note D#, 1
+	octave 2
+	note A#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note A#, 1
+	octave 3
+	note D#, 1
+	note F_, 1
+	loopchannel 0, Music_KantoGymBattle_branch_ec965
+; ec9fa
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -1,1539 +1,1542 @@
-_Music_KantoTrainerBattle: ; 0xec9fa
-	db $80
-	dw _Music_KantoTrainerBattle_Ch1
-	db $01
-	dw _Music_KantoTrainerBattle_Ch2
-	db $02
-	dw _Music_KantoTrainerBattle_Ch3
-; 0xeca03
+Music_KantoTrainerBattle: ; ec9fa
+	dbw $80, Music_KantoTrainerBattle_Ch1
+	dbw $01, Music_KantoTrainerBattle_Ch2
+	dbw $02, Music_KantoTrainerBattle_Ch3
+; eca03
 
-	db $03
+INCBIN "baserom.gbc", $eca03, $eca04 - $eca03
 
-_Music_KantoTrainerBattle_Ch1: ; 0xeca04
-	tempo $7200
+Music_KantoTrainerBattle_Ch1: ; eca04
+	tempo 114
 	volume $77
 	forceoctave $1b
-	notetype $0c, $b3
+	notetype $c, $b3
 	vibrato $12, $24
-	dutycycle $01
-	note $00
-	octave4
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $80
-	dutycycle $02
+	dutycycle $1
+	note __, 0
+	octave 4
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	dutycycle $2
 	intensity $b1
-	octave4
-	note $41
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $11
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $41
-	note $01
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $01
-	note $41
-	note $01
-	octave3
-	note $40
-	note $00
-	note $60
-	note $00
-	note $70
-	note $00
-	octave4
-	note $11
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $11
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $41
-	note $01
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $01
-	note $41
-	note $01
-	note $40
-	note $00
-	note $60
-	note $00
-	note $80
-	note $00
+	octave 4
+	note D#, 1
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note D#, 1
+	note __, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note D#, 1
+	note __, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	intensity $b3
-	note $41
-	note $03
-	note $61
-	note $03
-	note $71
-	note $01
-	note $41
-	note $61
-	note $01
-	note $71
-	note $01
-	note $41
-	note $61
-	note $71
-	notetype $0c, $b7
-	note $43
-	note $01
-	note $19
-	note $03
-	note $41
-	note $11
-	octave3
-	note $80
-	octave4
-	note $10
-	note $40
-	note $00
-	note $10
-	note $00
-	note $40
-	note $00
-	note $27
-	note $67
-	note $97
-	octave5
-	note $23
-	note $20
-	octave4
-	note $90
-	note $60
-	note $20
-	note $43
-	note $01
-	note $19
-	note $03
-	note $41
-	note $11
-	octave3
-	note $80
-	octave4
-	note $10
-	note $40
-	note $00
-	note $30
-	note $00
-	note $60
-	note $00
-	note $45
-	note $35
-	note $11
-	note $01
-	note $01
-	note $31
-	note $03
-	note $61
-	note $01
-	note $91
-	note $80
-	note $70
-	octave3
-	note $90
-	note $60
-	note $10
-	note $90
-	octave4
-	note $10
-	note $00
-	note $60
-	note $00
-	note $10
-	octave3
-	note $90
-	note $60
-	note $04
-	octave4
-	note $47
-	note $33
-	octave3
-	note $60
-	note $a0
-	octave4
-	note $10
-	note $40
-	note $33
-	octave3
-	note $33
-	octave4
-	note $63
-	octave3
-	note $33
-	note $03
-	note $33
-	note $03
-	note $33
-	note $90
-	note $60
-	note $10
-	note $90
-	octave4
-	note $10
-	note $00
-	note $60
-	note $00
-	note $10
-	octave3
-	note $90
-	note $60
-	note $04
-	octave4
-	note $47
-	note $33
-	octave3
-	note $60
-	note $a0
-	octave4
-	note $10
-	note $40
-	note $33
-	octave3
-	note $33
-	note $03
-	note $33
-	note $b0
-	octave4
-	note $30
-	note $60
-	note $00
-	octave3
-	note $31
-	octave4
-	note $61
-	note $31
-	octave3
-	note $b1
-	note $31
-	octave4
-	note $31
+	note D#, 1
+	note __, 3
+	note F_, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+
+Music_KantoTrainerBattle_branch_eca88: ; eca88
+	notetype $c, $b7
+	note D#, 3
+	note __, 1
+	note C_, 9
+	note __, 3
+	note D#, 1
+	note C_, 1
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 7
+	note F_, 7
+	note G#, 7
+	octave 5
+	note C#, 3
+	note C#, 0
+	octave 4
+	note G#, 0
+	note F_, 0
+	note C#, 0
+	note D#, 3
+	note __, 1
+	note C_, 9
+	note __, 3
+	note D#, 1
+	note C_, 1
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note D#, 5
+	note D_, 5
+	note C_, 1
+	note __, 1
+	note __, 1
+	note D_, 1
+	note __, 3
+	note F_, 1
+	note __, 1
+	note G#, 1
+	note G_, 0
+	note F#, 0
+	octave 3
+	note G#, 0
+	note F_, 0
+	note C_, 0
+	note G#, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note C_, 0
+	octave 3
+	note G#, 0
+	note F_, 0
+	note __, 4
+	octave 4
+	note D#, 7
+	note D_, 3
+	octave 3
+	note F_, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note D_, 3
+	octave 3
+	note D_, 3
+	octave 4
+	note F_, 3
+	octave 3
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note G#, 0
+	note F_, 0
+	note C_, 0
+	note G#, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note C_, 0
+	octave 3
+	note G#, 0
+	note F_, 0
+	note __, 4
+	octave 4
+	note D#, 7
+	note D_, 3
+	octave 3
+	note F_, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note D_, 3
+	octave 3
+	note D_, 3
+	note __, 3
+	note D_, 3
+	note A#, 0
+	octave 4
+	note D_, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 4
+	note F_, 1
+	note D_, 1
+	octave 3
+	note A#, 1
+	note D_, 1
+	octave 4
+	note D_, 1
 	intensity $67
-	note $10
-	note $20
-	note $30
-	note $40
-	note $50
-	note $40
-	note $30
-	note $20
-	note $10
-	note $02
-	note $43
-	notetype $06, $67
-	note $40
-	note $00
-	note $40
-	note $00
-	note $40
-	note $06
-	note $40
-	note $00
-	note $40
-	note $00
-	octave3
-	note $80
-	note $02
-	note $80
-	note $02
-	octave4
-	note $17
+	note C_, 0
+	note C#, 0
+	note D_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	note __, 2
+	note D#, 3
+	notetype $6, $67
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 6
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	octave 4
+	note C_, 7
 	intensity $77
-	note $21
-	note $31
-	note $41
-	note $51
-	note $61
-	note $51
-	note $41
-	note $31
-	note $21
-	note $05
-	note $57
-	note $50
-	note $00
-	note $50
-	note $00
-	note $50
-	note $06
-	note $50
-	note $00
-	note $50
-	note $00
-	octave3
-	note $90
-	note $02
-	note $90
-	note $02
-	octave4
-	note $27
+	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 __, 5
+	note E_, 7
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 6
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	octave 4
+	note C#, 7
 	intensity $87
-	note $31
-	note $41
-	note $51
-	note $61
-	note $71
-	note $61
-	note $51
-	note $41
-	note $31
-	note $05
-	note $67
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $06
-	note $60
-	note $00
-	note $60
-	note $00
-	octave3
-	note $a0
-	note $02
-	note $a0
-	note $02
-	octave4
-	note $37
+	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 __, 5
+	note F_, 7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 6
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	octave 4
+	note D_, 7
 	intensity $97
-	note $41
-	note $51
-	note $61
-	note $71
-	note $81
-	note $71
-	note $61
-	note $51
-	note $41
-	note $05
-	note $77
+	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 __, 5
+	note F#, 7
 	intensity $a7
-	note $97
-	note $b7
+	note G#, 7
+	note A#, 7
 	intensity $b7
-	octave5
-	note $37
-	note $31
-	note $05
-	octave4
-	note $b1
-	note $71
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $71
-	note $41
-	octave3
-	note $b1
-	note $71
-	octave4
-	note $91
-	note $01
-	note $4b
+	octave 5
+	note D_, 7
+	note D_, 1
+	note __, 5
+	octave 4
+	note A#, 1
+	note F#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note F#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note F#, 1
+	octave 4
+	note G#, 1
+	note __, 1
+	note D#, 11
 	intensity $b1
-	octave6
-	note $11
-	note $11
-	note $17
-	note $11
-	note $11
-	note $13
-	note $13
-	note $13
-	note $13
+	octave 6
+	note C_, 1
+	note C_, 1
+	note C_, 7
+	note C_, 1
+	note C_, 1
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	note C_, 3
 	intensity $b7
-	octave4
-	note $b1
-	note $71
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $71
-	note $41
-	octave3
-	note $b1
-	note $71
-	octave4
-	note $71
-	note $01
-	note $c3
-	note $b3
-	note $93
-	note $73
-	note $63
-	note $43
-	note $33
-	note $47
-	note $77
-	octave5
-	note $17
-	note $47
-	octave4
-	note $2f
-	note $21
-	note $01
-	note $41
-	note $01
-	note $61
-	note $01
-	octave3
-	note $91
-	note $01
-	octave4
-	note $61
-	note $71
-	note $61
-	note $41
-	note $61
+	octave 4
+	note A#, 1
+	note F#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note F#, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note F#, 1
+	octave 4
+	note F#, 1
+	note __, 1
+	note B_, 3
+	note A#, 3
+	note G#, 3
+	note F#, 3
+	note F_, 3
+	note D#, 3
+	note D_, 3
+	note D#, 7
+	note F#, 7
+	octave 5
+	note C_, 7
+	note D#, 7
+	octave 4
+	note C#, 15
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
 	intensity $67
-	note $50
-	note $30
-	note $10
-	octave3
-	note $c0
-	note $a0
-	note $80
+	note E_, 0
+	note D_, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note G_, 0
 	intensity $a1
-	octave4
-	note $21
-	octave2
-	note $81
-	note $81
-	octave4
-	note $21
-	octave2
-	note $81
-	note $81
+	octave 4
+	note C#, 1
+	octave 2
+	note G_, 1
+	note G_, 1
+	octave 4
+	note C#, 1
+	octave 2
+	note G_, 1
+	note G_, 1
 	intensity $b7
-	octave4
-	note $33
-	loopchannel $00, $4a88 ; end
-; 0xecbea
+	octave 4
+	note D_, 3
+	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
 
-_Music_KantoTrainerBattle_Ch2: ; 0xecbea
+Music_KantoTrainerBattle_Ch2: ; ecbea
 	forceoctave $1b
-	vibrato $06, $36
-	dutycycle $01
-	notetype $0c, $d1
-	octave4
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $b3
-	note $80
-	note $90
-	note $80
-	note $70
-	dutycycle $03
+	vibrato $6, $36
+	dutycycle $1
+	notetype $c, $d1
+	octave 4
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	dutycycle $3
 	intensity $62
-	octave3
-	note $80
-	note $90
-	note $80
-	note $70
-	loopchannel $0e, $4c04
-	note $80
-	note $90
-	note $80
-	note $60
-	note $40
-	note $30
-	note $10
-	octave2
-	note $c0
+
+Music_KantoTrainerBattle_branch_ecc04: ; ecc04
+	octave 3
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	loopchannel 14, Music_KantoTrainerBattle_branch_ecc04
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F_, 0
+	note D#, 0
+	note D_, 0
+	note C_, 0
+	octave 2
+	note B_, 0
 	intensity $d7
-	dutycycle $02
-	note $11
-	octave3
-	note $10
-	note $00
-	octave2
-	note $10
-	note $00
-	octave1
-	note $b1
-	octave2
-	note $b0
-	note $00
-	octave1
-	note $b0
-	note $00
-	note $a1
-	octave2
-	note $a0
-	note $00
-	octave1
-	note $a0
-	note $00
-	note $91
-	octave2
-	note $90
-	note $00
-	octave1
-	note $90
-	note $00
-	note $80
-	note $c0
-	octave2
-	note $30
-	note $60
-	note $80
-	note $c0
-	octave3
-	note $30
-	note $60
-	notetype $0c, $d7
-	octave2
-	note $10
-	note $10
-	octave3
-	note $10
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $10
-	note $00
-	octave2
-	note $11
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $11
-	note $b0
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $11
-	note $a0
-	note $00
-	note $90
-	note $00
-	octave3
-	note $10
-	note $00
-	octave2
-	note $20
-	note $20
-	note $90
-	note $00
-	octave3
-	note $21
-	octave2
-	note $21
-	note $90
-	note $00
-	octave3
-	note $11
-	octave2
-	note $21
-	note $90
-	note $00
-	note $b1
-	note $20
-	note $20
-	note $60
-	note $00
-	note $91
-	octave3
-	note $20
-	note $00
-	note $61
-	note $90
-	note $00
-	note $b1
-	octave2
-	note $10
-	note $10
-	octave3
-	note $10
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $10
-	note $00
-	octave2
-	note $11
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $11
-	note $b0
-	note $00
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $11
-	note $a0
-	note $00
-	note $60
-	note $00
-	note $a0
-	note $00
-	octave1
-	note $b0
-	note $b0
-	octave2
-	note $60
-	note $00
-	note $b1
-	octave1
-	note $b1
-	octave2
-	note $60
-	note $00
-	note $a1
-	octave1
-	note $b1
-	octave2
-	note $60
-	note $00
-	note $91
-	octave1
-	note $b0
-	note $b0
-	octave2
-	note $60
-	note $00
-	note $81
-	note $b0
-	note $00
-	octave3
-	note $31
-	note $60
-	note $00
-	note $b1
-	octave1
-	note $61
-	octave2
-	note $60
-	note $00
-	note $10
-	note $00
-	note $60
-	note $00
-	octave1
-	note $61
-	octave2
-	note $50
-	note $00
-	note $10
-	note $00
-	note $50
-	note $00
-	octave1
-	note $61
-	octave2
-	note $40
-	note $00
-	note $10
-	note $00
-	note $40
-	note $00
-	octave1
-	note $61
-	octave2
-	note $30
-	note $00
-	note $40
-	note $10
-	octave1
-	note $b0
-	note $a0
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $63
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $73
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $83
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $93
-	octave1
-	note $61
-	octave2
-	note $60
-	note $00
-	note $10
-	note $00
-	note $60
-	note $00
-	octave1
-	note $61
-	octave2
-	note $50
-	note $00
-	note $10
-	note $00
-	note $50
-	note $00
-	octave1
-	note $61
-	octave2
-	note $40
-	note $00
-	note $10
-	note $00
-	note $40
-	note $00
-	octave1
-	note $61
-	octave2
-	note $30
-	note $00
-	note $40
-	note $10
-	octave1
-	note $b0
-	note $a0
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $63
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $73
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $83
-	octave1
-	note $b0
-	note $00
-	note $b0
-	note $00
-	octave3
-	note $93
+	dutycycle $2
+	note C_, 1
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	octave 1
+	note A#, 1
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 1
+	note A#, 0
+	note __, 0
+	note A_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 1
+	note A_, 0
+	note __, 0
+	note G#, 1
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 1
+	note G#, 0
+	note __, 0
+	note G_, 0
+	note B_, 0
+	octave 2
+	note D_, 0
+	note F_, 0
+	note G_, 0
+	note B_, 0
+	octave 3
+	note D_, 0
+	note F_, 0
+
+Music_KantoTrainerBattle_branch_ecc41: ; ecc41
+	notetype $c, $d7
+	octave 2
+	note C_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note C_, 1
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note C_, 1
+	note A#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note C_, 1
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note C#, 0
+	note C#, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note C#, 1
+	octave 2
+	note C#, 1
+	note G#, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note C#, 1
+	note G#, 0
+	note __, 0
+	note A#, 1
+	note C#, 0
+	note C#, 0
+	note F_, 0
+	note __, 0
+	note G#, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	note F_, 1
+	note G#, 0
+	note __, 0
+	note A#, 1
+	octave 2
+	note C_, 0
+	note C_, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note C_, 1
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note C_, 1
+	note A#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note C_, 1
+	note A_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 1
+	note A#, 0
+	note A#, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	note A#, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note A_, 1
+	octave 1
+	note A#, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note G#, 1
+	octave 1
+	note A#, 0
+	note A#, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	note G_, 1
+	note A#, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	note F_, 0
+	note __, 0
+	note A#, 1
+	octave 1
+	note F_, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note E_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note C_, 0
+	octave 1
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note F_, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note F#, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note G_, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note G#, 3
+	octave 1
+	note F_, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note E_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 1
+	note F_, 1
+	octave 2
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note C_, 0
+	octave 1
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note F_, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note F#, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note G_, 3
+	octave 1
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 3
+	note G#, 3
 	vibrato $12, $24
-	notetype $0c, $78
-	octave4
-	note $8f
+	notetype $c, $78
+	octave 4
+	note G_, 15
 	intensity $77
-	note $8f
-	notetype $06, $88
-	note $9f
+	note G_, 15
+	notetype $6, $88
+	note G#, 15
 	intensity $87
-	note $9e
-	note $80
-	note $96
-	note $a0
-	note $b2
-	note $a0
-	note $97
-	note $83
-	note $65
-	note $01
-	notetype $0c, $98
-	note $af
+	note G#, 14
+	note G_, 0
+	note G#, 6
+	note A_, 0
+	note A#, 2
+	note A_, 0
+	note G#, 7
+	note G_, 3
+	note F_, 5
+	note __, 1
+	notetype $c, $98
+	note A_, 15
 	intensity $97
-	note $af
+	note A_, 15
 	intensity $a7
-	note $bf
+	note A#, 15
 	intensity $d7
-	octave5
-	note $37
-	note $67
-	vibrato $04, $36
-	octave2
-	note $b3
-	note $43
-	note $10
-	note $00
+	octave 5
+	note D_, 7
+	note F_, 7
+	vibrato $4, $36
+	octave 2
+	note A#, 3
+	note D#, 3
+	note C_, 0
+	note __, 0
 	intensity $d8
-	note $95
+	note G#, 5
 	intensity $d7
-	note $9f
-	note $b3
-	note $43
-	note $40
-	note $00
-	octave3
-	note $4d
-	octave2
-	note $10
-	note $00
-	octave3
-	note $41
-	note $01
-	notetype $06, $d7
-	octave2
-	note $10
-	note $00
-	note $10
-	note $00
-	note $11
-	note $01
-	note $11
-	note $01
-	octave3
-	note $97
-	octave4
-	note $61
-	note $71
-	note $61
-	note $41
-	note $61
-	note $01
-	note $41
-	note $01
-	octave3
-	note $61
-	note $01
-	note $71
-	note $01
-	note $91
-	note $01
-	note $21
-	note $01
-	note $91
-	note $b1
-	note $91
-	note $71
-	note $91
+	note G#, 15
+	note A#, 3
+	note D#, 3
+	note D#, 0
+	note __, 0
+	octave 3
+	note D#, 13
+	octave 2
+	note C_, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	note __, 1
+	notetype $6, $d7
+	octave 2
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note G#, 7
+	octave 4
+	note F_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note G#, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
 	intensity $72
-	note $80
-	note $60
-	note $50
-	note $30
-	note $10
-	octave2
-	note $c0
+	note G_, 0
+	note F_, 0
+	note E_, 0
+	note D_, 0
+	note C_, 0
+	octave 2
+	note B_, 0
 	intensity $c1
-	octave3
-	note $c1
-	octave1
-	note $70
-	note $00
-	note $70
-	note $00
-	octave3
-	note $c1
-	octave1
-	note $70
-	note $00
-	note $70
-	note $00
+	octave 3
+	note B_, 1
+	octave 1
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 1
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
 	intensity $d7
-	octave3
-	note $c3
-	loopchannel $00, $4c41 ; end
-; 0xecdd2
+	octave 3
+	note B_, 3
+	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
 
-_Music_KantoTrainerBattle_Ch3: ; 0xecdd2
+Music_KantoTrainerBattle_Ch3: ; ecdd2
 	forceoctave $1b
 	vibrato $12, $23
-	notetype $0c, $15
-	octave2
-	note $b0
-	octave4
-	note $b0
-	octave3
-	note $b1
-	octave2
-	note $a0
-	octave4
-	note $a0
-	octave3
-	note $a1
-	octave2
-	note $90
-	octave4
-	note $90
-	octave3
-	note $91
-	octave2
-	note $80
-	octave4
-	note $80
-	octave3
-	note $81
-	octave2
-	note $70
-	octave4
-	note $70
-	octave3
-	note $71
-	octave2
-	note $60
-	octave4
-	note $60
-	octave3
-	note $61
-	octave2
-	note $50
-	octave4
-	note $50
-	octave3
-	note $51
-	note $30
-	note $60
-	note $c0
-	octave4
-	note $30
+	notetype $c, $15
+	octave 2
+	note A#, 0
+	octave 4
+	note A#, 0
+	octave 3
+	note A#, 1
+	octave 2
+	note A_, 0
+	octave 4
+	note A_, 0
+	octave 3
+	note A_, 1
+	octave 2
+	note G#, 0
+	octave 4
+	note G#, 0
+	octave 3
+	note G#, 1
+	octave 2
+	note G_, 0
+	octave 4
+	note G_, 0
+	octave 3
+	note G_, 1
+	octave 2
+	note F#, 0
+	octave 4
+	note F#, 0
+	octave 3
+	note F#, 1
+	octave 2
+	note F_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F_, 1
+	octave 2
+	note E_, 0
+	octave 4
+	note E_, 0
+	octave 3
+	note E_, 1
+	note D_, 0
+	note F_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
 	intensity $18
-	octave6
-	note $11
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave5
-	note $61
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave5
-	note $71
-	octave4
-	note $10
-	note $40
-	octave5
-	note $41
-	note $61
-	note $01
-	note $71
-	note $01
-	octave4
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $c0
-	note $00
-	octave5
-	note $41
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave5
-	note $61
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave5
-	note $71
-	octave4
-	note $10
-	note $40
-	octave5
-	note $41
-	note $61
-	note $01
-	note $71
-	note $01
-	note $80
-	note $00
-	note $b0
-	note $00
-	note $c0
-	note $00
-	octave6
-	note $11
-	note $03
-	note $31
-	note $03
-	note $41
-	note $01
-	note $11
-	note $31
-	note $01
-	note $41
-	note $01
-	octave5
-	note $81
-	note $b1
-	note $c1
-	notetype $0c, $14
-	octave6
-	note $13
-	notetype $06, $14
-	octave5
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	notetype $0c, $14
-	note $89
-	note $01
-	notetype $06, $14
-	note $80
-	note $90
-	note $a0
-	note $b0
-	octave6
-	note $15
-	octave5
-	note $a0
-	note $90
-	note $87
-	octave6
-	note $16
-	octave5
-	note $c0
-	notetype $0c, $14
-	octave6
-	note $2f
-	note $27
-	note $63
-	note $90
-	note $60
-	note $20
-	octave5
-	note $90
-	octave6
-	note $13
-	notetype $06, $14
-	octave5
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	notetype $0c, $14
-	note $89
-	note $01
-	notetype $06, $14
-	note $80
-	note $90
-	note $a0
-	note $b0
-	octave6
-	note $15
-	octave5
-	note $a0
-	note $90
-	note $87
-	octave6
-	note $16
-	octave5
-	note $c0
-	note $bf
-	note $bf
-	note $bc
-	note $c0
-	octave6
-	note $10
-	note $20
-	note $37
-	note $61
-	note $31
-	octave5
-	note $b1
-	note $a1
-	notetype $0c, $10
-	note $9a
+	octave 6
+	note C_, 1
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 5
+	note F_, 1
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 5
+	note F#, 1
+	octave 4
+	note C_, 0
+	note D#, 0
+	octave 5
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 5
+	note D#, 1
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 5
+	note F_, 1
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 5
+	note F#, 1
+	octave 4
+	note C_, 0
+	note D#, 0
+	octave 5
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 6
+	note C_, 1
+	note __, 3
+	note D_, 1
+	note __, 3
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 5
+	note G_, 1
+	note A#, 1
+	note B_, 1
+
+Music_KantoTrainerBattle_branch_ece5a: ; ece5a
+	notetype $c, $14
+	octave 6
+	note C_, 3
+	notetype $6, $14
+	octave 5
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	notetype $c, $14
+	note G_, 9
+	note __, 1
+	notetype $6, $14
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	octave 6
+	note C_, 5
+	octave 5
+	note A_, 0
+	note G#, 0
+	note G_, 7
+	octave 6
+	note C_, 6
+	octave 5
+	note B_, 0
+	notetype $c, $14
+	octave 6
+	note C#, 15
+	note C#, 7
+	note F_, 3
+	note G#, 0
+	note F_, 0
+	note C#, 0
+	octave 5
+	note G#, 0
+	octave 6
+	note C_, 3
+	notetype $6, $14
+	octave 5
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	notetype $c, $14
+	note G_, 9
+	note __, 1
+	notetype $6, $14
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
+	octave 6
+	note C_, 5
+	octave 5
+	note A_, 0
+	note G#, 0
+	note G_, 7
+	octave 6
+	note C_, 6
+	octave 5
+	note B_, 0
+	note A#, 15
+	note A#, 15
+	note A#, 12
+	note B_, 0
+	octave 6
+	note C_, 0
+	note C#, 0
+	note D_, 7
+	note F_, 1
+	note D_, 1
+	octave 5
+	note A#, 1
+	note A_, 1
+	notetype $c, $10
+	note G#, 10
 	intensity $14
-	note $10
-	note $60
-	note $00
-	note $90
-	note $00
+	note C_, 0
+	note F_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
 	intensity $10
-	octave6
-	note $15
-	notetype $06, $10
-	octave5
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	note $9f
-	notetype $0c, $10
-	note $bf
+	octave 6
+	note C_, 5
+	notetype $6, $10
+	octave 5
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G#, 15
+	notetype $c, $10
+	note A#, 15
 	intensity $25
-	note $30
-	octave4
-	note $b0
-	note $60
-	note $b0
-	octave5
-	note $60
-	note $30
-	octave4
-	note $b0
-	octave5
-	note $30
-	note $b0
-	note $60
-	note $30
-	note $60
-	octave6
-	note $31
-	note $20
-	note $10
+	note D_, 0
+	octave 4
+	note A#, 0
+	note F_, 0
+	note A#, 0
+	octave 5
+	note F_, 0
+	note D_, 0
+	octave 4
+	note A#, 0
+	octave 5
+	note D_, 0
+	note A#, 0
+	note F_, 0
+	note D_, 0
+	note F_, 0
+	octave 6
+	note D_, 1
+	note C#, 0
+	note C_, 0
 	intensity $10
-	octave5
-	note $9a
+	octave 5
+	note G#, 10
 	intensity $14
-	note $10
-	note $60
-	note $00
-	note $90
-	note $00
+	note C_, 0
+	note F_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
 	intensity $10
-	octave6
-	note $16
-	notetype $06, $10
-	note $20
-	note $30
-	notetype $0c, $10
-	note $47
-	note $3b
-	note $90
-	note $60
+	octave 6
+	note C_, 6
+	notetype $6, $10
+	note C#, 0
+	note D_, 0
+	notetype $c, $10
+	note D#, 7
+	note D_, 11
+	note G#, 0
+	note F_, 0
 	intensity $25
-	octave5
-	note $b0
-	note $60
-	note $90
-	note $90
-	note $90
-	note $00
-	note $b0
-	note $00
-	note $91
-	note $81
-	note $61
-	note $41
-	note $61
+	octave 5
+	note A#, 0
+	note F_, 0
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
 	intensity $24
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	octave3
-	note $40
-	octave4
-	note $10
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $50
-	octave4
-	note $20
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note D#, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note E_, 0
+	octave 4
+	note C#, 0
 	intensity $14
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
 	intensity $15
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $60
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
+	octave 4
+	note D_, 0
 	intensity $15
-	octave3
-	note $b0
-	octave4
-	note $40
-	octave3
-	note $70
-	octave4
-	note $40
-	octave3
-	note $b0
-	octave4
-	note $40
-	octave3
-	note $70
-	octave4
-	note $40
-	octave3
-	note $b0
-	octave4
-	note $40
-	octave3
-	note $70
-	octave4
-	note $40
-	octave3
-	note $b0
-	octave4
-	note $40
-	octave3
-	note $70
-	octave4
-	note $40
+	octave 3
+	note A#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note F#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note A#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note F#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note A#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note F#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note A#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note F#, 0
+	octave 4
+	note D#, 0
 	intensity $14
-	octave3
-	note $60
-	note $90
-	note $c0
-	octave4
-	note $30
-	octave3
-	note $90
-	note $c0
-	octave4
-	note $30
-	note $60
-	octave3
-	note $c0
-	octave4
-	note $30
-	note $60
-	note $90
-	note $30
-	note $60
-	note $90
-	octave5
-	note $30
-	octave6
-	note $43
-	octave5
-	note $b3
-	octave6
-	note $20
-	note $00
-	note $15
-	octave4
-	note $10
-	note $40
-	note $90
-	octave5
-	note $10
-	note $40
-	note $90
-	octave6
-	note $10
-	note $40
-	note $90
-	note $40
-	note $10
-	octave5
-	note $90
-	note $40
-	note $10
-	octave4
-	note $90
-	note $40
-	octave6
-	note $43
-	octave5
-	note $b3
-	note $c0
-	note $00
-	octave6
-	note $7b
-	note $60
-	note $70
-	note $9f
-	note $67
-	note $20
-	note $00
-	note $40
-	note $00
-	note $60
-	note $00
-	octave5
-	note $90
-	note $00
-	octave6
-	note $60
-	note $70
-	note $60
-	note $40
-	note $60
-	notetype $06, $24
-	note $50
-	note $30
-	note $10
-	octave5
-	note $c0
-	note $a0
-	note $80
+	octave 3
+	note F_, 0
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note F_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note D_, 0
+	note F_, 0
+	note G#, 0
+	note D_, 0
+	note F_, 0
+	note G#, 0
+	octave 5
+	note D_, 0
+	octave 6
+	note D#, 3
+	octave 5
+	note A#, 3
+	octave 6
+	note C#, 0
+	note __, 0
+	note C_, 5
+	octave 4
+	note C_, 0
+	note D#, 0
+	note G#, 0
+	octave 5
+	note C_, 0
+	note D#, 0
+	note G#, 0
+	octave 6
+	note C_, 0
+	note D#, 0
+	note G#, 0
+	note D#, 0
+	note C_, 0
+	octave 5
+	note G#, 0
+	note D#, 0
+	note C_, 0
+	octave 4
+	note G#, 0
+	note D#, 0
+	octave 6
+	note D#, 3
+	octave 5
+	note A#, 3
+	note B_, 0
+	note __, 0
+	octave 6
+	note F#, 11
+	note F_, 0
+	note F#, 0
+	note G#, 15
+	note F_, 7
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 5
+	note G#, 0
+	note __, 0
+	octave 6
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note D#, 0
+	note F_, 0
+	notetype $6, $24
+	note E_, 0
+	note D_, 0
+	note C_, 0
+	octave 5
+	note B_, 0
+	note A_, 0
+	note G_, 0
 	intensity $14
-	note $81
-	octave3
-	note $80
-	note $00
-	note $80
-	note $00
-	octave5
-	note $81
-	octave3
-	note $80
-	note $00
-	note $80
-	note $00
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 5
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	intensity $14
-	octave5
-	note $83
-	loopchannel $00, $4e5a ; end
-; 0xed06d
+	octave 5
+	note G_, 3
+	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
+; ed06d
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -1,1229 +1,1232 @@
-_Music_KantoWildPokemonBattle: ; 0xed06d
-	db $80
-	dw _Music_KantoWildPokemonBattle_Ch1
-	db $01
-	dw _Music_KantoWildPokemonBattle_Ch2
-	db $02
-	dw _Music_KantoWildPokemonBattle_Ch3
-; 0xed076
+Music_KantoWildBattle: ; ed06d
+	dbw $80, Music_KantoWildBattle_Ch1
+	dbw $01, Music_KantoWildBattle_Ch2
+	dbw $02, Music_KantoWildBattle_Ch3
+; ed076
 
-; 0xed076
-	db $03
-; 0xed077
+INCBIN "baserom.gbc", $ed076, $ed077 - $ed076
 
-_Music_KantoWildPokemonBattle_Ch1: ; 0xed077
-	tempo $7000
+Music_KantoWildBattle_Ch1: ; ed077
+	tempo 112
 	volume $77
 	vibrato $12, $23
-	dutycycle $02
-	notetype $0c, $b7
-	note $0f
-	octave4
-	note $b5
-	note $a0
-	note $90
-	note $a0
-	note $90
-	note $80
-	note $70
-	note $90
-	note $80
-	note $70
-	note $60
-	notetype $0c, $b7
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
-	octave4
-	note $63
-	note $23
-	octave3
-	note $c7
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed18a
-	note $07
-	note $80
-	note $c0
-	octave4
-	note $20
-	octave3
-	note $c0
-	note $80
-	note $c0
-	octave4
-	note $30
-	note $40
+	dutycycle $2
+	notetype $c, $b7
+	note __, 15
+	octave 4
+	note A#, 5
+	note A_, 0
+	note G#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+
+Music_KantoWildBattle_branch_ed091: ; ed091
+	notetype $c, $b7
+	callchannel Music_KantoWildBattle_branch_ed18a
+	octave 4
+	note F_, 3
+	note C#, 3
+	octave 3
+	note B_, 7
+	callchannel Music_KantoWildBattle_branch_ed18a
+	note __, 7
+	note G_, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	note G_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note D#, 0
 	intensity $b1
-	note $55
-	note $15
-	octave3
-	note $83
-	octave4
-	note $55
-	note $15
-	note $53
+	note E_, 5
+	note C_, 5
+	octave 3
+	note G_, 3
+	octave 4
+	note E_, 5
+	note C_, 5
+	note E_, 3
 	intensity $b7
-	note $60
-	note $20
-	octave3
-	note $90
-	octave4
-	note $10
-	note $20
-	octave3
-	note $90
-	note $60
-	note $80
-	note $93
-	note $70
-	note $80
-	note $90
-	octave4
-	note $10
-	note $23
-	octave3
-	note $60
-	note $90
-	octave4
-	note $20
-	note $50
-	note $62
-	note $80
-	note $93
+	note F_, 0
+	note C#, 0
+	octave 3
+	note G#, 0
+	octave 4
+	note C_, 0
+	note C#, 0
+	octave 3
+	note G#, 0
+	note F_, 0
+	note G_, 0
+	note G#, 3
+	note F#, 0
+	note G_, 0
+	note G#, 0
+	octave 4
+	note C_, 0
+	note C#, 3
+	octave 3
+	note F_, 0
+	note G#, 0
+	octave 4
+	note C#, 0
+	note E_, 0
+	note F_, 2
+	note G_, 0
+	note G#, 3
 	intensity $b1
-	octave3
-	note $85
-	note $65
-	note $53
-	note $95
-	note $85
-	note $63
-	octave4
-	note $15
-	octave3
-	note $b5
-	note $83
-	notetype $08, $b7
-	octave2
-	note $81
-	octave3
-	note $11
-	note $51
-	note $11
-	note $51
-	note $81
-	note $51
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $11
-	note $51
-	note $61
-	note $21
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $91
-	note $61
-	note $91
-	note $61
-	note $21
-	note $61
-	note $21
-	octave2
-	note $91
-	notetype $0c, $b7
-	octave3
-	note $93
-	octave4
-	note $23
+	octave 3
+	note G_, 5
+	note F_, 5
+	note E_, 3
+	note G#, 5
+	note G_, 5
+	note F_, 3
+	octave 4
+	note C_, 5
+	octave 3
+	note A#, 5
+	note G_, 3
+	notetype $8, $b7
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note C#, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note C#, 1
+	note F_, 1
+	note C#, 1
+	octave 2
+	note G#, 1
+	notetype $c, $b7
+	octave 3
+	note G#, 3
+	octave 4
+	note C#, 3
 	intensity $71
-	note $60
-	note $60
+	note F_, 0
+	note F_, 0
 	intensity $91
-	note $60
-	note $60
+	note F_, 0
+	note F_, 0
 	intensity $b1
-	note $90
-	note $90
+	note G#, 0
+	note G#, 0
 	intensity $d1
-	note $90
-	note $90
+	note G#, 0
+	note G#, 0
 	intensity $c7
-	note $50
-	note $30
-	note $20
-	note $30
-	note $5b
-	note $57
+	note E_, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note E_, 11
+	note E_, 7
 	intensity $b1
-	note $50
-	note $30
-	note $10
-	octave3
-	note $b0
-	note $a0
-	note $80
-	note $60
-	note $50
+	note E_, 0
+	note D_, 0
+	note C_, 0
+	octave 3
+	note A#, 0
+	note A_, 0
+	note G_, 0
+	note F_, 0
+	note E_, 0
 	intensity $b7
-	note $37
-	note $67
-	note $b7
-	octave4
-	note $37
-	octave3
-	note $87
-	octave4
-	note $17
-	note $57
-	note $87
-	note $07
-	octave3
-	note $47
-	note $97
-	octave4
-	note $17
-	octave3
-	note $b7
-	note $07
-	octave4
-	note $37
-	octave3
-	note $91
-	note $61
-	note $31
-	note $61
-	octave4
-	note $13
-	note $05
-	note $10
-	note $04
-	note $21
-	note $10
-	note $0c
-	note $23
-	note $05
-	note $20
-	note $04
-	note $61
-	note $40
-	note $04
-	note $27
+	note D_, 7
+	note F_, 7
+	note A#, 7
+	octave 4
+	note D_, 7
+	octave 3
+	note G_, 7
+	octave 4
+	note C_, 7
+	note E_, 7
+	note G_, 7
+	note __, 7
+	octave 3
+	note D#, 7
+	note G#, 7
+	octave 4
+	note C_, 7
+	octave 3
+	note A#, 7
+	note __, 7
+	octave 4
+	note D_, 7
+	octave 3
+	note G#, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	octave 4
+	note C_, 3
+	note __, 5
+	note C_, 0
+	note __, 4
+	note C#, 1
+	note C_, 0
+	note __, 12
+	note C#, 3
+	note __, 5
+	note C#, 0
+	note __, 4
+	note F_, 1
+	note D#, 0
+	note __, 4
+	note C#, 7
+
+Music_KantoWildBattle_branch_ed15b: ; ed15b
 	intensity $b1
-	octave3
-	note $10
-	note $40
-	note $30
-	note $20
-	loopchannel $08, $515b
-	note $20
-	note $60
-	note $50
-	note $40
-	loopchannel $08, $5166
-	note $10
-	note $40
-	note $30
-	note $20
-	loopchannel $10, $516e
-	note $20
-	note $50
-	note $40
-	note $30
-	loopchannel $08, $5176
-	note $10
-	note $40
-	note $30
-	note $20
-	loopchannel $08, $517e
-	loopchannel $00, $5091 ; end
-; 0xed18a
+	octave 3
+	note C_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	loopchannel 8, Music_KantoWildBattle_branch_ed15b
 
-_Music_KantoWildPokemonBattle_sub_0xed18a: ; 0xed18a
-; subroutine
-	octave4
-	note $10
-	note $04
-	octave3
-	note $c0
-	note $04
-	note $b0
-	note $02
-	note $09
-	octave4
-	note $11
-	note $01
-	note $41
-	note $20
-	note $04
-	note $10
-	note $04
-	octave3
-	note $c0
-	note $02
-	endchannel ; end
-; 0xed19f
+Music_KantoWildBattle_branch_ed166: ; ed166
+	note C#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	loopchannel 8, Music_KantoWildBattle_branch_ed166
 
-_Music_KantoWildPokemonBattle_Ch2: ; 0xed19f
-	dutycycle $01
+Music_KantoWildBattle_branch_ed16e: ; ed16e
+	note C_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	loopchannel 16, Music_KantoWildBattle_branch_ed16e
+
+Music_KantoWildBattle_branch_ed176: ; ed176
+	note C#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	loopchannel 8, Music_KantoWildBattle_branch_ed176
+
+Music_KantoWildBattle_branch_ed17e: ; ed17e
+	note C_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	loopchannel 8, Music_KantoWildBattle_branch_ed17e
+	loopchannel 0, Music_KantoWildBattle_branch_ed091
+; ed18a
+
+Music_KantoWildBattle_branch_ed18a: ; ed18a
+	octave 4
+	note C_, 0
+	note __, 4
+	octave 3
+	note B_, 0
+	note __, 4
+	note A#, 0
+	note __, 2
+	note __, 9
+	octave 4
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note C#, 0
+	note __, 4
+	note C_, 0
+	note __, 4
+	octave 3
+	note B_, 0
+	note __, 2
+	endchannel
+
+Music_KantoWildBattle_Ch2: ; ed19f
+	dutycycle $1
 	vibrato $12, $23
-	notetype $0c, $b1
-	octave4
-	note $80
-	note $70
-	note $60
-	note $50
-	note $80
-	note $70
-	note $60
-	note $50
-	note $80
-	note $70
-	note $60
-	note $50
-	note $80
-	note $70
-	note $60
-	note $50
-	note $80
-	note $70
-	note $60
-	note $50
-	note $70
-	note $60
-	note $50
-	note $40
-	note $60
-	note $50
-	note $40
-	note $30
-	note $50
-	note $40
-	note $30
-	note $20
-	notetype $0c, $b7
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
-	octave2
-	note $61
-	octave1
-	note $c0
-	note $00
-	octave2
-	note $81
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed2c6
-	octave2
-	note $80
-	note $00
-	octave1
-	note $c0
-	note $00
-	octave2
-	note $60
-	note $70
-	notetype $06, $b7
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	forceoctave $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	forceoctave $00
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	forceoctave $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	forceoctave $00
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed307
-	note $0f
-	octave3
-	note $bf
-	octave4
-	note $3f
-	note $6f
-	notetype $0c, $b7
-	note $5f
-	note $87
-	octave5
-	note $17
-	note $07
-	octave3
-	note $97
-	octave4
-	note $17
-	note $47
-	note $67
-	note $60
-	octave3
-	note $b0
-	note $90
-	note $b0
-	octave4
-	note $60
-	octave3
-	note $b0
-	note $90
-	note $b0
-	octave4
-	note $97
-	note $90
-	note $60
-	note $30
-	octave3
-	note $c0
-	octave4
-	note $60
-	note $30
-	octave3
-	note $c0
-	note $90
-	notetype $06, $b7
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
-	forceoctave $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed31b
-	forceoctave $00
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed340
-	octave2
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	note $11
-	note $01
-	octave4
-	note $13
-	octave2
-	note $11
-	note $01
-	octave4
-	note $43
-	octave2
-	note $11
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	octave4
-	note $63
-	octave2
-	note $21
-	note $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed340
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed354
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed340
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed354
-	forceoctave $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed340
-	forceoctave $00
-	note $21
-	note $01
-	octave3
-	note $93
-	octave2
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $23
-	octave2
-	note $21
-	note $01
-	octave3
-	note $b3
-	octave2
-	note $21
-	note $01
-	callchannel _Music_KantoWildPokemonBattle_sub_0xed340
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	note $11
-	note $01
-	octave4
-	note $13
-	octave2
-	note $11
-	note $01
-	octave3
-	note $b3
-	octave2
-	note $11
-	note $01
-	loopchannel $00, $51c8 ; end
-; 0xed2c6
+	notetype $c, $b1
+	octave 4
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
 
-_Music_KantoWildPokemonBattle_sub_0xed2c6: ; 0xed2c6
-; subroutine
-	octave2
-	note $10
-	note $01
-	note $10
-	octave1
-	note $80
-	note $00
-	octave2
-	note $10
-	note $00
-	octave3
-	note $11
-	octave2
-	note $10
-	note $00
-	octave1
-	note $80
-	note $01
-	note $80
-	octave2
-	note $12
-	note $10
-	octave1
-	note $81
-	octave2
-	note $11
-	octave1
-	note $81
-	octave2
-	note $71
-	octave1
-	note $81
-	octave2
-	note $81
-	note $20
-	note $01
-	note $20
-	octave1
-	note $90
-	note $00
-	octave2
-	note $20
-	note $00
-	octave3
-	note $20
-	note $00
-	octave2
-	note $21
-	octave1
-	note $90
-	note $01
-	note $90
-	octave2
-	note $20
-	note $01
-	note $20
-	octave1
-	note $90
-	note $00
-	octave2
-	note $20
-	note $00
-	octave1
-	note $81
-	endchannel ; end
-; 0xed307
+Music_KantoWildBattle_branch_ed1c8: ; ed1c8
+	notetype $c, $b7
+	callchannel Music_KantoWildBattle_branch_ed2c6
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	callchannel Music_KantoWildBattle_branch_ed2c6
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 1
+	note B_, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note F#, 0
+	notetype $6, $b7
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	forceoctave $1
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	forceoctave $0
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	forceoctave $1
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	forceoctave $0
+	callchannel Music_KantoWildBattle_branch_ed307
+	callchannel Music_KantoWildBattle_branch_ed307
+	note __, 15
+	octave 3
+	note A#, 15
+	octave 4
+	note D_, 15
+	note F_, 15
+	notetype $c, $b7
+	note E_, 15
+	note G_, 7
+	octave 5
+	note C_, 7
+	note __, 7
+	octave 3
+	note G#, 7
+	octave 4
+	note C_, 7
+	note D#, 7
+	note F_, 7
+	note F_, 0
+	octave 3
+	note A#, 0
+	note G#, 0
+	note A#, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note A#, 0
+	note G#, 0
+	note A#, 0
+	octave 4
+	note G#, 7
+	note G#, 0
+	note F_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note F_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note G#, 0
+	notetype $6, $b7
+	callchannel Music_KantoWildBattle_branch_ed31b
+	forceoctave $1
+	callchannel Music_KantoWildBattle_branch_ed31b
+	forceoctave $0
+	callchannel Music_KantoWildBattle_branch_ed340
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note C_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 4
+	note D#, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	octave 4
+	note F_, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	callchannel Music_KantoWildBattle_branch_ed340
+	callchannel Music_KantoWildBattle_branch_ed354
+	callchannel Music_KantoWildBattle_branch_ed340
+	callchannel Music_KantoWildBattle_branch_ed354
+	forceoctave $1
+	callchannel Music_KantoWildBattle_branch_ed340
+	forceoctave $0
+	note C#, 1
+	note __, 1
+	octave 3
+	note G#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	octave 3
+	note A#, 3
+	octave 2
+	note C#, 1
+	note __, 1
+	callchannel Music_KantoWildBattle_branch_ed340
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note C_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 3
+	note A#, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	loopchannel 0, Music_KantoWildBattle_branch_ed1c8
+; ed2c6
 
-_Music_KantoWildPokemonBattle_sub_0xed307: ; 0xed307
-; subroutine
-	octave2
-	note $11
-	note $03
-	note $10
-	note $00
-	note $11
-	octave3
-	note $11
-	octave2
-	note $13
-	note $01
-	note $11
-	note $01
-	note $11
-	octave3
-	note $11
-	note $01
-	octave2
-	note $13
-	endchannel ; end
-; 0xed31b
+Music_KantoWildBattle_branch_ed2c6: ; ed2c6
+	octave 2
+	note C_, 0
+	note __, 1
+	note C_, 0
+	octave 1
+	note G_, 0
+	note __, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 0
+	note __, 0
+	octave 1
+	note G_, 0
+	note __, 1
+	note G_, 0
+	octave 2
+	note C_, 2
+	note C_, 0
+	octave 1
+	note G_, 1
+	octave 2
+	note C_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note C#, 0
+	note __, 1
+	note C#, 0
+	octave 1
+	note G#, 0
+	note __, 0
+	octave 2
+	note C#, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 2
+	note C#, 1
+	octave 1
+	note G#, 0
+	note __, 1
+	note G#, 0
+	octave 2
+	note C#, 0
+	note __, 1
+	note C#, 0
+	octave 1
+	note G#, 0
+	note __, 0
+	octave 2
+	note C#, 0
+	note __, 0
+	octave 1
+	note G_, 1
+	endchannel
+; ed307
 
-_Music_KantoWildPokemonBattle_sub_0xed31b: ; 0xed31b
-; subroutine
-	octave2
-	note $11
-	note $03
-	note $11
-	note $03
-	octave1
-	note $80
-	note $00
-	note $80
-	note $00
-	octave2
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $15
-	note $11
-	note $03
-	note $11
-	octave1
-	note $81
-	octave2
-	note $51
-	note $11
-	octave1
-	note $81
-	octave2
-	note $11
-	note $03
-	note $11
-	note $51
-	note $81
-	note $c1
-	octave3
-	note $11
-	endchannel ; end
-; 0xed340
+Music_KantoWildBattle_branch_ed307: ; ed307
+	octave 2
+	note C_, 1
+	note __, 3
+	note C_, 0
+	note __, 0
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 3
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 2
+	note C_, 3
+	endchannel
+; ed31b
 
-_Music_KantoWildPokemonBattle_sub_0xed340: ; 0xed340
-; subroutine
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	endchannel ; end
-; 0xed354
+Music_KantoWildBattle_branch_ed31b: ; ed31b
+	octave 2
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note __, 3
+	octave 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 2
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note C_, 5
+	note C_, 1
+	note __, 3
+	note C_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note E_, 1
+	note C_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note C_, 1
+	note __, 3
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	endchannel
+; ed340
 
-_Music_KantoWildPokemonBattle_sub_0xed354: ; 0xed354
-; subroutine
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	octave3
-	note $83
-	octave2
-	note $11
-	note $01
-	endchannel ; end
-; 0xed368
+Music_KantoWildBattle_branch_ed340: ; ed340
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	endchannel
+; ed354
 
-_Music_KantoWildPokemonBattle_Ch3: ; 0xed368
+Music_KantoWildBattle_branch_ed354: ; ed354
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 3
+	octave 2
+	note C_, 1
+	note __, 1
+	endchannel
+
+Music_KantoWildBattle_Ch3: ; ed368
 	vibrato $14, $23
-	notetype $0c, $14
-	octave3
-	note $10
-	note $00
-	note $10
-	octave4
-	note $10
-	octave3
-	note $20
-	note $00
-	note $20
-	octave4
-	note $20
-	octave3
-	note $30
-	note $00
-	note $30
-	octave4
-	note $30
-	octave3
-	note $40
-	note $00
-	note $40
-	octave4
-	note $40
-	octave3
-	note $50
-	note $00
-	note $50
-	octave4
-	note $50
-	octave3
-	note $60
-	note $00
-	note $60
-	octave4
-	note $60
-	octave3
-	note $70
-	note $00
-	note $70
-	octave4
-	note $70
-	octave3
-	note $80
-	note $00
-	note $80
-	octave4
-	note $80
-	notetype $0c, $14
-	octave5
-	note $80
-	note $01
-	octave4
-	note $80
-	note $01
-	octave5
-	note $80
-	note $02
-	octave4
-	note $80
-	note $00
-	octave5
-	note $80
-	note $01
-	octave4
-	note $80
-	octave3
-	note $80
-	note $c0
-	octave4
-	note $10
-	note $30
-	note $45
-	octave5
-	note $41
-	note $01
-	note $81
-	note $90
-	note $01
-	octave4
-	note $90
-	note $01
-	octave5
-	note $90
-	note $02
-	octave4
-	note $90
-	note $00
-	octave5
-	note $90
-	note $01
-	octave4
-	note $90
-	octave6
-	note $25
-	octave5
-	note $90
-	note $60
-	note $c0
-	note $80
-	note $60
-	note $30
-	note $80
-	note $60
-	note $30
-	octave4
-	note $c0
-	octave5
-	note $80
-	note $01
-	octave4
-	note $80
-	note $01
-	octave5
-	note $80
-	note $02
-	octave4
-	note $80
-	note $00
-	octave5
-	note $80
-	note $01
-	octave4
-	note $80
-	note $10
-	note $30
-	note $40
-	note $60
-	note $85
-	octave5
-	note $41
-	note $01
-	note $81
-	note $90
-	note $01
-	octave4
-	note $80
-	note $01
-	octave5
-	note $90
-	note $02
-	octave4
-	note $80
-	note $00
-	octave5
-	note $90
-	note $01
-	octave4
-	note $80
-	note $23
-	note $93
-	octave5
-	note $66
-	note $70
-	note $81
+	notetype $c, $14
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note D_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	octave 4
+	note E_, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	note F_, 0
+	octave 4
+	note F_, 0
+	octave 3
+	note F#, 0
+	note __, 0
+	note F#, 0
+	octave 4
+	note F#, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	octave 4
+	note G_, 0
+
+Music_KantoWildBattle_branch_ed39e: ; ed39e
+	notetype $c, $14
+	octave 5
+	note G_, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 1
+	octave 5
+	note G_, 0
+	note __, 2
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 5
+	note G_, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	octave 3
+	note G_, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note D#, 5
+	octave 5
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note G#, 0
+	note __, 1
+	octave 4
+	note G#, 0
+	note __, 1
+	octave 5
+	note G#, 0
+	note __, 2
+	octave 4
+	note G#, 0
+	note __, 0
+	octave 5
+	note G#, 0
+	note __, 1
+	octave 4
+	note G#, 0
+	octave 6
+	note C#, 5
+	octave 5
+	note G#, 0
+	note F_, 0
+	note B_, 0
+	note G_, 0
+	note F_, 0
+	note D_, 0
+	note G_, 0
+	note F_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	octave 5
+	note G_, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 1
+	octave 5
+	note G_, 0
+	note __, 2
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 5
+	note G_, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	note C_, 0
+	note D_, 0
+	note D#, 0
+	note F_, 0
+	note G_, 5
+	octave 5
+	note D#, 1
+	note __, 1
+	note G_, 1
+	note G#, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 1
+	octave 5
+	note G#, 0
+	note __, 2
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 5
+	note G#, 0
+	note __, 1
+	octave 4
+	note G_, 0
+	note C#, 3
+	note G#, 3
+	octave 5
+	note F_, 6
+	note F#, 0
+	note G_, 1
 	intensity $24
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
 	intensity $14
-	octave5
-	note $71
+	octave 5
+	note F#, 1
 	intensity $24
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
 	intensity $14
-	octave5
-	note $51
+	octave 5
+	note E_, 1
 	intensity $24
-	note $10
-	octave4
-	note $80
+	note C_, 0
+	octave 4
+	note G_, 0
 	intensity $14
-	octave5
-	note $81
+	octave 5
+	note G_, 1
 	intensity $24
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
 	intensity $14
-	octave5
-	note $a1
+	octave 5
+	note A_, 1
 	intensity $24
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
 	intensity $14
-	octave5
-	note $81
+	octave 5
+	note G_, 1
 	intensity $24
-	note $10
-	octave4
-	note $90
+	note C_, 0
+	octave 4
+	note G#, 0
 	intensity $14
-	octave5
-	note $9b
-	note $81
-	note $61
-	note $91
-	note $81
-	note $20
-	note $60
-	note $90
-	octave6
-	note $10
-	note $27
-	octave5
-	note $11
+	octave 5
+	note G#, 11
+	note G_, 1
+	note F_, 1
+	note G#, 1
+	note G_, 1
+	note C#, 0
+	note F_, 0
+	note G#, 0
+	octave 6
+	note C_, 0
+	note C#, 7
+	octave 5
+	note C_, 1
 	intensity $24
-	octave4
-	note $50
-	note $80
-	note $50
-	note $80
+	octave 4
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note G_, 0
 	intensity $14
-	note $b1
+	note A#, 1
 	intensity $24
-	note $50
-	note $80
-	note $50
-	note $80
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note G_, 0
 	intensity $14
-	note $91
+	note G#, 1
 	intensity $24
-	note $50
-	note $80
+	note E_, 0
+	note G_, 0
 	intensity $14
-	octave5
-	note $21
+	octave 5
+	note C#, 1
 	intensity $24
-	octave4
-	note $50
-	note $80
-	note $50
-	note $80
+	octave 4
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note G_, 0
 	intensity $14
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $24
-	octave4
-	note $50
-	note $80
-	note $50
-	note $80
+	octave 4
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note G_, 0
 	intensity $14
-	note $b1
+	note A#, 1
 	intensity $24
-	note $50
-	note $80
+	note E_, 0
+	note G_, 0
 	intensity $14
-	octave5
-	note $61
+	octave 5
+	note F_, 1
 	intensity $24
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
 	intensity $14
-	note $51
+	note E_, 1
 	intensity $24
-	octave4
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
 	intensity $14
-	note $31
+	note D_, 1
 	intensity $24
-	octave4
-	note $80
-	octave5
-	note $10
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
 	intensity $14
-	octave4
-	note $b3
-	octave5
-	note $13
-	note $33
-	note $63
-	note $9f
-	notetype $06, $14
-	note $90
-	note $00
+	octave 4
+	note A#, 3
+	octave 5
+	note C_, 3
+	note D_, 3
+	note F_, 3
+	note G#, 15
+	notetype $6, $14
+	note G#, 0
+	note __, 0
 	intensity $24
-	note $90
-	note $00
+	note G#, 0
+	note __, 0
 	intensity $34
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
 	intensity $24
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
 	intensity $14
-	note $90
-	note $00
-	note $90
-	note $00
-	octave6
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	octave5
-	note $81
-	note $61
-	note $51
-	note $61
-	notetype $0c, $15
-	note $8b
-	note $87
-	notetype $06, $15
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 6
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 5
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	notetype $c, $15
+	note G_, 11
+	note G_, 7
+	notetype $6, $15
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	intensity $24
-	note $80
-	note $00
-	note $80
-	note $00
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	intensity $14
-	note $80
-	note $00
-	note $80
-	note $00
-	notetype $0c, $14
-	octave2
-	note $bf
-	note $b0
-	note $01
-	note $b0
-	note $01
-	note $b0
-	note $00
-	octave3
-	note $b0
-	note $01
-	note $b0
-	note $01
-	note $b0
-	note $00
-	note $10
-	note $01
-	notetype $06, $15
-	note $10
-	note $00
-	note $11
-	octave4
-	note $11
-	octave3
-	note $13
-	note $01
-	note $11
-	note $01
-	note $11
-	octave4
-	note $11
-	note $01
-	octave3
-	note $13
-	note $11
-	note $03
-	note $10
-	note $00
-	note $11
-	octave4
-	note $11
-	octave3
-	note $13
-	note $01
-	note $11
-	note $01
-	note $11
-	octave2
-	note $b1
-	note $01
-	note $b1
-	note $01
-	notetype $0c, $14
-	note $9f
-	note $9f
-	note $b1
-	note $01
-	note $b0
-	note $02
-	note $b0
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $b0
-	note $00
-	note $31
-	note $01
-	note $30
-	note $02
-	note $30
-	note $00
-	octave4
-	note $30
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave5
-	note $53
-	octave4
-	note $10
-	note $50
-	note $80
-	note $c0
-	octave5
-	note $10
-	note $00
-	note $50
-	note $04
-	note $61
-	note $50
-	note $00
-	octave4
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $50
-	note $80
-	note $50
-	note $10
-	note $50
-	note $80
-	octave5
-	note $10
-	note $50
-	note $80
-	note $63
-	octave4
-	note $20
-	note $60
-	note $90
-	octave5
-	note $10
-	note $20
-	note $00
-	note $60
-	note $04
-	note $91
-	note $80
-	note $04
-	note $67
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	notetype $c, $14
+	octave 2
+	note A#, 15
+	note A#, 0
+	note __, 1
+	note A#, 0
+	note __, 1
+	note A#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 1
+	note A#, 0
+	note __, 1
+	note A#, 0
+	note __, 0
+	note C_, 0
+	note __, 1
+	notetype $6, $15
+	note C_, 0
+	note __, 0
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note C_, 3
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note C_, 3
+	note C_, 1
+	note __, 3
+	note C_, 0
+	note __, 0
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note C_, 3
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	notetype $c, $14
+	note G#, 15
+	note G#, 15
+	note A#, 1
+	note __, 1
+	note A#, 0
+	note __, 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 5
+	note E_, 3
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note B_, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 4
+	note F_, 1
+	note E_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 5
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note F_, 3
+	octave 4
+	note C#, 0
+	note F_, 0
+	note G#, 0
+	octave 5
+	note C_, 0
+	note C#, 0
+	note __, 0
+	note F_, 0
+	note __, 4
+	note G#, 1
+	note G_, 0
+	note __, 4
+	note F_, 7
 	intensity $13
-	note $85
-	note $75
-	note $51
-	note $01
-	note $85
-	note $a5
-	note $81
-	note $01
-	note $9b
-	note $81
-	note $61
-	note $91
-	note $81
-	note $03
-	octave6
-	note $27
-	octave5
-	note $15
-	octave4
-	note $b5
-	note $91
-	note $01
-	octave5
-	note $25
-	note $15
-	octave4
-	note $b1
-	note $01
-	octave5
-	note $65
-	note $55
-	note $31
-	note $01
-	octave4
-	note $b3
-	octave5
-	note $13
-	note $33
-	note $63
-	note $9f
-	note $9f
-	note $8f
-	note $8f
-	loopchannel $00, $539e ; end
-; 0xed5c6
+	note G_, 5
+	note F#, 5
+	note E_, 1
+	note __, 1
+	note G_, 5
+	note A_, 5
+	note G_, 1
+	note __, 1
+	note G#, 11
+	note G_, 1
+	note F_, 1
+	note G#, 1
+	note G_, 1
+	note __, 3
+	octave 6
+	note C#, 7
+	octave 5
+	note C_, 5
+	octave 4
+	note A#, 5
+	note G#, 1
+	note __, 1
+	octave 5
+	note C#, 5
+	note C_, 5
+	octave 4
+	note A#, 1
+	note __, 1
+	octave 5
+	note F_, 5
+	note E_, 5
+	note D_, 1
+	note __, 1
+	octave 4
+	note A#, 3
+	octave 5
+	note C_, 3
+	note D_, 3
+	note F_, 3
+	note G#, 15
+	note G#, 15
+	note G_, 15
+	note G_, 15
+	loopchannel 0, Music_KantoWildBattle_branch_ed39e
+; ed5c6
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -1,327 +1,329 @@
-_Music_LakeOfRage: ; 0xee6c5
-	db $c0
-	dw _Music_LakeOfRage_Ch1
-	db $01
-	dw _Music_LakeOfRage_Ch2
-	db $02
-	dw _Music_LakeOfRage_Ch3
-	db $03
-	dw _Music_LakeOfRage_Ch4
-; 0xee6d1
+Music_LakeOfRage: ; ee6c5
+	dbw $c0, Music_LakeOfRage_Ch1
+	dbw $01, Music_LakeOfRage_Ch2
+	dbw $02, Music_LakeOfRage_Ch3
+	dbw $03, Music_LakeOfRage_Ch4
+; ee6d1
 
-_Music_LakeOfRage_Ch1: ; 0xee6d1
-	tempo $9000
+
+Music_LakeOfRage_Ch1: ; ee6d1
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0200
-	vibrato $08, $22
+	dutycycle $3
+	tone $0002
+	vibrato $8, $22
 	stereopanning $f0
-	notetype $0c, $b4
-	octave3
-	note $35
-	note $39
-	note $35
-	note $35
-	note $53
+	notetype $c, $b4
+	octave 3
+	note D_, 5
+	note D_, 9
+	note D_, 5
+	note D_, 5
+	note E_, 3
+
+Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $b5
-	note $75
-	note $55
-	note $33
-	octave4
-	note $35
-	note $13
-	note $51
-	note $33
-	octave3
-	note $c5
-	note $81
-	notetype $08, $b5
-	note $33
-	note $83
-	note $c3
-	notetype $0c, $b4
-	note $32
-	note $70
+	note F#, 5
+	note E_, 5
+	note D_, 3
+	octave 4
+	note D_, 5
+	note C_, 3
+	note E_, 1
+	note D_, 3
+	octave 3
+	note B_, 5
+	note G_, 1
+	notetype $8, $b5
+	note D_, 3
+	note G_, 3
+	note B_, 3
+	notetype $c, $b4
+	note D_, 2
+	note F#, 0
 	intensity $b7
-	note $a7
-	note $73
-	note $a2
-	octave4
-	note $20
-	note $3b
-	notetype $08, $b4
-	octave3
-	note $13
-	octave2
-	note $c3
-	note $a3
-	notetype $08, $b7
-	note $ab
-	notetype $0c, $b7
-	octave3
-	note $1b
+	note A_, 7
+	note F#, 3
+	note A_, 2
+	octave 4
+	note C#, 0
+	note D_, 11
+	notetype $8, $b4
+	octave 3
+	note C_, 3
+	octave 2
+	note B_, 3
+	note A_, 3
+	notetype $8, $b7
+	note A_, 11
+	notetype $c, $b7
+	octave 3
+	note C_, 11
 	intensity $b4
-	note $53
-	note $31
+	note E_, 3
+	note D_, 1
 	intensity $b7
-	octave2
-	note $a9
+	octave 2
+	note A_, 9
 	intensity $b4
-	octave3
-	note $53
-	note $32
-	note $50
+	octave 3
+	note E_, 3
+	note D_, 2
+	note E_, 0
 	intensity $b7
-	note $77
-	note $35
-	note $10
-	note $50
-	note $17
-	note $55
-	note $50
-	note $80
-	note $57
-	note $85
-	note $70
-	note $80
+	note F#, 7
+	note D_, 5
+	note C_, 0
+	note E_, 0
+	note C_, 7
+	note E_, 5
+	note E_, 0
+	note G_, 0
+	note E_, 7
+	note G_, 5
+	note F#, 0
+	note G_, 0
 	intensity $a0
-	note $a6
+	note A_, 6
 	intensity $a7
-	note $a6
-	note $a0
-	octave4
-	note $10
+	note A_, 6
+	note A_, 0
+	octave 4
+	note C_, 0
 	intensity $a0
-	note $35
+	note D_, 5
 	intensity $a7
-	note $35
-	loopchannel $00, $66e9 ; end
-; 0xee749
+	note D_, 5
+	loopchannel 0, Music_LakeOfRage_branch_ee6e9
 
-_Music_LakeOfRage_Ch2: ; 0xee749
-	dutycycle $03
+Music_LakeOfRage_Ch2: ; ee749
+	dutycycle $3
 	vibrato $20, $44
 	stereopanning $ff
-	notetype $0c, $90
-	octave3
-	note $87
+	notetype $c, $90
+	octave 3
+	note G_, 7
 	intensity $97
-	note $87
+	note G_, 7
 	intensity $a0
-	note $a7
+	note A_, 7
 	intensity $a7
-	note $a7
-	notetype $08, $c7
-	octave4
-	note $3f
-	octave3
-	note $a3
-	octave4
-	note $33
-	note $af
-	octave5
-	note $13
-	octave4
-	note $c3
-	notetype $0c, $c7
-	note $8b
-	note $c3
-	note $a2
-	note $80
+	note A_, 7
+
+Music_LakeOfRage_branch_ee75e: ; ee75e
+	notetype $8, $c7
+	octave 4
+	note D_, 15
+	octave 3
+	note A_, 3
+	octave 4
+	note D_, 3
+	note A_, 15
+	octave 5
+	note C_, 3
+	octave 4
+	note B_, 3
+	notetype $c, $c7
+	note G_, 11
+	note B_, 3
+	note A_, 2
+	note G_, 0
 	intensity $b0
-	note $7b
+	note F#, 11
 	intensity $b7
-	note $7f
-	notetype $08, $c3
-	octave3
-	note $83
-	note $73
-	note $53
-	note $1e
-	notetype $0c, $c3
-	octave4
-	note $10
-	note $50
-	note $80
-	note $00
-	note $50
-	note $80
+	note F#, 15
+	notetype $8, $c3
+	octave 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note C_, 14
+	notetype $c, $c3
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note G_, 0
 	intensity $c5
-	octave5
-	note $19
+	octave 5
+	note C_, 9
 	intensity $c3
-	octave4
-	note $a3
-	note $83
-	note $73
-	note $51
-	notetype $08, $c3
-	note $33
-	note $53
-	note $73
-	notetype $08, $c7
-	note $ab
-	notetype $08, $c3
-	octave3
-	note $83
-	note $73
-	note $53
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $a3
-	octave4
-	note $53
-	note $33
-	note $13
-	note $83
-	note $73
-	note $53
-	notetype $08, $c7
-	note $7f
-	note $33
-	note $73
-	notetype $0c, $c7
-	note $af
-	loopchannel $00, $675e ; end
-; 0xee7c1
+	octave 4
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 1
+	notetype $8, $c3
+	note D_, 3
+	note E_, 3
+	note F#, 3
+	notetype $8, $c7
+	note A_, 11
+	notetype $8, $c3
+	octave 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	octave 4
+	note E_, 3
+	note D_, 3
+	note C_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	notetype $8, $c7
+	note F#, 15
+	note D_, 3
+	note F#, 3
+	notetype $c, $c7
+	note A_, 15
+	loopchannel 0, Music_LakeOfRage_branch_ee75e
 
-_Music_LakeOfRage_Ch3: ; 0xee7c1
-	stereopanning $0f
-	notetype $0c, $16
-	octave3
-	note $83
-	note $01
-	note $83
-	note $05
-	note $73
-	note $01
-	note $73
-	note $01
-	note $53
-	octave3
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $63
-	note $11
-	note $63
-	note $11
-	note $61
-	note $71
-	note $83
-	note $31
-	note $83
-	note $31
-	note $81
-	note $c1
-	note $a1
-	note $31
-	note $71
-	note $a3
-	note $31
-	note $51
-	note $71
-	note $a1
-	note $71
-	note $a1
-	octave4
-	note $33
-	octave3
-	note $a1
-	octave4
-	note $31
-	note $71
-	octave3
-	note $53
-	note $11
-	note $53
-	note $11
-	note $51
-	note $11
-	note $83
-	note $11
-	note $83
-	note $11
-	note $81
-	note $11
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $a1
-	note $31
-	note $71
-	octave4
-	note $33
-	octave3
-	note $31
-	note $51
-	note $71
-	note $83
-	note $11
-	note $83
-	note $11
-	note $81
-	note $11
-	note $83
-	note $11
-	note $83
-	note $11
-	note $81
-	note $11
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $a1
-	loopchannel $00, $67d0 ; end
-; 0xee835
+Music_LakeOfRage_Ch3: ; ee7c1
+	stereopanning $f
+	notetype $c, $16
+	octave 3
+	note G_, 3
+	note __, 1
+	note G_, 3
+	note __, 5
+	note F#, 3
+	note __, 1
+	note F#, 3
+	note __, 1
+	note E_, 3
 
-_Music_LakeOfRage_Ch4: ; 0xee835
+Music_LakeOfRage_branch_ee7d0: ; ee7d0
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note F_, 3
+	note C_, 1
+	note F_, 3
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 3
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	note A_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 3
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	octave 3
+	note E_, 3
+	note C_, 1
+	note E_, 3
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note F#, 1
+	octave 4
+	note D_, 3
+	octave 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	loopchannel 0, Music_LakeOfRage_branch_ee7d0
+
+Music_LakeOfRage_Ch4: ; ee835
 	stereopanning $f0
-	togglenoise $03
-	notetype $0c
-	note $31
-	note $30
-	note $30
-	note $81
-	note $31
-	note $30
-	note $30
-	note $75
-	note $31
-	note $30
-	note $30
-	note $81
-	note $31
-	note $30
-	note $30
-	note $72
-	note $30
-	note $30
-	note $30
-	loopchannel $00, $683b ; end
-; 0xee852
+	togglenoise $3
+	notetype $c
+
+Music_LakeOfRage_branch_ee83b: ; ee83b
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note G_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note F#, 5
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note G_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note F#, 2
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	loopchannel 0, Music_LakeOfRage_branch_ee83b
+; ee852
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -1,41 +1,39 @@
-_Music_LakeOfRageRocketsRadioSignal: ; 0xef5b1
-	db $80
-	dw _Music_LakeOfRageRocketsRadioSignal_Ch1
-	db $01
-	dw _Music_LakeOfRageRocketsRadioSignal_Ch2
-	db $02
-	dw _Music_LakeOfRageRocketsRadioSignal_Ch3
-; 0xef5ba
+Music_LakeOfRageRocketRadio: ; ef5b1
+	dbw $80, Music_LakeOfRageRocketRadio_Ch1
+	dbw $01, Music_LakeOfRageRocketRadio_Ch2
+	dbw $02, Music_LakeOfRageRocketRadio_Ch3
+; ef5ba
 
-_Music_LakeOfRageRocketsRadioSignal_Ch1: ; 0xef5ba
-	tempo $a000
+
+Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
+	tempo 160
 	volume $77
-	dutycycle $01
-	tone $1811
-	vibrato $00, $f0
+	dutycycle $1
+	tone $1118
+	vibrato $0, $f0
 	stereopanning $f0
-	notetype $0c, $a7
-	octave7
-	note $83
-	note $73
-	note $83
-	note $73
-	note $0f
-	loopchannel $00, $75c9 ; end
-; 0xef5d6
 
-_Music_LakeOfRageRocketsRadioSignal_Ch2: ; 0xef5d6
-	dutycycle $01
+Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
+	notetype $c, $a7
+	octave 7
+	note G_, 3
+	note F#, 3
+	note G_, 3
+	note F#, 3
+	note __, 15
+	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+
+Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
+	dutycycle $1
 	vibrato $13, $e8
-	notetype $0c, $a7
-	note $01
-	stereopanning $0f
-	loopchannel $00, $75c9 ; end
-; 0xef5e5
+	notetype $c, $a7
+	note __, 1
+	stereopanning $f
+	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 
-_Music_LakeOfRageRocketsRadioSignal_Ch3: ; 0xef5e5
-	notetype $0c, $26
+Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
+	notetype $c, $26
 	vibrato $10, $44
-	note $03
-	loopchannel $00, $75c9 ; end
-; 0xef5f0
+	note __, 3
+	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+; ef5f0
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -1,524 +1,524 @@
-_Music_LavenderTown: ; 0xef72f
-	db $80
-	dw _Music_LavenderTown_Ch1
-	db $01
-	dw _Music_LavenderTown_Ch2
-	db $02
-	dw _Music_LavenderTown_Ch3
-; 0xef738
+Music_LavenderTown: ; ef72f
+	dbw $80, Music_LavenderTown_Ch1
+	dbw $01, Music_LavenderTown_Ch2
+	dbw $02, Music_LavenderTown_Ch3
+; ef738
 
-; 0xef738
-	db $03
-; 0xef739
+INCBIN "baserom.gbc", $ef738, $ef739 - $ef738
 
-_Music_LavenderTown_Ch1: ; 0xef739
-	tempo $a000
+Music_LavenderTown_Ch1: ; ef739
+	tempo 160
 	volume $77
-	stereopanning $0f
-	vibrato $06, $24
-	dutycycle $00
-	notetype $0c, $b3
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	callchannel _Music_LavenderTown_sub_0xef7fd
+	stereopanning $f
+	vibrato $6, $24
+	dutycycle $0
+	notetype $c, $b3
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+
+Music_LavenderTown_branch_ef74c: ; ef74c
+	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
-	octave5
-	note $31
+	octave 5
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $93
-	note $71
+	note F#, 1
 	intensity $43
-	note $71
+	note F#, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $43
-	note $c1
+	note B_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $43
-	note $a1
-	callchannel _Music_LavenderTown_sub_0xef87f
+	note A_, 1
+	callchannel Music_LavenderTown_branch_ef87f
 	intensity $93
 	intensity $93
-	note $61
+	note F_, 1
 	intensity $83
-	note $61
+	note F_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $93
-	octave4
-	note $c1
+	octave 4
+	note B_, 1
 	intensity $43
-	note $c1
+	note B_, 1
 	intensity $93
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
-	callchannel _Music_LavenderTown_sub_0xef7fd
+	note G_, 1
+	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
-	octave5
-	note $31
+	octave 5
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $93
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $43
-	note $c1
+	note B_, 1
 	intensity $93
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
-	callchannel _Music_LavenderTown_sub_0xef87f
+	note G_, 1
+	callchannel Music_LavenderTown_branch_ef87f
 	intensity $93
-	octave6
-	note $11
+	octave 6
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $93
-	octave5
-	note $81
+	octave 5
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $93
-	note $51
+	note E_, 1
 	intensity $43
-	note $51
+	note E_, 1
 	intensity $93
-	note $11
+	note C_, 1
 	intensity $43
-	note $11
-	octave3
-	note $61
-	note $a1
-	octave4
-	note $11
-	note $51
-	note $61
-	note $11
-	octave3
-	note $a1
-	note $61
-	octave3
-	note $11
-	note $51
-	note $81
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $81
-	note $51
-	note $11
-	note $61
-	note $a1
-	octave4
-	note $11
-	note $51
-	note $61
-	note $11
-	octave3
-	note $a1
-	note $61
-	loopchannel $02, $77ca
-	note $71
-	note $a1
-	octave4
-	note $11
-	note $71
-	note $a1
-	note $11
-	octave3
-	note $a1
-	note $71
-	note $81
-	octave4
-	note $11
-	note $31
-	note $61
-	note $81
-	note $61
-	note $31
-	note $11
-	octave3
-	note $c7
-	note $c7
-	loopchannel $00, $774c ; end
-; 0xef7fd
+	note C_, 1
+	octave 3
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
 
-_Music_LavenderTown_sub_0xef7fd: ; 0xef7fd
-; subroutine
+Music_LavenderTown_branch_ef7ca: ; ef7ca
+	octave 3
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note E_, 1
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
+	loopchannel 2, Music_LavenderTown_branch_ef7ca
+	note F#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note F#, 1
+	note A_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 7
+	note B_, 7
+	loopchannel 0, Music_LavenderTown_branch_ef74c
+; ef7fd
+
+Music_LavenderTown_branch_ef7fd: ; ef7fd
 	intensity $83
-	octave5
-	note $11
+	octave 5
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $83
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $83
-	octave6
-	note $11
+	octave 6
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $83
-	octave5
-	note $81
+	octave 5
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $83
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $83
-	note $a1
+	note A_, 1
 	intensity $43
-	note $a1
+	note A_, 1
 	intensity $83
-	octave6
-	note $31
+	octave 6
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $83
-	octave5
-	note $a1
+	octave 5
+	note A_, 1
 	intensity $43
-	note $a1
+	note A_, 1
 	intensity $83
-	note $51
+	note E_, 1
 	intensity $43
-	note $51
+	note E_, 1
 	intensity $83
-	note $c1
+	note B_, 1
 	intensity $43
-	note $c1
+	note B_, 1
 	intensity $83
-	octave6
-	note $51
+	octave 6
+	note E_, 1
 	intensity $43
-	note $51
+	note E_, 1
 	intensity $83
-	octave5
-	note $c1
+	octave 5
+	note B_, 1
 	intensity $43
-	note $c1
+	note B_, 1
 	intensity $83
-	note $21
+	note C#, 1
 	intensity $43
-	note $21
+	note C#, 1
 	intensity $83
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $83
-	note $b1
+	note A#, 1
 	intensity $43
-	note $b1
+	note A#, 1
 	intensity $83
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $83
-	note $11
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $83
-	note $61
+	note F_, 1
 	intensity $43
-	note $61
+	note F_, 1
 	intensity $83
-	octave6
-	note $11
+	octave 6
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $83
-	octave5
-	note $61
+	octave 5
+	note F_, 1
 	intensity $43
-	note $61
-	endchannel ; end
-; 0xef87f
+	note F_, 1
+	endchannel
+; ef87f
 
-_Music_LavenderTown_sub_0xef87f: ; 0xef87f
-; subroutine
+Music_LavenderTown_branch_ef87f: ; ef87f
 	intensity $93
-	octave5
-	note $81
+	octave 5
+	note G_, 1
 	intensity $83
-	note $81
+	note G_, 1
 	intensity $83
-	note $61
+	note F_, 1
 	intensity $43
-	note $61
+	note F_, 1
 	intensity $83
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $83
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
-	endchannel ; end
-; 0xef899
+	note G_, 1
+	endchannel
 
-_Music_LavenderTown_Ch2: ; 0xef899
-	dutycycle $01
-	vibrato $08, $24
+Music_LavenderTown_Ch2: ; ef899
+	dutycycle $1
+	vibrato $8, $24
 	stereopanning $ff
-	notetype $0c, $a3
-	octave5
-	note $11
+
+Music_LavenderTown_branch_ef8a0: ; ef8a0
+	notetype $c, $a3
+	octave 5
+	note C_, 1
 	intensity $63
-	note $11
+	note C_, 1
 	intensity $a3
-	note $81
+	note G_, 1
 	intensity $63
-	note $81
+	note G_, 1
 	intensity $a3
-	note $c1
+	note B_, 1
 	intensity $63
-	note $c1
+	note B_, 1
 	intensity $a3
-	note $71
+	note F#, 1
 	intensity $63
-	note $71
-	loopchannel $03, $78a0
+	note F#, 1
+	loopchannel 3, Music_LavenderTown_branch_ef8a0
 	intensity $a3
-	note $11
+	note C_, 1
 	intensity $63
-	note $11
+	note C_, 1
 	intensity $a3
-	note $81
+	note G_, 1
 	intensity $63
-	note $81
+	note G_, 1
 	intensity $a3
-	note $c1
+	note B_, 1
 	intensity $63
-	note $c1
+	note B_, 1
 	intensity $a3
-	octave6
-	note $31
+	octave 6
+	note D_, 1
 	intensity $63
-	note $31
+	note D_, 1
+
+Music_LavenderTown_branch_ef8d7: ; ef8d7
 	intensity $b5
-	callchannel _Music_LavenderTown_sub_0xef915
-	octave2
-	note $73
-	octave3
-	note $13
-	note $73
-	note $a3
-	octave2
-	note $83
-	octave3
-	note $13
-	note $33
-	note $83
-	note $63
-	note $33
-	octave2
-	note $c3
-	note $83
-	callchannel _Music_LavenderTown_sub_0xef915
-	octave2
-	note $83
-	octave3
-	note $13
-	note $63
-	note $83
-	note $13
-	note $63
-	note $83
-	note $63
-	note $13
-	note $53
-	note $83
-	octave4
-	note $13
+	callchannel Music_LavenderTown_branch_ef915
+	octave 2
+	note F#, 3
+	octave 3
+	note C_, 3
+	note F#, 3
+	note A_, 3
+	octave 2
+	note G_, 3
+	octave 3
+	note C_, 3
+	note D_, 3
+	note G_, 3
+	note F_, 3
+	note D_, 3
+	octave 2
+	note B_, 3
+	note G_, 3
+	callchannel Music_LavenderTown_branch_ef915
+	octave 2
+	note G_, 3
+	octave 3
+	note C_, 3
+	note F_, 3
+	note G_, 3
+	note C_, 3
+	note F_, 3
+	note G_, 3
+	note F_, 3
+	note C_, 3
+	note E_, 3
+	note G_, 3
+	octave 4
+	note C_, 3
 	intensity $b7
-	octave2
-	note $6f
-	note $1f
-	note $6f
-	note $1f
-	note $6f
-	note $7f
-	note $8f
-	octave1
-	note $87
+	octave 2
+	note F_, 15
+	note C_, 15
+	note F_, 15
+	note C_, 15
+	note F_, 15
+	note F#, 15
+	note G_, 15
+	octave 1
+	note G_, 7
 	intensity $57
-	octave5
-	note $30
-	note $60
-	note $85
-	loopchannel $00, $78d7 ; end
-; 0xef915
+	octave 5
+	note D_, 0
+	note F_, 0
+	note G_, 5
+	loopchannel 0, Music_LavenderTown_branch_ef8d7
+; ef915
 
-_Music_LavenderTown_sub_0xef915: ; 0xef915
-; subroutine
-	octave2
-	note $13
-	note $83
-	octave3
-	note $53
-	octave2
-	note $83
-	note $33
-	note $a3
-	octave3
-	note $63
-	octave2
-	note $a3
-	note $53
-	note $c3
-	octave3
-	note $83
-	note $63
-	note $53
-	note $23
-	octave2
-	note $b3
-	note $83
-	note $63
-	octave3
-	note $13
-	note $a3
-	note $13
-	endchannel ; end
-; 0xef932
+Music_LavenderTown_branch_ef915: ; ef915
+	octave 2
+	note C_, 3
+	note G_, 3
+	octave 3
+	note E_, 3
+	octave 2
+	note G_, 3
+	note D_, 3
+	note A_, 3
+	octave 3
+	note F_, 3
+	octave 2
+	note A_, 3
+	note E_, 3
+	note B_, 3
+	octave 3
+	note G_, 3
+	note F_, 3
+	note E_, 3
+	note C#, 3
+	octave 2
+	note A#, 3
+	note G_, 3
+	note F_, 3
+	octave 3
+	note C_, 3
+	note A_, 3
+	note C_, 3
+	endchannel
 
-_Music_LavenderTown_Ch3: ; 0xef932
+Music_LavenderTown_Ch3: ; ef932
 	vibrato $12, $24
-	notetype $0c, $13
+	notetype $c, $13
 	stereopanning $f0
-	note $0f
-	note $0f
-	note $0f
-	note $07
-	octave5
-	note $53
-	note $63
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 7
+	octave 5
+	note E_, 3
+	note F_, 3
+
+Music_LavenderTown_branch_ef941: ; ef941
 	intensity $12
-	octave5
-	note $83
-	note $03
-	note $83
-	note $03
-	note $53
-	note $03
-	note $53
-	note $63
-	note $83
-	note $63
-	note $53
-	note $c3
-	note $27
-	note $01
-	note $21
-	note $31
-	note $51
-	note $69
-	note $81
-	note $61
-	note $51
-	note $37
-	octave4
-	note $a3
-	octave5
-	note $33
-	note $5b
-	note $61
-	note $51
-	note $3b
-	note $51
-	note $61
-	note $83
-	note $03
-	note $83
-	note $03
-	note $53
-	note $03
-	note $53
-	note $63
-	note $83
-	note $63
-	note $53
-	note $c3
-	note $27
-	note $01
-	note $21
-	note $31
-	note $51
-	note $69
-	note $81
-	note $61
-	note $51
-	note $3b
-	note $11
-	note $31
-	note $1f
-	note $1b
-	note $03
+	octave 5
+	note G_, 3
+	note __, 3
+	note G_, 3
+	note __, 3
+	note E_, 3
+	note __, 3
+	note E_, 3
+	note F_, 3
+	note G_, 3
+	note F_, 3
+	note E_, 3
+	note B_, 3
+	note C#, 7
+	note __, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F_, 9
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 7
+	octave 4
+	note A_, 3
+	octave 5
+	note D_, 3
+	note E_, 11
+	note F_, 1
+	note E_, 1
+	note D_, 11
+	note E_, 1
+	note F_, 1
+	note G_, 3
+	note __, 3
+	note G_, 3
+	note __, 3
+	note E_, 3
+	note __, 3
+	note E_, 3
+	note F_, 3
+	note G_, 3
+	note F_, 3
+	note E_, 3
+	note B_, 3
+	note C#, 7
+	note __, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F_, 9
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 11
+	note C_, 1
+	note D_, 1
+	note C_, 15
+	note C_, 11
+	note __, 3
 	intensity $24
-	note $a1
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $13
-	octave5
-	note $83
-	note $63
-	note $53
-	note $33
-	note $13
-	note $a1
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $13
-	octave5
-	note $83
-	octave6
-	note $63
-	notetype $08, $24
-	note $51
-	note $61
-	note $51
-	notetype $0c, $24
-	note $33
-	note $13
-	octave5
-	note $a1
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $13
-	octave5
-	note $83
-	note $a1
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $13
-	note $23
-	note $3b
-	note $13
-	octave5
-	note $cb
-	note $51
-	note $61
-	loopchannel $00, $7941 ; end
-; 0xef9bc
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 3
+	octave 5
+	note G_, 3
+	note F_, 3
+	note E_, 3
+	note D_, 3
+	note C_, 3
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 3
+	octave 5
+	note G_, 3
+	octave 6
+	note F_, 3
+	notetype $8, $24
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	notetype $c, $24
+	note D_, 3
+	note C_, 3
+	octave 5
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 3
+	octave 5
+	note G_, 3
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 3
+	note C#, 3
+	note D_, 11
+	note C_, 3
+	octave 5
+	note B_, 11
+	note E_, 1
+	note F_, 1
+	loopchannel 0, Music_LavenderTown_branch_ef941
+; ef9bc
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -1,311 +1,319 @@
-_Music_Lighthouse: ; 0xee569
-	db $c0
-	dw _Music_Lighthouse_Ch1
-	db $01
-	dw _Music_Lighthouse_Ch2
-	db $02
-	dw _Music_Lighthouse_Ch3
-	db $03
-	dw _Music_Lighthouse_Ch4
-; 0xee575
+Music_Lighthouse: ; ee569
+	dbw $c0, Music_Lighthouse_Ch1
+	dbw $01, Music_Lighthouse_Ch2
+	dbw $02, Music_Lighthouse_Ch3
+	dbw $03, Music_Lighthouse_Ch4
+; ee575
 
-_Music_Lighthouse_Ch1: ; 0xee575
-	tempo $9000
+
+Music_Lighthouse_Ch1: ; ee575
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0400
-	vibrato $08, $45
-	stereopanning $0f
-	notetype $0c, $b3
-	octave3
-	note $27
-	octave2
-	note $71
-	note $91
-	note $a1
-	note $c1
-	octave3
-	note $23
-	octave2
-	note $c3
-	note $a3
-	note $c3
-	note $90
-	note $06
-	octave3
-	note $13
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $00
-	note $11
-	note $40
-	note $00
-	note $70
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $27
-	octave2
-	note $21
-	note $71
-	note $91
-	octave3
-	note $11
-	note $31
-	note $21
-	octave2
-	note $a1
-	note $91
-	note $a1
-	note $91
-	note $71
-	note $a1
-	note $90
-	note $06
-	octave3
-	note $1b
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $02
-	octave3
-	note $10
-	note $02
-	octave2
-	note $a3
-	octave3
-	note $a3
-	note $93
-	note $73
-	note $53
-	note $43
-	note $23
-	note $53
-	note $71
-	note $51
-	note $4b
-	octave2
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $97
-	note $a3
-	octave3
-	note $a3
-	note $91
-	note $71
-	note $51
-	note $71
-	note $51
-	note $41
-	note $21
-	octave2
-	note $c1
-	note $a1
-	note $c1
-	octave3
-	note $21
-	note $41
-	note $51
-	note $71
-	note $9b
-	octave2
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $97
-	loopchannel $00, $6584 ; end
-; 0xee5fc
+	dutycycle $3
+	tone $0004
+	vibrato $8, $45
+	stereopanning $f
 
-_Music_Lighthouse_Ch2: ; 0xee5fc
-	dutycycle $03
-	tone $0200
+Music_Lighthouse_branch_ee584: ; ee584
+	notetype $c, $b3
+	octave 3
+	note C#, 7
+	octave 2
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C#, 3
+	octave 2
+	note B_, 3
+	note A_, 3
+	note B_, 3
+	note G#, 0
+	note __, 6
+	octave 3
+	note C_, 3
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note C_, 1
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C#, 7
+	octave 2
+	note C#, 1
+	note F#, 1
+	note G#, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note C#, 1
+	octave 2
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note A_, 1
+	note G#, 0
+	note __, 6
+	octave 3
+	note C_, 11
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 2
+	octave 3
+	note C_, 0
+	note __, 2
+	octave 2
+	note A_, 3
+	octave 3
+	note A_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note D#, 3
+	note C#, 3
+	note E_, 3
+	note F#, 1
+	note E_, 1
+	note D#, 11
+	octave 2
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G#, 7
+	note A_, 3
+	octave 3
+	note A_, 3
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 11
+	octave 2
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G#, 7
+	loopchannel 0, Music_Lighthouse_branch_ee584
+
+Music_Lighthouse_Ch2: ; ee5fc
+	dutycycle $3
+	tone $0002
 	vibrato $10, $45
-	notetype $0c, $c5
-	octave3
-	note $9b
-	note $71
-	note $91
-	note $a7
-	octave4
-	note $27
-	note $10
-	note $06
-	octave3
-	note $9f
+
+Music_Lighthouse_branch_ee604: ; ee604
+	notetype $c, $c5
+	octave 3
+	note G#, 11
+	note F#, 1
+	note G#, 1
+	note A_, 7
+	octave 4
+	note C#, 7
+	note C_, 0
+	note __, 6
+	octave 3
+	note G#, 15
 	intensity $c5
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	note $9b
-	note $71
-	note $91
-	note $a7
-	octave4
-	note $27
-	note $10
-	note $06
-	note $4b
-	octave3
-	note $40
-	note $00
-	note $40
-	note $00
-	note $40
-	note $02
-	note $40
-	note $02
-	octave4
-	note $5b
-	note $41
-	note $21
-	octave3
-	note $9b
-	note $b3
-	note $c1
-	octave4
-	note $21
-	note $4b
-	octave3
-	note $41
-	note $21
-	note $41
-	note $21
-	note $17
-	octave4
-	note $5b
-	note $41
-	note $21
-	octave3
-	note $9b
-	octave4
-	note $13
-	octave3
-	note $c1
-	octave4
-	note $11
-	note $4b
-	octave3
-	note $41
-	note $21
-	note $41
-	note $21
-	note $17
-	loopchannel $00, $6604 ; end
-; 0xee656
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note G#, 11
+	note F#, 1
+	note G#, 1
+	note A_, 7
+	octave 4
+	note C#, 7
+	note C_, 0
+	note __, 6
+	note D#, 11
+	octave 3
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 2
+	note D#, 0
+	note __, 2
+	octave 4
+	note E_, 11
+	note D#, 1
+	note C#, 1
+	octave 3
+	note G#, 11
+	note A#, 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 11
+	octave 3
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 7
+	octave 4
+	note E_, 11
+	note D#, 1
+	note C#, 1
+	octave 3
+	note G#, 11
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D#, 11
+	octave 3
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 7
+	loopchannel 0, Music_Lighthouse_branch_ee604
 
-_Music_Lighthouse_Ch3: ; 0xee656
-	notetype $0c, $19
+Music_Lighthouse_Ch3: ; ee656
+	notetype $c, $19
 	stereopanning $f0
-	octave2
-	note $91
-	note $01
-	note $41
-	note $01
-	note $71
-	note $01
-	note $81
-	note $01
-	note $91
-	note $01
-	note $41
-	note $01
-	note $71
-	note $01
-	note $a1
-	note $01
-	loopchannel $02, $6664
-	note $91
-	note $01
-	note $41
-	note $01
-	note $71
-	note $01
-	note $a1
-	octave3
-	note $11
-	note $21
-	note $01
-	octave2
-	note $91
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $11
-	note $01
-	note $21
-	note $01
-	octave2
-	note $91
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	loopchannel $02, $6683
-	note $21
-	note $01
-	octave2
-	note $91
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $41
-	note $71
-	note $51
-	note $01
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $11
-	note $01
-	note $61
-	note $01
-	loopchannel $08, $669b
-	loopchannel $00, $665b ; end
-; 0xee6ad
 
-_Music_Lighthouse_Ch4: ; 0xee6ad
-	togglenoise $00
-	notetype $0c
-	stereopanning $0f
-	note $93
-	note $61
-	note $93
-	note $61
-	note $a1
-	note $b1
+Music_Lighthouse_branch_ee65b: ; ee65b
+	octave 2
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+
+Music_Lighthouse_branch_ee664: ; ee664
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	loopchannel 2, Music_Lighthouse_branch_ee664
+	note G#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+
+Music_Lighthouse_branch_ee683: ; ee683
+	note C#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	loopchannel 2, Music_Lighthouse_branch_ee683
+	note C#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+
+Music_Lighthouse_branch_ee69b: ; ee69b
+	note E_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	loopchannel 8, Music_Lighthouse_branch_ee69b
+	loopchannel 0, Music_Lighthouse_branch_ee65b
+
+Music_Lighthouse_Ch4: ; ee6ad
+	togglenoise $0
+	notetype $c
+
+Music_Lighthouse_branch_ee6b1: ; ee6b1
+	stereopanning $f
+	note G#, 3
+	note F_, 1
+	note G#, 3
+	note F_, 1
+	note A_, 1
+	note A#, 1
 	stereopanning $ff
-	note $91
-	note $63
-	note $91
-	note $63
-	note $91
-	note $a1
-	loopchannel $00, $66b1 ; end
-; 0xee6c5
+	note G#, 1
+	note F_, 3
+	note G#, 1
+	note F_, 3
+	note G#, 1
+	note A_, 1
+	loopchannel 0, Music_Lighthouse_branch_ee6b1
+; ee6c5
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -1,332 +1,333 @@
-_Music_LookBeauty: ; 0xeee3e
-	db $c0
-	dw _Music_LookBeauty_Ch1
-	db $01
-	dw _Music_LookBeauty_Ch2
-	db $02
-	dw _Music_LookBeauty_Ch3
-	db $03
-	dw _Music_LookBeauty_Ch4
-; 0xeee4a
+Music_LookBeauty: ; eee3e
+	dbw $c0, Music_LookBeauty_Ch1
+	dbw $01, Music_LookBeauty_Ch2
+	dbw $02, Music_LookBeauty_Ch3
+	dbw $03, Music_LookBeauty_Ch4
+; eee4a
 
-_Music_LookBeauty_Ch1: ; 0xeee4a
-	stereopanning $0f
+
+Music_LookBeauty_Ch1: ; eee4a
+	stereopanning $f
 	vibrato $12, $25
-	dutycycle $02
-	tempo $8000
+	dutycycle $2
+	tempo 128
 	volume $77
-	notetype $0c, $a3
-	note $0f
-	note $07
-	octave4
-	note $17
-	dutycycle $03
-	note $03
-	octave3
-	note $30
-	note $04
-	note $30
-	note $04
-	note $01
-	note $30
-	note $02
-	note $30
-	note $04
-	note $33
-	note $03
-	note $30
-	note $04
-	note $30
-	note $04
-	note $01
-	note $30
-	note $02
-	note $30
-	note $02
-	note $31
-	note $01
-	note $31
-	note $03
-	note $50
-	note $04
-	note $50
-	note $04
-	note $01
-	note $50
-	note $02
-	note $50
-	note $00
-	note $50
-	note $02
-	note $53
-	note $03
-	note $70
-	note $04
-	note $70
-	note $02
-	note $31
-	note $30
-	note $06
-	octave2
-	note $a0
-	octave3
-	note $10
-	note $40
-	note $70
-	note $40
-	note $70
-	note $a0
-	octave4
-	note $10
-	loopchannel $00, $6e5f ; end
-; 0xeee9c
+	notetype $c, $a3
+	note __, 15
+	note __, 7
+	octave 4
+	note C_, 7
+	dutycycle $3
 
-_Music_LookBeauty_Ch2: ; 0xeee9c
+Music_LookBeauty_branch_eee5f: ; eee5f
+	note __, 3
+	octave 3
+	note D_, 0
+	note __, 4
+	note D_, 0
+	note __, 4
+	note __, 1
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 4
+	note D_, 3
+	note __, 3
+	note D_, 0
+	note __, 4
+	note D_, 0
+	note __, 4
+	note __, 1
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 2
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 3
+	note E_, 0
+	note __, 4
+	note E_, 0
+	note __, 4
+	note __, 1
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 3
+	note __, 3
+	note F#, 0
+	note __, 4
+	note F#, 0
+	note __, 2
+	note D_, 1
+	note D_, 0
+	note __, 6
+	octave 2
+	note A_, 0
+	octave 3
+	note C_, 0
+	note D#, 0
+	note F#, 0
+	note D#, 0
+	note F#, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	loopchannel 0, Music_LookBeauty_branch_eee5f
+
+Music_LookBeauty_Ch2: ; eee9c
 	stereopanning $f0
 	vibrato $10, $23
-	dutycycle $02
-	notetype $0c, $c7
-	octave3
-	note $30
-	note $00
-	octave5
-	note $35
-	note $10
-	note $00
-	octave4
-	note $c0
-	note $00
-	note $b0
-	note $00
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	note $60
-	note $00
-	note $51
-	note $30
-	note $00
-	note $50
-	note $00
-	note $70
-	note $00
-	dutycycle $03
-	notetype $0c, $c7
-	note $8f
-	note $a7
-	note $c7
-	note $a9
-	note $90
-	note $00
-	note $a0
-	note $00
-	note $91
-	note $97
-	note $01
-	note $61
-	note $01
-	note $51
+	dutycycle $2
+	notetype $c, $c7
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 5
+	note D_, 5
+	note C_, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note E_, 1
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	dutycycle $3
+
+Music_LookBeauty_branch_eeec5: ; eeec5
+	notetype $c, $c7
+	note G_, 15
+	note A_, 7
+	note B_, 7
+	note A_, 9
+	note G#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 1
+	note G#, 7
+	note __, 1
+	note F_, 1
+	note __, 1
+	note E_, 1
 	intensity $b7
 	vibrato $10, $24
-	octave5
-	note $1e
-	notetype $06, $c7
+	octave 5
+	note C_, 14
+	notetype $6, $c7
 	intensity $c5
 	vibrato $10, $23
-	note $00
-	note $20
-	note $3f
-	note $1f
-	octave4
-	note $cf
-	note $03
-	octave5
-	note $31
-	note $01
-	octave4
-	note $c1
-	note $01
-	note $a5
-	note $0d
-	note $77
-	note $a7
-	loopchannel $00, $6ec5 ; end
-; 0xeeefa
+	note __, 0
+	note C#, 0
+	note D_, 15
+	note C_, 15
+	octave 4
+	note B_, 15
+	note __, 3
+	octave 5
+	note D_, 1
+	note __, 1
+	octave 4
+	note B_, 1
+	note __, 1
+	note A_, 5
+	note __, 13
+	note F#, 7
+	note A_, 7
+	loopchannel 0, Music_LookBeauty_branch_eeec5
 
-_Music_LookBeauty_Ch3: ; 0xeeefa
+Music_LookBeauty_Ch3: ; eeefa
 	stereopanning $ff
-	vibrato $08, $12
-	notetype $0c, $15
-	note $0f
-	octave5
-	note $50
-	note $00
-	note $40
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	octave3
-	note $36
-	note $70
-	note $83
-	octave4
-	note $c0
-	note $00
-	octave3
-	note $80
-	note $00
-	note $30
-	note $00
-	octave4
-	note $c0
-	note $00
-	octave3
-	note $30
-	note $00
-	note $81
-	note $80
-	octave4
-	note $b0
-	note $c0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave4
-	note $c0
-	note $00
-	octave3
-	note $30
-	note $02
-	octave4
-	note $c3
-	octave3
-	note $53
-	octave4
-	note $c0
-	note $00
-	octave3
-	note $50
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave4
-	note $a0
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $51
-	note $50
-	octave4
-	note $80
-	note $90
-	note $00
-	octave3
-	note $50
-	note $00
-	octave4
-	note $70
-	note $02
-	note $91
-	note $01
-	note $c1
-	octave3
-	note $a3
-	octave5
-	note $10
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $50
-	note $00
-	octave5
-	note $10
-	note $00
-	octave3
-	note $50
-	note $00
-	note $a1
-	note $a0
-	octave4
-	note $c0
-	octave5
-	note $10
-	note $00
-	octave3
-	note $a0
-	note $00
-	octave5
-	note $10
-	note $00
-	note $30
-	note $02
-	note $13
-	octave3
-	note $33
-	octave4
-	note $c0
-	note $00
-	octave3
-	note $30
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave4
-	note $a0
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave4
-	note $a1
-	note $a0
-	note $06
-	octave3
-	note $37
-	loopchannel $00, $6f0f ; end
-; 0xeef8b
+	vibrato $8, $12
+	notetype $c, $15
+	note __, 15
+	octave 5
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 3
+	note D_, 6
+	note F#, 0
 
-_Music_LookBeauty_Ch4: ; 0xeef8b
-	togglenoise $03
-	notetype $0c
-	note $0f
-	note $0f
-	callchannel _Music_LookBeauty_sub_0xeefa1
-	callchannel _Music_LookBeauty_sub_0xeefa1
-	callchannel _Music_LookBeauty_sub_0xeefa1
-	callchannel _Music_LookBeauty_sub_0xeefa1
-	loopchannel $00, $6f91 ; end
-; 0xeefa1
+Music_LookBeauty_branch_eef0f: ; eef0f
+	note G_, 3
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note G_, 1
+	note G_, 0
+	octave 4
+	note A#, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 2
+	octave 4
+	note B_, 3
+	octave 3
+	note E_, 3
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 4
+	note A_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	note E_, 0
+	octave 4
+	note G_, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 2
+	note G#, 1
+	note __, 1
+	note B_, 1
+	octave 3
+	note A_, 3
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 3
+	note E_, 0
+	note __, 0
+	note A_, 1
+	note A_, 0
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note D_, 0
+	note __, 2
+	note C_, 3
+	octave 3
+	note D_, 3
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 4
+	note A_, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 4
+	note A_, 1
+	note A_, 0
+	note __, 6
+	octave 3
+	note D_, 7
+	loopchannel 0, Music_LookBeauty_branch_eef0f
 
-_Music_LookBeauty_sub_0xeefa1: ; 0xeefa1
-; subroutine
-	note $71
-	note $81
-	note $31
-	note $81
-	note $81
-	note $31
-	note $81
-	note $81
-	note $71
-	note $31
-	note $81
-	note $31
-	note $81
-	note $81
-	note $31
-	note $81
-	endchannel ; end
-; 0xeefb2
+Music_LookBeauty_Ch4: ; eef8b
+	togglenoise $3
+	notetype $c
+	note __, 15
+	note __, 15
+
+Music_LookBeauty_branch_eef91: ; eef91
+	callchannel Music_LookBeauty_branch_eefa1
+	callchannel Music_LookBeauty_branch_eefa1
+	callchannel Music_LookBeauty_branch_eefa1
+	callchannel Music_LookBeauty_branch_eefa1
+	loopchannel 0, Music_LookBeauty_branch_eef91
+; eefa1
+
+Music_LookBeauty_branch_eefa1: ; eefa1
+	note F#, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note F#, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	endchannel
+; eefb2
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -1,121 +1,122 @@
-_Music_LookHiker: ; 0xf7411
-	db $c0
-	dw _Music_LookHiker_Ch1
-	db $01
-	dw _Music_LookHiker_Ch2
-	db $02
-	dw _Music_LookHiker_Ch3
-	db $03
-	dw _Music_LookHiker_Ch4
-; 0xf741d
+Music_LookHiker: ; f7411
+	dbw $c0, Music_LookHiker_Ch1
+	dbw $01, Music_LookHiker_Ch2
+	dbw $02, Music_LookHiker_Ch3
+	dbw $03, Music_LookHiker_Ch4
+; f741d
 
-_Music_LookHiker_Ch1: ; 0xf741d
-	tempo $8400
+
+Music_LookHiker_Ch1: ; f741d
+	tempo 132
 	volume $77
-	tone $0100
+	tone $0001
 	vibrato $12, $24
-	dutycycle $02
-	stereopanning $0f
-	notetype $0c, $68
-	octave3
-	note $71
-	note $61
-	note $77
-	note $31
-	note $41
-	note $51
-	note $61
-	note $71
-	note $03
-	note $71
-	note $03
-	note $71
-	note $01
-	note $71
-	note $05
-	loopchannel $00, $7433 ; end
-; 0xf7443
+	dutycycle $2
+	stereopanning $f
+	notetype $c, $68
+	octave 3
+	note F#, 1
+	note F_, 1
+	note F#, 7
 
-_Music_LookHiker_Ch2: ; 0xf7443
-	dutycycle $00
-	notetype $0c, $a1
-	note $03
-	octave1
-	note $c0
-	note $c4
-	octave2
-	note $70
-	note $74
-	octave1
-	note $c0
-	octave2
-	note $30
-	note $70
-	note $30
+Music_LookHiker_branch_f7433: ; f7433
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 5
+	loopchannel 0, Music_LookHiker_branch_f7433
+
+Music_LookHiker_Ch2: ; f7443
+	dutycycle $0
+	notetype $c, $a1
+	note __, 3
+	octave 1
+	note B_, 0
+	note B_, 4
+	octave 2
+	note F#, 0
+	note F#, 4
+	octave 1
+	note B_, 0
+	octave 2
+	note D_, 0
+	note F#, 0
+	note D_, 0
 	intensity $a1
-	octave1
-	note $c0
-	note $c1
-	octave2
-	note $30
-	note $31
-	note $70
-	note $71
-	note $b0
-	note $b1
-	octave1
-	note $c0
-	octave2
-	note $30
-	note $70
-	note $30
-	loopchannel $00, $7457 ; end
-; 0xf746b
 
-_Music_LookHiker_Ch3: ; 0xf746b
+Music_LookHiker_branch_f7457: ; f7457
+	octave 1
+	note B_, 0
+	note B_, 1
+	octave 2
+	note D_, 0
+	note D_, 1
+	note F#, 0
+	note F#, 1
+	note A#, 0
+	note A#, 1
+	octave 1
+	note B_, 0
+	octave 2
+	note D_, 0
+	note F#, 0
+	note D_, 0
+	loopchannel 0, Music_LookHiker_branch_f7457
+
+Music_LookHiker_Ch3: ; f746b
 	vibrato $12, $24
 	stereopanning $f0
-	notetype $0c, $14
-	octave4
-	note $c1
-	note $b1
-	note $c7
-	octave5
-	note $41
-	note $31
-	note $21
-	note $11
-	callchannel _Music_LookHiker_sub_0xf748a
-	note $81
-	note $91
-	note $a1
-	note $b1
-	callchannel _Music_LookHiker_sub_0xf748a
-	loopchannel $00, $7477 ; end
-; 0xf748a
+	notetype $c, $14
+	octave 4
+	note B_, 1
+	note A#, 1
+	note B_, 7
 
-_Music_LookHiker_sub_0xf748a: ; 0xf748a
-; subroutine
-	octave4
-	note $c1
-	note $03
-	note $c1
-	note $03
-	note $c1
-	note $01
-	note $c1
-	note $05
-	endchannel ; end
-; 0xf7494
+Music_LookHiker_branch_f7477: ; f7477
+	octave 5
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	callchannel Music_LookHiker_branch_f748a
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	callchannel Music_LookHiker_branch_f748a
+	loopchannel 0, Music_LookHiker_branch_f7477
+; f748a
 
-_Music_LookHiker_Ch4: ; 0xf7494
-	togglenoise $03
-	notetype $0c
-	note $63
-	note $0f
-	note $41
-	note $81
-	note $31
-	note $81
-	loopchannel $00, $749a ; end
-; 0xf74a2
+Music_LookHiker_branch_f748a: ; f748a
+	octave 4
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 5
+	endchannel
+
+Music_LookHiker_Ch4: ; f7494
+	togglenoise $3
+	notetype $c
+	note F_, 3
+	note __, 15
+
+Music_LookHiker_branch_f749a: ; f749a
+	note D#, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	loopchannel 0, Music_LookHiker_branch_f749a
+; f74a2
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -1,279 +1,275 @@
-_Music_LookKimonoGirl: ; 0xf79b8
-	db $80
-	dw _Music_LookKimonoGirl_Ch1
-	db $01
-	dw _Music_LookKimonoGirl_Ch2
-	db $02
-	dw _Music_LookKimonoGirl_Ch3
-; 0xf79c1
+Music_LookKimonoGirl: ; f79b8
+	dbw $80, Music_LookKimonoGirl_Ch1
+	dbw $01, Music_LookKimonoGirl_Ch2
+	dbw $02, Music_LookKimonoGirl_Ch3
+; f79c1
 
-; 0xf79c1
-	db $03
-; 0xf79c2
+INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1
 
-_Music_LookKimonoGirl_Ch1: ; 0xf79c2
-	tempo $a000
+Music_LookKimonoGirl_Ch1: ; f79c2
+	tempo 160
 	volume $77
-	stereopanning $0f
-	dutycycle $01
-	notetype $06, $87
-	tone $0100
-	callchannel _Music_LookKimonoGirl_sub_0xf7aa8
+	stereopanning $f
+	dutycycle $1
+	notetype $6, $87
+	tone $0001
+	callchannel Music_LookKimonoGirl_branch_f7aa8
 	tone $0000
-	notetype $0c, $b2
-	callchannel _Music_LookKimonoGirl_sub_0xf7a13
-	callchannel _Music_LookKimonoGirl_sub_0xf7a13
-	callchannel _Music_LookKimonoGirl_sub_0xf7a34
-	callchannel _Music_LookKimonoGirl_sub_0xf7a34
-	callchannel _Music_LookKimonoGirl_sub_0xf7a13
-	callchannel _Music_LookKimonoGirl_sub_0xf7a13
-	callchannel _Music_LookKimonoGirl_sub_0xf7a34
+
+Music_LookKimonoGirl_branch_f79d7: ; f79d7
+	notetype $c, $b2
+	callchannel Music_LookKimonoGirl_branch_f7a13
+	callchannel Music_LookKimonoGirl_branch_f7a13
+	callchannel Music_LookKimonoGirl_branch_f7a34
+	callchannel Music_LookKimonoGirl_branch_f7a34
+	callchannel Music_LookKimonoGirl_branch_f7a13
+	callchannel Music_LookKimonoGirl_branch_f7a13
+	callchannel Music_LookKimonoGirl_branch_f7a34
 	intensity $b4
-	octave3
-	note $50
+	octave 3
+	note E_, 0
 	intensity $54
-	octave4
-	note $50
+	octave 4
+	note E_, 0
 	intensity $b4
-	octave3
-	note $30
+	octave 3
+	note D_, 0
 	intensity $54
-	octave4
-	note $30
+	octave 4
+	note D_, 0
 	intensity $b4
-	octave2
-	note $c0
+	octave 2
+	note B_, 0
 	intensity $54
-	octave3
-	note $c0
+	octave 3
+	note B_, 0
 	intensity $b4
-	octave2
-	note $a0
+	octave 2
+	note A_, 0
 	intensity $54
-	octave3
-	note $a0
-	loopchannel $00, $79d7 ; end
-; 0xf7a13
+	octave 3
+	note A_, 0
+	loopchannel 0, Music_LookKimonoGirl_branch_f79d7
+; f7a13
 
-_Music_LookKimonoGirl_sub_0xf7a13: ; 0xf7a13
-; subroutine
+Music_LookKimonoGirl_branch_f7a13: ; f7a13
 	intensity $b4
-	octave2
-	note $60
+	octave 2
+	note F_, 0
 	intensity $74
-	octave3
-	note $60
+	octave 3
+	note F_, 0
 	intensity $b4
-	octave2
-	note $a0
+	octave 2
+	note A_, 0
 	intensity $74
-	octave3
-	note $a0
+	octave 3
+	note A_, 0
 	intensity $b4
-	octave2
-	note $c0
+	octave 2
+	note B_, 0
 	intensity $74
-	octave3
-	note $c0
+	octave 3
+	note B_, 0
 	intensity $b4
-	octave3
-	note $30
+	octave 3
+	note D_, 0
 	intensity $74
-	octave4
-	note $30
-	endchannel ; end
-; 0xf7a34
+	octave 4
+	note D_, 0
+	endchannel
+; f7a34
 
-_Music_LookKimonoGirl_sub_0xf7a34: ; 0xf7a34
-; subroutine
+Music_LookKimonoGirl_branch_f7a34: ; f7a34
 	intensity $b4
-	octave2
-	note $50
+	octave 2
+	note E_, 0
 	intensity $74
-	octave3
-	note $50
+	octave 3
+	note E_, 0
 	intensity $b4
-	octave2
-	note $a0
+	octave 2
+	note A_, 0
 	intensity $74
-	octave3
-	note $a0
+	octave 3
+	note A_, 0
 	intensity $b4
-	octave2
-	note $c0
+	octave 2
+	note B_, 0
 	intensity $74
-	octave3
-	note $c0
+	octave 3
+	note B_, 0
 	intensity $b4
-	octave3
-	note $30
+	octave 3
+	note D_, 0
 	intensity $74
-	octave4
-	note $30
-	endchannel ; end
-; 0xf7a55
+	octave 4
+	note D_, 0
+	endchannel
+; f7a55
 
-_Music_LookKimonoGirl_Ch2: ; 0xf7a55
-	dutycycle $00
-	notetype $06, $a7
+Music_LookKimonoGirl_Ch2: ; f7a55
+	dutycycle $0
+	notetype $6, $a7
 	stereopanning $f0
-	callchannel _Music_LookKimonoGirl_sub_0xf7aa8
-	dutycycle $03
-	notetype $0c, $91
-	octave5
-	note $50
-	note $30
-	octave4
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $50
-	note $30
-	note $50
-	note $30
-	octave3
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $50
-	note $30
-	callchannel _Music_LookKimonoGirl_sub_0xf7a94
-	octave5
-	note $60
-	note $30
-	octave4
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $60
-	note $30
-	note $60
-	note $30
-	octave3
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $50
-	note $30
-	callchannel _Music_LookKimonoGirl_sub_0xf7a94
-	loopchannel $00, $7a5f ; end
-; 0xf7a94
+	callchannel Music_LookKimonoGirl_branch_f7aa8
 
-_Music_LookKimonoGirl_sub_0xf7a94: ; 0xf7a94
-; subroutine
-	octave5
-	note $c0
-	note $a0
-	note $50
-	note $30
-	note $50
-	note $30
-	octave4
-	note $c0
-	note $a0
-	note $c0
-	note $a0
-	note $50
-	note $30
-	note $50
-	note $30
-	octave3
-	note $c0
-	note $50
-	endchannel ; end
-; 0xf7aa8
+Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
+	dutycycle $3
+	notetype $c, $91
+	octave 5
+	note E_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note D_, 0
+	callchannel Music_LookKimonoGirl_branch_f7a94
+	octave 5
+	note F_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note F_, 0
+	note D_, 0
+	note F_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note D_, 0
+	callchannel Music_LookKimonoGirl_branch_f7a94
+	loopchannel 0, Music_LookKimonoGirl_branch_f7a5f
+; f7a94
 
-_Music_LookKimonoGirl_sub_0xf7aa8: ; 0xf7aa8
-; subroutine
-	octave4
-	note $50
-	octave5
-	note $5f
-	note $00
-	note $51
-	note $02
+Music_LookKimonoGirl_branch_f7a94: ; f7a94
+	octave 5
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note E_, 0
+	endchannel
+; f7aa8
+
+Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
+	octave 4
+	note E_, 0
+	octave 5
+	note E_, 15
+	note __, 0
+	note E_, 1
+	note __, 2
 	intensity $b7
-	note $51
-	note $01
+	note E_, 1
+	note __, 1
 	intensity $b7
-	note $51
-	note $00
+	note E_, 1
+	note __, 0
 	intensity $a7
-	note $51
-	note $00
-	notetype $06, $65
-	note $51
-	note $00
+	note E_, 1
+	note __, 0
+	notetype $6, $65
+	note E_, 1
+	note __, 0
 	intensity $54
-	note $51
-	note $00
+	note E_, 1
+	note __, 0
 	intensity $63
-	note $51
-	note $51
+	note E_, 1
+	note E_, 1
 	intensity $91
-	note $51
+	note E_, 1
 	intensity $a1
-	note $50
-	notetype $08, $b1
-	note $50
-	note $50
-	endchannel ; end
-; 0xf7ad4
+	note E_, 0
+	notetype $8, $b1
+	note E_, 0
+	note E_, 0
+	endchannel
 
-_Music_LookKimonoGirl_Ch3: ; 0xf7ad4
+Music_LookKimonoGirl_Ch3: ; f7ad4
 	stereopanning $ff
 	vibrato $12, $24
-	notetype $06, $13
-	note $00
-	note $0f
-	octave5
-	note $50
-	note $60
-	note $51
-	notetype $0c, $13
-	note $5b
-	notetype $06, $13
-	octave5
-	note $31
-	note $51
-	octave5
-	note $33
-	note $53
-	note $63
-	note $a3
-	note $c3
-	note $a3
-	note $c3
-	octave6
-	note $33
-	note $57
-	note $60
-	note $70
-	note $61
-	note $33
-	note $57
-	note $33
-	note $53
-	note $67
-	note $a7
-	note $c0
-	octave7
-	note $10
-	octave6
-	note $c1
-	note $a3
-	note $63
-	note $33
-	note $50
-	note $60
-	note $59
-	note $61
-	note $51
-	note $37
-	note $57
-	loopchannel $00, $7aec ; end
-; 0xf7b13
+	notetype $6, $13
+	note __, 0
+	note __, 15
+	octave 5
+	note E_, 0
+	note F_, 0
+	note E_, 1
+	notetype $c, $13
+	note E_, 11
+	notetype $6, $13
+	octave 5
+	note D_, 1
+	note E_, 1
+
+Music_LookKimonoGirl_branch_f7aec: ; f7aec
+	octave 5
+	note D_, 3
+	note E_, 3
+	note F_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note B_, 3
+	octave 6
+	note D_, 3
+	note E_, 7
+	note F_, 0
+	note F#, 0
+	note F_, 1
+	note D_, 3
+	note E_, 7
+	note D_, 3
+	note E_, 3
+	note F_, 7
+	note A_, 7
+	note B_, 0
+	octave 7
+	note C_, 0
+	octave 6
+	note B_, 1
+	note A_, 3
+	note F_, 3
+	note D_, 3
+	note E_, 0
+	note F_, 0
+	note E_, 9
+	note F_, 1
+	note E_, 1
+	note D_, 7
+	note E_, 7
+	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
+; f7b13
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -1,119 +1,121 @@
-_Music_LookLass: ; 0xed79b
-	db $c0
-	dw _Music_LookLass_Ch1
-	db $01
-	dw _Music_LookLass_Ch2
-	db $02
-	dw _Music_LookLass_Ch3
-	db $03
-	dw _Music_LookLass_Ch4
-; 0xed7a7
+Music_LookLass: ; ed79b
+	dbw $c0, Music_LookLass_Ch1
+	dbw $01, Music_LookLass_Ch2
+	dbw $02, Music_LookLass_Ch3
+	dbw $03, Music_LookLass_Ch4
+; ed7a7
 
-_Music_LookLass_Ch1: ; 0xed7a7
-	tempo $8400
+
+Music_LookLass_Ch1: ; ed7a7
+	tempo 132
 	volume $77
-	tone $0100
-	dutycycle $02
-	notetype $0c, $c7
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $cd
-	stereopanning $0f
-	dutycycle $00
+	tone $0001
+	dutycycle $2
+	notetype $c, $c7
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note B_, 13
+	stereopanning $f
+	dutycycle $0
+
+Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a2
-	octave3
-	note $53
+	octave 3
+	note E_, 3
 	intensity $a1
-	note $53
-	note $53
-	note $51
+	note E_, 3
+	note E_, 3
+	note E_, 1
 	intensity $a3
-	note $c1
-	loopchannel $00, $57bd ; end
-; 0xed7cd
+	note B_, 1
+	loopchannel 0, Music_LookLass_branch_ed7bd
 
-_Music_LookLass_Ch2: ; 0xed7cd
+Music_LookLass_Ch2: ; ed7cd
 	stereopanning $f0
-	dutycycle $00
-	notetype $0c, $83
-	note $0f
+	dutycycle $0
+	notetype $c, $83
+	note __, 15
+
+Music_LookLass_branch_ed7d5: ; ed7d5
 	intensity $92
-	octave2
-	note $c3
+	octave 2
+	note B_, 3
 	intensity $91
-	note $c3
-	note $c3
-	note $c1
+	note B_, 3
+	note B_, 3
+	note B_, 1
 	intensity $93
-	octave3
-	note $91
-	loopchannel $00, $57d5 ; end
-; 0xed7e6
+	octave 3
+	note G#, 1
+	loopchannel 0, Music_LookLass_branch_ed7d5
 
-_Music_LookLass_Ch3: ; 0xed7e6
-	notetype $0c, $10
-	note $07
-	octave6
-	note $51
-	note $41
-	note $21
-	note $11
-	octave5
-	note $c1
-	note $01
-	octave6
-	note $41
-	note $01
-	note $51
-	note $01
-	note $41
-	note $01
-	note $21
-	note $11
-	octave5
-	note $c1
-	note $a1
-	note $91
-	note $a1
-	note $b1
-	octave6
-	note $21
-	octave5
-	note $c1
-	note $01
-	octave6
-	note $21
-	note $01
-	octave5
-	note $c1
-	note $01
-	note $a1
-	note $01
-	note $91
-	note $71
-	note $51
-	note $41
-	note $51
-	note $71
-	note $91
-	note $a1
-	loopchannel $00, $57ef ; end
-; 0xed81a
+Music_LookLass_Ch3: ; ed7e6
+	notetype $c, $10
+	note __, 7
+	octave 6
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note C_, 1
 
-_Music_LookLass_Ch4: ; 0xed81a
-	togglenoise $04
-	notetype $0c
-	note $1f
-	notetype $06
-	note $37
-	note $27
-	note $27
-	note $23
-	note $30
-	note $20
-	note $20
-	note $20
-	loopchannel $00, $581f ; end
-; 0xed82d
+Music_LookLass_branch_ed7ef: ; ed7ef
+	octave 5
+	note B_, 1
+	note __, 1
+	octave 6
+	note D#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C#, 1
+	note C_, 1
+	octave 5
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	octave 6
+	note C#, 1
+	octave 5
+	note B_, 1
+	note __, 1
+	octave 6
+	note C#, 1
+	note __, 1
+	octave 5
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	loopchannel 0, Music_LookLass_branch_ed7ef
+
+Music_LookLass_Ch4: ; ed81a
+	togglenoise $4
+	notetype $c
+	note C_, 15
+
+Music_LookLass_branch_ed81f: ; ed81f
+	notetype $6
+	note D_, 7
+	note C#, 7
+	note C#, 7
+	note C#, 3
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	loopchannel 0, Music_LookLass_branch_ed81f
+; ed82d
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -1,621 +1,625 @@
-_Music_LookMysticalMan: ; 0x17843b
-	db $c0
-	dw _Music_LookMysticalMan_Ch1
-	db $01
-	dw _Music_LookMysticalMan_Ch2
-	db $02
-	dw _Music_LookMysticalMan_Ch3
-	db $03
-	dw _Music_LookMysticalMan_Ch4
-; 0x178447
+Music_LookMysticalMan: ; 17843b
+	dbw $c0, Music_LookMysticalMan_Ch1
+	dbw $01, Music_LookMysticalMan_Ch2
+	dbw $02, Music_LookMysticalMan_Ch3
+	dbw $03, Music_LookMysticalMan_Ch4
+; 178447
 
-_Music_LookMysticalMan_Ch1: ; 0x178447
-	tempo $8800
+
+Music_LookMysticalMan_Ch1: ; 178447
+	tempo 136
 	volume $77
-	vibrato $0a, $34
-	tone $0100
-	stereopanning $0f
-	notetype $0c, $b3
-	note $07
-	dutycycle $03
-	notetype $06, $96
-	octave3
-	note $70
-	note $00
-	note $70
-	note $00
-	note $51
-	note $71
-	note $03
-	note $71
-	note $08
-	note $08
-	note $50
-	note $00
-	note $50
-	note $00
-	note $31
-	note $51
-	note $03
-	note $51
-	note $08
-	note $08
-	note $50
-	note $00
-	note $50
-	note $00
-	note $21
-	note $51
-	note $03
-	note $51
-	note $08
-	note $08
-	note $50
-	note $00
-	note $50
-	note $00
-	note $21
-	note $51
-	note $02
-	note $60
-	note $73
-	note $03
-	note $53
-	note $03
-	note $23
-	dutycycle $02
-	callchannel _Music_LookMysticalMan_sub_0x1784f9
-	octave4
-	note $21
-	note $01
-	octave3
-	note $c1
-	note $01
-	note $b1
-	octave4
-	note $25
-	note $03
-	octave3
-	note $73
-	note $03
-	note $53
-	callchannel _Music_LookMysticalMan_sub_0x1784f9
-	octave4
-	note $21
-	note $01
-	note $21
-	note $01
-	octave3
-	note $b1
-	note $c5
-	note $b3
-	note $73
+	vibrato $a, $34
+	tone $0001
+	stereopanning $f
+	notetype $c, $b3
+	note __, 7
+
+Music_LookMysticalMan_branch_178458: ; 178458
+	dutycycle $3
+	notetype $6, $96
+	octave 3
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note E_, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 8
+	note __, 8
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D_, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 8
+	note __, 8
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note C#, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 8
+	note __, 8
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note C#, 1
+	note E_, 1
+	note __, 2
+	note F_, 0
+	note F#, 3
+	note __, 3
+	note E_, 3
+	note __, 3
+	note C#, 3
+	dutycycle $2
+	callchannel Music_LookMysticalMan_branch_1784f9
+	octave 4
+	note C#, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note __, 1
+	note A#, 1
+	octave 4
+	note C#, 5
+	note __, 3
+	octave 3
+	note F#, 3
+	note __, 3
+	note E_, 3
+	callchannel Music_LookMysticalMan_branch_1784f9
+	octave 4
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 3
+	note A#, 1
+	note B_, 5
+	note A#, 3
+	note F#, 3
 	intensity $a5
-	dutycycle $00
-	octave4
-	note $71
-	note $b5
-	dutycycle $02
+	dutycycle $0
+	octave 4
+	note F#, 1
+	note A#, 5
+	dutycycle $2
 	intensity $72
-	octave5
-	note $31
-	octave4
-	note $c1
-	note $71
-	note $31
-	loopchannel $04, $44b4
-	octave5
-	note $31
-	octave4
-	note $c1
-	note $71
-	note $31
-	octave3
-	note $a1
-	note $71
-	note $31
-	octave2
-	note $a1
-	note $c1
-	octave3
-	note $31
-	note $71
-	note $a1
-	note $c1
-	octave4
-	note $31
-	note $71
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $91
-	note $51
-	octave3
-	note $c1
-	loopchannel $04, $44d4
-	octave5
-	note $21
-	octave4
-	note $b1
-	note $71
-	note $21
-	octave3
-	note $b1
-	note $71
-	note $21
-	octave2
-	note $b1
-	octave3
-	note $21
-	note $51
-	note $71
-	note $b1
-	octave4
-	note $21
-	note $51
-	note $71
-	note $b1
-	loopchannel $00, $4458 ; end
-; 0x1784f9
 
-_Music_LookMysticalMan_sub_0x1784f9: ; 0x1784f9
-; subroutine
-	note $3f
-	octave4
-	note $31
-	note $01
-	note $51
-	note $01
-	note $71
-	note $35
-	octave3
-	note $5f
-	note $c1
-	note $01
-	octave4
-	note $21
-	note $01
-	note $31
-	octave3
-	note $c5
-	octave4
-	note $51
-	note $01
-	note $51
-	note $01
-	note $31
-	note $25
-	note $21
-	note $01
-	note $21
-	note $01
-	octave3
-	note $c1
-	note $a5
-	endchannel ; end
-; 0x17851a
+Music_LookMysticalMan_branch_1784b4: ; 1784b4
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	note F#, 1
+	note D_, 1
+	loopchannel 4, Music_LookMysticalMan_branch_1784b4
+	octave 5
+	note D_, 1
+	octave 4
+	note B_, 1
+	note F#, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	note B_, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	note B_, 1
 
-_Music_LookMysticalMan_Ch2: ; 0x17851a
-	dutycycle $03
-	vibrato $0a, $34
-	notetype $0c, $b3
-	note $07
+Music_LookMysticalMan_branch_1784d4: ; 1784d4
+	octave 5
+	note D_, 1
+	octave 4
+	note G#, 1
+	note E_, 1
+	octave 3
+	note B_, 1
+	loopchannel 4, Music_LookMysticalMan_branch_1784d4
+	octave 5
+	note C#, 1
+	octave 4
+	note A#, 1
+	note F#, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	note F#, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note A#, 1
+	octave 4
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note A#, 1
+	loopchannel 0, Music_LookMysticalMan_branch_178458
+; 1784f9
+
+Music_LookMysticalMan_branch_1784f9: ; 1784f9
+	note D_, 15
+	octave 4
+	note D_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note D_, 5
+	octave 3
+	note E_, 15
+	note B_, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	note __, 1
+	note D_, 1
+	octave 3
+	note B_, 5
+	octave 4
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note C#, 5
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note A_, 5
+	endchannel
+
+Music_LookMysticalMan_Ch2: ; 17851a
+	dutycycle $3
+	vibrato $a, $34
+	notetype $c, $b3
+	note __, 7
+
+Music_LookMysticalMan_branch_178523: ; 178523
 	stereopanning $f0
-	notetype $06, $b8
-	octave3
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $a1
-	note $c1
-	note $03
-	note $c1
-	note $05
+	notetype $6, $b8
+	octave 3
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 1
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 5
 	stereopanning $ff
-	note $c7
-	note $a3
+	note B_, 7
+	note A_, 3
 	stereopanning $f0
-	note $90
-	note $00
-	note $90
-	note $00
-	note $71
-	note $91
-	note $03
-	note $91
-	note $05
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 1
+	note G#, 1
+	note __, 3
+	note G#, 1
+	note __, 5
 	stereopanning $ff
-	note $77
-	note $93
+	note F#, 7
+	note G#, 3
 	stereopanning $f0
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $81
-	note $a1
-	note $03
-	note $a1
-	note $05
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G_, 1
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 5
 	stereopanning $ff
-	note $a7
-	note $83
+	note A_, 7
+	note G_, 3
 	stereopanning $f0
-	note $70
-	note $00
-	note $70
-	note $00
-	note $51
-	note $71
-	note $02
-	note $a0
-	note $b3
-	note $03
-	note $73
-	note $03
-	note $53
-	callchannel _Music_LookMysticalMan_sub_0x17859a
-	note $71
-	note $01
-	note $51
-	note $01
-	note $31
-	note $55
-	callchannel _Music_LookMysticalMan_sub_0x1785c8
-	callchannel _Music_LookMysticalMan_sub_0x17859a
-	note $71
-	note $01
-	note $71
-	note $01
-	note $51
-	note $35
-	callchannel _Music_LookMysticalMan_sub_0x1785c8
-	notetype $0c, $b7
-	note $c1
-	note $01
-	note $c1
-	note $01
-	octave4
-	note $31
-	note $00
-	note $21
-	note $00
-	octave3
-	note $cf
-	note $01
-	note $c1
-	note $01
-	octave4
-	note $31
-	note $01
-	note $21
-	note $00
-	octave3
-	note $c1
-	note $00
-	note $bf
-	note $01
-	loopchannel $00, $4523 ; end
-; 0x17859a
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note E_, 1
+	note F#, 1
+	note __, 2
+	note A_, 0
+	note A#, 3
+	note __, 3
+	note F#, 3
+	note __, 3
+	note E_, 3
+	callchannel Music_LookMysticalMan_branch_17859a
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note E_, 5
+	callchannel Music_LookMysticalMan_branch_1785c8
+	callchannel Music_LookMysticalMan_branch_17859a
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note D_, 5
+	callchannel Music_LookMysticalMan_branch_1785c8
+	notetype $c, $b7
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 0
+	note C#, 1
+	note __, 0
+	octave 3
+	note B_, 15
+	note __, 1
+	note B_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 0
+	octave 3
+	note B_, 1
+	note __, 0
+	note A#, 15
+	note __, 1
+	loopchannel 0, Music_LookMysticalMan_branch_178523
+; 17859a
 
-_Music_LookMysticalMan_sub_0x17859a: ; 0x17859a
-; subroutine
-	note $c1
-	note $01
-	octave4
-	note $31
-	note $01
-	note $71
-	note $a5
-	note $c7
-	note $01
-	note $a1
-	note $c1
-	octave5
-	note $21
-	note $31
-	note $01
-	note $21
-	note $01
-	note $31
-	note $25
-	octave4
-	note $cb
+Music_LookMysticalMan_branch_17859a: ; 17859a
+	note B_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note A_, 5
+	note B_, 7
+	note __, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C#, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note D_, 1
+	note C#, 5
+	octave 4
+	note B_, 11
 	intensity $88
-	note $b0
-	note $a0
+	note A#, 0
+	note A_, 0
 	intensity $68
-	note $90
-	note $70
+	note G#, 0
+	note F#, 0
 	intensity $b8
-	octave5
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $c1
-	note $a5
-	note $81
-	note $01
-	note $81
-	note $01
-	note $71
-	note $55
-	endchannel ; end
-; 0x1785c8
+	octave 5
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note B_, 1
+	note A_, 5
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note E_, 5
+	endchannel
+; 1785c8
 
-_Music_LookMysticalMan_sub_0x1785c8: ; 0x1785c8
-; subroutine
-	note $27
+Music_LookMysticalMan_branch_1785c8: ; 1785c8
+	note C#, 7
 	intensity $88
-	note $10
-	octave3
-	note $c0
-	note $b0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
 	intensity $68
-	note $90
-	note $70
+	note G#, 0
+	note F#, 0
 	intensity $48
-	note $50
-	note $20
-	note $00
+	note E_, 0
+	note C#, 0
+	note __, 0
 	intensity $b8
-	endchannel ; end
-; 0x1785db
+	endchannel
 
-_Music_LookMysticalMan_Ch3: ; 0x1785db
-	notetype $06, $16
-	note $0f
-	octave2
-	note $c3
-	octave3
-	note $a1
-	note $01
-	note $73
-	octave2
-	note $c0
-	note $00
-	note $c3
-	note $a1
-	note $c1
-	octave3
-	note $c1
-	octave2
-	note $c1
-	octave3
-	note $a1
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $53
-	note $91
-	note $01
-	note $c3
-	note $50
-	note $00
-	note $55
-	octave2
-	note $b1
-	note $c5
-	note $93
-	note $a3
-	octave3
-	note $81
-	note $01
-	note $53
-	octave2
-	note $a0
-	note $00
-	note $a3
-	note $81
-	note $a1
-	octave3
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $81
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $73
-	note $b1
-	note $01
-	octave3
-	note $23
-	octave2
-	note $70
-	note $00
-	note $75
-	note $93
-	note $03
-	note $b3
-	note $c3
-	octave3
-	note $a1
-	note $01
-	note $73
-	octave2
-	note $c0
-	note $00
-	note $c5
-	octave3
-	note $31
-	note $01
-	note $71
-	note $35
-	note $53
-	note $91
-	note $01
-	note $c3
-	note $50
-	note $00
-	note $55
-	note $31
-	note $01
-	octave2
-	note $c1
-	note $95
-	note $a3
-	octave3
-	note $21
-	note $01
-	note $53
-	octave2
-	note $a0
-	note $00
-	note $a5
-	octave3
-	note $53
-	note $21
-	octave2
-	note $55
-	loopchannel $02, $4615
-	note $73
-	note $b1
-	note $01
-	octave3
-	note $21
-	note $75
-	octave2
-	note $71
-	note $01
-	octave3
-	note $23
-	octave2
-	note $b1
-	octave3
-	note $75
-	octave2
-	note $c3
-	octave3
-	note $c3
-	octave2
-	note $c3
-	octave3
-	note $71
-	note $a5
-	octave2
-	note $c3
-	octave3
-	note $73
-	octave2
-	note $c3
-	note $a3
-	note $01
-	note $b3
-	note $01
-	note $c5
-	note $01
-	note $c3
-	note $a3
-	note $73
-	note $53
-	octave3
-	note $53
-	octave2
-	note $53
-	note $91
-	octave3
-	note $35
-	octave2
-	note $53
-	note $c3
-	octave3
-	note $53
-	note $73
-	note $01
-	note $53
-	note $01
-	note $27
-	octave2
-	note $c7
-	note $b3
-	loopchannel $00, $45df ; end
-; 0x17868e
+Music_LookMysticalMan_Ch3: ; 1785db
+	notetype $6, $16
+	note __, 15
 
-_Music_LookMysticalMan_Ch4: ; 0x17868e
-	togglenoise $03
-	notetype $0c
-	note $41
-	note $41
-	note $31
-	note $30
-	note $30
-	callchannel _Music_LookMysticalMan_sub_0x1786d3
-	callchannel _Music_LookMysticalMan_sub_0x1786d9
-	callchannel _Music_LookMysticalMan_sub_0x1786d3
-	callchannel _Music_LookMysticalMan_sub_0x1786df
-	loopchannel $02, $4697
-	callchannel _Music_LookMysticalMan_sub_0x1786d3
-	callchannel _Music_LookMysticalMan_sub_0x1786d9
-	callchannel _Music_LookMysticalMan_sub_0x1786d3
-	note $31
-	note $41
-	note $31
-	note $40
-	note $30
-	note $31
-	note $41
-	note $31
-	note $30
-	note $30
-	note $31
-	note $41
-	note $32
-	note $40
-	note $41
-	note $41
-	note $31
-	note $41
-	note $31
-	note $41
-	note $32
-	note $40
-	note $41
-	note $31
-	note $31
-	note $30
-	note $30
-	loopchannel $02, $46ba
-	loopchannel $00, $4697 ; end
-; 0x1786d3
+Music_LookMysticalMan_branch_1785df: ; 1785df
+	octave 2
+	note B_, 3
+	octave 3
+	note A_, 1
+	note __, 1
+	note F#, 3
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 3
+	note A_, 1
+	note B_, 1
+	octave 3
+	note B_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note A_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note E_, 3
+	note G#, 1
+	note __, 1
+	note B_, 3
+	note E_, 0
+	note __, 0
+	note E_, 5
+	octave 2
+	note A#, 1
+	note B_, 5
+	note G#, 3
+	note A_, 3
+	octave 3
+	note G_, 1
+	note __, 1
+	note E_, 3
+	octave 2
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note G_, 1
+	note A_, 1
+	octave 3
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note G_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
 
-_Music_LookMysticalMan_sub_0x1786d3: ; 0x1786d3
-; subroutine
-	note $43
-	note $32
-	note $42
-	note $41
-	note $33
-	endchannel ; end
-; 0x1786d9
+Music_LookMysticalMan_branch_178615: ; 178615
+	octave 2
+	note F#, 3
+	note A#, 1
+	note __, 1
+	octave 3
+	note C#, 3
+	octave 2
+	note F#, 0
+	note __, 0
+	note F#, 5
+	note G#, 3
+	note __, 3
+	note A#, 3
+	note B_, 3
+	octave 3
+	note A_, 1
+	note __, 1
+	note F#, 3
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 5
+	octave 3
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note D_, 5
+	note E_, 3
+	note G#, 1
+	note __, 1
+	note B_, 3
+	note E_, 0
+	note __, 0
+	note E_, 5
+	note D_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note G#, 5
+	note A_, 3
+	octave 3
+	note C#, 1
+	note __, 1
+	note E_, 3
+	octave 2
+	note A_, 0
+	note __, 0
+	note A_, 5
+	octave 3
+	note E_, 3
+	note C#, 1
+	octave 2
+	note E_, 5
+	loopchannel 2, Music_LookMysticalMan_branch_178615
+	note F#, 3
+	note A#, 1
+	note __, 1
+	octave 3
+	note C#, 1
+	note F#, 5
+	octave 2
+	note F#, 1
+	note __, 1
+	octave 3
+	note C#, 3
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 5
+	octave 2
+	note B_, 3
+	octave 3
+	note B_, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note F#, 1
+	note A_, 5
+	octave 2
+	note B_, 3
+	octave 3
+	note F#, 3
+	octave 2
+	note B_, 3
+	note A_, 3
+	note __, 1
+	note A#, 3
+	note __, 1
+	note B_, 5
+	note __, 1
+	note B_, 3
+	note A_, 3
+	note F#, 3
+	note E_, 3
+	octave 3
+	note E_, 3
+	octave 2
+	note E_, 3
+	note G#, 1
+	octave 3
+	note D_, 5
+	octave 2
+	note E_, 3
+	note B_, 3
+	octave 3
+	note E_, 3
+	note F#, 3
+	note __, 1
+	note E_, 3
+	note __, 1
+	note C#, 7
+	octave 2
+	note B_, 7
+	note A#, 3
+	loopchannel 0, Music_LookMysticalMan_branch_1785df
 
-_Music_LookMysticalMan_sub_0x1786d9: ; 0x1786d9
-; subroutine
-	note $43
-	note $32
-	note $32
-	note $41
-	note $33
-	endchannel ; end
-; 0x1786df
+Music_LookMysticalMan_Ch4: ; 17868e
+	togglenoise $3
+	notetype $c
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
 
-_Music_LookMysticalMan_sub_0x1786df: ; 0x1786df
-; subroutine
-	note $43
-	note $31
-	note $40
-	note $32
-	note $31
-	note $41
-	note $30
-	note $30
-	endchannel ; end
-; 0x1786e8
+Music_LookMysticalMan_branch_178697: ; 178697
+	callchannel Music_LookMysticalMan_branch_1786d3
+	callchannel Music_LookMysticalMan_branch_1786d9
+	callchannel Music_LookMysticalMan_branch_1786d3
+	callchannel Music_LookMysticalMan_branch_1786df
+	loopchannel 2, Music_LookMysticalMan_branch_178697
+	callchannel Music_LookMysticalMan_branch_1786d3
+	callchannel Music_LookMysticalMan_branch_1786d9
+	callchannel Music_LookMysticalMan_branch_1786d3
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 0
+	note D_, 0
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+
+Music_LookMysticalMan_branch_1786ba: ; 1786ba
+	note D_, 1
+	note D#, 1
+	note D_, 2
+	note D#, 0
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 2
+	note D#, 0
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	loopchannel 2, Music_LookMysticalMan_branch_1786ba
+	loopchannel 0, Music_LookMysticalMan_branch_178697
+; 1786d3
+
+Music_LookMysticalMan_branch_1786d3: ; 1786d3
+	note D#, 3
+	note D_, 2
+	note D#, 2
+	note D#, 1
+	note D_, 3
+	endchannel
+; 1786d9
+
+Music_LookMysticalMan_branch_1786d9: ; 1786d9
+	note D#, 3
+	note D_, 2
+	note D_, 2
+	note D#, 1
+	note D_, 3
+	endchannel
+; 1786df
+
+Music_LookMysticalMan_branch_1786df: ; 1786df
+	note D#, 3
+	note D_, 1
+	note D#, 0
+	note D_, 2
+	note D_, 1
+	note D#, 1
+	note D_, 0
+	note D_, 0
+	endchannel
+; 1786e8
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -1,143 +1,144 @@
-_Music_LookOfficer: ; 0xed82d
-	db $80
-	dw _Music_LookOfficer_Ch1
-	db $01
-	dw _Music_LookOfficer_Ch2
-	db $02
-	dw _Music_LookOfficer_Ch3
-; 0xed836
+Music_LookOfficer: ; ed82d
+	dbw $80, Music_LookOfficer_Ch1
+	dbw $01, Music_LookOfficer_Ch2
+	dbw $02, Music_LookOfficer_Ch3
+; ed836
 
-_Music_LookOfficer_Ch1: ; 0xed836
-	tempo $7400
+
+Music_LookOfficer_Ch1: ; ed836
+	tempo 116
 	volume $77
-	tone $0100
+	tone $0001
 	vibrato $12, $34
-	stereopanning $0f
-	dutycycle $03
-	notetype $0c, $a7
-	octave4
-	note $20
-	note $30
-	note $40
-	note $50
-	note $6b
+	stereopanning $f
+	dutycycle $3
+	notetype $c, $a7
+	octave 4
+	note C#, 0
+	note D_, 0
+	note D#, 0
+	note E_, 0
+	note F_, 11
 	intensity $2f
-	octave3
-	note $cf
+	octave 3
+	note B_, 15
+
+Music_LookOfficer_branch_ed852: ; ed852
 	intensity $82
-	note $03
-	note $c5
-	note $93
-	note $c5
-	note $c5
-	note $93
-	note $c1
+	note __, 3
+	note B_, 5
+	note G#, 3
+	note B_, 5
+	note B_, 5
+	note G#, 3
+	note B_, 1
 	intensity $2f
-	note $bf
-	note $af
-	loopchannel $00, $5852 ; end
-; 0xed863
+	note A#, 15
+	note A_, 15
+	loopchannel 0, Music_LookOfficer_branch_ed852
 
-_Music_LookOfficer_Ch2: ; 0xed863
+Music_LookOfficer_Ch2: ; ed863
 	vibrato $12, $34
-	dutycycle $03
-	notetype $0c, $b7
-	octave5
-	note $40
-	note $30
-	note $20
-	note $10
-	octave4
-	note $cb
-	dutycycle $03
+	dutycycle $3
+	notetype $c, $b7
+	octave 5
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 4
+	note B_, 11
+	dutycycle $3
 	intensity $a2
-	octave1
-	note $c3
-	octave2
-	note $a1
-	octave1
-	note $c3
-	octave2
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $41
-	note $51
-	note $91
-	octave3
-	note $51
-	octave2
-	note $51
-	note $91
-	note $c1
-	note $51
-	note $91
-	loopchannel $02, $5882
-	forceoctave $01
-	callchannel _Music_LookOfficer_sub_0xed89e
-	forceoctave $00
-	callchannel _Music_LookOfficer_sub_0xed89e
-	loopchannel $00, $5882 ; end
-; 0xed89e
+	octave 1
+	note B_, 3
+	octave 2
+	note A_, 1
+	octave 1
+	note B_, 3
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note D#, 1
 
-_Music_LookOfficer_sub_0xed89e: ; 0xed89e
-; subroutine
-	octave1
-	note $a1
-	octave2
-	note $21
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $21
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $21
-	endchannel ; end
-; 0xed8ad
+Music_LookOfficer_branch_ed882: ; ed882
+	note E_, 1
+	note G#, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	note E_, 1
+	note G#, 1
+	loopchannel 2, Music_LookOfficer_branch_ed882
+	forceoctave $1
+	callchannel Music_LookOfficer_branch_ed89e
+	forceoctave $0
+	callchannel Music_LookOfficer_branch_ed89e
+	loopchannel 0, Music_LookOfficer_branch_ed882
+; ed89e
 
-_Music_LookOfficer_Ch3: ; 0xed8ad
+Music_LookOfficer_branch_ed89e: ; ed89e
+	octave 1
+	note A_, 1
+	octave 2
+	note C#, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C#, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note C#, 1
+	endchannel
+
+Music_LookOfficer_Ch3: ; ed8ad
 	vibrato $14, $14
 	stereopanning $f0
-	notetype $0c, $14
-	note $09
-	octave3
-	note $c1
-	note $01
-	note $c1
+	notetype $c, $14
+	note __, 9
+	octave 3
+	note B_, 1
+	note __, 1
+	note B_, 1
 	intensity $12
-	octave5
-	note $41
-	note $00
-	note $61
-	note $00
-	note $a1
-	note $c1
-	note $00
-	octave6
-	note $21
-	note $00
-	note $41
-	note $55
-	note $45
-	note $23
-	octave5
-	note $c1
-	note $a1
-	note $91
-	note $71
-	note $91
-	note $a1
-	note $c1
-	octave6
-	note $21
-	note $67
-	note $37
-	note $57
-	note $27
-	loopchannel $00, $58c8 ; end
-; 0xed8dd
+	octave 5
+	note D#, 1
+	note __, 0
+	note F_, 1
+	note __, 0
+	note A_, 1
+	note B_, 1
+	note __, 0
+	octave 6
+	note C#, 1
+	note __, 0
+	note D#, 1
+
+Music_LookOfficer_branch_ed8c8: ; ed8c8
+	note E_, 5
+	note D#, 5
+	note C#, 3
+	octave 5
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C#, 1
+	note F_, 7
+	note D_, 7
+	note E_, 7
+	note C#, 7
+	loopchannel 0, Music_LookOfficer_branch_ed8c8
+; ed8dd
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -1,164 +1,167 @@
-_Music_LookPokemaniac: ; 0xebde1
-	db $80
-	dw _Music_LookPokemaniac_Ch1
-	db $01
-	dw _Music_LookPokemaniac_Ch2
-	db $02
-	dw _Music_LookPokemaniac_Ch3
-; 0xebdea
+Music_LookPokemaniac: ; ebde1
+	dbw $80, Music_LookPokemaniac_Ch1
+	dbw $01, Music_LookPokemaniac_Ch2
+	dbw $02, Music_LookPokemaniac_Ch3
+; ebdea
 
-_Music_LookPokemaniac_Ch1: ; 0xebdea
-	stereopanning $0f
-	tempo $9000
+
+Music_LookPokemaniac_Ch1: ; ebdea
+	stereopanning $f
+	tempo 144
 	volume $77
-	vibrato $02, $33
-	tone $0200
-	notetype $0c, $b3
-	note $07
-	note $03
-	octave3
-	note $b0
-	note $02
-	note $b0
-	note $02
-	loopchannel $04, $7dfb
-	note $03
-	note $80
-	note $02
-	note $80
-	note $02
-	loopchannel $04, $7dfb
-	loopchannel $00, $7dfb ; end
-; 0xebe12
+	vibrato $2, $33
+	tone $0002
+	notetype $c, $b3
+	note __, 7
 
-_Music_LookPokemaniac_Ch2: ; 0xebe12
+Music_LookPokemaniac_branch_ebdfb: ; ebdfb
+	note __, 3
+	octave 3
+	note A#, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
+	note __, 3
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
+	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
+
+Music_LookPokemaniac_Ch2: ; ebe12
 	stereopanning $ff
-	vibrato $02, $33
-	tone $0100
-	notetype $0c, $b3
-	octave2
-	note $a0
-	note $70
-	note $40
-	note $10
-	octave1
-	note $a3
-	octave2
-	note $11
-	note $01
-	octave3
-	note $70
-	note $02
-	note $a0
-	note $02
-	octave1
-	note $81
-	note $01
-	octave3
-	note $10
-	note $02
-	note $40
-	note $02
-	loopchannel $02, $7e24
-	octave1
-	note $a1
-	note $01
-	octave3
-	note $40
-	note $02
-	note $70
-	note $02
-	octave1
-	note $51
-	note $01
-	octave2
-	note $a0
-	note $02
-	octave3
-	note $10
-	note $02
-	loopchannel $02, $7e38
-	loopchannel $00, $7e24 ; end
-; 0xebe51
+	vibrato $2, $33
+	tone $0001
+	notetype $c, $b3
+	octave 2
+	note A_, 0
+	note F#, 0
+	note D#, 0
+	note C_, 0
+	octave 1
+	note A_, 3
 
-_Music_LookPokemaniac_Ch3: ; 0xebe51
+Music_LookPokemaniac_branch_ebe24: ; ebe24
+	octave 2
+	note C_, 1
+	note __, 1
+	octave 3
+	note F#, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	octave 1
+	note G_, 1
+	note __, 1
+	octave 3
+	note C_, 0
+	note __, 2
+	note D#, 0
+	note __, 2
+	loopchannel 2, Music_LookPokemaniac_branch_ebe24
+
+Music_LookPokemaniac_branch_ebe38: ; ebe38
+	octave 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note D#, 0
+	note __, 2
+	note F#, 0
+	note __, 2
+	octave 1
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 0
+	note __, 2
+	octave 3
+	note C_, 0
+	note __, 2
+	loopchannel 2, Music_LookPokemaniac_branch_ebe38
+	loopchannel 0, Music_LookPokemaniac_branch_ebe24
+
+Music_LookPokemaniac_Ch3: ; ebe51
 	stereopanning $f0
-	vibrato $06, $33
-	notetype $0c, $15
-	octave4
-	note $10
-	note $40
-	note $70
-	note $a0
-	octave5
-	note $13
+	vibrato $6, $33
+	notetype $c, $15
+	octave 4
+	note C_, 0
+	note D#, 0
+	note F#, 0
+	note A_, 0
+	octave 5
+	note C_, 3
 	intensity $10
-	callchannel _Music_LookPokemaniac_sub_0xebe70
+
+Music_LookPokemaniac_branch_ebe62: ; ebe62
+	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
-	callchannel _Music_LookPokemaniac_sub_0xebe70
+	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $10
-	loopchannel $00, $7e62 ; end
-; 0xebe70
+	loopchannel 0, Music_LookPokemaniac_branch_ebe62
+; ebe70
 
-_Music_LookPokemaniac_sub_0xebe70: ; 0xebe70
-; subroutine
-	note $b5
-	note $a1
-	note $91
-	note $81
-	note $75
-	note $61
-	note $71
-	note $a1
-	octave4
-	note $43
-	note $10
-	note $00
-	note $40
-	note $00
-	note $10
-	note $00
-	note $40
-	note $00
-	octave5
-	note $73
-	note $10
-	note $00
-	note $70
-	note $00
-	note $10
-	note $00
-	note $70
-	note $00
-	note $85
-	note $71
-	note $61
-	note $51
-	note $45
-	note $31
-	note $41
-	note $71
-	note $13
-	octave4
-	note $a0
-	note $00
-	octave5
-	note $10
-	note $00
-	note $40
-	note $00
-	note $10
-	note $00
-	note $43
-	octave4
-	note $a0
-	note $00
-	octave5
-	note $40
-	note $00
-	note $70
-	note $00
-	note $10
-	note $00
-	endchannel ; end
-; 0xebeab
+Music_LookPokemaniac_branch_ebe70: ; ebe70
+	note A#, 5
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 5
+	note F_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D#, 3
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 5
+	note F#, 3
+	note C_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 5
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 5
+	note D_, 1
+	note D#, 1
+	note F#, 1
+	note C_, 3
+	octave 4
+	note A_, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note D#, 3
+	octave 4
+	note A_, 0
+	note __, 0
+	octave 5
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	endchannel
+; ebeab
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -1,357 +1,368 @@
-_Music_LookRival: ; 0xf4f79
-	db $c0
-	dw _Music_LookRival_Ch1
-	db $01
-	dw _Music_LookRival_Ch2
-	db $02
-	dw _Music_LookRival_Ch3
-	db $03
-	dw _Music_LookRival_Ch4
-; 0xf4f85
+Music_LookRival: ; f4f79
+	dbw $c0, Music_LookRival_Ch1
+	dbw $01, Music_LookRival_Ch2
+	dbw $02, Music_LookRival_Ch3
+	dbw $03, Music_LookRival_Ch4
+; f4f85
 
-_Music_LookRival_Ch1: ; 0xf4f85
-	tempo $7000
+
+Music_LookRival_Ch1: ; f4f85
+	tempo 112
 	volume $77
-	dutycycle $01
-	tone $0100
+	dutycycle $1
+	tone $0001
 	vibrato $12, $15
-	stereopanning $0f
-	notetype $0c, $b2
-	octave4
-	note $10
-	octave3
-	note $b0
-	note $91
-	note $b0
-	note $90
-	note $71
-	note $65
+	stereopanning $f
+	notetype $c, $b2
+	octave 4
+	note C_, 0
+	octave 3
+	note A#, 0
+	note G#, 1
+	note A#, 0
+	note G#, 0
+	note F#, 1
+	note F_, 5
 	intensity $b7
-	note $95
+	note G#, 5
 	intensity $b2
-	note $b3
-	note $61
-	note $93
+	note A#, 3
+	note F_, 1
+	note G#, 3
 	intensity $a0
-	note $99
+	note G#, 9
 	intensity $a5
-	note $97
+	note G#, 7
 	intensity $a6
-	note $77
+	note F#, 7
+
+Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
+
+Music_LookRival_branch_f4fb1: ; f4fb1
 	intensity $b5
-	note $63
-	note $41
-	note $65
-	note $61
-	note $81
-	note $93
-	note $b3
-	note $91
-	note $83
+	note F_, 3
+	note D#, 1
+	note F_, 5
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note A#, 3
+	note G#, 1
+	note G_, 3
 	intensity $a0
-	note $61
+	note F_, 1
 	intensity $a7
-	note $6f
+	note F_, 15
 	intensity $66
-	note $01
-	note $61
-	note $83
+	note __, 1
+	note F_, 1
+	note G_, 3
 	intensity $b6
-	note $93
-	octave4
-	note $13
-	octave3
-	note $b3
-	note $91
-	note $b5
+	note G#, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	note G#, 1
+	note A#, 5
 	intensity $b4
-	note $b1
-	octave4
-	note $11
-	note $21
-	note $21
-	note $41
-	note $41
-	note $21
-	note $15
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note C#, 1
+	note D#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 5
 	intensity $b7
-	octave3
-	note $bb
-	note $91
-	note $81
-	note $91
-	note $b9
-	note $c3
-	octave4
-	note $15
-	octave3
-	note $b5
-	octave4
-	note $31
-	note $11
-	octave3
-	note $b5
-	note $89
-	note $b5
-	note $95
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $97
-	note $65
-	note $11
+	octave 3
+	note A#, 11
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note A#, 9
+	note B_, 3
+	octave 4
+	note C_, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note A#, 5
+	note G_, 9
+	note A#, 5
+	note G#, 5
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 7
+	note F_, 5
+	note C_, 1
+
+Music_LookRival_branch_f4ff7: ; f4ff7
 	intensity $b2
-	note $65
+	note F_, 5
 	intensity $b7
-	note $93
-	note $71
-	note $61
-	note $41
-	loopchannel $03, $4ff7
+	note G#, 3
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	loopchannel 3, Music_LookRival_branch_f4ff7
 	intensity $b2
-	note $61
-	note $93
+	note F_, 1
+	note G#, 3
 	intensity $b7
-	note $95
-	note $73
-	loopchannel $00, $4fb1 ; end
-; 0xf5010
+	note G#, 5
+	note F#, 3
+	loopchannel 0, Music_LookRival_branch_f4fb1
 
-_Music_LookRival_Ch2: ; 0xf5010
-	dutycycle $03
-	vibrato $08, $36
-	stereopanning $f0
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $61
-	note $41
-	note $21
-	note $15
+Music_LookRival_Ch2: ; f5010
+	dutycycle $3
+	vibrato $8, $36
+	stereopanning $f0
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note C_, 5
 	intensity $c7
-	note $45
+	note D#, 5
 	intensity $c2
-	note $63
-	note $11
-	note $43
+	note F_, 3
+	note C_, 1
+	note D#, 3
 	intensity $b0
-	note $49
+	note D#, 9
 	intensity $b7
-	note $4f
+	note D#, 15
+
+Music_LookRival_branch_f502e: ; f502e
+
+Music_AfterTheRivalFight_branch_f502e: ; f502e
 	intensity $c7
-	note $1b
+	note C_, 11
 	intensity $c4
-	note $11
-	note $31
-	note $43
-	note $33
-	note $11
-	note $33
+	note C_, 1
+	note D_, 1
+	note D#, 3
+	note D_, 3
+	note C_, 1
+	note D_, 3
 	intensity $b0
-	note $15
+	note C_, 5
 	intensity $b7
-	note $17
+	note C_, 7
 	intensity $b4
-	octave3
-	note $a1
-	note $81
-	note $a1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note A_, 1
 	intensity $c6
-	octave4
-	note $15
+	octave 4
+	note C_, 5
 	intensity $c7
-	note $47
-	note $6b
+	note D#, 7
+	note F_, 11
 	intensity $c4
-	note $61
-	note $81
-	note $91
-	note $91
-	note $81
-	note $81
-	note $61
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note F_, 1
 	intensity $c4
-	note $85
+	note G_, 5
 	intensity $b0
-	note $6f
+	note F_, 15
 	intensity $b7
-	note $6f
+	note F_, 15
 	intensity $b0
-	note $8b
-	note $63
-	note $5f
-	note $6b
-	note $43
+	note G_, 11
+	note F_, 3
+	note E_, 15
+	note F_, 11
+	note D#, 3
 	intensity $c7
-	note $37
+	note D_, 7
 	intensity $c4
-	note $11
-	note $31
-	note $40
-	note $30
-	note $41
+	note C_, 1
+	note D_, 1
+	note D#, 0
+	note D_, 0
+	note D#, 1
+
+Music_LookRival_branch_f5070: ; f5070
 	intensity $c2
-	note $15
+	note C_, 5
 	intensity $c7
-	note $45
+	note D#, 5
 	intensity $c2
-	note $63
-	loopchannel $03, $5070
-	note $11
-	note $43
+	note F_, 3
+	loopchannel 3, Music_LookRival_branch_f5070
+	note C_, 1
+	note D#, 3
 	intensity $c7
-	note $49
-	loopchannel $00, $502e ; end
-; 0xf5086
+	note D#, 9
+	loopchannel 0, Music_LookRival_branch_f502e
 
-_Music_LookRival_Ch3: ; 0xf5086
-	notetype $0c, $28
-	note $01
-	octave4
-	note $11
-	octave3
-	note $91
-	note $71
-	note $63
-	note $91
-	note $43
-	note $11
-	note $31
-	note $41
-	note $91
-	note $71
-	note $61
-	note $49
-	note $49
-	note $11
-	note $41
-	note $71
-	callchannel _Music_LookRival_sub_0xf50ef
-	loopchannel $03, $509d
-	note $63
-	note $11
-	note $43
-	note $91
-	note $81
-	note $71
-	callchannel _Music_LookRival_sub_0xf50f7
-	note $b1
-	note $61
-	note $81
-	note $93
-	note $61
-	note $81
-	note $90
-	note $a0
-	callchannel _Music_LookRival_sub_0xf50ff
-	note $b1
-	note $61
-	note $81
-	note $93
-	note $61
-	note $b1
-	note $c1
-	octave4
-	note $13
-	octave3
-	note $81
-	note $b3
-	note $81
-	note $a1
-	note $b1
-	octave4
-	note $13
-	octave3
-	note $81
-	note $b3
-	note $81
-	note $a1
-	note $b0
-	note $a0
-	callchannel _Music_LookRival_sub_0xf50f7
-	callchannel _Music_LookRival_sub_0xf50ff
-	callchannel _Music_LookRival_sub_0xf50ef
-	callchannel _Music_LookRival_sub_0xf50ef
-	note $61
-	note $11
-	note $31
-	note $43
-	note $11
-	note $31
-	note $40
-	note $50
-	note $61
-	note $11
-	note $31
-	note $43
-	note $11
-	note $71
-	note $51
-	loopchannel $00, $509d ; end
-; 0xf50ef
+Music_LookRival_Ch3: ; f5086
+	notetype $c, $28
+	note __, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	note F#, 1
+	note F_, 3
+	note G#, 1
+	note D#, 3
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 9
+	note D#, 9
+	note C_, 1
+	note D#, 1
+	note F#, 1
 
-_Music_LookRival_sub_0xf50ef: ; 0xf50ef
-; subroutine
-	note $61
-	note $11
-	note $31
-	note $43
-	note $11
-	note $31
-	note $41
-	endchannel ; end
-; 0xf50f7
+Music_LookRival_branch_f509d: ; f509d
 
-_Music_LookRival_sub_0xf50f7: ; 0xf50f7
-; subroutine
-	note $b1
-	note $61
-	note $81
-	note $93
-	note $61
-	note $81
-	note $91
-	endchannel ; end
-; 0xf50ff
+Music_AfterTheRivalFight_branch_f509d: ; f509d
+	callchannel Music_LookRival_branch_f50ef
+	loopchannel 3, Music_LookRival_branch_f509d
+	note F_, 3
+	note C_, 1
+	note D#, 3
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	callchannel Music_LookRival_branch_f50f7
+	note A#, 1
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note F_, 1
+	note G_, 1
+	note G#, 0
+	note A_, 0
+	callchannel Music_LookRival_branch_f50ff
+	note A#, 1
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note F_, 1
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 1
+	note A#, 3
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 1
+	note A#, 3
+	note G_, 1
+	note A_, 1
+	note A#, 0
+	note A_, 0
+	callchannel Music_LookRival_branch_f50f7
+	callchannel Music_LookRival_branch_f50ff
+	callchannel Music_LookRival_branch_f50ef
+	callchannel Music_LookRival_branch_f50ef
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 3
+	note C_, 1
+	note D_, 1
+	note D#, 0
+	note E_, 0
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 3
+	note C_, 1
+	note F#, 1
+	note E_, 1
+	loopchannel 0, Music_LookRival_branch_f509d
+; f50ef
 
-_Music_LookRival_sub_0xf50ff: ; 0xf50ff
-; subroutine
-	note $b3
-	note $61
-	note $93
-	note $61
-	note $81
-	note $91
-	endchannel ; end
-; 0xf5106
+Music_LookRival_branch_f50ef: ; f50ef
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note D#, 3
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	endchannel
+; f50f7
 
-_Music_LookRival_Ch4: ; 0xf5106
+Music_LookRival_branch_f50f7: ; f50f7
+	note A#, 1
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	endchannel
+; f50ff
+
+Music_LookRival_branch_f50ff: ; f50ff
+	note A#, 3
+	note F_, 1
+	note G#, 3
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	endchannel
+
+Music_LookRival_Ch4: ; f5106
 	stereopanning $f0
-	togglenoise $03
-	notetype $0c
-	note $07
-	note $0f
-	note $41
-	note $33
-	note $35
-	note $33
-	note $43
-	note $43
-	note $31
-	note $31
-	note $31
-	note $31
-	note $43
-	note $31
-	note $43
-	note $41
-	note $33
-	note $43
-	note $31
-	note $43
-	note $41
-	note $31
-	note $31
-	loopchannel $00, $5118 ; end
-; 0xf5127
+	togglenoise $3
+	notetype $c
+	note __, 7
+	note __, 15
+	note D#, 1
+	note D_, 3
+	note D_, 5
+	note D_, 3
+	note D#, 3
+	note D#, 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+
+Music_AfterTheRivalFight_branch_f5118: ; f5118
+
+Music_LookRival_branch_f5118: ; f5118
+	note D#, 3
+	note D_, 1
+	note D#, 3
+	note D#, 1
+	note D_, 3
+	note D#, 3
+	note D_, 1
+	note D#, 3
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	loopchannel 0, Music_LookRival_branch_f5118
+; f5127
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -1,416 +1,434 @@
-_Music_LookRocket: ; 0xf74a2
-	db $c0
-	dw _Music_LookRocket_Ch1
-	db $01
-	dw _Music_LookRocket_Ch2
-	db $02
-	dw _Music_LookRocket_Ch3
-	db $03
-	dw _Music_LookRocket_Ch4
-; 0xf74ae
+Music_LookRocket: ; f74a2
+	dbw $c0, Music_LookRocket_Ch1
+	dbw $01, Music_LookRocket_Ch2
+	dbw $02, Music_LookRocket_Ch3
+	dbw $03, Music_LookRocket_Ch4
+; f74ae
 
-_Music_LookRocket_Ch1: ; 0xf74ae
-	tempo $7b00
+
+Music_LookRocket_Ch1: ; f74ae
+	tempo 123
 	volume $77
-	forceoctave $02
-	stereopanning $0f
-	dutycycle $03
-	vibrato $05, $64
-	notetype $0c, $a8
-	octave4
-	note $10
-	note $30
-	callchannel _Music_LookRocket_sub_0xf74e6
-	dutycycle $01
+	forceoctave $2
+	stereopanning $f
+	dutycycle $3
+	vibrato $5, $64
+	notetype $c, $a8
+	octave 4
+	note C_, 0
+	note D_, 0
+	callchannel Music_LookRocket_branch_f74e6
+	dutycycle $1
+
+Music_LookRocket_branch_f74c7: ; f74c7
 	intensity $a8
-	callchannel _Music_LookRocket_sub_0xf74f7
-	callchannel _Music_LookRocket_sub_0xf758a
-	octave4
-	note $70
-	note $00
+	callchannel Music_LookRocket_branch_f74f7
+	callchannel Music_LookRocket_branch_f758a
+	octave 4
+	note F#, 0
+	note __, 0
 	intensity $53
-	callchannel _Music_LookRocket_sub_0xf750c
+	callchannel Music_LookRocket_branch_f750c
 	intensity $c3
-	callchannel _Music_LookRocket_sub_0xf750c
+	callchannel Music_LookRocket_branch_f750c
 	intensity $e3
-	callchannel _Music_LookRocket_sub_0xf750c
-	note $0f
-	loopchannel $00, $74c7 ; end
-; 0xf74e6
+	callchannel Music_LookRocket_branch_f750c
+	note __, 15
+	loopchannel 0, Music_LookRocket_branch_f74c7
+; f74e6
 
-_Music_LookRocket_sub_0xf74e6: ; 0xf74e6
-; subroutine
-	note $40
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	note $10
-	note $02
-	octave2
-	note $60
-	note $90
-	note $c0
-	octave3
-	note $30
-	note $60
-	note $90
-	endchannel ; end
-; 0xf74f7
+Music_RocketTheme_branch_f74e6: ; f74e6
 
-_Music_LookRocket_sub_0xf74f7: ; 0xf74f7
-; subroutine
-	note $01
-	octave3
-	note $40
-	note $04
-	note $43
-	octave2
-	note $a1
-	octave3
-	note $40
-	note $60
-	note $75
-	note $40
-	note $02
-	note $70
-	note $00
-	note $40
-	note $00
-	octave4
-	note $70
-	note $00
-	endchannel ; end
-; 0xf750c
+Music_LookRocket_branch_f74e6: ; f74e6
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	octave 2
+	note F_, 0
+	note G#, 0
+	note B_, 0
+	octave 3
+	note D_, 0
+	note F_, 0
+	note G#, 0
+	endchannel
+; f74f7
 
-_Music_LookRocket_sub_0xf750c: ; 0xf750c
-; subroutine
-	note $01
-	octave2
-	note $c0
-	note $06
-	octave3
-	note $10
-	note $04
-	endchannel ; end
-; 0xf7514
+Music_RocketTheme_branch_f74f7: ; f74f7
 
-_Music_LookRocket_Ch2: ; 0xf7514
-	forceoctave $02
-	vibrato $04, $64
-	dutycycle $03
-	notetype $0c, $b7
+Music_LookRocket_branch_f74f7: ; f74f7
+	note __, 1
+	octave 3
+	note D#, 0
+	note __, 4
+	note D#, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D#, 0
+	note F_, 0
+	note F#, 5
+	note D#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	endchannel
+; f750c
+
+Music_LookRocket_branch_f750c: ; f750c
+
+Music_RocketTheme_branch_f750c: ; f750c
+	note __, 1
+	octave 2
+	note B_, 0
+	note __, 6
+	octave 3
+	note C_, 0
+	note __, 4
+	endchannel
+; f7514
+
+Music_LookRocket_Ch2: ; f7514
+	forceoctave $2
+	vibrato $4, $64
+	dutycycle $3
+	notetype $c, $b7
 	stereopanning $ff
-	octave5
-	note $10
-	note $30
-	callchannel _Music_LookRocket_sub_0xf7547
+	octave 5
+	note C_, 0
+	note D_, 0
+	callchannel Music_LookRocket_branch_f7547
+
+Music_LookRocket_branch_f7526: ; f7526
 	intensity $b7
-	callchannel _Music_LookRocket_sub_0xf758a
-	octave5
-	note $10
-	note $00
-	callchannel _Music_LookRocket_sub_0xf7554
+	callchannel Music_LookRocket_branch_f758a
+	octave 5
+	note C_, 0
+	note __, 0
+	callchannel Music_LookRocket_branch_f7554
 	intensity $53
-	callchannel _Music_LookRocket_sub_0xf7568
+	callchannel Music_LookRocket_branch_f7568
 	intensity $c3
-	callchannel _Music_LookRocket_sub_0xf7568
+	callchannel Music_LookRocket_branch_f7568
 	intensity $e3
-	callchannel _Music_LookRocket_sub_0xf7568
-	callchannel _Music_LookRocket_sub_0xf756f
-	loopchannel $00, $7526 ; end
-; 0xf7547
+	callchannel Music_LookRocket_branch_f7568
+	callchannel Music_LookRocket_branch_f756f
+	loopchannel 0, Music_LookRocket_branch_f7526
+; f7547
 
-_Music_LookRocket_sub_0xf7547: ; 0xf7547
-; subroutine
-	note $40
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	note $10
-	note $02
-	octave3
-	note $c5
-	dutycycle $00
-	endchannel ; end
-; 0xf7554
+Music_LookRocket_branch_f7547: ; f7547
 
-_Music_LookRocket_sub_0xf7554: ; 0xf7554
-; subroutine
-	note $01
-	octave4
-	note $40
-	note $04
-	note $63
-	note $10
-	note $30
-	note $40
-	note $60
-	note $75
-	note $40
-	note $02
-	note $70
-	note $00
-	note $40
-	note $00
-	octave5
-	note $40
-	note $00
-	endchannel ; end
-; 0xf7568
+Music_RocketTheme_branch_f7547: ; f7547
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	octave 3
+	note B_, 5
+	dutycycle $0
+	endchannel
+; f7554
 
-_Music_LookRocket_sub_0xf7568: ; 0xf7568
-; subroutine
-	note $01
-	octave3
-	note $60
-	note $06
-	note $70
-	note $04
-	endchannel ; end
-; 0xf756f
+Music_LookRocket_branch_f7554: ; f7554
 
-_Music_LookRocket_sub_0xf756f: ; 0xf756f
-; subroutine
+Music_RocketTheme_branch_f7554: ; f7554
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 4
+	note F_, 3
+	note C_, 0
+	note D_, 0
+	note D#, 0
+	note F_, 0
+	note F#, 5
+	note D#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 5
+	note D#, 0
+	note __, 0
+	endchannel
+; f7568
+
+Music_LookRocket_branch_f7568: ; f7568
+
+Music_RocketTheme_branch_f7568: ; f7568
+	note __, 1
+	octave 3
+	note F_, 0
+	note __, 6
+	note F#, 0
+	note __, 4
+	endchannel
+; f756f
+
+Music_LookRocket_branch_f756f: ; f756f
+
+Music_RocketTheme_branch_f756f: ; f756f
 	intensity $63
-	note $90
-	note $60
-	note $30
-	octave2
-	note $c0
+	note G#, 0
+	note F_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
 	intensity $a3
-	octave3
-	note $a0
-	note $70
-	note $40
-	note $10
+	octave 3
+	note A_, 0
+	note F#, 0
+	note D#, 0
+	note C_, 0
 	intensity $c3
-	note $b0
-	note $80
-	note $50
-	note $20
+	note A#, 0
+	note G_, 0
+	note E_, 0
+	note C#, 0
 	intensity $f3
-	note $c0
-	note $90
-	note $60
-	note $30
-	endchannel ; end
-; 0xf758a
+	note B_, 0
+	note G#, 0
+	note F_, 0
+	note D_, 0
+	endchannel
+; f758a
 
-_Music_LookRocket_sub_0xf758a: ; 0xf758a
-; subroutine
-	octave3
-	note $01
-	note $80
-	note $04
-	note $a7
-	note $b5
-	note $a0
-	note $02
-	note $b0
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xf7597
+Music_RocketTheme_branch_f758a: ; f758a
 
-_Music_LookRocket_Ch3: ; 0xf7597
-	forceoctave $02
-	vibrato $04, $22
-	notetype $0c, $14
+Music_LookRocket_branch_f758a: ; f758a
+	octave 3
+	note __, 1
+	note G_, 0
+	note __, 4
+	note A_, 7
+	note A#, 5
+	note A_, 0
+	note __, 2
+	note A#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	endchannel
+
+Music_LookRocket_Ch3: ; f7597
+	forceoctave $2
+	vibrato $4, $22
+	notetype $c, $14
 	stereopanning $f0
-	note $01
-	callchannel _Music_LookRocket_sub_0xf75bf
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf75fe
+	note __, 1
+	callchannel Music_LookRocket_branch_f75bf
+
+Music_LookRocket_branch_f75a5: ; f75a5
+	callchannel Music_LookRocket_branch_f75fe
+	callchannel Music_LookRocket_branch_f75fe
 	intensity $24
-	callchannel _Music_LookRocket_sub_0xf7623
+	callchannel Music_LookRocket_branch_f7623
 	intensity $14
-	callchannel _Music_LookRocket_sub_0xf75cc
-	callchannel _Music_LookRocket_sub_0xf7623
-	callchannel _Music_LookRocket_sub_0xf75e1
-	loopchannel $00, $75a5 ; end
-; 0xf75bf
+	callchannel Music_LookRocket_branch_f75cc
+	callchannel Music_LookRocket_branch_f7623
+	callchannel Music_LookRocket_branch_f75e1
+	loopchannel 0, Music_LookRocket_branch_f75a5
+; f75bf
 
-_Music_LookRocket_sub_0xf75bf: ; 0xf75bf
-; subroutine
-	octave3
-	note $60
-	note $00
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	note $30
-	note $02
-	octave3
-	note $35
-	endchannel ; end
-; 0xf75cc
+Music_RocketTheme_branch_f75bf: ; f75bf
 
-_Music_LookRocket_sub_0xf75cc: ; 0xf75cc
-; subroutine
-	octave2
-	note $90
-	note $00
-	octave3
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $10
-	note $00
-	note $70
-	note $00
-	endchannel ; end
-; 0xf75e1
+Music_LookRocket_branch_f75bf: ; f75bf
+	octave 3
+	note F_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note D_, 0
+	note __, 2
+	octave 3
+	note D_, 5
+	endchannel
+; f75cc
 
-_Music_LookRocket_sub_0xf75e1: ; 0xf75e1
-; subroutine
+Music_RocketTheme_branch_f75cc: ; f75cc
+
+Music_LookRocket_branch_f75cc: ; f75cc
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	endchannel
+; f75e1
+
+Music_RocketTheme_branch_f75e1: ; f75e1
+
+Music_LookRocket_branch_f75e1: ; f75e1
 	intensity $24
-	octave2
-	note $90
-	note $00
-	octave3
-	note $60
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $70
-	note $00
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note F#, 0
+	note __, 0
 	intensity $14
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $90
-	note $00
-	endchannel ; end
-; 0xf75fe
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	endchannel
+; f75fe
 
-_Music_LookRocket_sub_0xf75fe: ; 0xf75fe
-; subroutine
-	note $10
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $10
-	note $00
-	note $40
-	note $00
-	note $80
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xf7623
+Music_LookRocket_branch_f75fe: ; f75fe
 
-_Music_LookRocket_sub_0xf7623: ; 0xf7623
-; subroutine
-	octave2
-	note $90
-	note $00
-	octave3
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $90
-	note $70
-	note $40
-	note $10
-	endchannel ; end
-; 0xf7638
+Music_RocketTheme_branch_f75fe: ; f75fe
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	endchannel
+; f7623
 
-_Music_LookRocket_Ch4: ; 0xf7638
-	togglenoise $03
-	notetype $0c
-	note $01
-	callchannel _Music_LookRocket_sub_0xf765c
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf765c
-	loopchannel $00, $7640 ; end
-; 0xf765c
+Music_RocketTheme_branch_f7623: ; f7623
 
-_Music_LookRocket_sub_0xf765c: ; 0xf765c
-; subroutine
-	note $17
-	note $31
-	note $41
-	note $20
-	note $20
-	note $30
-	note $30
-	endchannel ; end
-; 0xf7664
+Music_LookRocket_branch_f7623: ; f7623
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note F#, 0
+	note D#, 0
+	note C_, 0
+	endchannel
 
-_Music_LookRocket_sub_0xf7664: ; 0xf7664
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $71
-	note $41
-	note $71
-	note $31
-	note $71
-	endchannel ; end
-; 0xf766d
+Music_LookRocket_Ch4: ; f7638
+	togglenoise $3
+	notetype $c
+	note __, 1
+	callchannel Music_LookRocket_branch_f765c
+
+Music_LookRocket_branch_f7640: ; f7640
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f7664
+	callchannel Music_LookRocket_branch_f765c
+	loopchannel 0, Music_LookRocket_branch_f7640
+; f765c
+
+Music_LookRocket_branch_f765c: ; f765c
+
+Music_RocketTheme_branch_f765c: ; f765c
+	note C_, 7
+	note D_, 1
+	note D#, 1
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note D_, 0
+	endchannel
+; f7664
+
+Music_LookRocket_branch_f7664: ; f7664
+
+Music_RocketTheme_branch_f7664: ; f7664
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	endchannel
+; f766d
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -1,183 +1,184 @@
-_Music_LookSage: ; 0xee35e
-	db $40
-	dw _Music_LookSage_Ch1
-	db $02
-	dw _Music_LookSage_Ch3
-; 0xee364
+Music_LookSage: ; ee35e
+	dbw $40, Music_LookSage_Ch1
+	dbw $02, Music_LookSage_Ch3
+; ee364
 
-_Music_LookSage_Ch1: ; 0xee364
-	tempo $9000
-	stereopanning $0f
+
+Music_LookSage_Ch1: ; ee364
+	tempo 144
+	stereopanning $f
 	volume $77
-	dutycycle $03
-	notetype $0c, $b3
-	note $01
-	note $0f
-	callchannel _Music_LookSage_sub_0xee3fa
+	dutycycle $3
+	notetype $c, $b3
+	note __, 1
+	note __, 15
+	callchannel Music_LookSage_branch_ee3fa
 	intensity $b3
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	note $51
+	note E_, 1
 	intensity $93
-	note $51
+	note E_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $b3
-	note $61
+	note F_, 1
 	intensity $93
-	note $61
+	note F_, 1
+
+Music_LookSage_branch_ee38e: ; ee38e
 	intensity $b3
-	note $31
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	octave2
-	note $c1
+	octave 2
+	note B_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $b3
-	note $c1
+	note B_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $b3
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	octave2
-	note $c1
+	octave 2
+	note B_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $b3
-	octave3
-	note $31
+	octave 3
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	note $51
+	note E_, 1
 	intensity $93
-	note $51
+	note E_, 1
 	intensity $b3
-	note $61
+	note F_, 1
 	intensity $93
-	note $61
+	note F_, 1
 	intensity $b3
-	note $31
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	note $51
+	note E_, 1
 	intensity $93
-	note $51
+	note E_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $b3
-	note $31
+	note D_, 1
 	intensity $93
-	note $31
+	note D_, 1
 	intensity $b3
-	octave2
-	note $c1
+	octave 2
+	note B_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $b3
-	note $c1
+	note B_, 1
 	intensity $93
-	note $c1
-	callchannel _Music_LookSage_sub_0xee3fa
-	loopchannel $00, $638e ; end
-; 0xee3fa
+	note B_, 1
+	callchannel Music_LookSage_branch_ee3fa
+	loopchannel 0, Music_LookSage_branch_ee38e
+; ee3fa
 
-_Music_LookSage_sub_0xee3fa: ; 0xee3fa
-; subroutine
+Music_LookSage_branch_ee3fa: ; ee3fa
 	intensity $b3
-	octave2
-	note $51
+	octave 2
+	note E_, 1
 	intensity $93
-	note $51
+	note E_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
+	note A_, 1
 	intensity $b3
-	note $c1
+	note B_, 1
 	intensity $93
-	note $c1
+	note B_, 1
 	intensity $b3
-	note $a1
+	note A_, 1
 	intensity $93
-	note $a1
-	endchannel ; end
-; 0xee414
+	note A_, 1
+	endchannel
 
-_Music_LookSage_Ch3: ; 0xee414
+Music_LookSage_Ch3: ; ee414
 	stereopanning $f0
 	vibrato $16, $23
-	notetype $0c, $10
-	octave5
-	note $c0
-	octave6
-	note $10
-	octave5
-	note $cf
-	vibrato $07, $23
-	note $c7
+	notetype $c, $10
+	octave 5
+	note B_, 0
+	octave 6
+	note C_, 0
+	octave 5
+	note B_, 15
+	vibrato $7, $23
+	note B_, 7
 	vibrato $14, $23
-	octave6
-	note $35
-	note $50
-	note $60
-	note $5d
-	note $80
-	note $90
-	note $ab
-	note $c3
-	note $38
-	note $50
-	note $60
-	note $30
-	vibrato $00, $00
-	note $53
-	vibrato $07, $23
-	note $57
+	octave 6
+	note D_, 5
+	note E_, 0
+	note F_, 0
+	note E_, 13
+	note G_, 0
+	note G#, 0
+
+Music_LookSage_branch_ee430: ; ee430
+	note A_, 11
+	note B_, 3
+	note D_, 8
+	note E_, 0
+	note F_, 0
+	note D_, 0
+	vibrato $0, $0
+	note E_, 3
+	vibrato $7, $23
+	note E_, 7
 	vibrato $14, $23
-	octave5
-	note $c7
-	octave6
-	note $67
-	notetype $06, $10
-	note $50
-	note $40
-	note $30
-	note $20
-	note $10
-	octave5
-	note $c0
-	note $b0
-	note $a0
-	note $03
-	octave6
-	note $51
-	note $61
-	notetype $0c, $10
-	note $5d
-	note $80
-	note $90
-	loopchannel $00, $6430 ; end
-; 0xee45f
+	octave 5
+	note B_, 7
+	octave 6
+	note F_, 7
+	notetype $6, $10
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 5
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note __, 3
+	octave 6
+	note E_, 1
+	note F_, 1
+	notetype $c, $10
+	note E_, 13
+	note G_, 0
+	note G#, 0
+	loopchannel 0, Music_LookSage_branch_ee430
+; ee45f
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -1,305 +1,299 @@
-_Music_LookYoungster: ; 0xf66c3
-	db $80
-	dw _Music_LookYoungster_Ch1
-	db $01
-	dw _Music_LookYoungster_Ch2
-	db $02
-	dw _Music_LookYoungster_Ch3
-; 0xf66cc
+Music_LookYoungster: ; f66c3
+	dbw $80, Music_LookYoungster_Ch1
+	dbw $01, Music_LookYoungster_Ch2
+	dbw $02, Music_LookYoungster_Ch3
+; f66cc
 
-_Music_LookYoungster_Ch1: ; 0xf66cc
-	tempo $7600
+
+Music_LookYoungster_Ch1: ; f66cc
+	tempo 118
 	volume $77
-	stereopanning $0f
-	dutycycle $03
-	notetype $0c, $a3
-	octave3
-	note $80
-	note $90
-	note $a0
-	note $b0
+	stereopanning $f
+	dutycycle $3
+	notetype $c, $a3
+	octave 3
+	note G_, 0
+	note G#, 0
+	note A_, 0
+	note A#, 0
 	intensity $3e
-	note $cf
+	note B_, 15
 	intensity $c3
-	octave4
-	note $10
-	note $02
-	note $13
-	note $01
-	note $15
+	octave 4
+	note C_, 0
+	note __, 2
+	note C_, 3
+	note __, 1
+	note C_, 5
 	intensity $b3
-	note $01
-	octave3
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	octave4
-	note $30
-	note $00
-	note $10
-	note $02
-	note $10
-	note $00
-	note $0f
-	note $01
-	octave3
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	octave4
-	note $30
-	note $00
-	note $10
-	note $02
-	note $10
-	note $00
-	note $0f
-	loopchannel $00, $66ea ; end
-; 0xf670e
 
-; 0xf670e
-	endchannel
-; 0xf670f
+Music_LookYoungster_branch_f66ea: ; f66ea
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 0
+	note __, 15
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 0
+	note __, 15
+	loopchannel 0, Music_LookYoungster_branch_f66ea
+INCBIN "baserom.gbc", $f670e, $f670f - $f670e
 
-_Music_LookYoungster_Ch2: ; 0xf670f
+Music_LookYoungster_Ch2: ; f670f
 	stereopanning $f0
 	vibrato $12, $26
-	dutycycle $01
-	notetype $0c, $a3
-	octave3
-	note $c0
-	octave4
-	note $10
-	note $20
-	note $30
+	dutycycle $1
+	notetype $c, $a3
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	note C#, 0
+	note D_, 0
 	intensity $3e
-	notetype $0c, $2e
-	note $8f
-	notetype $0c, $b3
+	notetype $c, $2e
+	note G_, 15
+	notetype $c, $b3
 	intensity $c3
-	note $60
-	note $02
-	note $63
-	note $01
-	note $75
-	dutycycle $03
+	note F_, 0
+	note __, 2
+	note F_, 3
+	note __, 1
+	note F#, 5
+
+Music_LookYoungster_branch_f672f: ; f672f
+	dutycycle $3
 	intensity $b3
-	note $01
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $80
-	note $00
-	note $60
-	note $02
-	note $60
-	note $00
+	note __, 1
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G_, 0
+	note __, 0
+	note F_, 0
+	note __, 2
+	note F_, 0
+	note __, 0
 	intensity $97
-	dutycycle $02
-	note $40
-	note $60
-	note $40
-	note $30
-	note $10
-	note $00
-	octave3
-	note $90
-	note $02
-	note $60
-	note $00
-	note $80
-	note $00
-	note $90
-	note $00
-	dutycycle $03
+	dutycycle $2
+	note D#, 0
+	note F_, 0
+	note D#, 0
+	note D_, 0
+	note C_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 2
+	note F_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	dutycycle $3
 	intensity $b3
-	note $01
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $80
-	note $00
-	note $60
-	note $02
-	note $60
-	note $00
-	dutycycle $02
+	note __, 1
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G_, 0
+	note __, 0
+	note F_, 0
+	note __, 2
+	note F_, 0
+	note __, 0
+	dutycycle $2
 	intensity $97
-	note $90
-	note $b0
-	note $90
-	note $80
-	note $60
-	note $00
-	note $10
-	note $02
-	octave3
-	note $90
-	note $00
-	note $b0
-	note $00
-	octave4
-	note $10
-	note $00
-	loopchannel $00, $672f ; end
-; 0xf6783
+	note G#, 0
+	note A#, 0
+	note G#, 0
+	note G_, 0
+	note F_, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	octave 3
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	loopchannel 0, Music_LookYoungster_branch_f672f
+INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
 
-; 0xf6783
-	endchannel
-; 0xf6784
-
-_Music_LookYoungster_Ch3: ; 0xf6784
+Music_LookYoungster_Ch3: ; f6784
 	stereopanning $ff
-	vibrato $02, $24
-	notetype $0c, $25
-	note $03
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
+	vibrato $2, $24
+	notetype $c, $25
+	note __, 3
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
 	intensity $15
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	note $30
-	note $02
-	note $33
-	note $01
-	note $95
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 2
+	note D_, 3
+	note __, 1
+	note G#, 5
 	intensity $25
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $60
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $60
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $60
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $60
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $90
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $90
-	note $00
-	octave3
-	note $40
-	note $00
-	octave2
-	note $90
-	note $00
-	octave3
-	note $40
-	note $00
-	note $80
-	note $00
-	note $90
-	note $00
-	loopchannel $00, $67ae ; end
-; 0xf6810
 
-	endchannel ; end
-	
-; 0xf6811
\ No newline at end of file
+Music_LookYoungster_branch_f67ae: ; f67ae
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note F_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	loopchannel 0, Music_LookYoungster_branch_f67ae
+; f6810
+
+INCBIN "baserom.gbc", $f6810, $f6811 - $f6810
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -1,278 +1,283 @@
-_Music_MagnetTrain: ; 0xef5f0
-	db $c0
-	dw _Music_MagnetTrain_Ch1
-	db $01
-	dw _Music_MagnetTrain_Ch2
-	db $02
-	dw _Music_MagnetTrain_Ch3
-	db $03
-	dw _Music_MagnetTrain_Ch4
-; 0xef5fc
+Music_MagnetTrain: ; ef5f0
+	dbw $c0, Music_MagnetTrain_Ch1
+	dbw $01, Music_MagnetTrain_Ch2
+	dbw $02, Music_MagnetTrain_Ch3
+	dbw $03, Music_MagnetTrain_Ch4
+; ef5fc
 
-_Music_MagnetTrain_Ch1: ; 0xef5fc
-	tempo $6e00
+
+Music_MagnetTrain_Ch1: ; ef5fc
+	tempo 110
 	volume $77
-	stereopanning $0f
+	stereopanning $f
 	vibrato $14, $23
-	dutycycle $02
-	notetype $0c, $b2
-	note $0f
-	note $0f
+	dutycycle $2
+	notetype $c, $b2
+	note __, 15
+	note __, 15
 	intensity $b7
-	octave4
-	note $30
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $30
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $30
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $30
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $50
-	note $10
-	octave3
-	note $a0
-	octave4
-	note $10
-	note $50
-	note $10
-	octave3
-	note $a0
-	octave4
-	note $10
-	note $50
-	note $10
-	octave3
-	note $a0
-	octave4
-	note $10
-	note $50
-	note $10
-	notetype $06, $b7
-	note $70
-	note $00
-	note $70
-	note $00
-	notetype $0c, $b7
-	note $3f
-	endchannel ; end
-; 0xef648
+	octave 4
+	note D_, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note C_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note C_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note C_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note C_, 0
+	notetype $6, $b7
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	notetype $c, $b7
+	note D_, 15
+	endchannel
 
-_Music_MagnetTrain_Ch2: ; 0xef648
+Music_MagnetTrain_Ch2: ; ef648
 	vibrato $14, $23
-	dutycycle $01
-	notetype $0c, $d2
+	dutycycle $1
+	notetype $c, $d2
 	stereopanning $f0
-	notetype $0c, $d8
-	octave1
-	note $6b
-	note $01
-	notetype $06, $d7
-	note $60
-	note $00
-	note $60
-	note $00
-	octave2
-	note $63
-	note $03
-	note $63
-	note $03
-	note $63
-	note $03
-	note $63
-	note $03
-	dutycycle $03
-	notetype $0c, $d7
-	octave4
-	note $8f
-	note $ac
-	note $00
-	notetype $06, $d7
-	note $a0
-	note $00
-	note $a0
-	note $00
-	notetype $0c, $d7
-	note $af
-	endchannel ; end
-; 0xef67d
+	notetype $c, $d8
+	octave 1
+	note F_, 11
+	note __, 1
+	notetype $6, $d7
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 2
+	note F_, 3
+	note __, 3
+	note F_, 3
+	note __, 3
+	note F_, 3
+	note __, 3
+	note F_, 3
+	note __, 3
+	dutycycle $3
+	notetype $c, $d7
+	octave 4
+	note G_, 15
+	note A_, 12
+	note __, 0
+	notetype $6, $d7
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	notetype $c, $d7
+	note A_, 15
+	endchannel
 
-_Music_MagnetTrain_Ch3: ; 0xef67d
+Music_MagnetTrain_Ch3: ; ef67d
 	stereopanning $ff
 	vibrato $10, $23
-	notetype $0c, $15
-	octave6
-	note $10
-	octave5
-	note $80
-	note $40
-	note $10
-	note $80
-	note $40
-	note $10
-	octave4
-	note $80
-	octave5
-	note $40
-	note $10
-	octave4
-	note $80
-	note $40
-	octave5
-	note $10
-	octave4
-	note $80
-	note $40
-	note $10
-	note $80
-	note $40
-	note $10
-	octave3
-	note $80
-	octave4
-	note $10
-	note $40
-	note $80
-	note $10
-	note $40
-	note $80
-	octave5
-	note $10
-	octave4
-	note $80
-	octave5
-	note $10
-	note $40
-	note $80
-	note $10
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $30
-	octave3
-	note $30
-	octave2
-	note $3f
-	endchannel ; end
-; 0xef6f4
+	notetype $c, $15
+	octave 6
+	note C_, 0
+	octave 5
+	note G_, 0
+	note D#, 0
+	note C_, 0
+	note G_, 0
+	note D#, 0
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note D#, 0
+	note C_, 0
+	octave 4
+	note G_, 0
+	note D#, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
+	note D#, 0
+	note C_, 0
+	note G_, 0
+	note D#, 0
+	note C_, 0
+	octave 3
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D#, 0
+	note G_, 0
+	note C_, 0
+	note D#, 0
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note G_, 0
+	octave 5
+	note C_, 0
+	note D#, 0
+	note G_, 0
+	note C_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note D_, 15
+	endchannel
 
-_Music_MagnetTrain_Ch4: ; 0xef6f4
-	togglenoise $03
-	notetype $0c
-	note $cb
-	note $31
-	note $b0
-	note $b0
-	notetype $06
-	note $43
-	note $73
-	note $43
-	note $73
-	note $b3
-	note $73
-	note $b3
-	note $31
-	note $31
-	callchannel _Music_MagnetTrain_sub_0xef71e
-	callchannel _Music_MagnetTrain_sub_0xef71e
-	notetype $0c
-	note $cf
-	endchannel ; end
-; 0xef711
+Music_MagnetTrain_Ch4: ; ef6f4
+	togglenoise $3
+	notetype $c
+	note B_, 11
+	note D_, 1
+	note A#, 0
+	note A#, 0
+	notetype $6
+	note D#, 3
+	note F#, 3
+	note D#, 3
+	note F#, 3
+	note A#, 3
+	note F#, 3
+	note A#, 3
+	note D_, 1
+	note D_, 1
+	callchannel Music_MagnetTrain_branch_ef71e
+	callchannel Music_MagnetTrain_branch_ef71e
+	notetype $c
+	note B_, 15
+	endchannel
+; ef711
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	endchannel
+; ef71e
 
-INCBIN "baserom.gbc", $ef711, $ef71e - $ef711
-
-_Music_MagnetTrain_sub_0xef71e: ; 0xef71e
-; subroutine
-	note $91
-	note $81
-	note $81
-	note $81
-	note $91
-	note $81
-	note $81
-	note $81
-	note $91
-	note $81
-	note $81
-	note $81
-	note $91
-	note $81
-	note $81
-	note $81
-	endchannel ; end
-; 0xef72f
+Music_MagnetTrain_branch_ef71e: ; ef71e
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	endchannel
+; ef72f
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -1,147 +1,149 @@
-_Music_MainMenu: ; 0xf78fd
-	db $c0
-	dw _Music_MainMenu_Ch1
-	db $01
-	dw _Music_MainMenu_Ch2
-	db $02
-	dw _Music_MainMenu_Ch3
-	db $03
-	dw _Music_MainMenu_Ch4
-; 0xf7909
+Music_MainMenu: ; f78fd
+	dbw $c0, Music_MainMenu_Ch1
+	dbw $01, Music_MainMenu_Ch2
+	dbw $02, Music_MainMenu_Ch3
+	dbw $03, Music_MainMenu_Ch4
+; f7909
 
-_Music_MainMenu_Ch1: ; 0xf7909
-	tempo $a000
+
+Music_MainMenu_Ch1: ; f7909
+	tempo 160
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $10, $15
 	stereopanning $f0
-	notetype $0c, $0f
-	octave3
-	note $37
-	notetype $0c, $92
-	octave3
-	note $25
-	note $20
-	note $20
-	note $21
-	note $21
-	note $23
-	loopchannel $02, $791d
-	note $45
-	note $40
-	note $40
-	note $41
-	note $41
-	note $43
-	octave2
-	note $c5
-	note $c0
-	note $c0
-	note $c1
-	note $c1
-	notetype $0c, $94
-	octave3
-	note $13
-	loopchannel $00, $791d ; end
-; 0xf7940
+	notetype $c, $f
+	octave 3
+	note D_, 7
 
-_Music_MainMenu_Ch2: ; 0xf7940
-	dutycycle $03
-	stereopanning $0f
-	notetype $0c, $0f
-	octave3
-	note $87
-	notetype $0c, $a2
-	note $75
-	note $70
-	note $70
-	note $71
-	note $71
-	note $73
-	loopchannel $02, $7949
-	note $95
-	note $90
-	note $90
-	note $91
-	note $91
-	note $93
-	note $55
-	note $50
-	note $50
-	note $51
-	note $51
-	notetype $0c, $a4
-	note $63
-	loopchannel $00, $7949 ; end
-; 0xf7969
+Music_MainMenu_branch_f791d: ; f791d
+	notetype $c, $92
+	octave 3
+	note C#, 5
+	note C#, 0
+	note C#, 0
+	note C#, 1
+	note C#, 1
+	note C#, 3
+	loopchannel 2, Music_MainMenu_branch_f791d
+	note D#, 5
+	note D#, 0
+	note D#, 0
+	note D#, 1
+	note D#, 1
+	note D#, 3
+	octave 2
+	note B_, 5
+	note B_, 0
+	note B_, 0
+	note B_, 1
+	note B_, 1
+	notetype $c, $94
+	octave 3
+	note C_, 3
+	loopchannel 0, Music_MainMenu_branch_f791d
 
-_Music_MainMenu_Ch3: ; 0xf7969
+Music_MainMenu_Ch2: ; f7940
+	dutycycle $3
+	stereopanning $f
+	notetype $c, $f
+	octave 3
+	note G_, 7
+
+Music_MainMenu_branch_f7949: ; f7949
+	notetype $c, $a2
+	note F#, 5
+	note F#, 0
+	note F#, 0
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	loopchannel 2, Music_MainMenu_branch_f7949
+	note G#, 5
+	note G#, 0
+	note G#, 0
+	note G#, 1
+	note G#, 1
+	note G#, 3
+	note E_, 5
+	note E_, 0
+	note E_, 0
+	note E_, 1
+	note E_, 1
+	notetype $c, $a4
+	note F_, 3
+	loopchannel 0, Music_MainMenu_branch_f7949
+
+Music_MainMenu_Ch3: ; f7969
 	stereopanning $f0
-	notetype $0c, $25
-	note $07
-	octave2
-	note $70
-	note $04
-	note $70
-	note $70
-	note $70
-	note $00
-	note $70
-	note $00
-	note $70
-	note $02
-	loopchannel $02, $796f
-	note $90
-	note $04
-	note $90
-	note $90
-	note $90
-	note $00
-	note $90
-	note $00
-	note $90
-	note $02
-	note $50
-	note $04
-	note $50
-	note $50
-	note $50
-	note $00
-	note $50
-	note $00
-	note $60
-	note $02
-	loopchannel $00, $796f ; end
-; 0xf7996
+	notetype $c, $25
+	note __, 7
 
-_Music_MainMenu_Ch4: ; 0xf7996
-	stereopanning $0f
-	togglenoise $03
-	notetype $0c
-	note $07
-	note $0f
-	note $0f
-	note $0f
-	note $0b
-	note $30
-	note $30
-	note $30
-	note $30
-	note $35
-	note $30
-	note $30
-	note $31
-	note $31
-	note $33
-	note $35
-	note $30
-	note $30
-	note $31
-	note $31
-	note $40
-	note $40
-	note $30
-	note $30
-	loopchannel $00, $79a5 ; end
-; 0xf79b8
+Music_MainMenu_branch_f796f: ; f796f
+	octave 2
+	note F#, 0
+	note __, 4
+	note F#, 0
+	note F#, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 2
+	loopchannel 2, Music_MainMenu_branch_f796f
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 2
+	note E_, 0
+	note __, 4
+	note E_, 0
+	note E_, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 2
+	loopchannel 0, Music_MainMenu_branch_f796f
+
+Music_MainMenu_Ch4: ; f7996
+	stereopanning $f
+	togglenoise $3
+	notetype $c
+	note __, 7
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 11
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+
+Music_MainMenu_branch_f79a5: ; f79a5
+	note D_, 5
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 5
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note D_, 0
+	loopchannel 0, Music_MainMenu_branch_f79a5
+; f79b8
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -1,676 +1,677 @@
-_Music_MobileAdapter: ; 0x1fc87
-	db $c0
-	dw _Music_MobileAdapter_Ch1
-	db $01
-	dw _Music_MobileAdapter_Ch2
-	db $02
-	dw _Music_MobileAdapter_Ch3
-	db $03
-	dw _Music_MobileAdapter_Ch4
-; 0x1fc93
+Music_MobileAdapter: ; 1fc87
+	dbw $c0, Music_MobileAdapter_Ch1
+	dbw $01, Music_MobileAdapter_Ch2
+	dbw $02, Music_MobileAdapter_Ch3
+	dbw $03, Music_MobileAdapter_Ch4
+; 1fc93
 
-_Music_MobileAdapter_Ch1: ; 0x1fc93
-	tempo $8400
+
+Music_MobileAdapter_Ch1: ; 1fc93
+	tempo 132
 	volume $77
-	tone $0100
-	stereopanning $0f
-	dutycycle $02
-	notetype $0c, $84
-	note $01
-	note $05
-	octave3
-	note $80
-	octave4
-	note $30
-	note $50
-	note $00
-	note $30
-	note $00
-	note $23
-	callchannel _Music_MobileAdapter_sub_0x1fd39
-	note $30
-	note $20
-	note $31
-	octave3
-	note $a0
-	note $80
-	note $a1
-	note $70
-	note $50
-	note $71
-	note $30
-	note $20
-	note $31
-	callchannel _Music_MobileAdapter_sub_0x1fd39
-	note $30
-	note $20
-	octave3
-	note $c0
-	octave4
-	note $30
-	note $70
-	note $50
-	note $30
-	note $20
+	tone $0001
+	stereopanning $f
+	dutycycle $2
+	notetype $c, $84
+	note __, 1
+	note __, 5
+	octave 3
+	note G_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C#, 3
+
+Music_MobileAdapter_branch_1fcad: ; 1fcad
+	callchannel Music_MobileAdapter_branch_1fd39
+	note D_, 0
+	note C#, 0
+	note D_, 1
+	octave 3
+	note A_, 0
+	note G_, 0
+	note A_, 1
+	note F#, 0
+	note E_, 0
+	note F#, 1
+	note D_, 0
+	note C#, 0
+	note D_, 1
+	callchannel Music_MobileAdapter_branch_1fd39
+	note D_, 0
+	note C#, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note D_, 0
+	note F#, 0
+	note E_, 0
+	note D_, 0
+	note C#, 0
 	intensity $94
-	note $31
-	octave3
-	note $a1
-	octave4
-	note $33
-	octave5
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	octave4
-	note $27
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 3
+	octave 5
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 7
 	intensity $92
-	note $70
-	note $80
-	note $a1
-	note $91
-	note $a1
+	note F#, 0
+	note G_, 0
+	note A_, 1
+	note G#, 1
+	note A_, 1
 	intensity $94
-	note $52
-	octave3
-	note $a2
-	note $53
-	octave4
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	octave3
-	note $c7
+	note E_, 2
+	octave 3
+	note A_, 2
+	note E_, 3
+	octave 4
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note B_, 7
 	intensity $92
-	octave4
-	note $c0
-	octave5
-	note $10
-	note $21
-	octave4
-	note $c1
-	note $a1
-	octave5
-	note $22
+	octave 4
+	note B_, 0
+	octave 5
+	note C_, 0
+	note C#, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	octave 5
+	note C#, 2
 	intensity $94
-	octave4
-	note $22
-	octave3
-	note $a3
-	octave4
-	note $70
-	note $00
-	note $70
-	note $00
-	note $70
-	note $00
-	octave3
-	note $79
-	octave4
-	note $30
-	note $00
-	note $30
-	note $00
-	note $30
-	note $00
-	octave3
-	note $39
-	octave4
-	note $a7
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 3
+	octave 4
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note F#, 9
+	octave 4
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 3
+	note D_, 9
+	octave 4
+	note A_, 7
 	intensity $a1
-	octave3
-	note $20
-	note $30
-	note $50
-	note $70
-	note $80
-	note $a0
-	note $c0
-	octave4
-	note $20
-	note $30
-	note $20
-	note $31
-	octave3
-	note $a0
-	note $80
-	note $a1
+	octave 3
+	note C#, 0
+	note D_, 0
+	note E_, 0
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 1
+	octave 3
+	note A_, 0
+	note G_, 0
+	note A_, 1
 	intensity $94
-	note $71
-	octave2
-	note $a1
-	octave3
-	note $33
+	note F#, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
 	intensity $77
-	callchannel _Music_MobileAdapter_sub_0x1ff09
-	loopchannel $00, $7cad ; end
-; 0x1fd39
+	callchannel Music_MobileAdapter_branch_1ff09
+	loopchannel 0, Music_MobileAdapter_branch_1fcad
+; 1fd39
 
-_Music_MobileAdapter_sub_0x1fd39: ; 0x1fd39
-; subroutine
+Music_MobileAdapter_branch_1fd39: ; 1fd39
 	intensity $94
-	octave4
-	note $70
-	note $00
-	note $70
-	note $00
-	note $71
-	octave3
-	note $79
-	octave4
-	note $80
-	note $00
-	note $80
-	note $00
-	note $81
-	octave3
-	note $87
+	octave 4
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 1
+	octave 3
+	note F#, 9
+	octave 4
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 1
+	octave 3
+	note G_, 7
 	intensity $a1
-	note $c0
-	octave4
-	note $30
-	note $50
-	note $30
-	note $20
-	note $50
-	note $30
-	note $20
-	octave3
-	note $c0
-	note $a0
-	note $50
-	note $70
-	note $80
-	note $70
-	note $50
-	note $a0
-	note $c0
-	octave4
-	note $20
-	endchannel ; end
-; 0x1fd63
+	note B_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note C#, 0
+	note E_, 0
+	note D_, 0
+	note C#, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note E_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note E_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	endchannel
+; 1fd63
 
-_Music_MobileAdapter_Ch2: ; 0x1fd63
-	notetype $0c, $c1
+Music_MobileAdapter_Ch2: ; 1fd63
+	notetype $c, $c1
 	vibrato $10, $23
-	dutycycle $02
-	octave3
-	note $80
-	note $c0
-	octave4
-	note $30
-	note $20
-	note $31
-	octave3
-	note $c0
-	note $b0
-	note $c1
-	octave4
-	note $21
-	octave3
-	note $c1
-	note $a1
+	dutycycle $2
+	octave 3
+	note G_, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note C#, 0
+	note D_, 1
+	octave 3
+	note B_, 0
+	note A#, 0
+	note B_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
 	intensity $b4
-	octave4
-	note $30
-	note $70
-	callchannel _Music_MobileAdapter_sub_0x1fdfe
-	note $a3
-	note $83
-	note $a3
-	note $53
-	note $7b
-	note $01
-	note $30
-	note $70
-	callchannel _Music_MobileAdapter_sub_0x1fdfe
-	octave5
-	note $23
-	octave4
-	note $a3
-	octave5
-	note $73
-	note $53
-	note $3b
-	note $01
-	note $20
-	note $30
-	note $50
-	note $00
-	note $50
-	note $00
-	note $50
-	note $00
-	note $83
-	note $71
-	note $51
-	note $31
-	note $28
+	octave 4
+	note D_, 0
+	note F#, 0
+
+Music_MobileAdapter_branch_1fd80: ; 1fd80
+	callchannel Music_MobileAdapter_branch_1fdfe
+	note A_, 3
+	note G_, 3
+	note A_, 3
+	note E_, 3
+	note F#, 11
+	note __, 1
+	note D_, 0
+	note F#, 0
+	callchannel Music_MobileAdapter_branch_1fdfe
+	octave 5
+	note C#, 3
+	octave 4
+	note A_, 3
+	octave 5
+	note F#, 3
+	note E_, 3
+	note D_, 11
+	note __, 1
+	note C#, 0
+	note D_, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 3
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 8
 	intensity $a2
-	octave3
-	note $52
-	note $21
+	octave 3
+	note E_, 2
+	note C#, 1
 	intensity $b4
-	octave5
-	note $30
-	note $20
-	octave4
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c0
-	note $00
-	octave5
-	note $23
-	note $31
-	note $51
-	note $71
-	note $58
+	octave 5
+	note D_, 0
+	note C#, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 5
+	note C#, 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 8
 	intensity $a2
-	octave3
-	note $a2
-	note $51
+	octave 3
+	note A_, 2
+	note E_, 1
 	intensity $b4
-	octave5
-	note $70
-	note $80
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $83
-	note $71
-	note $51
-	note $30
-	note $20
-	octave4
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c0
-	note $00
-	octave5
-	note $83
-	note $71
-	note $31
-	octave4
-	note $b0
-	note $c0
-	octave5
-	note $2b
-	note $53
-	note $3f
-	dutycycle $01
+	octave 5
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G_, 3
+	note F#, 1
+	note E_, 1
+	note D_, 0
+	note C#, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 5
+	note G_, 3
+	note F#, 1
+	note D_, 1
+	octave 4
+	note A#, 0
+	note B_, 0
+	octave 5
+	note C#, 11
+	note E_, 3
+	note D_, 15
+	dutycycle $1
 	intensity $71
-	callchannel _Music_MobileAdapter_sub_0x1fe16
-	octave4
-	note $50
-	note $a0
-	octave5
-	note $20
-	note $50
-	callchannel _Music_MobileAdapter_sub_0x1fe16
-	note $01
-	dutycycle $02
+	callchannel Music_MobileAdapter_branch_1fe16
+	octave 4
+	note E_, 0
+	note A_, 0
+	octave 5
+	note C#, 0
+	note E_, 0
+	callchannel Music_MobileAdapter_branch_1fe16
+	note __, 1
+	dutycycle $2
 	intensity $b4
-	octave4
-	note $30
-	note $70
-	loopchannel $00, $7d80 ; end
-; 0x1fdfe
+	octave 4
+	note D_, 0
+	note F#, 0
+	loopchannel 0, Music_MobileAdapter_branch_1fd80
+; 1fdfe
 
-_Music_MobileAdapter_sub_0x1fdfe: ; 0x1fdfe
-; subroutine
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a1
-	octave5
-	note $33
-	note $21
-	octave4
-	note $c1
-	note $80
-	note $a0
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c1
-	octave5
-	note $53
-	note $31
-	note $21
-	octave4
-	note $c1
-	endchannel ; end
-; 0x1fe16
+Music_MobileAdapter_branch_1fdfe: ; 1fdfe
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 1
+	octave 5
+	note D_, 3
+	note C#, 1
+	octave 4
+	note B_, 1
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 1
+	octave 5
+	note E_, 3
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 1
+	endchannel
+; 1fe16
 
-_Music_MobileAdapter_sub_0x1fe16: ; 0x1fe16
-; subroutine
-	octave5
-	note $70
-	note $30
-	octave4
-	note $a0
-	note $70
-	octave5
-	note $70
-	note $30
-	octave4
-	note $a0
-	note $70
-	octave5
-	note $70
-	note $30
-	octave4
-	note $b0
-	note $70
-	octave5
-	note $70
-	note $30
-	octave4
-	note $b0
-	note $70
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $23
-	endchannel ; end
-; 0x1fe3d
+Music_MobileAdapter_branch_1fe16: ; 1fe16
+	octave 5
+	note F#, 0
+	note D_, 0
+	octave 4
+	note A_, 0
+	note F#, 0
+	octave 5
+	note F#, 0
+	note D_, 0
+	octave 4
+	note A_, 0
+	note F#, 0
+	octave 5
+	note F#, 0
+	note D_, 0
+	octave 4
+	note A#, 0
+	note F#, 0
+	octave 5
+	note F#, 0
+	note D_, 0
+	octave 4
+	note A#, 0
+	note F#, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note C#, 3
+	endchannel
+; 1fe3d
 
-_Music_MobileAdapter_Ch3: ; 0x1fe3d
-	notetype $0c, $14
-	note $01
-	octave3
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $80
-	note $a0
-	note $00
-	note $50
-	note $00
-	note $a3
-	callchannel _Music_MobileAdapter_sub_0x1fecf
-	callchannel _Music_MobileAdapter_sub_0x1fee3
-	callchannel _Music_MobileAdapter_sub_0x1feee
-	note $30
-	note $00
-	octave2
-	note $a0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $20
-	note $00
-	callchannel _Music_MobileAdapter_sub_0x1fecf
-	callchannel _Music_MobileAdapter_sub_0x1fee3
-	callchannel _Music_MobileAdapter_sub_0x1feee
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $33
-	callchannel _Music_MobileAdapter_sub_0x1fee3
-	callchannel _Music_MobileAdapter_sub_0x1fef7
-	note $c0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $30
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $30
-	note $00
-	octave2
-	note $80
-	note $00
-	note $c0
-	note $00
-	callchannel _Music_MobileAdapter_sub_0x1fef7
-	octave3
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $20
-	note $00
-	note $a0
-	note $00
-	note $20
-	note $00
-	note $a0
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $80
-	note $00
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $80
-	note $00
-	callchannel _Music_MobileAdapter_sub_0x1fee3
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $71
-	octave2
-	note $a1
-	octave3
-	note $33
-	callchannel _Music_MobileAdapter_sub_0x1ff09
-	loopchannel $00, $7e4f ; end
-; 0x1fecf
+Music_MobileAdapter_Ch3: ; 1fe3d
+	notetype $c, $14
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note G_, 0
+	note A_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note A_, 3
 
-_Music_MobileAdapter_sub_0x1fecf: ; 0x1fecf
-; subroutine
-	octave3
-	note $30
-	note $00
-	note $a0
-	note $00
-	loopchannel $04, $7ecf
-	octave2
-	note $80
-	note $00
-	octave3
-	note $30
-	note $00
-	loopchannel $04, $7ed8
-	endchannel ; end
-; 0x1fee3
+Music_MobileAdapter_branch_1fe4f: ; 1fe4f
+	callchannel Music_MobileAdapter_branch_1fecf
+	callchannel Music_MobileAdapter_branch_1fee3
+	callchannel Music_MobileAdapter_branch_1feee
+	note D_, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	callchannel Music_MobileAdapter_branch_1fecf
+	callchannel Music_MobileAdapter_branch_1fee3
+	callchannel Music_MobileAdapter_branch_1feee
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
+	callchannel Music_MobileAdapter_branch_1fee3
+	callchannel Music_MobileAdapter_branch_1fef7
+	note B_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	callchannel Music_MobileAdapter_branch_1fef7
+	octave 3
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	callchannel Music_MobileAdapter_branch_1fee3
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
+	callchannel Music_MobileAdapter_branch_1ff09
+	loopchannel 0, Music_MobileAdapter_branch_1fe4f
+; 1fecf
 
-_Music_MobileAdapter_sub_0x1fee3: ; 0x1fee3
-; subroutine
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $50
-	note $00
-	loopchannel $04, $7ee3
-	endchannel ; end
-; 0x1feee
+Music_MobileAdapter_branch_1fecf: ; 1fecf
+	octave 3
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	loopchannel 4, Music_MobileAdapter_branch_1fecf
 
-_Music_MobileAdapter_sub_0x1feee: ; 0x1feee
-; subroutine
-	note $30
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0x1fef7
+Music_MobileAdapter_branch_1fed8: ; 1fed8
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	loopchannel 4, Music_MobileAdapter_branch_1fed8
+	endchannel
+; 1fee3
 
-_Music_MobileAdapter_sub_0x1fef7: ; 0x1fef7
-; subroutine
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $20
-	note $00
-	note $50
-	note $00
-	note $20
-	note $00
-	octave2
-	note $a0
-	octave3
-	note $51
-	note $00
-	octave2
-	note $a3
-	endchannel ; end
-; 0x1ff09
+Music_MobileAdapter_branch_1fee3: ; 1fee3
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note E_, 0
+	note __, 0
+	loopchannel 4, Music_MobileAdapter_branch_1fee3
+	endchannel
+; 1feee
 
-_Music_MobileAdapter_sub_0x1ff09: ; 0x1ff09
-; subroutine
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $31
-	octave2
-	note $a0
-	octave3
-	note $32
-	octave2
-	note $b0
-	note $00
-	octave3
-	note $31
-	octave2
-	note $b0
-	octave3
-	note $32
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $31
-	octave2
-	note $c0
-	octave3
-	note $32
-	octave2
-	note $a1
-	note $05
-	loopchannel $02, $7f09
-	endchannel ; end
-; 0x1ff2c
+Music_MobileAdapter_branch_1feee: ; 1feee
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	endchannel
+; 1fef7
 
-_Music_MobileAdapter_Ch4: ; 0x1ff2c
-	togglenoise $03
+Music_MobileAdapter_branch_1fef7: ; 1fef7
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	octave 3
+	note E_, 1
+	note __, 0
+	octave 2
+	note A_, 3
+	endchannel
+; 1ff09
+
+Music_MobileAdapter_branch_1ff09: ; 1ff09
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 0
+	octave 3
+	note D_, 2
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note A#, 0
+	octave 3
+	note D_, 2
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 2
+	octave 2
+	note A_, 1
+	note __, 5
+	loopchannel 2, Music_MobileAdapter_branch_1ff09
+	endchannel
+
+Music_MobileAdapter_Ch4: ; 1ff2c
+	togglenoise $3
 	stereopanning $f0
-	notetype $0c
-	note $01
-	note $09
-	note $31
-	note $31
-	note $30
-	note $30
-	callchannel _Music_MobileAdapter_sub_0x1ff60
-	callchannel _Music_MobileAdapter_sub_0x1ff60
-	note $03
-	note $37
-	note $37
-	note $33
-	note $30
-	note $32
-	note $33
-	loopchannel $02, $7f3e
-	note $03
-	note $33
-	loopchannel $0b, $7f49
-	note $01
-	note $31
-	note $31
-	note $30
-	note $30
-	note $03
-	note $37
-	note $37
-	note $35
-	note $31
-	note $31
-	note $30
-	note $30
-	loopchannel $00, $7f38 ; end
-; 0x1ff60
+	notetype $c
+	note __, 1
+	note __, 9
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
 
-_Music_MobileAdapter_sub_0x1ff60: ; 0x1ff60
-; subroutine
-	note $03
-	note $33
-	loopchannel $07, $7f60
-	note $01
-	note $31
-	note $31
-	note $30
-	note $30
-	endchannel ; end
-; 0x1ff6c
+Music_MobileAdapter_branch_1ff38: ; 1ff38
+	callchannel Music_MobileAdapter_branch_1ff60
+	callchannel Music_MobileAdapter_branch_1ff60
+
+Music_MobileAdapter_branch_1ff3e: ; 1ff3e
+	note __, 3
+	note D_, 7
+	note D_, 7
+	note D_, 3
+	note D_, 0
+	note D_, 2
+	note D_, 3
+	loopchannel 2, Music_MobileAdapter_branch_1ff3e
+
+Music_MobileAdapter_branch_1ff49: ; 1ff49
+	note __, 3
+	note D_, 3
+	loopchannel 11, Music_MobileAdapter_branch_1ff49
+	note __, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note __, 3
+	note D_, 7
+	note D_, 7
+	note D_, 5
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	loopchannel 0, Music_MobileAdapter_branch_1ff38
+; 1ff60
+
+Music_MobileAdapter_branch_1ff60: ; 1ff60
+	note __, 3
+	note D_, 3
+	loopchannel 7, Music_MobileAdapter_branch_1ff60
+	note __, 1
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	endchannel
+; 1ff6c
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -1,288 +1,284 @@
-_Music_MobileAdapterMenu: ; 0x17801f
-	db $80
-	dw _Music_MobileAdapterMenu_Ch1
-	db $01
-	dw _Music_MobileAdapterMenu_Ch2
-	db $02
-	dw _Music_MobileAdapterMenu_Ch3
-; 0x178028
+Music_MobileAdapterMenu: ; 17801f
+	dbw $80, Music_MobileAdapterMenu_Ch1
+	dbw $01, Music_MobileAdapterMenu_Ch2
+	dbw $02, Music_MobileAdapterMenu_Ch3
+; 178028
 
-_Music_MobileAdapterMenu_Ch1: ; 0x178028
-	tempo $a800
+
+Music_MobileAdapterMenu_Ch1: ; 178028
+	tempo 168
 	volume $77
-	tone $0100
-	stereopanning $0f
-	dutycycle $02
-	notetype $0c, $66
-	note $01
-	callchannel _Music_MobileAdapterMenu_sub_0x178057
-	callchannel _Music_MobileAdapterMenu_sub_0x178076
-	octave3
-	note $73
-	note $c3
-	note $71
-	note $c0
-	note $00
-	note $43
-	callchannel _Music_MobileAdapterMenu_sub_0x178076
-	octave3
-	note $71
-	octave2
-	note $c1
-	octave3
-	note $42
-	note $50
-	note $47
-	callchannel _Music_MobileAdapterMenu_sub_0x178057
-	loopchannel $00, $4038 ; end
-; 0x178057
+	tone $0001
+	stereopanning $f
+	dutycycle $2
+	notetype $c, $66
+	note __, 1
 
-_Music_MobileAdapterMenu_sub_0x178057: ; 0x178057
-; subroutine
-	octave3
-	note $96
-	octave4
-	note $50
-	note $40
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $73
-	note $57
-	note $40
-	note $00
-	note $20
-	note $00
-	note $43
-	note $96
-	octave4
-	note $50
-	note $40
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $73
-	note $a1
-	note $51
-	note $a2
-	note $a0
-	note $97
-	endchannel ; end
-; 0x178076
+Music_MobileAdapterMenu_branch_178038: ; 178038
+	callchannel Music_MobileAdapterMenu_branch_178057
+	callchannel Music_MobileAdapterMenu_branch_178076
+	octave 3
+	note F#, 3
+	note B_, 3
+	note F#, 1
+	note B_, 0
+	note __, 0
+	note D#, 3
+	callchannel Music_MobileAdapterMenu_branch_178076
+	octave 3
+	note F#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 2
+	note E_, 0
+	note D#, 7
+	callchannel Music_MobileAdapterMenu_branch_178057
+	loopchannel 0, Music_MobileAdapterMenu_branch_178038
+; 178057
 
-_Music_MobileAdapterMenu_sub_0x178076: ; 0x178076
-; subroutine
-	note $50
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $22
-	octave3
-	note $c0
-	note $a1
-	octave4
-	note $50
-	note $00
-	note $23
-	endchannel ; end
-; 0x178084
+Music_MobileAdapterMenu_branch_178057: ; 178057
+	octave 3
+	note G#, 6
+	octave 4
+	note E_, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note F#, 3
+	note E_, 7
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note D#, 3
+	note G#, 6
+	octave 4
+	note E_, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note F#, 3
+	note A_, 1
+	note E_, 1
+	note A_, 2
+	note A_, 0
+	note G#, 7
+	endchannel
+; 178076
 
-_Music_MobileAdapterMenu_Ch2: ; 0x178084
+Music_MobileAdapterMenu_branch_178076: ; 178076
+	note E_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 0
+	note A_, 1
+	octave 4
+	note E_, 0
+	note __, 0
+	note C#, 3
+	endchannel
+
+Music_MobileAdapterMenu_Ch2: ; 178084
 	stereopanning $f0
-	notetype $0c, $84
-	dutycycle $02
-	octave4
-	note $50
-	note $90
-	callchannel _Music_MobileAdapterMenu_sub_0x1780ae
-	note $57
-	callchannel _Music_MobileAdapterMenu_sub_0x1780d7
-	note $41
-	note $21
-	note $42
-	note $50
-	note $77
-	callchannel _Music_MobileAdapterMenu_sub_0x1780d7
-	note $41
-	note $51
-	note $72
-	note $90
-	note $75
-	note $50
-	note $90
-	callchannel _Music_MobileAdapterMenu_sub_0x1780ae
-	note $55
-	note $50
-	note $90
-	loopchannel $00, $408e ; end
-; 0x1780ae
+	notetype $c, $84
+	dutycycle $2
+	octave 4
+	note E_, 0
+	note G#, 0
 
-_Music_MobileAdapterMenu_sub_0x1780ae: ; 0x1780ae
-; subroutine
-	octave4
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $a2
-	note $90
-	note $70
-	note $00
-	note $40
-	note $00
-	octave3
-	note $c3
-	octave4
-	note $21
-	note $41
-	note $52
-	note $90
-	note $75
-	note $50
-	note $90
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $a2
-	note $90
-	note $70
-	note $00
-	note $40
-	note $00
-	octave3
-	note $c3
-	octave4
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $22
-	note $40
-	endchannel ; end
-; 0x1780d7
+Music_MobileAdapterMenu_branch_17808e: ; 17808e
+	callchannel Music_MobileAdapterMenu_branch_1780ae
+	note E_, 7
+	callchannel Music_MobileAdapterMenu_branch_1780d7
+	note D#, 1
+	note C#, 1
+	note D#, 2
+	note E_, 0
+	note F#, 7
+	callchannel Music_MobileAdapterMenu_branch_1780d7
+	note D#, 1
+	note E_, 1
+	note F#, 2
+	note G#, 0
+	note F#, 5
+	note E_, 0
+	note G#, 0
+	callchannel Music_MobileAdapterMenu_branch_1780ae
+	note E_, 5
+	note E_, 0
+	note G#, 0
+	loopchannel 0, Music_MobileAdapterMenu_branch_17808e
+; 1780ae
 
-_Music_MobileAdapterMenu_sub_0x1780d7: ; 0x1780d7
-; subroutine
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $92
-	note $70
-	note $51
-	note $a0
-	note $00
-	note $53
-	endchannel ; end
-; 0x1780e2
+Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
+	octave 4
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 2
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 3
+	octave 4
+	note C#, 1
+	note D#, 1
+	note E_, 2
+	note G#, 0
+	note F#, 5
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 2
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 3
+	note B_, 3
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 2
+	note D#, 0
+	endchannel
+; 1780d7
 
-_Music_MobileAdapterMenu_Ch3: ; 0x1780e2
-	vibrato $08, $34
-	notetype $0c, $25
-	note $01
-	callchannel _Music_MobileAdapterMenu_sub_0x178119
-	octave2
-	note $c0
-	note $90
-	callchannel _Music_MobileAdapterMenu_sub_0x178146
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $71
-	note $00
-	note $40
-	note $71
-	note $40
-	note $00
-	octave2
-	note $c1
-	note $70
-	note $90
-	callchannel _Music_MobileAdapterMenu_sub_0x178146
-	octave2
-	note $c1
-	note $01
-	octave3
-	note $71
-	note $00
-	note $40
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $40
-	note $00
-	note $73
-	callchannel _Music_MobileAdapterMenu_sub_0x178119
-	note $01
-	loopchannel $00, $40e9 ; end
-; 0x178119
+Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 2
+	note F#, 0
+	note E_, 1
+	note A_, 0
+	note __, 0
+	note E_, 3
+	endchannel
 
-_Music_MobileAdapterMenu_sub_0x178119: ; 0x178119
-; subroutine
-	octave3
-	note $51
-	note $01
-	note $c1
-	note $00
-	note $90
-	note $40
-	note $00
-	note $c0
-	note $00
-	note $43
-	note $21
-	note $01
-	note $a1
-	note $00
-	note $70
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $40
-	note $00
-	note $73
-	note $51
-	note $01
-	note $c1
-	note $00
-	note $90
-	note $40
-	note $00
-	note $c0
-	note $00
-	note $43
-	note $21
-	note $01
-	note $a1
-	note $00
-	note $20
-	note $52
+Music_MobileAdapterMenu_Ch3: ; 1780e2
+	vibrato $8, $34
+	notetype $c, $25
+	note __, 1
+
+Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
+	callchannel Music_MobileAdapterMenu_branch_178119
+	octave 2
+	note B_, 0
+	note G#, 0
+	callchannel Music_MobileAdapterMenu_branch_178146
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note F#, 1
+	note __, 0
+	note D#, 0
+	note F#, 1
+	note D#, 0
+	note __, 0
+	octave 2
+	note B_, 1
+	note F#, 0
+	note G#, 0
+	callchannel Music_MobileAdapterMenu_branch_178146
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 3
+	note F#, 1
+	note __, 0
+	note D#, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note F#, 3
+	callchannel Music_MobileAdapterMenu_branch_178119
+	note __, 1
+	loopchannel 0, Music_MobileAdapterMenu_branch_1780e9
+; 178119
+
+Music_MobileAdapterMenu_branch_178119: ; 178119
+	octave 3
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 0
+	note G#, 0
+	note D#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D#, 3
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 0
+	note F#, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note F#, 3
+	note E_, 1
+	note __, 1
+	note B_, 1
+	note __, 0
+	note G#, 0
+	note D#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note D#, 3
+	note C#, 1
+	note __, 1
+	note A_, 1
+	note __, 0
+	note C#, 0
+	note E_, 2
 	intensity $35
-	note $52
+	note E_, 2
 	intensity $25
-	endchannel ; end
-; 0x178146
+	endchannel
+; 178146
 
-_Music_MobileAdapterMenu_sub_0x178146: ; 0x178146
-; subroutine
-	note $a1
-	note $01
-	octave3
-	note $a1
-	note $00
-	note $20
-	note $a1
-	octave4
-	note $20
-	note $00
-	octave3
-	note $a3
-	endchannel ; end
-; 0x178153
+Music_MobileAdapterMenu_branch_178146: ; 178146
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 0
+	note C#, 0
+	note A_, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note A_, 3
+	endchannel
+; 178153
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -1,488 +1,490 @@
-_Music_MobileCenter: ; 0x17961d
-	db $c0
-	dw _Music_MobileCenter_Ch1
-	db $01
-	dw _Music_MobileCenter_Ch2
-	db $02
-	dw _Music_MobileCenter_Ch3
-	db $03
-	dw _Music_MobileCenter_Ch4
-; 0x179629
+Music_MobileCenter: ; 17961d
+	dbw $c0, Music_MobileCenter_Ch1
+	dbw $01, Music_MobileCenter_Ch2
+	dbw $02, Music_MobileCenter_Ch3
+	dbw $03, Music_MobileCenter_Ch4
+; 179629
 
-_Music_MobileCenter_Ch1: ; 0x179629
-	tempo $a000
+
+Music_MobileCenter_Ch1: ; 179629
+	tempo 160
 	volume $77
-	dutycycle $01
-	tone $0200
-	vibrato $08, $22
+	dutycycle $1
+	tone $0002
+	vibrato $8, $22
 	stereopanning $f0
-	notetype $0c, $a2
-	octave3
-	note $51
-	note $61
-	note $83
-	note $81
-	note $a1
-	note $c3
-	octave3
-	note $51
-	note $11
-	note $51
-	octave4
-	note $11
-	octave3
-	note $81
-	note $c1
-	note $a1
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $51
-	note $61
-	note $81
-	note $81
-	note $31
-	note $81
-	note $c1
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $81
-	note $a1
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $51
-	note $11
-	note $51
-	octave4
-	note $11
-	octave3
-	note $81
-	note $c1
-	note $a1
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $51
-	note $61
-	note $81
-	note $81
-	note $31
-	note $81
-	note $c3
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $11
-	note $31
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $51
-	note $31
-	note $13
-	note $31
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $51
-	note $61
-	note $81
-	note $61
-	note $51
-	note $33
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $31
-	note $61
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $87
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a3
-	note $81
-	note $a1
-	note $c1
-	octave4
-	note $11
-	note $31
-	note $11
-	octave3
-	note $c3
-	note $a1
-	note $c1
-	octave4
-	note $11
-	note $31
-	octave3
-	note $c1
-	note $a1
-	note $83
-	note $61
-	note $81
-	note $a1
-	note $61
-	note $81
-	note $61
-	note $51
-	note $31
-	note $11
-	note $31
-	note $51
-	note $61
-	loopchannel $00, $5642 ; end
-; 0x1796cc
+	notetype $c, $a2
+	octave 3
+	note E_, 1
+	note F_, 1
+	note G_, 3
+	note G_, 1
+	note A_, 1
+	note B_, 3
 
-_Music_MobileCenter_Ch2: ; 0x1796cc
-	notetype $0c, $c2
-	dutycycle $03
-	note $09
-	octave1
-	note $81
-	note $a1
-	note $c1
-	octave2
-	note $11
-	note $51
-	octave1
-	note $81
-	octave2
-	note $51
-	note $11
-	note $51
-	note $61
-	note $51
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	note $61
-	note $81
-	note $51
-	note $81
-	note $51
-	note $81
-	note $51
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $11
-	note $51
-	octave1
-	note $81
-	octave2
-	note $51
-	note $11
-	note $51
-	note $61
-	note $51
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	octave1
-	note $81
-	octave2
-	note $81
-	note $31
-	note $81
-	note $61
-	note $81
-	note $11
-	note $51
-	octave1
-	note $81
-	octave2
-	note $51
-	note $11
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $81
-	note $11
-	note $81
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $31
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $31
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $81
-	note $11
-	note $81
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $61
-	note $a1
-	note $11
-	note $a1
-	note $31
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $31
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $51
-	note $81
-	note $11
-	note $81
-	note $51
-	note $61
-	note $51
-	note $31
-	loopchannel $00, $56d6 ; end
-; 0x179777
+Music_MobileCenter_branch_179642: ; 179642
+	octave 3
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 3
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 7
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 3
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 3
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 3
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	loopchannel 0, Music_MobileCenter_branch_179642
 
-_Music_MobileCenter_Ch3: ; 0x179777
-	notetype $0c, $24
+Music_MobileCenter_Ch2: ; 1796cc
+	notetype $c, $c2
+	dutycycle $3
+	note __, 9
+	octave 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+
+Music_MobileCenter_branch_1796d6: ; 1796d6
+	octave 2
+	note C_, 1
+	note E_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note C_, 1
+	note E_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note C_, 1
+	note E_, 1
+	octave 1
+	note G_, 1
+	octave 2
+	note E_, 1
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note D_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note D_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	loopchannel 0, Music_MobileCenter_branch_1796d6
+
+Music_MobileCenter_Ch3: ; 179777
+	notetype $c, $24
 	vibrato $10, $34
-	octave4
-	note $81
-	note $a1
-	note $c3
-	note $c1
-	octave5
-	note $11
-	note $33
-	notetype $0c, $25
-	note $11
-	octave4
-	note $81
-	octave5
-	note $11
-	note $83
-	note $63
-	note $51
-	note $31
-	octave4
-	note $c5
-	notetype $0c, $10
-	octave6
-	note $80
-	note $00
-	note $30
-	note $00
-	octave7
-	note $30
-	note $02
-	notetype $0c, $25
-	octave4
-	note $c1
-	note $81
-	note $c1
-	octave5
-	note $53
-	note $33
-	octave4
-	note $c1
-	octave5
-	note $11
-	note $55
-	octave4
-	note $51
-	note $61
-	note $31
-	note $51
-	octave5
-	note $11
-	octave4
-	note $81
-	octave5
-	note $11
-	note $83
-	note $63
-	note $51
-	note $31
-	octave4
-	note $c5
-	notetype $0c, $10
-	octave6
-	note $80
-	note $00
-	note $30
-	note $00
-	octave7
-	note $30
-	note $02
-	notetype $0c, $25
-	octave4
-	note $c1
-	note $81
-	note $c1
-	octave5
-	note $53
-	note $33
-	octave4
-	note $c1
-	octave5
-	note $17
-	octave4
-	note $81
-	note $a1
-	note $c1
-	octave5
-	note $31
+	octave 4
+	note G_, 1
+	note A_, 1
+	note B_, 3
+	note B_, 1
+	octave 5
+	note C_, 1
+	note D_, 3
+	notetype $c, $25
+
+Music_MobileCenter_branch_179788: ; 179788
+	note C_, 1
+	octave 4
+	note G_, 1
+	octave 5
+	note C_, 1
+	note G_, 3
+	note F_, 3
+	note E_, 1
+	note D_, 1
+	octave 4
+	note B_, 5
+	notetype $c, $10
+	octave 6
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 7
+	note D_, 0
+	note __, 2
+	notetype $c, $25
+	octave 4
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 5
+	note E_, 3
+	note D_, 3
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 1
+	note E_, 5
+	octave 4
+	note E_, 1
+	note F_, 1
+	note D_, 1
+	note E_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G_, 1
+	octave 5
+	note C_, 1
+	note G_, 3
+	note F_, 3
+	note E_, 1
+	note D_, 1
+	octave 4
+	note B_, 5
+	notetype $c, $10
+	octave 6
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 7
+	note D_, 0
+	note __, 2
+	notetype $c, $25
+	octave 4
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	octave 5
+	note E_, 3
+	note D_, 3
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 7
+	octave 4
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note D_, 1
 	vibrato $18, $44
-	note $57
-	note $87
-	note $61
-	note $81
-	note $61
-	note $51
-	note $37
-	octave4
-	note $c7
-	octave5
-	note $37
-	note $51
-	note $61
-	note $51
-	note $31
-	note $17
-	note $57
-	note $87
-	note $61
-	note $51
-	note $61
-	note $81
-	note $a7
-	note $83
-	note $61
-	note $51
-	note $67
-	note $51
-	note $61
-	note $51
-	note $31
-	note $17
+	note E_, 7
+	note G_, 7
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 7
+	octave 4
+	note B_, 7
+	octave 5
+	note D_, 7
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 7
+	note E_, 7
+	note G_, 7
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 7
+	note G_, 3
+	note F_, 1
+	note E_, 1
+	note F_, 7
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 7
 	vibrato $10, $34
-	loopchannel $00, $5788 ; end
-; 0x179807
+	loopchannel 0, Music_MobileCenter_branch_179788
 
-_Music_MobileCenter_Ch4: ; 0x179807
-	togglenoise $03
-	stereopanning $0f
-	notetype $0c
-	note $a7
-	note $a3
-	note $20
-	note $20
-	note $20
-	note $20
-	note $a1
-	note $21
-	note $21
-	note $21
-	note $a1
-	note $21
-	note $31
-	note $21
-	loopchannel $03, $5813
-	note $a1
-	note $21
-	note $21
-	note $21
-	note $a1
-	note $31
-	note $20
-	note $20
-	note $20
-	note $20
-	loopchannel $00, $5813 ; end
-; 0x17982d
+Music_MobileCenter_Ch4: ; 179807
+	togglenoise $3
+	stereopanning $f
+	notetype $c
+	note A_, 7
+	note A_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+
+Music_MobileCenter_branch_179813: ; 179813
+	note A_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note A_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	loopchannel 3, Music_MobileCenter_branch_179813
+	note A_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note A_, 1
+	note D_, 1
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	loopchannel 0, Music_MobileCenter_branch_179813
+; 17982d
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -1,111 +1,114 @@
-_Music_Mom: ; 0xf6bf2
-	db $81
-	dw _Music_Mom_Ch2
-	db $02
-	dw _Music_Mom_Ch3
-	db $03
-	dw _Music_Mom_Ch4
-; 0xf6bfb
+Music_Mom: ; f6bf2
+	dbw $81, Music_Mom_Ch2
+	dbw $02, Music_Mom_Ch3
+	dbw $03, Music_Mom_Ch4
+; f6bfb
 
-_Music_Mom_Ch2: ; 0xf6bfb
-	tempo $9000
+
+Music_Mom_Ch2: ; f6bfb
+	tempo 144
 	volume $77
-	stereopanning $0f
-	dutycycle $02
-	notetype $06, $b3
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $90
-	note $a0
-	note $c7
-	notetype $0c, $b1
-	note $03
-	octave3
-	note $25
-	note $33
-	note $11
-	note $01
-	note $25
-	octave2
-	note $53
-	note $b1
-	note $c1
-	loopchannel $00, $6c0e ; end
-; 0xf6c20
+	stereopanning $f
+	dutycycle $2
+	notetype $6, $b3
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note G#, 0
+	note A_, 0
+	note B_, 7
 
-_Music_Mom_Ch3: ; 0xf6c20
+Music_Mom_branch_f6c0e: ; f6c0e
+	notetype $c, $b1
+	note __, 3
+	octave 3
+	note C#, 5
+	note D_, 3
+	note C_, 1
+	note __, 1
+	note C#, 5
+	octave 2
+	note E_, 3
+	note A#, 1
+	note B_, 1
+	loopchannel 0, Music_Mom_branch_f6c0e
+
+Music_Mom_Ch3: ; f6c20
 	stereopanning $f0
-	notetype $06, $25
-	octave3
-	note $50
-	note $30
-	octave2
-	note $c0
-	note $90
-	note $57
+	notetype $6, $25
+	octave 3
+	note E_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	note G#, 0
+	note E_, 7
 	intensity $23
-	octave2
-	note $a1
-	note $05
-	octave4
-	note $51
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave4
-	note $77
-	note $41
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $51
-	note $05
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $31
-	note $05
-	note $23
-	note $31
-	note $01
-	loopchannel $00, $6c2e ; end
-; 0xf6c51
 
-_Music_Mom_Ch4: ; 0xf6c51
-	togglenoise $03
-	notetype $0c, $05
-	note $40
-	note $00
-	note $71
-	note $30
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $73
-	note $30
-	note $00
-	note $40
-	note $00
-	note $73
-	note $30
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $31
-	note $40
-	note $00
-	loopchannel $00, $6c56 ; end
-; 0xf6c72
+Music_Mom_branch_f6c2e: ; f6c2e
+	octave 2
+	note A_, 1
+	note __, 5
+	octave 4
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 7
+	note D#, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 1
+	note __, 5
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 5
+	note C#, 3
+	note D_, 1
+	note __, 1
+	loopchannel 0, Music_Mom_branch_f6c2e
+
+Music_Mom_Ch4: ; f6c51
+	togglenoise $3
+	notetype $c
+	note __, 5
+
+Music_Mom_branch_f6c56: ; f6c56
+	note D#, 0
+	note __, 0
+	note F#, 1
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 3
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 3
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note D_, 1
+	note D#, 0
+	note __, 0
+	loopchannel 0, Music_Mom_branch_f6c56
+; f6c72
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -1,142 +1,147 @@
-_Music_MtMoon: ; 0xedb29
-	db $c0
-	dw _Music_MtMoon_Ch1
-	db $01
-	dw _Music_MtMoon_Ch2
-	db $02
-	dw _Music_MtMoon_Ch3
-	db $03
-	dw _Music_MtMoon_Ch4
-; 0xedb35
+Music_MtMoon: ; edb29
+	dbw $c0, Music_MtMoon_Ch1
+	dbw $01, Music_MtMoon_Ch2
+	dbw $02, Music_MtMoon_Ch3
+	dbw $03, Music_MtMoon_Ch4
+; edb35
 
-_Music_MtMoon_Ch1: ; 0xedb35
-	tempo $d000
+
+Music_MtMoon_Ch1: ; edb35
+	tempo 208
 	volume $77
-	dutycycle $02
-	tone $0100
-	vibrato $08, $14
+	dutycycle $2
+	tone $0001
+	vibrato $8, $14
 	stereopanning $f0
-	notetype $0c, $45
-	note $01
-	loopchannel $00, $5b56 ; end
-; 0xedb4c
+	notetype $c, $45
+	note __, 1
+	loopchannel 0, Music_MtMoon_branch_edb56
+; edb4c
 
-_Music_MtMoon_Ch2: ; 0xedb4c
-	vibrato $0b, $15
-	dutycycle $02
-	notetype $0c, $84
-	stereopanning $0f
-	octave4
-	note $45
-	note $25
-	octave3
-	note $c1
-	octave4
-	note $21
-	note $41
-	note $81
-	note $41
-	note $25
-	octave3
-	note $c1
-	octave4
-	note $21
-	note $41
-	note $81
-	note $41
-	note $25
-	octave3
-	note $c1
-	note $b1
-	note $c5
-	octave4
-	note $29
-	note $95
-	note $75
-	note $51
-	note $71
-	note $91
-	octave5
-	note $11
-	octave4
-	note $91
-	note $75
-	note $51
-	note $71
-	note $91
-	octave5
-	note $11
-	octave4
-	note $91
-	note $75
-	note $51
-	note $41
-	note $55
-	note $75
-	note $53
-	loopchannel $00, $5b56 ; end
-; 0xedb8a
+Music_MtMoon_Ch2: ; edb4c
+	vibrato $b, $15
+	dutycycle $2
+	notetype $c, $84
+	stereopanning $f
 
-_Music_MtMoon_Ch3: ; 0xedb8a
-	notetype $0c, $28
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $81
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $81
-	octave2
-	note $c1
-	octave3
-	note $41
-	loopchannel $03, $5b8d
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $81
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $81
-	note $41
-	note $51
-	note $51
-	note $91
-	octave4
-	note $11
-	octave3
-	note $51
-	note $91
-	octave4
-	note $11
-	octave3
-	note $51
-	note $91
-	loopchannel $04, $5bab
-	loopchannel $00, $5b8a ; end
-; 0xedbbf
+Music_MtMoon_branch_edb56: ; edb56
+	octave 4
+	note D#, 5
+	note C#, 5
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note C#, 5
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note C#, 5
+	octave 3
+	note B_, 1
+	note A#, 1
+	note B_, 5
+	octave 4
+	note C#, 9
+	note G#, 5
+	note F#, 5
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	note F#, 5
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note G#, 1
+	note F#, 5
+	note E_, 1
+	note D#, 1
+	note E_, 5
+	note F#, 5
+	note E_, 3
+	loopchannel 0, Music_MtMoon_branch_edb56
 
-_Music_MtMoon_Ch4: ; 0xedbbf
-	togglenoise $05
-	notetype $0c
-	stereopanning $0f
-	note $b3
-	note $b7
-	note $b3
+Music_MtMoon_Ch3: ; edb8a
+
+Music_MtMoon_branch_edb8a: ; edb8a
+	notetype $c, $28
+
+Music_MtMoon_branch_edb8d: ; edb8d
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note G_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note G_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	loopchannel 3, Music_MtMoon_branch_edb8d
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note G_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note E_, 1
+
+Music_MtMoon_branch_edbab: ; edbab
+	note E_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	loopchannel 4, Music_MtMoon_branch_edbab
+	loopchannel 0, Music_MtMoon_branch_edb8a
+
+Music_MtMoon_Ch4: ; edbbf
+	togglenoise $5
+	notetype $c
+
+Music_MtMoon_branch_edbc3: ; edbc3
+	stereopanning $f
+	note A#, 3
+	note A#, 7
+	note A#, 3
 	stereopanning $f0
-	note $b3
-	note $b3
-	note $b3
-	stereopanning $0f
-	note $b3
-	note $b3
+	note A#, 3
+	note A#, 3
+	note A#, 3
+	stereopanning $f
+	note A#, 3
+	note A#, 3
 	stereopanning $f0
-	note $b7
-	loopchannel $00, $5bc3 ; end
-; 0xedbd8
+	note A#, 7
+	loopchannel 0, Music_MtMoon_branch_edbc3
+; edbd8
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -1,102 +1,120 @@
-_Music_MtMoonSquare: ; 0xf4815
-	db $40
-	dw _Music_MtMoonSquare_Ch1
-	db $01
-	dw _Music_MtMoonSquare_Ch2
-; 0xf481b
+Music_MtMoonSquare: ; f4815
+	dbw $40, Music_MtMoonSquare_Ch1
+	dbw $01, Music_MtMoonSquare_Ch2
+; f481b
 
-_Music_MtMoonSquare_Ch1: ; 0xf481b
-	tempo $7000
+
+Music_MtMoonSquare_Ch1: ; f481b
+	tempo 112
 	volume $77
-	dutycycle $02
-	tone $0100
-	note $00
-	notetype $0c, $44
-	octave4
-	note $31
-	note $51
-	note $73
-	note $71
-	note $a1
-	octave5
-	note $33
-	loopchannel $02, $4829
-	octave4
-	note $51
-	note $71
-	note $93
-	note $91
-	note $c1
-	octave5
-	note $53
-	loopchannel $02, $4835
-	octave4
-	note $21
-	note $31
-	note $53
-	note $51
-	note $81
-	octave5
-	note $23
-	loopchannel $02, $4841
-	octave4
-	note $31
-	note $51
-	note $73
-	note $71
-	note $a1
-	octave5
-	note $33
-	loopchannel $02, $484d
-	loopchannel $00, $4826 ; end
-; 0xf485d
+	dutycycle $2
+	tone $0001
+	note __, 0
 
-_Music_MtMoonSquare_Ch2: ; 0xf485d
-	dutycycle $02
+Music_MtMoonSquare_branch_f4826: ; f4826
+	notetype $c, $44
+
+Music_MtMoonSquare_branch_f4829: ; f4829
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 3
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 3
+	loopchannel 2, Music_MtMoonSquare_branch_f4829
+
+Music_MtMoonSquare_branch_f4835: ; f4835
+	octave 4
+	note E_, 1
+	note F#, 1
+	note G#, 3
+	note G#, 1
+	note B_, 1
+	octave 5
+	note E_, 3
+	loopchannel 2, Music_MtMoonSquare_branch_f4835
+
+Music_MtMoonSquare_branch_f4841: ; f4841
+	octave 4
+	note C#, 1
+	note D_, 1
+	note E_, 3
+	note E_, 1
+	note G_, 1
+	octave 5
+	note C#, 3
+	loopchannel 2, Music_MtMoonSquare_branch_f4841
+
+Music_MtMoonSquare_branch_f484d: ; f484d
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 3
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 3
+	loopchannel 2, Music_MtMoonSquare_branch_f484d
+	loopchannel 0, Music_MtMoonSquare_branch_f4826
+
+Music_MtMoonSquare_Ch2: ; f485d
+	dutycycle $2
 	vibrato $18, $24
-	notetype $0c, $82
-	octave4
-	note $31
-	note $51
-	note $73
-	note $71
-	note $a1
-	octave5
-	note $33
-	notetype $0c, $62
-	loopchannel $02, $4865
-	notetype $0c, $82
-	octave4
-	note $51
-	note $71
-	note $93
-	note $91
-	note $c1
-	octave5
-	note $53
-	notetype $0c, $62
-	loopchannel $02, $4877
-	notetype $0c, $82
-	octave4
-	note $21
-	note $31
-	note $53
-	note $51
-	note $81
-	octave5
-	note $23
-	notetype $0c, $62
-	loopchannel $02, $4889
-	notetype $0c, $82
-	octave4
-	note $31
-	note $51
-	note $73
-	note $71
-	note $a1
-	octave5
-	note $33
-	notetype $0c, $62
-	loopchannel $02, $489b
-	loopchannel $00, $4862 ; end
-; 0xf48ae
+
+Music_MtMoonSquare_branch_f4862: ; f4862
+	notetype $c, $82
+
+Music_MtMoonSquare_branch_f4865: ; f4865
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 3
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 3
+	notetype $c, $62
+	loopchannel 2, Music_MtMoonSquare_branch_f4865
+	notetype $c, $82
+
+Music_MtMoonSquare_branch_f4877: ; f4877
+	octave 4
+	note E_, 1
+	note F#, 1
+	note G#, 3
+	note G#, 1
+	note B_, 1
+	octave 5
+	note E_, 3
+	notetype $c, $62
+	loopchannel 2, Music_MtMoonSquare_branch_f4877
+	notetype $c, $82
+
+Music_MtMoonSquare_branch_f4889: ; f4889
+	octave 4
+	note C#, 1
+	note D_, 1
+	note E_, 3
+	note E_, 1
+	note G_, 1
+	octave 5
+	note C#, 3
+	notetype $c, $62
+	loopchannel 2, Music_MtMoonSquare_branch_f4889
+	notetype $c, $82
+
+Music_MtMoonSquare_branch_f489b: ; f489b
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 3
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 3
+	notetype $c, $62
+	loopchannel 2, Music_MtMoonSquare_branch_f489b
+	loopchannel 0, Music_MtMoonSquare_branch_f4862
+; f48ae
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -1,673 +1,671 @@
-_Music_NationalPark: ; 0xf54e8
-	db $c0
-	dw _Music_NationalPark_Ch1
-	db $01
-	dw _Music_NationalPark_Ch2
-	db $02
-	dw _Music_NationalPark_Ch3
-	db $03
-	dw _Music_NationalPark_Ch4
-; 0xf54f4
+Music_NationalPark: ; f54e8
+	dbw $c0, Music_NationalPark_Ch1
+	dbw $01, Music_NationalPark_Ch2
+	dbw $02, Music_NationalPark_Ch3
+	dbw $03, Music_NationalPark_Ch4
+; f54f4
 
-_Music_NationalPark_Ch1: ; 0xf54f4
-	tempo $c000
+
+Music_NationalPark_Ch1: ; f54f4
+	tempo 192
 	volume $77
-	stereopanning $0f
+	stereopanning $f
 	vibrato $18, $24
-	dutycycle $01
-	notetype $0c, $77
-	note $01
-	callchannel _Music_NationalPark_sub_0xf554a
-	callchannel _Music_NationalPark_sub_0xf554a
-	notetype $06, $67
-	callchannel _Music_NationalPark_sub_0xf563a
-	notetype $0c, $77
-	note $0f
-	octave2
-	note $b0
-	octave3
-	note $30
-	note $60
-	note $90
-	note $30
-	note $60
-	note $b0
-	notetype $06, $67
-	octave4
-	note $30
-	note $20
-	note $30
-	note $00
-	note $30
-	note $00
-	note $20
-	note $00
-	note $30
-	note $02
-	note $30
-	note $02
-	note $30
-	note $00
-	callchannel _Music_NationalPark_sub_0xf563a
+	dutycycle $1
+	notetype $c, $77
+	note __, 1
+
+Music_NationalPark_branch_f5504: ; f5504
+	callchannel Music_NationalPark_branch_f554a
+	callchannel Music_NationalPark_branch_f554a
+	notetype $6, $67
+	callchannel Music_NationalPark_branch_f563a
+	notetype $c, $77
+	note __, 15
+	octave 2
+	note A#, 0
+	octave 3
+	note D_, 0
+	note F_, 0
+	note G#, 0
+	note D_, 0
+	note F_, 0
+	note A#, 0
+	notetype $6, $67
+	octave 4
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note __, 0
+	callchannel Music_NationalPark_branch_f563a
 	intensity $77
-	octave3
-	note $50
-	note $64
-	note $43
-	note $01
-	note $1b
-	note $67
-	note $20
+	octave 3
+	note E_, 0
+	note F_, 4
+	note D#, 3
+	note __, 1
+	note C_, 11
+	note F_, 7
+	note C#, 0
 	intensity $98
-	note $3f
+	note D_, 15
 	intensity $77
-	note $36
-	notetype $0c, $77
-	note $03
-	loopchannel $00, $5504 ; end
-; 0xf554a
+	note D_, 6
+	notetype $c, $77
+	note __, 3
+	loopchannel 0, Music_NationalPark_branch_f5504
+; f554a
 
-_Music_NationalPark_sub_0xf554a: ; 0xf554a
-; subroutine
-	octave2
-	note $95
-	octave3
-	note $61
+Music_NationalPark_branch_f554a: ; f554a
+	octave 2
+	note G#, 5
+	octave 3
+	note F_, 1
 	intensity $47
-	note $60
-	note $90
+	note F_, 0
+	note G#, 0
 	intensity $57
-	note $60
-	note $90
+	note F_, 0
+	note G#, 0
 	intensity $77
-	note $60
-	note $90
+	note F_, 0
+	note G#, 0
 	intensity $97
-	note $60
-	note $90
+	note F_, 0
+	note G#, 0
 	intensity $77
-	octave2
-	note $a5
-	octave3
-	note $71
+	octave 2
+	note A_, 5
+	octave 3
+	note F#, 1
 	intensity $47
-	note $70
-	note $a0
+	note F#, 0
+	note A_, 0
 	intensity $57
-	note $70
-	note $a0
+	note F#, 0
+	note A_, 0
 	intensity $77
-	note $70
-	note $a0
+	note F#, 0
+	note A_, 0
 	intensity $97
-	note $70
-	note $a0
+	note F#, 0
+	note A_, 0
 	intensity $77
-	octave2
-	note $95
-	octave3
-	note $61
+	octave 2
+	note G#, 5
+	octave 3
+	note F_, 1
 	intensity $47
-	octave4
-	note $10
-	note $20
+	octave 4
+	note C_, 0
+	note C#, 0
 	intensity $57
-	note $10
-	note $20
+	note C_, 0
+	note C#, 0
 	intensity $77
-	note $10
-	note $20
+	note C_, 0
+	note C#, 0
 	intensity $97
-	note $10
-	note $20
+	note C_, 0
+	note C#, 0
 	intensity $77
-	octave2
-	note $a5
-	octave3
-	note $21
+	octave 2
+	note A_, 5
+	octave 3
+	note C#, 1
 	intensity $47
-	octave4
-	note $20
-	note $40
+	octave 4
+	note C#, 0
+	note D#, 0
 	intensity $57
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $97
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $a1
-	octave4
-	note $21
-	octave3
-	note $a1
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
 	intensity $47
-	octave4
-	note $20
-	note $40
+	octave 4
+	note C#, 0
+	note D#, 0
 	intensity $57
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $97
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $11
-	octave3
-	note $91
-	octave4
-	note $11
-	octave3
-	note $91
-	octave4
-	note $41
-	note $11
-	note $41
-	note $11
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
 	intensity $57
-	octave4
-	note $60
-	note $40
+	octave 4
+	note F_, 0
+	note D#, 0
 	intensity $67
-	note $30
-	note $40
+	note D_, 0
+	note D#, 0
 	intensity $77
-	note $60
-	note $70
+	note F_, 0
+	note F#, 0
 	intensity $97
-	note $90
-	note $b0
+	note G#, 0
+	note A#, 0
 	intensity $77
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $a1
-	octave4
-	note $21
-	octave3
-	note $a1
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
 	intensity $47
-	octave4
-	note $20
-	note $40
+	octave 4
+	note C#, 0
+	note D#, 0
 	intensity $57
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $97
-	note $20
-	note $40
+	note C#, 0
+	note D#, 0
 	intensity $77
-	note $11
-	octave3
-	note $91
-	octave4
-	note $11
-	octave3
-	note $91
-	octave4
-	note $41
-	note $11
-	note $41
-	note $11
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
-	endchannel ; end
-; 0xf563a
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	endchannel
+; f563a
 
-_Music_NationalPark_sub_0xf563a: ; 0xf563a
-; subroutine
-	note $0f
-	note $02
-	octave4
-	note $b0
-	note $b0
-	note $00
-	note $b0
-	note $00
-	note $b0
-	note $00
-	note $b1
-	note $03
-	note $0f
-	note $02
-	note $a0
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a1
-	note $03
-	endchannel ; end
-; 0xf5652
+Music_NationalPark_branch_f563a: ; f563a
+	note __, 15
+	note __, 2
+	octave 4
+	note A#, 0
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note A#, 1
+	note __, 3
+	note __, 15
+	note __, 2
+	note A_, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 1
+	note __, 3
+	endchannel
 
-_Music_NationalPark_Ch2: ; 0xf5652
+Music_NationalPark_Ch2: ; f5652
 	vibrato $14, $24
-	dutycycle $01
-	notetype $0c, $a7
-	note $01
+	dutycycle $1
+	notetype $c, $a7
+	note __, 1
 	stereopanning $f0
-	notetype $0c, $a7
-	callchannel _Music_NationalPark_sub_0xf56b8
-	octave3
-	note $37
-	callchannel _Music_NationalPark_sub_0xf56b8
-	note $01
+
+Music_NationalPark_branch_f565d: ; f565d
+	notetype $c, $a7
+	callchannel Music_NationalPark_branch_f56b8
+	octave 3
+	note D_, 7
+	callchannel Music_NationalPark_branch_f56b8
+	note __, 1
 	intensity $a7
-	octave4
-	note $91
-	note $71
-	note $61
-	notetype $06, $a7
-	callchannel _Music_NationalPark_sub_0xf56f5
-	octave3
-	note $c0
-	octave4
-	note $14
-	octave3
-	note $93
-	note $01
-	octave4
-	note $b7
-	note $91
-	note $01
-	note $71
-	note $01
-	note $93
-	note $50
-	note $6d
+	octave 4
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	notetype $6, $a7
+	callchannel Music_NationalPark_branch_f56f5
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 4
+	octave 3
+	note G#, 3
+	note __, 1
+	octave 4
+	note A#, 7
+	note G#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G#, 3
+	note E_, 0
+	note F_, 13
 	intensity $87
-	note $80
-	note $90
-	note $00
-	note $90
-	note $00
-	note $80
-	note $00
-	note $90
-	note $02
-	note $90
-	note $02
-	note $90
-	note $00
+	note G_, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	note G#, 0
+	note __, 0
 	intensity $a7
-	callchannel _Music_NationalPark_sub_0xf56f5
-	octave3
-	note $c0
-	octave4
-	note $14
-	octave3
-	note $93
-	note $01
-	note $bb
-	octave4
-	note $17
-	octave3
-	note $a0
-	vibrato $00, $00
+	callchannel Music_NationalPark_branch_f56f5
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 4
+	octave 3
+	note G#, 3
+	note __, 1
+	note A#, 11
+	octave 4
+	note C_, 7
+	octave 3
+	note A_, 0
+	vibrato $0, $0
 	intensity $b8
-	note $bf
+	note A#, 15
 	vibrato $14, $24
 	intensity $b7
-	note $ba
-	octave2
-	note $41
-	note $31
-	loopchannel $00, $565d ; end
-; 0xf56b8
+	note A#, 10
+	octave 2
+	note D#, 1
+	note D_, 1
+	loopchannel 0, Music_NationalPark_branch_f565d
+; f56b8
 
-_Music_NationalPark_sub_0xf56b8: ; 0xf56b8
-; subroutine
-	octave2
-	note $25
-	note $91
-	octave3
-	note $27
-	octave2
-	note $25
-	note $a1
-	octave3
-	note $27
-	octave2
-	note $25
-	note $91
-	octave3
-	note $27
-	octave2
-	note $25
-	note $a1
-	octave3
-	note $77
-	octave1
-	note $75
-	octave2
-	note $21
-	note $b7
-	octave1
-	note $75
-	octave2
-	note $21
-	note $a7
-	octave1
-	note $65
-	octave2
-	note $11
-	note $97
-	octave1
-	note $b5
-	octave2
-	note $61
-	octave3
-	note $37
-	octave1
-	note $75
-	octave2
-	note $21
-	note $b7
-	octave1
-	note $75
-	octave2
-	note $21
-	note $a7
-	octave1
-	note $65
-	octave2
-	note $11
-	note $97
-	octave1
-	note $b5
-	octave2
-	note $61
-	endchannel ; end
-; 0xf56f5
+Music_NationalPark_branch_f56b8: ; f56b8
+	octave 2
+	note C#, 5
+	note G#, 1
+	octave 3
+	note C#, 7
+	octave 2
+	note C#, 5
+	note A_, 1
+	octave 3
+	note C#, 7
+	octave 2
+	note C#, 5
+	note G#, 1
+	octave 3
+	note C#, 7
+	octave 2
+	note C#, 5
+	note A_, 1
+	octave 3
+	note F#, 7
+	octave 1
+	note F#, 5
+	octave 2
+	note C#, 1
+	note A#, 7
+	octave 1
+	note F#, 5
+	octave 2
+	note C#, 1
+	note A_, 7
+	octave 1
+	note F_, 5
+	octave 2
+	note C_, 1
+	note G#, 7
+	octave 1
+	note A#, 5
+	octave 2
+	note F_, 1
+	octave 3
+	note D_, 7
+	octave 1
+	note F#, 5
+	octave 2
+	note C#, 1
+	note A#, 7
+	octave 1
+	note F#, 5
+	octave 2
+	note C#, 1
+	note A_, 7
+	octave 1
+	note F_, 5
+	octave 2
+	note C_, 1
+	note G#, 7
+	octave 1
+	note A#, 5
+	octave 2
+	note F_, 1
+	endchannel
+; f56f5
 
-_Music_NationalPark_sub_0xf56f5: ; 0xf56f5
-; subroutine
-	octave4
-	note $50
-	note $64
-	note $73
-	note $01
-	note $26
+Music_NationalPark_branch_f56f5: ; f56f5
+	octave 4
+	note E_, 0
+	note F_, 4
+	note F#, 3
+	note __, 1
+	note C#, 6
 	intensity $87
-	octave5
-	note $50
-	note $60
-	note $00
-	note $60
-	note $00
-	note $50
-	note $00
-	note $61
+	octave 5
+	note E_, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 1
 	intensity $a7
-	octave3
-	note $b1
-	octave4
-	note $21
-	octave4
-	note $50
-	note $64
-	note $73
-	note $01
-	note $46
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 4
+	note E_, 0
+	note F_, 4
+	note F#, 3
+	note __, 1
+	note D#, 6
 	intensity $87
-	octave5
-	note $30
-	note $40
-	note $00
-	note $40
-	note $00
-	note $30
-	note $00
-	note $41
+	octave 5
+	note D_, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D#, 1
 	intensity $a7
-	octave4
-	note $31
-	note $21
-	endchannel ; end
-; 0xf5723
+	octave 4
+	note D_, 1
+	note C#, 1
+	endchannel
 
-_Music_NationalPark_Ch3: ; 0xf5723
+Music_NationalPark_Ch3: ; f5723
 	vibrato $16, $24
-	notetype $0c, $11
-	octave4
-	note $90
-	note $b0
+	notetype $c, $11
+	octave 4
+	note G#, 0
+	note A#, 0
 	stereopanning $ff
-	callchannel _Music_NationalPark_sub_0xf5756
-	octave5
-	note $bd
-	octave4
-	note $90
-	note $b0
-	callchannel _Music_NationalPark_sub_0xf5756
-	octave5
-	note $b7
-	octave4
-	note $37
+
+Music_NationalPark_branch_f572e: ; f572e
+	callchannel Music_NationalPark_branch_f5756
+	octave 5
+	note A#, 13
+	octave 4
+	note G#, 0
+	note A#, 0
+	callchannel Music_NationalPark_branch_f5756
+	octave 5
+	note A#, 7
+	octave 4
+	note D_, 7
 	intensity $15
-	callchannel _Music_NationalPark_sub_0xf578f
-	octave4
-	note $30
-	octave3
-	note $62
-	callchannel _Music_NationalPark_sub_0xf578f
-	octave4
-	note $30
-	octave3
-	note $60
+	callchannel Music_NationalPark_branch_f578f
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 2
+	callchannel Music_NationalPark_branch_f578f
+	octave 4
+	note D_, 0
+	octave 3
+	note F_, 0
 	intensity $11
-	octave4
-	note $90
-	note $b0
-	loopchannel $00, $572e ; end
-; 0xf5756
+	octave 4
+	note G#, 0
+	note A#, 0
+	loopchannel 0, Music_NationalPark_branch_f572e
+; f5756
 
-_Music_NationalPark_sub_0xf5756: ; 0xf5756
-; subroutine
-	octave5
-	note $1f
-	note $2d
-	note $90
-	note $b0
-	octave6
-	note $1f
-	note $29
-	note $11
-	note $21
-	note $41
-	note $61
-	note $41
-	note $21
-	octave5
-	note $b9
-	octave6
-	note $61
-	note $41
-	note $21
-	octave5
-	note $a8
-	octave6
-	note $30
-	octave6
-	note $41
-	note $21
-	note $11
-	octave5
-	note $93
-	octave6
-	note $93
-	note $41
-	note $6d
-	note $30
-	note $40
-	note $61
-	note $41
-	note $21
-	octave5
-	note $b9
-	octave6
-	note $61
-	note $41
-	note $21
-	octave5
-	note $a9
-	octave6
-	note $41
-	note $21
-	note $11
-	octave5
-	note $93
-	note $b3
-	octave6
-	note $11
-	endchannel ; end
-; 0xf578f
+Music_NationalPark_branch_f5756: ; f5756
+	octave 5
+	note C_, 15
+	note C#, 13
+	note G#, 0
+	note A#, 0
+	octave 6
+	note C_, 15
+	note C#, 9
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 5
+	note A#, 9
+	octave 6
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 5
+	note A_, 8
+	octave 6
+	note D_, 0
+	octave 6
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	octave 5
+	note G#, 3
+	octave 6
+	note G#, 3
+	note D#, 1
+	note F_, 13
+	note D_, 0
+	note D#, 0
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 5
+	note A#, 9
+	octave 6
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	octave 5
+	note A_, 9
+	octave 6
+	note D#, 1
+	note C#, 1
+	note C_, 1
+	octave 5
+	note G#, 3
+	note A#, 3
+	octave 6
+	note C_, 1
+	endchannel
+; f578f
 
-_Music_NationalPark_sub_0xf578f: ; 0xf578f
-; subroutine
-	octave2
-	note $72
-	octave3
-	note $21
-	note $00
-	note $b3
-	note $20
-	note $00
-	note $b0
-	note $22
-	octave2
-	note $72
-	octave3
-	note $21
-	note $00
-	note $a3
-	note $20
-	note $00
-	note $a0
-	note $22
-	octave2
-	note $62
-	octave3
-	note $11
-	note $00
-	note $93
-	note $10
-	note $00
-	note $90
-	note $12
-	octave2
-	note $b2
-	octave3
-	note $61
-	note $00
-	octave4
-	note $33
-	octave3
-	note $60
-	note $00
-	endchannel ; end
-; 0xf57b8
+Music_NationalPark_branch_f578f: ; f578f
+	octave 2
+	note F#, 2
+	octave 3
+	note C#, 1
+	note __, 0
+	note A#, 3
+	note C#, 0
+	note __, 0
+	note A#, 0
+	note C#, 2
+	octave 2
+	note F#, 2
+	octave 3
+	note C#, 1
+	note __, 0
+	note A_, 3
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note C#, 2
+	octave 2
+	note F_, 2
+	octave 3
+	note C_, 1
+	note __, 0
+	note G#, 3
+	note C_, 0
+	note __, 0
+	note G#, 0
+	note C_, 2
+	octave 2
+	note A#, 2
+	octave 3
+	note F_, 1
+	note __, 0
+	octave 4
+	note D_, 3
+	octave 3
+	note F_, 0
+	note __, 0
+	endchannel
 
-_Music_NationalPark_Ch4: ; 0xf57b8
-	togglenoise $03
-	notetype $0c
-	note $01
-	note $0f
-	loopchannel $17, $57bd
-	note $07
-	note $b1
-	note $31
-	note $b0
-	note $30
-	note $c1
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $c1
-	loopchannel $07, $57c8
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $40
-	note $40
-	note $30
-	note $30
-	note $b0
-	note $40
-	loopchannel $00, $57bd ; end
-; 0xf57e8
+Music_NationalPark_Ch4: ; f57b8
+	togglenoise $3
+	notetype $c
+	note __, 1
+
+Music_NationalPark_branch_f57bd: ; f57bd
+	note __, 15
+	loopchannel 23, Music_NationalPark_branch_f57bd
+	note __, 7
+	note A#, 1
+	note D_, 1
+	note A#, 0
+	note D_, 0
+	note B_, 1
+
+Music_NationalPark_branch_f57c8: ; f57c8
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note B_, 1
+	loopchannel 7, Music_NationalPark_branch_f57c8
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note D_, 0
+	note A#, 0
+	note D#, 0
+	loopchannel 0, Music_NationalPark_branch_f57bd
+; f57e8
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -1,338 +1,333 @@
-_Music_NewBarkTown: ; 0xeb2d3
-	db $80
-	dw _Music_NewBarkTown_Ch1
-	db $01
-	dw _Music_NewBarkTown_Ch2
-	db $02
-	dw _Music_NewBarkTown_Ch3
-; 0xeb2dc
+Music_NewBarkTown: ; eb2d3
+	dbw $80, Music_NewBarkTown_Ch1
+	dbw $01, Music_NewBarkTown_Ch2
+	dbw $02, Music_NewBarkTown_Ch3
+; eb2dc
 
-; 0xeb2dc
-	db $03
-; 0xeb2dd
+INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc
 
-_Music_NewBarkTown_Ch1: ; 0xeb2dd
-	tempo $bb00
+Music_NewBarkTown_Ch1: ; eb2dd
+	tempo 187
 	volume $77
-	stereopanning $0f
+	stereopanning $f
 	vibrato $12, $23
-	notetype $0c, $87
-	note $03
-	dutycycle $00
-	callchannel _Music_NewBarkTown_sub_0xeb349
-	octave3
-	note $20
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $81
-	note $71
-	dutycycle $02
+	notetype $c, $87
+	note __, 3
+
+Music_NewBarkTown_branch_eb2eb: ; eb2eb
+	dutycycle $0
+	callchannel Music_NewBarkTown_branch_eb349
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note G_, 1
+	note F#, 1
+	dutycycle $2
 	intensity $82
-	note $50
-	note $70
-	note $50
-	note $30
-	note $20
-	octave2
-	note $c0
-	note $a0
-	note $80
-	dutycycle $00
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note D_, 0
+	note C#, 0
+	octave 2
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	dutycycle $0
 	intensity $87
-	callchannel _Music_NewBarkTown_sub_0xeb349
-	octave3
-	note $20
-	note $00
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $51
-	dutycycle $02
+	callchannel Music_NewBarkTown_branch_eb349
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	dutycycle $2
 	intensity $82
-	note $20
-	note $00
-	octave2
-	note $a0
-	octave3
-	note $20
-	note $50
-	note $80
-	note $a0
-	octave4
-	note $20
-	note $50
-	note $a0
-	dutycycle $01
+	note C#, 0
+	note __, 0
+	octave 2
+	note A_, 0
+	octave 3
+	note C#, 0
+	note E_, 0
+	note G_, 0
+	note A_, 0
+	octave 4
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	dutycycle $1
 	intensity $5e
-	callchannel _Music_NewBarkTown_sub_0xeb37c
-	callchannel _Music_NewBarkTown_sub_0xeb37c
-	callchannel _Music_NewBarkTown_sub_0xeb37c
-	octave2
-	note $81
-	note $c1
-	octave3
-	note $31
-	note $73
-	note $83
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $51
-	note $83
-	note $a3
-	note $c1
+	callchannel Music_NewBarkTown_branch_eb37c
+	callchannel Music_NewBarkTown_branch_eb37c
+	callchannel Music_NewBarkTown_branch_eb37c
+	octave 2
+	note G_, 1
+	note B_, 1
+	octave 3
+	note D_, 1
+	note F#, 3
+	note G_, 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note G_, 3
+	note A_, 3
+	note B_, 1
 	intensity $87
-	loopchannel $00, $72eb ; end
-; 0xeb349
+	loopchannel 0, Music_NewBarkTown_branch_eb2eb
+; eb349
 
-_Music_NewBarkTown_sub_0xeb349: ; 0xeb349
-; subroutine
-	octave3
-	note $70
-	note $00
-	note $30
-	note $00
-	note $a1
-	note $30
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	note $b1
-	note $30
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	note $c1
-	note $70
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	octave4
-	note $11
-	octave3
-	note $30
-	note $00
-	octave2
-	note $c0
-	note $00
-	note $80
-	note $00
-	octave3
-	note $81
-	octave2
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $90
-	note $00
-	octave3
-	note $51
-	octave2
-	note $c0
-	note $00
-	endchannel ; end
-; 0xeb37c
+Music_NewBarkTown_branch_eb349: ; eb349
+	octave 3
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 1
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A#, 1
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note B_, 1
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	endchannel
+; eb37c
 
-_Music_NewBarkTown_sub_0xeb37c: ; 0xeb37c
-; subroutine
-	octave2
-	note $81
-	note $c1
-	octave3
-	note $31
-	note $73
-	note $83
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $51
-	note $83
-	note $a3
-	note $51
-	endchannel ; end
-; 0xeb38d
+Music_NewBarkTown_branch_eb37c: ; eb37c
+	octave 2
+	note G_, 1
+	note B_, 1
+	octave 3
+	note D_, 1
+	note F#, 3
+	note G_, 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note G_, 3
+	note A_, 3
+	note E_, 1
+	endchannel
 
-_Music_NewBarkTown_Ch2: ; 0xeb38d
+Music_NewBarkTown_Ch2: ; eb38d
 	stereopanning $ff
 	vibrato $12, $23
-	notetype $06, $a7
-	note $07
-	dutycycle $02
-	notetype $06, $a7
-	callchannel _Music_NewBarkTown_sub_0xeb3bf
-	callchannel _Music_NewBarkTown_sub_0xeb3bf
-	callchannel _Music_NewBarkTown_sub_0xeb3f2
+	notetype $6, $a7
+	note __, 7
+
+Music_NewBarkTown_branch_eb396: ; eb396
+	dutycycle $2
+	notetype $6, $a7
+	callchannel Music_NewBarkTown_branch_eb3bf
+	callchannel Music_NewBarkTown_branch_eb3bf
+	callchannel Music_NewBarkTown_branch_eb3f2
 	intensity $87
-	octave5
-	note $c5
-	note $a5
+	octave 5
+	note B_, 5
+	note A_, 5
 	intensity $77
-	octave6
-	note $33
-	note $2f
-	callchannel _Music_NewBarkTown_sub_0xeb3f2
+	octave 6
+	note D_, 3
+	note C#, 15
+	callchannel Music_NewBarkTown_branch_eb3f2
 	intensity $87
-	octave5
-	note $c5
-	note $a5
+	octave 5
+	note B_, 5
+	note A_, 5
 	intensity $77
-	octave6
-	note $33
-	note $5f
-	loopchannel $00, $7396 ; end
-; 0xeb3bf
+	octave 6
+	note D_, 3
+	note E_, 15
+	loopchannel 0, Music_NewBarkTown_branch_eb396
+; eb3bf
 
-_Music_NewBarkTown_sub_0xeb3bf: ; 0xeb3bf
-; subroutine
-	octave2
-	note $33
-	note $07
-	note $30
-	note $00
-	note $30
-	note $00
-	note $31
-	note $01
-	note $37
-	note $b1
-	note $01
-	note $33
-	note $07
-	note $30
-	note $00
-	note $30
-	note $00
-	note $31
-	note $01
-	note $37
-	octave3
-	note $11
-	note $01
-	octave2
-	note $83
-	note $07
-	note $80
-	note $00
-	note $80
-	note $00
-	octave1
-	note $91
-	note $01
-	note $97
-	octave2
-	note $31
-	note $01
-	note $a3
-	note $07
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave1
-	note $a1
-	note $01
-	note $a7
-	octave2
-	note $23
-	endchannel ; end
-; 0xeb3f2
+Music_NewBarkTown_branch_eb3bf: ; eb3bf
+	octave 2
+	note D_, 3
+	note __, 7
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 7
+	note A#, 1
+	note __, 1
+	note D_, 3
+	note __, 7
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 7
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 2
+	note G_, 3
+	note __, 7
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 1
+	note G#, 1
+	note __, 1
+	note G#, 7
+	octave 2
+	note D_, 1
+	note __, 1
+	note A_, 3
+	note __, 7
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	note __, 1
+	note A_, 7
+	octave 2
+	note C#, 3
+	endchannel
+; eb3f2
 
-_Music_NewBarkTown_sub_0xeb3f2: ; 0xeb3f2
-; subroutine
-	notetype $06, $97
-	dutycycle $02
-	octave4
-	note $cb
-	note $ab
-	note $87
-	notetype $0c, $97
-	note $5f
-	endchannel ; end
-; 0xeb400
+Music_NewBarkTown_branch_eb3f2: ; eb3f2
+	notetype $6, $97
+	dutycycle $2
+	octave 4
+	note B_, 11
+	note A_, 11
+	note G_, 7
+	notetype $c, $97
+	note E_, 15
+	endchannel
 
-_Music_NewBarkTown_Ch3: ; 0xeb400
+Music_NewBarkTown_Ch3: ; eb400
 	stereopanning $f0
-	notetype $0c, $10
-	octave5
-	note $31
-	note $51
+	notetype $c, $10
+	octave 5
+	note D_, 1
+	note E_, 1
+
+Music_NewBarkTown_branch_eb408: ; eb408
 	vibrato $16, $23
-	note $73
-	note $a3
-	note $81
-	note $71
-	note $51
-	note $81
-	note $75
-	note $31
-	octave4
-	note $a5
-	note $80
-	note $a0
-	note $c3
-	octave5
-	note $33
-	note $51
-	note $31
-	note $21
-	note $31
-	note $55
-	note $71
-	note $53
-	note $01
-	note $30
-	note $50
-	note $73
-	note $a3
-	note $b1
-	note $a1
-	note $81
-	note $b1
-	note $a5
-	octave6
-	note $21
-	note $35
-	octave5
-	note $50
-	note $70
-	note $85
-	note $a1
-	note $c7
-	note $a5
-	note $80
-	note $70
-	note $53
-	note $03
+	note F#, 3
+	note A_, 3
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note G_, 1
+	note F#, 5
+	note D_, 1
+	octave 4
+	note A_, 5
+	note G_, 0
+	note A_, 0
+	note B_, 3
+	octave 5
+	note D_, 3
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 5
+	note F#, 1
+	note E_, 3
+	note __, 1
+	note D_, 0
+	note E_, 0
+	note F#, 3
+	note A_, 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A#, 1
+	note A_, 5
+	octave 6
+	note C#, 1
+	note D_, 5
+	octave 5
+	note E_, 0
+	note F#, 0
+	note G_, 5
+	note A_, 1
+	note B_, 7
+	note A_, 5
+	note G_, 0
+	note F#, 0
+	note E_, 3
+	note __, 3
 	intensity $25
 	vibrato $12, $53
-	octave2
-	note $8f
-	note $af
-	note $8f
-	note $af
-	note $8f
-	note $af
-	note $8f
-	note $ad
+	octave 2
+	note G_, 15
+	note A_, 15
+	note G_, 15
+	note A_, 15
+	note G_, 15
+	note A_, 15
+	note G_, 15
+	note A_, 13
 	intensity $10
 	vibrato $16, $23
-	octave5
-	note $30
-	note $50
-	loopchannel $00, $7408 ; end
-; 0xeb453
+	octave 5
+	note D_, 0
+	note E_, 0
+	loopchannel 0, Music_NewBarkTown_branch_eb408
+; eb453
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -1,17 +1,17 @@
-_Music_Nothing: ; 0xe91a3
-	db $c0
-	dw _Music_Nothing_Ch1
-	db $01
-	dw _Music_Nothing_Ch2
-	db $02
-	dw _Music_Nothing_Ch3
-	db $03
-	dw _Music_Nothing_Ch4
-; 0xe91af
+Music_Nothing: ; e91a3
+	dbw $c0, Music_Nothing_Ch1
+	dbw $01, Music_Nothing_Ch2
+	dbw $02, Music_Nothing_Ch3
+	dbw $03, Music_Nothing_Ch4
+; e91af
 
-_Music_Nothing_Ch1: ; 0xe91af
-_Music_Nothing_Ch2: ; 0xe91af
-_Music_Nothing_Ch3: ; 0xe91af
-_Music_Nothing_Ch4: ; 0xe91af
-	endchannel ; end
-; 0xe91b0
+
+Music_Nothing_Ch3: ; e91af
+
+Music_Nothing_Ch1: ; e91af
+
+Music_Nothing_Ch2: ; e91af
+
+Music_Nothing_Ch4: ; e91af
+	endchannel
+; e91b0
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,359 +1,365 @@
-_Music_PalletTown: ; 0xf4b0c
-	db $80
-	dw _Music_PalletTown_Ch1
-	db $01
-	dw _Music_PalletTown_Ch2
-	db $02
-	dw _Music_PalletTown_Ch3
-; 0xf4b15
+Music_PalletTown: ; f4b0c
+	dbw $80, Music_PalletTown_Ch1
+	dbw $01, Music_PalletTown_Ch2
+	dbw $02, Music_PalletTown_Ch3
+; f4b15
 
-_Music_PalletTown_Ch1: ; 0xf4b15
-	tempo $bc00
+
+Music_PalletTown_Ch1: ; f4b15
+	tempo 188
 	volume $77
 	vibrato $12, $24
-	tone $0100
-	stereopanning $0f
-	dutycycle $02
-	notetype $0c, $78
-	octave3
-	note $cb
-	note $a0
-	note $30
-	note $70
-	note $a0
-	note $cb
-	note $40
-	note $80
-	note $c0
-	octave4
-	note $40
-	note $53
-	note $33
-	note $13
-	octave3
-	note $a3
+	tone $0001
+	stereopanning $f
+
+Music_PalletTown_branch_f4b22: ; f4b22
+	dutycycle $2
+	notetype $c, $78
+	octave 3
+	note B_, 11
+	note A_, 0
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	note B_, 11
+	note D#, 0
+	note G_, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	note E_, 3
+	note D_, 3
+	note C_, 3
+	octave 3
+	note A_, 3
 	intensity $77
-	note $87
+	note G_, 7
 	intensity $78
-	note $73
-	note $a3
-	note $cb
-	note $a0
-	note $30
-	note $70
-	note $a0
-	note $81
-	note $c1
-	octave4
-	note $51
-	note $83
-	note $71
-	note $81
-	note $a1
-	note $51
-	note $31
-	note $11
-	note $51
-	note $71
-	note $51
-	note $31
-	note $11
-	octave3
-	note $c7
+	note F#, 3
+	note A_, 3
+	note B_, 11
+	note A_, 0
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	note G_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	note G_, 3
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 7
 	intensity $77
-	note $c7
-	dutycycle $03
+	note B_, 7
+
+Music_PalletTown_branch_f4b59: ; f4b59
+	dutycycle $3
 	intensity $92
-	note $81
-	note $51
-	note $81
-	note $51
-	note $81
-	note $41
-	note $81
-	note $41
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
 	intensity $5f
-	note $80
-	note $a0
-	note $c0
-	octave4
-	note $10
-	note $31
-	note $83
-	note $31
-	note $11
-	octave3
-	note $c1
-	loopchannel $02, $4b59
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	loopchannel 2, Music_PalletTown_branch_f4b59
 	intensity $3f
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $a3
-	note $83
-	note $73
-	note $33
-	note $53
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note D_, 3
+	note E_, 3
 	intensity $72
-	note $10
-	note $50
-	note $80
-	octave4
-	note $10
-	note $30
-	note $a0
-	octave5
-	note $31
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 4
+	note C_, 0
+	note D_, 0
+	note A_, 0
+	octave 5
+	note D_, 1
 	intensity $62
-	note $31
+	note D_, 1
 	intensity $22
-	note $31
+	note D_, 1
 	intensity $2f
-	octave3
-	note $33
-	note $53
-	note $85
-	note $a0
-	note $80
+	octave 3
+	note D_, 3
+	note E_, 3
+	note G_, 5
+	note A_, 0
+	note G_, 0
 	intensity $1f
-	note $77
-	loopchannel $00, $4b22 ; end
-; 0xf4ba1
+	note F#, 7
+	loopchannel 0, Music_PalletTown_branch_f4b22
 
-_Music_PalletTown_Ch2: ; 0xf4ba1
+Music_PalletTown_Ch2: ; f4ba1
 	vibrato $12, $44
-	dutycycle $02
+	dutycycle $2
 	stereopanning $f0
-	notetype $0c, $88
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $31
-	note $85
-	note $73
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $31
-	note $85
-	octave1
-	note $c3
-	octave2
-	note $11
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $13
-	note $31
-	note $51
-	note $71
-	note $81
-	note $31
-	note $03
-	note $33
-	note $73
-	octave1
-	note $81
-	note $c1
-	octave2
-	note $31
-	note $85
-	note $73
-	note $51
-	note $31
-	note $51
-	octave1
-	note $c3
-	octave2
-	note $31
-	note $51
-	note $71
-	note $87
-	note $a7
-	note $81
-	note $31
-	note $81
-	octave3
-	note $33
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $31
+
+Music_PalletTown_branch_f4ba8: ; f4ba8
+	notetype $c, $88
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note D_, 1
+	note G_, 5
+	note F#, 3
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note D_, 1
+	note G_, 5
+	octave 1
+	note B_, 3
+	octave 2
+	note C_, 1
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note C_, 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note D_, 1
+	note __, 3
+	note D_, 3
+	note F#, 3
+	octave 1
+	note G_, 1
+	note B_, 1
+	octave 2
+	note D_, 1
+	note G_, 5
+	note F#, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 1
+	note B_, 3
+	octave 2
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 7
+	note A_, 7
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+
+Music_PalletTown_branch_f4be5: ; f4be5
 	intensity $a2
-	octave3
-	note $51
-	octave2
-	note $11
-	octave3
-	note $51
-	octave2
-	note $11
-	octave3
-	note $41
-	octave2
-	note $11
-	octave3
-	note $41
-	octave2
-	note $11
+	octave 3
+	note E_, 1
+	octave 2
+	note C_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note C_, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note C_, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note C_, 1
 	intensity $93
-	note $85
-	note $80
-	note $82
-	note $31
-	note $83
-	loopchannel $02, $4be5
-	note $11
-	octave3
-	note $53
-	octave2
-	note $10
-	octave3
-	note $12
-	octave2
-	note $11
-	note $51
-	note $11
-	note $31
-	octave3
-	note $33
-	octave2
-	note $30
-	note $82
-	note $51
-	note $81
-	note $51
+	note G_, 5
+	note G_, 0
+	note G_, 2
+	note D_, 1
+	note G_, 3
+	loopchannel 2, Music_PalletTown_branch_f4be5
+	note C_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note C_, 0
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note D_, 0
+	note G_, 2
+	note E_, 1
+	note G_, 1
+	note E_, 1
 	intensity $1f
-	note $73
+	note F#, 3
 	intensity $88
-	note $73
-	note $c3
-	note $83
-	note $a1
-	note $31
-	note $81
-	note $33
-	note $11
-	octave1
-	note $c1
-	note $a1
-	loopchannel $00, $4ba8 ; end
-; 0xf4c2a
+	note F#, 3
+	note B_, 3
+	note G_, 3
+	note A_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 3
+	note C_, 1
+	octave 1
+	note B_, 1
+	note A_, 1
+	loopchannel 0, Music_PalletTown_branch_f4ba8
 
-_Music_PalletTown_Ch3: ; 0xf4c2a
+Music_PalletTown_Ch3: ; f4c2a
 	vibrato $14, $24
-	notetype $0c, $10
-	octave6
-	note $31
-	note $11
-	octave5
-	note $c1
-	note $a1
-	octave6
-	note $81
-	note $51
-	note $71
-	note $51
-	note $35
-	octave5
-	note $c1
-	note $80
-	note $00
-	note $80
-	note $00
-	note $a0
-	note $00
-	note $c0
-	note $00
-	octave6
-	note $17
-	note $01
-	octave5
-	note $71
-	note $81
-	note $a1
-	note $c5
-	octave6
-	note $10
-	octave5
-	note $c0
-	note $a7
-	octave6
-	note $31
-	note $11
-	octave5
-	note $c1
-	octave6
-	note $31
-	note $80
-	note $00
-	note $70
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
-	note $55
-	note $30
-	note $00
-	note $37
-	note $11
-	octave5
-	note $c1
-	note $a1
-	note $81
-	octave6
-	note $31
-	note $11
-	octave5
-	note $c1
-	note $a1
-	note $87
-	note $01
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $17
-	note $35
-	note $11
-	octave5
-	note $c7
-	note $01
-	note $81
-	note $a1
-	note $c1
-	octave6
-	note $11
-	note $01
-	note $13
-	note $35
-	note $10
-	note $30
-	octave5
-	note $c7
-	note $01
-	note $c1
-	note $a1
-	note $81
-	note $a7
-	note $53
-	note $c3
-	note $a7
-	note $83
-	note $53
-	note $76
-	note $00
-	note $82
-	note $00
-	note $c2
-	note $00
-	note $c7
-	note $a7
-	loopchannel $00, $4c2d ; end
-; 0xf4c9f
+
+Music_PalletTown_branch_f4c2d: ; f4c2d
+	notetype $c, $10
+	octave 6
+	note D_, 1
+	note C_, 1
+	octave 5
+	note B_, 1
+	note A_, 1
+	octave 6
+	note G_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 5
+	octave 5
+	note B_, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 6
+	note C_, 7
+	note __, 1
+	octave 5
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 5
+	octave 6
+	note C_, 0
+	octave 5
+	note B_, 0
+	note A_, 7
+	octave 6
+	note D_, 1
+	note C_, 1
+	octave 5
+	note B_, 1
+	octave 6
+	note D_, 1
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 5
+	note D_, 0
+	note __, 0
+	note D_, 7
+	note C_, 1
+	octave 5
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	octave 6
+	note D_, 1
+	note C_, 1
+	octave 5
+	note B_, 1
+	note A_, 1
+	note G_, 7
+	note __, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 7
+	note D_, 5
+	note C_, 1
+	octave 5
+	note B_, 7
+	note __, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 1
+	note __, 1
+	note C_, 3
+	note D_, 5
+	note C_, 0
+	note D_, 0
+	octave 5
+	note B_, 7
+	note __, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 7
+	note E_, 3
+	note B_, 3
+	note A_, 7
+	note G_, 3
+	note E_, 3
+	note F#, 6
+	note __, 0
+	note G_, 2
+	note __, 0
+	note B_, 2
+	note __, 0
+	note B_, 7
+	note A_, 7
+	loopchannel 0, Music_PalletTown_branch_f4c2d
+; f4c9f
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -1,233 +1,234 @@
-_Music_PokeFluteChannel: ; 0xf7b13
-	db $80
-	dw _Music_PokeFluteChannel_Ch1
-	db $01
-	dw _Music_PokeFluteChannel_Ch2
-	db $02
-	dw _Music_PokeFluteChannel_Ch3
-; 0xf7b1c
+Music_PokeFluteChannel: ; f7b13
+	dbw $80, Music_PokeFluteChannel_Ch1
+	dbw $01, Music_PokeFluteChannel_Ch2
+	dbw $02, Music_PokeFluteChannel_Ch3
+; f7b1c
 
-_Music_PokeFluteChannel_Ch1: ; 0xf7b1c
-	tempo $f000
+
+Music_PokeFluteChannel_Ch1: ; f7b1c
+	tempo 240
 	volume $77
 	stereopanning $f0
-	dutycycle $03
-	tone $0200
-	notetype $0c, $b4
-	note $03
-	octave3
-	note $57
-	note $57
-	notetype $0c, $b3
-	note $61
-	note $51
-	note $31
-	note $11
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $cf
-	note $01
-	octave2
-	note $83
-	note $a7
-	octave3
-	note $51
-	note $81
-	note $63
-	octave2
-	note $67
-	octave3
-	note $81
-	note $a1
-	note $83
-	octave2
-	note $53
-	octave3
-	note $81
-	note $a1
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $c7
-	note $a7
-	note $87
-	octave2
-	note $c1
-	octave3
-	note $31
-	octave2
-	note $c3
-	note $87
-	octave3
-	note $13
-	note $51
-	note $31
-	octave2
-	note $83
-	note $a7
-	loopchannel $00, $7b40 ; end
-; 0xf7b68
+	dutycycle $3
+	tone $0002
+	notetype $c, $b4
+	note __, 3
+	octave 3
+	note E_, 7
+	note E_, 7
+	notetype $c, $b3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note B_, 15
+	note __, 1
+	octave 2
+	note G_, 3
+	note A_, 7
 
-_Music_PokeFluteChannel_Ch2: ; 0xf7b68
-	stereopanning $0f
-	dutycycle $03
-	tone $0100
-	notetype $0c, $c4
-	note $03
-	octave3
-	note $17
-	octave2
-	note $87
-	note $a7
-	octave3
-	note $57
-	notetype $0c, $c3
-	octave2
-	note $51
-	note $81
-	octave3
-	note $11
-	note $51
-	octave2
-	note $81
-	octave3
-	note $11
-	note $51
-	note $31
-	octave2
-	note $51
-	octave3
-	note $11
-	octave2
-	note $61
-	octave3
-	note $11
-	octave2
-	note $51
-	note $81
-	octave3
-	note $11
-	note $51
-	octave2
-	note $a3
-	note $13
-	octave3
-	note $81
-	note $61
-	note $51
-	note $31
-	octave2
-	note $83
-	note $13
-	note $81
-	note $51
-	octave3
-	note $11
-	octave2
-	note $a1
-	note $31
-	note $81
-	note $c1
-	octave3
-	note $31
-	octave2
-	note $31
-	note $71
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $81
-	octave3
-	note $31
-	note $81
-	note $31
-	octave2
-	note $33
-	note $83
-	note $51
-	octave3
-	note $11
-	note $13
-	octave2
-	note $81
-	octave3
-	note $51
-	octave2
-	note $81
-	note $c1
-	note $51
-	octave3
-	note $11
-	octave2
-	note $61
-	octave3
-	note $11
-	octave2
-	note $51
-	note $81
-	loopchannel $00, $7b94 ; end
-; 0xf7bd5
+Music_PokeFluteChannel_branch_f7b40: ; f7b40
+	octave 3
+	note E_, 1
+	note G_, 1
+	note F_, 3
+	octave 2
+	note F_, 7
+	octave 3
+	note G_, 1
+	note A_, 1
+	note G_, 3
+	octave 2
+	note E_, 3
+	octave 3
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 7
+	note A_, 7
+	note G_, 7
+	octave 2
+	note B_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note B_, 3
+	note G_, 7
+	octave 3
+	note C_, 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note G_, 3
+	note A_, 7
+	loopchannel 0, Music_PokeFluteChannel_branch_f7b40
 
-_Music_PokeFluteChannel_Ch3: ; 0xf7bd5
+Music_PokeFluteChannel_Ch2: ; f7b68
+	stereopanning $f
+	dutycycle $3
+	tone $0001
+	notetype $c, $c4
+	note __, 3
+	octave 3
+	note C_, 7
+	octave 2
+	note G_, 7
+	note A_, 7
+	octave 3
+	note E_, 7
+	notetype $c, $c3
+	octave 2
+	note E_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note E_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note F_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note E_, 1
+	note G_, 1
+
+Music_PokeFluteChannel_branch_f7b94: ; f7b94
+	octave 3
+	note C_, 1
+	note E_, 1
+	octave 2
+	note A_, 3
+	note C_, 3
+	octave 3
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note G_, 3
+	note C_, 3
+	note G_, 1
+	note E_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	octave 2
+	note D_, 3
+	note G_, 3
+	note E_, 1
+	octave 3
+	note C_, 1
+	note C_, 3
+	octave 2
+	note G_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note G_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note F_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note E_, 1
+	note G_, 1
+	loopchannel 0, Music_PokeFluteChannel_branch_f7b94
+
+Music_PokeFluteChannel_Ch3: ; f7bd5
 	vibrato $10, $14
-	notetype $0c, $10
-	callchannel _Music_PokeFluteChannel_sub_0xf7c05
-	callchannel _Music_PokeFluteChannel_sub_0xf7c05
-	note $03
-	octave4
-	note $11
-	octave5
-	note $61
-	note $51
-	note $61
-	octave6
-	note $13
-	note $03
-	octave4
-	note $11
-	octave5
-	note $81
-	note $71
-	note $81
-	octave6
-	note $13
-	octave5
-	note $c1
-	note $a1
-	note $c3
-	note $a1
-	note $81
-	note $a3
-	note $81
-	note $71
-	note $87
-	note $03
-	callchannel _Music_PokeFluteChannel_sub_0xf7c05
-	loopchannel $00, $7be1 ; end
-; 0xf7c05
+	notetype $c, $10
+	callchannel Music_PokeFluteChannel_branch_f7c05
+	callchannel Music_PokeFluteChannel_branch_f7c05
 
-_Music_PokeFluteChannel_sub_0xf7c05: ; 0xf7c05
-; subroutine
-	octave5
-	note $51
-	note $61
-	note $83
-	note $a1
-	note $81
-	octave6
-	note $13
-	note $11
-	note $31
-	note $11
-	octave5
-	note $81
-	note $a1
-	note $61
-	note $83
-	endchannel ; end
-; 0xf7c16
+Music_PokeFluteChannel_branch_f7be1: ; f7be1
+	note __, 3
+	octave 4
+	note C_, 1
+	octave 5
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	octave 6
+	note C_, 3
+	note __, 3
+	octave 4
+	note C_, 1
+	octave 5
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	octave 6
+	note C_, 3
+	octave 5
+	note B_, 1
+	note A_, 1
+	note B_, 3
+	note A_, 1
+	note G_, 1
+	note A_, 3
+	note G_, 1
+	note F#, 1
+	note G_, 7
+	note __, 3
+	callchannel Music_PokeFluteChannel_branch_f7c05
+	loopchannel 0, Music_PokeFluteChannel_branch_f7be1
+; f7c05
+
+Music_PokeFluteChannel_branch_f7c05: ; f7c05
+	octave 5
+	note E_, 1
+	note F_, 1
+	note G_, 3
+	note A_, 1
+	note G_, 1
+	octave 6
+	note C_, 3
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 5
+	note G_, 1
+	note A_, 1
+	note F_, 1
+	note G_, 3
+	endchannel
+; f7c16
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -1,419 +1,416 @@
-_Music_PokemonCenter: ; 0xed5c6
-	db $c0
-	dw _Music_PokemonCenter_Ch1
-	db $01
-	dw _Music_PokemonCenter_Ch2
-	db $02
-	dw _Music_PokemonCenter_Ch3
-	db $03
-	dw _Music_PokemonCenter_Ch4
-; 0xed5d2
+Music_PokemonCenter: ; ed5c6
+	dbw $c0, Music_PokemonCenter_Ch1
+	dbw $01, Music_PokemonCenter_Ch2
+	dbw $02, Music_PokemonCenter_Ch3
+	dbw $03, Music_PokemonCenter_Ch4
+; ed5d2
 
-_Music_PokemonCenter_Ch1: ; 0xed5d2
-	tempo $9800
+
+Music_PokemonCenter_Ch1: ; ed5d2
+	tempo 152
 	volume $77
-	dutycycle $02
-	vibrato $0a, $14
-	tone $0100
-	stereopanning $0f
-	notetype $0c, $83
-	octave3
-	note $71
-	note $61
-	note $71
-	octave4
-	note $33
-	note $21
-	octave3
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $a1
-	note $51
-	note $a1
-	octave4
-	note $23
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $a1
-	note $c1
-	octave4
-	note $21
-	note $31
-	note $21
-	octave3
-	note $c1
-	note $a1
-	note $71
-	note $61
-	note $71
-	octave4
-	note $33
-	note $21
-	octave3
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $a1
-	note $51
-	note $a1
-	octave4
-	note $23
-	octave3
-	note $c1
-	note $a1
-	note $81
-	notetype $0c, $b4
-	note $71
-	note $51
-	note $31
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $c1
+	dutycycle $2
+	vibrato $a, $14
+	tone $0001
+
+Music_PokemonCenter_branch_ed5df: ; ed5df
+	stereopanning $f
+	notetype $c, $83
+	octave 3
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	octave 4
+	note D_, 3
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note F#, 1
+	note F_, 1
+	note F#, 1
+	octave 4
+	note D_, 3
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	notetype $c, $b4
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
 	stereopanning $f0
-	note $71
-	note $51
-	note $33
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $c1
-	note $a1
-	note $83
-	note $51
-	note $71
-	note $81
-	note $a1
-	note $81
-	note $71
-	note $53
-	note $21
-	note $31
-	note $51
-	note $81
-	note $71
-	note $81
-	note $a1
-	note $c1
-	note $a7
-	octave4
-	note $31
-	note $21
-	octave3
-	note $c3
-	note $a1
-	note $c1
-	octave4
-	note $21
-	note $31
-	note $51
-	note $31
-	note $23
-	octave3
-	note $c1
-	octave4
-	note $21
-	note $31
-	note $51
-	note $21
-	octave3
-	note $c1
-	note $a3
-	note $81
-	note $a1
-	note $c1
-	note $81
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $31
-	note $51
-	note $71
-	note $81
-	loopchannel $00, $55df ; end
-; 0xed671
+	note F#, 1
+	note E_, 1
+	note D_, 3
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 3
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 3
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 7
+	octave 4
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 3
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 3
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	loopchannel 0, Music_PokemonCenter_branch_ed5df
 
-_Music_PokemonCenter_Ch2: ; 0xed671
+Music_PokemonCenter_Ch2: ; ed671
 	vibrato $10, $25
+
+Music_PokemonCenter_branch_ed674: ; ed674
 	stereopanning $ff
-	callchannel _Music_PokemonCenter_sub_0xed6d1
-	stereopanning $0f
-	notetype $0c, $a5
-	octave3
-	note $a3
-	note $53
+	callchannel Music_PokemonCenter_branch_ed6d1
+	stereopanning $f
+	notetype $c, $a5
+	octave 3
+	note A_, 3
+	note E_, 3
 	stereopanning $ff
-	callchannel _Music_PokemonCenter_sub_0xed6e4
-	note $31
-	note $75
-	stereopanning $0f
-	notetype $0c, $a5
-	octave3
-	note $a3
-	note $53
+	callchannel Music_PokemonCenter_branch_ed6e4
+	note D_, 1
+	note F#, 5
+	stereopanning $f
+	notetype $c, $a5
+	octave 3
+	note A_, 3
+	note E_, 3
 	stereopanning $ff
-	callchannel _Music_PokemonCenter_sub_0xed6d1
-	stereopanning $0f
-	notetype $0c, $a5
-	octave3
-	note $a3
-	note $53
+	callchannel Music_PokemonCenter_branch_ed6d1
+	stereopanning $f
+	notetype $c, $a5
+	octave 3
+	note A_, 3
+	note E_, 3
 	stereopanning $ff
-	callchannel _Music_PokemonCenter_sub_0xed6e4
-	note $37
-	stereopanning $0f
-	notetype $0c, $a5
-	octave3
-	note $33
-	note $53
-	notetype $0c, $c6
-	octave4
-	note $77
-	note $a7
-	note $81
-	note $a1
-	note $81
-	note $71
-	note $57
-	note $27
-	note $57
-	note $71
-	note $81
-	note $71
-	note $51
-	note $37
-	note $77
-	note $a7
-	note $81
-	note $71
-	note $81
-	note $a1
-	note $c7
-	note $a3
-	note $81
-	note $71
-	note $87
-	note $71
-	note $81
-	note $71
-	note $51
-	note $37
-	loopchannel $00, $5674 ; end
-; 0xed6d1
+	callchannel Music_PokemonCenter_branch_ed6e4
+	note D_, 7
+	stereopanning $f
+	notetype $c, $a5
+	octave 3
+	note D_, 3
+	note E_, 3
+	notetype $c, $c6
+	octave 4
+	note F#, 7
+	note A_, 7
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 7
+	note C#, 7
+	note E_, 7
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 7
+	note F#, 7
+	note A_, 7
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 7
+	note A_, 3
+	note G_, 1
+	note F#, 1
+	note G_, 7
+	note F#, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 7
+	loopchannel 0, Music_PokemonCenter_branch_ed674
+; ed6d1
 
-_Music_PokemonCenter_sub_0xed6d1: ; 0xed6d1
-; subroutine
-	dutycycle $02
-	notetype $0c, $c2
-	octave4
-	note $31
-	octave3
-	note $a1
-	octave4
-	note $31
+Music_PokemonCenter_branch_ed6d1: ; ed6d1
+	dutycycle $2
+	notetype $c, $c2
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
 	intensity $c3
-	note $a3
-	note $83
-	note $71
-	note $51
-	note $25
-	endchannel ; end
-; 0xed6e4
+	note A_, 3
+	note G_, 3
+	note F#, 1
+	note E_, 1
+	note C#, 5
+	endchannel
+; ed6e4
 
-_Music_PokemonCenter_sub_0xed6e4: ; 0xed6e4
-; subroutine
-	notetype $0c, $c2
-	octave4
-	note $21
-	octave3
-	note $a1
-	octave4
-	note $21
+Music_PokemonCenter_branch_ed6e4: ; ed6e4
+	notetype $c, $c2
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
 	intensity $c3
-	note $73
-	note $53
-	note $21
-	endchannel ; end
-; 0xed6f3
+	note F#, 3
+	note E_, 3
+	note C#, 1
+	endchannel
 
-_Music_PokemonCenter_Ch3: ; 0xed6f3
-	notetype $0c, $28
+Music_PokemonCenter_Ch3: ; ed6f3
+	notetype $c, $28
+
+Music_PokemonCenter_branch_ed6f6: ; ed6f6
 	stereopanning $f0
-	octave3
-	note $30
-	note $04
-	note $70
-	note $02
-	note $70
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	callchannel _Music_PokemonCenter_sub_0xed76f
-	callchannel _Music_PokemonCenter_sub_0xed778
-	note $70
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $80
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $04
-	note $70
-	note $02
-	note $70
-	note $00
-	note $80
-	note $00
-	note $70
-	note $00
-	callchannel _Music_PokemonCenter_sub_0xed76f
-	callchannel _Music_PokemonCenter_sub_0xed778
-	note $30
-	note $04
-	note $70
-	note $02
-	note $70
-	note $00
-	note $30
-	note $00
-	note $80
-	note $00
+	octave 3
+	note D_, 0
+	note __, 4
+	note F#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	callchannel Music_PokemonCenter_branch_ed76f
+	callchannel Music_PokemonCenter_branch_ed778
+	note F#, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 4
+	note F#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	callchannel Music_PokemonCenter_branch_ed76f
+	callchannel Music_PokemonCenter_branch_ed778
+	note D_, 0
+	note __, 4
+	note F#, 0
+	note __, 2
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 	stereopanning $ff
-	callchannel _Music_PokemonCenter_sub_0xed783
-	note $80
-	note $04
-	note $c0
-	note $02
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $04
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $00
-	note $70
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $a0
-	note $00
-	callchannel _Music_PokemonCenter_sub_0xed783
-	note $80
-	note $04
-	note $c0
-	note $02
-	note $c0
-	note $02
-	note $c0
-	note $00
-	note $50
-	note $04
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $00
-	note $70
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $80
-	note $00
-	note $50
-	note $00
-	loopchannel $00, $56f6 ; end
-; 0xed76f
+	callchannel Music_PokemonCenter_branch_ed783
+	note G_, 0
+	note __, 4
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 4
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	callchannel Music_PokemonCenter_branch_ed783
+	note G_, 0
+	note __, 4
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 4
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	note F#, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	loopchannel 0, Music_PokemonCenter_branch_ed6f6
+; ed76f
 
-_Music_PokemonCenter_sub_0xed76f: ; 0xed76f
-; subroutine
-	note $50
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	endchannel ; end
-; 0xed778
+Music_PokemonCenter_branch_ed76f: ; ed76f
+	note E_, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	endchannel
+; ed778
 
-_Music_PokemonCenter_sub_0xed778: ; 0xed778
-; subroutine
-	note $50
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $80
-	note $00
-	note $a0
-	note $00
-	endchannel ; end
-; 0xed783
+Music_PokemonCenter_branch_ed778: ; ed778
+	note E_, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	endchannel
+; ed783
 
-_Music_PokemonCenter_sub_0xed783: ; 0xed783
-; subroutine
-	note $70
-	note $04
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	endchannel ; end
-; 0xed78c
+Music_PokemonCenter_branch_ed783: ; ed783
+	note F#, 0
+	note __, 4
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	endchannel
 
-_Music_PokemonCenter_Ch4: ; 0xed78c
-	togglenoise $03
-	notetype $0c
+Music_PokemonCenter_Ch4: ; ed78c
+	togglenoise $3
+	notetype $c
 	stereopanning $ff
-	note $85
-	note $83
-	note $81
-	note $81
-	note $81
-	loopchannel $00, $5792 ; end
-; 0xed79b
+
+Music_PokemonCenter_branch_ed792: ; ed792
+	note G_, 5
+	note G_, 3
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	loopchannel 0, Music_PokemonCenter_branch_ed792
+; ed79b
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -1,239 +1,235 @@
-_Music_PokemonChannel: ; 0xee45f
-	db $c0
-	dw _Music_PokemonChannel_Ch1
-	db $01
-	dw _Music_PokemonChannel_Ch2
-	db $02
-	dw _Music_PokemonChannel_Ch3
-	db $03
-	dw _Music_PokemonChannel_Ch4
-; 0xee46b
+Music_PokemonChannel: ; ee45f
+	dbw $c0, Music_PokemonChannel_Ch1
+	dbw $01, Music_PokemonChannel_Ch2
+	dbw $02, Music_PokemonChannel_Ch3
+	dbw $03, Music_PokemonChannel_Ch4
+; ee46b
 
-_Music_PokemonChannel_Ch1: ; 0xee46b
-	tempo $8000
+
+Music_PokemonChannel_Ch1: ; ee46b
+	tempo 128
 	volume $77
-	vibrato $08, $38
-	dutycycle $01
-	stereopanning $0f
-	notetype $0c, $b3
-	octave2
-	note $c0
-	note $01
-	note $70
-	note $c0
-	note $00
-	octave3
-	note $73
-	dutycycle $00
-	octave2
-	note $c0
-	note $00
-	note $c0
-	note $00
-	notetype $06, $b3
-	note $80
-	note $00
-	note $c0
-	note $00
-	dutycycle $01
-	octave3
-	note $11
-	note $03
-	note $81
-	note $11
-	note $01
-	note $c7
-	dutycycle $00
-	note $13
-	note $13
-	octave2
-	note $81
-	note $01
-	dutycycle $03
-	octave4
-	note $31
-	note $01
-	note $31
-	note $01
-	octave3
-	note $81
-	note $c1
-	octave4
-	note $31
-	note $71
-	note $81
-	note $01
-	note $41
-	note $01
-	note $11
-	note $01
-	note $41
-	note $01
-	note $07
-	octave3
-	note $81
-	note $05
-	note $c1
-	note $05
-	note $31
-	note $05
-	endchannel ; end
-; 0xee4be
+	vibrato $8, $38
+	dutycycle $1
+	stereopanning $f
+	notetype $c, $b3
+	octave 2
+	note B_, 0
+	note __, 1
+	note F#, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note F#, 3
+	dutycycle $0
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	notetype $6, $b3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	dutycycle $1
+	octave 3
+	note C_, 1
+	note __, 3
+	note G_, 1
+	note C_, 1
+	note __, 1
+	note B_, 7
+	dutycycle $0
+	note C_, 3
+	note C_, 3
+	octave 2
+	note G_, 1
+	note __, 1
+	dutycycle $3
+	octave 4
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note __, 7
+	octave 3
+	note G_, 1
+	note __, 5
+	note B_, 1
+	note __, 5
+	note D_, 1
+	note __, 5
+	endchannel
 
-_Music_PokemonChannel_Ch2: ; 0xee4be
-	dutycycle $01
-	vibrato $08, $38
+Music_PokemonChannel_Ch2: ; ee4be
+	dutycycle $1
+	vibrato $8, $38
 	stereopanning $ff
-	notetype $0c, $b3
-	octave3
-	note $82
-	note $a0
-	note $c0
-	note $00
-	octave4
-	note $33
-	dutycycle $00
-	octave3
-	note $80
-	note $00
-	note $80
-	note $00
-	notetype $06, $b3
-	note $30
-	note $00
-	note $80
-	note $00
-	dutycycle $01
-	octave4
-	note $15
-	note $31
-	note $51
-	note $01
-	note $87
-	dutycycle $00
-	octave3
-	note $83
-	note $73
-	note $51
-	note $01
-	dutycycle $03
-	octave4
-	note $c1
-	note $01
-	note $b1
-	note $01
-	note $c7
-	octave5
-	note $11
-	note $01
-	note $11
-	note $01
-	octave4
-	note $b1
-	note $01
-	note $91
-	note $01
-	note $07
-	note $31
-	octave3
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $30
-	note $00
-	octave4
-	note $81
-	note $05
-	octave3
-	note $81
-	note $05
-	endchannel ; end
-; 0xee50e
+	notetype $c, $b3
+	octave 3
+	note G_, 2
+	note A_, 0
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 3
+	dutycycle $0
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	notetype $6, $b3
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	dutycycle $1
+	octave 4
+	note C_, 5
+	note D_, 1
+	note E_, 1
+	note __, 1
+	note G_, 7
+	dutycycle $0
+	octave 3
+	note G_, 3
+	note F#, 3
+	note E_, 1
+	note __, 1
+	dutycycle $3
+	octave 4
+	note B_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note B_, 7
+	octave 5
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 4
+	note A#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note __, 7
+	note D_, 1
+	octave 3
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 4
+	note G_, 1
+	note __, 5
+	octave 3
+	note G_, 1
+	note __, 5
+	endchannel
 
-_Music_PokemonChannel_Ch3: ; 0xee50e
-	vibrato $08, $38
-	notetype $0c, $25
+Music_PokemonChannel_Ch3: ; ee50e
+	vibrato $8, $38
+	notetype $c, $25
 	stereopanning $f0
-	octave2
-	note $80
-	note $01
-	note $c0
-	octave3
-	note $30
-	note $00
-	note $85
-	note $03
-	note $10
-	note $01
-	octave2
-	note $80
-	octave3
-	note $10
-	note $00
-	note $55
-	note $03
-	octave4
-	note $80
-	note $00
-	note $30
-	note $00
-	octave3
-	note $83
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	note $40
-	note $00
-	note $90
-	note $00
-	note $30
-	octave3
-	note $c0
-	note $80
-	note $c0
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $80
-	note $02
-	note $80
-	note $02
-	endchannel ; end
-; 0xee549
+	octave 2
+	note G_, 0
+	note __, 1
+	note B_, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note G_, 5
+	note __, 3
+	note C_, 0
+	note __, 1
+	octave 2
+	note G_, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note E_, 5
+	note __, 3
+	octave 4
+	note G_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 3
+	note G_, 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note G_, 0
+	note B_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	endchannel
 
-_Music_PokemonChannel_Ch4: ; 0xee549
-	togglenoise $03
-	notetype $0c
-	note $b2
-	note $b0
-	note $31
-	note $13
-	note $31
-	note $31
-	note $b0
-	note $30
-	loopchannel $02, $654d
-	note $91
-	note $b1
-	note $90
-	note $90
-	note $90
-	note $90
-	note $13
-	note $90
-	note $90
-	note $90
-	note $90
-	note $c3
-	note $33
-	note $b3
-	note $b3
-	endchannel ; end
-; 0xee569
+Music_PokemonChannel_Ch4: ; ee549
+	togglenoise $3
+	notetype $c
+
+Music_PokemonChannel_branch_ee54d: ; ee54d
+	note A#, 2
+	note A#, 0
+	note D_, 1
+	note C_, 3
+	note D_, 1
+	note D_, 1
+	note A#, 0
+	note D_, 0
+	loopchannel 2, Music_PokemonChannel_branch_ee54d
+	note G#, 1
+	note A#, 1
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note C_, 3
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note G#, 0
+	note B_, 3
+	note D_, 3
+	note A#, 3
+	note A#, 3
+	endchannel
+; ee569
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -1,136 +1,138 @@
-_Music_PokemonLullaby: ; 0xf6d79
-	db $80
-	dw _Music_PokemonLullaby_Ch1
-	db $01
-	dw _Music_PokemonLullaby_Ch2
-	db $02
-	dw _Music_PokemonLullaby_Ch3
-; 0xf6d82
+Music_PokemonLullaby: ; f6d79
+	dbw $80, Music_PokemonLullaby_Ch1
+	dbw $01, Music_PokemonLullaby_Ch2
+	dbw $02, Music_PokemonLullaby_Ch3
+; f6d82
 
-_Music_PokemonLullaby_Ch1: ; 0xf6d82
-	tempo $e000
+
+Music_PokemonLullaby_Ch1: ; f6d82
+	tempo 224
 	volume $77
-	dutycycle $03
-	tone $0100
-	notetype $0c, $a7
-	octave3
-	note $8f
-	octave4
-	note $1f
+	dutycycle $3
+	tone $0001
+
+Music_PokemonLullaby_branch_f6d8c: ; f6d8c
+	notetype $c, $a7
+	octave 3
+	note G_, 15
+	octave 4
+	note C_, 15
 	stereopanning $f0
-	octave3
-	note $8f
-	stereopanning $0f
-	octave4
-	note $17
+	octave 3
+	note G_, 15
+	stereopanning $f
+	octave 4
+	note C_, 7
 	stereopanning $f0
-	octave3
-	note $c7
-	stereopanning $0f
-	note $8f
+	octave 3
+	note B_, 7
+	stereopanning $f
+	note G_, 15
 	stereopanning $f0
-	octave4
-	note $17
-	stereopanning $0f
-	octave3
-	note $c7
+	octave 4
+	note C_, 7
+	stereopanning $f
+	octave 3
+	note B_, 7
 	stereopanning $f0
-	note $87
+	note G_, 7
 	stereopanning $ff
-	note $01
-	note $81
-	note $81
-	note $c1
-	octave4
-	note $13
-	octave3
-	note $c3
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $8f
-	octave4
-	note $17
-	octave3
-	note $c7
-	loopchannel $00, $6d8c ; end
-; 0xf6dc4
+	note __, 1
+	note G_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note G_, 15
+	octave 4
+	note C_, 7
+	octave 3
+	note B_, 7
+	loopchannel 0, Music_PokemonLullaby_branch_f6d8c
 
-_Music_PokemonLullaby_Ch2: ; 0xf6dc4
+Music_PokemonLullaby_Ch2: ; f6dc4
 	vibrato $10, $14
-	dutycycle $00
-	notetype $0c, $b4
-	note $0f
-	note $09
-	octave4
-	note $81
-	note $71
-	note $81
+	dutycycle $0
+	notetype $c, $b4
+
+Music_PokemonLullaby_branch_f6dcc: ; f6dcc
+	note __, 15
+	note __, 9
+	octave 4
+	note G_, 1
+	note F#, 1
+	note G_, 1
 	intensity $b7
-	note $5b
-	note $31
-	note $51
-	note $63
-	note $83
-	note $61
-	note $51
-	note $31
-	note $61
-	note $59
+	note E_, 11
+	note D_, 1
+	note E_, 1
+	note F_, 3
+	note G_, 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note E_, 9
 	intensity $b5
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
 	intensity $c7
-	note $51
-	note $63
-	note $53
-	note $63
+	note E_, 1
+	note F_, 3
+	note E_, 3
+	note F_, 3
 	intensity $b5
-	note $81
-	note $81
-	note $41
+	note G_, 1
+	note G_, 1
+	note D#, 1
 	intensity $b7
-	note $5d
+	note E_, 13
 	intensity $87
-	octave3
-	note $67
-	note $83
+	octave 3
+	note F_, 7
+	note G_, 3
 	intensity $b5
-	octave4
-	note $81
-	note $81
+	octave 4
+	note G_, 1
+	note G_, 1
 	intensity $b7
-	note $41
-	note $5f
-	note $0d
-	loopchannel $00, $6dcc ; end
-; 0xf6e03
+	note D#, 1
+	note E_, 15
+	note __, 13
+	loopchannel 0, Music_PokemonLullaby_branch_f6dcc
 
-_Music_PokemonLullaby_Ch3: ; 0xf6e03
-	notetype $0c, $11
+Music_PokemonLullaby_Ch3: ; f6e03
+	notetype $c, $11
+
+Music_PokemonLullaby_branch_f6e06: ; f6e06
 	stereopanning $f0
-	octave4
-	note $11
-	note $51
-	note $81
-	note $c1
-	octave5
-	note $11
-	octave4
-	note $c1
-	note $a1
-	note $81
-	stereopanning $0f
-	note $31
-	note $61
-	note $a1
-	octave5
-	note $11
-	note $31
-	note $11
-	octave4
-	note $c1
-	note $a1
-	loopchannel $00, $6e06 ; end
-; 0xf6e23
+	octave 4
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	stereopanning $f
+	note D_, 1
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	loopchannel 0, Music_PokemonLullaby_branch_f6e06
+; f6e23
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -1,473 +1,472 @@
-_Music_PokemonMarch: ; 0xf6e23
-	db $c0
-	dw _Music_PokemonMarch_Ch1
-	db $01
-	dw _Music_PokemonMarch_Ch2
-	db $02
-	dw _Music_PokemonMarch_Ch3
-	db $03
-	dw _Music_PokemonMarch_Ch4
-; 0xf6e2f
+Music_PokemonMarch: ; f6e23
+	dbw $c0, Music_PokemonMarch_Ch1
+	dbw $01, Music_PokemonMarch_Ch2
+	dbw $02, Music_PokemonMarch_Ch3
+	dbw $03, Music_PokemonMarch_Ch4
+; f6e2f
 
-_Music_PokemonMarch_Ch1: ; 0xf6e2f
-	tempo $9000
+
+Music_PokemonMarch_Ch1: ; f6e2f
+	tempo 144
 	volume $77
 	stereopanning $f0
-	dutycycle $03
-	tone $0100
-	notetype $0c, $42
-	octave3
-	note $33
+	dutycycle $3
+	tone $0001
+	notetype $c, $42
+	octave 3
+	note D_, 3
 	intensity $62
-	note $33
+	note D_, 3
 	intensity $82
-	note $33
+	note D_, 3
 	intensity $a2
-	note $33
-	notetype $08, $a2
-	callchannel _Music_PokemonMarch_sub_0xf6eae
-	note $41
-	note $11
-	note $41
-	note $11
-	callchannel _Music_PokemonMarch_sub_0xf6eae
-	note $41
-	note $11
-	note $41
-	note $81
-	callchannel _Music_PokemonMarch_sub_0xf6eae
-	note $11
-	note $11
-	note $41
-	note $11
-	callchannel _Music_PokemonMarch_sub_0xf6eae
-	note $41
-	note $11
-	note $21
-	note $41
-	callchannel _Music_PokemonMarch_sub_0xf6eb8
-	note $61
-	note $31
-	note $61
-	note $31
-	callchannel _Music_PokemonMarch_sub_0xf6eb8
-	note $61
-	note $31
-	note $61
-	note $a1
-	callchannel _Music_PokemonMarch_sub_0xf6eb8
-	note $31
-	note $31
-	note $61
-	note $31
-	callchannel _Music_PokemonMarch_sub_0xf6eb8
-	note $61
-	note $31
-	note $61
-	note $81
-	callchannel _Music_PokemonMarch_sub_0xf6eb8
-	note $61
-	note $31
-	note $61
-	note $31
-	callchannel _Music_PokemonMarch_sub_0xf6eae
-	note $41
-	note $11
-	note $41
-	note $11
-	octave2
-	note $b1
-	note $b1
-	octave3
-	note $11
-	note $31
-	note $21
-	note $11
-	octave2
-	note $b1
-	note $03
-	note $41
-	note $03
-	octave3
-	note $41
-	note $41
-	note $61
-	note $81
-	note $71
-	note $61
-	note $43
-	note $61
-	note $83
-	note $b1
-	loopchannel $00, $6e4c ; end
-; 0xf6eae
+	note D_, 3
+	notetype $8, $a2
 
-_Music_PokemonMarch_sub_0xf6eae: ; 0xf6eae
-; subroutine
-	note $03
-	octave3
-	note $40
-	note $30
-	note $41
-	note $01
-	note $41
-	note $41
-	note $01
-	endchannel ; end
-; 0xf6eb8
+Music_PokemonMarch_branch_f6e4c: ; f6e4c
+	callchannel Music_PokemonMarch_branch_f6eae
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	callchannel Music_PokemonMarch_branch_f6eae
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note G_, 1
+	callchannel Music_PokemonMarch_branch_f6eae
+	note C_, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	callchannel Music_PokemonMarch_branch_f6eae
+	note D#, 1
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	callchannel Music_PokemonMarch_branch_f6eb8
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	callchannel Music_PokemonMarch_branch_f6eb8
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note A_, 1
+	callchannel Music_PokemonMarch_branch_f6eb8
+	note D_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	callchannel Music_PokemonMarch_branch_f6eb8
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	callchannel Music_PokemonMarch_branch_f6eb8
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	callchannel Music_PokemonMarch_branch_f6eae
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	note __, 3
+	note D#, 1
+	note __, 3
+	octave 3
+	note D#, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 3
+	note F_, 1
+	note G_, 3
+	note A#, 1
+	loopchannel 0, Music_PokemonMarch_branch_f6e4c
+; f6eae
 
-_Music_PokemonMarch_sub_0xf6eb8: ; 0xf6eb8
-; subroutine
-	note $03
-	note $60
-	note $50
-	note $61
-	note $01
-	note $61
-	note $61
-	note $01
-	endchannel ; end
-; 0xf6ec1
+Music_PokemonMarch_branch_f6eae: ; f6eae
+	note __, 3
+	octave 3
+	note D#, 0
+	note D_, 0
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note D#, 1
+	note __, 1
+	endchannel
+; f6eb8
 
-_Music_PokemonMarch_Ch2: ; 0xf6ec1
-	dutycycle $02
+Music_PokemonMarch_branch_f6eb8: ; f6eb8
+	note __, 3
+	note F_, 0
+	note E_, 0
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
+	endchannel
+
+Music_PokemonMarch_Ch2: ; f6ec1
+	dutycycle $2
 	vibrato $10, $22
-	notetype $0c, $b2
-	octave3
-	note $83
-	note $83
-	note $83
-	note $83
-	notetype $0c, $b7
-	octave3
-	note $9b
-	notetype $08, $b3
-	note $41
-	note $91
-	note $b1
-	octave4
-	note $11
-	note $0f
-	note $05
-	notetype $08, $b7
-	octave3
-	note $9f
-	notetype $08, $b3
-	note $41
-	note $93
-	note $b1
-	octave4
-	note $13
-	note $21
-	note $13
-	note $21
-	note $13
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $91
-	notetype $08, $b7
-	note $bf
-	notetype $08, $b3
-	note $b1
-	note $61
-	note $b1
-	octave4
-	note $11
-	note $31
-	note $0f
-	note $05
-	notetype $08, $b7
-	octave3
-	note $bf
-	notetype $08, $b3
-	note $61
-	note $b3
-	octave4
-	note $11
-	note $33
-	note $41
-	note $33
-	note $41
-	note $33
-	note $41
-	note $31
-	note $11
-	octave3
-	note $c1
-	notetype $08, $b7
-	note $bf
-	notetype $08, $b3
-	note $a1
-	note $b3
-	octave4
-	note $11
-	notetype $08, $b7
-	octave3
-	note $9f
-	notetype $08, $b3
-	note $b1
-	note $93
-	note $61
-	note $41
-	note $41
-	note $61
-	note $81
-	note $71
-	note $61
-	note $41
-	note $01
-	octave4
-	note $40
-	note $30
-	note $40
-	note $04
-	octave3
-	note $81
-	note $81
-	note $91
-	note $b1
-	note $a1
-	note $91
-	note $81
-	note $01
-	octave4
-	note $80
-	note $70
-	note $80
-	note $04
-	loopchannel $00, $6ece ; end
-; 0xf6f4d
+	notetype $c, $b2
+	octave 3
+	note G_, 3
+	note G_, 3
+	note G_, 3
+	note G_, 3
 
-_Music_PokemonMarch_Ch3: ; 0xf6f4d
-	stereopanning $0f
-	notetype $0c, $16
-	note $0f
-	notetype $08, $16
-	callchannel _Music_PokemonMarch_sub_0xf6fe8
-	note $01
-	octave4
-	note $41
-	callchannel _Music_PokemonMarch_sub_0xf6fe8
-	octave4
-	note $91
-	note $41
-	callchannel _Music_PokemonMarch_sub_0xf6fe8
-	note $01
-	octave4
-	note $41
-	octave3
-	note $91
-	note $01
-	octave4
-	note $41
-	octave3
-	note $41
-	note $01
-	octave4
-	note $41
-	octave3
-	note $91
-	note $01
-	octave4
-	note $41
-	octave3
-	note $41
-	note $81
-	note $91
-	octave3
-	note $b1
-	note $01
-	octave4
-	note $61
-	octave3
-	note $61
-	note $01
-	octave4
-	note $61
-	octave3
-	note $81
-	note $01
-	octave4
-	note $61
-	octave3
-	note $a1
-	note $00
-	octave4
-	note $61
-	note $00
-	loopchannel $03, $6f7b
-	octave3
-	note $b1
-	note $01
-	octave4
-	note $61
-	octave3
-	note $61
-	note $01
-	octave4
-	note $61
-	octave3
-	note $b1
-	note $01
-	octave4
-	note $61
-	note $31
-	note $11
-	octave3
-	note $c1
-	note $b1
-	note $01
-	octave4
-	note $61
-	octave3
-	note $61
-	note $01
-	octave4
-	note $61
-	octave3
-	note $81
-	note $01
-	octave4
-	note $61
-	octave3
-	note $61
-	note $81
-	note $b1
-	note $91
-	note $01
-	octave4
-	note $41
-	octave3
-	note $41
-	note $01
-	octave4
-	note $41
-	octave3
-	note $61
-	note $01
-	octave4
-	note $41
-	octave3
-	note $91
-	note $01
-	octave4
-	note $11
-	note $41
-	note $41
-	note $61
-	note $81
-	note $71
-	note $61
-	note $41
-	note $03
-	octave3
-	note $41
-	note $03
-	octave4
-	note $81
-	note $81
-	note $91
-	note $b1
-	note $a1
-	note $91
-	note $81
-	note $01
-	note $41
-	note $61
-	note $01
-	note $91
-	loopchannel $00, $6f56 ; end
-; 0xf6fe8
+Music_PokemonMarch_branch_f6ece: ; f6ece
+	notetype $c, $b7
+	octave 3
+	note G#, 11
+	notetype $8, $b3
+	note D#, 1
+	note G#, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note __, 15
+	note __, 5
+	notetype $8, $b7
+	octave 3
+	note G#, 15
+	notetype $8, $b3
+	note D#, 1
+	note G#, 3
+	note A#, 1
+	octave 4
+	note C_, 3
+	note C#, 1
+	note C_, 3
+	note C#, 1
+	note C_, 3
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	notetype $8, $b7
+	note A#, 15
+	notetype $8, $b3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note __, 15
+	note __, 5
+	notetype $8, $b7
+	octave 3
+	note A#, 15
+	notetype $8, $b3
+	note F_, 1
+	note A#, 3
+	octave 4
+	note C_, 1
+	note D_, 3
+	note D#, 1
+	note D_, 3
+	note D#, 1
+	note D_, 3
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	notetype $8, $b7
+	note A#, 15
+	notetype $8, $b3
+	note A_, 1
+	note A#, 3
+	octave 4
+	note C_, 1
+	notetype $8, $b7
+	octave 3
+	note G#, 15
+	notetype $8, $b3
+	note A#, 1
+	note G#, 3
+	note F_, 1
+	note D#, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note D_, 0
+	note D#, 0
+	note __, 4
+	octave 3
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note __, 4
+	loopchannel 0, Music_PokemonMarch_branch_f6ece
 
-_Music_PokemonMarch_sub_0xf6fe8: ; 0xf6fe8
-; subroutine
-	octave3
-	note $91
-	note $01
-	octave4
-	note $41
-	octave3
-	note $41
-	note $01
-	octave4
-	note $41
-	octave3
-	note $61
-	note $01
-	octave4
-	note $41
-	octave3
-	note $81
-	endchannel ; end
-; 0xf6ffa
+Music_PokemonMarch_Ch3: ; f6f4d
+	stereopanning $f
+	notetype $c, $16
+	note __, 15
+	notetype $8, $16
 
-_Music_PokemonMarch_Ch4: ; 0xf6ffa
+Music_PokemonMarch_branch_f6f56: ; f6f56
+	callchannel Music_PokemonMarch_branch_f6fe8
+	note __, 1
+	octave 4
+	note D#, 1
+	callchannel Music_PokemonMarch_branch_f6fe8
+	octave 4
+	note G#, 1
+	note D#, 1
+	callchannel Music_PokemonMarch_branch_f6fe8
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note G_, 1
+	note G#, 1
+
+Music_PokemonMarch_branch_f6f7b: ; f6f7b
+	octave 3
+	note A#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note G_, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note A_, 1
+	note __, 0
+	octave 4
+	note F_, 1
+	note __, 0
+	loopchannel 3, Music_PokemonMarch_branch_f6f7b
+	octave 3
+	note A#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note A#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note G_, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	octave 3
+	note F_, 1
+	note G_, 1
+	note A#, 1
+	note G#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note F_, 1
+	note G_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note __, 3
+	octave 3
+	note D#, 1
+	note __, 3
+	octave 4
+	note G_, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note __, 1
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note G#, 1
+	loopchannel 0, Music_PokemonMarch_branch_f6f56
+; f6fe8
+
+Music_PokemonMarch_branch_f6fe8: ; f6fe8
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note G_, 1
+	endchannel
+
+Music_PokemonMarch_Ch4: ; f6ffa
 	stereopanning $f0
-	togglenoise $05
-	notetype $08
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	callchannel _Music_PokemonMarch_sub_0xf7042
-	note $13
-	note $11
-	note $13
-	note $11
-	note $13
-	note $14
-	notetype $06
-	note $30
-	note $30
-	note $20
-	note $20
-	notetype $08
-	callchannel _Music_PokemonMarch_sub_0xf7042
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	callchannel _Music_PokemonMarch_sub_0xf7042
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	callchannel _Music_PokemonMarch_sub_0xf7042
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	callchannel _Music_PokemonMarch_sub_0xf7042
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	note $23
-	note $21
-	note $23
-	note $21
-	note $25
-	note $11
-	notetype $04
-	note $04
-	notetype $06
-	note $30
-	note $30
-	notetype $08
-	callchannel _Music_PokemonMarch_sub_0xf704c
-	loopchannel $00, $7003 ; end
-; 0xf7042
+	togglenoise $5
+	notetype $8
+	callchannel Music_PokemonMarch_branch_f704c
 
-_Music_PokemonMarch_sub_0xf7042: ; 0xf7042
-; subroutine
-	note $13
-	note $11
-	note $13
-	note $11
-	note $13
-	note $31
-	note $31
-	note $21
-	note $21
-	endchannel ; end
-; 0xf704c
+Music_PokemonMarch_branch_f7003: ; f7003
+	callchannel Music_PokemonMarch_branch_f7042
+	note C_, 3
+	note C_, 1
+	note C_, 3
+	note C_, 1
+	note C_, 3
+	note C_, 4
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	notetype $8
+	callchannel Music_PokemonMarch_branch_f7042
+	callchannel Music_PokemonMarch_branch_f704c
+	callchannel Music_PokemonMarch_branch_f7042
+	callchannel Music_PokemonMarch_branch_f704c
+	callchannel Music_PokemonMarch_branch_f7042
+	callchannel Music_PokemonMarch_branch_f704c
+	callchannel Music_PokemonMarch_branch_f7042
+	callchannel Music_PokemonMarch_branch_f704c
+	note C#, 3
+	note C#, 1
+	note C#, 3
+	note C#, 1
+	note C#, 5
+	note C_, 1
+	notetype $4
+	note __, 4
+	notetype $6
+	note D_, 0
+	note D_, 0
+	notetype $8
+	callchannel Music_PokemonMarch_branch_f704c
+	loopchannel 0, Music_PokemonMarch_branch_f7003
+; f7042
 
-_Music_PokemonMarch_sub_0xf704c: ; 0xf704c
-; subroutine
-	note $13
-	note $11
-	note $13
-	note $13
-	note $13
-	note $21
-	note $31
-	note $21
-	endchannel ; end
-; 0xf7055
+Music_PokemonMarch_branch_f7042: ; f7042
+	note C_, 3
+	note C_, 1
+	note C_, 3
+	note C_, 1
+	note C_, 3
+	note D_, 1
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	endchannel
+; f704c
+
+Music_PokemonMarch_branch_f704c: ; f704c
+	note C_, 3
+	note C_, 1
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	endchannel
+; f7055
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -1,269 +1,268 @@
-_Music_PostCredits: ; 0xcfd9e
-	db $40
-	dw _Music_PostCredits_Ch1
-	db $01
-	dw _Music_PostCredits_Ch2
-; 0xcfda4
+Music_PostCredits: ; cfd9e
+	dbw $40, Music_PostCredits_Ch1
+	dbw $01, Music_PostCredits_Ch2
+; cfda4
 
-; 0xcfda4
-	db $02
-; 0xcfda5
+INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4
 
-_Music_PostCredits_Ch1: ; 0xcfda5
-	tempo $0f01
+Music_PostCredits_Ch1: ; cfda5
+	tempo 271
 	volume $77
-	forceoctave $03
-	dutycycle $02
-	notetype $0c, $93
-	note $07
-	octave3
-	note $11
-	note $51
-	note $81
-	octave4
-	note $11
-	note $51
+	forceoctave $3
+	dutycycle $2
+	notetype $c, $93
+	note __, 7
+
+Music_PostCredits_branch_cfdb2: ; cfdb2
+	octave 3
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
 	intensity $73
-	note $51
+	note E_, 1
 	intensity $53
-	note $51
+	note E_, 1
 	intensity $43
-	note $51
+	note E_, 1
 	intensity $93
-	octave2
-	note $c1
-	octave3
-	note $31
-	note $81
-	note $c1
-	octave4
-	note $31
+	octave 2
+	note B_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
 	intensity $73
-	note $31
+	note D_, 1
 	intensity $53
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $93
-	octave2
-	note $b1
-	octave3
-	note $31
-	note $81
-	note $b1
-	octave4
-	note $31
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note D_, 1
 	intensity $73
-	note $31
+	note D_, 1
 	intensity $53
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $93
-	octave2
-	note $a1
-	octave3
-	note $11
-	note $61
-	note $a1
-	octave4
-	note $11
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
 	intensity $73
-	note $11
+	note C_, 1
 	intensity $53
-	note $11
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $93
-	octave2
-	note $91
-	octave3
-	note $11
-	note $61
-	note $91
-	octave4
-	note $11
+	octave 2
+	note G#, 1
+	octave 3
+	note C_, 1
+	note F_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
 	intensity $73
-	note $11
+	note C_, 1
 	intensity $53
-	note $11
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $93
-	octave2
-	note $81
-	octave3
-	note $11
-	note $51
-	note $81
-	octave4
-	note $11
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
 	intensity $73
-	note $11
+	note C_, 1
 	intensity $63
-	note $11
+	note C_, 1
 	intensity $43
-	note $11
+	note C_, 1
 	intensity $93
-	octave2
-	note $71
-	note $a1
-	octave3
-	note $31
-	note $71
-	note $a1
+	octave 2
+	note F#, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note A_, 1
 	intensity $73
-	note $a1
+	note A_, 1
 	intensity $63
-	note $a1
+	note A_, 1
 	intensity $43
-	note $a1
+	note A_, 1
 	intensity $93
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	note $81
-	note $81
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $93
-	note $31
-	octave2
-	note $81
-	loopchannel $00, $7db2 ; end
-; 0xcfe48
+	note D_, 1
+	octave 2
+	note G_, 1
+	loopchannel 0, Music_PostCredits_branch_cfdb2
 
-_Music_PostCredits_Ch2: ; 0xcfe48
-	forceoctave $03
-	dutycycle $02
-	notetype $0c, $a3
-	octave5
-	note $51
+Music_PostCredits_Ch2: ; cfe48
+	forceoctave $3
+	dutycycle $2
+	notetype $c, $a3
+	octave 5
+	note E_, 1
 	intensity $73
-	note $51
+	note E_, 1
 	intensity $a3
-	note $61
+	note F_, 1
 	intensity $73
-	note $61
+	note F_, 1
+
+Music_PostCredits_branch_cfe5a: ; cfe5a
 	intensity $a3
-	note $81
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $53
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $93
-	octave6
-	note $31
-	note $11
-	octave5
-	note $c1
-	octave6
-	note $11
-	octave5
-	note $81
+	octave 6
+	note D_, 1
+	note C_, 1
+	octave 5
+	note B_, 1
+	octave 6
+	note C_, 1
+	octave 5
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $53
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $33
-	note $81
+	note G_, 1
 	intensity $a3
-	note $51
+	note E_, 1
 	intensity $73
-	note $51
+	note E_, 1
 	intensity $a3
-	note $61
-	note $81
+	note F_, 1
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $53
-	note $81
+	note G_, 1
 	intensity $43
-	note $81
+	note G_, 1
 	intensity $33
-	note $81
+	note G_, 1
 	intensity $a3
-	note $a1
+	note A_, 1
 	intensity $73
-	note $a1
+	note A_, 1
 	intensity $a3
-	note $51
-	note $81
+	note E_, 1
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $53
-	note $81
+	note G_, 1
 	intensity $a3
-	note $61
+	note F_, 1
 	intensity $73
-	note $61
+	note F_, 1
 	intensity $53
-	note $61
+	note F_, 1
 	intensity $a3
-	note $31
-	note $51
-	note $61
+	note D_, 1
+	note E_, 1
+	note F_, 1
 	intensity $73
-	note $61
+	note F_, 1
 	intensity $53
-	note $61
+	note F_, 1
 	intensity $43
-	note $61
+	note F_, 1
 	intensity $33
-	note $61
+	note F_, 1
 	intensity $a3
-	note $81
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $a3
-	note $61
-	note $51
-	note $41
-	note $51
-	note $c1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note B_, 1
 	intensity $73
-	note $c1
+	note B_, 1
 	intensity $53
-	note $c1
+	note B_, 1
 	intensity $a3
-	note $a1
+	note A_, 1
 	intensity $73
-	note $a1
+	note A_, 1
 	intensity $a3
-	note $31
+	note D_, 1
 	intensity $73
-	note $31
+	note D_, 1
 	intensity $53
-	note $31
+	note D_, 1
 	intensity $43
-	note $31
+	note D_, 1
 	intensity $33
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
 	intensity $23
-	note $31
-	note $31
+	note D_, 1
+	note D_, 1
 	intensity $a3
-	note $81
+	note G_, 1
 	intensity $73
-	octave4
-	note $81
+	octave 4
+	note G_, 1
 	intensity $a3
-	octave5
-	note $31
-	note $81
+	octave 5
+	note D_, 1
+	note G_, 1
 	intensity $73
-	note $81
+	note G_, 1
 	intensity $53
-	note $81
+	note G_, 1
 	intensity $a3
-	note $51
-	note $61
-	loopchannel $00, $7e5a ; end
-; 0xcff04
+	note E_, 1
+	note F_, 1
+	loopchannel 0, Music_PostCredits_branch_cfe5a
+; cff04
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -1,321 +1,323 @@
-_Music_Printer: ; 0xf07fd
-	db $02
-	dw _Music_Printer_Ch3
-; 0xf0800
+Music_Printer: ; f07fd
+	dbw $02, Music_Printer_Ch3
+; f0800
 
-_Music_Printer_Ch3: ; 0xf0800
-	tempo $0001
-	notetype $0c, $20
-	octave4
-	note $c5
-	octave5
-	note $20
-	note $00
-	octave4
-	note $c5
-	octave5
-	note $20
-	note $00
-	octave4
-	note $c0
-	note $00
-	octave5
-	note $50
-	note $00
-	note $40
-	note $00
-	note $20
-	note $00
-	octave4
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $70
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	octave5
-	note $20
-	note $10
-	note $20
-	note $00
-	octave4
-	note $70
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	note $50
-	note $00
-	octave5
-	note $50
-	note $40
-	note $50
-	note $00
-	octave4
-	note $40
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $70
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $c0
-	note $00
-	note $50
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $30
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $70
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $70
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $90
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $90
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $20
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $20
-	note $00
-	note $a0
-	note $00
-	note $c0
-	note $b0
-	note $c0
-	note $00
-	note $50
-	note $00
-	note $70
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $30
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $70
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $70
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $90
-	note $00
-	note $50
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $90
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $20
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $40
-	note $00
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $90
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $40
-	note $00
-	loopchannel $00, $4823 ; end
-; 0xf0941
+
+Music_Printer_Ch3: ; f0800
+	tempo 256
+	notetype $c, $20
+	octave 4
+	note B_, 5
+	octave 5
+	note C#, 0
+	note __, 0
+	octave 4
+	note B_, 5
+	octave 5
+	note C#, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	octave 5
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 4
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+
+Music_Printer_branch_f0823: ; f0823
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 5
+	note C#, 0
+	note C_, 0
+	note C#, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 5
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note A#, 0
+	note B_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	loopchannel 0, Music_Printer_branch_f0823
+; f0941
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -1,328 +1,328 @@
-_Music_ProfOak: ; 0xf4dea
-	db $80
-	dw _Music_ProfOak_Ch1
-	db $01
-	dw _Music_ProfOak_Ch2
-	db $02
-	dw _Music_ProfOak_Ch3
-; 0xf4df3
+Music_ProfOak: ; f4dea
+	dbw $80, Music_ProfOak_Ch1
+	dbw $01, Music_ProfOak_Ch2
+	dbw $02, Music_ProfOak_Ch3
+; f4df3
 
-_Music_ProfOak_Ch1: ; 0xf4df3
-	tempo $7600
+
+Music_ProfOak_Ch1: ; f4df3
+	tempo 118
 	volume $77
 	vibrato $12, $34
-	tone $0100
+	tone $0001
 	stereopanning $f0
-	dutycycle $03
-	notetype $0c, $98
-	octave2
-	note $70
-	note $c0
-	octave3
-	note $40
-	note $70
-	note $af
-	note $97
+	dutycycle $3
+	notetype $c, $98
+	octave 2
+	note F#, 0
+	note B_, 0
+	octave 3
+	note D#, 0
+	note F#, 0
+	note A_, 15
+	note G#, 7
 	intensity $97
-	note $97
+	note G#, 7
+
+Music_ProfOak_branch_f4e10: ; f4e10
 	intensity $91
-	callchannel _Music_ProfOak_sub_0xf4e42
-	callchannel _Music_ProfOak_sub_0xf4e42
-	callchannel _Music_ProfOak_sub_0xf4e4d
-	callchannel _Music_ProfOak_sub_0xf4e4d
-	loopchannel $02, $4e10
-	callchannel _Music_ProfOak_sub_0xf4e58
-	callchannel _Music_ProfOak_sub_0xf4e58
-	callchannel _Music_ProfOak_sub_0xf4e6c
-	callchannel _Music_ProfOak_sub_0xf4e6c
-	forceoctave $02
-	callchannel _Music_ProfOak_sub_0xf4e58
-	callchannel _Music_ProfOak_sub_0xf4e58
-	forceoctave $00
-	callchannel _Music_ProfOak_sub_0xf4e6c
-	callchannel _Music_ProfOak_sub_0xf4e6c
-	loopchannel $00, $4e22 ; end
-; 0xf4e42
+	callchannel Music_ProfOak_branch_f4e42
+	callchannel Music_ProfOak_branch_f4e42
+	callchannel Music_ProfOak_branch_f4e4d
+	callchannel Music_ProfOak_branch_f4e4d
+	loopchannel 2, Music_ProfOak_branch_f4e10
 
-_Music_ProfOak_sub_0xf4e42: ; 0xf4e42
-; subroutine
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $91
-	note $51
-	note $c1
-	note $51
-	note $91
-	note $51
-	endchannel ; end
-; 0xf4e4d
+Music_ProfOak_branch_f4e22: ; f4e22
+	callchannel Music_ProfOak_branch_f4e58
+	callchannel Music_ProfOak_branch_f4e58
+	callchannel Music_ProfOak_branch_f4e6c
+	callchannel Music_ProfOak_branch_f4e6c
+	forceoctave $2
+	callchannel Music_ProfOak_branch_f4e58
+	callchannel Music_ProfOak_branch_f4e58
+	forceoctave $0
+	callchannel Music_ProfOak_branch_f4e6c
+	callchannel Music_ProfOak_branch_f4e6c
+	loopchannel 0, Music_ProfOak_branch_f4e22
+; f4e42
 
-_Music_ProfOak_sub_0xf4e4d: ; 0xf4e4d
-; subroutine
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $71
-	note $41
-	note $c1
-	note $41
-	note $71
-	note $41
-	endchannel ; end
-; 0xf4e58
+Music_ProfOak_branch_f4e42: ; f4e42
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	note B_, 1
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	endchannel
+; f4e4d
 
-_Music_ProfOak_sub_0xf4e58: ; 0xf4e58
-; subroutine
-	octave2
-	note $a1
-	octave3
-	note $21
-	note $51
-	note $20
-	note $50
-	note $21
+Music_ProfOak_branch_f4e4d: ; f4e4d
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note B_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	endchannel
+; f4e58
+
+Music_ProfOak_branch_f4e58: ; f4e58
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note C#, 0
+	note E_, 0
+	note C#, 1
 	intensity $92
-	note $a1
+	note A_, 1
 	intensity $91
-	note $21
+	note C#, 1
 	intensity $92
-	note $51
+	note E_, 1
 	intensity $91
-	endchannel ; end
-; 0xf4e6c
+	endchannel
+; f4e6c
 
-_Music_ProfOak_sub_0xf4e6c: ; 0xf4e6c
-; subroutine
-	octave2
-	note $c0
-	octave3
-	note $50
+Music_ProfOak_branch_f4e6c: ; f4e6c
+	octave 2
+	note B_, 0
+	octave 3
+	note E_, 0
 	intensity $92
-	note $93
-	note $53
+	note G#, 3
+	note E_, 3
 	intensity $91
-	note $50
-	note $90
+	note E_, 0
+	note G#, 0
 	intensity $92
-	note $c3
+	note B_, 3
 	intensity $91
-	endchannel ; end
-; 0xf4e7e
+	endchannel
 
-_Music_ProfOak_Ch2: ; 0xf4e7e
+Music_ProfOak_Ch2: ; f4e7e
 	vibrato $12, $34
-	dutycycle $03
-	notetype $0c, $a8
-	octave3
-	note $c0
-	octave4
-	note $40
-	note $70
-	note $b0
-	note $cf
+	dutycycle $3
+	notetype $c, $a8
+	octave 3
+	note B_, 0
+	octave 4
+	note D#, 0
+	note F#, 0
+	note A#, 0
+	note B_, 15
 	intensity $a7
-	note $c9
-	dutycycle $02
+	note B_, 9
+	dutycycle $2
+
+Music_ProfOak_branch_f4e92: ; f4e92
 	intensity $b2
-	octave3
-	note $c1
-	octave4
-	note $21
-	note $41
-	note $53
-	note $41
-	note $23
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note E_, 3
+	note D#, 1
+	note C#, 3
 	intensity $91
-	note $c1
-	octave5
-	note $21
-	note $41
-	note $53
-	note $41
-	note $23
+	note B_, 1
+	octave 5
+	note C#, 1
+	note D#, 1
+	note E_, 3
+	note D#, 1
+	note C#, 3
 	intensity $b2
-	octave3
-	note $c1
-	note $a1
-	note $91
-	note $a3
-	note $c0
-	note $00
-	note $c3
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 3
+	note B_, 0
+	note __, 0
+	note B_, 3
 	intensity $91
-	octave4
-	note $c1
-	note $a1
-	note $91
-	note $a3
-	note $c1
-	note $c3
-	loopchannel $02, $4e92
-	note $05
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 3
+	note B_, 1
+	note B_, 3
+	loopchannel 2, Music_ProfOak_branch_f4e92
+	note __, 5
 	intensity $b4
-	note $25
-	octave3
-	note $a0
-	octave4
-	note $20
-	note $55
-	note $20
-	note $50
-	note $73
-	note $53
-	note $43
-	note $23
-	octave3
-	note $c5
-	note $90
-	note $c0
-	octave4
-	note $57
+
+Music_ProfOak_branch_f4ebf: ; f4ebf
+	note C#, 5
+	octave 3
+	note A_, 0
+	octave 4
+	note C#, 0
+	note E_, 5
+	note C#, 0
+	note E_, 0
+	note F#, 3
+	note E_, 3
+	note D#, 3
+	note C#, 3
+	octave 3
+	note B_, 5
+	note G#, 0
+	note B_, 0
+	octave 4
+	note E_, 7
 	intensity $82
-	note $c5
-	note $90
-	note $c0
+	note B_, 5
+	note G#, 0
+	note B_, 0
 	intensity $83
-	octave5
-	note $57
+	octave 5
+	note E_, 7
 	intensity $b4
-	octave3
-	note $a5
-	note $70
-	note $a0
-	octave4
-	note $47
-	note $53
-	note $43
-	note $23
-	note $13
-	octave3
-	note $c5
-	note $90
-	note $c0
-	octave4
-	note $55
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $9f
-	loopchannel $00, $4ebf ; end
-; 0xf4ef5
+	octave 3
+	note A_, 5
+	note F#, 0
+	note A_, 0
+	octave 4
+	note D#, 7
+	note E_, 3
+	note D#, 3
+	note C#, 3
+	note C_, 3
+	octave 3
+	note B_, 5
+	note G#, 0
+	note B_, 0
+	octave 4
+	note E_, 5
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note G#, 15
+	loopchannel 0, Music_ProfOak_branch_f4ebf
 
-_Music_ProfOak_Ch3: ; 0xf4ef5
-	stereopanning $0f
-	notetype $0c, $14
-	note $03
-	octave3
-	note $51
-	note $01
-	octave4
-	note $50
-	note $00
-	octave3
-	note $a1
-	note $01
-	octave2
-	note $c1
-	octave3
-	note $c0
-	note $00
-	note $51
-	callchannel _Music_ProfOak_sub_0xf4f3d
-	callchannel _Music_ProfOak_sub_0xf4f3d
-	callchannel _Music_ProfOak_sub_0xf4f3d
-	callchannel _Music_ProfOak_sub_0xf4f4c
-	callchannel _Music_ProfOak_sub_0xf4f4c
-	loopchannel $02, $4f0d
-	callchannel _Music_ProfOak_sub_0xf4f5a
-	callchannel _Music_ProfOak_sub_0xf4f5a
-	callchannel _Music_ProfOak_sub_0xf4f69
-	callchannel _Music_ProfOak_sub_0xf4f69
-	forceoctave $02
-	callchannel _Music_ProfOak_sub_0xf4f5a
-	callchannel _Music_ProfOak_sub_0xf4f5a
-	forceoctave $00
-	callchannel _Music_ProfOak_sub_0xf4f69
-	callchannel _Music_ProfOak_sub_0xf4f69
-	loopchannel $00, $4f1d ; end
-; 0xf4f3d
+Music_ProfOak_Ch3: ; f4ef5
+	stereopanning $f
+	notetype $c, $14
+	note __, 3
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note B_, 0
+	note __, 0
+	note E_, 1
+	callchannel Music_ProfOak_branch_f4f3d
 
-_Music_ProfOak_sub_0xf4f3d: ; 0xf4f3d
-; subroutine
-	note $51
-	note $01
-	octave4
-	note $50
-	note $00
-	octave3
-	note $91
-	note $01
-	octave2
-	note $c1
-	octave3
-	note $c0
-	note $00
-	note $51
-	endchannel ; end
-; 0xf4f4c
+Music_ProfOak_branch_f4f0d: ; f4f0d
+	callchannel Music_ProfOak_branch_f4f3d
+	callchannel Music_ProfOak_branch_f4f3d
+	callchannel Music_ProfOak_branch_f4f4c
+	callchannel Music_ProfOak_branch_f4f4c
+	loopchannel 2, Music_ProfOak_branch_f4f0d
 
-_Music_ProfOak_sub_0xf4f4c: ; 0xf4f4c
-; subroutine
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $40
-	note $00
-	octave3
-	note $41
-	note $01
-	note $71
-	note $c0
-	note $00
-	note $41
-	endchannel ; end
-; 0xf4f5a
+Music_ProfOak_branch_f4f1d: ; f4f1d
+	callchannel Music_ProfOak_branch_f4f5a
+	callchannel Music_ProfOak_branch_f4f5a
+	callchannel Music_ProfOak_branch_f4f69
+	callchannel Music_ProfOak_branch_f4f69
+	forceoctave $2
+	callchannel Music_ProfOak_branch_f4f5a
+	callchannel Music_ProfOak_branch_f4f5a
+	forceoctave $0
+	callchannel Music_ProfOak_branch_f4f69
+	callchannel Music_ProfOak_branch_f4f69
+	loopchannel 0, Music_ProfOak_branch_f4f1d
+; f4f3d
 
-_Music_ProfOak_sub_0xf4f5a: ; 0xf4f5a
-; subroutine
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $a0
-	note $00
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $51
-	note $a0
-	note $00
-	note $21
-	endchannel ; end
-; 0xf4f69
+Music_ProfOak_branch_f4f3d: ; f4f3d
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note B_, 0
+	note __, 0
+	note E_, 1
+	endchannel
+; f4f4c
 
-_Music_ProfOak_sub_0xf4f69: ; 0xf4f69
-; subroutine
-	octave2
-	note $91
-	note $01
-	octave3
-	note $90
-	note $00
-	octave2
-	note $91
-	note $01
-	octave3
-	note $51
-	note $90
-	note $00
-	octave2
-	note $c1
-	endchannel ; end
-; 0xf4f79
+Music_ProfOak_branch_f4f4c: ; f4f4c
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note B_, 0
+	note __, 0
+	note D#, 1
+	endchannel
+; f4f5a
+
+Music_ProfOak_branch_f4f5a: ; f4f5a
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note A_, 0
+	note __, 0
+	note C#, 1
+	endchannel
+; f4f69
+
+Music_ProfOak_branch_f4f69: ; f4f69
+	octave 2
+	note G#, 1
+	note __, 1
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note G#, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note G#, 0
+	note __, 0
+	octave 2
+	note B_, 1
+	endchannel
+; f4f79
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -1,313 +1,312 @@
-_Music_ProfOaksPokemonTalk: ; 0xf4c9f
-	db $80
-	dw _Music_ProfOaksPokemonTalk_Ch1
-	db $01
-	dw _Music_ProfOaksPokemonTalk_Ch2
-	db $02
-	dw _Music_ProfOaksPokemonTalk_Ch3
-; 0xf4ca8
+Music_ProfOaksPokemonTalk: ; f4c9f
+	dbw $80, Music_ProfOaksPokemonTalk_Ch1
+	dbw $01, Music_ProfOaksPokemonTalk_Ch2
+	dbw $02, Music_ProfOaksPokemonTalk_Ch3
+; f4ca8
 
-; 0xf4ca8
-	db $03
-; 0xf4ca9
+INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8
 
-_Music_ProfOaksPokemonTalk_Ch1: ; 0xf4ca9
-	tempo $a400
+Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
+	tempo 164
 	volume $77
-	stereopanning $0f
-	vibrato $06, $25
-	dutycycle $01
-	notetype $0c, $94
-	note $07
-	octave3
-	note $c0
-	octave4
-	note $20
-	note $40
-	note $50
-	note $20
-	note $40
-	note $50
-	note $70
-	note $45
-	note $20
-	octave3
-	note $c0
-	note $70
-	note $90
-	note $70
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $b0
-	note $c1
-	note $70
-	note $90
-	note $70
-	note $00
-	note $70
-	note $00
-	note $70
-	note $90
-	note $70
-	note $00
-	note $b3
-	octave4
-	note $45
-	note $20
-	octave3
-	note $c0
-	note $90
-	note $c0
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b0
-	note $c0
-	note $70
-	note $b0
-	note $40
-	note $00
-	note $40
-	note $00
-	note $70
-	note $b0
-	note $40
-	note $00
-	note $40
-	note $00
-	note $b3
-	note $51
-	octave2
-	note $c0
-	octave3
-	note $50
-	note $91
-	note $50
-	note $90
-	note $c0
-	octave4
-	note $20
-	octave3
-	note $c0
-	octave4
-	note $20
-	octave3
-	note $c3
-	note $71
-	note $40
-	note $70
-	note $c1
-	note $70
-	note $c0
-	octave4
-	note $40
-	note $50
-	note $40
-	note $50
-	note $43
-	octave3
-	note $b1
-	octave4
-	note $21
-	note $51
-	note $71
-	note $21
-	note $51
-	note $71
-	note $51
-	note $21
-	octave3
-	note $b0
-	note $00
-	note $c0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $40
-	note $00
-	note $50
-	note $00
-	note $60
-	note $00
-	note $70
-	note $00
-	loopchannel $00, $4cc3 ; end
-; 0xf4d31
+	stereopanning $f
+	vibrato $6, $25
+	dutycycle $1
+	notetype $c, $94
+	note __, 7
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D#, 0
+	note E_, 0
+	note C#, 0
+	note D#, 0
+	note E_, 0
+	note F#, 0
 
-_Music_ProfOaksPokemonTalk_Ch2: ; 0xf4d31
-	vibrato $08, $24
-	dutycycle $03
-	notetype $0c, $a7
+Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
+	note D#, 5
+	note C#, 0
+	octave 3
+	note B_, 0
+	note F#, 0
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note A#, 0
+	note B_, 1
+	note F#, 0
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note A#, 3
+	octave 4
+	note D#, 5
+	note C#, 0
+	octave 3
+	note B_, 0
+	note G#, 0
+	note B_, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 0
+	note B_, 0
+	note F#, 0
+	note A#, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note A#, 0
+	note D#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note A#, 3
+	note E_, 1
+	octave 2
+	note B_, 0
+	octave 3
+	note E_, 0
+	note G#, 1
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 3
+	note F#, 1
+	note D#, 0
+	note F#, 0
+	note B_, 1
+	note F#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note C#, 1
+	octave 3
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
+
+Music_ProfOaksPokemonTalk_Ch2: ; f4d31
+	vibrato $8, $24
+	dutycycle $3
+	notetype $c, $a7
 	stereopanning $ff
-	octave3
-	note $c0
-	octave4
-	note $20
-	note $40
-	note $50
-	note $20
-	note $40
-	note $50
-	note $70
-	note $40
-	note $50
-	note $70
-	note $90
-	note $50
-	note $70
-	note $90
-	note $b0
-	note $c5
-	note $b0
-	note $90
-	note $75
-	note $60
-	note $70
-	note $93
-	note $77
-	note $73
-	note $95
-	note $70
-	note $50
-	note $45
-	note $30
-	note $40
-	note $53
-	note $47
-	note $43
-	note $55
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $97
-	note $75
-	note $40
-	note $70
-	note $c7
-	note $b3
-	note $c1
-	note $b1
-	note $93
-	note $b1
-	note $91
-	note $71
-	note $20
-	note $00
-	note $40
-	note $00
-	note $50
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
-	note $90
-	note $00
-	note $b0
-	note $00
-	loopchannel $00, $4d4d ; end
-; 0xf4d82
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D#, 0
+	note E_, 0
+	note C#, 0
+	note D#, 0
+	note E_, 0
+	note F#, 0
+	note D#, 0
+	note E_, 0
+	note F#, 0
+	note G#, 0
+	note E_, 0
+	note F#, 0
+	note G#, 0
+	note A#, 0
 
-_Music_ProfOaksPokemonTalk_Ch3: ; 0xf4d82
-	vibrato $06, $38
-	notetype $0c, $25
+Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
+	note B_, 5
+	note A#, 0
+	note G#, 0
+	note F#, 5
+	note F_, 0
+	note F#, 0
+	note G#, 3
+	note F#, 7
+	note F#, 3
+	note G#, 5
+	note F#, 0
+	note E_, 0
+	note D#, 5
+	note D_, 0
+	note D#, 0
+	note E_, 3
+	note D#, 7
+	note D#, 3
+	note E_, 5
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note G#, 7
+	note F#, 5
+	note D#, 0
+	note F#, 0
+	note B_, 7
+	note A#, 3
+	note B_, 1
+	note A#, 1
+	note G#, 3
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note C#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
+
+Music_ProfOaksPokemonTalk_Ch3: ; f4d82
+	vibrato $6, $38
+	notetype $c, $25
 	stereopanning $f0
-	note $07
-	octave3
-	note $70
-	note $50
-	note $40
-	note $20
-	note $50
-	note $40
-	note $20
-	octave2
-	note $b0
-	note $c5
-	octave3
-	note $40
-	note $70
-	note $c5
-	note $40
-	note $20
-	octave2
-	note $c3
-	octave3
-	note $c7
-	octave4
-	note $43
-	octave3
-	note $95
-	note $40
-	note $90
-	octave2
-	note $95
-	octave3
-	note $40
-	note $90
-	note $45
-	note $71
-	note $b1
-	note $91
-	note $71
-	note $41
-	note $51
-	note $03
-	note $50
-	note $50
-	note $50
-	note $00
-	note $50
-	note $00
-	note $c3
-	note $71
-	note $03
-	note $70
-	note $70
-	octave2
-	note $c0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $c3
-	note $71
-	octave4
-	note $71
-	octave3
-	note $51
-	octave4
-	note $51
-	octave3
-	note $21
-	octave4
-	note $21
-	octave2
-	note $b1
-	octave3
-	note $b1
-	octave2
-	note $71
-	octave3
-	note $b0
-	note $00
-	note $90
-	note $00
-	note $70
-	note $00
-	note $50
-	note $00
-	note $40
-	note $00
-	note $20
-	note $00
-	octave2
-	note $b0
-	note $00
-	loopchannel $00, $4d95 ; end
-; 0xf4dea
+	note __, 7
+	octave 3
+	note F#, 0
+	note E_, 0
+	note D#, 0
+	note C#, 0
+	note E_, 0
+	note D#, 0
+	note C#, 0
+	octave 2
+	note A#, 0
+
+Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
+	note B_, 5
+	octave 3
+	note D#, 0
+	note F#, 0
+	note B_, 5
+	note D#, 0
+	note C#, 0
+	octave 2
+	note B_, 3
+	octave 3
+	note B_, 7
+	octave 4
+	note D#, 3
+	octave 3
+	note G#, 5
+	note D#, 0
+	note G#, 0
+	octave 2
+	note G#, 5
+	octave 3
+	note D#, 0
+	note G#, 0
+	note D#, 5
+	note F#, 1
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	note __, 3
+	note E_, 0
+	note E_, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note B_, 3
+	note F#, 1
+	note __, 3
+	note F#, 0
+	note F#, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 3
+	note F#, 1
+	octave 4
+	note F#, 1
+	octave 3
+	note E_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note C#, 1
+	octave 4
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note A#, 1
+	octave 2
+	note F#, 1
+	octave 3
+	note A#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 2
+	note A#, 0
+	note __, 0
+	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
+; f4dea
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -1,853 +1,892 @@
-_Music_RivalBattle: ; 0xe974f
-	db $80
-	dw _Music_RivalBattle_Ch1
-	db $01
-	dw _Music_RivalBattle_Ch2
-	db $02
-	dw _Music_RivalBattle_Ch3
-; 0xe9758
+Music_RivalBattle: ; e974f
+	dbw $80, Music_RivalBattle_Ch1
+	dbw $01, Music_RivalBattle_Ch2
+	dbw $02, Music_RivalBattle_Ch3
+; e9758
 
-_Music_RivalBattle_Ch1: ; 0xe9758
-	tempo $6600
+
+Music_RivalBattle_Ch1: ; e9758
+	tempo 102
 	volume $77
-	dutycycle $03
-	tone $0200
-	vibrato $08, $15
-	notetype $0c, $b2
-	octave3
-	note $71
-	note $b3
+	dutycycle $3
+	tone $0002
+	vibrato $8, $15
+	notetype $c, $b2
+	octave 3
+	note F#, 1
+	note A#, 3
 	intensity $b7
-	note $b9
+	note A#, 9
 	intensity $b2
-	note $71
-	octave4
-	note $23
+	note F#, 1
+	octave 4
+	note C#, 3
 	intensity $b7
-	note $25
-	note $53
+	note C#, 5
+	note E_, 3
+
+Music_RivalBattle_branch_e9777: ; e9777
 	intensity $b2
-	octave2
-	note $b5
+	octave 2
+	note A#, 5
 	intensity $b7
-	octave3
-	note $25
+	octave 3
+	note C#, 5
 	intensity $b2
-	note $43
-	loopchannel $03, $5777
+	note D#, 3
+	loopchannel 3, Music_RivalBattle_branch_e9777
 	intensity $b2
-	octave2
-	note $b1
-	octave3
-	note $23
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 3
 	intensity $b7
-	note $29
+	note C#, 9
+
+Music_RivalBattle_branch_e978f: ; e978f
 	intensity $b2
-	octave3
-	note $95
+	octave 3
+	note G#, 5
 	intensity $b7
-	note $c5
+	note B_, 5
 	intensity $b2
-	octave4
-	note $23
-	loopchannel $03, $578f
+	octave 4
+	note C#, 3
+	loopchannel 3, Music_RivalBattle_branch_e978f
 	intensity $b2
-	octave3
-	note $91
-	note $c3
+	octave 3
+	note G#, 1
+	note B_, 3
 	intensity $4d
-	note $c9
+	note B_, 9
+
+Music_RivalBattle_branch_e97a6: ; e97a6
 	intensity $b7
-	note $b5
-	note $75
-	note $43
-	note $63
-	note $73
-	note $91
-	note $b5
+	note A#, 5
+	note F#, 5
+	note D#, 3
+	note F_, 3
+	note F#, 3
+	note G#, 1
+	note A#, 5
 	intensity $b2
-	note $60
-	note $40
-	note $20
-	note $40
+	note F_, 0
+	note D#, 0
+	note C#, 0
+	note D#, 0
 	intensity $b7
-	note $63
+	note F_, 3
 	intensity $b2
-	note $90
-	note $70
-	note $60
-	note $70
+	note G#, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
 	intensity $b7
-	note $93
+	note G#, 3
 	intensity $b6
-	note $91
-	note $b1
-	note $c1
-	note $b1
-	note $c1
-	octave4
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $51
+	note G#, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
 	intensity $b7
-	octave3
-	note $b5
-	note $75
-	note $b3
-	octave4
-	note $23
-	octave3
-	note $c3
-	note $b1
-	note $95
-	note $65
-	octave4
-	note $25
-	octave3
-	note $93
+	octave 3
+	note A#, 5
+	note F#, 5
+	note A#, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A#, 1
+	note G#, 5
+	note F_, 5
+	octave 4
+	note C#, 5
+	octave 3
+	note G#, 3
 	intensity $b5
-	note $21
-	note $61
-	note $91
-	octave4
-	note $11
-	note $21
-	octave3
-	note $91
-	note $61
-	note $91
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	octave 3
+	note G#, 1
+	note F_, 1
+	note G#, 1
 	intensity $b7
-	note $79
+	note F#, 9
 	intensity $b4
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $71
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
 	intensity $b7
-	note $63
-	note $43
-	note $21
-	note $45
+	note F_, 3
+	note D#, 3
+	note C#, 1
+	note D#, 5
 	intensity $a0
-	note $67
+	note F_, 7
 	intensity $a7
-	note $67
+	note F_, 7
 	intensity $a0
-	octave2
-	note $b7
+	octave 2
+	note A#, 7
 	intensity $a7
-	note $b7
+	note A#, 7
 	intensity $b7
-	octave3
-	note $79
+	octave 3
+	note F#, 9
 	intensity $b5
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $71
-	note $61
-	note $41
-	note $21
-	note $41
-	note $91
-	note $71
-	note $61
-	note $91
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note G#, 1
 	intensity $a0
-	note $bf
+	note A#, 15
 	intensity $a7
-	note $bf
+	note A#, 15
 	intensity $a0
-	note $c7
+	note B_, 7
 	intensity $a7
-	note $c3
+	note B_, 3
 	intensity $b7
-	note $93
+	note G#, 3
 	intensity $b5
-	octave4
-	note $51
-	note $41
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $71
-	note $51
-	note $41
-	note $21
-	octave3
-	note $b1
-	note $51
-	note $b1
-	octave4
-	note $41
-	note $51
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $41
-	octave3
-	note $b1
-	octave4
-	note $41
-	note $51
-	note $41
-	octave3
-	note $b1
-	note $41
-	note $b1
-	octave4
-	note $41
-	loopchannel $02, $5837
+	octave 4
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+
+Music_RivalBattle_branch_e9837: ; e9837
+	octave 3
+	note A#, 1
+	note E_, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	loopchannel 2, Music_RivalBattle_branch_e9837
 	intensity $94
-	octave3
-	note $47
-	octave2
-	note $b7
-	octave3
-	note $87
-	note $67
+	octave 3
+	note D#, 7
+	octave 2
+	note A#, 7
+	octave 3
+	note G_, 7
+	note F_, 7
 	intensity $96
-	octave2
-	note $97
-	note $b7
-	note $c7
-	octave3
-	note $27
+	octave 2
+	note G#, 7
+	note A#, 7
+	note B_, 7
+	octave 3
+	note C#, 7
 	intensity $b7
-	octave4
-	note $47
-	octave3
-	note $b7
-	octave4
-	note $87
-	note $67
-	octave3
-	note $97
-	note $b7
-	note $c7
-	octave4
-	note $27
+	octave 4
+	note D#, 7
+	octave 3
+	note A#, 7
+	octave 4
+	note G_, 7
+	note F_, 7
+	octave 3
+	note G#, 7
+	note A#, 7
+	note B_, 7
+	octave 4
+	note C#, 7
 	intensity $a0
-	note $47
+	note D#, 7
 	intensity $a7
-	note $47
+	note D#, 7
 	intensity $a0
-	octave3
-	note $87
+	octave 3
+	note G_, 7
 	intensity $a7
-	note $87
+	note G_, 7
 	intensity $b7
-	note $47
-	note $27
-	note $43
-	note $23
-	octave2
-	note $c3
-	octave3
-	note $23
+	note D#, 7
+	note C#, 7
+	note D#, 3
+	note C#, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note C#, 3
 	intensity $c7
-	octave2
-	note $b5
-	octave3
-	note $25
-	note $43
-	note $55
-	note $45
-	note $23
-	note $95
-	note $55
-	note $43
-	note $25
-	note $45
-	note $33
-	octave2
-	note $95
-	note $c5
-	octave3
-	note $23
-	note $35
-	note $25
-	octave2
-	note $c3
-	octave3
-	note $75
-	note $35
-	note $23
-	octave2
-	note $c5
-	octave3
-	note $29
-	loopchannel $00, $57a6 ; end
-; 0xe98af
+	octave 2
+	note A#, 5
+	octave 3
+	note C#, 5
+	note D#, 3
+	note E_, 5
+	note D#, 5
+	note C#, 3
+	note G#, 5
+	note E_, 5
+	note D#, 3
+	note C#, 5
+	note D#, 5
+	note D_, 3
+	octave 2
+	note G#, 5
+	note B_, 5
+	octave 3
+	note C#, 3
+	note D_, 5
+	note C#, 5
+	octave 2
+	note B_, 3
+	octave 3
+	note F#, 5
+	note D_, 5
+	note C#, 3
+	octave 2
+	note B_, 5
+	octave 3
+	note C#, 9
+	loopchannel 0, Music_RivalBattle_branch_e97a6
 
-_Music_RivalBattle_Ch2: ; 0xe98af
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $c2
-	octave4
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave2
-	note $c0
+Music_RivalBattle_Ch2: ; e98af
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $c2
+	octave 4
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 2
+	note B_, 0
 	intensity $c2
-	octave4
-	note $45
+	octave 4
+	note D#, 5
 	intensity $c7
-	octave3
-	note $75
+	octave 3
+	note F#, 5
 	intensity $c2
-	note $93
+	note G#, 3
+
+Music_RivalBattle_branch_e98ea: ; e98ea
 	intensity $c2
-	note $45
+	note D#, 5
 	intensity $c7
-	note $75
+	note F#, 5
 	intensity $c2
-	note $93
-	loopchannel $02, $58ea
+	note G#, 3
+	loopchannel 2, Music_RivalBattle_branch_e98ea
 	intensity $c2
-	note $41
-	note $73
+	note D#, 1
+	note F#, 3
 	intensity $c7
-	note $77
+	note F#, 7
 	intensity $a2
-	note $c0
-	octave4
-	note $10
+	note B_, 0
+	octave 4
+	note C_, 0
+
+Music_RivalBattle_branch_e9903: ; e9903
 	intensity $c2
-	note $25
+	note C#, 5
 	intensity $c7
-	note $55
+	note E_, 5
 	intensity $c2
-	note $73
-	loopchannel $03, $5903
+	note F#, 3
+	loopchannel 3, Music_RivalBattle_branch_e9903
 	intensity $c2
-	note $21
-	note $53
+	note C#, 1
+	note E_, 3
 	intensity $b0
-	note $53
+	note E_, 3
 	intensity $b7
-	note $55
-	callchannel _Music_RivalBattle_sub_0xe99e0
+	note E_, 5
+
+Music_RivalBattle_branch_e991a: ; e991a
+	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
-	note $97
+	note G#, 7
 	intensity $b7
-	note $97
-	callchannel _Music_RivalBattle_sub_0xe99e0
+	note G#, 7
+	callchannel Music_RivalBattle_branch_e99e0
 	intensity $4e
-	note $97
+	note G#, 7
 	intensity $b7
-	note $97
+	note G#, 7
 	intensity $b0
-	octave3
-	note $c9
+	octave 3
+	note B_, 9
 	intensity $b7
-	note $c5
+	note B_, 5
 	intensity $b0
-	octave4
-	note $27
-	octave3
-	note $c7
+	octave 4
+	note C#, 7
+	octave 3
+	note B_, 7
 	intensity $b0
-	note $b9
+	note A#, 9
 	intensity $b7
-	note $b5
+	note A#, 5
 	intensity $2f
-	note $49
+	note D#, 9
 	intensity $b7
-	note $45
+	note D#, 5
 	intensity $b0
-	note $c9
+	note B_, 9
 	intensity $b7
-	note $c5
+	note B_, 5
 	intensity $c7
-	octave4
-	note $27
-	octave3
-	note $c7
+	octave 4
+	note C#, 7
+	octave 3
+	note B_, 7
 	intensity $b0
-	octave4
-	note $4f
+	octave 4
+	note D#, 15
 	intensity $b7
-	note $4f
+	note D#, 15
 	intensity $b0
-	note $53
+	note E_, 3
 	intensity $b7
-	note $55
+	note E_, 5
 	intensity $c7
-	note $51
-	note $91
-	note $c1
-	octave5
-	note $27
-	octave4
-	note $c7
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	octave 5
+	note C#, 7
+	octave 4
+	note B_, 7
 	intensity $b0
-	note $b9
+	note A#, 9
 	intensity $b7
-	note $b5
+	note A#, 5
 	intensity $b0
-	note $a9
+	note A_, 9
 	intensity $b7
-	note $a5
+	note A_, 5
 	intensity $b0
-	note $99
+	note G#, 9
 	intensity $b7
-	note $95
+	note G#, 5
 	intensity $b0
-	note $89
+	note G_, 9
 	intensity $b7
-	note $85
+	note G_, 5
 	intensity $a4
-	octave3
-	note $87
-	note $47
-	note $b7
-	note $97
+	octave 3
+	note G_, 7
+	note D#, 7
+	note A#, 7
+	note G#, 7
 	intensity $a6
-	octave2
-	note $c7
-	octave3
-	note $27
-	note $47
-	note $67
+	octave 2
+	note B_, 7
+	octave 3
+	note C#, 7
+	note D#, 7
+	note F_, 7
 	intensity $c7
-	octave4
-	note $87
-	note $47
-	note $b7
-	note $97
-	octave3
-	note $c7
-	octave4
-	note $27
-	note $47
-	note $67
+	octave 4
+	note G_, 7
+	note D#, 7
+	note A#, 7
+	note G#, 7
+	octave 3
+	note B_, 7
+	octave 4
+	note C#, 7
+	note D#, 7
+	note F_, 7
 	intensity $b0
-	note $8f
-	note $4f
-	octave3
-	note $c7
-	note $b7
-	note $97
+	note G_, 15
+	note D#, 15
+	octave 3
+	note B_, 7
+	note A#, 7
+	note G#, 7
 	intensity $c7
-	note $67
+	note F_, 7
+
+Music_RivalBattle_branch_e99a6: ; e99a6
 	intensity $c2
-	octave3
-	note $b5
+	octave 3
+	note A#, 5
 	intensity $c7
-	octave4
-	note $25
+	octave 4
+	note C#, 5
 	intensity $c2
-	note $43
-	loopchannel $03, $59a6
+	note D#, 3
+	loopchannel 3, Music_RivalBattle_branch_e99a6
 	intensity $c2
-	octave3
-	note $b1
-	octave4
-	note $23
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 3
 	intensity $b7
-	note $25
+	note C#, 5
 	intensity $9a
-	note $23
+	note C#, 3
+
+Music_RivalBattle_branch_e99c1: ; e99c1
 	intensity $c2
-	octave3
-	note $95
+	octave 3
+	note G#, 5
 	intensity $c7
-	note $c5
+	note B_, 5
 	intensity $c2
-	octave4
-	note $23
-	loopchannel $03, $59c1
+	octave 4
+	note C#, 3
+	loopchannel 3, Music_RivalBattle_branch_e99c1
 	intensity $c2
-	octave3
-	note $91
-	note $c3
+	octave 3
+	note G#, 1
+	note B_, 3
 	intensity $c7
-	note $c5
+	note B_, 5
 	intensity $6a
-	octave4
-	note $33
-	loopchannel $00, $591a ; end
-; 0xe99e0
+	octave 4
+	note D_, 3
+	loopchannel 0, Music_RivalBattle_branch_e991a
+; e99e0
 
-_Music_RivalBattle_sub_0xe99e0: ; 0xe99e0
-; subroutine
+Music_RivalBattle_branch_e99e0: ; e99e0
 	intensity $c7
-	note $49
+	note D#, 9
 	intensity $c4
-	octave3
-	note $b1
-	octave4
-	note $41
-	note $71
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 1
+	note F#, 1
 	intensity $c5
-	note $63
-	note $43
+	note F_, 3
+	note D#, 3
 	intensity $c2
-	note $21
+	note C#, 1
 	intensity $c7
-	note $45
+	note D#, 5
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
-	endchannel ; end
-; 0xe99fb
+	note F_, 7
+	endchannel
 
-_Music_RivalBattle_Ch3: ; 0xe99fb
-	notetype $0c, $19
-	octave3
-	note $71
-	note $b1
-	note $01
-	note $b9
-	octave3
-	note $71
-	octave4
-	note $21
-	note $01
-	note $25
-	octave3
-	note $21
-	note $31
-	note $41
-	note $21
-	note $41
-	note $73
-	note $51
-	note $41
-	note $21
-	loopchannel $04, $5a0c
-	octave3
-	note $21
-	octave2
-	note $c1
-	octave3
-	note $21
-	note $53
-	note $31
-	note $21
-	octave2
-	note $c1
-	loopchannel $03, $5a17
-	octave3
-	note $21
-	note $51
-	note $21
-	octave2
-	note $c3
-	octave3
-	note $11
-	note $21
-	note $31
-	callchannel _Music_RivalBattle_sub_0xe9b47
-	octave2
-	note $b1
-	octave4
-	note $21
-	octave2
-	note $b1
-	octave3
-	note $c1
-	octave2
-	note $b1
-	octave3
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $91
-	callchannel _Music_RivalBattle_sub_0xe9b50
-	note $21
-	note $91
-	octave4
-	note $21
-	octave3
-	note $93
-	note $21
-	note $11
-	octave2
-	note $c1
-	callchannel _Music_RivalBattle_sub_0xe9b47
-	octave2
-	note $b1
-	octave3
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $91
-	octave2
-	note $b1
-	octave3
-	note $71
-	octave2
-	note $b1
-	octave3
-	note $61
-	callchannel _Music_RivalBattle_sub_0xe9b50
-	note $21
-	note $91
-	loopchannel $04, $5a66
-	callchannel _Music_RivalBattle_sub_0xe9b5c
-	note $91
-	note $71
-	octave2
-	note $b1
-	octave3
-	note $61
-	loopchannel $04, $5a71
-	octave2
-	note $b1
-	octave3
-	note $71
-	octave2
-	note $b1
-	octave3
-	note $71
-	octave2
-	note $b1
-	octave3
-	note $71
-	note $61
-	note $41
-	callchannel _Music_RivalBattle_sub_0xe9b5c
-	octave2
-	note $c1
-	octave3
-	note $31
-	callchannel _Music_RivalBattle_sub_0xe9b65
-	octave3
-	note $41
-	octave4
-	note $41
-	callchannel _Music_RivalBattle_sub_0xe9b65
-	octave3
-	note $41
-	note $b1
-	note $51
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $51
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $51
-	octave4
-	note $51
-	octave3
-	note $51
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $51
-	note $51
-	note $71
-	note $81
-	note $91
-	note $41
-	note $b1
-	loopchannel $04, $5ab3
-	note $41
-	note $a1
-	loopchannel $04, $5ab9
-	note $41
-	note $91
-	loopchannel $04, $5abf
-	note $41
-	note $81
-	loopchannel $0c, $5ac5
-	octave2
-	note $c1
-	octave3
-	note $41
-	loopchannel $04, $5acb
-	octave2
-	note $c1
-	octave3
-	note $71
-	loopchannel $04, $5ad3
-	note $41
-	note $81
-	note $b1
-	note $41
-	note $81
-	note $b1
-	note $41
-	note $b1
-	note $41
-	note $81
-	note $b1
-	note $41
-	note $81
-	note $b1
-	note $41
-	note $b1
-	octave2
-	note $c1
-	octave3
-	note $81
-	note $c1
-	octave2
-	note $c1
-	octave3
-	note $81
-	note $c1
-	octave2
-	note $c1
-	octave3
-	note $c1
-	octave2
-	note $c1
-	octave3
-	note $91
-	note $c1
-	octave2
-	note $c1
-	octave4
-	note $41
-	note $21
-	octave3
-	note $c1
-	note $91
-	note $87
-	note $47
-	note $b7
-	note $87
-	octave2
-	note $c7
-	octave3
-	note $27
-	note $47
-	note $67
-	octave2
-	note $b1
-	octave3
-	note $41
-	loopchannel $07, $5b10
-	note $51
-	note $41
-	octave2
-	note $b1
-	octave3
-	note $41
-	loopchannel $06, $5b1a
-	octave2
-	note $b1
-	octave3
-	note $71
-	note $61
-	note $51
-	octave2
-	note $91
-	octave3
-	note $21
-	loopchannel $07, $5b28
-	note $31
-	note $21
-	octave2
-	note $91
-	octave3
-	note $21
-	loopchannel $04, $5b32
-	octave2
-	note $c1
-	note $91
-	note $c1
-	octave3
-	note $63
-	note $51
-	note $41
-	note $31
-	loopchannel $00, $5a30 ; end
-; 0xe9b47
+Music_RivalBattle_Ch3: ; e99fb
+	notetype $c, $19
+	octave 3
+	note F#, 1
+	note A#, 1
+	note __, 1
+	note A#, 9
+	octave 3
+	note F#, 1
+	octave 4
+	note C#, 1
+	note __, 1
+	note C#, 5
+	octave 3
+	note C#, 1
+	note D_, 1
 
-_Music_RivalBattle_sub_0xe9b47: ; 0xe9b47
-; subroutine
-	octave2
-	note $b1
-	octave3
-	note $41
-	loopchannel $04, $5b47
-	endchannel ; end
-; 0xe9b50
+Music_RivalBattle_branch_e9a0c: ; e9a0c
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note F#, 3
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9a0c
 
-_Music_RivalBattle_sub_0xe9b50: ; 0xe9b50
-; subroutine
-	note $21
-	note $91
-	octave4
-	note $21
-	octave3
-	note $93
-	octave4
-	note $21
-	octave3
-	note $21
-	note $91
-	endchannel ; end
-; 0xe9b5c
+Music_RivalBattle_branch_e9a17: ; e9a17
+	octave 3
+	note C#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C#, 1
+	note E_, 3
+	note D_, 1
+	note C#, 1
+	octave 2
+	note B_, 1
+	loopchannel 3, Music_RivalBattle_branch_e9a17
+	octave 3
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 1
+	note C#, 1
+	note D_, 1
 
-_Music_RivalBattle_sub_0xe9b5c: ; 0xe9b5c
-; subroutine
-	octave2
-	note $c1
-	octave3
-	note $71
-	loopchannel $07, $5b5c
-	endchannel ; end
-; 0xe9b65
+Music_RivalBattle_branch_e9a30: ; e9a30
+	callchannel Music_RivalBattle_branch_e9b47
+	octave 2
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note B_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G#, 1
+	callchannel Music_RivalBattle_branch_e9b50
+	note C#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 3
+	note C#, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	callchannel Music_RivalBattle_branch_e9b47
+	octave 2
+	note A#, 1
+	octave 3
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	callchannel Music_RivalBattle_branch_e9b50
 
-_Music_RivalBattle_sub_0xe9b65: ; 0xe9b65
-; subroutine
-	octave3
-	note $41
-	note $b1
-	octave4
-	note $41
-	loopchannel $02, $5b65
-	endchannel ; end
-; 0xe9b6f
+Music_RivalBattle_branch_e9a66: ; e9a66
+	note C#, 1
+	note G#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9a66
+	callchannel Music_RivalBattle_branch_e9b5c
+	note G#, 1
+	note F#, 1
+
+Music_RivalBattle_branch_e9a71: ; e9a71
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	loopchannel 4, Music_RivalBattle_branch_e9a71
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	callchannel Music_RivalBattle_branch_e9b5c
+	octave 2
+	note B_, 1
+	octave 3
+	note D_, 1
+	callchannel Music_RivalBattle_branch_e9b65
+	octave 3
+	note D#, 1
+	octave 4
+	note D#, 1
+	callchannel Music_RivalBattle_branch_e9b65
+	octave 3
+	note D#, 1
+	note A#, 1
+	note E_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+
+Music_RivalBattle_branch_e9ab3: ; e9ab3
+	note D#, 1
+	note A#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9ab3
+
+Music_RivalBattle_branch_e9ab9: ; e9ab9
+	note D#, 1
+	note A_, 1
+	loopchannel 4, Music_RivalBattle_branch_e9ab9
+
+Music_RivalBattle_branch_e9abf: ; e9abf
+	note D#, 1
+	note G#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9abf
+
+Music_RivalBattle_branch_e9ac5: ; e9ac5
+	note D#, 1
+	note G_, 1
+	loopchannel 12, Music_RivalBattle_branch_e9ac5
+
+Music_RivalBattle_branch_e9acb: ; e9acb
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9acb
+
+Music_RivalBattle_branch_e9ad3: ; e9ad3
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9ad3
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	note D#, 1
+	note G_, 1
+	note A#, 1
+	note D#, 1
+	note A#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note G_, 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note G_, 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note B_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note G#, 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	octave 4
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note G_, 7
+	note D#, 7
+	note A#, 7
+	note G_, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note C#, 7
+	note D#, 7
+	note F_, 7
+
+Music_RivalBattle_branch_e9b10: ; e9b10
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	loopchannel 7, Music_RivalBattle_branch_e9b10
+	note E_, 1
+	note D#, 1
+
+Music_RivalBattle_branch_e9b1a: ; e9b1a
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	loopchannel 6, Music_RivalBattle_branch_e9b1a
+	octave 2
+	note A#, 1
+	octave 3
+	note F#, 1
+	note F_, 1
+	note E_, 1
+
+Music_RivalBattle_branch_e9b28: ; e9b28
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	loopchannel 7, Music_RivalBattle_branch_e9b28
+	note D_, 1
+	note C#, 1
+
+Music_RivalBattle_branch_e9b32: ; e9b32
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9b32
+	octave 2
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note F_, 3
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	loopchannel 0, Music_RivalBattle_branch_e9a30
+; e9b47
+
+Music_RivalBattle_branch_e9b47: ; e9b47
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	loopchannel 4, Music_RivalBattle_branch_e9b47
+	endchannel
+; e9b50
+
+Music_RivalBattle_branch_e9b50: ; e9b50
+	note C#, 1
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 3
+	octave 4
+	note C#, 1
+	octave 3
+	note C#, 1
+	note G#, 1
+	endchannel
+; e9b5c
+
+Music_RivalBattle_branch_e9b5c: ; e9b5c
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	loopchannel 7, Music_RivalBattle_branch_e9b5c
+	endchannel
+; e9b65
+
+Music_RivalBattle_branch_e9b65: ; e9b65
+	octave 3
+	note D#, 1
+	note A#, 1
+	octave 4
+	note D#, 1
+	loopchannel 2, Music_RivalBattle_branch_e9b65
+	endchannel
+; e9b6f
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -1,1032 +1,1057 @@
-_Music_RocketBattle: ; 0xe9b6f
-	db $80
-	dw _Music_RocketBattle_Ch1
-	db $01
-	dw _Music_RocketBattle_Ch2
-	db $02
-	dw _Music_RocketBattle_Ch3
-; 0xe9b78
+Music_RocketBattle: ; e9b6f
+	dbw $80, Music_RocketBattle_Ch1
+	dbw $01, Music_RocketBattle_Ch2
+	dbw $02, Music_RocketBattle_Ch3
+; e9b78
 
-_Music_RocketBattle_Ch1: ; 0xe9b78
-	tempo $6500
+
+Music_RocketBattle_Ch1: ; e9b78
+	tempo 101
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $10, $15
-	notetype $0c, $b2
-	octave4
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $90
-	note $80
-	note $70
-	note $60
-	note $70
-	note $60
-	note $50
-	note $40
-	note $50
-	note $40
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	octave2
-	note $c0
+	notetype $c, $b2
+	octave 4
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 2
+	note B_, 0
+
+Music_RocketBattle_branch_e9bad: ; e9bad
 	intensity $b2
-	octave3
-	note $15
-	note $13
-	note $51
+	octave 3
+	note C_, 5
+	note C_, 3
+	note E_, 1
 	intensity $b7
-	note $33
-	loopchannel $03, $5bad
+	note D_, 3
+	loopchannel 3, Music_RocketBattle_branch_e9bad
 	intensity $b2
-	note $15
-	note $15
+	note C_, 5
+	note C_, 5
 	intensity $b7
-	note $33
+	note D_, 3
+
+Music_RocketBattle_branch_e9bc1: ; e9bc1
 	intensity $b2
-	octave4
-	note $55
-	note $53
-	note $81
+	octave 4
+	note E_, 5
+	note E_, 3
+	note G_, 1
 	intensity $b7
-	note $63
-	loopchannel $03, $5bc1
+	note F_, 3
+	loopchannel 3, Music_RocketBattle_branch_e9bc1
 	intensity $b2
-	note $55
-	note $53
+	note E_, 5
+	note E_, 3
 	intensity $b7
-	note $31
-	note $43
+	note D_, 1
+	note D#, 3
 	intensity $b3
-	octave4
-	note $11
-	octave3
-	note $51
-	note $51
-	note $b1
-	note $61
-	note $61
-	note $a1
-	note $31
-	note $31
-	octave4
-	note $11
-	octave3
-	note $51
-	note $51
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $61
-	note $51
-	note $61
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	note A#, 1
+	note F_, 1
+	note F_, 1
+	note A_, 1
+	note D_, 1
+	note D_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
 	intensity $b5
-	note $83
+	note G_, 3
 	intensity $b3
-	note $81
-	note $61
-	note $41
-	note $31
-	note $21
-	note $31
+	note G_, 1
+	note F_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	intensity $b5
-	note $43
+	note D#, 3
 	intensity $b3
-	note $41
-	note $31
-	note $61
-	octave4
-	note $51
-	octave3
-	note $51
-	note $51
-	octave4
-	note $31
-	octave3
-	note $61
-	note $61
-	octave4
-	note $11
-	octave3
-	note $31
-	note $31
-	octave4
-	note $51
-	octave3
-	note $51
-	note $51
-	octave4
-	note $31
-	octave3
-	note $51
-	note $31
-	note $51
-	note $61
-	note $51
-	note $61
+	note D#, 1
+	note D_, 1
+	note F_, 1
+
+Music_RocketBattle_branch_e9c02: ; e9c02
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note D_, 1
+	note D_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
 	intensity $b5
-	note $83
+	note G_, 3
 	intensity $b3
-	note $81
-	note $61
-	octave4
-	note $11
-	note $31
-	note $11
-	note $31
+	note G_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
 	intensity $b5
-	note $63
+	note F_, 3
 	intensity $b2
-	octave3
-	note $61
-	note $81
-	note $93
+	octave 3
+	note F_, 1
+	note G_, 1
+	note G#, 3
 	intensity $b5
-	note $33
-	note $13
-	note $33
-	note $51
+	note D_, 3
+	note C_, 3
+	note D_, 3
+	note E_, 1
 	intensity $b2
-	note $61
-	note $a3
+	note F_, 1
+	note A_, 3
 	intensity $b7
-	note $a3
+	note A_, 3
 	intensity $b5
-	note $a1
-	note $81
-	note $63
-	note $33
-	note $13
-	note $33
-	note $51
-	note $61
-	note $51
-	note $31
-	note $11
-	note $b1
-	note $81
-	note $a1
-	note $b1
+	note A_, 1
+	note G_, 1
+	note F_, 3
+	note D_, 3
+	note C_, 3
+	note D_, 3
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note A#, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
 	intensity $b7
-	octave4
-	note $55
-	note $33
-	octave3
-	note $81
-	note $b3
-	note $a5
-	note $83
-	note $51
-	note $63
-	note $55
-	note $35
-	note $43
+	octave 4
+	note E_, 5
+	note D_, 3
+	octave 3
+	note G_, 1
+	note A#, 3
+	note A_, 5
+	note G_, 3
+	note E_, 1
+	note F_, 3
+	note E_, 5
+	note D_, 5
+	note D#, 3
 	intensity $a0
-	note $57
+	note E_, 7
 	intensity $a7
-	note $57
+	note E_, 7
 	intensity $b7
-	octave2
-	note $a7
-	note $87
-	note $a7
-	note $b7
-	note $a7
-	note $87
-	note $a7
-	octave3
-	note $27
-	note $37
-	note $27
-	octave2
-	note $b7
-	note $a7
-	octave3
-	note $37
-	note $27
-	note $37
-	note $57
-	octave2
-	note $b5
-	octave3
-	note $35
-	note $13
+	octave 2
+	note A_, 7
+	note G_, 7
+	note A_, 7
+	note A#, 7
+	note A_, 7
+	note G_, 7
+	note A_, 7
+	octave 3
+	note C#, 7
+	note D_, 7
+	note C#, 7
+	octave 2
+	note A#, 7
+	note A_, 7
+	octave 3
+	note D_, 7
+	note C#, 7
+	note D_, 7
+	note E_, 7
+	octave 2
+	note A#, 5
+	octave 3
+	note D_, 5
+	note C_, 3
 	intensity $b5
-	octave2
-	note $b1
-	octave3
-	note $11
-	note $31
-	note $51
-	note $61
-	note $81
-	note $a1
-	note $b1
-	note $a1
-	note $51
-	note $a1
-	note $b1
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $a1
-	octave4
-	note $21
-	note $31
-	note $21
-	octave3
-	note $b1
-	note $81
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note A#, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	note G_, 1
 	intensity $b2
-	note $55
-	note $55
-	note $53
-	note $55
-	note $53
+	note E_, 5
+	note E_, 5
+	note E_, 3
+	note E_, 5
+	note E_, 3
 	intensity $b7
-	note $81
-	note $63
+	note G_, 1
+	note F_, 3
 	intensity $b2
-	note $55
-	note $53
+	note E_, 5
+	note E_, 3
 	intensity $b7
-	note $81
-	note $63
+	note G_, 1
+	note F_, 3
 	intensity $b2
-	note $55
-	octave4
-	note $30
-	note $40
+	note E_, 5
+	octave 4
+	note D_, 0
+	note D#, 0
 	intensity $a0
-	note $57
+	note E_, 7
 	intensity $b2
-	octave3
-	note $65
-	note $63
+	octave 3
+	note F_, 5
+	note F_, 3
 	intensity $b7
-	note $b1
-	note $83
+	note A#, 1
+	note G_, 3
+
+Music_RocketBattle_branch_e9cc5: ; e9cc5
 	intensity $b2
-	note $65
-	note $63
+	note F_, 5
+	note F_, 3
 	intensity $b7
-	note $a1
-	note $83
-	loopchannel $02, $5cc5
+	note A_, 1
+	note G_, 3
+	loopchannel 2, Music_RocketBattle_branch_e9cc5
 	intensity $b2
-	note $65
-	octave4
-	note $30
-	note $50
+	note F_, 5
+	octave 4
+	note D_, 0
+	note E_, 0
 	intensity $a0
-	note $67
+	note F_, 7
 	intensity $b3
-	note $31
-	octave3
-	note $a1
-	note $51
-	note $a3
-	note $a1
+	note D_, 1
+	octave 3
+	note A_, 1
+	note E_, 1
+	note A_, 3
+	note A_, 1
 	intensity $b7
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $b3
-	note $41
-	octave3
-	note $b1
-	note $81
-	note $b3
-	note $b1
+	note D#, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note A#, 3
+	note A#, 1
 	intensity $b7
-	octave4
-	note $33
+	octave 4
+	note D_, 3
 	intensity $b3
-	note $51
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $13
-	note $11
+	note E_, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 3
+	note C_, 1
 	intensity $b7
-	note $43
+	note D#, 3
 	intensity $a0
-	note $53
+	note E_, 3
 	intensity $a7
-	note $55
+	note E_, 5
 	intensity $a0
-	octave3
-	note $95
+	octave 3
+	note G#, 5
 	intensity $b3
-	note $11
-	note $51
-	note $51
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $61
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $31
-	note $11
-	note $51
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	note $11
-	note $11
-	octave2
-	note $b1
-	octave3
-	note $11
+	note C_, 1
+	note E_, 1
+	note E_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note F_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note D_, 1
+	note C_, 1
+	note E_, 1
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
 	intensity $b5
-	note $33
+	note D_, 3
 	intensity $b3
-	note $31
-	note $11
-	octave2
-	note $b1
-	octave3
-	note $31
-	note $21
-	note $31
+	note D_, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note C#, 1
+	note D_, 1
 	intensity $b5
-	note $43
+	note D#, 3
 	intensity $b3
-	note $41
-	note $31
-	note $61
-	loopchannel $00, $5c02 ; end
-; 0xe9d3e
-
-_Music_RocketBattle_Ch2: ; 0xe9d3e
-	dutycycle $03
-	vibrato $08, $36
-	tone $0100
-	notetype $0c, $b2
-	octave4
-	note $a3
-	note $b3
-	note $c3
-	octave5
-	note $10
+	note D#, 1
+	note D_, 1
+	note F_, 1
+	loopchannel 0, Music_RocketBattle_branch_e9c02
+
+Music_RocketBattle_Ch2: ; e9d3e
+	dutycycle $3
+	vibrato $8, $36
+	tone $0001
+	notetype $c, $b2
+	octave 4
+	note A_, 3
+	note A#, 3
+	note B_, 3
+	octave 5
+	note C_, 0
 	intensity $82
-	octave4
-	note $90
-	note $a0
-	note $90
+	octave 4
+	note G#, 0
+	note A_, 0
+	note G#, 0
 	intensity $c2
-	octave5
-	note $20
+	octave 5
+	note C#, 0
 	intensity $92
-	octave4
-	note $90
-	note $a0
-	note $90
+	octave 4
+	note G#, 0
+	note A_, 0
+	note G#, 0
 	intensity $c2
-	octave5
-	note $30
+	octave 5
+	note D_, 0
 	intensity $a2
-	octave4
-	note $90
-	note $a0
-	note $90
+	octave 4
+	note G#, 0
+	note A_, 0
+	note G#, 0
 	intensity $c2
-	octave5
-	note $40
+	octave 5
+	note D#, 0
 	intensity $b2
-	octave4
-	note $90
-	note $a0
-	note $90
+	octave 4
+	note G#, 0
+	note A_, 0
+	note G#, 0
 	intensity $c2
-	octave5
-	note $50
-	octave4
-	note $90
-	note $a0
-	note $90
+	octave 5
+	note E_, 0
+	octave 4
+	note G#, 0
+	note A_, 0
+	note G#, 0
+
+Music_RocketBattle_branch_e9d7b: ; e9d7b
 	intensity $c2
-	octave3
-	note $a5
-	note $a3
-	octave4
-	note $11
+	octave 3
+	note A_, 5
+	note A_, 3
+	octave 4
+	note C_, 1
 	intensity $c7
-	octave3
-	note $b3
-	loopchannel $03, $5d7b
+	octave 3
+	note A#, 3
+	loopchannel 3, Music_RocketBattle_branch_e9d7b
 	intensity $c2
-	note $a5
-	note $a5
+	note A_, 5
+	note A_, 5
 	intensity $4a
-	note $93
+	note G#, 3
+
+Music_RocketBattle_branch_e9d91: ; e9d91
 	intensity $c2
-	octave4
-	note $a5
-	note $a3
-	octave5
-	note $11
+	octave 4
+	note A_, 5
+	note A_, 3
+	octave 5
+	note C_, 1
 	intensity $c7
-	octave4
-	note $b3
-	loopchannel $03, $5d91
+	octave 4
+	note A#, 3
+	loopchannel 3, Music_RocketBattle_branch_e9d91
 	intensity $c2
-	note $a5
-	note $a3
+	note A_, 5
+	note A_, 3
 	intensity $c7
-	note $81
-	note $93
-	callchannel _Music_RocketBattle_sub_0xe9ea0
+	note G_, 1
+	note G#, 3
+	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
-	note $6f
+	note F_, 15
 	intensity $b7
-	note $6f
-	callchannel _Music_RocketBattle_sub_0xe9ea0
+	note F_, 15
+
+Music_RocketBattle_branch_e9db1: ; e9db1
+	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b0
-	note $b7
+	note A#, 7
 	intensity $b7
-	note $b7
+	note A#, 7
 	intensity $c4
-	octave3
-	note $a1
-	note $81
-	note $a1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note A_, 1
 	intensity $c7
-	octave4
-	note $13
-	octave3
-	note $b1
-	note $a1
-	note $81
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
 	intensity $c2
-	note $a1
-	octave4
-	note $13
+	note A_, 1
+	octave 4
+	note C_, 3
 	intensity $b0
-	note $15
+	note C_, 5
 	intensity $b7
-	note $13
+	note C_, 3
 	intensity $c4
-	octave3
-	note $b1
-	note $a1
-	note $b1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note A#, 1
 	intensity $c7
-	octave4
-	note $33
-	note $11
-	octave3
-	note $b1
-	note $a1
+	octave 4
+	note D_, 3
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
 	intensity $c2
-	note $b1
-	octave4
-	note $33
+	note A#, 1
+	octave 4
+	note D_, 3
 	intensity $b0
-	note $33
+	note D_, 3
 	intensity $b7
-	note $35
+	note D_, 5
 	intensity $4f
-	note $a5
+	note A_, 5
 	intensity $a0
-	note $85
-	note $63
-	note $55
-	note $65
-	note $83
-	note $a5
-	note $b5
-	note $93
-	note $a5
+	note G_, 5
+	note F_, 3
+	note E_, 5
+	note F_, 5
+	note G_, 3
+	note A_, 5
+	note A#, 5
+	note G#, 3
+	note A_, 5
 	intensity $a7
-	note $a9
+	note A_, 9
 	intensity $3f
-	octave3
-	note $37
+	octave 3
+	note D_, 7
 	intensity $b7
-	note $37
+	note D_, 7
 	intensity $3f
-	note $27
+	note C#, 7
 	intensity $b7
-	note $27
+	note C#, 7
 	intensity $3f
-	note $37
+	note D_, 7
 	intensity $b7
-	note $37
+	note D_, 7
 	intensity $3f
-	note $57
+	note E_, 7
 	intensity $b7
-	note $57
+	note E_, 7
 	intensity $4e
-	note $67
+	note F_, 7
 	intensity $a0
-	note $67
-	note $5f
-	note $6f
-	note $af
+	note F_, 7
+	note E_, 15
+	note F_, 15
+	note A_, 15
 	intensity $3f
-	note $6f
+	note F_, 15
 	intensity $c7
-	octave4
-	note $37
-	note $27
+	octave 4
+	note D_, 7
+	note C#, 7
 	intensity $b0
-	note $57
+	note E_, 7
 	intensity $b7
-	note $57
+	note E_, 7
 	intensity $3c
-	note $a5
+	note A_, 5
 	intensity $c7
-	note $a9
+	note A_, 9
 	intensity $c2
-	octave3
-	note $a5
-	note $a5
-	note $a3
-	note $a5
-	note $a3
+	octave 3
+	note A_, 5
+	note A_, 5
+	note A_, 3
+	note A_, 5
+	note A_, 3
 	intensity $c7
-	octave4
-	note $11
-	octave3
-	note $b3
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 3
 	intensity $c2
-	note $a5
-	note $a3
+	note A_, 5
+	note A_, 3
 	intensity $c7
-	octave4
-	note $11
-	octave3
-	note $b3
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 3
 	intensity $c2
-	note $a5
+	note A_, 5
 	intensity $c7
-	octave4
-	note $80
-	note $90
-	note $a7
+	octave 4
+	note G_, 0
+	note G#, 0
+	note A_, 7
+
+Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c2
-	octave3
-	note $b5
-	note $b3
+	octave 3
+	note A#, 5
+	note A#, 3
 	intensity $c7
-	octave4
-	note $31
-	note $13
-	loopchannel $03, $5e5a
+	octave 4
+	note D_, 1
+	note C_, 3
+	loopchannel 3, Music_RocketBattle_branch_e9e5a
 	intensity $c2
-	octave3
-	note $b5
+	octave 3
+	note A#, 5
 	intensity $c7
-	octave4
-	note $80
-	note $a0
-	note $b7
+	octave 4
+	note G_, 0
+	note A_, 0
+	note A#, 7
 	intensity $c7
-	note $a5
-	note $85
-	note $a3
-	note $b5
-	octave5
-	note $35
-	octave4
-	note $b3
-	note $a5
-	note $85
+	note A_, 5
+	note G_, 5
+	note A_, 3
+	note A#, 5
+	octave 5
+	note D_, 5
+	octave 4
+	note A#, 3
+	note A_, 5
+	note G_, 5
 	intensity $c5
-	note $a3
+	note A_, 3
 	intensity $b0
-	note $a7
+	note A_, 7
 	intensity $b7
-	note $a7
+	note A_, 7
 	intensity $c6
-	octave3
-	note $a5
-	note $95
-	note $53
-	note $a5
-	note $95
-	note $53
+	octave 3
+	note A_, 5
+	note G#, 5
+	note E_, 3
+	note A_, 5
+	note G#, 5
+	note E_, 3
 	intensity $b0
-	note $67
+	note F_, 7
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $3d
-	note $b7
+	note A#, 7
 	intensity $c7
-	note $b7
-	loopchannel $00, $5db1 ; end
-; 0xe9ea0
+	note A#, 7
+	loopchannel 0, Music_RocketBattle_branch_e9db1
+; e9ea0
 
-_Music_RocketBattle_sub_0xe9ea0: ; 0xe9ea0
-; subroutine
+Music_RocketBattle_branch_e9ea0: ; e9ea0
 	intensity $c6
-	octave4
-	note $a5
-	note $95
-	note $53
-	note $a5
-	note $95
-	note $53
-	endchannel ; end
-; 0xe9eaa
+	octave 4
+	note A_, 5
+	note G#, 5
+	note E_, 3
+	note A_, 5
+	note G#, 5
+	note E_, 3
+	endchannel
 
-_Music_RocketBattle_Ch3: ; 0xe9eaa
-	notetype $0c, $19
-	octave3
-	note $a1
-	octave4
-	note $51
-	octave3
-	note $91
-	octave4
-	note $51
-	octave3
-	note $81
-	octave4
-	note $51
-	octave3
-	note $71
-	octave4
-	note $51
-	octave3
-	note $61
-	octave4
-	note $51
-	octave3
-	note $51
-	octave4
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $11
-	octave2
-	note $c1
-	note $b1
-	callchannel _Music_RocketBattle_sub_0xe9fe6
-	loopchannel $03, $5ecc
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $81
-	note $61
-	note $51
-	note $31
-	callchannel _Music_RocketBattle_sub_0xe9fe6
-	loopchannel $03, $5edf
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $81
-	octave2
-	note $81
-	note $a1
-	note $b1
-	callchannel _Music_RocketBattle_sub_0xe9ff3
-	callchannel _Music_RocketBattle_sub_0xea010
-	octave3
-	note $61
-	callchannel _Music_RocketBattle_sub_0xea01d
-	callchannel _Music_RocketBattle_sub_0xe9ff3
-	callchannel _Music_RocketBattle_sub_0xea010
-	octave3
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $51
-	note $31
-	callchannel _Music_RocketBattle_sub_0xea02a
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $b1
-	octave3
-	note $61
-	loopchannel $05, $5f25
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $b1
-	callchannel _Music_RocketBattle_sub_0xea02a
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $61
-	note $51
-	note $31
-	callchannel _Music_RocketBattle_sub_0xea02a
-	callchannel _Music_RocketBattle_sub_0xea02a
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	octave2
-	note $b1
-	note $a1
-	octave3
-	note $31
-	note $81
-	note $61
-	loopchannel $07, $5f4e
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	octave2
-	note $b1
-	note $a1
-	octave3
-	note $a1
-	note $81
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	loopchannel $04, $5f6a
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $81
-	note $61
-	note $51
-	note $31
-	note $21
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $51
-	loopchannel $0d, $5f7c
-	octave2
-	note $a1
-	octave3
-	note $53
-	note $31
-	note $11
-	octave2
-	note $b1
-	octave2
-	note $a1
-	octave3
-	note $51
-	loopchannel $04, $5f8c
-	octave2
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $a1
-	note $b3
-	note $a1
-	note $81
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $61
-	loopchannel $07, $5f9e
-	note $51
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	loopchannel $05, $5fa8
-	octave3
-	note $b1
-	octave4
-	note $33
-	note $11
-	octave3
-	note $b1
-	note $81
-	callchannel _Music_RocketBattle_sub_0xea033
-	octave3
-	note $51
-	callchannel _Music_RocketBattle_sub_0xea010
-	octave3
-	note $61
-	callchannel _Music_RocketBattle_sub_0xea033
-	octave3
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	callchannel _Music_RocketBattle_sub_0xe9ff3
-	callchannel _Music_RocketBattle_sub_0xea010
-	octave3
-	note $61
-	callchannel _Music_RocketBattle_sub_0xea01d
-	loopchannel $00, $5efe ; end
-; 0xe9fe6
+Music_RocketBattle_Ch3: ; e9eaa
+	notetype $c, $19
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note F#, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note F_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note E_, 1
+	octave 4
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A#, 1
 
-_Music_RocketBattle_sub_0xe9fe6: ; 0xe9fe6
-; subroutine
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $31
-	octave2
-	note $a1
-	note $b1
-	octave3
-	note $51
-	note $81
-	note $61
-	endchannel ; end
-; 0xe9ff3
+Music_RocketBattle_branch_e9ecc: ; e9ecc
+	callchannel Music_RocketBattle_branch_e9fe6
+	loopchannel 3, Music_RocketBattle_branch_e9ecc
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
 
-_Music_RocketBattle_sub_0xe9ff3: ; 0xe9ff3
-; subroutine
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $41
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $41
-	note $31
-	endchannel ; end
-; 0xea010
+Music_RocketBattle_branch_e9edf: ; e9edf
+	callchannel Music_RocketBattle_branch_e9fe6
+	loopchannel 3, Music_RocketBattle_branch_e9edf
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note G_, 1
+	octave 2
+	note G_, 1
+	note A_, 1
+	note A#, 1
+	callchannel Music_RocketBattle_branch_e9ff3
+	callchannel Music_RocketBattle_branch_ea010
+	octave 3
+	note F_, 1
+	callchannel Music_RocketBattle_branch_ea01d
 
-_Music_RocketBattle_sub_0xea010: ; 0xea010
-; subroutine
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $b1
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $b1
-	octave2
-	note $b1
-	endchannel ; end
-; 0xea01d
+Music_RocketBattle_branch_e9efe: ; e9efe
+	callchannel Music_RocketBattle_branch_e9ff3
+	callchannel Music_RocketBattle_branch_ea010
+	octave 3
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	callchannel Music_RocketBattle_branch_ea02a
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
 
-_Music_RocketBattle_sub_0xea01d: ; 0xea01d
-; subroutine
-	octave2
-	note $b1
-	octave3
-	note $61
-	note $b1
-	note $61
-	note $b1
-	note $61
-	octave2
-	note $b1
-	octave3
-	note $61
-	endchannel ; end
-; 0xea02a
+Music_RocketBattle_branch_e9f25: ; e9f25
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	loopchannel 5, Music_RocketBattle_branch_e9f25
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note A#, 1
+	callchannel Music_RocketBattle_branch_ea02a
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	callchannel Music_RocketBattle_branch_ea02a
+	callchannel Music_RocketBattle_branch_ea02a
 
-_Music_RocketBattle_sub_0xea02a: ; 0xea02a
-; subroutine
-	octave2
-	note $a1
-	octave3
-	note $51
-	loopchannel $04, $602a
-	endchannel ; end
-; 0xea033
+Music_RocketBattle_branch_e9f4e: ; e9f4e
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	loopchannel 7, Music_RocketBattle_branch_e9f4e
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A#, 1
+	note A_, 1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
 
-_Music_RocketBattle_sub_0xea033: ; 0xea033
-; subroutine
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $a1
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $a1
-	octave2
-	note $a1
-	endchannel ; end
-; 0xea040
+Music_RocketBattle_branch_e9f6a: ; e9f6a
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	loopchannel 4, Music_RocketBattle_branch_e9f6a
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+
+Music_RocketBattle_branch_e9f7c: ; e9f7c
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	loopchannel 13, Music_RocketBattle_branch_e9f7c
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+
+Music_RocketBattle_branch_e9f8c: ; e9f8c
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	loopchannel 4, Music_RocketBattle_branch_e9f8c
+	octave 2
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note A#, 3
+	note A_, 1
+	note G_, 1
+	note A#, 1
+
+Music_RocketBattle_branch_e9f9e: ; e9f9e
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	loopchannel 7, Music_RocketBattle_branch_e9f9e
+	note E_, 1
+	note F_, 1
+
+Music_RocketBattle_branch_e9fa8: ; e9fa8
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	loopchannel 5, Music_RocketBattle_branch_e9fa8
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 3
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	callchannel Music_RocketBattle_branch_ea033
+	octave 3
+	note E_, 1
+	callchannel Music_RocketBattle_branch_ea010
+	octave 3
+	note F_, 1
+	callchannel Music_RocketBattle_branch_ea033
+	octave 3
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	callchannel Music_RocketBattle_branch_e9ff3
+	callchannel Music_RocketBattle_branch_ea010
+	octave 3
+	note F_, 1
+	callchannel Music_RocketBattle_branch_ea01d
+	loopchannel 0, Music_RocketBattle_branch_e9efe
+; e9fe6
+
+Music_RocketBattle_branch_e9fe6: ; e9fe6
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	note A#, 1
+	octave 3
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	endchannel
+; e9ff3
+
+Music_RocketBattle_branch_e9ff3: ; e9ff3
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	endchannel
+; ea010
+
+Music_RocketBattle_branch_ea010: ; ea010
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	octave 2
+	note A#, 1
+	endchannel
+; ea01d
+
+Music_RocketBattle_branch_ea01d: ; ea01d
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	endchannel
+; ea02a
+
+Music_RocketBattle_branch_ea02a: ; ea02a
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	loopchannel 4, Music_RocketBattle_branch_ea02a
+	endchannel
+; ea033
+
+Music_RocketBattle_branch_ea033: ; ea033
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	endchannel
+; ea040
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -1,309 +1,320 @@
-_Music_RocketHideout: ; 0xeeb75
-	db $c0
-	dw _Music_RocketHideout_Ch1
-	db $01
-	dw _Music_RocketHideout_Ch2
-	db $02
-	dw _Music_RocketHideout_Ch3
-	db $03
-	dw _Music_RocketHideout_Ch4
-; 0xeeb81
+Music_RocketHideout: ; eeb75
+	dbw $c0, Music_RocketHideout_Ch1
+	dbw $01, Music_RocketHideout_Ch2
+	dbw $02, Music_RocketHideout_Ch3
+	dbw $03, Music_RocketHideout_Ch4
+; eeb81
 
-_Music_RocketHideout_Ch1: ; 0xeeb81
-	tempo $9000
+
+Music_RocketHideout_Ch1: ; eeb81
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0400
+	dutycycle $3
+	tone $0004
 	vibrato $10, $44
-	notetype $0c, $b3
+	notetype $c, $b3
 	stereopanning $f0
-	note $0f
-	loopchannel $04, $6b93
-	octave2
-	note $41
-	note $01
-	note $b3
-	note $a1
-	note $05
-	note $41
-	note $b3
-	note $a1
-	note $07
-	loopchannel $02, $6b98
-	octave3
-	note $b1
-	note $a1
-	note $61
-	note $71
-	octave4
-	note $21
-	note $11
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $61
-	note $71
-	octave4
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $a1
-	note $71
-	note $61
-	note $41
-	note $61
-	note $71
-	note $b1
-	note $71
-	note $61
-	note $41
-	note $61
-	note $71
-	note $a1
-	octave2
-	note $b1
-	note $c1
-	octave3
-	note $41
-	note $61
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $81
-	note $91
-	octave4
-	note $41
-	note $31
-	note $41
-	note $31
-	note $11
-	octave3
-	note $c1
-	note $81
-	note $91
-	octave4
-	note $41
-	note $31
-	note $11
-	octave3
-	note $c1
-	note $91
-	note $81
-	note $61
-	note $81
-	note $91
-	octave4
-	note $11
-	octave3
-	note $91
-	note $81
-	note $61
-	note $81
-	note $91
-	note $c1
-	note $11
-	note $21
-	note $61
-	note $81
-	note $0f
+
+Music_RocketHideout_branch_eeb93: ; eeb93
+	note __, 15
+	loopchannel 4, Music_RocketHideout_branch_eeb93
+
+Music_RocketHideout_branch_eeb98: ; eeb98
+	octave 2
+	note D#, 1
+	note __, 1
+	note A#, 3
+	note A_, 1
+	note __, 5
+	note D#, 1
+	note A#, 3
+	note A_, 1
+	note __, 7
+	loopchannel 2, Music_RocketHideout_branch_eeb98
+	octave 3
+	note A#, 1
+	note A_, 1
+	note F_, 1
+	note F#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note F_, 1
+	note F#, 1
+	octave 4
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note F_, 1
+	note F#, 1
+	note A_, 1
+	octave 2
+	note A#, 1
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note G#, 1
+	octave 4
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note G#, 1
+	octave 4
+	note D#, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note B_, 1
+	note C_, 1
+	note C#, 1
+	note F_, 1
+	note G_, 1
+	note __, 15
 	intensity $b7
-	octave2
-	note $9f
-	note $0f
-	note $af
+	octave 2
+	note G#, 15
+	note __, 15
+	note A_, 15
 	intensity $b3
-	note $0f
-	loopchannel $04, $6bfe
-	loopchannel $00, $6b93 ; end
-; 0xeec07
 
-_Music_RocketHideout_Ch2: ; 0xeec07
-	dutycycle $03
-	tone $0200
-	vibrato $00, $f0
-	notetype $0c, $c4
-	stereopanning $0f
-	octave2
-	note $41
-	note $01
-	note $b3
-	note $a1
-	note $05
-	note $41
-	note $b3
-	note $a1
-	note $07
-	note $41
-	note $01
-	note $b3
-	note $a1
-	note $05
-	note $41
-	note $b3
-	note $a1
-	note $07
-	octave3
-	note $4b
-	note $b1
-	note $a1
-	octave4
-	note $27
-	note $17
-	octave3
-	note $bb
-	note $a3
-	note $77
-	note $67
-	octave4
-	note $4b
-	note $b1
-	note $a1
-	note $77
-	note $67
-	note $4b
-	note $33
-	octave3
-	note $c7
-	note $b7
-	octave4
-	note $6b
-	octave5
-	note $11
-	octave4
-	note $c1
-	note $97
-	note $87
-	note $6b
-	note $53
-	note $27
-	note $17
-	octave2
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
+Music_RocketHideout_branch_eebfe: ; eebfe
+	note __, 15
+	loopchannel 4, Music_RocketHideout_branch_eebfe
+	loopchannel 0, Music_RocketHideout_branch_eeb93
+
+Music_RocketHideout_Ch2: ; eec07
+	dutycycle $3
+	tone $0002
+	vibrato $0, $f0
+	notetype $c, $c4
+	stereopanning $f
+
+Music_RocketHideout_branch_eec14: ; eec14
+	octave 2
+	note D#, 1
+	note __, 1
+	note A#, 3
+	note A_, 1
+	note __, 5
+	note D#, 1
+	note A#, 3
+	note A_, 1
+	note __, 7
+	note D#, 1
+	note __, 1
+	note A#, 3
+	note A_, 1
+	note __, 5
+	note D#, 1
+	note A#, 3
+	note A_, 1
+	note __, 7
+	octave 3
+	note D#, 11
+	note A#, 1
+	note A_, 1
+	octave 4
+	note C#, 7
+	note C_, 7
+	octave 3
+	note A#, 11
+	note A_, 3
+	note F#, 7
+	note F_, 7
+	octave 4
+	note D#, 11
+	note A#, 1
+	note A_, 1
+	note F#, 7
+	note F_, 7
+	note D#, 11
+	note D_, 3
+	octave 3
+	note B_, 7
+	note A#, 7
+	octave 4
+	note F_, 11
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note G#, 7
+	note G_, 7
+	note F_, 11
+	note E_, 3
+	note C#, 7
+	note C_, 7
+	octave 2
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
 	intensity $c7
-	octave3
-	note $2f
+	octave 3
+	note C#, 15
 	intensity $c4
-	octave2
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
+	octave 2
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
 	intensity $c7
-	octave3
-	note $2f
+	octave 3
+	note C#, 15
 	intensity $c4
-	octave2
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
-	note $21
-	note $93
-	note $81
-	note $07
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
-	note $21
-	note $93
-	note $81
-	note $07
-	loopchannel $00, $6c14 ; end
-; 0xeec79
+	octave 2
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
+	note C#, 1
+	note G#, 3
+	note G_, 1
+	note __, 7
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
+	note C#, 1
+	note G#, 3
+	note G_, 1
+	note __, 7
+	loopchannel 0, Music_RocketHideout_branch_eec14
 
-_Music_RocketHideout_Ch3: ; 0xeec79
-	notetype $0c, $19
-	octave2
-	note $41
-	note $01
-	note $b3
-	note $a1
-	note $05
-	note $41
-	note $b3
-	note $a1
-	note $07
-	loopchannel $06, $6c7c
-	note $61
-	note $01
-	octave3
-	note $13
-	octave2
-	note $c1
-	note $05
-	note $61
-	octave3
-	note $13
-	octave2
-	note $c1
-	note $07
-	loopchannel $02, $6c8a
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
-	octave3
-	note $2f
-	loopchannel $02, $6c9b
-	octave2
-	note $21
-	note $01
-	note $93
-	note $81
-	note $05
-	note $21
-	note $93
-	note $81
-	note $07
-	loopchannel $02, $6ca6
-	loopchannel $00, $6c7c ; end
-; 0xeecb8
+Music_RocketHideout_Ch3: ; eec79
+	notetype $c, $19
 
-_Music_RocketHideout_Ch4: ; 0xeecb8
-	togglenoise $00
-	notetype $0c
-	stereopanning $0f
-	note $0f
-	note $0f
-	note $30
-	note $30
-	note $40
-	note $40
-	callchannel _Music_RocketHideout_sub_0xeecdb
-	callchannel _Music_RocketHideout_sub_0xeecdb
-	note $53
-	callchannel _Music_RocketHideout_sub_0xeecdb
-	note $63
-	callchannel _Music_RocketHideout_sub_0xeecdb
-	note $b3
-	callchannel _Music_RocketHideout_sub_0xeecdb
-	note $73
-	loopchannel $00, $6cc7 ; end
-; 0xeecdb
+Music_RocketHideout_branch_eec7c: ; eec7c
+	octave 2
+	note D#, 1
+	note __, 1
+	note A#, 3
+	note A_, 1
+	note __, 5
+	note D#, 1
+	note A#, 3
+	note A_, 1
+	note __, 7
+	loopchannel 6, Music_RocketHideout_branch_eec7c
 
-_Music_RocketHideout_sub_0xeecdb: ; 0xeecdb
-; subroutine
+Music_RocketHideout_branch_eec8a: ; eec8a
+	note F_, 1
+	note __, 1
+	octave 3
+	note C_, 3
+	octave 2
+	note B_, 1
+	note __, 5
+	note F_, 1
+	octave 3
+	note C_, 3
+	octave 2
+	note B_, 1
+	note __, 7
+	loopchannel 2, Music_RocketHideout_branch_eec8a
+
+Music_RocketHideout_branch_eec9b: ; eec9b
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
+	octave 3
+	note C#, 15
+	loopchannel 2, Music_RocketHideout_branch_eec9b
+
+Music_RocketHideout_branch_eeca6: ; eeca6
+	octave 2
+	note C#, 1
+	note __, 1
+	note G#, 3
+	note G_, 1
+	note __, 5
+	note C#, 1
+	note G#, 3
+	note G_, 1
+	note __, 7
+	loopchannel 2, Music_RocketHideout_branch_eeca6
+	loopchannel 0, Music_RocketHideout_branch_eec7c
+
+Music_RocketHideout_Ch4: ; eecb8
+	togglenoise $0
+	notetype $c
+	stereopanning $f
+	note __, 15
+	note __, 15
+	note D_, 0
+	note D_, 0
+	note D#, 0
+	note D#, 0
+	callchannel Music_RocketHideout_branch_eecdb
+
+Music_RocketHideout_branch_eecc7: ; eecc7
+	callchannel Music_RocketHideout_branch_eecdb
+	note E_, 3
+	callchannel Music_RocketHideout_branch_eecdb
+	note F_, 3
+	callchannel Music_RocketHideout_branch_eecdb
+	note A#, 3
+	callchannel Music_RocketHideout_branch_eecdb
+	note F#, 3
+	loopchannel 0, Music_RocketHideout_branch_eecc7
+; eecdb
+
+Music_RocketHideout_branch_eecdb: ; eecdb
 	stereopanning $f0
-	note $40
-	note $40
-	stereopanning $0f
-	note $a3
-	note $40
-	note $40
+	note D#, 0
+	note D#, 0
+	stereopanning $f
+	note A_, 3
+	note D#, 0
+	note D#, 0
 	stereopanning $f0
-	note $a3
-	endchannel ; end
-; 0xeece8
+	note A_, 3
+	endchannel
+; eece8
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -1,479 +1,490 @@
-_Music_RocketTheme: ; 0xf766d
-	db $c0
-	dw _Music_RocketTheme_Ch1
-	db $01
-	dw _Music_RocketTheme_Ch2
-	db $02
-	dw _Music_RocketTheme_Ch3
-	db $03
-	dw _Music_RocketTheme_Ch4
-; 0xf7679
+Music_RocketTheme: ; f766d
+	dbw $c0, Music_RocketTheme_Ch1
+	dbw $01, Music_RocketTheme_Ch2
+	dbw $02, Music_RocketTheme_Ch3
+	dbw $03, Music_RocketTheme_Ch4
+; f7679
 
-_Music_RocketTheme_Ch1: ; 0xf7679
-	tempo $8000
+
+Music_RocketTheme_Ch1: ; f7679
+	tempo 128
 	volume $77
-	dutycycle $03
-	stereopanning $0f
-	vibrato $05, $64
-	notetype $0c, $a8
-	octave4
-	note $10
-	note $30
-	dutycycle $03
-	notetype $0c, $a8
-	callchannel _Music_LookRocket_sub_0xf74e6
-	dutycycle $01
+	dutycycle $3
+	stereopanning $f
+	vibrato $5, $64
+	notetype $c, $a8
+	octave 4
+	note C_, 0
+	note D_, 0
+
+Music_RocketTheme_branch_f768b: ; f768b
+	dutycycle $3
+	notetype $c, $a8
+	callchannel Music_RocketTheme_branch_f74e6
+	dutycycle $1
 	intensity $a8
-	callchannel _Music_LookRocket_sub_0xf74f7
-	callchannel _Music_LookRocket_sub_0xf758a
-	octave4
-	note $70
-	note $00
+	callchannel Music_RocketTheme_branch_f74f7
+	callchannel Music_RocketTheme_branch_f758a
+	octave 4
+	note F#, 0
+	note __, 0
 	intensity $53
-	callchannel _Music_LookRocket_sub_0xf750c
+	callchannel Music_RocketTheme_branch_f750c
 	intensity $c3
-	callchannel _Music_LookRocket_sub_0xf750c
+	callchannel Music_RocketTheme_branch_f750c
 	intensity $e3
-	callchannel _Music_LookRocket_sub_0xf750c
-	note $0f
-	dutycycle $00
-	notetype $06, $b3
-	vibrato $06, $64
-	callchannel _Music_RocketTheme_sub_0xf7727
-	octave4
-	note $60
-	note $72
-	note $61
-	note $01
-	note $41
-	note $01
-	note $11
-	note $31
-	note $41
-	note $11
-	octave3
-	note $b1
-	note $81
-	note $b1
-	octave4
-	note $11
-	note $03
-	note $33
-	note $03
-	note $43
-	note $03
-	note $41
-	note $71
-	callchannel _Music_RocketTheme_sub_0xf7727
-	octave3
-	note $70
-	note $82
-	note $61
-	note $01
-	note $41
-	note $01
-	note $11
-	note $31
-	note $41
-	note $11
-	octave2
-	note $b1
-	note $81
-	note $b1
-	octave3
-	note $11
-	note $03
-	note $33
-	note $03
-	note $43
-	note $61
-	note $51
-	note $41
-	note $31
-	note $03
-	note $61
-	note $0d
-	note $71
-	note $09
-	loopchannel $03, $76ef
-	note $03
-	note $61
-	note $0d
-	note $71
-	note $01
-	note $71
-	note $01
-	note $41
-	note $11
-	note $71
-	note $a1
-	loopchannel $04, $7701
-	note $81
-	note $b1
-	loopchannel $04, $7707
-	note $91
-	note $c1
-	loopchannel $04, $770d
-	octave3
-	note $a1
-	octave4
-	note $11
-	loopchannel $04, $7713
-	notetype $0c, $b3
-	note $0f
-	note $0b
-	note $61
-	note $10
-	note $30
-	loopchannel $00, $768b ; end
-; 0xf7727
+	callchannel Music_RocketTheme_branch_f750c
+	note __, 15
+	dutycycle $0
+	notetype $6, $b3
+	vibrato $6, $64
+	callchannel Music_RocketTheme_branch_f7727
+	octave 4
+	note F_, 0
+	note F#, 2
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 4
+	note C_, 1
+	note __, 3
+	note D_, 3
+	note __, 3
+	note D#, 3
+	note __, 3
+	note D#, 1
+	note F#, 1
+	callchannel Music_RocketTheme_branch_f7727
+	octave 3
+	note F#, 0
+	note G_, 2
+	note F_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note D_, 1
+	note D#, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	note __, 3
+	note D_, 3
+	note __, 3
+	note D#, 3
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
 
-_Music_RocketTheme_sub_0xf7727: ; 0xf7727
-; subroutine
-	note $06
-	note $c0
-	octave4
-	note $11
-	note $05
-	note $11
-	note $01
-	octave3
-	note $81
-	note $05
-	octave4
-	note $4b
-	note $37
-	octave3
-	note $b1
-	note $05
-	note $81
-	note $01
-	note $a1
-	note $01
-	note $b1
-	note $09
-	endchannel ; end
-; 0xf773e
+Music_RocketTheme_branch_f76ef: ; f76ef
+	note __, 3
+	note F_, 1
+	note __, 13
+	note F#, 1
+	note __, 9
+	loopchannel 3, Music_RocketTheme_branch_f76ef
+	note __, 3
+	note F_, 1
+	note __, 13
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note D#, 1
+	note C_, 1
 
-_Music_RocketTheme_Ch2: ; 0xf773e
+Music_RocketTheme_branch_f7701: ; f7701
+	note F#, 1
+	note A_, 1
+	loopchannel 4, Music_RocketTheme_branch_f7701
+
+Music_RocketTheme_branch_f7707: ; f7707
+	note G_, 1
+	note A#, 1
+	loopchannel 4, Music_RocketTheme_branch_f7707
+
+Music_RocketTheme_branch_f770d: ; f770d
+	note G#, 1
+	note B_, 1
+	loopchannel 4, Music_RocketTheme_branch_f770d
+
+Music_RocketTheme_branch_f7713: ; f7713
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	loopchannel 4, Music_RocketTheme_branch_f7713
+	notetype $c, $b3
+	note __, 15
+	note __, 11
+	note F_, 1
+	note C_, 0
+	note D_, 0
+	loopchannel 0, Music_RocketTheme_branch_f768b
+; f7727
+
+Music_RocketTheme_branch_f7727: ; f7727
+	note __, 6
+	note B_, 0
+	octave 4
+	note C_, 1
+	note __, 5
+	note C_, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	note __, 5
+	octave 4
+	note D#, 11
+	note D_, 7
+	octave 3
+	note A#, 1
+	note __, 5
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A#, 1
+	note __, 9
+	endchannel
+
+Music_RocketTheme_Ch2: ; f773e
 	stereopanning $ff
-	vibrato $04, $64
-	dutycycle $03
-	notetype $0c, $b7
-	octave5
-	note $10
-	note $30
-	notetype $0c, $b7
-	callchannel _Music_LookRocket_sub_0xf7547
+	vibrato $4, $64
+	dutycycle $3
+	notetype $c, $b7
+	octave 5
+	note C_, 0
+	note D_, 0
+
+Music_RocketTheme_branch_f774b: ; f774b
+	notetype $c, $b7
+	callchannel Music_RocketTheme_branch_f7547
 	intensity $b7
-	callchannel _Music_LookRocket_sub_0xf758a
-	octave5
-	note $10
-	note $00
-	callchannel _Music_LookRocket_sub_0xf7554
+	callchannel Music_RocketTheme_branch_f758a
+	octave 5
+	note C_, 0
+	note __, 0
+	callchannel Music_RocketTheme_branch_f7554
 	intensity $53
-	callchannel _Music_LookRocket_sub_0xf7568
+	callchannel Music_RocketTheme_branch_f7568
 	intensity $c3
-	callchannel _Music_LookRocket_sub_0xf7568
+	callchannel Music_RocketTheme_branch_f7568
 	intensity $e3
-	callchannel _Music_LookRocket_sub_0xf7568
-	callchannel _Music_LookRocket_sub_0xf756f
-	vibrato $06, $64
-	callchannel _Music_RocketTheme_sub_0xf7800
-	octave4
-	note $a0
-	vibrato $00, $00
+	callchannel Music_RocketTheme_branch_f7568
+	callchannel Music_RocketTheme_branch_f756f
+	vibrato $6, $64
+	callchannel Music_RocketTheme_branch_f7800
+	octave 4
+	note A_, 0
+	vibrato $0, $0
 	intensity $b8
-	note $bd
-	vibrato $05, $22
+	note A#, 13
+	vibrato $5, $22
 	intensity $b7
-	note $b4
-	vibrato $06, $64
-	notetype $0c, $b7
-	note $bb
-	note $01
-	octave5
-	note $10
-	note $30
-	callchannel _Music_RocketTheme_sub_0xf7800
-	note $c0
-	vibrato $00, $00
+	note A#, 4
+	vibrato $6, $64
+	notetype $c, $b7
+	note A#, 11
+	note __, 1
+	octave 5
+	note C_, 0
+	note D_, 0
+	callchannel Music_RocketTheme_branch_f7800
+	note B_, 0
+	vibrato $0, $0
 	intensity $b8
-	octave4
-	note $1d
-	vibrato $05, $22
+	octave 4
+	note C_, 13
+	vibrato $5, $22
 	intensity $b7
-	note $14
-	vibrato $06, $64
-	notetype $0c, $b7
-	note $1b
-	octave3
-	note $b0
-	note $a0
-	note $90
-	note $80
-	notetype $06, $b7
-	callchannel _Music_RocketTheme_sub_0xf781c
-	octave4
-	note $30
-	note $48
-	note $30
-	note $20
-	note $1b
-	note $61
-	note $01
-	note $71
-	note $01
-	callchannel _Music_RocketTheme_sub_0xf781c
-	octave3
-	note $c1
-	note $01
-	octave4
-	note $11
-	note $01
-	note $31
-	note $01
-	note $47
-	note $03
-	note $31
-	note $01
-	note $11
-	octave3
-	note $81
-	note $c0
-	octave4
-	note $1e
-	note $2f
-	note $3f
-	note $4f
-	note $51
-	note $21
-	octave3
-	note $b1
-	note $81
-	octave4
-	note $61
-	note $31
-	octave3
-	note $c1
-	note $91
-	octave4
-	note $71
-	note $41
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $81
-	note $51
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $91
-	note $61
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $a1
-	note $71
-	note $41
-	note $11
-	note $b1
-	note $81
-	note $51
-	note $21
-	note $c3
-	octave5
-	note $11
-	note $31
-	loopchannel $00, $774b ; end
-; 0xf7800
+	note C_, 4
+	vibrato $6, $64
+	notetype $c, $b7
+	note C_, 11
+	octave 3
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	notetype $6, $b7
+	callchannel Music_RocketTheme_branch_f781c
+	octave 4
+	note D_, 0
+	note D#, 8
+	note D_, 0
+	note C#, 0
+	note C_, 11
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	callchannel Music_RocketTheme_branch_f781c
+	octave 3
+	note B_, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 7
+	note __, 3
+	note D_, 1
+	note __, 1
+	note C_, 1
+	octave 3
+	note G_, 1
+	note B_, 0
+	octave 4
+	note C_, 14
+	note C#, 15
+	note D_, 15
+	note D#, 15
+	note E_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	octave 4
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	octave 4
+	note F#, 1
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note G#, 1
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note A_, 1
+	note F#, 1
+	note D#, 1
+	note C_, 1
+	note A#, 1
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	note B_, 3
+	octave 5
+	note C_, 1
+	note D_, 1
+	loopchannel 0, Music_RocketTheme_branch_f774b
+; f7800
 
-_Music_RocketTheme_sub_0xf7800: ; 0xf7800
-; subroutine
-	notetype $06, $b7
-	note $06
-	octave4
-	note $30
-	note $41
-	note $05
-	note $41
-	note $01
-	note $11
-	note $05
-	note $7b
-	note $67
-	note $41
-	note $05
-	note $11
-	note $01
-	note $31
-	note $01
-	note $41
-	note $01
-	octave3
-	note $41
-	note $01
-	note $41
-	note $01
-	endchannel ; end
-; 0xf781c
+Music_RocketTheme_branch_f7800: ; f7800
+	notetype $6, $b7
+	note __, 6
+	octave 4
+	note D_, 0
+	note D#, 1
+	note __, 5
+	note D#, 1
+	note __, 1
+	note C_, 1
+	note __, 5
+	note F#, 11
+	note F_, 7
+	note D#, 1
+	note __, 5
+	note C_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	octave 3
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	endchannel
+; f781c
 
-_Music_RocketTheme_sub_0xf781c: ; 0xf781c
-; subroutine
-	octave3
-	note $c0
-	octave4
-	note $12
-	note $43
-	note $13
-	note $77
-	note $67
-	note $13
-	endchannel ; end
-; 0xf7826
+Music_RocketTheme_branch_f781c: ; f781c
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 2
+	note D#, 3
+	note C_, 3
+	note F#, 7
+	note F_, 7
+	note C_, 3
+	endchannel
 
-_Music_RocketTheme_Ch3: ; 0xf7826
+Music_RocketTheme_Ch3: ; f7826
 	stereopanning $f0
-	vibrato $04, $22
-	notetype $0c, $14
-	note $01
-	notetype $0c, $14
-	callchannel _Music_LookRocket_sub_0xf75bf
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf75fe
+	vibrato $4, $22
+	notetype $c, $14
+	note __, 1
+
+Music_RocketTheme_branch_f782f: ; f782f
+	notetype $c, $14
+	callchannel Music_RocketTheme_branch_f75bf
+	callchannel Music_RocketTheme_branch_f75fe
+	callchannel Music_RocketTheme_branch_f75fe
 	intensity $24
-	callchannel _Music_LookRocket_sub_0xf7623
+	callchannel Music_RocketTheme_branch_f7623
 	intensity $14
-	callchannel _Music_LookRocket_sub_0xf75cc
-	callchannel _Music_LookRocket_sub_0xf7623
-	callchannel _Music_LookRocket_sub_0xf75e1
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf75fe
-	callchannel _Music_LookRocket_sub_0xf7623
-	callchannel _Music_LookRocket_sub_0xf75cc
-	callchannel _Music_LookRocket_sub_0xf7623
-	callchannel _Music_LookRocket_sub_0xf75cc
-	octave3
-	note $10
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	note $20
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $b0
-	note $80
-	note $50
-	note $20
-	note $30
-	note $00
-	octave4
-	note $30
-	note $00
-	octave3
-	note $30
-	note $00
-	note $30
-	note $00
-	note $40
-	note $00
-	octave4
-	note $40
-	note $00
-	note $10
-	octave3
-	note $a0
-	note $70
-	note $40
-	note $50
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $60
-	note $00
-	octave4
-	note $30
-	note $00
-	octave3
-	note $70
-	note $00
-	octave4
-	note $40
-	note $00
-	octave3
-	note $80
-	note $00
-	octave4
-	note $50
-	note $00
-	octave3
-	note $90
-	note $00
-	octave4
-	note $60
-	note $00
-	octave3
-	note $a0
-	note $00
-	octave4
-	note $70
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave4
-	note $80
-	note $00
-	octave3
-	note $c1
-	octave4
-	note $90
-	note $00
-	loopchannel $00, $782f ; end
-; 0xf78be
+	callchannel Music_RocketTheme_branch_f75cc
+	callchannel Music_RocketTheme_branch_f7623
+	callchannel Music_RocketTheme_branch_f75e1
+	callchannel Music_RocketTheme_branch_f75fe
+	callchannel Music_RocketTheme_branch_f75fe
+	callchannel Music_RocketTheme_branch_f75fe
+	callchannel Music_RocketTheme_branch_f75fe
+	callchannel Music_RocketTheme_branch_f7623
+	callchannel Music_RocketTheme_branch_f75cc
+	callchannel Music_RocketTheme_branch_f7623
+	callchannel Music_RocketTheme_branch_f75cc
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note G_, 0
+	note E_, 0
+	note C#, 0
+	note D_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 3
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	note C_, 0
+	octave 3
+	note A_, 0
+	note F#, 0
+	note D#, 0
+	note E_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	octave 3
+	note F#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note F_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 4
+	note G#, 0
+	note __, 0
+	loopchannel 0, Music_RocketTheme_branch_f782f
 
-_Music_RocketTheme_Ch4: ; 0xf78be
-	togglenoise $03
-	notetype $0c
-	note $01
-	callchannel _Music_LookRocket_sub_0xf765c
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf765c
-	note $b1
-	note $71
-	note $31
-	note $71
-	note $b1
-	note $71
-	note $31
-	note $71
-	loopchannel $0b, $78de
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf7664
-	callchannel _Music_LookRocket_sub_0xf765c
-	callchannel _Music_LookRocket_sub_0xf765c
-	loopchannel $00, $78c3 ; end
-; 0xf78fd
+Music_RocketTheme_Ch4: ; f78be
+	togglenoise $3
+	notetype $c
+	note __, 1
+
+Music_RocketTheme_branch_f78c3: ; f78c3
+	callchannel Music_RocketTheme_branch_f765c
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f765c
+
+Music_RocketTheme_branch_f78de: ; f78de
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	note A#, 1
+	note F#, 1
+	note D_, 1
+	note F#, 1
+	loopchannel 11, Music_RocketTheme_branch_f78de
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f7664
+	callchannel Music_RocketTheme_branch_f765c
+	callchannel Music_RocketTheme_branch_f765c
+	loopchannel 0, Music_RocketTheme_branch_f78c3
+; f78fd
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -1,658 +1,654 @@
-_Music_Route1: ; 0xec000
-	db $80
-	dw _Music_Route1_Ch1
-	db $01
-	dw _Music_Route1_Ch2
-	db $02
-	dw _Music_Route1_Ch3
-; 0xec009
+Music_Route1: ; ec000
+	dbw $80, Music_Route1_Ch1
+	dbw $01, Music_Route1_Ch2
+	dbw $02, Music_Route1_Ch3
+; ec009
 
-; 0xec009
-	db $03
-; 0xec00a
+INCBIN "baserom.gbc", $ec009, $ec00a - $ec009
 
-_Music_Route1_Ch1: ; 0xec00a
-	stereopanning $0f
-	tempo $b800
+Music_Route1_Ch1: ; ec00a
+	stereopanning $f
+	tempo 184
 	volume $77
 	vibrato $16, $11
-	dutycycle $03
-	notetype $0c, $83
-	octave4
-	note $30
-	note $50
-	note $71
-	note $71
-	note $31
-	octave3
-	note $a1
-	octave4
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $31
-	octave3
-	note $a1
-	note $71
-	note $80
-	note $a0
-	note $81
-	note $51
-	note $80
-	note $50
-	octave4
-	note $30
-	note $50
-	note $71
-	note $71
-	note $31
-	octave3
-	note $a1
-	octave4
-	note $c1
-	note $a1
-	note $82
-	note $50
-	note $51
-	note $81
-	note $a1
-	note $81
-	note $71
+	dutycycle $3
+	notetype $c, $83
+	octave 4
+	note D_, 0
+	note E_, 0
+	note F#, 1
+	note F#, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note G_, 0
+	note A_, 0
+	note G_, 1
+	note E_, 1
+	note G_, 0
+	note E_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note F#, 1
+	note F#, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G_, 2
+	note E_, 0
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
 	intensity $81
-	octave5
-	note $31
-	note $31
+	octave 5
+	note D_, 1
+	note D_, 1
 	intensity $83
-	note $01
+	note __, 1
+
+Music_Route1_branch_ec04a: ; ec04a
 	intensity $83
-	note $01
-	octave4
-	note $31
-	octave3
-	note $a1
-	note $03
-	octave4
-	note $31
-	octave3
-	note $a1
-	note $01
-	note $01
-	octave4
-	note $31
-	octave3
-	note $a2
-	octave4
-	note $30
-	octave3
-	note $51
+	note __, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note __, 3
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 0
+	octave 3
+	note E_, 1
 	intensity $81
-	note $81
-	note $81
+	note G_, 1
+	note G_, 1
 	intensity $83
-	note $01
-	note $01
-	octave4
-	note $21
-	octave3
-	note $a1
-	note $03
-	octave4
-	note $21
-	octave3
-	note $a1
-	note $01
-	note $01
-	octave4
-	note $21
-	note $20
-	octave3
-	note $c0
-	note $a0
-	note $80
-	note $71
-	note $a1
-	octave4
-	note $31
-	note $01
-	note $01
-	octave3
-	note $70
-	note $80
-	note $a3
-	note $01
-	note $30
-	note $50
-	note $71
-	note $70
-	note $80
-	note $a1
-	note $a0
-	note $c0
-	note $a1
-	note $a0
-	note $c0
-	note $a1
+	note __, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
+	note __, 3
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	note C#, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	note __, 1
+	octave 3
+	note F#, 0
+	note G_, 0
+	note A_, 3
+	note __, 1
+	note D_, 0
+	note E_, 0
+	note F#, 1
+	note F#, 0
+	note G_, 0
+	note A_, 1
+	note A_, 0
+	note B_, 0
+	note A_, 1
+	note A_, 0
+	note B_, 0
+	note A_, 1
 	intensity $81
-	octave4
-	note $81
-	note $81
+	octave 4
+	note G_, 1
+	note G_, 1
 	intensity $83
-	octave3
-	note $70
-	note $50
-	note $01
-	note $50
-	note $70
-	note $85
-	note $50
-	octave2
-	note $c0
-	octave3
-	note $21
-	note $50
-	note $70
-	note $83
-	notetype $08, $83
-	note $a0
-	note $c0
-	note $a0
-	notetype $0c, $83
-	note $80
-	note $50
-	note $71
+	octave 3
+	note F#, 0
+	note E_, 0
+	note __, 1
+	note E_, 0
+	note F#, 0
+	note G_, 5
+	note E_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note C#, 1
+	note E_, 0
+	note F#, 0
+	note G_, 3
+	notetype $8, $83
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	notetype $c, $83
+	note G_, 0
+	note E_, 0
+	note F#, 1
 	intensity $81
-	octave4
-	note $a1
-	note $a1
+	octave 4
+	note A_, 1
+	note A_, 1
 	intensity $83
-	octave3
-	note $a0
-	note $80
+	octave 3
+	note A_, 0
+	note G_, 0
 	intensity $77
 	intensity $1d
-	note $73
-	note $a3
-	note $81
-	note $71
-	note $51
-	note $81
-	note $73
-	note $a2
-	note $70
-	note $51
-	note $a1
-	octave4
-	note $21
-	octave3
-	note $a0
-	note $80
-	dutycycle $02
+	note F#, 3
+	note A_, 3
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note G_, 1
+	note F#, 3
+	note A_, 2
+	note F#, 0
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 0
+	note G_, 0
+	dutycycle $2
 	intensity $87
-	octave6
-	note $73
-	note $a3
-	note $81
-	note $71
-	note $52
-	note $80
-	note $71
-	note $31
-	note $51
-	note $21
-	note $31
+	octave 6
+	note F#, 3
+	note A_, 3
+	note G_, 1
+	note F#, 1
+	note E_, 2
+	note G_, 0
+	note F#, 1
+	note D_, 1
+	note E_, 1
+	note C#, 1
+	note D_, 1
 	intensity $81
-	octave5
-	note $31
-	note $31
-	note $01
-	loopchannel $00, $404a ; end
-; 0xec0eb
+	octave 5
+	note D_, 1
+	note D_, 1
+	note __, 1
+	loopchannel 0, Music_Route1_branch_ec04a
 
-_Music_Route1_Ch2: ; 0xec0eb
+Music_Route1_Ch2: ; ec0eb
 	stereopanning $f0
 	vibrato $12, $22
-	dutycycle $02
-	notetype $0c, $92
-	octave4
-	note $70
-	note $80
-	callchannel _Music_Route1_sub_0xec198
-	octave3
-	note $a1
-	note $a1
-	octave4
-	note $70
-	note $80
-	callchannel _Music_Route1_sub_0xec1aa
-	note $21
-	note $51
-	note $31
+	dutycycle $2
+	notetype $c, $92
+	octave 4
+	note F#, 0
+	note G_, 0
+	callchannel Music_Route1_branch_ec198
+	octave 3
+	note A_, 1
+	note A_, 1
+	octave 4
+	note F#, 0
+	note G_, 0
+	callchannel Music_Route1_branch_ec1aa
+	note C#, 1
+	note E_, 1
+	note D_, 1
 	intensity $81
-	note $71
-	note $71
+	note F#, 1
+	note F#, 1
 	intensity $82
-	octave4
-	note $30
-	note $50
-	dutycycle $02
+	octave 4
+	note D_, 0
+	note E_, 0
+	dutycycle $2
+
+Music_Route1_branch_ec112: ; ec112
 	intensity $82
-	callchannel _Music_Route1_sub_0xec188
+	callchannel Music_Route1_branch_ec188
 	intensity $81
-	octave3
-	note $a1
-	note $a1
+	octave 3
+	note A_, 1
+	note A_, 1
 	intensity $82
-	octave4
-	note $20
-	note $30
-	note $51
-	note $51
-	note $51
-	note $20
-	note $30
-	note $51
-	note $51
-	note $51
-	note $20
-	note $30
-	note $51
-	note $51
-	note $70
-	note $50
-	note $50
-	note $70
-	note $31
-	note $01
-	note $71
-	note $30
-	note $50
-	callchannel _Music_Route1_sub_0xec188
+	octave 4
+	note C#, 0
+	note D_, 0
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note C#, 0
+	note D_, 0
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note C#, 0
+	note D_, 0
+	note E_, 1
+	note E_, 1
+	note F#, 0
+	note E_, 0
+	note E_, 0
+	note F#, 0
+	note D_, 1
+	note __, 1
+	note F#, 1
+	note D_, 0
+	note E_, 0
+	callchannel Music_Route1_branch_ec188
 	intensity $81
-	note $a1
-	note $a1
+	note A_, 1
+	note A_, 1
 	intensity $82
-	note $20
-	note $30
-	note $51
-	note $81
-	note $71
-	note $51
-	note $31
-	note $21
-	octave3
-	note $c1
-	note $a1
-	octave4
-	note $c3
-	notetype $08, $92
-	note $20
-	note $30
-	note $20
-	notetype $0c, $92
-	octave3
-	note $c0
-	octave4
-	note $20
-	note $31
+	note C#, 0
+	note D_, 0
+	note E_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	octave 4
+	note B_, 3
+	notetype $8, $92
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	notetype $c, $92
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D_, 1
 	intensity $81
-	octave5
-	note $31
-	note $31
+	octave 5
+	note D_, 1
+	note D_, 1
 	intensity $82
-	octave4
-	note $70
-	note $80
-	callchannel _Music_Route1_sub_0xec198
-	note $03
-	note $70
-	note $80
-	callchannel _Music_Route1_sub_0xec1aa
-	notetype $08, $92
-	note $20
-	note $30
-	note $20
-	notetype $0c, $92
-	octave4
-	note $c0
-	octave5
-	note $20
-	note $31
+	octave 4
+	note F#, 0
+	note G_, 0
+	callchannel Music_Route1_branch_ec198
+	note __, 3
+	note F#, 0
+	note G_, 0
+	callchannel Music_Route1_branch_ec1aa
+	notetype $8, $92
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	notetype $c, $92
+	octave 4
+	note B_, 0
+	octave 5
+	note C#, 0
+	note D_, 1
 	intensity $81
-	note $71
-	note $71
+	note F#, 1
+	note F#, 1
 	intensity $82
-	octave4
-	note $30
-	note $50
-	loopchannel $00, $4112 ; end
-; 0xec188
+	octave 4
+	note D_, 0
+	note E_, 0
+	loopchannel 0, Music_Route1_branch_ec112
+; ec188
 
-_Music_Route1_sub_0xec188: ; 0xec188
-; subroutine
-	note $71
-	note $71
-	note $71
-	note $30
-	note $50
-	note $71
-	note $71
-	note $71
-	note $30
-	note $50
-	note $71
-	note $71
-	note $82
-	note $70
-	note $51
-	endchannel ; end
-; 0xec198
+Music_Route1_branch_ec188: ; ec188
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note E_, 0
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note E_, 0
+	note F#, 1
+	note F#, 1
+	note G_, 2
+	note F#, 0
+	note E_, 1
+	endchannel
+; ec198
 
-_Music_Route1_sub_0xec198: ; 0xec198
-; subroutine
-	note $a1
-	note $a1
-	note $71
-	note $31
-	octave5
-	note $31
-	note $21
-	octave4
-	note $c1
-	octave5
-	note $31
-	octave4
-	note $a1
-	note $71
-	note $32
-	note $70
-	note $51
-	endchannel ; end
-; 0xec1aa
+Music_Route1_branch_ec198: ; ec198
+	note A_, 1
+	note A_, 1
+	note F#, 1
+	note D_, 1
+	octave 5
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	octave 4
+	note A_, 1
+	note F#, 1
+	note D_, 2
+	note F#, 0
+	note E_, 1
+	endchannel
+; ec1aa
 
-_Music_Route1_sub_0xec1aa: ; 0xec1aa
-; subroutine
-	note $a1
-	note $a1
-	note $71
-	note $31
-	octave5
-	note $31
-	note $21
-	octave4
-	note $c2
-	note $80
-	note $a1
-	octave5
-	note $31
-	endchannel ; end
-; 0xec1b8
+Music_Route1_branch_ec1aa: ; ec1aa
+	note A_, 1
+	note A_, 1
+	note F#, 1
+	note D_, 1
+	octave 5
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 2
+	note G_, 0
+	note A_, 1
+	octave 5
+	note D_, 1
+	endchannel
 
-_Music_Route1_Ch3: ; 0xec1b8
+Music_Route1_Ch3: ; ec1b8
 	stereopanning $ff
 	vibrato $10, $23
-	notetype $0c, $25
-	note $01
-	octave3
-	note $30
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $70
-	note $02
-	octave3
-	note $30
-	note $00
-	note $c0
-	note $00
-	octave4
-	note $80
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $30
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $30
-	note $02
-	octave3
-	note $20
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $20
-	octave3
-	note $a0
-	note $30
-	octave2
-	note $a0
-	octave3
-	note $30
-	note $70
-	octave4
-	note $30
-	octave3
-	note $a0
-	note $70
-	note $a0
-	note $80
-	note $30
-	note $80
-	note $c0
-	octave4
-	note $80
-	note $30
-	octave3
-	note $c0
-	note $80
-	octave2
-	note $a0
-	octave3
-	note $20
-	note $50
-	note $80
-	note $50
-	note $a0
-	octave4
-	note $20
-	note $80
-	note $71
-	note $a0
-	note $00
-	note $a0
-	note $02
-	octave3
-	note $30
-	note $00
-	octave4
-	note $31
-	octave3
-	note $20
-	note $00
-	octave4
-	note $21
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $c1
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	note $30
-	note $00
-	octave4
-	note $31
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $c1
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	note $20
-	note $00
-	octave4
-	note $21
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $c1
-	note $10
-	note $00
-	octave4
-	note $11
-	octave3
-	note $20
-	note $00
-	octave4
-	note $21
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave4
-	note $31
-	note $20
-	octave3
-	note $c0
-	note $a1
-	note $80
-	note $50
-	octave2
-	note $30
-	note $00
-	octave3
-	note $31
-	octave2
-	note $50
-	note $00
-	octave3
-	note $51
-	octave2
-	note $70
-	note $00
-	octave3
-	note $71
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $a1
-	octave4
-	note $31
-	note $71
-	note $51
-	octave3
-	note $50
-	note $00
-	note $50
-	note $00
-	octave4
-	note $51
-	octave3
-	note $20
-	note $00
-	octave4
-	note $21
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $c1
-	octave2
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave2
-	note $80
-	note $00
-	octave3
-	note $80
-	note $c0
-	octave4
-	note $21
-	note $50
-	note $20
-	octave3
-	note $a0
-	note $80
-	note $50
-	note $20
-	note $31
-	octave4
-	note $70
-	note $00
-	note $70
-	note $02
-	octave3
-	note $33
-	note $73
-	note $81
-	note $a1
-	note $c2
-	note $80
-	note $71
-	note $31
-	octave2
-	note $a2
-	octave3
-	note $30
-	note $a0
-	note $c0
-	note $a0
-	note $c0
-	note $a2
-	note $80
-	note $71
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $81
-	note $71
-	note $52
-	note $20
-	note $31
-	note $71
-	note $a1
-	octave4
-	note $21
-	note $31
-	octave5
-	note $a0
-	note $00
-	note $a0
-	note $02
-	loopchannel $00, $420c ; end
-; 0xec2ca
+	notetype $c, $25
+	note __, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 3
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 4
+	note G_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 3
+	note C#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note C#, 0
+	octave 3
+	note A_, 0
+	note D_, 0
+	octave 2
+	note A_, 0
+	octave 3
+	note D_, 0
+	note F#, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	note F#, 0
+	note A_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note B_, 0
+	octave 4
+	note G_, 0
+	note D_, 0
+	octave 3
+	note B_, 0
+	note G_, 0
+	octave 2
+	note A_, 0
+	octave 3
+	note C#, 0
+	note E_, 0
+	note G_, 0
+	note E_, 0
+	note A_, 0
+	octave 4
+	note C#, 0
+	note G_, 0
+	note F#, 1
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+
+Music_Route1_branch_ec20c: ; ec20c
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 4
+	note D_, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	note D_, 0
+	note __, 0
+	octave 4
+	note D_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	note C_, 0
+	note __, 0
+	octave 4
+	note C_, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note C#, 0
+	octave 3
+	note B_, 0
+	note A_, 1
+	note G_, 0
+	note E_, 0
+	octave 2
+	note D_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note E_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	octave 2
+	note F#, 0
+	note __, 0
+	octave 3
+	note F#, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	note E_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 4
+	note E_, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	octave 4
+	note C#, 1
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note B_, 0
+	octave 4
+	note C#, 1
+	note E_, 0
+	note C#, 0
+	octave 3
+	note A_, 0
+	note G_, 0
+	note E_, 0
+	note C#, 0
+	note D_, 1
+	octave 4
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 2
+	octave 3
+	note D_, 3
+	note F#, 3
+	note G_, 1
+	note A_, 1
+	note B_, 2
+	note G_, 0
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note D_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 0
+	note B_, 0
+	note A_, 2
+	note G_, 0
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 2
+	note C#, 0
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	octave 5
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	loopchannel 0, Music_Route1_branch_ec20c
+; ec2ca
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -1,461 +1,466 @@
-_Music_Route12: ; 0xec506
-	db $c0
-	dw _Music_Route12_Ch1
-	db $01
-	dw _Music_Route12_Ch2
-	db $02
-	dw _Music_Route12_Ch3
-	db $03
-	dw _Music_Route12_Ch4
-; 0xec512
+Music_Route12: ; ec506
+	dbw $c0, Music_Route12_Ch1
+	dbw $01, Music_Route12_Ch2
+	dbw $02, Music_Route12_Ch3
+	dbw $03, Music_Route12_Ch4
+; ec512
 
-_Music_Route12_Ch1: ; 0xec512
-	tempo $9400
+
+Music_Route12_Ch1: ; ec512
+	tempo 148
 	volume $77
 	vibrato $12, $34
-	tone $0100
-	stereopanning $0f
-	dutycycle $03
-	notetype $0c, $98
-	octave3
-	note $90
-	note $01
-	note $a0
-	note $97
-	octave2
-	note $c0
-	octave3
-	note $50
-	note $70
-	note $90
-	note $70
-	note $01
-	note $50
+	tone $0001
+	stereopanning $f
+	dutycycle $3
+	notetype $c, $98
+	octave 3
+	note G#, 0
+	note __, 1
+	note A_, 0
+	note G#, 7
+	octave 2
+	note B_, 0
+	octave 3
+	note E_, 0
+	note F#, 0
+	note G#, 0
+	note F#, 0
+	note __, 1
+	note E_, 0
 	intensity $97
-	note $4b
-	dutycycle $02
+	note D#, 11
+
+Music_Route12_branch_ec535: ; ec535
+	dutycycle $2
 	intensity $96
-	callchannel _Music_Route12_sub_0xec5b1
-	callchannel _Music_Route12_sub_0xec5bf
-	callchannel _Music_Route12_sub_0xec5b1
-	note $50
-	note $01
-	note $70
-	note $53
-	note $c3
-	octave4
-	note $43
-	callchannel _Music_Route12_sub_0xec5b1
-	callchannel _Music_Route12_sub_0xec5bf
-	callchannel _Music_Route12_sub_0xec5b1
+	callchannel Music_Route12_branch_ec5b1
+	callchannel Music_Route12_branch_ec5bf
+	callchannel Music_Route12_branch_ec5b1
+	note E_, 0
+	note __, 1
+	note F#, 0
+	note E_, 3
+	note B_, 3
+	octave 4
+	note D#, 3
+	callchannel Music_Route12_branch_ec5b1
+	callchannel Music_Route12_branch_ec5bf
+	callchannel Music_Route12_branch_ec5b1
 	intensity $92
-	octave4
-	note $50
-	octave3
-	note $c0
-	note $90
-	note $50
-	octave4
-	note $40
-	octave3
-	note $c0
-	note $90
-	note $40
-	octave4
-	note $30
-	octave3
-	note $c0
-	note $90
-	note $30
-	note $20
-	note $60
-	note $90
-	note $c0
-	dutycycle $03
+	octave 4
+	note E_, 0
+	octave 3
+	note B_, 0
+	note G#, 0
+	note E_, 0
+	octave 4
+	note D#, 0
+	octave 3
+	note B_, 0
+	note G#, 0
+	note D#, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note B_, 0
+	note G#, 0
+	note D_, 0
+	note C#, 0
+	note F_, 0
+	note G#, 0
+	note B_, 0
+	dutycycle $3
 	intensity $7f
-	octave4
-	note $22
-	octave3
-	note $c2
-	note $a0
-	note $00
-	note $a3
-	octave4
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $20
-	octave3
-	note $c0
-	note $a3
-	note $91
-	note $71
-	note $91
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $c2
-	note $a2
-	note $90
-	note $00
-	note $93
-	note $c1
-	note $a1
-	note $c0
-	note $a0
-	note $93
-	note $71
-	note $51
-	note $71
-	note $81
-	note $51
-	note $42
-	note $72
-	note $41
-	note $57
-	note $77
-	note $43
-	note $73
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 0
+	note __, 0
+	note A_, 3
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	note A_, 3
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 0
+	note __, 0
+	note G#, 3
+	note B_, 1
+	note A_, 1
+	note B_, 0
+	note A_, 0
+	note G#, 3
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 1
+	note D#, 2
+	note F#, 2
+	note D#, 1
+	note E_, 7
+	note F#, 7
+	note D#, 3
+	note F#, 3
+
+Music_Route12_branch_ec59b: ; ec59b
 	intensity $97
-	note $90
-	note $a0
-	note $c3
-	octave2
-	note $c0
-	octave3
-	note $40
-	note $50
-	note $00
-	note $50
-	note $70
-	note $93
-	loopchannel $02, $459b
-	loopchannel $00, $4535 ; end
-; 0xec5b1
+	note G#, 0
+	note A_, 0
+	note B_, 3
+	octave 2
+	note B_, 0
+	octave 3
+	note D#, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note F#, 0
+	note G#, 3
+	loopchannel 2, Music_Route12_branch_ec59b
+	loopchannel 0, Music_Route12_branch_ec535
+; ec5b1
 
-_Music_Route12_sub_0xec5b1: ; 0xec5b1
-; subroutine
-	octave3
-	note $90
-	note $00
-	note $50
-	note $00
-	octave2
-	note $c0
-	note $00
-	note $c0
-	octave3
-	note $40
-	note $53
-	note $93
-	endchannel ; end
-; 0xec5bf
+Music_Route12_branch_ec5b1: ; ec5b1
+	octave 3
+	note G#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	note B_, 0
+	octave 3
+	note D#, 0
+	note E_, 3
+	note G#, 3
+	endchannel
+; ec5bf
 
-_Music_Route12_sub_0xec5bf: ; 0xec5bf
-; subroutine
-	note $a0
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	note $70
-	note $90
-	note $a3
-	note $73
-	endchannel ; end
-; 0xec5ca
+Music_Route12_branch_ec5bf: ; ec5bf
+	note A_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note G#, 0
+	note A_, 3
+	note F#, 3
+	endchannel
 
-_Music_Route12_Ch2: ; 0xec5ca
-	dutycycle $03
+Music_Route12_Ch2: ; ec5ca
+	dutycycle $3
 	vibrato $12, $34
-	notetype $0c, $b8
-	octave4
-	note $50
-	note $01
-	note $70
-	note $5b
-	octave3
-	note $c0
-	note $01
-	octave4
-	note $10
+	notetype $c, $b8
+	octave 4
+	note E_, 0
+	note __, 1
+	note F#, 0
+	note E_, 11
+	octave 3
+	note B_, 0
+	note __, 1
+	octave 4
+	note C_, 0
 	intensity $b7
-	octave3
-	note $c7
-	note $40
-	note $70
-	note $c0
-	octave4
-	note $40
-	dutycycle $03
+	octave 3
+	note B_, 7
+	note D#, 0
+	note F#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+
+Music_Route12_branch_ec5e5: ; ec5e5
+	dutycycle $3
 	intensity $b7
-	callchannel _Music_Route12_sub_0xec647
-	note $70
-	note $a0
-	note $90
-	note $70
-	note $91
-	note $00
-	note $50
-	octave3
-	note $cb
-	dutycycle $02
-	octave2
-	note $c0
-	note $01
-	octave3
-	note $10
-	octave2
-	note $c3
-	octave3
-	note $43
-	note $73
-	dutycycle $03
-	callchannel _Music_Route12_sub_0xec647
-	note $a0
-	octave5
-	note $20
-	octave4
-	note $c0
-	note $a0
-	note $c1
-	note $00
-	note $a0
+	callchannel Music_Route12_branch_ec647
+	note F#, 0
+	note A_, 0
+	note G#, 0
+	note F#, 0
+	note G#, 1
+	note __, 0
+	note E_, 0
+	octave 3
+	note B_, 11
+	dutycycle $2
+	octave 2
+	note B_, 0
+	note __, 1
+	octave 3
+	note C_, 0
+	octave 2
+	note B_, 3
+	octave 3
+	note D#, 3
+	note F#, 3
+	dutycycle $3
+	callchannel Music_Route12_branch_ec647
+	note A_, 0
+	octave 5
+	note C#, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note B_, 1
+	note __, 0
+	note A_, 0
 	intensity $b8
-	note $95
+	note G#, 5
 	intensity $b7
-	note $95
+	note G#, 5
 	intensity $6f
-	note $9f
-	dutycycle $02
+	note G#, 15
+	dutycycle $2
 	intensity $a8
-	note $a2
-	note $92
-	note $70
-	note $00
-	note $77
+	note A_, 2
+	note G#, 2
+	note F#, 0
+	note __, 0
+	note F#, 7
 	intensity $a7
-	note $79
-	note $01
-	note $73
+	note F#, 9
+	note __, 1
+	note F#, 3
 	intensity $a8
-	note $92
-	note $72
-	note $50
-	note $00
-	note $57
+	note G#, 2
+	note F#, 2
+	note E_, 0
+	note __, 0
+	note E_, 7
 	intensity $a7
-	note $59
-	note $01
-	note $53
-	note $72
-	note $42
-	octave3
-	note $c1
+	note E_, 9
+	note __, 1
+	note E_, 3
+	note F#, 2
+	note D#, 2
+	octave 3
+	note B_, 1
 	intensity $a8
-	octave4
-	note $c7
-	note $c7
-	note $a7
-	note $90
-	note $70
-	note $5d
-	note $59
+	octave 4
+	note B_, 7
+	note B_, 7
+	note A_, 7
+	note G#, 0
+	note F#, 0
+	note E_, 13
+	note E_, 9
 	intensity $a4
-	note $55
-	loopchannel $00, $45e5 ; end
-; 0xec647
+	note E_, 5
+	loopchannel 0, Music_Route12_branch_ec5e5
+; ec647
 
-_Music_Route12_sub_0xec647: ; 0xec647
-; subroutine
-	octave4
-	note $55
+Music_Route12_branch_ec647: ; ec647
+	octave 4
+	note E_, 5
 	intensity $b1
-	octave3
-	note $c0
-	note $c0
+	octave 3
+	note B_, 0
+	note B_, 0
 	intensity $b7
-	note $c3
-	octave4
-	note $c3
-	note $a3
-	note $93
-	note $73
-	endchannel ; end
-; 0xec657
+	note B_, 3
+	octave 4
+	note B_, 3
+	note A_, 3
+	note G#, 3
+	note F#, 3
+	endchannel
 
-_Music_Route12_Ch3: ; 0xec657
+Music_Route12_Ch3: ; ec657
 	vibrato $12, $54
-	notetype $0c, $16
-	octave3
-	note $91
-	note $03
-	note $90
-	note $a0
-	note $c1
-	note $01
-	note $53
-	note $41
-	note $03
-	note $40
-	note $50
-	note $71
-	note $01
-	note $43
-	callchannel _Music_Route12_sub_0xec6b4
-	note $70
-	note $00
-	note $50
-	note $02
-	note $40
-	note $50
-	note $73
-	octave2
-	note $c3
-	callchannel _Music_Route12_sub_0xec6b4
-	note $50
-	note $00
-	note $c0
-	note $02
-	octave2
-	note $c0
-	octave3
-	note $20
-	note $33
-	note $63
-	note $7c
-	note $00
-	note $70
-	note $90
-	note $a4
-	note $00
-	note $a0
-	note $c0
-	octave4
-	note $13
-	octave3
-	note $73
-	note $5d
-	note $90
-	note $a0
-	note $c5
-	note $50
-	note $70
-	note $83
-	note $53
-	octave2
-	note $c4
-	note $00
-	note $c0
-	octave3
-	note $40
-	note $77
-	note $57
-	note $73
-	note $43
-	note $50
-	note $00
-	note $50
-	note $02
-	note $50
-	note $70
-	note $93
-	note $52
-	note $00
-	loopchannel $02, $46a3
-	loopchannel $00, $466c ; end
-; 0xec6b4
+	notetype $c, $16
+	octave 3
+	note G#, 1
+	note __, 3
+	note G#, 0
+	note A_, 0
+	note B_, 1
+	note __, 1
+	note E_, 3
+	note D#, 1
+	note __, 3
+	note D#, 0
+	note E_, 0
+	note F#, 1
+	note __, 1
+	note D#, 3
 
-_Music_Route12_sub_0xec6b4: ; 0xec6b4
-; subroutine
-	octave3
-	note $50
-	note $00
-	note $50
-	note $02
-	note $50
-	note $70
-	note $93
-	note $53
-	note $30
-	note $00
-	note $30
-	note $02
-	note $30
-	note $50
-	note $73
-	note $33
-	note $50
-	note $00
-	note $50
-	note $02
-	note $50
-	note $70
-	note $93
-	note $53
-	endchannel ; end
-; 0xec6ce
+Music_Route12_branch_ec66c: ; ec66c
+	callchannel Music_Route12_branch_ec6b4
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note D#, 0
+	note E_, 0
+	note F#, 3
+	octave 2
+	note B_, 3
+	callchannel Music_Route12_branch_ec6b4
+	note E_, 0
+	note __, 0
+	note B_, 0
+	note __, 2
+	octave 2
+	note B_, 0
+	octave 3
+	note C#, 0
+	note D_, 3
+	note F_, 3
+	note F#, 12
+	note __, 0
+	note F#, 0
+	note G#, 0
+	note A_, 4
+	note __, 0
+	note A_, 0
+	note B_, 0
+	octave 4
+	note C_, 3
+	octave 3
+	note F#, 3
+	note E_, 13
+	note G#, 0
+	note A_, 0
+	note B_, 5
+	note E_, 0
+	note F#, 0
+	note G_, 3
+	note E_, 3
+	octave 2
+	note B_, 4
+	note __, 0
+	note B_, 0
+	octave 3
+	note D#, 0
+	note F#, 7
+	note E_, 7
+	note F#, 3
+	note D#, 3
 
-_Music_Route12_Ch4: ; 0xec6ce
-	togglenoise $04
+Music_Route12_branch_ec6a3: ; ec6a3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note F#, 0
+	note G#, 3
+	note E_, 2
+	note __, 0
+	loopchannel 2, Music_Route12_branch_ec6a3
+	loopchannel 0, Music_Route12_branch_ec66c
+; ec6b4
+
+Music_Route12_branch_ec6b4: ; ec6b4
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note F#, 0
+	note G#, 3
+	note E_, 3
+	note D_, 0
+	note __, 0
+	note D_, 0
+	note __, 2
+	note D_, 0
+	note E_, 0
+	note F#, 3
+	note D_, 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note F#, 0
+	note G#, 3
+	note E_, 3
+	endchannel
+
+Music_Route12_Ch4: ; ec6ce
+	togglenoise $4
 	stereopanning $f0
-	notetype $0c
-	note $c9
-	note $20
-	note $20
-	note $33
-	note $c5
-	note $20
-	note $20
-	note $33
-	notetype $06
-	callchannel _Music_Route12_sub_0xec717
-	note $33
-	note $37
-	note $21
-	note $21
-	note $37
-	callchannel _Music_Route12_sub_0xec717
-	loopchannel $08, $46e1
-	notetype $0c
-	note $c9
-	note $30
-	note $30
-	note $35
-	note $20
-	note $20
-	note $35
-	note $20
-	note $20
-	note $33
-	loopchannel $02, $46ed
-	note $cf
-	notetype $06
-	callchannel _Music_Route12_sub_0xec717
-	callchannel _Music_Route12_sub_0xec717
-	note $cf
-	note $33
-	note $37
-	note $21
-	note $21
-	note $37
-	callchannel _Music_Route12_sub_0xec717
-	loopchannel $02, $4707
-	loopchannel $00, $46e1 ; end
-; 0xec717
+	notetype $c
+	note B_, 9
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	note B_, 5
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	notetype $6
+	callchannel Music_Route12_branch_ec717
 
-_Music_Route12_sub_0xec717: ; 0xec717
-; subroutine
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	endchannel ; end
-; 0xec720
+Music_Route12_branch_ec6e1: ; ec6e1
+	note D_, 3
+	note D_, 7
+	note C#, 1
+	note C#, 1
+	note D_, 7
+	callchannel Music_Route12_branch_ec717
+	loopchannel 8, Music_Route12_branch_ec6e1
+
+Music_Route12_branch_ec6ed: ; ec6ed
+	notetype $c
+	note B_, 9
+	note D_, 0
+	note D_, 0
+	note D_, 5
+	note C#, 0
+	note C#, 0
+	note D_, 5
+	note C#, 0
+	note C#, 0
+	note D_, 3
+	loopchannel 2, Music_Route12_branch_ec6ed
+	note B_, 15
+	notetype $6
+	callchannel Music_Route12_branch_ec717
+	callchannel Music_Route12_branch_ec717
+	note B_, 15
+
+Music_Route12_branch_ec707: ; ec707
+	note D_, 3
+	note D_, 7
+	note C#, 1
+	note C#, 1
+	note D_, 7
+	callchannel Music_Route12_branch_ec717
+	loopchannel 2, Music_Route12_branch_ec707
+	loopchannel 0, Music_Route12_branch_ec6e1
+; ec717
+
+Music_Route12_branch_ec717: ; ec717
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	endchannel
+; ec720
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -1,533 +1,534 @@
-_Music_Route2: ; 0xed8dd
-	db $c0
-	dw _Music_Route2_Ch1
-	db $01
-	dw _Music_Route2_Ch2
-	db $02
-	dw _Music_Route2_Ch3
-	db $03
-	dw _Music_Route2_Ch4
-; 0xed8e9
+Music_Route2: ; ed8dd
+	dbw $c0, Music_Route2_Ch1
+	dbw $01, Music_Route2_Ch2
+	dbw $02, Music_Route2_Ch3
+	dbw $03, Music_Route2_Ch4
+; ed8e9
 
-_Music_Route2_Ch1: ; 0xed8e9
-	tempo $9700
+
+Music_Route2_Ch1: ; ed8e9
+	tempo 151
 	volume $77
-	stereopanning $0f
-	vibrato $06, $23
-	notetype $0c, $b1
-	note $0f
-	note $0f
-	callchannel _Music_Route2_sub_0xed931
+	stereopanning $f
+	vibrato $6, $23
+	notetype $c, $b1
+	note __, 15
+	note __, 15
+	callchannel Music_Route2_branch_ed931
+
+Music_Route2_branch_ed8fb: ; ed8fb
 	intensity $b1
-	octave3
-	note $c3
-	note $c3
-	note $c3
-	note $c3
-	octave4
-	note $53
-	note $53
-	note $53
-	note $53
-	callchannel _Music_Route2_sub_0xed931
-	callchannel _Music_Route2_sub_0xed940
-	callchannel _Music_Route2_sub_0xed940
-	callchannel _Music_Route2_sub_0xed971
-	octave3
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $11
-	note $61
-	note $31
-	octave3
-	note $c1
-	note $81
-	callchannel _Music_Route2_sub_0xed971
-	note $81
-	octave4
-	note $11
-	note $31
-	note $81
-	note $61
-	note $31
-	octave3
-	note $c1
-	note $81
-	loopchannel $00, $58fb ; end
-; 0xed931
+	octave 3
+	note B_, 3
+	note B_, 3
+	note B_, 3
+	note B_, 3
+	octave 4
+	note E_, 3
+	note E_, 3
+	note E_, 3
+	note E_, 3
+	callchannel Music_Route2_branch_ed931
+	callchannel Music_Route2_branch_ed940
+	callchannel Music_Route2_branch_ed940
+	callchannel Music_Route2_branch_ed971
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	callchannel Music_Route2_branch_ed971
+	note G_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	loopchannel 0, Music_Route2_branch_ed8fb
+; ed931
 
-_Music_Route2_sub_0xed931: ; 0xed931
-; subroutine
-	octave4
-	note $13
-	note $13
-	note $13
-	note $13
-	note $13
-	note $13
+Music_Route2_branch_ed931: ; ed931
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	note C_, 3
 	intensity $b7
-	note $13
-	octave3
-	note $c3
+	note C_, 3
+	octave 3
+	note B_, 3
 	intensity $b1
-	endchannel ; end
-; 0xed940
+	endchannel
+; ed940
 
-_Music_Route2_sub_0xed940: ; 0xed940
-; subroutine
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	note $51
-	note $b1
-	note $51
-	note $b1
-	note $51
-	note $b1
-	note $51
-	note $b1
-	note $11
-	note $a1
-	note $11
-	note $a1
-	note $11
-	note $a1
-	note $11
-	note $a1
-	note $11
-	note $91
-	note $11
-	note $91
+Music_Route2_branch_ed940: ; ed940
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	note A#, 1
+	note E_, 1
+	note A#, 1
+	note E_, 1
+	note A#, 1
+	note E_, 1
+	note A#, 1
+	note C_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note C_, 1
+	note A_, 1
+	note C_, 1
+	note G#, 1
+	note C_, 1
+	note G#, 1
 	intensity $b7
-	octave2
-	note $c1
-	octave3
-	note $91
-	octave2
-	note $c1
-	octave3
-	note $81
+	octave 2
+	note B_, 1
+	octave 3
+	note G#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note G_, 1
 	intensity $b1
-	endchannel ; end
-; 0xed971
+	endchannel
+; ed971
 
-_Music_Route2_sub_0xed971: ; 0xed971
-; subroutine
-	note $c1
-	note $81
-	note $c1
-	note $81
-	note $c1
-	note $91
-	note $c1
-	note $91
-	octave4
-	note $51
-	note $11
-	note $51
-	note $11
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $a1
-	endchannel ; end
-; 0xed996
+Music_Route2_branch_ed971: ; ed971
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	note G#, 1
+	octave 4
+	note E_, 1
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	endchannel
 
-_Music_Route2_Ch2: ; 0xed996
+Music_Route2_Ch2: ; ed996
 	stereopanning $ff
-	vibrato $08, $24
-	notetype $0c, $b2
-	callchannel _Music_Route2_sub_0xed9ba
+	vibrato $8, $24
+	notetype $c, $b2
+	callchannel Music_Route2_branch_ed9ba
+
+Music_Route2_branch_ed9a1: ; ed9a1
 	intensity $b2
-	callchannel _Music_Route2_sub_0xed9ba
-	dutycycle $02
+	callchannel Music_Route2_branch_ed9ba
+	dutycycle $2
 	intensity $b5
-	callchannel _Music_Route2_sub_0xed9dc
-	callchannel _Music_Route2_sub_0xed9dc
-	callchannel _Music_Route2_sub_0xeda02
-	callchannel _Music_Route2_sub_0xeda02
-	loopchannel $00, $59a1 ; end
-; 0xed9ba
+	callchannel Music_Route2_branch_ed9dc
+	callchannel Music_Route2_branch_ed9dc
+	callchannel Music_Route2_branch_eda02
+	callchannel Music_Route2_branch_eda02
+	loopchannel 0, Music_Route2_branch_ed9a1
+; ed9ba
 
-_Music_Route2_sub_0xed9ba: ; 0xed9ba
-; subroutine
-	octave4
-	note $53
-	note $53
-	note $51
-	octave2
-	note $11
-	octave4
-	note $51
-	octave2
-	note $11
-	octave4
-	note $b3
-	note $b3
-	note $b1
-	octave2
-	note $81
-	octave4
-	note $b1
-	octave2
-	note $81
-	octave4
-	note $a3
-	note $a3
-	note $a3
-	note $a3
-	note $93
-	note $93
+Music_Route2_branch_ed9ba: ; ed9ba
+	octave 4
+	note E_, 3
+	note E_, 3
+	note E_, 1
+	octave 2
+	note C_, 1
+	octave 4
+	note E_, 1
+	octave 2
+	note C_, 1
+	octave 4
+	note A#, 3
+	note A#, 3
+	note A#, 1
+	octave 2
+	note G_, 1
+	octave 4
+	note A#, 1
+	octave 2
+	note G_, 1
+	octave 4
+	note A_, 3
+	note A_, 3
+	note A_, 3
+	note A_, 3
+	note G#, 3
+	note G#, 3
 	intensity $b7
-	note $93
-	note $83
+	note G#, 3
+	note G_, 3
 	intensity $b2
-	endchannel ; end
-; 0xed9dc
+	endchannel
+; ed9dc
 
-_Music_Route2_sub_0xed9dc: ; 0xed9dc
-; subroutine
-	octave2
-	note $13
-	note $01
-	note $10
-	note $00
-	note $10
-	note $00
-	note $11
-	note $01
-	note $10
-	note $00
-	note $83
-	note $01
-	note $80
-	note $00
-	note $80
-	note $00
-	note $81
-	note $01
-	note $80
-	note $00
-	note $63
-	note $01
-	note $60
-	note $00
-	note $60
-	note $00
-	note $61
-	note $01
-	note $60
-	note $00
-	note $63
-	note $01
-	note $60
-	note $00
-	note $63
-	note $33
-	endchannel ; end
-; 0xeda02
+Music_Route2_branch_ed9dc: ; ed9dc
+	octave 2
+	note C_, 3
+	note __, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 3
+	note D_, 3
+	endchannel
+; eda02
 
-_Music_Route2_sub_0xeda02: ; 0xeda02
-; subroutine
-	octave2
-	note $53
-	note $01
-	note $50
-	note $00
-	note $50
-	note $00
-	note $51
-	note $01
-	note $50
-	note $00
-	note $a3
-	note $01
-	note $a0
-	note $00
-	note $90
-	note $00
-	note $91
-	note $01
-	note $90
-	note $00
-	note $63
-	note $01
-	note $60
-	note $00
-	note $70
-	note $00
-	note $71
-	note $01
-	note $70
-	note $00
-	note $83
-	note $01
-	note $80
-	note $00
-	note $80
-	note $00
-	note $81
-	note $01
-	note $80
-	note $00
-	endchannel ; end
-; 0xeda2c
+Music_Route2_branch_eda02: ; eda02
+	octave 2
+	note E_, 3
+	note __, 1
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 1
+	note __, 1
+	note E_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 1
+	note __, 1
+	note F#, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	endchannel
 
-_Music_Route2_Ch3: ; 0xeda2c
+Music_Route2_Ch3: ; eda2c
 	stereopanning $f0
 	vibrato $16, $15
-	notetype $0c, $14
-	octave4
-	note $c0
-	note $02
-	note $c0
-	note $02
-	note $c0
-	note $02
-	note $c0
-	note $02
-	octave5
-	note $50
-	note $02
-	note $50
-	note $02
-	note $50
-	note $02
-	note $50
-	note $02
-	callchannel _Music_Route2_sub_0xeda9e
-	octave3
-	note $33
-	notetype $0c, $15
-	octave3
-	note $13
-	note $01
-	note $10
-	note $00
-	note $10
-	note $00
-	note $11
-	note $01
-	note $10
-	note $00
-	note $83
-	note $01
-	note $80
-	note $00
-	note $80
-	note $00
-	note $81
-	note $01
-	note $80
-	note $00
-	callchannel _Music_Route2_sub_0xeda9e
-	octave3
-	note $31
+	notetype $c, $14
+	octave 4
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 2
+	note B_, 0
+	note __, 2
+	octave 5
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	callchannel Music_Route2_branch_eda9e
+	octave 3
+	note D_, 3
+
+Music_Route2_branch_eda4b: ; eda4b
+	notetype $c, $15
+	octave 3
+	note C_, 3
+	note __, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 1
+	note __, 1
+	note C_, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	callchannel Music_Route2_branch_eda9e
+	octave 3
+	note D_, 1
 	intensity $10
-	octave6
-	note $10
-	note $30
-	callchannel _Music_Route2_sub_0xedaaf
-	note $03
-	note $87
-	note $61
-	note $81
-	notetype $0c, $10
-	callchannel _Music_Route2_sub_0xedaaf
-	note $0f
+	octave 6
+	note C_, 0
+	note D_, 0
+	callchannel Music_Route2_branch_edaaf
+	note __, 3
+	note G_, 7
+	note F_, 1
+	note G_, 1
+	notetype $c, $10
+	callchannel Music_Route2_branch_edaaf
+	note __, 15
 	intensity $25
-	callchannel _Music_Route2_sub_0xedacb
-	note $03
-	note $40
-	note $56
-	note $33
-	octave5
-	note $c0
-	octave6
-	note $12
-	octave5
-	note $c3
-	note $a3
-	note $c7
-	note $83
-	octave6
-	note $a3
-	note $83
-	callchannel _Music_Route2_sub_0xedacb
-	note $03
-	note $90
-	note $a6
-	note $c3
-	note $70
-	note $8f
-	note $8e
-	loopchannel $00, $5a4b ; end
-; 0xeda9e
+	callchannel Music_Route2_branch_edacb
+	note __, 3
+	note D#, 0
+	note E_, 6
+	note D_, 3
+	octave 5
+	note B_, 0
+	octave 6
+	note C_, 2
+	octave 5
+	note B_, 3
+	note A_, 3
+	note B_, 7
+	note G_, 3
+	octave 6
+	note A_, 3
+	note G_, 3
+	callchannel Music_Route2_branch_edacb
+	note __, 3
+	note G#, 0
+	note A_, 6
+	note B_, 3
+	note F#, 0
+	note G_, 15
+	note G_, 14
+	loopchannel 0, Music_Route2_branch_eda4b
+; eda9e
 
-_Music_Route2_sub_0xeda9e: ; 0xeda9e
-; subroutine
-	octave3
-	note $63
-	note $01
-	note $60
-	note $00
-	note $60
-	note $00
-	note $61
-	note $01
-	note $60
-	note $00
-	note $63
-	note $01
-	note $60
-	note $00
-	note $63
-	endchannel ; end
-; 0xedaaf
+Music_Route2_branch_eda9e: ; eda9e
+	octave 3
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 1
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 3
+	note __, 1
+	note F_, 0
+	note __, 0
+	note F_, 3
+	endchannel
+; edaaf
 
-_Music_Route2_sub_0xedaaf: ; 0xedaaf
-; subroutine
-	octave6
-	note $59
-	note $31
-	note $01
-	note $11
-	notetype $06, $10
-	octave5
-	note $70
-	note $8e
-	note $a3
-	note $b3
-	note $03
-	octave6
-	note $11
-	note $31
-	note $40
-	note $5f
-	note $56
-	note $63
-	note $53
-	note $40
-	note $52
-	note $33
-	note $13
-	note $33
-	endchannel ; end
-; 0xedacb
+Music_Route2_branch_edaaf: ; edaaf
+	octave 6
+	note E_, 9
+	note D_, 1
+	note __, 1
+	note C_, 1
+	notetype $6, $10
+	octave 5
+	note F#, 0
+	note G_, 14
+	note A_, 3
+	note A#, 3
+	note __, 3
+	octave 6
+	note C_, 1
+	note D_, 1
+	note D#, 0
+	note E_, 15
+	note E_, 6
+	note F_, 3
+	note E_, 3
+	note D#, 0
+	note E_, 2
+	note D_, 3
+	note C_, 3
+	note D_, 3
+	endchannel
+; edacb
 
-_Music_Route2_sub_0xedacb: ; 0xedacb
-; subroutine
-	octave5
-	note $cf
-	note $03
-	octave6
-	note $20
-	note $36
-	note $53
-	octave5
-	note $c0
-	octave6
-	note $1f
-	note $12
-	note $33
-	note $03
-	note $53
-	note $6f
-	endchannel ; end
-; 0xedadc
+Music_Route2_branch_edacb: ; edacb
+	octave 5
+	note B_, 15
+	note __, 3
+	octave 6
+	note C#, 0
+	note D_, 6
+	note E_, 3
+	octave 5
+	note B_, 0
+	octave 6
+	note C_, 15
+	note C_, 2
+	note D_, 3
+	note __, 3
+	note E_, 3
+	note F_, 15
+	endchannel
 
-_Music_Route2_Ch4: ; 0xedadc
-	togglenoise $05
-	notetype $0c
-	note $a3
-	note $a3
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	loopchannel $03, $5ae0
-	note $a3
-	note $a3
-	note $a1
-	note $a1
-	note $43
-	note $a3
-	note $a3
-	note $a1
-	note $a1
-	note $c1
-	note $a1
-	loopchannel $04, $5aef
-	note $c3
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	loopchannel $07, $5af9
-	note $c3
-	note $a3
-	note $a1
-	note $a1
-	note $43
-	note $c3
-	note $13
-	note $c1
-	note $c1
-	note $13
-	loopchannel $03, $5b09
-	note $c3
-	note $13
-	note $21
-	note $11
-	note $23
-	note $c3
-	note $13
-	note $c1
-	note $c1
-	note $13
-	loopchannel $03, $5b17
-	note $c3
-	note $13
-	note $31
-	note $31
-	note $43
-	loopchannel $00, $5aef ; end
-; 0xedb29
+Music_Route2_Ch4: ; edadc
+	togglenoise $5
+	notetype $c
+
+Music_Route2_branch_edae0: ; edae0
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	loopchannel 3, Music_Route2_branch_edae0
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note D#, 3
+
+Music_Route2_branch_edaef: ; edaef
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	loopchannel 4, Music_Route2_branch_edaef
+
+Music_Route2_branch_edaf9: ; edaf9
+	note B_, 3
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	loopchannel 7, Music_Route2_branch_edaf9
+	note B_, 3
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note D#, 3
+
+Music_Route2_branch_edb09: ; edb09
+	note B_, 3
+	note C_, 3
+	note B_, 1
+	note B_, 1
+	note C_, 3
+	loopchannel 3, Music_Route2_branch_edb09
+	note B_, 3
+	note C_, 3
+	note C#, 1
+	note C_, 1
+	note C#, 3
+
+Music_Route2_branch_edb17: ; edb17
+	note B_, 3
+	note C_, 3
+	note B_, 1
+	note B_, 1
+	note C_, 3
+	loopchannel 3, Music_Route2_branch_edb17
+	note B_, 3
+	note C_, 3
+	note D_, 1
+	note D_, 1
+	note D#, 3
+	loopchannel 0, Music_Route2_branch_edaef
+; edb29
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -1,676 +1,681 @@
-_Music_Route26: ; 0xeefb2
-	db $c0
-	dw _Music_Route26_Ch1
-	db $01
-	dw _Music_Route26_Ch2
-	db $02
-	dw _Music_Route26_Ch3
-	db $03
-	dw _Music_Route26_Ch4
-; 0xeefbe
+Music_Route26: ; eefb2
+	dbw $c0, Music_Route26_Ch1
+	dbw $01, Music_Route26_Ch2
+	dbw $02, Music_Route26_Ch3
+	dbw $03, Music_Route26_Ch4
+; eefbe
 
-_Music_Route26_Ch1: ; 0xeefbe
-	stereopanning $0f
+
+Music_Route26_Ch1: ; eefbe
+	stereopanning $f
 	vibrato $12, $23
-	tempo $9700
+	tempo 151
 	volume $77
 	vibrato $14, $23
-	dutycycle $00
-	notetype $0c, $a7
-	octave3
-	note $33
-	note $03
-	note $43
-	note $03
-	note $73
-	note $03
-	note $9b
-	notetype $08, $a7
-	octave4
-	note $11
-	octave3
-	note $91
-	note $71
-	dutycycle $00
-	notetype $0c, $a7
-	octave3
-	note $60
-	note $01
-	note $20
-	note $62
-	note $80
-	note $90
-	note $01
-	note $60
-	octave4
-	note $23
-	note $43
-	octave3
-	note $c3
-	note $a3
-	note $73
-	note $60
-	note $00
-	note $20
-	note $60
-	note $92
-	note $80
-	note $90
-	note $00
-	note $60
-	note $90
-	octave4
-	note $23
-	note $53
-	note $43
-	octave3
-	note $a3
-	note $c3
-	note $b0
-	note $00
-	note $60
-	note $b0
-	octave4
-	note $20
-	note $00
-	octave3
-	note $b0
-	octave4
-	note $20
-	note $63
-	note $20
-	note $00
-	octave3
-	note $a0
-	note $00
-	note $b3
-	note $01
-	notetype $06, $a7
-	note $b0
-	note $00
-	note $b0
-	note $00
-	note $b1
-	note $01
-	note $b1
-	note $01
-	note $81
-	note $01
-	note $81
-	note $01
-	notetype $08, $a5
-	note $91
-	octave4
-	note $21
-	note $41
-	note $95
-	note $75
-	note $45
-	note $25
-	octave3
-	note $b5
-	octave4
-	note $15
-	octave3
-	note $95
-	dutycycle $02
-	notetype $0c, $a5
-	note $a2
-	note $92
-	note $73
-	note $21
-	note $41
-	note $51
-	note $71
-	note $c3
-	note $a1
-	note $91
-	note $71
-	note $91
-	note $a1
-	note $93
-	note $73
-	note $53
-	note $43
-	octave4
-	note $21
-	octave3
-	note $c1
-	note $91
-	note $63
-	note $71
-	notetype $06, $a5
-	note $96
-	octave4
-	note $10
-	note $27
-	notetype $08, $a5
-	octave3
-	note $20
-	note $00
-	note $20
-	note $00
-	note $20
-	note $00
-	note $25
-	notetype $06, $a5
-	note $06
-	octave4
-	note $40
-	note $57
-	notetype $08, $a5
-	octave3
-	note $50
-	note $00
-	note $50
-	note $00
-	note $50
-	note $00
-	note $55
-	note $05
-	notetype $0c, $a5
-	octave2
-	note $c0
-	note $70
-	note $c0
-	octave3
-	note $50
-	note $70
-	note $50
-	note $70
-	note $c0
-	octave4
-	note $50
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $70
-	note $c0
-	note $70
-	note $50
-	octave3
-	note $c0
-	note $73
-	note $43
-	octave2
-	note $c3
-	note $03
-	loopchannel $00, $6fe0 ; end
-; 0xef09d
+	dutycycle $0
+	notetype $c, $a7
+	octave 3
+	note D_, 3
+	note __, 3
+	note D#, 3
+	note __, 3
+	note F#, 3
+	note __, 3
+	note G#, 11
+	notetype $8, $a7
+	octave 4
+	note C_, 1
+	octave 3
+	note G#, 1
+	note F#, 1
 
-_Music_Route26_Ch2: ; 0xef09d
+Music_Route26_branch_eefe0: ; eefe0
+	dutycycle $0
+	notetype $c, $a7
+	octave 3
+	note F_, 0
+	note __, 1
+	note C#, 0
+	note F_, 2
+	note G_, 0
+	note G#, 0
+	note __, 1
+	note F_, 0
+	octave 4
+	note C#, 3
+	note D#, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note F#, 3
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note F_, 0
+	note G#, 2
+	note G_, 0
+	note G#, 0
+	note __, 0
+	note F_, 0
+	note G#, 0
+	octave 4
+	note C#, 3
+	note E_, 3
+	note D#, 3
+	octave 3
+	note A_, 3
+	note B_, 3
+	note A#, 0
+	note __, 0
+	note F_, 0
+	note A#, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	octave 4
+	note C#, 0
+	note F_, 3
+	note C#, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	note A#, 3
+	note __, 1
+	notetype $6, $a7
+	note A#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	notetype $8, $a5
+	note G#, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note G#, 5
+	note F#, 5
+	note D#, 5
+	note C#, 5
+	octave 3
+	note A#, 5
+	octave 4
+	note C_, 5
+	octave 3
+	note G#, 5
+	dutycycle $2
+	notetype $c, $a5
+	note A_, 2
+	note G#, 2
+	note F#, 3
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note B_, 3
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note D#, 3
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note F_, 3
+	note F#, 1
+	notetype $6, $a5
+	note G#, 6
+	octave 4
+	note C_, 0
+	note C#, 7
+	notetype $8, $a5
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 5
+	notetype $6, $a5
+	note __, 6
+	octave 4
+	note D#, 0
+	note E_, 7
+	notetype $8, $a5
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 5
+	note __, 5
+	notetype $c, $a5
+	octave 2
+	note B_, 0
+	note F#, 0
+	note B_, 0
+	octave 3
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note B_, 0
+	octave 4
+	note E_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note F#, 0
+	note B_, 0
+	note F#, 0
+	note E_, 0
+	octave 3
+	note B_, 0
+	note F#, 3
+	note D#, 3
+	octave 2
+	note B_, 3
+	note __, 3
+	loopchannel 0, Music_Route26_branch_eefe0
+
+Music_Route26_Ch2: ; ef09d
 	stereopanning $f0
 	vibrato $14, $23
-	dutycycle $02
-	notetype $0c, $c7
-	octave1
-	note $b3
-	note $01
-	notetype $06, $c7
-	note $b0
-	note $00
-	octave2
-	note $b0
-	note $00
-	octave1
-	note $97
-	note $03
-	note $90
-	note $00
-	octave2
-	note $90
-	note $00
-	octave1
-	note $77
-	note $03
-	note $70
-	note $00
-	octave2
-	note $70
-	note $00
-	notetype $0c, $c7
-	octave1
-	note $9b
-	notetype $08, $c7
-	note $91
-	octave2
-	note $11
-	note $41
-	dutycycle $02
-	notetype $0c, $c2
-	octave2
-	note $25
-	note $20
-	note $90
-	note $21
-	note $21
-	note $91
-	note $21
-	octave1
-	note $c5
-	note $c0
-	octave2
-	note $a0
-	octave1
-	note $c1
-	note $c1
-	note $c1
-	note $c1
-	callchannel _Music_Route26_sub_0xef14e
-	note $a5
-	note $a0
-	octave2
-	note $c0
-	notetype $08, $c2
-	octave1
-	note $c1
-	note $c1
-	note $c1
-	octave2
-	note $c1
-	note $c1
-	note $c1
-	notetype $0c, $c2
-	callchannel _Music_Route26_sub_0xef14e
+	dutycycle $2
+	notetype $c, $c7
+	octave 1
+	note A#, 3
+	note __, 1
+	notetype $6, $c7
+	note A#, 0
+	note __, 0
+	octave 2
+	note A#, 0
+	note __, 0
+	octave 1
+	note G#, 7
+	note __, 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	note __, 0
+	octave 1
+	note F#, 7
+	note __, 3
+	note F#, 0
+	note __, 0
+	octave 2
+	note F#, 0
+	note __, 0
+	notetype $c, $c7
+	octave 1
+	note G#, 11
+	notetype $8, $c7
+	note G#, 1
+	octave 2
+	note C_, 1
+	note D#, 1
+
+Music_Route26_branch_ef0ce: ; ef0ce
+	dutycycle $2
+	notetype $c, $c2
+	octave 2
+	note C#, 5
+	note C#, 0
+	note G#, 0
+	note C#, 1
+	note C#, 1
+	note G#, 1
+	note C#, 1
+	octave 1
+	note B_, 5
+	note B_, 0
+	octave 2
+	note A_, 0
+	octave 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	callchannel Music_Route26_branch_ef14e
+	note A_, 5
+	note A_, 0
+	octave 2
+	note B_, 0
+	notetype $8, $c2
+	octave 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	notetype $c, $c2
+	callchannel Music_Route26_branch_ef14e
 	intensity $c7
-	octave2
-	note $73
-	note $01
-	notetype $06, $c2
-	note $71
-	note $71
-	note $73
-	note $73
-	note $43
-	note $43
-	notetype $08, $c2
-	octave2
-	note $91
-	note $91
-	note $91
-	octave1
-	note $95
-	loopchannel $03, $710e
-	octave2
-	note $91
-	note $91
-	note $91
-	notetype $0c, $c7
-	note $70
-	note $40
-	note $10
-	octave1
-	note $90
-	dutycycle $03
-	octave4
-	note $25
-	note $45
-	note $53
-	note $75
-	note $c3
-	note $a1
-	note $91
-	note $a1
-	note $95
-	note $41
-	note $01
-	note $41
-	note $91
-	note $41
-	note $61
-	note $01
-	note $61
-	note $75
-	note $93
-	note $a7
-	note $01
-	note $a1
-	note $91
-	note $71
-	note $a7
-	note $03
-	note $91
-	note $a1
-	note $cb
-	note $03
-	note $4b
-	note $40
-	note $20
-	note $10
-	note $40
-	loopchannel $00, $70ce ; end
-; 0xef14e
+	octave 2
+	note F#, 3
+	note __, 1
+	notetype $6, $c2
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	note F#, 3
+	note D#, 3
+	note D#, 3
+	notetype $8, $c2
 
-_Music_Route26_sub_0xef14e: ; 0xef14e
-; subroutine
-	note $b5
-	note $b0
-	octave2
-	note $b0
-	octave1
-	note $b1
-	note $b1
-	octave2
-	note $b1
-	octave1
-	note $b1
-	endchannel ; end
-; 0xef15a
+Music_Route26_branch_ef10e: ; ef10e
+	octave 2
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	octave 1
+	note G#, 5
+	loopchannel 3, Music_Route26_branch_ef10e
+	octave 2
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	notetype $c, $c7
+	note F#, 0
+	note D#, 0
+	note C_, 0
+	octave 1
+	note G#, 0
+	dutycycle $3
+	octave 4
+	note C#, 5
+	note D#, 5
+	note E_, 3
+	note F#, 5
+	note B_, 3
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 5
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note G#, 1
+	note D#, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note F#, 5
+	note G#, 3
+	note A_, 7
+	note __, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note A_, 7
+	note __, 3
+	note G#, 1
+	note A_, 1
+	note B_, 11
+	note __, 3
+	note D#, 11
+	note D#, 0
+	note C#, 0
+	note C_, 0
+	note D#, 0
+	loopchannel 0, Music_Route26_branch_ef0ce
+; ef14e
 
-_Music_Route26_Ch3: ; 0xef15a
+Music_Route26_branch_ef14e: ; ef14e
+	note A#, 5
+	note A#, 0
+	octave 2
+	note A#, 0
+	octave 1
+	note A#, 1
+	note A#, 1
+	octave 2
+	note A#, 1
+	octave 1
+	note A#, 1
+	endchannel
+
+Music_Route26_Ch3: ; ef15a
 	stereopanning $ff
 	vibrato $12, $23
-	notetype $0c, $14
+	notetype $c, $14
 	vibrato $18, $23
-	octave4
-	note $b3
-	note $01
-	notetype $06, $14
-	note $60
-	note $00
-	note $b0
-	note $00
-	octave5
-	note $17
-	note $03
-	octave4
-	note $90
-	note $00
-	octave5
-	note $10
-	note $00
-	note $27
-	note $03
-	octave4
-	note $b0
-	note $00
-	octave5
-	note $20
-	note $00
-	notetype $0c, $14
-	note $4b
-	notetype $08, $14
-	note $71
-	note $61
-	note $41
+	octave 4
+	note A#, 3
+	note __, 1
+	notetype $6, $14
+	note F_, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 5
+	note C_, 7
+	note __, 3
+	octave 4
+	note G#, 0
+	note __, 0
+	octave 5
+	note C_, 0
+	note __, 0
+	note C#, 7
+	note __, 3
+	octave 4
+	note A#, 0
+	note __, 0
+	octave 5
+	note C#, 0
+	note __, 0
+	notetype $c, $14
+	note D#, 11
+	notetype $8, $14
+	note F#, 1
+	note F_, 1
+	note D#, 1
+
+Music_Route26_branch_ef18a: ; ef18a
 	vibrato $18, $23
-	notetype $0c, $14
-	octave5
-	note $20
-	note $01
-	octave4
-	note $90
-	callchannel _Music_Route26_sub_0xef22f
+	notetype $c, $14
+	octave 5
+	note C#, 0
+	note __, 1
+	octave 4
+	note G#, 0
+	callchannel Music_Route26_branch_ef22f
 	vibrato $25, $13
-	note $20
-	note $00
-	octave4
-	note $90
-	octave5
-	note $20
-	callchannel _Music_Route26_sub_0xef22f
-	note $60
-	note $00
-	note $20
-	note $60
-	note $b7
-	note $b0
-	note $00
-	octave6
-	note $10
-	note $00
-	note $2b
-	note $43
-	note $27
-	note $17
-	octave5
-	note $b7
-	octave6
-	note $13
-	note $90
-	note $40
-	note $10
-	octave5
-	note $90
+	note C#, 0
+	note __, 0
+	octave 4
+	note G#, 0
+	octave 5
+	note C#, 0
+	callchannel Music_Route26_branch_ef22f
+	note F_, 0
+	note __, 0
+	note C#, 0
+	note F_, 0
+	note A#, 7
+	note A#, 0
+	note __, 0
+	octave 6
+	note C_, 0
+	note __, 0
+	note C#, 11
+	note D#, 3
+	note C#, 7
+	note C_, 7
+	octave 5
+	note A#, 7
+	octave 6
+	note C_, 3
+	note G#, 0
+	note D#, 0
+	note C_, 0
+	octave 5
+	note G#, 0
 	intensity $15
-	octave2
-	note $a0
-	note $00
-	note $a0
-	note $02
-	notetype $06, $15
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a1
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $a1
-	note $01
-	octave2
-	note $a3
-	note $c1
-	note $01
-	note $c1
-	note $05
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c1
-	note $01
-	note $c1
-	note $01
-	octave3
-	note $c1
-	note $01
-	note $a3
-	note $91
-	note $01
-	octave2
-	note $91
-	note $05
-	note $90
-	note $00
-	note $90
-	note $00
-	note $91
-	note $01
-	note $91
-	note $01
-	octave3
-	note $91
-	note $01
-	octave2
-	note $91
-	note $01
-	octave3
-	note $21
-	note $09
-	note $20
-	note $00
-	note $20
-	note $00
-	note $21
-	note $01
-	note $21
-	note $01
-	octave4
-	note $61
-	note $01
-	note $23
-	octave3
-	note $77
-	notetype $08, $15
-	octave2
-	note $70
-	note $00
-	note $70
-	note $00
-	note $70
-	note $00
-	note $75
-	note $05
-	octave4
-	note $15
-	octave3
-	note $10
-	note $00
-	note $10
-	note $00
-	note $10
-	note $00
-	note $15
-	note $05
-	notetype $0c, $15
-	octave2
-	note $cf
-	note $c7
-	octave3
-	note $73
-	note $40
-	note $00
-	octave2
-	note $90
-	octave3
-	note $10
-	loopchannel $00, $718a ; end
-; 0xef22f
+	octave 2
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	notetype $6, $15
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 2
+	note A_, 3
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 5
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note __, 1
+	note A_, 3
+	note G#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 5
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	octave 3
+	note G#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 1
+	octave 3
+	note C#, 1
+	note __, 9
+	note C#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note F_, 1
+	note __, 1
+	note C#, 3
+	octave 3
+	note F#, 7
+	notetype $8, $15
+	octave 2
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note F#, 5
+	note __, 5
+	octave 4
+	note C_, 5
+	octave 3
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	note C_, 5
+	note __, 5
+	notetype $c, $15
+	octave 2
+	note B_, 15
+	note B_, 7
+	octave 3
+	note F#, 3
+	note D#, 0
+	note __, 0
+	octave 2
+	note G#, 0
+	octave 3
+	note C_, 0
+	loopchannel 0, Music_Route26_branch_ef18a
+; ef22f
 
-_Music_Route26_sub_0xef22f: ; 0xef22f
-; subroutine
-	octave5
-	note $67
-	note $21
-	note $61
-	note $93
-	note $73
-	note $23
-	note $43
-	endchannel ; end
-; 0xef238
+Music_Route26_branch_ef22f: ; ef22f
+	octave 5
+	note F_, 7
+	note C#, 1
+	note F_, 1
+	note G#, 3
+	note F#, 3
+	note C#, 3
+	note D#, 3
+	endchannel
 
-_Music_Route26_Ch4: ; 0xef238
-	togglenoise $04
-	notetype $0c
-	note $c5
-	note $30
-	note $30
-	loopchannel $03, $723c
-	callchannel _Music_Route26_sub_0xef2b0
-	notetype $06
-	callchannel _Music_Route26_sub_0xef29a
-	callchannel _Music_Route26_sub_0xef29a
-	callchannel _Music_Route26_sub_0xef2a8
-	note $3b
-	note $31
-	note $31
-	notetype $08
-	note $31
-	note $21
-	note $21
-	note $31
-	note $31
-	note $51
-	notetype $06
-	callchannel _Music_Route26_sub_0xef29a
-	callchannel _Music_Route26_sub_0xef29a
-	notetype $08
-	note $31
-	note $31
-	note $31
-	note $c5
-	loopchannel $04, $7266
-	notetype $06
-	callchannel _Music_Route26_sub_0xef2a8
-	callchannel _Music_Route26_sub_0xef2a8
-	callchannel _Music_Route26_sub_0xef29a
-	callchannel _Music_Route26_sub_0xef2a8
-	notetype $06
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	notetype $08
-	note $31
-	note $31
-	note $31
-	note $cb
-	loopchannel $02, $727c
-	notetype $0c
-	note $cf
-	callchannel _Music_Route26_sub_0xef2b0
-	loopchannel $00, $7246 ; end
-; 0xef29a
+Music_Route26_Ch4: ; ef238
+	togglenoise $4
+	notetype $c
 
-_Music_Route26_sub_0xef29a: ; 0xef29a
-; subroutine
-	note $5b
-	note $31
-	note $31
-	note $33
-	note $33
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	endchannel ; end
-; 0xef2a8
+Music_Route26_branch_ef23c: ; ef23c
+	note B_, 5
+	note D_, 0
+	note D_, 0
+	loopchannel 3, Music_Route26_branch_ef23c
+	callchannel Music_Route26_branch_ef2b0
 
-_Music_Route26_sub_0xef2a8: ; 0xef2a8
-; subroutine
-	note $5b
-	note $31
-	note $31
-	note $33
-	note $33
-	note $53
-	note $33
-	endchannel ; end
-; 0xef2b0
+Music_Route26_branch_ef246: ; ef246
+	notetype $6
+	callchannel Music_Route26_branch_ef29a
+	callchannel Music_Route26_branch_ef29a
+	callchannel Music_Route26_branch_ef2a8
+	note D_, 11
+	note D_, 1
+	note D_, 1
+	notetype $8
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note D_, 1
+	note D_, 1
+	note E_, 1
+	notetype $6
+	callchannel Music_Route26_branch_ef29a
+	callchannel Music_Route26_branch_ef29a
+	notetype $8
 
-_Music_Route26_sub_0xef2b0: ; 0xef2b0
-; subroutine
-	notetype $06
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	notetype $08
-	note $31
-	note $31
-	note $51
-	endchannel ; end
-; 0xef2d0
+Music_Route26_branch_ef266: ; ef266
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note B_, 5
+	loopchannel 4, Music_Route26_branch_ef266
+	notetype $6
+	callchannel Music_Route26_branch_ef2a8
+	callchannel Music_Route26_branch_ef2a8
+	callchannel Music_Route26_branch_ef29a
+	callchannel Music_Route26_branch_ef2a8
+
+Music_Route26_branch_ef27c: ; ef27c
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	notetype $8
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note B_, 11
+	loopchannel 2, Music_Route26_branch_ef27c
+	notetype $c
+	note B_, 15
+	callchannel Music_Route26_branch_ef2b0
+	loopchannel 0, Music_Route26_branch_ef246
+; ef29a
+
+Music_Route26_branch_ef29a: ; ef29a
+	note E_, 11
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 3
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	endchannel
+; ef2a8
+
+Music_Route26_branch_ef2a8: ; ef2a8
+	note E_, 11
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 3
+	note E_, 3
+	note D_, 3
+	endchannel
+; ef2b0
+
+Music_Route26_branch_ef2b0: ; ef2b0
+	notetype $6
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	notetype $8
+	note D_, 1
+	note D_, 1
+	note E_, 1
+	endchannel
+; ef2d0
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -1,527 +1,528 @@
-_Music_Route29: ; 0xf0386
-	db $c0
-	dw _Music_Route29_Ch1
-	db $01
-	dw _Music_Route29_Ch2
-	db $02
-	dw _Music_Route29_Ch3
-	db $03
-	dw _Music_Route29_Ch4
-; 0xf0392
+Music_Route29: ; f0386
+	dbw $c0, Music_Route29_Ch1
+	dbw $01, Music_Route29_Ch2
+	dbw $02, Music_Route29_Ch3
+	dbw $03, Music_Route29_Ch4
+; f0392
 
-_Music_Route29_Ch1: ; 0xf0392
-	tempo $9200
+
+Music_Route29_Ch1: ; f0392
+	tempo 146
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $10, $15
-	stereopanning $0f
-	notetype $0c, $b2
-	note $01
-	note $01
-	octave4
-	note $11
-	note $51
-	note $13
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $83
-	note $a1
-	note $71
-	note $13
-	octave4
-	note $31
-	octave3
-	note $c1
-	note $33
-	octave4
-	note $11
-	note $51
-	note $13
-	octave3
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $a3
-	note $a1
-	note $11
-	note $31
-	note $81
-	note $11
-	note $13
-	note $81
-	octave4
-	note $11
-	note $51
-	note $11
-	octave3
-	note $51
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $81
-	note $60
-	note $80
-	note $a1
-	note $11
-	note $71
-	note $31
-	octave4
-	note $31
-	octave3
-	note $c3
-	note $51
-	octave4
-	note $11
-	note $51
-	note $51
-	octave3
-	note $51
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	note $30
-	note $80
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $81
-	note $50
-	note $60
-	note $81
-	note $81
-	note $67
+	stereopanning $f
+	notetype $c, $b2
+	note __, 1
+
+Music_Route29_branch_f03a5: ; f03a5
+	note __, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note C_, 3
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 3
+	note A_, 1
+	note F#, 1
+	note C_, 3
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	note D_, 3
+	octave 4
+	note C_, 1
+	note E_, 1
+	note C_, 3
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 3
+	note A_, 1
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note C_, 1
+	note C_, 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note C_, 1
+	octave 3
+	note E_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note F_, 0
+	note G_, 0
+	note A_, 1
+	note C_, 1
+	note F#, 1
+	note D_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 3
+	note E_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note E_, 1
+	octave 3
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note D_, 0
+	note G_, 0
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	note E_, 0
+	note F_, 0
+	note G_, 1
+	note G_, 1
+	note F_, 7
 	intensity $b4
-	note $a3
-	octave4
-	note $11
-	octave3
-	note $a9
-	note $53
-	note $81
-	note $51
+	note A_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 9
+	note E_, 3
+	note G_, 1
+	note E_, 1
 	intensity $b2
-	note $85
+	note G_, 5
 	intensity $b4
-	note $63
-	note $a1
-	note $81
-	note $61
+	note F_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
 	intensity $b2
-	note $a3
+	note A_, 3
 	intensity $b4
-	note $23
-	note $51
-	note $83
+	note C#, 3
+	note E_, 1
+	note G_, 3
 	intensity $b3
-	note $57
+	note E_, 7
 	intensity $b4
-	note $a1
-	note $81
-	note $a1
-	octave4
-	note $13
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	octave 4
+	note C_, 3
 	intensity $b2
-	octave3
-	note $a5
+	octave 3
+	note A_, 5
 	intensity $b4
-	note $81
-	note $51
-	note $81
-	octave4
-	note $13
-	octave3
-	note $81
-	octave4
-	note $31
-	note $11
-	octave3
-	note $c1
-	note $a1
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
 	intensity $b2
-	note $83
-	note $c3
+	note G_, 3
+	note B_, 3
 	intensity $b4
-	note $81
-	note $51
-	octave4
-	note $11
-	octave3
-	note $53
-	note $51
-	octave4
-	note $11
-	octave3
-	note $51
-	note $83
-	octave4
-	note $11
-	octave3
-	note $51
+	note G_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 3
+	note E_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note G_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
 	intensity $b2
-	note $11
-	note $81
-	note $83
-	loopchannel $00, $43a5 ; end
-; 0xf044d
+	note C_, 1
+	note G_, 1
+	note G_, 3
+	loopchannel 0, Music_Route29_branch_f03a5
 
-_Music_Route29_Ch2: ; 0xf044d
-	dutycycle $03
+Music_Route29_Ch2: ; f044d
+	dutycycle $3
 	vibrato $12, $36
-	notetype $0c, $c2
-	octave4
-	note $10
-	note $30
-	callchannel _Music_Route29_sub_0xf04de
-	note $60
-	note $50
-	note $31
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $11
-	octave3
-	note $51
-	note $51
-	octave4
-	note $10
-	note $30
-	callchannel _Music_Route29_sub_0xf04de
-	note $60
-	note $50
-	note $31
-	note $31
-	octave3
-	note $c1
+	notetype $c, $c2
+	octave 4
+	note C_, 0
+	note D_, 0
+
+Music_Route29_branch_f0458: ; f0458
+	callchannel Music_Route29_branch_f04de
+	note F_, 0
+	note E_, 0
+	note D_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note E_, 1
+	note E_, 1
+	octave 4
+	note C_, 0
+	note D_, 0
+	callchannel Music_Route29_branch_f04de
+	note F_, 0
+	note E_, 0
+	note D_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
 	intensity $c4
-	octave4
-	note $17
-	octave3
-	note $a1
-	note $a1
-	octave4
-	note $11
-	note $11
-	note $61
-	note $a1
-	note $81
-	note $61
-	octave3
-	note $81
-	note $81
-	octave4
-	note $11
-	note $11
-	note $51
-	note $81
-	note $61
-	note $51
-	octave3
-	note $61
-	note $61
-	note $a1
-	note $a1
-	octave4
-	note $31
-	note $61
-	note $51
-	note $31
-	note $51
-	note $31
-	note $21
-	note $31
-	note $21
-	octave3
-	note $b1
-	note $a1
-	note $81
-	note $a1
-	note $a1
-	octave4
-	note $11
-	note $11
-	note $61
-	note $a1
-	note $81
-	note $61
-	octave3
-	note $81
-	note $81
-	octave4
-	note $11
-	note $11
-	note $51
-	note $81
-	note $61
-	note $51
-	note $61
-	note $51
-	note $31
-	note $61
+	octave 4
+	note C_, 7
+	octave 3
+	note A_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	octave 3
+	note G_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	octave 3
+	note F_, 1
+	note F_, 1
+	note A_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	octave 3
+	note G_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note F_, 1
 	intensity $c2
-	note $53
-	note $33
+	note E_, 3
+	note D_, 3
 	intensity $c4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $51
-	octave3
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $51
-	octave3
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	octave4
-	note $51
-	octave3
-	note $81
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G_, 1
 	intensity $c2
-	octave4
-	note $11
-	note $11
-	note $11
-	octave4
-	note $10
-	note $30
-	loopchannel $00, $4458 ; end
-; 0xf04de
+	octave 4
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	octave 4
+	note C_, 0
+	note D_, 0
+	loopchannel 0, Music_Route29_branch_f0458
+; f04de
 
-_Music_Route29_sub_0xf04de: ; 0xf04de
-; subroutine
-	note $51
-	note $51
-	note $81
-	note $81
-	note $11
-	note $31
-	note $51
-	note $11
-	note $60
-	note $50
-	note $31
-	octave3
-	note $c1
-	note $a1
-	note $81
-	octave4
-	note $a1
-	note $81
-	note $10
-	note $30
-	note $51
-	note $51
-	note $81
-	note $81
-	note $11
-	note $31
-	note $51
-	note $11
-	endchannel ; end
-; 0xf04fb
+Music_Route29_branch_f04de: ; f04de
+	note E_, 1
+	note E_, 1
+	note G_, 1
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note C_, 1
+	note F_, 0
+	note E_, 0
+	note D_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	octave 4
+	note A_, 1
+	note G_, 1
+	note C_, 0
+	note D_, 0
+	note E_, 1
+	note E_, 1
+	note G_, 1
+	note G_, 1
+	note C_, 1
+	note D_, 1
+	note E_, 1
+	note C_, 1
+	endchannel
 
-_Music_Route29_Ch3: ; 0xf04fb
+Music_Route29_Ch3: ; f04fb
 	stereopanning $f0
-	notetype $0c, $25
-	vibrato $09, $27
-	note $01
-	note $01
-	octave3
-	note $80
-	note $00
-	octave4
-	note $10
-	note $00
-	note $50
-	note $02
-	note $50
-	note $00
-	octave3
-	note $a0
-	note $00
-	octave4
-	note $50
-	note $00
-	octave3
-	note $60
-	note $00
-	octave4
-	note $10
-	note $02
-	octave3
-	note $a0
-	note $00
-	note $80
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $c0
-	note $00
-	note $80
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $80
-	note $00
-	octave4
-	note $10
-	note $00
-	note $50
-	note $02
-	note $10
-	note $00
-	note $50
-	note $00
-	note $50
-	note $00
-	octave3
-	note $60
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $80
-	note $00
-	note $c0
-	note $00
-	octave4
-	note $50
-	note $00
-	octave3
-	note $80
-	note $00
-	note $80
-	note $02
-	note $53
-	note $83
-	octave4
-	note $13
-	octave3
-	note $83
-	note $63
-	note $73
-	octave4
-	note $13
-	octave3
-	note $c3
-	note $53
-	note $83
-	octave4
-	note $13
-	octave3
-	note $81
-	note $51
-	note $81
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $81
-	octave4
-	note $11
-	octave3
-	note $c1
-	octave4
-	note $11
-	note $31
-	note $15
-	octave3
-	note $65
-	note $a3
-	octave4
-	note $15
-	octave3
-	note $85
-	note $a1
-	note $b1
-	note $c5
-	note $85
-	octave4
-	note $31
-	note $61
-	octave3
-	note $a5
-	note $51
-	octave4
-	note $51
-	note $21
-	octave3
-	note $a1
-	note $81
-	note $a5
-	octave4
-	note $15
-	octave3
-	note $a3
-	note $85
-	octave4
-	note $15
-	note $61
-	note $51
-	note $65
-	note $61
-	note $51
-	note $01
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $15
-	octave3
-	note $85
-	octave4
-	note $13
-	note $53
-	note $13
-	octave3
-	note $80
-	note $00
-	octave4
-	note $10
-	note $00
-	note $10
-	note $02
-	loopchannel $00, $4504 ; end
-; 0xf05a9
+	notetype $c, $25
+	vibrato $9, $27
+	note __, 1
 
-_Music_Route29_Ch4: ; 0xf05a9
-	stereopanning $0f
-	togglenoise $00
-	notetype $0c
-	note $01
-	note $01
-	note $61
-	note $65
-	note $61
-	note $61
-	note $61
-	note $01
-	note $63
-	note $63
-	note $61
-	note $63
-	loopchannel $00, $45b0 ; end
-; 0xf05bf
+Music_Route29_branch_f0504: ; f0504
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 2
+	octave 3
+	note A_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note C_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 3
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 2
+	note E_, 3
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 3
+	note F_, 3
+	note F#, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	note E_, 3
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 1
+	note E_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note C_, 5
+	octave 3
+	note F_, 5
+	note A_, 3
+	octave 4
+	note C_, 5
+	octave 3
+	note G_, 5
+	note A_, 1
+	note A#, 1
+	note B_, 5
+	note G_, 5
+	octave 4
+	note D_, 1
+	note F_, 1
+	octave 3
+	note A_, 5
+	note E_, 1
+	octave 4
+	note E_, 1
+	note C#, 1
+	octave 3
+	note A_, 1
+	note G_, 1
+	note A_, 5
+	octave 4
+	note C_, 5
+	octave 3
+	note A_, 3
+	note G_, 5
+	octave 4
+	note C_, 5
+	note F_, 1
+	note E_, 1
+	note F_, 5
+	note F_, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 5
+	octave 3
+	note G_, 5
+	octave 4
+	note C_, 3
+	note E_, 3
+	note C_, 3
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 2
+	loopchannel 0, Music_Route29_branch_f0504
+
+Music_Route29_Ch4: ; f05a9
+	stereopanning $f
+	togglenoise $0
+	notetype $c
+	note __, 1
+
+Music_Route29_branch_f05b0: ; f05b0
+	note __, 1
+	note F_, 1
+	note F_, 5
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
+	note F_, 3
+	note F_, 3
+	note F_, 1
+	note F_, 3
+	loopchannel 0, Music_Route29_branch_f05b0
+; f05bf
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -1,512 +1,514 @@
-_Music_Route3: ; 0xec2ca
-	db $c0
-	dw _Music_Route3_Ch1
-	db $01
-	dw _Music_Route3_Ch2
-	db $02
-	dw _Music_Route3_Ch3
-	db $03
-	dw _Music_Route3_Ch4
-; 0xec2d6
+Music_Route3: ; ec2ca
+	dbw $c0, Music_Route3_Ch1
+	dbw $01, Music_Route3_Ch2
+	dbw $02, Music_Route3_Ch3
+	dbw $03, Music_Route3_Ch4
+; ec2d6
 
-_Music_Route3_Ch1: ; 0xec2d6
-	stereopanning $0f
-	tempo $a000
+
+Music_Route3_Ch1: ; ec2d6
+	stereopanning $f
+	tempo 160
 	volume $77
-	notetype $0c, $91
-	note $09
-	dutycycle $00
-	vibrato $14, $06
-	octave3
-	note $20
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $60
-	note $30
-	note $60
-	note $30
-	note $60
-	note $30
-	note $60
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $70
-	note $90
-	callchannel _Music_Route3_sub_0xec3a4
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $20
-	note $50
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
+	notetype $c, $91
+	note __, 9
+	dutycycle $0
+	vibrato $14, $6
+	octave 3
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note F_, 0
+	note D_, 0
+	note F_, 0
+	note D_, 0
+	note F_, 0
+	note D_, 0
+	note F_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note F#, 0
+	note G#, 0
+
+Music_Route3_branch_ec307: ; ec307
+	callchannel Music_Route3_branch_ec3a4
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
 	intensity $6f
-	note $80
-	note $30
+	note G_, 0
+	note D_, 0
 	intensity $77
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $80
-	note $30
-	note $50
-	note $90
-	note $c3
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note E_, 0
+	note G#, 0
+	note B_, 3
 	intensity $6f
-	octave3
-	note $91
-	note $51
-	note $a1
-	note $91
-	note $a1
-	note $57
-	note $40
-	note $50
-	note $91
-	octave2
-	note $c3
-	octave3
-	note $31
-	note $51
-	note $91
-	note $c1
-	note $a0
-	note $90
-	note $62
-	note $52
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $61
+	octave 3
+	note G#, 1
+	note E_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note E_, 7
+	note D#, 0
+	note E_, 0
+	note G#, 1
+	octave 2
+	note B_, 3
+	octave 3
+	note D_, 1
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	note A_, 0
+	note G#, 0
+	note F_, 2
+	note E_, 2
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note F_, 1
 	intensity $91
-	note $70
-	note $30
-	octave2
-	note $a0
-	octave3
-	note $30
-	note $70
-	note $a0
-	note $70
-	note $a0
-	note $c0
-	note $90
-	note $50
-	note $90
-	note $50
-	note $90
-	note $c0
-	octave4
-	note $30
-	loopchannel $00, $4307 ; end
-; 0xec3a4
+	note F#, 0
+	note D_, 0
+	octave 2
+	note A_, 0
+	octave 3
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	note F#, 0
+	note A_, 0
+	note B_, 0
+	note G#, 0
+	note E_, 0
+	note G#, 0
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	loopchannel 0, Music_Route3_branch_ec307
+; ec3a4
 
-_Music_Route3_sub_0xec3a4: ; 0xec3a4
-; subroutine
-	octave3
-	note $a0
-	note $50
-	note $20
-	note $50
-	loopchannel $03, $43a4
-	note $20
-	note $50
-	note $20
-	note $50
-	note $a0
-	note $50
-	note $20
-	note $50
-	loopchannel $03, $43b1
-	note $20
-	note $50
-	note $20
-	note $50
-	note $80
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	loopchannel $03, $43bd
-	octave2
-	note $c0
-	octave3
-	note $30
-	octave2
-	note $c0
-	octave3
-	note $30
-	endchannel ; end
-; 0xec3d0
+Music_Route3_branch_ec3a4: ; ec3a4
+	octave 3
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	loopchannel 3, Music_Route3_branch_ec3a4
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
 
-_Music_Route3_Ch2: ; 0xec3d0
+Music_Route3_branch_ec3b1: ; ec3b1
+	note A_, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+	loopchannel 3, Music_Route3_branch_ec3b1
+	note C#, 0
+	note E_, 0
+	note C#, 0
+	note E_, 0
+
+Music_Route3_branch_ec3bd: ; ec3bd
+	note G_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	loopchannel 3, Music_Route3_branch_ec3bd
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note D_, 0
+	endchannel
+
+Music_Route3_Ch2: ; ec3d0
 	stereopanning $f0
-	notetype $0c, $5e
-	dutycycle $02
-	vibrato $06, $03
-	octave4
-	note $50
-	note $80
-	note $95
+	notetype $c, $5e
+	dutycycle $2
+	vibrato $6, $3
+	octave 4
+	note E_, 0
+	note G_, 0
+	note G#, 5
 	intensity $87
-	note $70
-	note $90
-	note $a0
-	note $06
-	note $23
-	note $53
-	note $33
-	octave3
-	note $c3
-	octave4
-	note $23
+	note F#, 0
+	note G#, 0
+	note A_, 0
+	note __, 6
+	note C#, 3
+	note E_, 3
+	note D_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C#, 3
 	intensity $a7
-	dutycycle $02
-	octave3
-	note $a0
-	octave4
-	note $20
-	note $50
-	note $90
+	dutycycle $2
+	octave 3
+	note A_, 0
+	octave 4
+	note C#, 0
+	note E_, 0
+	note G#, 0
+
+Music_Route3_branch_ec3f5: ; ec3f5
 	intensity $7d
-	callchannel _Music_Route3_sub_0xec443
-	note $80
-	note $c9
+	callchannel Music_Route3_branch_ec443
+	note G_, 0
+	note B_, 9
 	intensity $b7
-	note $c5
+	note B_, 5
 	intensity $7d
-	note $03
-	dutycycle $03
-	note $93
-	callchannel _Music_Route3_sub_0xec443
-	note $c0
+	note __, 3
+	dutycycle $3
+	note G#, 3
+	callchannel Music_Route3_branch_ec443
+	note B_, 0
 	intensity $7d
-	octave5
-	note $34
+	octave 5
+	note D_, 4
 	intensity $b7
-	octave5
-	note $34
-	dutycycle $00
-	octave3
-	note $30
-	note $80
-	note $c0
-	note $00
-	note $80
-	note $c0
-	octave4
-	note $33
+	octave 5
+	note D_, 4
+	dutycycle $0
+	octave 3
+	note D_, 0
+	note G_, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note B_, 0
+	octave 4
+	note D_, 3
 	intensity $8f
-	dutycycle $02
-	octave4
-	note $51
-	note $31
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $21
-	octave3
-	note $a7
-	note $90
-	note $a0
-	note $c1
-	note $53
-	octave4
-	note $57
-	note $30
-	note $20
-	note $32
-	note $22
-	octave3
-	note $a9
-	dutycycle $02
-	octave4
-	note $75
-	note $50
-	note $70
-	note $95
-	note $70
-	note $90
-	loopchannel $00, $43f5 ; end
-; 0xec443
+	dutycycle $2
+	octave 4
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 7
+	note G#, 0
+	note A_, 0
+	note B_, 1
+	note E_, 3
+	octave 4
+	note E_, 7
+	note D_, 0
+	note C#, 0
+	note D_, 2
+	note C#, 2
+	octave 3
+	note A_, 9
+	dutycycle $2
+	octave 4
+	note F#, 5
+	note E_, 0
+	note F#, 0
+	note G#, 5
+	note F#, 0
+	note G#, 0
+	loopchannel 0, Music_Route3_branch_ec3f5
+; ec443
 
-_Music_Route3_sub_0xec443: ; 0xec443
-; subroutine
-	note $a5
-	note $50
-	note $a0
-	octave5
-	note $26
+Music_Route3_branch_ec443: ; ec443
+	note A_, 5
+	note E_, 0
+	note A_, 0
+	octave 5
+	note C#, 6
 	intensity $b7
-	octave5
-	note $22
+	octave 5
+	note C#, 2
 	intensity $7d
-	octave4
-	note $51
-	note $a1
-	octave5
-	note $51
-	note $31
-	note $21
-	octave4
-	note $c1
-	note $a1
-	note $85
-	note $30
-	endchannel ; end
-; 0xec45b
+	octave 4
+	note E_, 1
+	note A_, 1
+	octave 5
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G_, 5
+	note D_, 0
+	endchannel
 
-_Music_Route3_Ch3: ; 0xec45b
+Music_Route3_Ch3: ; ec45b
 	stereopanning $ff
-	vibrato $06, $03
-	notetype $0c, $13
-	octave3
-	note $c0
-	octave4
-	note $30
-	note $55
-	note $30
-	octave3
-	note $c0
+	vibrato $6, $3
+	notetype $c, $13
+	octave 3
+	note B_, 0
+	octave 4
+	note D_, 0
+	note E_, 5
+	note D_, 0
+	octave 3
+	note B_, 0
 	intensity $14
-	octave3
-	note $a0
-	note $00
-	octave2
-	note $a1
-	note $01
-	note $a0
-	note $a0
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $a0
-	note $00
-	note $91
-	callchannel _Music_Route3_sub_0xec4bd
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	note __, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note G#, 1
+	callchannel Music_Route3_branch_ec4bd
+
+Music_Route3_branch_ec47f: ; ec47f
 	intensity $14
-	callchannel _Music_Route3_sub_0xec4bd
-	callchannel _Music_Route3_sub_0xec4bd
-	callchannel _Music_Route3_sub_0xec4ce
-	callchannel _Music_Route3_sub_0xec4bd
-	callchannel _Music_Route3_sub_0xec4bd
-	callchannel _Music_Route3_sub_0xec4ce
-	note $a1
-	octave3
-	note $21
-	note $51
-	note $a5
-	note $91
-	note $71
-	note $51
-	note $31
-	octave2
-	note $c1
-	note $91
-	note $50
-	note $00
-	note $51
-	note $c1
-	octave3
-	note $51
-	note $65
-	note $51
-	note $31
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $21
-	note $30
-	note $00
-	note $31
-	note $01
-	note $30
-	note $30
-	note $50
-	note $00
-	note $51
-	note $01
-	note $70
-	note $90
-	loopchannel $00, $447f ; end
-; 0xec4bd
+	callchannel Music_Route3_branch_ec4bd
+	callchannel Music_Route3_branch_ec4bd
+	callchannel Music_Route3_branch_ec4ce
+	callchannel Music_Route3_branch_ec4bd
+	callchannel Music_Route3_branch_ec4bd
+	callchannel Music_Route3_branch_ec4ce
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note A_, 5
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note B_, 1
+	note G#, 1
+	note E_, 0
+	note __, 0
+	note E_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F_, 5
+	note E_, 1
+	note D_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note D_, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	note D_, 0
+	note D_, 0
+	note E_, 0
+	note __, 0
+	note E_, 1
+	note __, 1
+	note F#, 0
+	note G#, 0
+	loopchannel 0, Music_Route3_branch_ec47f
+; ec4bd
 
-_Music_Route3_sub_0xec4bd: ; 0xec4bd
-; subroutine
-	octave3
-	note $a0
-	note $00
-	octave2
-	note $a1
-	note $01
-	note $a0
-	note $a0
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $a1
-	octave2
-	note $91
-	endchannel ; end
-; 0xec4ce
+Music_Route3_branch_ec4bd: ; ec4bd
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	note __, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note A_, 1
+	octave 2
+	note G#, 1
+	endchannel
+; ec4ce
 
-_Music_Route3_sub_0xec4ce: ; 0xec4ce
-; subroutine
-	octave3
-	note $80
-	note $00
-	octave2
-	note $a1
-	note $01
-	note $a0
-	note $a0
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $31
-	note $81
-	note $80
-	note $00
-	octave2
-	note $81
-	note $01
-	note $80
-	note $80
-	note $50
-	note $00
-	note $50
-	note $00
-	note $91
-	note $c1
-	endchannel ; end
-; 0xec4eb
+Music_Route3_branch_ec4ce: ; ec4ce
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note A_, 1
+	note __, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	note G_, 1
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 1
+	note __, 1
+	note G_, 0
+	note G_, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G#, 1
+	note B_, 1
+	endchannel
 
-_Music_Route3_Ch4: ; 0xec4eb
-	togglenoise $04
-	notetype $0c
-	note $09
-	notetype $0c
-	note $31
-	note $33
-	note $30
-	note $30
-	note $31
-	note $31
-	notetype $06
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	note $20
-	loopchannel $00, $44f0 ; end
-; 0xec506
+Music_Route3_Ch4: ; ec4eb
+	togglenoise $4
+	notetype $c
+	note __, 9
+
+Music_Route3_branch_ec4f0: ; ec4f0
+	notetype $c
+	note D_, 1
+	note D_, 3
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	notetype $6
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	loopchannel 0, Music_Route3_branch_ec4f0
+; ec506
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -1,684 +1,681 @@
-_Music_Route30: ; 0xefc01
-	db $c0
-	dw _Music_Route30_Ch1
-	db $01
-	dw _Music_Route30_Ch2
-	db $02
-	dw _Music_Route30_Ch3
-	db $03
-	dw _Music_Route30_Ch4
-; 0xefc0d
+Music_Route30: ; efc01
+	dbw $c0, Music_Route30_Ch1
+	dbw $01, Music_Route30_Ch2
+	dbw $02, Music_Route30_Ch3
+	dbw $03, Music_Route30_Ch4
+; efc0d
 
-_Music_Route30_Ch1: ; 0xefc0d
-	tempo $9000
+
+Music_Route30_Ch1: ; efc0d
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $10, $15
 	stereopanning $f0
-	notetype $0c, $b2
-	octave3
-	note $35
-	note $30
-	note $30
-	note $31
-	note $31
-	note $33
-	note $35
-	note $30
-	note $30
-	note $31
-	note $31
+	notetype $c, $b2
+	octave 3
+	note D_, 5
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	note D_, 5
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
 	intensity $4e
-	note $13
+	note C_, 3
+
+Music_Route30_branch_efc2e: ; efc2e
 	intensity $b6
-	note $35
+	note D_, 5
 	intensity $b4
-	octave2
-	note $c1
-	octave3
-	note $61
-	note $51
-	note $31
-	note $51
+	octave 2
+	note B_, 1
+	octave 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
 	intensity $b6
-	note $65
+	note F_, 5
 	intensity $b4
-	note $11
-	note $a1
-	note $81
-	note $61
-	note $11
-	note $31
-	note $81
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $31
-	note $51
-	note $c0
-	octave4
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $10
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note B_, 0
+	octave 4
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
 	intensity $b7
-	octave3
-	note $cb
+	octave 3
+	note B_, 11
 	intensity $b5
-	note $65
-	note $11
-	note $a1
-	note $81
-	note $61
-	note $11
-	octave4
-	note $31
-	note $11
-	octave3
-	note $c1
-	note $a1
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $81
-	note $30
-	note $50
-	note $30
-	note $50
+	note F_, 5
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note C_, 1
+	octave 4
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
 	intensity $b6
-	note $33
-	note $83
-	note $33
+	note D_, 3
+	note G_, 3
+	note D_, 3
 	intensity $b3
-	octave2
-	note $c0
-	octave3
-	note $10
-	octave2
-	note $c0
-	octave3
-	note $10
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
+	octave 2
+	note B_, 0
+	octave 3
+	note C_, 0
 	intensity $b6
-	octave2
-	note $c3
-	octave3
-	note $33
-	octave2
-	note $c3
+	octave 2
+	note B_, 3
+	octave 3
+	note D_, 3
+	octave 2
+	note B_, 3
 	intensity $b4
-	octave3
-	note $61
-	note $51
-	note $31
-	note $11
-	note $a1
-	note $81
-	note $61
-	note $51
+	octave 3
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
 	intensity $b6
-	note $a3
-	note $c3
-	octave4
-	note $13
-	note $53
-	note $31
-	octave3
-	note $83
-	note $a3
-	note $c3
-	octave4
-	note $11
-	octave3
-	note $81
+	note A_, 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	note E_, 3
+	note D_, 1
+	octave 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
 	intensity $b7
-	note $3d
+	note D_, 13
 	intensity $b6
-	note $61
-	note $51
-	note $31
-	note $11
-	note $a1
-	note $81
-	note $61
-	note $81
-	octave4
-	note $11
-	octave3
-	note $c1
-	note $a1
-	note $c1
-	octave4
-	note $11
-	note $51
-	note $61
-	note $a1
-	octave3
-	note $81
-	octave4
-	note $11
-	note $31
-	octave3
-	note $81
-	octave4
-	note $11
-	note $31
-	octave3
-	note $81
-	octave4
-	note $31
+	note F_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
 	intensity $b5
-	octave3
-	note $c1
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave4
-	note $33
-	octave3
-	note $81
-	note $c1
-	octave4
-	note $31
-	loopchannel $00, $7c2e ; end
-; 0xefcda
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 3
+	octave 3
+	note G_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	loopchannel 0, Music_Route30_branch_efc2e
 
-_Music_Route30_Ch2: ; 0xefcda
-	dutycycle $03
+Music_Route30_Ch2: ; efcda
+	dutycycle $3
 	vibrato $12, $36
-	stereopanning $0f
-	notetype $0c, $c2
-	octave3
-	note $85
-	note $80
-	note $80
-	note $81
-	note $81
-	note $83
-	note $85
-	note $80
-	note $80
-	note $81
-	note $81
+	stereopanning $f
+	notetype $c, $c2
+	octave 3
+	note G_, 5
+	note G_, 0
+	note G_, 0
+	note G_, 1
+	note G_, 1
+	note G_, 3
+	note G_, 5
+	note G_, 0
+	note G_, 0
+	note G_, 1
+	note G_, 1
 	intensity $c4
-	note $30
-	note $50
-	note $60
-	note $70
+	note D_, 0
+	note E_, 0
+	note F_, 0
+	note F#, 0
+
+Music_Route30_branch_efcf6: ; efcf6
 	intensity $c7
-	note $89
-	octave4
-	note $31
-	octave3
-	note $c1
-	note $81
-	octave4
-	note $69
-	note $51
-	note $31
-	note $11
-	note $30
-	note $50
-	note $30
-	note $50
+	note G_, 9
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	octave 4
+	note F_, 9
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
 	intensity $b0
-	note $33
+	note D_, 3
 	intensity $b7
-	note $37
+	note D_, 7
 	intensity $3f
-	note $37
+	note D_, 7
 	intensity $b7
-	note $37
+	note D_, 7
 	intensity $c7
-	note $19
-	note $11
-	octave3
-	note $a1
-	note $61
-	octave4
-	note $69
-	note $51
-	note $31
-	note $11
-	octave3
-	note $c5
-	note $81
-	octave4
-	note $37
-	octave3
-	note $85
-	note $31
-	note $c7
-	note $11
-	note $a3
-	note $c3
-	octave4
-	note $13
-	note $31
-	note $67
-	note $a7
-	note $81
+	note C_, 9
+	note C_, 1
+	octave 3
+	note A_, 1
+	note F_, 1
+	octave 4
+	note F_, 9
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 3
+	note B_, 5
+	note G_, 1
+	octave 4
+	note D_, 7
+	octave 3
+	note G_, 5
+	note D_, 1
+	note B_, 7
+	note C_, 1
+	note A_, 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	note D_, 1
+	note F_, 7
+	note A_, 7
+	note G_, 1
 	intensity $b0
-	note $33
+	note D_, 3
 	intensity $b7
-	note $39
+	note D_, 9
 	intensity $c7
-	note $13
-	octave3
-	note $c3
-	note $a3
-	note $83
-	note $a3
-	note $c3
-	octave4
-	note $13
-	note $33
-	note $67
-	octave5
-	note $17
-	octave4
-	note $c1
+	note C_, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	note D_, 3
+	note F_, 7
+	octave 5
+	note C_, 7
+	octave 4
+	note B_, 1
 	intensity $b0
-	note $85
+	note G_, 5
 	intensity $b7
-	note $87
+	note G_, 7
 	intensity $c7
-	note $c1
+	note B_, 1
 	intensity $b0
-	note $83
+	note G_, 3
 	intensity $b7
-	note $87
+	note G_, 7
 	intensity $a7
-	octave3
-	note $71
-	loopchannel $00, $7cf6 ; end
-; 0xefd5f
+	octave 3
+	note F#, 1
+	loopchannel 0, Music_Route30_branch_efcf6
 
-_Music_Route30_Ch3: ; 0xefd5f
-	notetype $0c, $27
-	octave2
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $c1
-	note $01
-	note $80
-	note $80
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $60
-	note $00
-	octave3
-	note $31
-	note $a1
-	octave2
-	note $60
-	note $60
-	note $60
-	note $00
-	octave3
-	note $11
-	octave2
-	note $60
-	note $00
-	note $70
-	note $00
-	note $80
-	note $00
-	note $c1
-	octave3
-	note $31
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	octave3
-	note $31
-	octave2
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	octave3
-	note $51
-	note $31
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $60
-	note $00
-	octave3
-	note $11
-	octave2
-	note $a1
-	note $60
-	note $60
-	note $60
-	note $00
-	octave3
-	note $11
-	octave2
-	note $60
-	note $00
-	note $60
-	note $00
-	note $60
-	note $00
-	octave3
-	note $11
-	note $61
-	octave2
-	note $60
-	note $60
-	note $60
-	note $00
-	octave3
-	note $51
-	octave2
-	note $61
-	note $71
-	note $80
-	note $00
-	note $c1
-	octave3
-	note $81
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	note $c1
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	octave4
-	note $31
-	octave3
-	note $c1
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	octave3
-	note $81
-	octave2
-	note $81
-	note $91
-	note $a0
-	note $00
-	octave3
-	note $11
-	octave2
-	note $c1
-	note $a0
-	note $a0
-	note $a0
-	note $00
-	octave3
-	note $31
-	octave2
-	note $a0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $61
-	note $51
-	note $10
-	note $10
-	note $10
-	note $00
-	note $a1
-	note $10
-	note $00
-	note $10
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $51
-	note $31
-	octave2
-	note $c0
-	note $c0
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c1
-	note $a1
-	note $80
-	note $80
-	note $80
-	note $00
-	note $c1
-	note $80
-	note $00
-	note $80
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $11
-	octave2
-	note $c1
-	note $a0
-	note $a0
-	note $a0
-	note $00
-	octave3
-	note $31
-	octave2
-	note $a0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $61
-	note $51
-	note $10
-	note $10
-	note $10
-	note $00
-	note $a1
-	note $10
-	note $00
-	note $10
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $11
-	note $31
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	octave3
-	note $51
-	note $31
-	octave2
-	note $80
-	note $80
-	note $80
-	note $00
-	octave3
-	note $31
-	octave2
-	note $80
-	note $00
-	note $80
-	note $00
-	loopchannel $00, $7d79 ; end
-; 0xefe7a
+Music_Route30_Ch3: ; efd5f
+	notetype $c, $27
+	octave 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 
-_Music_Route30_Ch4: ; 0xefe7a
-	togglenoise $03
-	notetype $0c
-	callchannel _Music_Route30_sub_0xefeb8
-	callchannel _Music_Route30_sub_0xefec1
-	callchannel _Music_Route30_sub_0xefecd
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefee1
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefecd
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefee1
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefecd
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefed7
-	callchannel _Music_Route30_sub_0xefecd
-	callchannel _Music_Route30_sub_0xefee1
-	loopchannel $00, $7e84 ; end
-; 0xefeb8
+Music_Route30_branch_efd79: ; efd79
+	note G_, 0
+	note __, 0
+	note B_, 1
+	note __, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	note A_, 1
+	octave 2
+	note F_, 0
+	note F_, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note A_, 1
+	note F_, 0
+	note F_, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	note F_, 1
+	octave 2
+	note F_, 0
+	note F_, 0
+	note F_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	octave 2
+	note F_, 1
+	note F#, 1
+	note G_, 0
+	note __, 0
+	note B_, 1
+	octave 3
+	note G_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note B_, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 4
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note G_, 1
+	octave 2
+	note G_, 1
+	note G#, 1
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note F_, 1
+	note E_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note __, 0
+	note A_, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 1
+	note A_, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note B_, 1
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note F_, 1
+	note E_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note __, 0
+	note A_, 1
+	note C_, 0
+	note __, 0
+	note C_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note E_, 1
+	note D_, 1
+	octave 2
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	octave 3
+	note D_, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_Route30_branch_efd79
 
-_Music_Route30_sub_0xefeb8: ; 0xefeb8
-; subroutine
-	note $31
-	note $71
-	note $71
-	note $30
-	note $30
-	note $31
-	note $31
-	note $33
-	endchannel ; end
-; 0xefec1
+Music_Route30_Ch4: ; efe7a
+	togglenoise $3
+	notetype $c
+	callchannel Music_Route30_branch_efeb8
+	callchannel Music_Route30_branch_efec1
 
-_Music_Route30_sub_0xefec1: ; 0xefec1
-; subroutine
-	note $31
-	note $71
-	note $71
-	note $30
-	note $30
-	note $31
-	note $31
-	note $30
-	note $30
-	note $30
-	note $30
-	endchannel ; end
-; 0xefecd
+Music_Route30_branch_efe84: ; efe84
+	callchannel Music_Route30_branch_efecd
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efee1
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efecd
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efee1
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efecd
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efed7
+	callchannel Music_Route30_branch_efecd
+	callchannel Music_Route30_branch_efee1
+	loopchannel 0, Music_Route30_branch_efe84
+; efeb8
 
-_Music_Route30_sub_0xefecd: ; 0xefecd
-; subroutine
-	note $31
-	note $71
-	note $71
-	note $30
-	note $30
-	note $31
-	note $31
-	note $31
-	note $31
-	endchannel ; end
-; 0xefed7
+Music_Route30_branch_efeb8: ; efeb8
+	note D_, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 3
+	endchannel
+; efec1
 
-_Music_Route30_sub_0xefed7: ; 0xefed7
-; subroutine
-	note $31
-	note $71
-	note $71
-	note $30
-	note $30
-	note $31
-	note $71
-	note $31
-	note $31
-	endchannel ; end
-; 0xefee1
+Music_Route30_branch_efec1: ; efec1
+	note D_, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	endchannel
+; efecd
 
-_Music_Route30_sub_0xefee1: ; 0xefee1
-; subroutine
-	note $31
-	note $71
-	note $71
-	note $30
-	note $30
-	note $31
-	note $31
-	notetype $06
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	note $30
-	notetype $0c
-	endchannel ; end
-; 0xefef5
+Music_Route30_branch_efecd: ; efecd
+	note D_, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	endchannel
+; efed7
+
+Music_Route30_branch_efed7: ; efed7
+	note D_, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note D_, 1
+	endchannel
+; efee1
+
+Music_Route30_branch_efee1: ; efee1
+	note D_, 1
+	note F#, 1
+	note F#, 1
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	notetype $c
+	endchannel
+; efef5
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -1,530 +1,531 @@
-_Music_Route36: ; 0xe94e9
-	db $c0
-	dw _Music_Route36_Ch1
-	db $01
-	dw _Music_Route36_Ch2
-	db $02
-	dw _Music_Route36_Ch3
-	db $03
-	dw _Music_Route36_Ch4
-; 0xe94f5
+Music_Route36: ; e94e9
+	dbw $c0, Music_Route36_Ch1
+	dbw $01, Music_Route36_Ch2
+	dbw $02, Music_Route36_Ch3
+	dbw $03, Music_Route36_Ch4
+; e94f5
 
-_Music_Route36_Ch1: ; 0xe94f5
-	tempo $9000
+
+Music_Route36_Ch1: ; e94f5
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0100
+	dutycycle $3
+	tone $0001
 	vibrato $10, $15
-	stereopanning $0f
-	notetype $0c, $b3
-	octave3
-	note $13
-	note $15
-	note $60
-	note $50
+	stereopanning $f
+	notetype $c, $b3
+	octave 3
+	note C_, 3
+	note C_, 5
+	note F_, 0
+	note E_, 0
 	intensity $b5
-	note $67
+	note F_, 7
 	intensity $b3
-	note $65
-	note $b0
-	note $a0
+	note F_, 5
+	note A#, 0
+	note A_, 0
 	intensity $5d
-	note $b3
+	note A#, 3
+
+Music_Route36_branch_e9517: ; e9517
 	intensity $b5
-	note $63
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $61
-	note $a1
-	note $41
-	note $b3
-	note $a3
-	note $81
-	note $b3
-	note $63
-	note $a1
-	note $81
-	note $61
-	note $51
-	note $61
-	note $a1
-	note $81
-	note $b3
-	note $a3
-	octave4
-	note $43
-	octave3
-	note $b1
+	note F_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	note D#, 1
+	note A#, 3
+	note A_, 3
+	note G_, 1
+	note A#, 3
+	note F_, 3
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note E_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note A#, 3
+	note A_, 3
+	octave 4
+	note D#, 3
+	octave 3
+	note A#, 1
 	intensity $b6
-	octave4
-	note $69
+	octave 4
+	note F_, 9
 	intensity $b5
-	note $11
-	note $61
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $43
-	note $33
-	note $11
-	octave3
-	note $b3
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D#, 3
+	note D_, 3
+	note C_, 1
+	octave 3
+	note A#, 3
 	intensity $b4
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $71
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $71
-	note $a1
-	octave4
-	note $31
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
 	intensity $a4
-	octave3
-	note $a1
-	octave4
-	note $31
-	note $71
-	octave3
-	note $a1
-	octave4
-	note $31
-	note $71
-	octave3
-	note $a1
-	octave4
-	note $31
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
 	stereopanning $f0
 	intensity $95
-	octave3
-	note $35
-	octave2
-	note $a5
-	octave3
-	note $33
-	octave2
-	note $a5
-	octave3
-	note $35
-	note $53
+	octave 3
+	note D_, 5
+	octave 2
+	note A_, 5
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 5
+	octave 3
+	note D_, 5
+	note E_, 3
 	intensity $b5
-	note $35
-	note $a5
-	note $83
+	note D_, 5
+	note A_, 5
+	note G_, 3
 	intensity $a5
-	octave2
-	note $a5
-	octave3
-	note $75
-	note $53
-	note $35
-	octave2
-	note $a5
-	octave3
-	note $33
+	octave 2
+	note A_, 5
+	octave 3
+	note F#, 5
+	note E_, 3
+	note D_, 5
+	octave 2
+	note A_, 5
+	octave 3
+	note D_, 3
 	intensity $b5
-	note $75
-	note $55
-	note $23
-	note $35
-	note $a5
-	note $83
-	octave2
-	note $a5
-	octave3
-	note $75
-	note $33
-	note $15
-	note $85
-	note $11
-	note $51
+	note F#, 5
+	note E_, 5
+	note C#, 3
+	note D_, 5
+	note A_, 5
+	note G_, 3
+	octave 2
+	note A_, 5
+	octave 3
+	note F#, 5
+	note D_, 3
+	note C_, 5
+	note G_, 5
+	note C_, 1
+	note E_, 1
 	intensity $b7
-	note $15
-	note $83
-	note $31
-	note $51
-	note $81
-	note $a1
-	note $91
-	note $a1
-	octave4
-	note $35
-	note $11
-	octave3
-	note $c1
-	note $a5
-	note $35
-	stereopanning $0f
+	note C_, 5
+	note G_, 3
+	note D_, 1
+	note E_, 1
+	note G_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	octave 4
+	note D_, 5
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 5
+	note D_, 5
+	stereopanning $f
 	intensity $b5
-	note $41
-	note $51
-	loopchannel $00, $5517 ; end
-; 0xe95af
+	note D#, 1
+	note E_, 1
+	loopchannel 0, Music_Route36_branch_e9517
 
-_Music_Route36_Ch2: ; 0xe95af
-	dutycycle $03
+Music_Route36_Ch2: ; e95af
+	dutycycle $3
 	vibrato $10, $36
 	stereopanning $f0
-	notetype $0c, $c2
-	octave3
-	note $61
-	note $10
-	note $60
+	notetype $c, $c2
+	octave 3
+	note F_, 1
+	note C_, 0
+	note F_, 0
 	intensity $c7
-	note $a7
-	note $13
+	note A_, 7
+	note C_, 3
 	intensity $c3
-	octave4
-	note $11
-	octave3
-	note $a0
-	octave4
-	note $10
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 0
+	octave 4
+	note C_, 0
 	intensity $c7
-	note $67
-	octave3
-	note $83
+	note F_, 7
+	octave 3
+	note G_, 3
+
+Music_Route36_branch_e95ce: ; e95ce
 	intensity $c7
-	octave4
-	note $19
+	octave 4
+	note C_, 9
 	intensity $c4
-	octave3
-	note $a1
-	octave4
-	note $11
-	note $a1
-	note $82
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	note A_, 1
+	note G_, 2
 	intensity $c2
-	note $40
+	note D#, 0
 	intensity $c7
-	note $4b
-	note $19
+	note D#, 11
+	note C_, 9
 	intensity $c4
-	octave3
-	note $a1
-	octave4
-	note $11
-	note $61
+	octave 3
+	note A_, 1
+	octave 4
+	note C_, 1
+	note F_, 1
 	intensity $c2
-	note $41
-	note $40
-	note $60
+	note D#, 1
+	note D#, 0
+	note F_, 0
 	intensity $c7
-	note $8b
-	note $a9
+	note G_, 11
+	note A_, 9
 	intensity $c4
-	note $61
-	note $a1
-	octave5
-	note $11
-	octave4
-	note $b2
-	note $a0
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
+	octave 4
+	note A#, 2
+	note A_, 0
 	intensity $c7
-	note $87
-	note $b3
+	note G_, 7
+	note A#, 3
 	intensity $b0
-	note $af
+	note A_, 15
 	intensity $b7
-	note $af
-	stereopanning $0f
+	note A_, 15
+	stereopanning $f
 	intensity $a4
-	octave3
-	note $a5
-	note $85
-	note $73
-	note $55
-	note $75
-	note $83
+	octave 3
+	note A_, 5
+	note G_, 5
+	note F#, 3
+	note E_, 5
+	note F#, 5
+	note G_, 3
 	intensity $b3
-	note $a1
-	note $70
-	note $a0
+	note A_, 1
+	note F#, 0
+	note A_, 0
 	intensity $b7
-	octave4
-	note $3b
+	octave 4
+	note D_, 11
 	intensity $a4
-	octave3
-	note $71
-	note $30
-	note $70
+	octave 3
+	note F#, 1
+	note D_, 0
+	note F#, 0
 	intensity $a7
-	note $ab
+	note A_, 11
 	intensity $c7
-	note $a5
-	note $85
-	note $73
-	note $c5
-	note $a5
-	note $83
+	note A_, 5
+	note G_, 5
+	note F#, 3
+	note B_, 5
+	note A_, 5
+	note G_, 3
 	intensity $c3
-	note $a1
-	note $70
-	note $a0
+	note A_, 1
+	note F#, 0
+	note A_, 0
 	intensity $c7
-	octave4
-	note $3b
+	octave 4
+	note D_, 11
 	intensity $c3
-	octave3
-	note $71
-	note $30
-	note $70
+	octave 3
+	note F#, 1
+	note D_, 0
+	note F#, 0
 	intensity $c7
-	note $ab
+	note A_, 11
 	intensity $c2
-	note $81
-	note $50
-	note $80
+	note G_, 1
+	note E_, 0
+	note G_, 0
 	intensity $b0
-	octave4
-	note $11
+	octave 4
+	note C_, 1
 	intensity $b7
-	note $19
+	note C_, 9
 	intensity $c5
-	octave3
-	note $81
-	note $50
-	note $80
+	octave 3
+	note G_, 1
+	note E_, 0
+	note G_, 0
 	intensity $c7
-	octave4
-	note $17
-	note $23
+	octave 4
+	note C_, 7
+	note C#, 3
 	stereopanning $ff
-	note $35
-	note $a5
-	note $81
-	note $71
+	note D_, 5
+	note A_, 5
+	note G_, 1
+	note F#, 1
 	intensity $b0
-	note $33
+	note D_, 3
 	intensity $b7
-	note $37
+	note D_, 7
 	stereopanning $f0
 	intensity $c4
-	octave3
-	note $70
-	note $80
-	note $a0
-	note $c0
-	loopchannel $00, $55ce ; end
-; 0xe966b
+	octave 3
+	note F#, 0
+	note G_, 0
+	note A_, 0
+	note B_, 0
+	loopchannel 0, Music_Route36_branch_e95ce
 
-_Music_Route36_Ch3: ; 0xe966b
-	notetype $0c, $25
-	octave3
-	note $60
-	note $02
-	note $60
-	note $00
-	octave4
-	note $13
-	octave3
-	note $11
-	note $61
-	note $11
-	note $40
-	note $02
-	note $40
-	note $00
-	octave4
-	note $63
-	octave2
-	note $b1
-	octave3
-	note $41
-	note $51
-	note $63
-	note $11
-	note $63
-	note $11
-	note $61
-	note $11
-	note $83
-	note $41
-	note $83
-	note $41
-	note $81
-	note $41
-	note $63
-	note $11
-	note $63
-	note $11
-	note $61
-	note $11
-	note $83
-	note $41
-	note $83
-	note $41
-	note $81
-	note $41
-	note $a3
-	note $61
-	note $a3
-	note $61
-	note $a1
-	note $61
-	note $b3
-	note $81
-	note $b3
-	note $81
-	note $b1
-	note $81
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $33
-	octave2
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $83
-	note $51
-	note $83
-	note $51
-	note $81
-	note $51
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $73
-	note $31
-	note $73
-	note $31
-	note $51
-	note $a1
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $83
-	note $51
-	note $83
-	note $51
-	note $81
-	note $51
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $73
-	note $31
-	note $73
-	note $31
-	note $71
-	note $31
-	note $83
-	note $11
-	note $83
-	note $11
-	note $81
-	note $11
-	note $83
-	note $11
-	note $83
-	note $11
-	note $51
-	note $81
-	note $a5
-	octave4
-	note $73
-	octave3
-	note $31
-	note $a1
-	octave4
-	note $31
-	note $12
-	note $50
-	note $75
-	octave3
-	note $31
-	note $41
-	note $51
-	loopchannel $00, $5684 ; end
-; 0xe9709
+Music_Route36_Ch3: ; e966b
+	notetype $c, $25
+	octave 3
+	note F_, 0
+	note __, 2
+	note F_, 0
+	note __, 0
+	octave 4
+	note C_, 3
+	octave 3
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note D#, 0
+	note __, 2
+	note D#, 0
+	note __, 0
+	octave 4
+	note F_, 3
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	note E_, 1
 
-_Music_Route36_Ch4: ; 0xe9709
-	togglenoise $01
-	notetype $0c
-	callchannel _Music_Route36_sub_0xe9734
-	callchannel _Music_Route36_sub_0xe9741
-	callchannel _Music_Route36_sub_0xe9734
-	callchannel _Music_Route36_sub_0xe973b
-	callchannel _Music_Route36_sub_0xe9734
-	callchannel _Music_Route36_sub_0xe9741
-	loopchannel $02, $5713
-	note $b3
-	note $a1
-	note $63
-	note $c0
-	note $c0
-	note $a3
-	loopchannel $0b, $5723
-	callchannel _Music_Route36_sub_0xe9741
-	loopchannel $00, $5713 ; end
-; 0xe9734
+Music_Route36_branch_e9684: ; e9684
+	note F_, 3
+	note C_, 1
+	note F_, 3
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note G_, 3
+	note D#, 1
+	note G_, 3
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note F_, 3
+	note C_, 1
+	note F_, 3
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note G_, 3
+	note D#, 1
+	note G_, 3
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note A_, 3
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note A#, 3
+	note G_, 1
+	note A#, 3
+	note G_, 1
+	note A#, 1
+	note G_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note G_, 3
+	note E_, 1
+	note G_, 3
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note G_, 3
+	note E_, 1
+	note G_, 3
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 3
+	note D_, 1
+	note F#, 1
+	note D_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note G_, 3
+	note C_, 1
+	note E_, 1
+	note G_, 1
+	note A_, 5
+	octave 4
+	note F#, 3
+	octave 3
+	note D_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note C_, 2
+	note E_, 0
+	note F#, 5
+	octave 3
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	loopchannel 0, Music_Route36_branch_e9684
 
-_Music_Route36_sub_0xe9734: ; 0xe9734
-; subroutine
-	note $a3
-	note $a5
-	note $b0
-	note $b0
-	note $a1
-	note $b1
-	endchannel ; end
-; 0xe973b
+Music_Route36_Ch4: ; e9709
+	togglenoise $1
+	notetype $c
+	callchannel Music_Route36_branch_e9734
+	callchannel Music_Route36_branch_e9741
 
-_Music_Route36_sub_0xe973b: ; 0xe973b
-; subroutine
-	note $a3
-	note $a5
-	note $c0
-	note $b0
-	note $a3
-	endchannel ; end
-; 0xe9741
+Music_Route36_branch_e9713: ; e9713
+	callchannel Music_Route36_branch_e9734
+	callchannel Music_Route36_branch_e973b
+	callchannel Music_Route36_branch_e9734
+	callchannel Music_Route36_branch_e9741
+	loopchannel 2, Music_Route36_branch_e9713
 
-_Music_Route36_sub_0xe9741: ; 0xe9741
-; subroutine
-	note $a3
-	note $a5
-	note $b0
-	note $b0
-	note $a1
-	notetype $06
-	note $b0
-	note $b0
-	note $a0
-	note $a0
-	notetype $0c
-	endchannel ; end
-; 0xe974f
+Music_Route36_branch_e9723: ; e9723
+	note A#, 3
+	note A_, 1
+	note F_, 3
+	note B_, 0
+	note B_, 0
+	note A_, 3
+	loopchannel 11, Music_Route36_branch_e9723
+	callchannel Music_Route36_branch_e9741
+	loopchannel 0, Music_Route36_branch_e9713
+; e9734
+
+Music_Route36_branch_e9734: ; e9734
+	note A_, 3
+	note A_, 5
+	note A#, 0
+	note A#, 0
+	note A_, 1
+	note A#, 1
+	endchannel
+; e973b
+
+Music_Route36_branch_e973b: ; e973b
+	note A_, 3
+	note A_, 5
+	note B_, 0
+	note A#, 0
+	note A_, 3
+	endchannel
+; e9741
+
+Music_Route36_branch_e9741: ; e9741
+	note A_, 3
+	note A_, 5
+	note A#, 0
+	note A#, 0
+	note A_, 1
+	notetype $6
+	note A#, 0
+	note A#, 0
+	note A_, 0
+	note A_, 0
+	notetype $c
+	endchannel
+; e974f
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -1,436 +1,448 @@
-_Music_Route37: ; 0xee94b
-	db $c0
-	dw _Music_Route37_Ch1
-	db $01
-	dw _Music_Route37_Ch2
-	db $02
-	dw _Music_Route37_Ch3
-	db $03
-	dw _Music_Route37_Ch4
-; 0xee957
+Music_Route37: ; ee94b
+	dbw $c0, Music_Route37_Ch1
+	dbw $01, Music_Route37_Ch2
+	dbw $02, Music_Route37_Ch3
+	dbw $03, Music_Route37_Ch4
+; ee957
 
-_Music_Route37_Ch1: ; 0xee957
-	tempo $9000
+
+Music_Route37_Ch1: ; ee957
+	tempo 144
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $10, $22
-	notetype $0c, $b3
-	note $0f
-	note $0f
+	notetype $c, $b3
+	note __, 15
+	note __, 15
+
+Music_Route37_branch_ee969: ; ee969
 	intensity $b3
-	note $01
-	octave2
-	note $71
-	note $c1
-	octave3
-	note $51
+	note __, 1
+	octave 2
+	note F#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
 	intensity $b7
-	note $49
+	note D#, 9
 	intensity $b3
-	note $53
-	note $43
-	note $23
-	octave2
-	note $c1
-	octave3
-	note $42
-	octave2
-	note $c0
+	note E_, 3
+	note D#, 3
+	note C#, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 2
+	octave 2
+	note B_, 0
 	intensity $b7
-	note $77
-	note $c7
-	octave3
-	note $cb
+	note F#, 7
+	note B_, 7
+	octave 3
+	note B_, 11
 	intensity $b3
-	note $01
-	octave2
-	note $71
-	note $c1
-	octave3
-	note $51
+	note __, 1
+	octave 2
+	note F#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
 	intensity $b7
-	note $49
-	octave2
-	note $a3
-	octave3
-	note $23
-	note $53
-	note $a1
-	note $72
-	note $a0
-	note $c5
-	octave2
-	note $c1
-	octave3
-	note $41
-	note $71
-	note $c1
-	note $a3
-	note $73
-	note $51
-	note $43
-	stereopanning $0f
-	callchannel _Music_Route37_sub_0xee9da
-	octave3
-	note $23
-	loopchannel $02, $69a5
-	callchannel _Music_Route37_sub_0xee9e9
-	octave3
-	note $73
-	callchannel _Music_Route37_sub_0xee9e9
-	octave3
-	note $73
-	callchannel _Music_Route37_sub_0xee9da
-	octave3
-	note $53
-	callchannel _Music_Route37_sub_0xee9da
-	octave3
-	note $93
-	callchannel _Music_Route37_sub_0xee9e9
-	octave4
-	note $43
-	callchannel _Music_Route37_sub_0xee9e9
-	octave3
-	note $63
+	note D#, 9
+	octave 2
+	note A_, 3
+	octave 3
+	note C#, 3
+	note E_, 3
+	note A_, 1
+	note F#, 2
+	note A_, 0
+	note B_, 5
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	note B_, 1
+	note A_, 3
+	note F#, 3
+	note E_, 1
+	note D#, 3
+	stereopanning $f
+
+Music_Route37_branch_ee9a5: ; ee9a5
+	callchannel Music_Route37_branch_ee9da
+	octave 3
+	note C#, 3
+	loopchannel 2, Music_Route37_branch_ee9a5
+	callchannel Music_Route37_branch_ee9e9
+	octave 3
+	note F#, 3
+	callchannel Music_Route37_branch_ee9e9
+	octave 3
+	note F#, 3
+	callchannel Music_Route37_branch_ee9da
+	octave 3
+	note E_, 3
+	callchannel Music_Route37_branch_ee9da
+	octave 3
+	note G#, 3
+	callchannel Music_Route37_branch_ee9e9
+	octave 4
+	note D#, 3
+	callchannel Music_Route37_branch_ee9e9
+	octave 3
+	note F_, 3
 	stereopanning $ff
-	callchannel _Music_Route37_sub_0xee9e9
-	note $03
-	callchannel _Music_Route37_sub_0xee9e9
-	note $03
-	loopchannel $00, $6969 ; end
-; 0xee9da
+	callchannel Music_Route37_branch_ee9e9
+	note __, 3
+	callchannel Music_Route37_branch_ee9e9
+	note __, 3
+	loopchannel 0, Music_Route37_branch_ee969
+; ee9da
 
-_Music_Route37_sub_0xee9da: ; 0xee9da
-; subroutine
+Music_Route37_branch_ee9da: ; ee9da
 	intensity $c2
-	octave2
-	note $a1
-	note $a0
-	note $a0
-	note $a1
-	note $a0
-	note $a0
-	note $a0
-	note $a0
-	note $a1
+	octave 2
+	note A_, 1
+	note A_, 0
+	note A_, 0
+	note A_, 1
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note A_, 0
+	note A_, 1
 	intensity $b7
-	endchannel ; end
-; 0xee9e9
+	endchannel
+; ee9e9
 
-_Music_Route37_sub_0xee9e9: ; 0xee9e9
-; subroutine
+Music_Route37_branch_ee9e9: ; ee9e9
 	intensity $c2
-	octave2
-	note $c1
-	note $c0
-	note $c0
-	note $c1
-	note $c0
-	note $c0
-	note $c0
-	note $c0
-	note $c1
+	octave 2
+	note B_, 1
+	note B_, 0
+	note B_, 0
+	note B_, 1
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note B_, 1
 	intensity $b7
-	endchannel ; end
-; 0xee9f8
+	endchannel
 
-_Music_Route37_Ch2: ; 0xee9f8
-	dutycycle $03
+Music_Route37_Ch2: ; ee9f8
+	dutycycle $3
 	vibrato $1c, $12
-	notetype $0c, $c2
-	octave2
-	note $c1
-	notetype $0c, $c1
-	note $c0
-	note $c0
+	notetype $c, $c2
+	octave 2
+	note B_, 1
+	notetype $c, $c1
+	note B_, 0
+	note B_, 0
 	intensity $c2
-	note $c1
+	note B_, 1
 	intensity $c1
-	note $c0
-	note $c0
-	note $c0
-	note $c0
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note B_, 0
 	intensity $c2
-	note $c5
-	note $c1
+	note B_, 5
+	note B_, 1
 	intensity $c1
-	note $c0
-	note $c0
+	note B_, 0
+	note B_, 0
 	intensity $c2
-	note $c1
+	note B_, 1
 	intensity $c1
-	note $c0
-	note $c0
-	note $c0
-	note $c0
+	note B_, 0
+	note B_, 0
+	note B_, 0
+	note B_, 0
 	intensity $c2
-	note $c1
-	callchannel _Music_Route37_sub_0xeeab7
+	note B_, 1
+
+Music_Route37_branch_eea24: ; eea24
+	callchannel Music_Route37_branch_eeab7
 	intensity $c6
-	octave4
-	note $23
-	octave3
-	note $c3
-	note $a3
-	note $53
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note E_, 3
 	intensity $b0
-	note $77
+	note F#, 7
 	intensity $b7
-	note $77
+	note F#, 7
 	intensity $c7
-	note $4b
-	callchannel _Music_Route37_sub_0xeeab7
+	note D#, 11
+	callchannel Music_Route37_branch_eeab7
 	intensity $c7
-	octave4
-	note $23
-	octave3
-	note $c3
-	octave4
-	note $23
-	note $53
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C#, 3
+	note E_, 3
 	intensity $b0
-	note $4f
+	note D#, 15
 	intensity $b0
-	note $47
+	note D#, 7
 	intensity $b7
-	note $47
+	note D#, 7
 	intensity $c4
-	note $03
-	octave3
-	note $a2
-	octave4
-	note $50
-	note $a3
-	note $93
+	note __, 3
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 0
+	note A_, 3
+	note G#, 3
 	intensity $a0
-	note $25
-	note $45
-	note $53
+	note C#, 5
+	note D#, 5
+	note E_, 3
 	intensity $c3
-	note $72
-	note $50
+	note F#, 2
+	note E_, 0
 	intensity $b0
-	note $45
+	note D#, 5
 	intensity $b7
-	note $45
+	note D#, 5
 	intensity $c3
-	octave3
-	note $c2
-	note $70
+	octave 3
+	note B_, 2
+	note F#, 0
 	intensity $b0
-	octave4
-	note $45
+	octave 4
+	note D#, 5
 	intensity $b7
-	octave4
-	note $45
+	octave 4
+	note D#, 5
 	intensity $c4
-	note $03
-	octave3
-	note $a2
-	octave4
-	note $50
-	note $a3
-	note $93
+	note __, 3
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 0
+	note A_, 3
+	note G#, 3
 	intensity $b0
-	note $25
-	note $45
-	note $53
+	note C#, 5
+	note D#, 5
+	note E_, 3
 	intensity $c3
-	note $72
-	note $40
+	note F#, 2
+	note D#, 0
 	intensity $b0
-	note $c5
+	note B_, 5
 	intensity $b7
-	note $c5
+	note B_, 5
 	intensity $c3
-	note $c2
-	note $70
+	note B_, 2
+	note F#, 0
 	intensity $b0
-	octave5
-	note $45
+	octave 5
+	note D#, 5
 	intensity $b7
-	octave5
-	note $45
+	octave 5
+	note D#, 5
 	intensity $c2
-	octave3
-	note $71
-	note $70
-	note $70
-	note $71
+	octave 3
+	note F#, 1
+	note F#, 0
+	note F#, 0
+	note F#, 1
 	intensity $c1
-	note $70
-	note $70
-	note $70
-	note $70
+	note F#, 0
+	note F#, 0
+	note F#, 0
+	note F#, 0
 	intensity $c2
-	note $75
-	note $71
-	note $70
-	note $70
-	note $71
+	note F#, 5
+	note F#, 1
+	note F#, 0
+	note F#, 0
+	note F#, 1
 	intensity $c1
-	note $70
-	note $70
-	note $70
-	note $70
+	note F#, 0
+	note F#, 0
+	note F#, 0
+	note F#, 0
 	intensity $c2
-	note $71
-	loopchannel $00, $6a24 ; end
-; 0xeeab7
+	note F#, 1
+	loopchannel 0, Music_Route37_branch_eea24
+; eeab7
 
-_Music_Route37_sub_0xeeab7: ; 0xeeab7
-; subroutine
+Music_Route37_branch_eeab7: ; eeab7
 	intensity $c7
-	octave3
-	note $73
+	octave 3
+	note F#, 3
 	intensity $b0
-	note $c4
+	note B_, 4
 	intensity $b7
-	note $c4
+	note B_, 4
 	intensity $c3
-	note $71
-	note $71
-	note $c1
-	endchannel ; end
-; 0xeeac7
+	note F#, 1
+	note F#, 1
+	note B_, 1
+	endchannel
 
-_Music_Route37_Ch3: ; 0xeeac7
+Music_Route37_Ch3: ; eeac7
 	stereopanning $f0
-	notetype $0c, $14
-	octave2
-	note $71
-	note $05
-	loopchannel $04, $6acc
-	callchannel _Music_Route37_sub_0xeeb32
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $91
-	note $c1
-	note $71
-	note $a1
-	note $71
-	note $51
-	note $41
-	note $71
-	loopchannel $04, $6ae0
-	callchannel _Music_Route37_sub_0xeeb32
-	callchannel _Music_Route37_sub_0xeeb32
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $91
-	note $c1
-	note $71
-	note $a1
-	octave3
-	note $21
-	octave2
-	note $a1
-	callchannel _Music_Route37_sub_0xeeb32
-	octave2
-	note $c1
-	octave3
-	note $41
-	loopchannel $04, $6afb
-	octave2
-	note $a1
-	octave3
-	note $21
-	loopchannel $07, $6b03
-	note $51
-	note $21
-	callchannel _Music_Route37_sub_0xeeb3c
-	octave2
-	note $c1
-	octave3
-	note $71
-	loopchannel $04, $6b10
-	octave2
-	note $a1
-	octave3
-	note $21
-	loopchannel $07, $6b18
-	note $51
-	note $21
-	callchannel _Music_Route37_sub_0xeeb3c
-	callchannel _Music_Route37_sub_0xeeb32
-	note $71
-	note $05
-	loopchannel $04, $6b28
-	loopchannel $00, $6ad3 ; end
-; 0xeeb32
+	notetype $c, $14
 
-_Music_Route37_sub_0xeeb32: ; 0xeeb32
-; subroutine
-	octave2
-	note $71
-	note $c1
-	note $71
-	note $c1
-	note $71
-	note $c1
-	note $71
-	note $c1
-	endchannel ; end
-; 0xeeb3c
+Music_Route37_branch_eeacc: ; eeacc
+	octave 2
+	note F#, 1
+	note __, 5
+	loopchannel 4, Music_Route37_branch_eeacc
 
-_Music_Route37_sub_0xeeb3c: ; 0xeeb3c
-; subroutine
-	octave2
-	note $c1
-	octave3
-	note $41
-	octave2
-	note $c1
-	octave3
-	note $41
-	octave2
-	note $c1
-	octave3
-	note $41
-	octave2
-	note $c1
-	octave3
-	note $41
-	endchannel ; end
-; 0xeeb4d
+Music_Route37_branch_eead3: ; eead3
+	callchannel Music_Route37_branch_eeb32
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 1
+	note B_, 1
+	note F#, 1
+	note A_, 1
+	note F#, 1
+	note E_, 1
 
-_Music_Route37_Ch4: ; 0xeeb4d
-	stereopanning $0f
-	togglenoise $00
-	notetype $0c
-	callchannel _Music_Route37_sub_0xeeb6b
-	note $30
-	note $40
-	note $40
-	note $30
-	callchannel _Music_Route37_sub_0xeeb6b
-	notetype $06
-	note $40
-	note $40
-	note $40
-	note $40
-	note $40
-	note $30
-	note $30
-	note $30
-	loopchannel $00, $6b51 ; end
-; 0xeeb6b
+Music_Route37_branch_eeae0: ; eeae0
+	note D#, 1
+	note F#, 1
+	loopchannel 4, Music_Route37_branch_eeae0
+	callchannel Music_Route37_branch_eeb32
+	callchannel Music_Route37_branch_eeb32
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 1
+	note B_, 1
+	note F#, 1
+	note A_, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note A_, 1
+	callchannel Music_Route37_branch_eeb32
 
-_Music_Route37_sub_0xeeb6b: ; 0xeeb6b
-; subroutine
-	note $31
-	note $40
-	note $40
-	note $31
-	note $40
-	note $40
-	note $31
-	note $40
-	note $40
-	endchannel ; end
-; 0xeeb75
+Music_Route37_branch_eeafb: ; eeafb
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	loopchannel 4, Music_Route37_branch_eeafb
+
+Music_Route37_branch_eeb03: ; eeb03
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	loopchannel 7, Music_Route37_branch_eeb03
+	note E_, 1
+	note C#, 1
+	callchannel Music_Route37_branch_eeb3c
+
+Music_Route37_branch_eeb10: ; eeb10
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	loopchannel 4, Music_Route37_branch_eeb10
+
+Music_Route37_branch_eeb18: ; eeb18
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	loopchannel 7, Music_Route37_branch_eeb18
+	note E_, 1
+	note C#, 1
+	callchannel Music_Route37_branch_eeb3c
+	callchannel Music_Route37_branch_eeb32
+
+Music_Route37_branch_eeb28: ; eeb28
+	note F#, 1
+	note __, 5
+	loopchannel 4, Music_Route37_branch_eeb28
+	loopchannel 0, Music_Route37_branch_eead3
+; eeb32
+
+Music_Route37_branch_eeb32: ; eeb32
+	octave 2
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	note B_, 1
+	endchannel
+; eeb3c
+
+Music_Route37_branch_eeb3c: ; eeb3c
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note D#, 1
+	endchannel
+
+Music_Route37_Ch4: ; eeb4d
+	stereopanning $f
+	togglenoise $0
+
+Music_Route37_branch_eeb51: ; eeb51
+	notetype $c
+	callchannel Music_Route37_branch_eeb6b
+	note D_, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	callchannel Music_Route37_branch_eeb6b
+	notetype $6
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note D#, 0
+	note D_, 0
+	note D_, 0
+	note D_, 0
+	loopchannel 0, Music_Route37_branch_eeb51
+; eeb6b
+
+Music_Route37_branch_eeb6b: ; eeb6b
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	endchannel
+; eeb75
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -1,51 +1,52 @@
-_Music_RuinsOfAlphInterior: ; 0xebd9e
-	db $80
-	dw _Music_RuinsOfAlphInterior_Ch1
-	db $01
-	dw _Music_RuinsOfAlphInterior_Ch2
-	db $02
-	dw _Music_RuinsOfAlphInterior_Ch3
-; 0xebda7
+Music_RuinsOfAlphInterior: ; ebd9e
+	dbw $80, Music_RuinsOfAlphInterior_Ch1
+	dbw $01, Music_RuinsOfAlphInterior_Ch2
+	dbw $02, Music_RuinsOfAlphInterior_Ch3
+; ebda7
 
-_Music_RuinsOfAlphInterior_Ch1: ; 0xebda7
-	tempo $e000
+
+Music_RuinsOfAlphInterior_Ch1: ; ebda7
+	tempo 224
 	volume $77
-	dutycycle $00
+	dutycycle $0
 	stereopanning $f0
-	notetype $0c, $44
-	note $00
-	loopchannel $00, $7dc2 ; end
-; 0xebdb8
+	notetype $c, $44
+	note __, 0
+	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+; ebdb8
 
-_Music_RuinsOfAlphInterior_Ch2: ; 0xebdb8
-	tone $0200
-	dutycycle $00
-	stereopanning $0f
-	notetype $0c, $a4
-	octave4
-	note $13
-	octave3
-	note $b3
-	octave4
-	note $21
-	note $41
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $13
-	octave3
-	note $b3
-	loopchannel $00, $7dc2 ; end
-; 0xebdd4
+Music_RuinsOfAlphInterior_Ch2: ; ebdb8
+	tone $0002
+	dutycycle $0
+	stereopanning $f
+	notetype $c, $a4
 
-_Music_RuinsOfAlphInterior_Ch3: ; 0xebdd4
-	notetype $0c, $10
-	octave2
-	note $91
-	octave3
-	note $21
-	note $51
-	note $09
-	loopchannel $00, $7dd7 ; end
-; 0xebde1
+Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C#, 1
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+
+Music_RuinsOfAlphInterior_Ch3: ; ebdd4
+	notetype $c, $10
+
+Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note __, 9
+	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
+; ebde1
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -1,81 +1,81 @@
-_Music_RuinsOfAlphRadioSignal: ; 0xeedcb
-	db $80
-	dw _Music_RuinsOfAlphRadioSignal_Ch1
-	db $01
-	dw _Music_RuinsOfAlphRadioSignal_Ch2
-	db $02
-	dw _Music_RuinsOfAlphRadioSignal_Ch3
-; 0xeedd4
+Music_RuinsOfAlphRadio: ; eedcb
+	dbw $80, Music_RuinsOfAlphRadio_Ch1
+	dbw $01, Music_RuinsOfAlphRadio_Ch2
+	dbw $02, Music_RuinsOfAlphRadio_Ch3
+; eedd4
 
-_Music_RuinsOfAlphRadioSignal_Ch1: ; 0xeedd4
-	tempo $a000
+
+Music_RuinsOfAlphRadio_Ch1: ; eedd4
+	tempo 160
 	volume $77
-	dutycycle $00
-	tone $1801
-	vibrato $00, $f0
+	dutycycle $0
+	tone $0118
+	vibrato $0, $f0
 	stereopanning $f0
-	notetype $06, $71
-	callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
-	notetype $0c, $a1
-	note $0f
-	note $0f
-	callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
-	notetype $0c, $a1
-	note $0f
-	note $0f
-	callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
-	notetype $0c, $a1
-	note $0f
-	loopchannel $00, $6de3 ; end
-; 0xeee01
 
-_Music_RuinsOfAlphRadioSignal_sub_0xeee01: ; 0xeee01
-; subroutine
-	octave4
-	note $80
-	note $70
-	note $80
-	note $70
-	note $17
-	endchannel ; end
-; 0xeee08
+Music_RuinsOfAlphRadio_branch_eede3: ; eede3
+	notetype $6, $71
+	callchannel Music_RuinsOfAlphRadio_branch_eee01
+	notetype $c, $a1
+	note __, 15
+	note __, 15
+	callchannel Music_RuinsOfAlphRadio_branch_eee08
+	notetype $c, $a1
+	note __, 15
+	note __, 15
+	callchannel Music_RuinsOfAlphRadio_branch_eee01
+	notetype $c, $a1
+	note __, 15
+	loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3
+; eee01
 
-_Music_RuinsOfAlphRadioSignal_sub_0xeee08: ; 0xeee08
-; subroutine
-	octave4
-	note $80
-	note $70
-	note $80
-	note $70
-	note $13
-	note $80
-	octave5
-	note $17
-	endchannel ; end
-; 0xeee12
+Music_RuinsOfAlphRadio_branch_eee01: ; eee01
+	octave 4
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note C_, 7
+	endchannel
+; eee08
 
-_Music_RuinsOfAlphRadioSignal_Ch2: ; 0xeee12
-	dutycycle $01
-	vibrato $01, $e0
-	stereopanning $0f
-	notetype $06, $81
-	callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee01
-	notetype $0c, $a1
-	note $0f
-	note $0f
-	notetype $06, $81
-	callchannel _Music_RuinsOfAlphRadioSignal_sub_0xeee08
-	notetype $0c, $a1
-	note $0f
-	loopchannel $00, $6e17 ; end
-; 0xeee32
+Music_RuinsOfAlphRadio_branch_eee08: ; eee08
+	octave 4
+	note G_, 0
+	note F#, 0
+	note G_, 0
+	note F#, 0
+	note C_, 3
+	note G_, 0
+	octave 5
+	note C_, 7
+	endchannel
 
-_Music_RuinsOfAlphRadioSignal_Ch3: ; 0xeee32
-	notetype $06, $26
-	octave2
-	note $10
-	note $20
-	note $10
-	note $0f
-	loopchannel $00, $6e35 ; end
-; 0xeee3e
+Music_RuinsOfAlphRadio_Ch2: ; eee12
+	dutycycle $1
+	vibrato $1, $e0
+
+Music_RuinsOfAlphRadio_branch_eee17: ; eee17
+	stereopanning $f
+	notetype $6, $81
+	callchannel Music_RuinsOfAlphRadio_branch_eee01
+	notetype $c, $a1
+	note __, 15
+	note __, 15
+	notetype $6, $81
+	callchannel Music_RuinsOfAlphRadio_branch_eee08
+	notetype $c, $a1
+	note __, 15
+	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
+
+Music_RuinsOfAlphRadio_Ch3: ; eee32
+	notetype $6, $26
+
+Music_RuinsOfAlphRadio_branch_eee35: ; eee35
+	octave 2
+	note C_, 0
+	note C#, 0
+	note C_, 0
+	note __, 15
+	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
+; eee3e
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -1,370 +1,365 @@
-_Music_ShowMeAround: ; 0xedbd8
-	db $c0
-	dw _Music_ShowMeAround_Ch1
-	db $01
-	dw _Music_ShowMeAround_Ch2
-	db $02
-	dw _Music_ShowMeAround_Ch3
-	db $03
-	dw _Music_ShowMeAround_Ch4
-; 0xedbe4
+Music_ShowMeAround: ; edbd8
+	dbw $c0, Music_ShowMeAround_Ch1
+	dbw $01, Music_ShowMeAround_Ch2
+	dbw $02, Music_ShowMeAround_Ch3
+	dbw $03, Music_ShowMeAround_Ch4
+; edbe4
 
-_Music_ShowMeAround_Ch1: ; 0xedbe4
-	tempo $9000
+
+Music_ShowMeAround_Ch1: ; edbe4
+	tempo 144
 	volume $77
-	stereopanning $0f
-	dutycycle $02
-	notetype $0c, $b1
-	octave4
-	note $c1
-	note $a1
-	note $91
-	note $a1
-	note $91
-	note $71
-	note $51
-	note $31
-	octave3
-	note $c3
-	note $90
-	note $c0
-	octave4
-	note $30
-	note $50
-	note $97
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	callchannel _Music_ShowMeAround_sub_0xedc98
-	callchannel _Music_ShowMeAround_sub_0xedc15
-	callchannel _Music_ShowMeAround_sub_0xedc98
-	callchannel _Music_ShowMeAround_sub_0xedc15
-	loopchannel $00, $5c01 ; end
-; 0xedc15
+	stereopanning $f
+	dutycycle $2
+	notetype $c, $b1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 1
+	note D_, 1
+	octave 3
+	note B_, 3
+	note G#, 0
+	note B_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note G#, 7
 
-_Music_ShowMeAround_sub_0xedc15: ; 0xedc15
-; subroutine
-	note $03
-	octave3
-	note $20
-	note $04
-	note $33
-	note $10
-	note $00
-	note $03
-	octave2
-	note $50
-	note $00
-	note $90
-	note $00
-	octave4
-	note $50
-	note $00
-	note $50
-	note $00
-	note $50
-	note $02
-	endchannel ; end
-; 0xedc2a
+Music_ShowMeAround_branch_edc01: ; edc01
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	callchannel Music_ShowMeAround_branch_edc98
+	callchannel Music_ShowMeAround_branch_edc15
+	callchannel Music_ShowMeAround_branch_edc98
+	callchannel Music_ShowMeAround_branch_edc15
+	loopchannel 0, Music_ShowMeAround_branch_edc01
+; edc15
 
-_Music_ShowMeAround_Ch2: ; 0xedc2a
+Music_ShowMeAround_branch_edc15: ; edc15
+	note __, 3
+	octave 3
+	note C#, 0
+	note __, 4
+	note D_, 3
+	note C_, 0
+	note __, 0
+	note __, 3
+	octave 2
+	note E_, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	endchannel
+; edc2a
+
+Music_ShowMeAround_Ch2: ; edc2a
 	stereopanning $ff
-	dutycycle $02
-	notetype $0c, $b1
-	octave5
-	note $51
-	note $31
-	note $21
-	note $31
-	note $21
-	octave4
-	note $c1
-	note $a1
-	note $91
-	note $53
-	note $50
-	note $90
-	note $c0
-	octave5
-	note $30
-	note $57
-	dutycycle $01
-	callchannel _Music_ShowMeAround_sub_0xedc98
-	callchannel _Music_ShowMeAround_sub_0xedc98
-	callchannel _Music_ShowMeAround_sub_0xedc86
-	note $a3
-	octave3
-	note $a1
-	octave4
-	note $21
-	note $53
-	note $31
-	note $21
-	octave3
-	note $c3
-	callchannel _Music_ShowMeAround_sub_0xedc86
-	note $a1
-	note $a1
-	note $91
-	note $51
-	note $71
-	note $91
-	note $a1
-	note $a1
-	note $a3
-	callchannel _Music_ShowMeAround_sub_0xedc8e
-	note $a3
-	octave5
-	note $21
-	octave4
-	note $a1
-	note $a3
-	note $90
-	note $80
-	note $70
-	note $60
-	note $50
-	note $00
-	note $40
-	note $50
-	callchannel _Music_ShowMeAround_sub_0xedc8e
-	note $a1
-	octave5
-	note $51
-	note $31
-	octave4
-	note $c1
-	note $a1
-	note $91
-	note $a1
-	note $a1
-	note $a3
-	loopchannel $00, $5c44 ; end
-; 0xedc86
+	dutycycle $2
+	notetype $c, $b1
+	octave 5
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 3
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	octave 5
+	note D_, 0
+	note E_, 7
+	dutycycle $1
 
-_Music_ShowMeAround_sub_0xedc86: ; 0xedc86
-; subroutine
-	octave3
-	note $a1
-	octave4
-	note $21
-	note $53
-	note $31
-	note $71
-	endchannel ; end
-; 0xedc8e
+Music_ShowMeAround_branch_edc44: ; edc44
+	callchannel Music_ShowMeAround_branch_edc98
+	callchannel Music_ShowMeAround_branch_edc98
+	callchannel Music_ShowMeAround_branch_edc86
+	note A_, 3
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	note E_, 3
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 3
+	callchannel Music_ShowMeAround_branch_edc86
+	note A_, 1
+	note A_, 1
+	note G#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	callchannel Music_ShowMeAround_branch_edc8e
+	note A_, 3
+	octave 5
+	note C#, 1
+	octave 4
+	note A_, 1
+	note A_, 3
+	note G#, 0
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note E_, 0
+	callchannel Music_ShowMeAround_branch_edc8e
+	note A_, 1
+	octave 5
+	note E_, 1
+	note D_, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	loopchannel 0, Music_ShowMeAround_branch_edc44
+; edc86
 
-_Music_ShowMeAround_sub_0xedc8e: ; 0xedc8e
-; subroutine
-	octave5
-	note $21
-	octave4
-	note $a1
-	note $a3
-	octave5
-	note $71
-	octave4
-	note $a1
-	endchannel ; end
-; 0xedc98
+Music_ShowMeAround_branch_edc86: ; edc86
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	note E_, 3
+	note D_, 1
+	note F#, 1
+	endchannel
+; edc8e
 
-_Music_ShowMeAround_sub_0xedc98: ; 0xedc98
-; subroutine
-	note $03
-	octave3
-	note $20
-	note $04
-	note $33
-	note $10
-	note $00
-	note $01
-	note $20
-	note $04
-	octave2
-	note $50
-	note $02
-	note $b1
-	note $c0
-	note $00
-	endchannel ; end
-; 0xedca9
+Music_ShowMeAround_branch_edc8e: ; edc8e
+	octave 5
+	note C#, 1
+	octave 4
+	note A_, 1
+	note A_, 3
+	octave 5
+	note F#, 1
+	octave 4
+	note A_, 1
+	endchannel
+; edc98
 
-_Music_ShowMeAround_Ch3: ; 0xedca9
+Music_ShowMeAround_branch_edc98: ; edc98
+	note __, 3
+	octave 3
+	note C#, 0
+	note __, 4
+	note D_, 3
+	note C_, 0
+	note __, 0
+	note __, 1
+	note C#, 0
+	note __, 4
+	octave 2
+	note E_, 0
+	note __, 2
+	note A#, 1
+	note B_, 0
+	note __, 0
+	endchannel
+
+Music_ShowMeAround_Ch3: ; edca9
 	stereopanning $f0
 	vibrato $10, $22
-	notetype $06, $25
-	octave2
-	note $c0
-	note $02
-	octave3
-	note $30
-	note $02
-	note $50
-	note $02
-	note $90
-	note $02
-	note $c0
-	note $02
-	octave4
-	note $30
-	note $02
-	note $50
-	note $02
-	note $90
-	note $02
-	note $31
-	note $05
-	note $31
-	octave3
-	note $c1
-	note $91
-	note $c1
-	note $51
-	note $05
+	notetype $6, $25
+	octave 2
+	note B_, 0
+	note __, 2
+	octave 3
+	note D_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	note B_, 0
+	note __, 2
+	octave 4
+	note D_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	note D_, 1
+	note __, 5
+	note D_, 1
+	octave 3
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	note E_, 1
+	note __, 5
 	intensity $14
-	octave2
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	note $80
-	note $60
-	note $51
+	octave 2
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
+	note F_, 0
+	note E_, 1
 	intensity $14
-	callchannel _Music_ShowMeAround_sub_0xedcef
-	callchannel _Music_ShowMeAround_sub_0xedcef
-	callchannel _Music_ShowMeAround_sub_0xedcef
-	callchannel _Music_ShowMeAround_sub_0xedd0f
-	callchannel _Music_ShowMeAround_sub_0xedcef
-	callchannel _Music_ShowMeAround_sub_0xedd0f
-	loopchannel $00, $5cd9 ; end
-; 0xedcef
 
-_Music_ShowMeAround_sub_0xedcef: ; 0xedcef
-; subroutine
-	octave2
-	note $a1
-	note $05
-	octave4
-	note $51
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave4
-	note $77
-	note $41
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $51
-	note $05
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $31
-	note $05
-	note $23
-	note $31
-	note $01
-	endchannel ; end
-; 0xedd0f
+Music_ShowMeAround_branch_edcd9: ; edcd9
+	callchannel Music_ShowMeAround_branch_edcef
+	callchannel Music_ShowMeAround_branch_edcef
+	callchannel Music_ShowMeAround_branch_edcef
+	callchannel Music_ShowMeAround_branch_edd0f
+	callchannel Music_ShowMeAround_branch_edcef
+	callchannel Music_ShowMeAround_branch_edd0f
+	loopchannel 0, Music_ShowMeAround_branch_edcd9
+; edcef
 
-_Music_ShowMeAround_sub_0xedd0f: ; 0xedd0f
-; subroutine
-	octave2
-	note $a1
-	note $05
-	octave4
-	note $51
-	note $01
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $31
-	note $01
-	octave4
-	note $77
-	note $41
-	note $01
-	octave2
-	note $91
-	note $05
-	octave4
-	note $31
-	note $01
-	octave3
-	note $c1
-	note $01
-	note $21
-	note $01
-	note $51
-	note $01
-	octave2
-	note $a1
-	note $05
-	endchannel ; end
-; 0xedd30
+Music_ShowMeAround_branch_edcef: ; edcef
+	octave 2
+	note A_, 1
+	note __, 5
+	octave 4
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 7
+	note D#, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 1
+	note __, 5
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 5
+	note C#, 3
+	note D_, 1
+	note __, 1
+	endchannel
+; edd0f
 
-_Music_ShowMeAround_Ch4: ; 0xedd30
-	togglenoise $03
-	notetype $0c
-	note $0f
-	note $07
-	note $31
-	note $41
-	note $73
-	callchannel _Music_ShowMeAround_sub_0xedd4f
-	callchannel _Music_ShowMeAround_sub_0xedd4f
-	callchannel _Music_ShowMeAround_sub_0xedd4f
-	callchannel _Music_ShowMeAround_sub_0xedd5e
-	callchannel _Music_ShowMeAround_sub_0xedd4f
-	callchannel _Music_ShowMeAround_sub_0xedd5e
-	loopchannel $00, $5d39 ; end
-; 0xedd4f
+Music_ShowMeAround_branch_edd0f: ; edd0f
+	octave 2
+	note A_, 1
+	note __, 5
+	octave 4
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 7
+	note D#, 1
+	note __, 1
+	octave 2
+	note G#, 1
+	note __, 5
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	octave 2
+	note A_, 1
+	note __, 5
+	endchannel
 
-_Music_ShowMeAround_sub_0xedd4f: ; 0xedd4f
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $81
-	note $81
-	note $73
-	note $31
-	note $41
-	note $73
-	note $31
-	note $81
-	note $81
-	note $31
-	note $41
-	endchannel ; end
-; 0xedd5e
+Music_ShowMeAround_Ch4: ; edd30
+	togglenoise $3
+	notetype $c
+	note __, 15
+	note __, 7
+	note D_, 1
+	note D#, 1
+	note F#, 3
 
-_Music_ShowMeAround_sub_0xedd5e: ; 0xedd5e
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $81
-	note $81
-	note $73
-	note $31
-	note $41
-	note $73
-	note $31
-	note $31
-	note $31
-	note $31
-	note $71
-	endchannel ; end
-; 0xedd6d
+Music_ShowMeAround_branch_edd39: ; edd39
+	callchannel Music_ShowMeAround_branch_edd4f
+	callchannel Music_ShowMeAround_branch_edd4f
+	callchannel Music_ShowMeAround_branch_edd4f
+	callchannel Music_ShowMeAround_branch_edd5e
+	callchannel Music_ShowMeAround_branch_edd4f
+	callchannel Music_ShowMeAround_branch_edd5e
+	loopchannel 0, Music_ShowMeAround_branch_edd39
+; edd4f
+
+Music_ShowMeAround_branch_edd4f: ; edd4f
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note F#, 3
+	note D_, 1
+	note D#, 1
+	note F#, 3
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note D#, 1
+	endchannel
+; edd5e
+
+Music_ShowMeAround_branch_edd5e: ; edd5e
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note G_, 1
+	note G_, 1
+	note F#, 3
+	note D_, 1
+	note D#, 1
+	note F#, 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note F#, 1
+	endchannel
+; edd6d
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -1,247 +1,249 @@
-_Music_SproutTower: ; 0xf6974
-	db $c0
-	dw _Music_SproutTower_Ch1
-	db $01
-	dw _Music_SproutTower_Ch2
-	db $02
-	dw _Music_SproutTower_Ch3
-	db $03
-	dw _Music_SproutTower_Ch4
-; 0xf6980
+Music_SproutTower: ; f6974
+	dbw $c0, Music_SproutTower_Ch1
+	dbw $01, Music_SproutTower_Ch2
+	dbw $02, Music_SproutTower_Ch3
+	dbw $03, Music_SproutTower_Ch4
+; f6980
 
-_Music_SproutTower_Ch1: ; 0xf6980
-	tempo $b000
+
+Music_SproutTower_Ch1: ; f6980
+	tempo 176
 	volume $77
-	dutycycle $03
-	tone $0200
-	vibrato $08, $45
-	stereopanning $0f
-	notetype $0c, $a3
-	note $0f
-	note $0f
-	note $05
-	octave3
-	note $61
-	note $73
-	note $73
-	note $63
-	note $13
-	note $23
-	note $43
-	note $43
-	note $43
-	note $73
-	note $73
-	note $61
-	note $71
-	note $91
-	note $71
-	note $63
-	note $71
-	note $49
-	note $71
-	note $61
-	note $41
-	note $21
+	dutycycle $3
+	tone $0002
+	vibrato $8, $45
+	stereopanning $f
+	notetype $c, $a3
+	note __, 15
+	note __, 15
+
+Music_SproutTower_branch_f6994: ; f6994
+	note __, 5
+	octave 3
+	note F_, 1
+	note F#, 3
+	note F#, 3
+	note F_, 3
+	note C_, 3
+	note C#, 3
+	note D#, 3
+	note D#, 3
+	note D#, 3
+	note F#, 3
+	note F#, 3
+	note F_, 1
+	note F#, 1
+	note G#, 1
+	note F#, 1
+	note F_, 3
+	note F#, 1
+	note D#, 9
+	note F#, 1
+	note F_, 1
+	note D#, 1
+	note C#, 1
 	intensity $a5
-	note $17
+	note C_, 7
 	intensity $a3
-	note $21
-	note $11
-	octave2
-	note $b1
-	octave3
-	note $21
+	note C#, 1
+	note C_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 1
 	intensity $a7
-	note $1f
+	note C_, 15
 	intensity $a3
-	note $63
-	note $63
-	note $73
-	note $73
-	note $63
-	note $63
-	note $43
-	note $43
-	loopchannel $00, $6994 ; end
-; 0xf69c8
+	note F_, 3
+	note F_, 3
+	note F#, 3
+	note F#, 3
+	note F_, 3
+	note F_, 3
+	note D#, 3
+	note D#, 3
+	loopchannel 0, Music_SproutTower_branch_f6994
 
-_Music_SproutTower_Ch2: ; 0xf69c8
-	dutycycle $03
-	tone $0100
-	vibrato $08, $48
-	notetype $0c, $b2
-	octave3
-	note $63
-	note $63
-	note $73
-	note $73
-	note $63
-	note $63
-	note $43
-	note $43
+Music_SproutTower_Ch2: ; f69c8
+	dutycycle $3
+	tone $0001
+	vibrato $8, $48
+	notetype $c, $b2
+	octave 3
+	note F_, 3
+	note F_, 3
+	note F#, 3
+	note F#, 3
+	note F_, 3
+	note F_, 3
+	note D#, 3
+	note D#, 3
+
+Music_SproutTower_branch_f69dc: ; f69dc
 	intensity $b5
-	octave4
-	note $13
-	octave3
-	note $b3
-	octave4
-	note $23
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $73
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C#, 3
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F#, 3
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b5
-	note $73
-	note $b3
-	octave4
-	note $11
-	note $21
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $21
-	note $41
-	note $21
-	note $17
+	note F#, 3
+	note A#, 3
+	octave 4
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note C#, 1
+	note C_, 7
 	intensity $b5
-	note $21
-	note $11
-	octave3
-	note $b1
-	note $71
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F#, 1
 	intensity $b7
-	note $b7
+	note A#, 7
 	intensity $b5
-	octave4
-	note $11
-	octave3
-	note $b1
-	note $71
-	note $41
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 1
+	note F#, 1
+	note D#, 1
 	intensity $b7
-	note $67
+	note F_, 7
 	intensity $b3
-	note $63
-	note $63
-	note $73
-	note $b1
-	note $60
-	note $b0
+	note F_, 3
+	note F_, 3
+	note F#, 3
+	note A#, 1
+	note F_, 0
+	note A#, 0
 	intensity $b7
-	octave4
-	note $1f
-	note $0f
-	loopchannel $00, $69dc ; end
-; 0xf6a25
+	octave 4
+	note C_, 15
+	note __, 15
+	loopchannel 0, Music_SproutTower_branch_f69dc
 
-_Music_SproutTower_Ch3: ; 0xf6a25
+Music_SproutTower_Ch3: ; f6a25
 	vibrato $14, $e8
-	notetype $0c, $14
-	octave3
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $71
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $71
+	notetype $c, $14
+	octave 3
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
 	stereopanning $f0
-	note $03
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $71
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $61
-	note $41
-	note $01
-	octave2
-	note $b1
-	octave3
-	note $41
-	note $71
-	note $41
-	note $01
-	note $71
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $71
-	note $67
-	note $73
-	note $b3
-	note $47
-	note $63
-	note $73
-	note $6f
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $61
-	note $61
-	note $01
-	note $11
-	note $61
-	note $71
-	note $41
-	note $01
-	note $61
-	loopchannel $00, $6a3e ; end
-; 0xf6a7a
 
-_Music_SproutTower_Ch4: ; 0xf6a7a
-	togglenoise $00
-	notetype $0c
-	note $03
-	note $73
+Music_SproutTower_branch_f6a3e: ; f6a3e
+	note __, 3
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note D#, 1
+	note __, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note F_, 7
+	note F#, 3
+	note A#, 3
+	note D#, 7
+	note F_, 3
+	note F#, 3
+	note F_, 15
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 1
+	note F#, 1
+	note D#, 1
+	note __, 1
+	note F_, 1
+	loopchannel 0, Music_SproutTower_branch_f6a3e
+
+Music_SproutTower_Ch4: ; f6a7a
+	togglenoise $0
+	notetype $c
+	note __, 3
+
+Music_SproutTower_branch_f6a7f: ; f6a7f
+	note F#, 3
 	stereopanning $f0
-	note $43
-	note $71
-	stereopanning $0f
-	note $41
+	note D#, 3
+	note F#, 1
+	stereopanning $f
+	note D#, 1
 	stereopanning $ff
-	note $73
-	note $73
-	stereopanning $0f
-	note $43
-	note $71
+	note F#, 3
+	note F#, 3
+	stereopanning $f
+	note D#, 3
+	note F#, 1
 	stereopanning $f0
-	note $41
+	note D#, 1
 	stereopanning $ff
-	note $73
-	loopchannel $00, $6a7f ; end
-; 0xf6a99
+	note F#, 3
+	loopchannel 0, Music_SproutTower_branch_f6a7f
+; f6a99
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -1,1197 +1,1191 @@
-_Music_SSAqua: ; 0xead99
-	db $c0
-	dw _Music_SSAqua_Ch1
-	db $01
-	dw _Music_SSAqua_Ch2
-	db $02
-	dw _Music_SSAqua_Ch3
-	db $03
-	dw _Music_SSAqua_Ch4
-; 0xeada5
+Music_SSAqua: ; ead99
+	dbw $c0, Music_SSAqua_Ch1
+	dbw $01, Music_SSAqua_Ch2
+	dbw $02, Music_SSAqua_Ch3
+	dbw $03, Music_SSAqua_Ch4
+; eada5
 
-_Music_SSAqua_Ch1: ; 0xeada5
-	tempo $7500
+
+Music_SSAqua_Ch1: ; eada5
+	tempo 117
 	volume $77
-	stereopanning $0f
-	tone $0100
+	stereopanning $f
+	tone $0001
 	vibrato $12, $33
-	dutycycle $02
-	notetype $06, $97
-	octave2
-	note $80
-	note $00
-	note $80
-	note $00
-	octave2
-	note $8f
-	note $07
-	note $81
-	note $01
-	notetype $0c, $97
-	note $81
-	note $89
-	note $03
-	notetype $06, $97
-	note $80
-	note $00
-	note $80
-	note $00
-	note $8f
-	note $07
-	note $81
-	note $01
-	notetype $0c, $97
-	note $81
-	note $87
-	note $07
-	dutycycle $01
+	dutycycle $2
+	notetype $6, $97
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+
+Music_SSAqua_branch_eadbc: ; eadbc
+	octave 2
+	note G_, 15
+	note __, 7
+	note G_, 1
+	note __, 1
+	notetype $c, $97
+	note G_, 1
+	note G_, 9
+	note __, 3
+	notetype $6, $97
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 15
+	note __, 7
+	note G_, 1
+	note __, 1
+	notetype $c, $97
+	note G_, 1
+	note G_, 7
+	note __, 7
+	dutycycle $1
 	intensity $61
-	callchannel _Music_SSAqua_sub_0xeaff5
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	callchannel _Music_SSAqua_sub_0xeaff5
-	callchannel _Music_SSAqua_sub_0xeb03e
-	note $0f
-	note $0f
-	note $0f
+	callchannel Music_SSAqua_branch_eaff5
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	callchannel Music_SSAqua_branch_eaff5
+	callchannel Music_SSAqua_branch_eb03e
+	note __, 15
+	note __, 15
+	note __, 15
 	intensity $97
-	note $0d
-	notetype $06, $97
-	note $30
-	note $00
-	octave3
-	note $b0
-	note $00
-	notetype $0c, $97
-	note $0f
-	note $0f
+	note __, 13
+	notetype $6, $97
+	note D_, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	notetype $c, $97
+	note __, 15
+	note __, 15
 	intensity $95
-	note $01
-	octave4
-	note $10
-	note $50
-	note $80
-	note $00
-	note $50
-	note $10
-	octave3
-	note $50
-	note $10
-	note $50
-	note $80
-	octave4
-	note $10
-	note $50
-	note $80
-	octave5
-	note $10
-	octave4
-	note $55
-	note $31
-	note $10
-	note $30
-	note $70
-	note $a0
-	octave5
-	note $10
-	note $30
-	octave4
-	note $80
-	note $70
-	dutycycle $02
+	note __, 1
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note __, 0
+	note E_, 0
+	note C_, 0
+	octave 3
+	note E_, 0
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 4
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	octave 5
+	note C_, 0
+	octave 4
+	note E_, 5
+	note D_, 1
+	note C_, 0
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	octave 5
+	note C_, 0
+	note D_, 0
+	octave 4
+	note G_, 0
+	note F#, 0
+	dutycycle $2
 	intensity $97
-	note $87
-	note $77
-	note $57
-	note $37
-	octave3
-	note $c7
-	note $b1
-	note $01
-	note $c0
-	note $00
-	octave4
-	note $71
+	note G_, 7
+	note F#, 7
+	note E_, 7
+	note D_, 7
+	octave 3
+	note B_, 7
+	note A#, 1
+	note __, 1
+	note B_, 0
+	note __, 0
+	octave 4
+	note F#, 1
 	intensity $75
-	octave5
-	note $a3
-	note $73
-	note $33
-	octave4
-	note $b1
-	notetype $06, $97
-	note $30
-	note $00
-	octave3
-	note $b0
-	note $00
+	octave 5
+	note A_, 3
+	note F#, 3
+	note D_, 3
+	octave 4
+	note A#, 1
+	notetype $6, $97
+	note D_, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
 	intensity $97
-	note $8f
-	note $af
-	note $c3
-	note $03
-	note $c3
-	note $03
-	octave4
-	note $57
-	note $87
-	note $70
-	vibrato $00, $00
+	note G_, 15
+	note A_, 15
+	note B_, 3
+	note __, 3
+	note B_, 3
+	note __, 3
+	octave 4
+	note E_, 7
+	note G_, 7
+	note F#, 0
+	vibrato $0, $0
 	intensity $88
-	note $89
-	vibrato $02, $23
+	note G_, 9
+	vibrato $2, $23
 	intensity $87
-	note $88
-	vibrato $08, $33
-	note $13
-	note $53
-	note $13
-	note $3b
-	note $7b
-	note $07
-	octave2
-	note $c1
-	octave3
-	note $31
-	note $71
-	note $a1
-	note $31
-	note $71
-	note $a1
-	octave4
-	note $31
-	note $71
-	notetype $0c, $97
-	note $06
-	note $0f
-	note $0f
-	note $87
-	note $70
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	octave3
-	note $a0
-	note $70
-	note $30
-	octave2
-	note $a0
-	note $c0
-	octave3
-	note $30
-	note $70
-	note $a0
-	note $30
-	note $70
-	note $a0
-	octave4
-	note $30
-	note $70
-	note $06
-	note $0f
-	note $01
-	note $51
-	note $80
-	note $00
-	note $50
-	notetype $06, $97
-	note $00
-	note $10
-	note $23
-	octave3
-	note $c1
-	note $01
-	note $a2
-	note $00
-	note $81
-	note $01
-	note $71
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $a1
-	note $71
-	note $31
-	note $a1
-	octave4
-	note $31
-	octave3
-	note $a1
-	note $71
-	note $a1
-	octave4
-	note $11
-	note $31
-	note $71
-	note $a1
-	loopchannel $00, $6dbc ; end
-; 0xeaeca
+	note G_, 8
+	vibrato $8, $33
+	note C_, 3
+	note E_, 3
+	note C_, 3
+	note D_, 11
+	note F#, 11
+	note __, 7
+	octave 2
+	note B_, 1
+	octave 3
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 1
+	notetype $c, $97
+	note __, 6
+	note __, 15
+	note __, 15
+	note G_, 7
+	note F#, 0
+	note D_, 0
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note A_, 0
+	note F#, 0
+	note D_, 0
+	octave 2
+	note A_, 0
+	note B_, 0
+	octave 3
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	octave 4
+	note D_, 0
+	note F#, 0
+	note __, 6
+	note __, 15
+	note __, 1
+	note E_, 1
+	note G_, 0
+	note __, 0
+	note E_, 0
+	notetype $6, $97
+	note __, 0
+	note C_, 0
+	note C#, 3
+	octave 3
+	note B_, 1
+	note __, 1
+	note A_, 2
+	note __, 0
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note A_, 1
+	note F#, 1
+	note D_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	loopchannel 0, Music_SSAqua_branch_eadbc
+; eaeca
 
-_Music_SSAqua_Ch2: ; 0xeaeca
+Music_SSAqua_Ch2: ; eaeca
 	stereopanning $f0
-	dutycycle $02
-	vibrato $08, $33
-	notetype $0c, $b7
-	note $01
-	notetype $0c, $b7
-	dutycycle $01
+	dutycycle $2
+	vibrato $8, $33
+	notetype $c, $b7
+	note __, 1
+
+Music_SSAqua_branch_eaed5: ; eaed5
+	notetype $c, $b7
+	dutycycle $1
 	intensity $61
-	callchannel _Music_SSAqua_sub_0xeaff5
-	callchannel _Music_SSAqua_sub_0xeb03e
-	dutycycle $02
+	callchannel Music_SSAqua_branch_eaff5
+	callchannel Music_SSAqua_branch_eb03e
+	dutycycle $2
 	intensity $d7
-	callchannel _Music_SSAqua_sub_0xeafe0
-	note $c0
-	note $00
-	note $80
-	note $02
-	octave3
-	note $85
-	note $80
-	note $c0
-	octave4
-	note $20
-	note $50
-	forceoctave $0c
-	callchannel _Music_SSAqua_sub_0xeafe0
-	forceoctave $00
-	octave3
-	note $c0
-	note $00
-	note $80
-	note $02
-	octave4
-	note $85
-	note $01
-	dutycycle $03
+	callchannel Music_SSAqua_branch_eafe0
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 2
+	octave 3
+	note G_, 5
+	note G_, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	note E_, 0
+	forceoctave $c
+	callchannel Music_SSAqua_branch_eafe0
+	forceoctave $0
+	octave 3
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 2
+	octave 4
+	note G_, 5
+	note __, 1
+	dutycycle $3
 	intensity $b7
-	octave3
-	note $c0
-	octave4
-	note $10
-	callchannel _Music_SSAqua_sub_0xeaf88
-	note $83
-	note $03
-	note $87
-	note $a7
-	note $c7
-	notetype $0c, $b7
-	octave5
-	note $19
-	note $31
-	note $11
-	octave4
-	note $81
-	note $c5
-	note $a5
-	note $01
-	octave3
-	note $c0
-	octave4
-	note $10
-	callchannel _Music_SSAqua_sub_0xeaf88
-	note $83
-	note $03
-	note $87
-	note $a7
-	note $c7
-	octave5
-	note $40
-	vibrato $00, $00
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	callchannel Music_SSAqua_branch_eaf88
+	note G_, 3
+	note __, 3
+	note G_, 7
+	note A_, 7
+	note B_, 7
+	notetype $c, $b7
+	octave 5
+	note C_, 9
+	note D_, 1
+	note C_, 1
+	octave 4
+	note G_, 1
+	note B_, 5
+	note A_, 5
+	note __, 1
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	callchannel Music_SSAqua_branch_eaf88
+	note G_, 3
+	note __, 3
+	note G_, 7
+	note A_, 7
+	note B_, 7
+	octave 5
+	note D#, 0
+	vibrato $0, $0
 	intensity $98
-	note $59
-	vibrato $04, $23
+	note E_, 9
+	vibrato $4, $23
 	intensity $97
-	note $58
-	vibrato $08, $23
-	note $33
-	note $13
-	octave4
-	note $83
-	note $cb
-	note $ab
-	note $03
-	dutycycle $00
-	note $c1
-	note $a1
-	callchannel _Music_SSAqua_sub_0xeafd5
-	notetype $06, $b7
-	note $90
-	note $aa
-	note $81
-	note $71
-	note $8b
-	note $03
-	note $03
-	note $51
-	note $01
-	note $51
-	note $01
-	note $81
-	note $01
-	note $a1
-	note $01
-	note $51
-	note $01
-	note $71
-	note $01
-	note $81
-	note $01
-	note $af
-	note $bb
-	note $c1
-	note $a1
-	callchannel _Music_SSAqua_sub_0xeafd5
-	notetype $06, $b7
-	note $90
-	note $aa
-	note $c3
-	note $8b
-	note $03
-	note $03
-	octave5
-	note $13
-	note $31
-	note $01
-	note $11
-	note $00
-	octave4
-	note $b0
-	note $c3
-	note $a1
-	note $01
-	note $83
-	note $51
-	note $01
-	note $77
-	note $87
-	note $a7
-	note $07
-	loopchannel $00, $6ed5 ; end
-; 0xeaf88
+	note E_, 8
+	vibrato $8, $23
+	note D_, 3
+	note C_, 3
+	octave 4
+	note G_, 3
+	note B_, 11
+	note A_, 11
+	note __, 3
+	dutycycle $0
+	note B_, 1
+	note A_, 1
+	callchannel Music_SSAqua_branch_eafd5
+	notetype $6, $b7
+	note G#, 0
+	note A_, 10
+	note G_, 1
+	note F#, 1
+	note G_, 11
+	note __, 3
+	note __, 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 15
+	note A#, 11
+	note B_, 1
+	note A_, 1
+	callchannel Music_SSAqua_branch_eafd5
+	notetype $6, $b7
+	note G#, 0
+	note A_, 10
+	note B_, 3
+	note G_, 11
+	note __, 3
+	note __, 3
+	octave 5
+	note C_, 3
+	note D_, 1
+	note __, 1
+	note C_, 1
+	note __, 0
+	octave 4
+	note A#, 0
+	note B_, 3
+	note A_, 1
+	note __, 1
+	note G_, 3
+	note E_, 1
+	note __, 1
+	note F#, 7
+	note G_, 7
+	note A_, 7
+	note __, 7
+	loopchannel 0, Music_SSAqua_branch_eaed5
+; eaf88
 
-_Music_SSAqua_sub_0xeaf88: ; 0xeaf88
-; subroutine
-	note $35
-	octave3
-	note $c0
-	octave4
-	note $10
-	note $31
-	octave3
-	note $c0
-	octave4
-	note $10
-	note $31
-	octave3
-	note $c0
-	octave4
-	note $10
-	note $31
-	note $01
-	note $81
-	note $01
-	note $a1
-	note $01
-	note $b1
-	note $01
-	note $c5
-	note $75
-	note $03
-	dutycycle $01
-	notetype $06, $b7
-	octave3
-	note $a0
-	note $00
-	octave4
-	note $30
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $30
-	note $00
-	note $70
-	note $00
-	note $a0
-	note $00
-	octave5
-	note $30
-	note $00
-	note $70
-	note $00
-	note $30
-	note $00
-	octave4
-	note $b0
-	note $00
-	note $70
-	note $00
-	note $b0
-	note $00
-	note $70
-	note $00
-	dutycycle $03
-	note $51
-	note $71
-	note $8b
-	note $51
-	note $71
-	note $83
-	note $51
-	note $71
-	note $83
-	note $51
-	note $71
-	endchannel ; end
-; 0xeafd5
+Music_SSAqua_branch_eaf88: ; eaf88
+	note D_, 5
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 1
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 1
+	octave 3
+	note B_, 0
+	octave 4
+	note C_, 0
+	note D_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note B_, 5
+	note F#, 5
+	note __, 3
+	dutycycle $1
+	notetype $6, $b7
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 5
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 4
+	note A#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	dutycycle $3
+	note E_, 1
+	note F#, 1
+	note G_, 11
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note E_, 1
+	note F#, 1
+	endchannel
+; eafd5
 
-_Music_SSAqua_sub_0xeafd5: ; 0xeafd5
-; subroutine
-	notetype $0c, $b7
-	note $c9
-	note $70
-	note $00
-	note $c0
-	note $00
-	note $70
-	note $00
-	endchannel ; end
-; 0xeafe0
+Music_SSAqua_branch_eafd5: ; eafd5
+	notetype $c, $b7
+	note B_, 9
+	note F#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	endchannel
+; eafe0
 
-_Music_SSAqua_sub_0xeafe0: ; 0xeafe0
-; subroutine
-	octave3
-	note $39
-	note $50
-	note $02
-	note $30
-	note $00
-	note $2b
-	octave2
-	note $a0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $17
-	note $01
-	octave2
-	note $c0
-	note $02
-	note $a0
-	note $00
-	endchannel ; end
-; 0xeaff5
+Music_SSAqua_branch_eafe0: ; eafe0
+	octave 3
+	note D_, 9
+	note E_, 0
+	note __, 2
+	note D_, 0
+	note __, 0
+	note C#, 11
+	octave 2
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note C_, 7
+	note __, 1
+	octave 2
+	note B_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	endchannel
+; eaff5
 
-_Music_SSAqua_sub_0xeaff5: ; 0xeaff5
-; subroutine
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	octave5
-	note $80
-	note $20
-	octave4
-	note $b0
-	note $80
-	octave5
-	note $80
-	note $20
-	octave4
-	note $b0
-	note $80
-	octave5
-	note $80
-	note $20
-	octave4
-	note $b0
-	note $80
-	octave5
-	note $80
-	note $20
-	octave4
-	note $b0
-	note $80
-	octave5
-	note $80
-	note $10
-	octave4
-	note $a0
-	note $80
-	octave5
-	note $80
-	note $10
-	octave4
-	note $a0
-	note $80
-	octave5
-	note $80
-	note $10
-	octave4
-	note $a0
-	note $80
-	octave5
-	note $80
-	note $10
-	octave4
-	note $a0
-	note $80
-	endchannel ; end
-; 0xeb03e
+Music_SSAqua_branch_eaff5: ; eaff5
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C#, 0
+	octave 4
+	note A#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C#, 0
+	octave 4
+	note A#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C#, 0
+	octave 4
+	note A#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C#, 0
+	octave 4
+	note A#, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C_, 0
+	octave 4
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C_, 0
+	octave 4
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C_, 0
+	octave 4
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note C_, 0
+	octave 4
+	note A_, 0
+	note G_, 0
+	endchannel
+; eb03e
 
-_Music_SSAqua_sub_0xeb03e: ; 0xeb03e
-; subroutine
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	octave5
-	note $80
-	octave4
-	note $c0
-	note $a0
-	note $80
-	octave5
-	note $80
-	note $30
-	octave4
-	note $c0
-	note $80
-	note $c0
-	note $80
-	note $20
-	octave3
-	note $80
-	endchannel ; end
-; 0xeb056
+Music_SSAqua_branch_eb03e: ; eb03e
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	octave 4
+	note B_, 0
+	note A_, 0
+	note G_, 0
+	octave 5
+	note G_, 0
+	note D_, 0
+	octave 4
+	note B_, 0
+	note G_, 0
+	note B_, 0
+	note G_, 0
+	note C#, 0
+	octave 3
+	note G_, 0
+	endchannel
 
-_Music_SSAqua_Ch3: ; 0xeb056
+Music_SSAqua_Ch3: ; eb056
 	stereopanning $ff
-	vibrato $08, $34
-	notetype $06, $15
-	octave2
-	note $80
-	note $00
-	note $80
-	note $00
-	note $8f
-	note $07
-	note $81
-	note $01
-	notetype $0c, $15
-	note $81
-	note $89
-	note $03
-	notetype $06, $15
-	note $80
-	note $00
-	note $80
-	note $00
-	note $8f
-	note $07
-	note $81
-	note $01
-	notetype $0c, $15
-	note $81
-	note $87
-	note $c0
-	octave3
-	note $20
-	note $30
-	note $80
-	note $30
-	note $80
-	note $c0
-	octave4
-	note $50
-	callchannel _Music_SSAqua_sub_0xeb14d
-	callchannel _Music_SSAqua_sub_0xeb14d
-	note $81
-	note $01
-	octave3
-	note $80
-	note $02
-	octave2
-	note $81
-	note $01
-	octave3
-	note $80
-	note $02
-	octave2
-	note $81
-	note $01
-	octave3
-	note $80
-	note $02
-	octave2
-	note $81
-	note $01
-	octave3
-	note $80
-	note $00
-	octave2
-	note $80
-	note $00
-	loopchannel $04, $708d
-	callchannel _Music_SSAqua_sub_0xeb172
-	callchannel _Music_SSAqua_sub_0xeb172
-	callchannel _Music_SSAqua_sub_0xeb230
-	octave3
-	note $51
-	note $01
-	octave4
-	note $50
-	note $02
-	octave3
-	note $41
-	note $01
-	octave4
-	note $40
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $30
-	note $02
-	octave3
-	note $41
-	note $01
-	octave4
-	note $40
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $10
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $10
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $20
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $20
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $70
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $70
-	note $02
-	callchannel _Music_SSAqua_sub_0xeb230
-	octave3
-	note $51
-	note $01
-	octave4
-	note $50
-	note $02
-	octave3
-	note $51
-	note $01
-	octave4
-	note $40
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $20
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $20
-	note $02
-	octave3
-	note $11
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $11
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $21
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $21
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $70
-	note $02
-	octave3
-	note $31
-	note $01
-	octave2
-	note $80
-	note $00
-	note $80
-	note $00
-	loopchannel $00, $7063 ; end
-; 0xeb14d
+	vibrato $8, $34
+	notetype $6, $15
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
 
-_Music_SSAqua_sub_0xeb14d: ; 0xeb14d
-; subroutine
-	notetype $06, $15
-	octave2
-	note $81
-	note $05
-	note $81
-	note $05
-	note $81
-	note $01
-	octave3
-	note $81
-	note $01
-	octave2
-	note $81
-	note $03
-	note $80
-	note $00
-	note $81
-	note $05
-	note $81
-	note $01
-	octave3
-	note $80
-	note $02
-	octave2
-	note $81
-	note $01
-	octave3
-	note $80
-	note $02
-	octave2
-	note $81
-	note $03
-	note $80
-	note $00
-	endchannel ; end
-; 0xeb172
+Music_SSAqua_branch_eb063: ; eb063
+	note G_, 15
+	note __, 7
+	note G_, 1
+	note __, 1
+	notetype $c, $15
+	note G_, 1
+	note G_, 9
+	note __, 3
+	notetype $6, $15
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 15
+	note __, 7
+	note G_, 1
+	note __, 1
+	notetype $c, $15
+	note G_, 1
+	note G_, 7
+	note B_, 0
+	octave 3
+	note C#, 0
+	note D_, 0
+	note G_, 0
+	note D_, 0
+	note G_, 0
+	note B_, 0
+	octave 4
+	note E_, 0
+	callchannel Music_SSAqua_branch_eb14d
+	callchannel Music_SSAqua_branch_eb14d
 
-_Music_SSAqua_sub_0xeb172: ; 0xeb172
-; subroutine
-	octave2
-	note $81
-	note $01
-	octave4
-	note $30
-	note $02
-	octave2
-	note $81
-	note $01
-	octave4
-	note $30
-	note $02
-	octave2
-	note $81
-	note $01
-	octave4
-	note $50
-	note $02
-	octave2
-	note $81
-	note $01
-	octave4
-	note $50
-	note $00
-	octave2
-	note $80
-	note $00
-	note $81
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $81
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $81
-	note $01
-	octave4
-	note $83
-	note $73
-	note $51
-	note $01
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $b0
-	note $02
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $b0
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $a0
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $a0
-	note $02
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $b0
-	note $02
-	octave2
-	note $b1
-	note $01
-	octave3
-	note $b0
-	note $00
-	note $40
-	note $00
-	note $51
-	note $01
-	octave4
-	note $50
-	note $02
-	octave3
-	note $51
-	note $01
-	octave4
-	note $50
-	note $02
-	octave3
-	note $41
-	note $01
-	octave4
-	note $40
-	note $02
-	octave3
-	note $41
-	note $01
-	octave4
-	note $40
-	note $00
-	octave3
-	note $20
-	note $00
-	note $31
-	note $01
-	octave4
-	note $30
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $30
-	note $02
-	octave3
-	note $21
-	note $01
-	octave4
-	note $c3
-	note $83
-	note $51
-	note $01
-	octave3
-	note $11
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $11
-	note $01
-	octave4
-	note $80
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $50
-	note $02
-	octave2
-	note $a1
-	note $01
-	octave4
-	note $50
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $80
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $70
-	note $02
-	octave3
-	note $31
-	note $01
-	octave4
-	note $70
-	note $02
-	endchannel ; end
-; 0xeb230
+Music_SSAqua_branch_eb08d: ; eb08d
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	loopchannel 4, Music_SSAqua_branch_eb08d
+	callchannel Music_SSAqua_branch_eb172
+	callchannel Music_SSAqua_branch_eb172
+	callchannel Music_SSAqua_branch_eb230
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C_, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C_, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	callchannel Music_SSAqua_branch_eb230
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 0
+	note __, 2
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_SSAqua_branch_eb063
+; eb14d
 
-_Music_SSAqua_sub_0xeb230: ; 0xeb230
-; subroutine
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $70
-	note $02
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $40
-	note $02
-	octave2
-	note $c1
-	note $01
-	octave4
-	note $40
-	note $02
-	endchannel ; end
-; 0xeb249
+Music_SSAqua_branch_eb14d: ; eb14d
+	notetype $6, $15
+	octave 2
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	note __, 1
+	octave 2
+	note G_, 1
+	note __, 3
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 5
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 3
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 3
+	note G_, 0
+	note __, 0
+	endchannel
+; eb172
 
-_Music_SSAqua_Ch4: ; 0xeb249
-	togglenoise $03
-	notetype $0c
-	note $01
-	note $90
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $90
-	note $80
-	loopchannel $0c, $724e
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2bb
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2bb
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2bb
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2c7
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2bb
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2ae
-	callchannel _Music_SSAqua_sub_0xeb2c7
-	loopchannel $00, $724e ; end
-; 0xeb2ae
+Music_SSAqua_branch_eb172: ; eb172
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	note G_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note G_, 1
+	note __, 1
+	octave 4
+	note G_, 3
+	note F#, 3
+	note E_, 1
+	note __, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note A#, 0
+	note __, 2
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note A#, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 0
+	note __, 2
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note A#, 0
+	note __, 2
+	octave 2
+	note A#, 1
+	note __, 1
+	octave 3
+	note A#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 3
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	octave 3
+	note D#, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note D_, 0
+	note __, 2
+	octave 3
+	note C#, 1
+	note __, 1
+	octave 4
+	note B_, 3
+	note G_, 3
+	note E_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note G_, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	endchannel
+; eb230
 
-_Music_SSAqua_sub_0xeb2ae: ; 0xeb2ae
-; subroutine
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	endchannel ; end
-; 0xeb2bb
+Music_SSAqua_branch_eb230: ; eb230
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note F#, 0
+	note __, 2
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	octave 2
+	note B_, 1
+	note __, 1
+	octave 4
+	note D#, 0
+	note __, 2
+	endchannel
 
-_Music_SSAqua_sub_0xeb2bb: ; 0xeb2bb
-; subroutine
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $71
-	endchannel ; end
-; 0xeb2c7
+Music_SSAqua_Ch4: ; eb249
+	togglenoise $3
+	notetype $c
+	note __, 1
 
-_Music_SSAqua_sub_0xeb2c7: ; 0xeb2c7
-; subroutine
-	note $b1
-	note $80
-	note $80
-	note $31
-	note $80
-	note $80
-	note $30
-	note $30
-	note $31
-	note $31
-	note $11
-	endchannel ; end
-; 0xeb2d3
+Music_SSAqua_branch_eb24e: ; eb24e
+	note G#, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G#, 0
+	note G_, 0
+	loopchannel 12, Music_SSAqua_branch_eb24e
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2bb
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2bb
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2bb
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2c7
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2bb
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2ae
+	callchannel Music_SSAqua_branch_eb2c7
+	loopchannel 0, Music_SSAqua_branch_eb24e
+; eb2ae
+
+Music_SSAqua_branch_eb2ae: ; eb2ae
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	endchannel
+; eb2bb
+
+Music_SSAqua_branch_eb2bb: ; eb2bb
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note F#, 1
+	endchannel
+; eb2c7
+
+Music_SSAqua_branch_eb2c7: ; eb2c7
+	note A#, 1
+	note G_, 0
+	note G_, 0
+	note D_, 1
+	note G_, 0
+	note G_, 0
+	note D_, 0
+	note D_, 0
+	note D_, 1
+	note D_, 1
+	note C_, 1
+	endchannel
+; eb2d3
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -1,29 +1,25 @@
-_Music_SuccessfulCapture: ; 0xf4602
-	db $80
-	dw _Music_SuccessfulCapture_Ch1
-	db $01
-	dw _Music_SuccessfulCapture_Ch2
-	db $02
-	dw _Music_SuccessfulCapture_Ch3
-; 0xf460b
+Music_SuccessfulCapture: ; f4602
+	dbw $80, Music_SuccessfulCapture_Ch1
+	dbw $01, Music_SuccessfulCapture_Ch2
+	dbw $02, Music_SuccessfulCapture_Ch3
+; f460b
 
-_Music_SuccessfulCapture_Ch1: ; 0xf460b
-	tempo $7e00
+
+Music_SuccessfulCapture_Ch1: ; f460b
+	tempo 126
 	volume $77
-	dutycycle $03
-	tone $0100
-	notetype $0c, $a1
-	jumpchannel $4536 ; end
-; 0xf461b
+	dutycycle $3
+	tone $0001
+	notetype $c, $a1
+	jumpchannel Music_SuccessfulCapture_branch_f4536
 
-_Music_SuccessfulCapture_Ch2: ; 0xf461b
+Music_SuccessfulCapture_Ch2: ; f461b
 	vibrato $12, $24
-	notetype $0c, $c1
-	dutycycle $02
-	jumpchannel $4585 ; end
-; 0xf4626
+	notetype $c, $c1
+	dutycycle $2
+	jumpchannel Music_SuccessfulCapture_branch_f4585
 
-_Music_SuccessfulCapture_Ch3: ; 0xf4626
-	notetype $0c, $25
-	jumpchannel $45cf ; end
-; 0xf462c
+Music_SuccessfulCapture_Ch3: ; f4626
+	notetype $c, $25
+	jumpchannel Music_SuccessfulCapture_branch_f45cf
+; f462c
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -1,2060 +1,2062 @@
-_Music_SuicuneBattle: ; 0x178b81
-	db $80
-	dw _Music_SuicuneBattle_Ch1
-	db $01
-	dw _Music_SuicuneBattle_Ch2
-	db $02
-	dw _Music_SuicuneBattle_Ch3
-; 0x178b8a
+Music_SuicuneBattle: ; 178b81
+	dbw $80, Music_SuicuneBattle_Ch1
+	dbw $01, Music_SuicuneBattle_Ch2
+	dbw $02, Music_SuicuneBattle_Ch3
+; 178b8a
 
-_Music_SuicuneBattle_Ch1: ; 0x178b8a
-	tempo $6500
+
+Music_SuicuneBattle_Ch1: ; 178b8a
+	tempo 101
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $12, $15
-	notetype $0c, $b7
-	octave4
-	note $a0
-	note $90
-	note $83
-	note $51
-	note $40
-	note $30
-	note $23
-	octave3
-	note $b1
-	note $a0
-	note $90
-	note $83
-	note $51
-	note $40
-	note $30
-	note $23
-	octave2
-	note $b1
-	notetype $0c, $b2
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a1
-	notetype $0c, $b3
-	octave4
-	note $63
-	note $51
-	notetype $0c, $b2
-	octave2
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a1
-	notetype $0c, $b3
-	octave4
-	note $63
-	note $51
-	notetype $0c, $b2
-	octave2
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a1
-	notetype $0c, $b3
-	octave4
-	note $63
-	note $51
-	notetype $0c, $b2
-	octave2
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a3
-	note $a1
-	note $a1
-	note $a1
-	note $a0
-	note $c0
-	octave3
-	note $50
-	note $90
-	notetype $0c, $b4
-	octave2
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $31
-	note $a3
-	note $51
-	note $31
-	note $51
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $83
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $63
-	note $51
-	note $31
-	note $61
-	note $81
-	note $51
-	octave2
-	note $81
-	octave3
-	note $51
-	note $81
-	note $a5
-	note $83
-	note $63
-	note $51
-	note $35
-	octave2
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $31
-	note $51
-	note $31
-	note $a3
-	note $51
-	note $31
-	note $51
-	octave3
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $83
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $63
-	note $51
-	note $31
-	note $61
-	octave4
-	note $11
-	octave3
-	note $81
-	note $11
-	note $a3
-	note $81
-	note $61
-	note $a1
-	note $81
-	note $a1
-	note $11
-	octave4
-	note $13
-	octave3
-	note $a1
-	note $81
-	note $11
-	notetype $0c, $b3
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $01
-	note $53
-	note $31
-	note $11
-	octave2
-	note $c1
-	note $c1
-	octave3
-	note $11
-	note $51
-	note $31
-	note $11
-	octave2
-	note $c1
-	note $a1
-	note $c1
-	octave3
-	note $11
-	octave2
-	note $81
-	note $01
-	notetype $0c, $b6
-	octave3
-	note $89
-	notetype $0c, $b3
-	note $11
-	octave2
-	note $81
-	note $01
-	notetype $0c, $b7
-	octave3
-	note $89
-	notetype $0c, $b3
-	octave2
-	note $c1
-	octave3
-	note $11
-	note $01
-	note $53
-	note $31
-	note $11
-	octave2
-	note $c1
-	note $c1
-	octave3
-	note $11
-	note $51
-	note $31
-	note $11
-	octave2
-	note $c1
-	note $a1
-	note $c1
-	octave3
-	note $81
-	note $11
-	octave4
-	note $11
-	octave3
-	note $81
-	note $71
-	octave2
-	note $c1
-	octave3
-	note $c1
-	note $71
-	note $51
-	octave2
-	note $a1
-	octave3
-	note $a1
-	note $51
-	note $11
-	note $81
-	octave4
-	note $11
-	octave3
-	note $81
-	notetype $0c, $b2
-	octave2
-	note $c1
-	note $c5
-	note $c1
-	note $c5
-	note $c1
-	note $c5
-	note $c1
-	notetype $0c, $b4
-	octave3
-	note $15
-	notetype $0c, $b2
-	octave2
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave2
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave2
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave2
-	note $c1
-	octave3
-	note $11
-	octave2
-	note $c0
-	octave3
-	note $70
-	note $a0
-	octave4
-	note $10
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b5
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	notetype $0c, $b5
-	octave4
-	note $15
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b4
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b4
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	note $c1
-	notetype $0c, $b4
-	octave1
-	note $73
-	notetype $0c, $b2
-	octave3
-	note $c1
-	notetype $0c, $b5
-	octave4
-	note $15
-	notetype $0c, $b7
-	octave2
-	note $c7
-	note $57
-	octave3
-	note $17
-	octave2
-	note $a7
-	note $c7
-	note $57
-	note $69
-	note $11
-	note $31
-	note $11
-	notetype $0c, $a0
-	octave1
-	note $77
-	note $c7
-	note $87
-	octave2
-	note $17
-	octave1
-	note $c7
-	note $57
-	note $67
-	notetype $0c, $a7
-	note $67
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	notetype $0c, $b2
-	note $03
-	octave3
-	note $37
-	note $37
-	note $37
-	note $37
-	note $37
-	note $37
-	note $37
-	note $37
-	note $67
-	note $67
-	note $67
-	note $67
-	note $67
-	note $67
-	note $67
-	note $63
-	note $57
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	note $0f
-	vibrato $08, $24
-	dutycycle $02
-	notetype $0c, $96
-	octave4
-	note $55
-	note $75
-	octave3
-	note $a3
-	octave4
-	note $af
+	notetype $c, $b7
+	octave 4
+	note A_, 0
+	note G#, 0
+	note G_, 3
+	note E_, 1
+	note D#, 0
+	note D_, 0
+	note C#, 3
+	octave 3
+	note A#, 1
+	note A_, 0
+	note G#, 0
+	note G_, 3
+	note E_, 1
+	note D#, 0
+	note D_, 0
+	note C#, 3
+	octave 2
+	note A#, 1
+	notetype $c, $b2
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	notetype $c, $b3
+	octave 4
+	note F_, 3
+	note E_, 1
+	notetype $c, $b2
+	octave 2
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	notetype $c, $b3
+	octave 4
+	note F_, 3
+	note E_, 1
+	notetype $c, $b2
+	octave 2
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	notetype $c, $b3
+	octave 4
+	note F_, 3
+	note E_, 1
+	notetype $c, $b2
+	octave 2
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 0
+	note B_, 0
+	octave 3
+	note E_, 0
+	note G#, 0
+
+Music_SuicuneBattle_branch_178bfc: ; 178bfc
+	notetype $c, $b4
+	octave 2
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note F_, 3
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	note G_, 1
+	note E_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note E_, 1
+	note G_, 1
+	note A_, 5
+	note G_, 3
+	note F_, 3
+	note E_, 1
+	note D_, 5
+	octave 2
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note F_, 3
+	note E_, 1
+	note D_, 1
+	note F_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note C_, 1
+	note A_, 3
+	note G_, 1
+	note F_, 1
+	note A_, 1
+	note G_, 1
+	note A_, 1
+	note C_, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A_, 1
+	note G_, 1
+	note C_, 1
+	notetype $c, $b3
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	note E_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note __, 1
+	notetype $c, $b6
+	octave 3
+	note G_, 9
+	notetype $c, $b3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note __, 1
+	notetype $c, $b7
+	octave 3
+	note G_, 9
+	notetype $c, $b3
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	note E_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	note E_, 1
+	note D_, 1
+	note C_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note G_, 1
+	note C_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note F#, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	notetype $c, $b2
+	octave 2
+	note B_, 1
+	note B_, 5
+	note B_, 1
+	note B_, 5
+	note B_, 1
+	note B_, 5
+	note B_, 1
+	notetype $c, $b4
+	octave 3
+	note C_, 5
+	notetype $c, $b2
+	octave 2
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 2
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 2
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 0
+	octave 3
+	note F#, 0
+	note A_, 0
+	octave 4
+	note C_, 0
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b5
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	notetype $c, $b5
+	octave 4
+	note C_, 5
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b4
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b4
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	note B_, 1
+	notetype $c, $b4
+	octave 1
+	note F#, 3
+	notetype $c, $b2
+	octave 3
+	note B_, 1
+	notetype $c, $b5
+	octave 4
+	note C_, 5
+	notetype $c, $b7
+	octave 2
+	note B_, 7
+	note E_, 7
+	octave 3
+	note C_, 7
+	octave 2
+	note A_, 7
+	note B_, 7
+	note E_, 7
+	note F_, 9
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	notetype $c, $a0
+	octave 1
+	note F#, 7
+	note B_, 7
+	note G_, 7
+	octave 2
+	note C_, 7
+	octave 1
+	note B_, 7
+	note E_, 7
+	note F_, 7
+	notetype $c, $a7
+	note F_, 7
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	notetype $c, $b2
+	note __, 3
+	octave 3
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note D_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 7
+	note F_, 3
+	note E_, 7
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 15
+	vibrato $8, $24
+	dutycycle $2
+	notetype $c, $96
+	octave 4
+	note E_, 5
+	note F#, 5
+	octave 3
+	note A_, 3
+	octave 4
+	note A_, 15
 	vibrato $12, $15
-	dutycycle $03
-	loopchannel $00, $4bfc ; end
-; 0x178dec
+	dutycycle $3
+	loopchannel 0, Music_SuicuneBattle_branch_178bfc
 
-_Music_SuicuneBattle_Ch2: ; 0x178dec
-	dutycycle $03
+Music_SuicuneBattle_Ch2: ; 178dec
+	dutycycle $3
 	vibrato $14, $34
-	tone $0100
-	notetype $0c, $c3
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a1
-	octave5
-	note $50
-	octave4
-	note $50
-	note $a5
-	notetype $0c, $c2
-	octave2
-	note $57
-	note $57
-	note $57
-	notetype $0c, $c3
-	octave4
-	note $b3
-	notetype $0c, $c2
-	note $a3
-	octave2
-	note $57
-	note $57
-	note $57
-	notetype $0c, $c3
-	octave4
-	note $b3
-	notetype $0c, $c2
-	note $a3
-	octave4
-	note $57
-	note $57
-	note $57
-	notetype $0c, $c3
-	octave4
-	note $b3
-	notetype $0c, $c2
-	note $a3
-	octave4
-	note $57
-	note $57
-	note $57
-	note $53
-	notetype $0c, $c7
-	octave3
-	note $a7
-	note $c7
-	note $37
-	notetype $0c, $b0
-	octave4
-	note $37
-	notetype $0c, $b6
-	note $37
+	tone $0001
+	notetype $c, $c3
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 1
+	octave 5
+	note E_, 0
+	octave 4
+	note E_, 0
+	note A_, 5
+	notetype $c, $c2
+	octave 2
+	note E_, 7
+	note E_, 7
+	note E_, 7
+	notetype $c, $c3
+	octave 4
+	note A#, 3
+	notetype $c, $c2
+	note A_, 3
+	octave 2
+	note E_, 7
+	note E_, 7
+	note E_, 7
+	notetype $c, $c3
+	octave 4
+	note A#, 3
+	notetype $c, $c2
+	note A_, 3
+	octave 4
+	note E_, 7
+	note E_, 7
+	note E_, 7
+	notetype $c, $c3
+	octave 4
+	note A#, 3
+	notetype $c, $c2
+	note A_, 3
+	octave 4
+	note E_, 7
+	note E_, 7
+	note E_, 7
+	note E_, 3
+
+Music_SuicuneBattle_branch_178e4e: ; 178e4e
+	notetype $c, $c7
+	octave 3
+	note A_, 7
+	note B_, 7
+	note D_, 7
+	notetype $c, $b0
+	octave 4
+	note D_, 7
+	notetype $c, $b6
+	note D_, 7
 	vibrato $10, $24
-	dutycycle $02
-	notetype $0c, $a4
-	octave5
-	note $a5
-	note $c5
-	note $33
-	octave6
-	note $37
+	dutycycle $2
+	notetype $c, $a4
+	octave 5
+	note A_, 5
+	note B_, 5
+	note D_, 3
+	octave 6
+	note D_, 7
 	vibrato $14, $34
-	dutycycle $03
-	notetype $0c, $c7
-	octave4
-	note $17
-	note $37
-	octave3
-	note $87
-	octave4
-	note $67
-	notetype $0c, $b0
-	note $59
-	notetype $0c, $b7
-	note $55
-	notetype $0c, $a5
-	octave2
-	note $83
-	note $a3
-	note $83
-	note $c3
-	notetype $0c, $c7
-	octave3
-	note $a7
-	note $c7
-	note $37
-	notetype $0c, $c7
-	octave4
-	note $37
-	notetype $0c, $4c
-	note $33
-	notetype $0c, $c6
-	note $33
-	notetype $0c, $a4
-	vibrato $08, $24
-	dutycycle $02
-	octave5
-	note $a5
-	note $c5
-	note $33
-	octave6
-	note $37
+	dutycycle $3
+	notetype $c, $c7
+	octave 4
+	note C_, 7
+	note D_, 7
+	octave 3
+	note G_, 7
+	octave 4
+	note F_, 7
+	notetype $c, $b0
+	note E_, 9
+	notetype $c, $b7
+	note E_, 5
+	notetype $c, $a5
+	octave 2
+	note G_, 3
+	note A_, 3
+	note G_, 3
+	note B_, 3
+	notetype $c, $c7
+	octave 3
+	note A_, 7
+	note B_, 7
+	note D_, 7
+	notetype $c, $c7
+	octave 4
+	note D_, 7
+	notetype $c, $4c
+	note D_, 3
+	notetype $c, $c6
+	note D_, 3
+	notetype $c, $a4
+	vibrato $8, $24
+	dutycycle $2
+	octave 5
+	note A_, 5
+	note B_, 5
+	note D_, 3
+	octave 6
+	note D_, 7
 	vibrato $14, $34
-	notetype $0c, $c7
-	dutycycle $03
-	octave4
-	note $17
-	note $37
-	octave3
-	note $87
-	octave4
-	note $67
-	notetype $0c, $4c
-	note $57
-	notetype $0c, $c7
-	note $57
-	notetype $0c, $c6
-	note $17
-	note $87
-	notetype $0c, $c2
-	octave3
-	note $71
-	note $81
-	note $01
-	note $c3
-	note $a1
-	note $81
-	note $71
-	note $71
-	note $81
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $71
-	note $81
-	note $11
-	note $01
-	notetype $0c, $c7
-	octave4
-	note $19
-	notetype $0c, $c3
-	octave4
-	note $81
-	note $11
-	note $01
-	notetype $0c, $c7
-	octave5
-	note $19
-	notetype $0c, $c3
-	octave4
-	note $71
-	note $81
-	note $01
-	note $c3
-	note $a1
-	note $81
-	note $71
-	note $71
-	note $81
-	note $c1
-	note $a1
-	note $81
-	note $71
-	note $51
-	note $71
-	notetype $0c, $c7
-	note $87
-	note $77
-	note $57
-	note $87
-	notetype $0c, $c2
-	octave3
-	note $71
-	note $75
-	note $71
-	note $75
-	note $71
-	note $75
-	note $71
-	notetype $0c, $b7
-	note $85
-	notetype $0c, $c2
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave3
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave3
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave3
-	note $71
-	notetype $0c, $c7
-	note $85
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	notetype $0c, $c7
-	note $85
-	notetype $0c, $c2
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	note $71
-	notetype $0c, $c7
-	octave1
-	note $c3
-	notetype $0c, $c2
-	octave4
-	note $71
-	notetype $0c, $c7
-	note $85
-	notetype $0c, $b0
-	octave3
-	note $77
-	octave2
-	note $c7
-	octave3
-	note $87
-	note $57
-	note $77
-	octave2
-	note $c7
-	octave3
-	note $17
-	notetype $0c, $b7
-	octave3
-	note $17
-	notetype $0c, $c7
-	octave1
-	note $c7
-	octave2
-	note $57
-	note $17
-	note $67
-	note $57
-	octave1
-	note $c7
-	notetype $0c, $b0
-	octave2
-	note $19
-	notetype $0c, $b7
-	octave2
-	note $15
-	notetype $0c, $c3
-	octave1
-	note $c1
-	octave2
-	note $51
-	octave1
-	note $61
-	octave2
-	note $63
-	note $51
-	octave1
-	note $c1
-	note $61
-	note $c1
-	octave2
-	note $51
-	note $61
-	note $51
-	octave1
-	note $c1
-	note $61
-	note $c1
-	octave2
-	note $51
-	octave1
-	note $c1
-	octave2
-	note $51
-	octave1
-	note $61
-	octave2
-	note $63
-	note $51
-	octave1
-	note $c1
-	note $61
-	note $c1
-	octave2
-	note $51
-	note $61
-	note $51
-	octave1
-	note $c1
-	note $61
-	note $c1
-	octave2
-	note $51
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $61
-	octave3
-	note $63
-	note $51
-	octave2
-	note $c1
-	note $61
-	note $c1
-	octave3
-	note $51
-	note $61
-	note $51
-	octave2
-	note $c1
-	note $61
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $61
-	octave3
-	note $63
-	note $51
-	octave2
-	note $c1
-	note $61
-	note $c1
-	octave3
-	note $51
-	note $61
-	note $51
-	octave2
-	note $c1
-	note $61
-	note $c1
-	octave3
-	note $51
-	note $31
-	note $81
-	octave2
-	note $91
-	octave3
-	note $93
-	note $81
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	note $81
-	note $91
-	note $81
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	note $81
-	note $31
-	note $81
-	octave2
-	note $91
-	octave3
-	note $93
-	note $81
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	note $81
-	note $91
-	note $81
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	note $81
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $61
-	octave4
-	note $63
-	note $51
-	octave3
-	note $c1
-	note $61
-	note $c1
-	octave4
-	note $51
-	note $61
-	note $51
-	octave3
-	note $c1
-	note $61
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $61
-	octave4
-	note $63
-	note $51
-	octave3
-	note $c1
-	note $61
-	note $c1
-	octave4
-	note $51
-	note $61
-	note $51
-	octave3
-	note $c1
-	note $61
-	note $c1
-	octave4
-	note $51
-	note $31
-	note $81
-	octave3
-	note $91
-	octave4
-	note $93
-	note $81
-	note $31
-	octave3
-	note $91
-	octave4
-	note $31
-	note $81
-	note $91
-	note $81
-	note $31
-	octave3
-	note $91
-	octave4
-	note $31
-	note $81
-	note $31
-	note $81
-	octave3
-	note $91
-	octave4
-	note $93
-	note $81
-	note $31
-	octave3
-	note $91
-	octave4
-	note $31
-	note $81
-	note $91
-	note $81
-	note $31
-	octave3
-	note $91
-	octave4
-	note $31
-	note $81
-	notetype $0c, $c2
-	note $a7
-	notetype $0c, $c3
-	octave2
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	octave3
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $83
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	note $81
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	note $11
-	note $31
-	octave2
-	note $81
-	octave3
-	note $83
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	note $81
-	note $31
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	note $31
-	octave2
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	note $a1
-	note $c1
-	note $51
-	octave3
-	note $53
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $a1
-	note $51
-	note $a1
-	note $c1
-	loopchannel $00, $4e4e ; end
-; 0x179122
+	notetype $c, $c7
+	dutycycle $3
+	octave 4
+	note C_, 7
+	note D_, 7
+	octave 3
+	note G_, 7
+	octave 4
+	note F_, 7
+	notetype $c, $4c
+	note E_, 7
+	notetype $c, $c7
+	note E_, 7
+	notetype $c, $c6
+	note C_, 7
+	note G_, 7
+	notetype $c, $c2
+	octave 3
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note B_, 3
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note F#, 1
+	note G_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note C_, 1
+	note __, 1
+	notetype $c, $c7
+	octave 4
+	note C_, 9
+	notetype $c, $c3
+	octave 4
+	note G_, 1
+	note C_, 1
+	note __, 1
+	notetype $c, $c7
+	octave 5
+	note C_, 9
+	notetype $c, $c3
+	octave 4
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note B_, 3
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note F#, 1
+	note G_, 1
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	notetype $c, $c7
+	note G_, 7
+	note F#, 7
+	note E_, 7
+	note G_, 7
+	notetype $c, $c2
+	octave 3
+	note F#, 1
+	note F#, 5
+	note F#, 1
+	note F#, 5
+	note F#, 1
+	note F#, 5
+	note F#, 1
+	notetype $c, $b7
+	note G_, 5
+	notetype $c, $c2
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 3
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 3
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 3
+	note F#, 1
+	notetype $c, $c7
+	note G_, 5
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	notetype $c, $c7
+	note G_, 5
+	notetype $c, $c2
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	note F#, 1
+	notetype $c, $c7
+	octave 1
+	note B_, 3
+	notetype $c, $c2
+	octave 4
+	note F#, 1
+	notetype $c, $c7
+	note G_, 5
+	notetype $c, $b0
+	octave 3
+	note F#, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note G_, 7
+	note E_, 7
+	note F#, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note C_, 7
+	notetype $c, $b7
+	octave 3
+	note C_, 7
+	notetype $c, $c7
+	octave 1
+	note B_, 7
+	octave 2
+	note E_, 7
+	note C_, 7
+	note F_, 7
+	note E_, 7
+	octave 1
+	note B_, 7
+	notetype $c, $b0
+	octave 2
+	note C_, 9
+	notetype $c, $b7
+	octave 2
+	note C_, 5
+	notetype $c, $c3
+	octave 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note F_, 1
+	octave 2
+	note F_, 3
+	note E_, 1
+	octave 1
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 1
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note F_, 1
+	octave 2
+	note F_, 3
+	note E_, 1
+	octave 1
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 1
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 2
+	note E_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note F_, 1
+	octave 3
+	note F_, 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note F_, 1
+	octave 3
+	note F_, 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	note D_, 1
+	note G_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note G#, 3
+	note G_, 1
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note G#, 3
+	note G_, 1
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	note G_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note F_, 1
+	octave 4
+	note F_, 3
+	note E_, 1
+	octave 3
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 3
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note F_, 1
+	octave 4
+	note F_, 3
+	note E_, 1
+	octave 3
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	octave 3
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note G#, 3
+	note G_, 1
+	note D_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note D_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note G#, 3
+	note G_, 1
+	note D_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D_, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note D_, 1
+	octave 3
+	note G#, 1
+	octave 4
+	note D_, 1
+	note G_, 1
+	notetype $c, $c2
+	note A_, 7
+	notetype $c, $c3
+	octave 2
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	note D_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 3
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	note E_, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note A_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 1
+	loopchannel 0, Music_SuicuneBattle_branch_178e4e
 
-_Music_SuicuneBattle_Ch3: ; 0x179122
-	notetype $0c, $18
-	note $0f
-	note $03
-	octave2
-	note $a3
-	note $31
-	note $51
-	note $b1
-	note $81
-	note $31
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $a3
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $31
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $a3
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $a3
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $31
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $a3
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $a1
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $31
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $a3
-	note $51
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	note $a3
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $51
-	notetype $0c, $16
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $a1
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	note $31
-	note $a1
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	note $11
-	note $81
-	note $11
-	octave3
-	note $13
-	octave2
-	note $81
-	note $61
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $a1
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	note $31
-	note $a1
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	octave3
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	octave3
-	note $13
-	octave2
-	note $81
-	note $11
-	note $81
-	octave1
-	note $c1
-	octave2
-	note $71
-	note $c1
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	note $c1
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $83
-	note $11
-	octave3
-	note $11
-	octave2
-	note $81
-	note $31
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	octave3
-	note $31
-	octave2
-	note $a1
-	note $31
-	note $a1
-	note $31
-	note $a1
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $81
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave1
-	note $c1
-	octave2
-	note $71
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	note $51
-	note $11
-	note $81
-	note $11
-	note $81
-	note $71
-	note $71
-	note $03
-	note $71
-	note $71
-	note $03
-	note $71
-	note $71
-	note $03
-	note $71
-	note $85
-	note $71
-	note $71
-	note $03
-	note $71
-	note $71
-	note $03
-	note $71
-	note $71
-	note $03
-	note $71
-	note $85
-	note $c1
-	note $c1
-	octave1
-	note $c3
-	octave2
-	note $c1
-	note $c1
-	octave1
-	note $c3
-	octave2
-	note $c1
-	note $c1
-	octave1
-	note $c3
-	octave2
-	note $c1
-	octave3
-	note $15
-	note $71
-	note $71
-	octave1
-	note $c3
-	octave3
-	note $71
-	note $71
-	octave1
-	note $c3
-	octave3
-	note $71
-	note $71
-	octave1
-	note $c3
-	octave3
-	note $71
-	note $85
-	octave2
-	note $77
-	octave1
-	note $c7
-	octave2
-	note $87
-	note $57
-	note $77
-	octave1
-	note $c7
-	octave2
-	note $19
-	note $11
-	note $31
-	note $11
-	octave1
-	note $c7
-	octave2
-	note $57
-	note $17
-	note $67
-	note $57
-	octave1
-	note $c7
-	octave2
-	note $1f
-	note $03
-	octave1
-	note $c1
-	note $05
-	note $c1
-	note $01
-	note $03
-	note $c1
-	note $05
-	note $c1
-	note $01
-	note $03
-	note $c1
-	note $05
-	note $c1
-	note $01
-	note $03
-	note $c1
-	note $05
-	note $c1
-	note $01
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	note $61
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	note $91
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $c1
-	note $61
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $c1
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	note $c1
-	octave1
-	note $c1
-	octave2
-	note $61
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	octave3
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $31
-	note $91
-	note $31
-	note $91
-	octave3
-	note $31
-	octave2
-	note $91
-	octave3
-	note $31
-	octave2
-	note $91
-	note $31
-	note $91
-	note $a3
-	note $03
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $a1
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	octave1
-	note $a1
-	octave2
-	note $31
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	octave3
-	note $11
-	octave2
-	note $11
-	note $81
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	note $a1
-	octave1
-	note $a1
-	octave2
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $51
-	octave1
-	note $a1
-	octave2
-	note $a3
-	note $51
-	note $31
-	note $51
-	loopchannel $00, $5182 ; end
-; 0x17948b
+Music_SuicuneBattle_Ch3: ; 179122
+	notetype $c, $18
+	note __, 15
+	note __, 3
+	octave 2
+	note A_, 3
+	note D_, 1
+	note E_, 1
+	note A#, 1
+	note G_, 1
+	note D_, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note A_, 3
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	note A_, 3
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note E_, 1
+	notetype $c, $16
+
+Music_SuicuneBattle_branch_179182: ; 179182
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 3
+	octave 2
+	note G_, 1
+	note F_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	octave 3
+	note C_, 3
+	octave 2
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	note B_, 1
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 3
+	note C_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	note D_, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	note A_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F#, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note G_, 5
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note G_, 5
+	note B_, 1
+	note B_, 1
+	octave 1
+	note B_, 3
+	octave 2
+	note B_, 1
+	note B_, 1
+	octave 1
+	note B_, 3
+	octave 2
+	note B_, 1
+	note B_, 1
+	octave 1
+	note B_, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note C_, 5
+	note F#, 1
+	note F#, 1
+	octave 1
+	note B_, 3
+	octave 3
+	note F#, 1
+	note F#, 1
+	octave 1
+	note B_, 3
+	octave 3
+	note F#, 1
+	note F#, 1
+	octave 1
+	note B_, 3
+	octave 3
+	note F#, 1
+	note G_, 5
+	octave 2
+	note F#, 7
+	octave 1
+	note B_, 7
+	octave 2
+	note G_, 7
+	note E_, 7
+	note F#, 7
+	octave 1
+	note B_, 7
+	octave 2
+	note C_, 9
+	note C_, 1
+	note D_, 1
+	note C_, 1
+	octave 1
+	note B_, 7
+	octave 2
+	note E_, 7
+	note C_, 7
+	note F_, 7
+	note E_, 7
+	octave 1
+	note B_, 7
+	octave 2
+	note C_, 15
+	note __, 3
+	octave 1
+	note B_, 1
+	note __, 5
+	note B_, 1
+	note __, 1
+	note __, 3
+	note B_, 1
+	note __, 5
+	note B_, 1
+	note __, 1
+	note __, 3
+	note B_, 1
+	note __, 5
+	note B_, 1
+	note __, 1
+	note __, 3
+	note B_, 1
+	note __, 5
+	note B_, 1
+	note __, 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note B_, 1
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	note B_, 1
+	octave 1
+	note B_, 1
+	octave 2
+	note F_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note D_, 1
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G#, 1
+	note D_, 1
+	note G#, 1
+	note A_, 3
+	note __, 3
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note A_, 1
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note D_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note C_, 1
+	note G_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	note A_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note E_, 1
+	octave 1
+	note A_, 1
+	octave 2
+	note A_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	loopchannel 0, Music_SuicuneBattle_branch_179182
+; 17948b
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -1,744 +1,738 @@
-_Music_Surf: ; 0xf518a
-	db $80
-	dw _Music_Surf_Ch1
-	db $01
-	dw _Music_Surf_Ch2
-	db $02
-	dw _Music_Surf_Ch3
-; 0xf5193
+Music_Surf: ; f518a
+	dbw $80, Music_Surf_Ch1
+	dbw $01, Music_Surf_Ch2
+	dbw $02, Music_Surf_Ch3
+; f5193
 
-; 0xf5193
-	db $03
-; 0xf5194
+INCBIN "baserom.gbc", $f5193, $f5194 - $f5193
 
-_Music_Surf_Ch1: ; 0xf5194
-	tempo $6c00
+Music_Surf_Ch1: ; f5194
+	tempo 108
 	volume $77
-	notetype $0c, $a7
-	stereopanning $0f
-	dutycycle $02
+	notetype $c, $a7
+	stereopanning $f
+
+Music_Surf_branch_f519e: ; f519e
+	dutycycle $2
 	vibrato $10, $24
 	intensity $73
-	octave3
-	note $60
-	note $00
-	note $40
-	note $00
+	octave 3
+	note F_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
 	intensity $73
-	note $60
-	note $00
-	note $40
-	note $00
-	note $90
-	note $00
-	note $40
-	note $00
+	note F_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
 	intensity $73
-	note $60
-	note $00
-	note $40
-	note $00
-	note $60
-	note $00
-	note $40
+	note F_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note D#, 0
 	intensity $93
-	note $00
-	note $90
-	note $00
-	note $40
-	note $00
+	note __, 0
+	note G#, 0
+	note __, 0
+	note D#, 0
+	note __, 0
 	intensity $a7
-	note $60
-	note $00
-	note $40
-	note $00
-	note $60
-	note $00
-	note $40
+	note F_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F_, 0
+	note __, 0
+	note D#, 0
 	intensity $b7
-	note $00
-	note $b1
-	note $91
-	note $61
-	note $31
-	notetype $08, $c7
-	octave2
-	note $b1
-	octave3
-	note $31
-	note $61
+	note __, 0
+	note A#, 1
+	note G#, 1
+	note F_, 1
+	note D_, 1
+	notetype $8, $c7
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note F_, 1
 	intensity $f7
-	note $91
-	note $b1
-	octave4
-	note $31
-	dutycycle $00
-	callchannel _Music_Surf_sub_0xf5233
-	dutycycle $01
-	notetype $08, $a7
-	callchannel _Music_Surf_sub_0xf5233
-	callchannel _Music_Surf_sub_0xf5293
-	octave4
-	note $11
-	octave3
-	note $81
-	note $41
-	note $11
-	note $41
-	note $81
-	octave4
-	note $11
-	note $41
-	note $81
-	dutycycle $01
-	notetype $06, $97
-	callchannel _Music_Surf_sub_0xf5293
+	note G#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	dutycycle $0
+	callchannel Music_Surf_branch_f5233
+	dutycycle $1
+	notetype $8, $a7
+	callchannel Music_Surf_branch_f5233
+	callchannel Music_Surf_branch_f5293
+	octave 4
+	note C_, 1
+	octave 3
+	note G_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note G_, 1
+	octave 4
+	note C_, 1
+	note D#, 1
+	note G_, 1
+	dutycycle $1
+	notetype $6, $97
+	callchannel Music_Surf_branch_f5293
 	intensity $a8
-	note $95
-	note $a5
-	note $b2
-	octave4
-	note $32
+	note G#, 5
+	note A_, 5
+	note A#, 2
+	octave 4
+	note D_, 2
 	intensity $a8
-	dutycycle $01
-	callchannel _Music_Surf_sub_0xf52d9
-	octave3
-	note $47
-	note $97
-	note $47
-	dutycycle $03
-	notetype $08, $98
-	callchannel _Music_Surf_sub_0xf52d9
-	notetype $0c, $a7
-	octave3
-	note $4b
-	octave2
-	note $63
-	note $43
-	note $63
-	note $93
-	note $41
-	note $91
-	note $c1
-	octave3
-	note $41
-	loopchannel $00, $519e ; end
-; 0xf5233
+	dutycycle $1
+	callchannel Music_Surf_branch_f52d9
+	octave 3
+	note D#, 7
+	note G#, 7
+	note D#, 7
+	dutycycle $3
+	notetype $8, $98
+	callchannel Music_Surf_branch_f52d9
+	notetype $c, $a7
+	octave 3
+	note D#, 11
+	octave 2
+	note F_, 3
+	note D#, 3
+	note F_, 3
+	note G#, 3
+	note D#, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note D#, 1
+	loopchannel 0, Music_Surf_branch_f519e
+; f5233
 
-_Music_Surf_sub_0xf5233: ; 0xf5233
-; subroutine
-	notetype $0c, $a7
-	octave3
-	note $43
-	note $b0
-	note $00
-	octave4
-	note $40
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave4
-	note $40
-	note $00
-	octave3
-	note $43
-	note $b0
-	note $00
-	octave4
-	note $40
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave4
-	note $40
-	note $00
-	octave3
-	note $23
-	note $b0
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $23
-	note $b0
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $b0
-	note $00
-	octave4
-	note $20
-	note $00
-	octave3
-	note $13
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $13
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $90
-	note $00
-	octave4
-	note $10
-	note $00
-	notetype $06, $a7
-	octave3
-	note $b0
-	note $ce
-	octave4
-	note $43
-	octave3
-	note $c3
-	note $97
-	note $67
-	note $23
-	note $33
-	endchannel ; end
-; 0xf5293
+Music_Surf_branch_f5233: ; f5233
+	notetype $c, $a7
+	octave 3
+	note D#, 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note D#, 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note D#, 0
+	note __, 0
+	octave 3
+	note C#, 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note C#, 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	octave 3
+	note C_, 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note C_, 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	notetype $6, $a7
+	octave 3
+	note A#, 0
+	note B_, 14
+	octave 4
+	note D#, 3
+	octave 3
+	note B_, 3
+	note G#, 7
+	note F_, 7
+	note C#, 3
+	note D_, 3
+	endchannel
+; f5293
 
-_Music_Surf_sub_0xf5293: ; 0xf5293
-; subroutine
-	octave4
-	note $9f
-	note $43
-	note $13
-	octave3
-	note $93
-	octave4
-	note $13
-	note $33
-	note $43
-	note $83
-	note $93
-	notetype $08, $92
-	note $b1
-	note $61
-	note $31
-	note $61
-	note $31
-	octave3
-	note $b1
-	octave4
-	note $31
-	octave3
-	note $b1
-	note $61
-	note $b1
-	note $61
-	note $31
-	octave2
-	note $b1
-	octave3
-	note $31
-	note $61
-	note $91
-	note $b1
-	octave4
-	note $31
-	notetype $06, $97
-	note $20
-	note $3e
-	note $83
-	note $33
-	octave3
-	note $b3
-	octave4
-	note $33
-	note $63
-	note $83
-	note $a3
-	note $b3
-	notetype $08, $92
-	octave5
-	note $11
-	octave4
-	note $81
-	note $41
-	note $81
-	note $41
-	note $11
-	note $41
-	note $11
-	octave3
-	note $81
-	endchannel ; end
-; 0xf52d9
+Music_Surf_branch_f5293: ; f5293
+	octave 4
+	note G#, 15
+	note D#, 3
+	note C_, 3
+	octave 3
+	note G#, 3
+	octave 4
+	note C_, 3
+	note D_, 3
+	note D#, 3
+	note G_, 3
+	note G#, 3
+	notetype $8, $92
+	note A#, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	note D_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	note F_, 1
+	note D_, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	note A#, 1
+	octave 4
+	note D_, 1
+	notetype $6, $97
+	note C#, 0
+	note D_, 14
+	note G_, 3
+	note D_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note D_, 3
+	note F_, 3
+	note G_, 3
+	note A_, 3
+	note A#, 3
+	notetype $8, $92
+	octave 5
+	note C_, 1
+	octave 4
+	note G_, 1
+	note D#, 1
+	note G_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	octave 3
+	note G_, 1
+	endchannel
+; f52d9
 
-_Music_Surf_sub_0xf52d9: ; 0xf52d9
-; subroutine
-	octave3
-	note $b2
-	note $82
-	note $b2
-	octave4
-	note $48
-	notetype $06, $58
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $90
-	note $80
+Music_Surf_branch_f52d9: ; f52d9
+	octave 3
+	note A#, 2
+	note G_, 2
+	note A#, 2
+	octave 4
+	note D#, 8
+	notetype $6, $58
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G#, 0
+	note G_, 0
 	intensity $a8
-	note $43
-	note $33
-	note $43
-	note $83
-	note $a3
-	note $93
-	note $83
-	note $73
-	note $63
-	note $53
-	note $87
-	note $27
-	note $b7
-	note $a0
-	note $b2
-	note $93
-	octave4
-	note $13
-	note $6b
+	note D#, 3
+	note D_, 3
+	note D#, 3
+	note G_, 3
+	note A_, 3
+	note G#, 3
+	note G_, 3
+	note F#, 3
+	note F_, 3
+	note E_, 3
+	note G_, 7
+	note C#, 7
+	note A#, 7
+	note A_, 0
+	note A#, 2
+	note G#, 3
+	octave 4
+	note C_, 3
+	note F_, 11
 	intensity $58
-	note $40
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	note $b0
-	note $a0
-	note $80
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A#, 0
+	note A_, 0
+	note G_, 0
 	intensity $a8
-	note $97
-	octave4
-	note $43
-	octave3
-	note $c3
-	note $97
-	note $47
-	octave2
-	note $c7
-	endchannel ; end
-; 0xf5317
+	note G#, 7
+	octave 4
+	note D#, 3
+	octave 3
+	note B_, 3
+	note G#, 7
+	note D#, 7
+	octave 2
+	note B_, 7
+	endchannel
 
-_Music_Surf_Ch2: ; 0xf5317
-	notetype $0c, $c2
+Music_Surf_Ch2: ; f5317
+
+Music_Surf_branch_f5317: ; f5317
+	notetype $c, $c2
 	stereopanning $f0
-	dutycycle $02
+	dutycycle $2
 	vibrato $14, $23
-	octave1
-	note $b3
-	octave2
-	note $b0
-	note $02
-	note $b0
-	note $02
-	loopchannel $03, $5321
-	octave1
-	note $b3
-	octave2
-	note $60
-	note $02
-	note $b0
-	note $02
-	note $43
-	note $81
-	note $91
-	note $b3
-	note $43
-	note $81
-	note $91
-	note $b3
-	note $23
-	note $81
-	note $91
-	note $b3
-	note $23
-	note $81
-	note $91
-	note $b3
-	note $13
-	note $61
-	note $81
-	note $93
-	note $13
-	note $61
-	note $81
-	note $93
-	octave1
-	note $c3
-	octave2
-	note $61
-	note $81
-	note $91
-	note $b1
-	note $c3
-	note $b3
-	note $93
-	loopchannel $02, $5333
+
+Music_Surf_branch_f5321: ; f5321
+	octave 1
+	note A#, 3
+	octave 2
+	note A#, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	loopchannel 3, Music_Surf_branch_f5321
+	octave 1
+	note A#, 3
+	octave 2
+	note F_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+
+Music_Surf_branch_f5333: ; f5333
+	note D#, 3
+	note G_, 1
+	note G#, 1
+	note A#, 3
+	note D#, 3
+	note G_, 1
+	note G#, 1
+	note A#, 3
+	note C#, 3
+	note G_, 1
+	note G#, 1
+	note A#, 3
+	note C#, 3
+	note G_, 1
+	note G#, 1
+	note A#, 3
+	note C_, 3
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	note C_, 3
+	note F_, 1
+	note G_, 1
+	note G#, 3
+	octave 1
+	note B_, 3
+	octave 2
+	note F_, 1
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	note B_, 3
+	note A#, 3
+	note G#, 3
+	loopchannel 2, Music_Surf_branch_f5333
 	intensity $c7
-	callchannel _Music_Surf_sub_0xf53b2
-	note $43
-	note $33
-	note $23
-	callchannel _Music_Surf_sub_0xf53b2
-	note $33
-	note $43
-	octave1
-	note $b3
-	notetype $06, $b8
-	callchannel _Music_Surf_sub_0xf53d6
-	dutycycle $01
+	callchannel Music_Surf_branch_f53b2
+	note D#, 3
+	note D_, 3
+	note C#, 3
+	callchannel Music_Surf_branch_f53b2
+	note D_, 3
+	note D#, 3
+	octave 1
+	note A#, 3
+	notetype $6, $b8
+	callchannel Music_Surf_branch_f53d6
+	dutycycle $1
 	intensity $b8
-	callchannel _Music_Surf_sub_0xf53e8
-	dutycycle $02
-	callchannel _Music_Surf_sub_0xf53f3
-	dutycycle $01
+	callchannel Music_Surf_branch_f53e8
+	dutycycle $2
+	callchannel Music_Surf_branch_f53f3
+	dutycycle $1
 	intensity $b8
-	callchannel _Music_Surf_sub_0xf5404
-	octave3
-	note $cf
-	octave4
-	note $27
-	forceoctave $0c
-	dutycycle $03
-	callchannel _Music_Surf_sub_0xf53d6
+	callchannel Music_Surf_branch_f5404
+	octave 3
+	note B_, 15
+	octave 4
+	note C#, 7
+	forceoctave $c
+	dutycycle $3
+	callchannel Music_Surf_branch_f53d6
 	intensity $b8
-	dutycycle $01
-	callchannel _Music_Surf_sub_0xf53e8
-	dutycycle $03
-	callchannel _Music_Surf_sub_0xf53f3
+	dutycycle $1
+	callchannel Music_Surf_branch_f53e8
+	dutycycle $3
+	callchannel Music_Surf_branch_f53f3
 	intensity $b8
-	dutycycle $01
-	callchannel _Music_Surf_sub_0xf5404
-	forceoctave $00
-	notetype $0c, $b8
-	octave4
-	note $cb
-	dutycycle $02
-	note $b3
-	note $93
-	note $43
-	note $93
-	note $b3
-	note $c3
-	loopchannel $00, $5317 ; end
-; 0xf53b2
+	dutycycle $1
+	callchannel Music_Surf_branch_f5404
+	forceoctave $0
+	notetype $c, $b8
+	octave 4
+	note B_, 11
+	dutycycle $2
+	note A#, 3
+	note G#, 3
+	note D#, 3
+	note G#, 3
+	note A#, 3
+	note B_, 3
+	loopchannel 0, Music_Surf_branch_f5317
+; f53b2
 
-_Music_Surf_sub_0xf53b2: ; 0xf53b2
-; subroutine
-	octave1
-	note $93
-	octave3
-	note $63
-	note $43
-	octave1
-	note $93
-	octave3
-	note $43
-	note $33
-	octave1
-	note $b3
-	octave3
-	note $13
-	octave2
-	note $b3
-	octave1
-	note $b3
-	octave2
-	note $93
-	note $b3
-	octave1
-	note $83
-	octave3
-	note $33
-	note $13
-	octave1
-	note $83
-	octave2
-	note $b3
-	note $83
-	note $13
-	octave3
-	note $63
-	note $83
-	endchannel ; end
-; 0xf53d6
+Music_Surf_branch_f53b2: ; f53b2
+	octave 1
+	note G#, 3
+	octave 3
+	note F_, 3
+	note D#, 3
+	octave 1
+	note G#, 3
+	octave 3
+	note D#, 3
+	note D_, 3
+	octave 1
+	note A#, 3
+	octave 3
+	note C_, 3
+	octave 2
+	note A#, 3
+	octave 1
+	note A#, 3
+	octave 2
+	note G#, 3
+	note A#, 3
+	octave 1
+	note G_, 3
+	octave 3
+	note D_, 3
+	note C_, 3
+	octave 1
+	note G_, 3
+	octave 2
+	note A#, 3
+	note G_, 3
+	note C_, 3
+	octave 3
+	note F_, 3
+	note G_, 3
+	endchannel
+; f53d6
 
-_Music_Surf_sub_0xf53d6: ; 0xf53d6
-; subroutine
-	octave4
-	note $63
-	note $43
-	note $63
-	note $8b
+Music_Surf_branch_f53d6: ; f53d6
+	octave 4
+	note F_, 3
+	note D#, 3
+	note F_, 3
+	note G_, 11
 	intensity $58
-	note $70
-	note $60
-	note $50
-	note $40
-	note $30
-	note $20
-	note $10
-	octave3
-	note $c0
-	note $a0
-	endchannel ; end
-; 0xf53e8
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	octave 3
+	note B_, 0
+	note A_, 0
+	endchannel
+; f53e8
 
-_Music_Surf_sub_0xf53e8: ; 0xf53e8
-; subroutine
-	note $b6
-	octave4
-	note $17
-	note $2f
-	note $13
-	octave3
-	note $c3
-	octave4
-	note $1f
-	note $87
-	endchannel ; end
-; 0xf53f3
+Music_Surf_branch_f53e8: ; f53e8
+	note A#, 6
+	octave 4
+	note C_, 7
+	note C#, 15
+	note C_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 15
+	note G_, 7
+	endchannel
+; f53f3
 
-_Music_Surf_sub_0xf53f3: ; 0xf53f3
-; subroutine
-	note $70
-	note $82
-	note $63
-	note $83
-	note $9b
+Music_Surf_branch_f53f3: ; f53f3
+	note F#, 0
+	note G_, 2
+	note F_, 3
+	note G_, 3
+	note G#, 11
 	intensity $58
-	note $80
-	note $70
-	note $60
-	note $50
-	note $40
-	note $30
-	note $20
-	octave3
-	note $c0
-	endchannel ; end
-; 0xf5404
+	note G_, 0
+	note F#, 0
+	note F_, 0
+	note E_, 0
+	note D#, 0
+	note D_, 0
+	note C#, 0
+	octave 3
+	note B_, 0
+	endchannel
+; f5404
 
-_Music_Surf_sub_0xf5404: ; 0xf5404
-; subroutine
-	octave4
-	note $17
-	note $83
-	note $93
-	note $b7
-	note $97
-	note $47
-	endchannel ; end
-; 0xf540c
+Music_Surf_branch_f5404: ; f5404
+	octave 4
+	note C_, 7
+	note G_, 3
+	note G#, 3
+	note A#, 7
+	note G#, 7
+	note D#, 7
+	endchannel
 
-_Music_Surf_Ch3: ; 0xf540c
+Music_Surf_branch_f540c: ; f540c
+
+Music_Surf_Ch3: ; f540c
 	stereopanning $ff
-	notetype $0c, $15
+	notetype $c, $15
 	vibrato $16, $23
-	octave4
-	note $bb
-	octave5
-	note $1b
-	note $37
-	note $43
-	note $63
-	note $83
-	note $93
+	octave 4
+	note A#, 11
+	octave 5
+	note C_, 11
+	note D_, 7
+	note D#, 3
+	note F_, 3
+	note G_, 3
+	note G#, 3
 	intensity $12
-	note $bb
-	note $03
-	note $93
-	note $83
-	notetype $06, $12
-	note $70
-	note $8e
-	note $93
-	note $83
-	note $6f
-	octave4
-	note $b7
-	notetype $0c, $12
-	octave5
-	note $9f
-	note $83
-	note $63
-	notetype $06, $12
-	note $50
-	note $6e
-	note $83
-	note $63
-	note $4f
-	note $67
-	notetype $0c, $14
-	note $bb
-	note $03
-	note $93
-	note $83
-	notetype $06, $14
-	note $70
-	note $8e
-	note $93
-	note $83
-	note $6f
-	octave4
-	note $b7
-	notetype $0c, $14
-	octave5
-	note $9f
-	note $83
-	note $63
-	notetype $06, $14
-	note $50
-	note $6e
-	note $83
-	note $63
-	note $4f
-	octave6
-	note $47
-	notetype $0c, $13
-	note $1f
-	note $33
-	note $43
-	notetype $06, $13
-	note $30
-	note $4e
-	note $33
-	note $13
-	octave5
-	note $3f
-	octave6
-	note $37
-	notetype $0c, $13
-	octave5
-	note $bb
-	notetype $06, $13
-	note $a0
-	note $b6
-	octave6
-	note $17
-	note $37
-	note $6f
-	note $43
-	note $33
-	note $4f
-	note $37
-	notetype $0c, $14
-	note $1b
-	note $13
-	note $33
-	note $43
-	notetype $06, $14
-	note $30
-	note $4e
-	note $33
-	note $13
-	octave5
-	note $3f
-	octave6
-	note $37
-	notetype $0c, $14
-	octave5
-	note $bb
-	notetype $06, $14
-	note $a0
-	note $b6
-	octave6
-	note $17
-	note $37
-	notetype $0c, $14
-	note $6b
-	note $87
-	octave5
-	note $b3
+	note A#, 11
+	note __, 3
+	note G#, 3
+	note G_, 3
+	notetype $6, $12
+	note F#, 0
+	note G_, 14
+	note G#, 3
+	note G_, 3
+	note F_, 15
+	octave 4
+	note A#, 7
+	notetype $c, $12
+	octave 5
+	note G#, 15
+	note G_, 3
+	note F_, 3
+	notetype $6, $12
+	note E_, 0
+	note F_, 14
+	note G_, 3
+	note F_, 3
+	note D#, 15
+	note F_, 7
+	notetype $c, $14
+	note A#, 11
+	note __, 3
+	note G#, 3
+	note G_, 3
+	notetype $6, $14
+	note F#, 0
+	note G_, 14
+	note G#, 3
+	note G_, 3
+	note F_, 15
+	octave 4
+	note A#, 7
+	notetype $c, $14
+	octave 5
+	note G#, 15
+	note G_, 3
+	note F_, 3
+	notetype $6, $14
+	note E_, 0
+	note F_, 14
+	note G_, 3
+	note F_, 3
+	note D#, 15
+	octave 6
+	note D#, 7
+	notetype $c, $13
+	note C_, 15
+	note D_, 3
+	note D#, 3
+	notetype $6, $13
+	note D_, 0
+	note D#, 14
+	note D_, 3
+	note C_, 3
+	octave 5
+	note D_, 15
+	octave 6
+	note D_, 7
+	notetype $c, $13
+	octave 5
+	note A#, 11
+	notetype $6, $13
+	note A_, 0
+	note A#, 6
+	octave 6
+	note C_, 7
+	note D_, 7
+	note F_, 15
+	note D#, 3
+	note D_, 3
+	note D#, 15
+	note D_, 7
+	notetype $c, $14
+	note C_, 11
+	note C_, 3
+	note D_, 3
+	note D#, 3
+	notetype $6, $14
+	note D_, 0
+	note D#, 14
+	note D_, 3
+	note C_, 3
+	octave 5
+	note D_, 15
+	octave 6
+	note D_, 7
+	notetype $c, $14
+	octave 5
+	note A#, 11
+	notetype $6, $14
+	note A_, 0
+	note A#, 6
+	octave 6
+	note C_, 7
+	note D_, 7
+	notetype $c, $14
+	note F_, 11
+	note G_, 7
+	octave 5
+	note A#, 3
 	intensity $15
-	callchannel _Music_Surf_sub_0xf54c8
-	octave2
-	note $c3
-	octave3
-	note $43
-	note $63
-	note $93
-	note $b3
-	note $c3
-	callchannel _Music_Surf_sub_0xf54c8
-	octave2
-	note $c3
-	octave3
-	note $43
-	note $93
-	note $cb
-	octave2
-	note $cb
-	octave3
-	note $47
-	octave2
-	note $c3
-	loopchannel $00, $540c ; end
-; 0xf54c8
+	callchannel Music_Surf_branch_f54c8
+	octave 2
+	note B_, 3
+	octave 3
+	note D#, 3
+	note F_, 3
+	note G#, 3
+	note A#, 3
+	note B_, 3
+	callchannel Music_Surf_branch_f54c8
+	octave 2
+	note B_, 3
+	octave 3
+	note D#, 3
+	note G#, 3
+	note B_, 11
+	octave 2
+	note B_, 11
+	octave 3
+	note D#, 7
+	octave 2
+	note B_, 3
+	loopchannel 0, Music_Surf_branch_f540c
+; f54c8
 
-_Music_Surf_sub_0xf54c8: ; 0xf54c8
-; subroutine
-	octave3
-	note $43
-	note $80
-	note $02
-	note $b0
-	note $02
-	note $43
-	note $80
-	note $02
-	note $b0
-	note $02
-	note $23
-	note $80
-	note $02
-	note $b0
-	note $02
-	note $23
-	note $80
-	note $02
-	note $b0
-	note $02
-	note $13
-	note $60
-	note $02
-	note $90
-	note $02
-	note $13
-	note $60
-	note $02
-	note $90
-	note $02
-	endchannel ; end
-; 0xf54e8
+Music_Surf_branch_f54c8: ; f54c8
+	octave 3
+	note D#, 3
+	note G_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note D#, 3
+	note G_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note C#, 3
+	note G_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note C#, 3
+	note G_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note C_, 3
+	note F_, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	note C_, 3
+	note F_, 0
+	note __, 2
+	note G#, 0
+	note __, 2
+	endchannel
+; f54e8
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -1,295 +1,299 @@
-_Music_TinTower: ; 0xf6811
-	db $c0
-	dw _Music_TinTower_Ch1
-	db $01
-	dw _Music_TinTower_Ch2
-	db $02
-	dw _Music_TinTower_Ch3
-	db $03
-	dw _Music_TinTower_Ch4
-; 0xf681d
+Music_TinTower: ; f6811
+	dbw $c0, Music_TinTower_Ch1
+	dbw $01, Music_TinTower_Ch2
+	dbw $02, Music_TinTower_Ch3
+	dbw $03, Music_TinTower_Ch4
+; f681d
 
-_Music_TinTower_Ch1: ; 0xf681d
-	tempo $d000
+
+Music_TinTower_Ch1: ; f681d
+	tempo 208
 	volume $77
-	dutycycle $03
-	tone $0400
-	vibrato $08, $45
+	dutycycle $3
+	tone $0004
+	vibrato $8, $45
+
+Music_TinTower_branch_f682a: ; f682a
 	stereopanning $f0
-	notetype $0c, $a5
-	octave3
-	note $83
-	note $13
-	note $97
-	note $83
-	note $13
-	octave2
-	note $b1
-	octave3
-	note $11
-	note $21
-	octave2
-	note $b1
-	octave3
-	note $83
-	note $13
-	note $93
-	note $63
-	note $83
-	octave2
-	note $83
-	octave3
-	note $85
-	note $b1
-	note $81
-	note $61
-	note $21
-	note $81
-	note $97
-	note $83
-	octave4
-	note $13
-	octave3
-	note $91
-	note $81
-	note $61
-	note $91
-	note $81
-	note $21
-	octave2
-	note $b1
-	octave3
-	note $81
-	note $93
-	note $63
-	note $83
-	octave2
-	note $83
-	octave3
-	note $87
+	notetype $c, $a5
+	octave 3
+	note G_, 3
+	note C_, 3
+	note G#, 7
+	note G_, 3
+	note C_, 3
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G_, 3
+	note C_, 3
+	note G#, 3
+	note F_, 3
+	note G_, 3
+	octave 2
+	note G_, 3
+	octave 3
+	note G_, 5
+	note A#, 1
+	note G_, 1
+	note F_, 1
+	note C#, 1
+	note G_, 1
+	note G#, 7
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note G#, 1
+	note G_, 1
+	note F_, 1
+	note G#, 1
+	note G_, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note G_, 1
+	note G#, 3
+	note F_, 3
+	note G_, 3
+	octave 2
+	note G_, 3
+	octave 3
+	note G_, 7
 	intensity $a2
-	octave2
-	note $83
-	note $8b
-	note $83
-	note $87
+	octave 2
+	note G_, 3
+	note G_, 11
+	note G_, 3
+	note G_, 7
 	intensity $a7
-	note $83
+	note G_, 3
 	intensity $a2
-	note $93
-	note $97
+	note G#, 3
+	note G#, 7
 	intensity $a7
-	note $83
+	note G_, 3
 	intensity $a2
-	note $93
-	note $97
+	note G#, 3
+	note G#, 7
 	intensity $a7
-	note $b3
+	note A#, 3
 	intensity $a2
-	note $83
-	note $8b
-	note $83
-	note $8b
-	note $83
-	note $8b
-	note $83
-	note $87
+	note G_, 3
+	note G_, 11
+	note G_, 3
+	note G_, 11
+	note G_, 3
+	note G_, 11
+	note G_, 3
+	note G_, 7
 	intensity $a5
-	octave3
-	note $b3
-	loopchannel $00, $682a ; end
-; 0xf688b
+	octave 3
+	note A#, 3
+	loopchannel 0, Music_TinTower_branch_f682a
 
-_Music_TinTower_Ch2: ; 0xf688b
-	dutycycle $03
-	tone $0200
+Music_TinTower_Ch2: ; f688b
+	dutycycle $3
+	tone $0002
 	vibrato $18, $44
+
+Music_TinTower_branch_f6893: ; f6893
 	stereopanning $ff
-	notetype $0c, $b5
-	octave4
-	note $13
-	note $13
-	note $21
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $21
-	note $13
-	note $63
-	note $23
-	octave3
-	note $b3
-	octave4
-	note $13
-	note $13
-	note $21
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $21
-	note $13
-	octave3
-	note $13
-	octave4
-	note $17
-	stereopanning $0f
-	loopchannel $02, $6895
+
+Music_TinTower_branch_f6895: ; f6895
+	notetype $c, $b5
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	note C_, 3
+	note F_, 3
+	note C#, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	note C_, 3
+	octave 3
+	note C_, 3
+	octave 4
+	note C_, 7
+	stereopanning $f
+	loopchannel 2, Music_TinTower_branch_f6895
 	intensity $b2
-	octave3
-	note $13
-	note $1b
-	note $13
-	note $17
+	octave 3
+	note C_, 3
+	note C_, 11
+	note C_, 3
+	note C_, 7
 	intensity $b7
-	note $13
+	note C_, 3
 	intensity $b2
-	note $23
-	note $27
+	note C#, 3
+	note C#, 7
 	intensity $b7
-	note $13
+	note C_, 3
 	intensity $b2
-	note $23
-	note $27
+	note C#, 3
+	note C#, 7
 	intensity $b7
-	note $43
+	note D#, 3
 	intensity $90
 	stereopanning $ff
-	note $83
-	octave4
-	note $13
-	octave3
-	note $b1
-	note $91
-	note $81
-	note $91
-	note $83
-	note $13
-	note $87
-	note $83
-	octave4
-	note $13
-	octave3
-	note $b1
-	octave4
-	note $11
-	note $21
-	octave3
-	note $b1
-	octave4
-	note $13
-	octave3
-	note $13
-	octave4
-	note $15
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 3
+	note C_, 3
+	note G_, 7
+	note G_, 3
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note C_, 3
+	octave 4
+	note C_, 5
 	intensity $95
-	note $21
-	loopchannel $00, $6893 ; end
-; 0xf68f8
+	note C#, 1
+	loopchannel 0, Music_TinTower_branch_f6893
 
-_Music_TinTower_Ch3: ; 0xf68f8
-	notetype $0c, $14
-	note $0f
-	note $0f
-	note $0f
-	note $09
-	octave2
-	note $81
-	note $91
-	note $b1
-	octave3
-	note $17
-	note $27
-	note $57
-	octave2
-	note $b1
-	octave3
-	note $11
-	note $21
-	note $41
-	note $17
-	note $27
-	note $57
-	octave4
-	note $17
-	octave3
-	note $10
-	note $02
-	note $10
-	note $0a
-	note $10
-	note $02
-	note $10
-	note $06
-	note $13
-	note $20
-	note $02
-	note $20
-	note $06
-	note $13
-	note $20
-	note $02
-	note $20
-	note $06
-	note $43
-	stereopanning $0f
-	note $10
-	note $02
-	note $10
-	note $0a
-	note $10
-	note $02
-	note $10
-	note $02
+Music_TinTower_Ch3: ; f68f8
+	notetype $c, $14
+
+Music_TinTower_branch_f68fb: ; f68fb
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 9
+	octave 2
+	note G_, 1
+	note G#, 1
+	note A#, 1
+	octave 3
+	note C_, 7
+	note C#, 7
+	note E_, 7
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	note C_, 7
+	note C#, 7
+	note E_, 7
+	octave 4
+	note C_, 7
+	octave 3
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 10
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 6
+	note C_, 3
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 6
+	note C_, 3
+	note C#, 0
+	note __, 2
+	note C#, 0
+	note __, 6
+	note D#, 3
+	stereopanning $f
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 10
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 2
 	stereopanning $ff
-	octave2
-	note $b1
-	octave3
-	note $11
-	note $21
-	note $41
-	stereopanning $0f
-	note $10
-	note $02
-	note $10
-	note $0a
-	note $10
-	note $02
-	note $10
-	note $0a
+	octave 2
+	note A#, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note D#, 1
+	stereopanning $f
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 10
+	note C_, 0
+	note __, 2
+	note C_, 0
+	note __, 10
 	stereopanning $ff
-	loopchannel $00, $68fb ; end
-; 0xf6948
+	loopchannel 0, Music_TinTower_branch_f68fb
 
-_Music_TinTower_Ch4: ; 0xf6948
-	togglenoise $00
-	notetype $0c
-	stereopanning $0f
-	note $81
+Music_TinTower_Ch4: ; f6948
+	togglenoise $0
+	notetype $c
+
+Music_TinTower_branch_f694c: ; f694c
+	stereopanning $f
+	note G_, 1
 	stereopanning $f0
-	note $80
-	note $80
-	stereopanning $0f
-	note $81
+	note G_, 0
+	note G_, 0
+	stereopanning $f
+	note G_, 1
 	stereopanning $f0
-	note $63
-	stereopanning $0f
-	note $81
-	note $81
-	note $61
+	note F_, 3
+	stereopanning $f
+	note G_, 1
+	note G_, 1
+	note F_, 1
 	stereopanning $f0
-	note $81
-	stereopanning $0f
-	note $80
-	note $80
+	note G_, 1
+	stereopanning $f
+	note G_, 0
+	note G_, 0
 	stereopanning $f0
-	note $81
-	stereopanning $0f
-	note $63
+	note G_, 1
+	stereopanning $f
+	note F_, 3
 	stereopanning $f0
-	note $81
-	note $81
-	note $61
-	loopchannel $00, $694c ; end
-; 0xf6974
+	note G_, 1
+	note G_, 1
+	note F_, 1
+	loopchannel 0, Music_TinTower_branch_f694c
+; f6974
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,1186 +1,1180 @@
-_Music_TitleScreen: ; 0xeb808
-	db $c0
-	dw _Music_TitleScreen_Ch1
-	db $01
-	dw _Music_TitleScreen_Ch2
-	db $02
-	dw _Music_TitleScreen_Ch3
-	db $03
-	dw _Music_TitleScreen_Ch4
-; 0xeb814
+Music_TitleScreen: ; eb808
+	dbw $c0, Music_TitleScreen_Ch1
+	dbw $01, Music_TitleScreen_Ch2
+	dbw $02, Music_TitleScreen_Ch3
+	dbw $03, Music_TitleScreen_Ch4
+; eb814
 
-_Music_TitleScreen_Ch1: ; 0xeb814
-	tempo $8600
+
+Music_TitleScreen_Ch1: ; eb814
+	tempo 134
 	volume $77
-	dutycycle $03
-	tone $0200
+	dutycycle $3
+	tone $0002
 	vibrato $10, $12
 	stereopanning $f0
-	notetype $0c, $a7
+	notetype $c, $a7
 	intensity $a0
-	octave3
-	note $03
+	octave 3
+	note __, 3
 	intensity $a7
-	octave2
-	note $80
-	note $01
-	note $a0
-	note $c7
-	note $83
-	octave3
-	note $10
-	note $01
-	note $30
-	note $57
-	note $13
-	octave2
-	note $c0
-	note $01
-	octave3
-	note $10
-	octave2
-	note $c7
-	note $a3
-	note $a0
-	note $01
-	note $c0
-	octave3
-	note $15
-	note $53
-	note $71
+	octave 2
+	note G_, 0
+	note __, 1
+	note A_, 0
+	note B_, 7
+	note G_, 3
+	octave 3
+	note C_, 0
+	note __, 1
+	note D_, 0
+	note E_, 7
+	note C_, 3
+	octave 2
+	note B_, 0
+	note __, 1
+	octave 3
+	note C_, 0
+	octave 2
+	note B_, 7
+	note A_, 3
+	note A_, 0
+	note __, 1
+	note B_, 0
+	octave 3
+	note C_, 5
+	note E_, 3
+	note F#, 1
 	stereopanning $ff
-	octave4
-	note $80
+	octave 4
+	note G_, 0
 	stereopanning $f0
-	octave3
-	note $34
-	octave2
-	note $c1
-	octave3
-	note $33
-	octave2
-	note $c3
-	octave3
-	note $15
-	note $65
-	note $13
-	note $35
+	octave 3
+	note D_, 4
+	octave 2
+	note B_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 5
+	note F_, 5
+	note C_, 3
+	note D_, 5
 	intensity $b7
-	note $40
-	note $50
-	note $65
-	note $50
-	note $40
-	note $37
-	notetype $08, $a7
-	note $13
-	octave2
-	note $c3
-	octave3
-	note $13
-	note $38
-	octave2
-	note $c2
-	octave3
-	note $35
-	octave2
-	note $c5
-	octave3
-	note $12
-	note $35
-	note $52
-	note $53
-	note $53
-	note $13
-	notetype $08, $a0
-	octave2
-	note $c5
-	notetype $08, $a7
-	note $c5
-	notetype $08, $a7
-	octave3
-	note $63
-	note $53
-	note $13
-	notetype $08, $a0
-	note $35
-	notetype $08, $a7
-	note $35
-	notetype $08, $a7
-	note $02
-	octave2
-	note $c2
-	octave3
-	note $12
-	note $32
-	note $38
-	octave2
-	note $c2
-	octave3
-	note $35
-	octave2
-	note $c5
-	octave3
-	note $18
-	note $68
-	note $15
-	note $38
-	notetype $0c, $b7
-	note $40
-	note $50
-	note $65
-	note $50
-	note $40
-	note $37
-	notetype $08, $a7
-	note $13
-	octave2
-	note $c3
-	octave3
-	note $13
-	note $38
-	octave2
-	note $c2
-	octave3
-	note $38
-	notetype $08, $b7
-	note $82
-	note $a3
-	note $83
-	note $63
-	note $65
-	note $55
-	note $38
-	note $62
-	note $82
-	note $35
-	note $82
-	notetype $08, $54
-	octave2
-	note $82
-	note $c2
-	notetype $08, $94
-	octave3
-	note $32
-	note $82
-	tempo $8800
-	notetype $08, $b4
-	note $62
-	note $a2
-	notetype $08, $d4
-	octave4
-	note $12
-	note $62
-	tempo $8a00
-	notetype $08, $b4
-	note $38
-	note $18
-	octave3
-	note $b5
-	notetype $0c, $b7
-	note $60
-	note $50
-	note $30
-	note $50
-	note $63
-	octave4
-	note $33
-	note $63
-	note $55
-	octave3
-	note $81
-	notetype $08, $b7
-	note $a3
-	note $83
-	note $63
-	note $8b
-	octave4
-	note $15
-	tempo $8800
-	note $25
-	tempo $8600
-	callchannel _Music_TitleScreen_sub_0xeb96d
-	octave4
-	note $13
-	note $13
-	note $23
-	callchannel _Music_TitleScreen_sub_0xeb96d
-	octave4
-	note $13
-	note $13
-	note $23
-	callchannel _Music_TitleScreen_sub_0xeb96d
-	octave3
-	note $53
-	note $53
-	note $13
-	notetype $0c, $a0
-	note $35
-	notetype $0c, $a7
-	note $39
+	note D#, 0
+	note E_, 0
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
+	notetype $8, $a7
+	note C_, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 3
+	note D_, 8
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 5
+	octave 2
+	note B_, 5
+	octave 3
+	note C_, 2
+	note D_, 5
+	note E_, 2
+	note E_, 3
+	note E_, 3
+	note C_, 3
+	notetype $8, $a0
+	octave 2
+	note B_, 5
+	notetype $8, $a7
+	note B_, 5
+	notetype $8, $a7
+	octave 3
+	note F_, 3
+	note E_, 3
+	note C_, 3
+	notetype $8, $a0
+	note D_, 5
+	notetype $8, $a7
+	note D_, 5
+	notetype $8, $a7
+	note __, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note C_, 2
+	note D_, 2
+	note D_, 8
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 5
+	octave 2
+	note B_, 5
+	octave 3
+	note C_, 8
+	note F_, 8
+	note C_, 5
+	note D_, 8
+	notetype $c, $b7
+	note D#, 0
+	note E_, 0
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
+	notetype $8, $a7
+	note C_, 3
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 3
+	note D_, 8
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 8
+	notetype $8, $b7
+	note G_, 2
+	note A_, 3
+	note G_, 3
+	note F_, 3
+	note F_, 5
+	note E_, 5
+	note D_, 8
+	note F_, 2
+	note G_, 2
+	note D_, 5
+	note G_, 2
+	notetype $8, $54
+	octave 2
+	note G_, 2
+	note B_, 2
+	notetype $8, $94
+	octave 3
+	note D_, 2
+	note G_, 2
+	tempo 136
+	notetype $8, $b4
+	note F_, 2
+	note A_, 2
+	notetype $8, $d4
+	octave 4
+	note C_, 2
+	note F_, 2
+	tempo 138
+	notetype $8, $b4
+	note D_, 8
+	note C_, 8
+	octave 3
+	note A#, 5
+	notetype $c, $b7
+	note F_, 0
+	note E_, 0
+	note D_, 0
+	note E_, 0
+	note F_, 3
+	octave 4
+	note D_, 3
+	note F_, 3
+	note E_, 5
+	octave 3
+	note G_, 1
+	notetype $8, $b7
+	note A_, 3
+	note G_, 3
+	note F_, 3
+	note G_, 11
+	octave 4
+	note C_, 5
+	tempo 136
+	note C#, 5
+	tempo 134
+	callchannel Music_TitleScreen_branch_eb96d
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C#, 3
+	callchannel Music_TitleScreen_branch_eb96d
+	octave 4
+	note C_, 3
+	note C_, 3
+	note C#, 3
+	callchannel Music_TitleScreen_branch_eb96d
+	octave 3
+	note E_, 3
+	note E_, 3
+	note C_, 3
+	notetype $c, $a0
+	note D_, 5
+	notetype $c, $a7
+	note D_, 9
 	intensity $a0
-	note $17
+	note C_, 7
 	intensity $a7
-	note $17
+	note C_, 7
 	intensity $a0
-	octave2
-	note $c7
+	octave 2
+	note B_, 7
 	intensity $a7
-	note $c7
-	octave3
-	note $17
-	octave2
-	note $c7
-	octave3
-	note $37
-	octave2
-	note $c7
-	octave3
-	note $17
-	note $67
-	note $a7
-	note $85
-	note $80
-	note $70
-	note $67
-	note $57
+	note B_, 7
+	octave 3
+	note C_, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note D_, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note C_, 7
+	note F_, 7
+	note A_, 7
+	note G_, 5
+	note G_, 0
+	note F#, 0
+	note F_, 7
+	note E_, 7
 	intensity $a0
-	note $3f
+	note D_, 15
 	intensity $a7
-	note $3f
+	note D_, 15
 	intensity $a3
-	octave2
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $02
-	notetype $08, $b2
-	note $a1
-	note $a1
-	note $a1
-	note $a1
-	note $a1
-	note $71
-	notetype $0c, $b7
-	note $80
-	note $02
-	octave1
-	note $80
-	note $0a
-	endchannel ; end
-; 0xeb96d
+	octave 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	notetype $8, $b2
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note F#, 1
+	notetype $c, $b7
+	note G_, 0
+	note __, 2
+	octave 1
+	note G_, 0
+	note __, 10
+	endchannel
+; eb96d
 
-_Music_TitleScreen_sub_0xeb96d: ; 0xeb96d
-; subroutine
-	notetype $0c, $c3
-	note $30
-	note $00
-	octave2
-	note $30
-	octave1
-	note $a0
-	octave2
-	note $30
-	loopchannel $05, $7971
-	note $00
-	note $30
-	octave1
-	note $a0
-	notetype $08, $b7
-	endchannel ; end
-; 0xeb984
+Music_TitleScreen_branch_eb96d: ; eb96d
+	notetype $c, $c3
+	note D_, 0
 
-_Music_TitleScreen_Ch2: ; 0xeb984
-	dutycycle $03
+Music_TitleScreen_branch_eb971: ; eb971
+	note __, 0
+	octave 2
+	note D_, 0
+	octave 1
+	note A_, 0
+	octave 2
+	note D_, 0
+	loopchannel 5, Music_TitleScreen_branch_eb971
+	note __, 0
+	note D_, 0
+	octave 1
+	note A_, 0
+	notetype $8, $b7
+	endchannel
+
+Music_TitleScreen_Ch2: ; eb984
+	dutycycle $3
 	vibrato $14, $12
-	notetype $0c, $c7
+	notetype $c, $c7
 	intensity $a4
-	octave1
-	note $80
-	octave2
-	note $30
-	note $80
-	octave3
-	note $10
+	octave 1
+	note G_, 0
+	octave 2
+	note D_, 0
+	note G_, 0
+	octave 3
+	note C_, 0
 	intensity $c2
-	octave3
-	note $c0
-	note $01
-	note $a0
+	octave 3
+	note B_, 0
+	note __, 1
+	note A_, 0
 	intensity $b0
-	note $85
+	note G_, 5
 	intensity $b7
-	note $85
-	note $0f
-	note $0f
+	note G_, 5
+	note __, 15
+	note __, 15
 	intensity $c7
-	octave4
-	note $10
-	note $01
-	note $30
-	note $57
-	note $71
-	note $50
-	note $70
-	octave3
-	note $85
-	note $c1
-	octave4
-	note $37
+	octave 4
+	note C_, 0
+	note __, 1
+	note D_, 0
+	note E_, 7
+	note F#, 1
+	note E_, 0
+	note F#, 0
+	octave 3
+	note G_, 5
+	note B_, 1
+	octave 4
+	note D_, 7
 	stereopanning $f0
 	intensity $97
-	octave2
-	note $a3
-	note $63
+	octave 2
+	note A_, 3
+	note F_, 3
 	stereopanning $ff
 	intensity $c7
-	octave4
-	note $65
-	note $50
-	note $40
-	note $37
+	octave 4
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
 	stereopanning $f0
 	intensity $97
-	octave2
-	note $a5
-	octave3
-	note $11
-	stereopanning $0f
+	octave 2
+	note A_, 5
+	octave 3
+	note C_, 1
+	stereopanning $f
 	intensity $a3
-	octave4
-	note $33
-	note $31
-	note $13
-	note $11
-	octave3
-	note $c3
+	octave 4
+	note D_, 3
+	note D_, 1
+	note C_, 3
+	note C_, 1
+	octave 3
+	note B_, 3
 	stereopanning $ff
 	intensity $c7
-	octave3
-	note $85
-	note $c1
-	octave4
-	note $37
+	octave 3
+	note G_, 5
+	note B_, 1
+	octave 4
+	note D_, 7
 	stereopanning $f0
 	intensity $97
-	octave2
-	note $a1
-	note $63
-	note $a1
+	octave 2
+	note A_, 1
+	note F_, 3
+	note A_, 1
 	stereopanning $ff
-	notetype $08, $c7
-	octave4
-	note $13
-	octave3
-	note $c3
-	octave4
-	note $13
-	note $3b
+	notetype $8, $c7
+	octave 4
+	note C_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note C_, 3
+	note D_, 11
 	stereopanning $f0
-	notetype $08, $b7
-	octave2
-	note $a8
-	stereopanning $0f
-	notetype $0c, $c7
-	note $80
-	note $a0
-	note $c5
-	note $50
-	note $70
-	note $83
-	notetype $0c, $4b
-	note $a3
+	notetype $8, $b7
+	octave 2
+	note A_, 8
+	stereopanning $f
+	notetype $c, $c7
+	note G_, 0
+	note A_, 0
+	note B_, 5
+	note E_, 0
+	note F#, 0
+	note G_, 3
+	notetype $c, $4b
+	note A_, 3
 	stereopanning $ff
-	notetype $0c, $c7
-	octave3
-	note $85
-	note $c1
-	octave4
-	note $37
+	notetype $c, $c7
+	octave 3
+	note G_, 5
+	note B_, 1
+	octave 4
+	note D_, 7
 	stereopanning $f0
 	intensity $97
-	octave2
-	note $a1
-	note $65
+	octave 2
+	note A_, 1
+	note F_, 5
 	stereopanning $ff
 	intensity $c7
-	octave4
-	note $65
-	note $50
-	note $40
-	note $37
+	octave 4
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
 	stereopanning $f0
 	intensity $97
-	octave3
-	note $11
-	octave2
-	note $a5
-	note $c5
-	note $81
-	notetype $08, $c7
-	note $63
-	note $83
-	note $63
+	octave 3
+	note C_, 1
+	octave 2
+	note A_, 5
+	note B_, 5
+	note G_, 1
+	notetype $8, $c7
+	note F_, 3
+	note G_, 3
+	note F_, 3
 	stereopanning $ff
-	octave3
-	note $88
-	note $c2
-	octave4
-	note $3b
+	octave 3
+	note G_, 8
+	note B_, 2
+	octave 4
+	note D_, 11
 	stereopanning $f0
-	notetype $08, $a7
-	octave3
-	note $33
-	note $13
-	note $33
+	notetype $8, $a7
+	octave 3
+	note D_, 3
+	note C_, 3
+	note D_, 3
 	stereopanning $ff
-	notetype $08, $c7
-	octave4
-	note $63
-	note $53
-	note $63
-	note $88
-	note $b2
-	notetype $0c, $b0
-	note $87
-	notetype $0c, $b7
-	note $87
+	notetype $8, $c7
+	octave 4
+	note F_, 3
+	note E_, 3
+	note F_, 3
+	note G_, 8
+	note A#, 2
+	notetype $c, $b0
+	note G_, 7
+	notetype $c, $b7
+	note G_, 7
 	intensity $c6
-	note $a3
+	note A_, 3
 	intensity $5d
-	note $a3
+	note A_, 3
 	intensity $c7
-	note $b5
+	note A#, 5
 	intensity $c3
-	note $61
+	note F_, 1
 	intensity $c7
-	note $67
+	note F_, 7
 	intensity $a7
-	octave3
-	note $b7
+	octave 3
+	note A#, 7
 	intensity $c7
-	octave4
-	note $b3
-	note $c3
-	octave5
-	note $15
+	octave 4
+	note A#, 3
+	note B_, 3
+	octave 5
+	note C_, 5
 	intensity $c3
-	octave4
-	note $81
+	octave 4
+	note G_, 1
 	intensity $c7
-	note $87
+	note G_, 7
 	intensity $a7
-	octave3
-	note $57
+	octave 3
+	note E_, 7
 	intensity $c7
-	octave5
-	note $13
-	note $23
-	tone $0100
-	stereopanning $0f
-	callchannel _Music_TitleScreen_sub_0xebae7
-	note $23
-	callchannel _Music_TitleScreen_sub_0xebae7
-	note $23
-	callchannel _Music_TitleScreen_sub_0xebae7
-	octave4
-	note $a3
+	octave 5
+	note C_, 3
+	note C#, 3
+	tone $0001
+	stereopanning $f
+	callchannel Music_TitleScreen_branch_ebae7
+	note C#, 3
+	callchannel Music_TitleScreen_branch_ebae7
+	note C#, 3
+	callchannel Music_TitleScreen_branch_ebae7
+	octave 4
+	note A_, 3
 	stereopanning $ff
 	tone $0000
-	notetype $0c, $b0
-	octave3
-	note $c5
-	notetype $0c, $b7
-	note $c9
+	notetype $c, $b0
+	octave 3
+	note B_, 5
+	notetype $c, $b7
+	note B_, 9
 	intensity $c7
-	note $a7
-	note $65
-	note $50
-	note $40
-	note $37
-	note $87
-	note $67
-	note $a7
+	note A_, 7
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
+	note G_, 7
+	note F_, 7
+	note A_, 7
 	intensity $b0
-	note $87
+	note G_, 7
 	intensity $b7
-	note $87
+	note G_, 7
 	intensity $c7
-	note $67
-	octave4
-	note $65
-	note $50
-	note $40
-	note $37
-	octave2
-	note $c7
-	octave3
-	note $17
-	note $a5
-	note $60
-	note $a0
+	note F_, 7
+	octave 4
+	note F_, 5
+	note E_, 0
+	note D#, 0
+	note D_, 7
+	octave 2
+	note B_, 7
+	octave 3
+	note C_, 7
+	note A_, 5
+	note F_, 0
+	note A_, 0
 	intensity $b0
-	note $8f
+	note G_, 15
 	intensity $b7
-	note $8f
+	note G_, 15
 	intensity $c2
-	octave4
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $02
-	note $80
-	note $02
+	octave 4
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
 	intensity $90
-	note $83
-	notetype $08, $c2
-	octave3
-	note $61
-	note $61
-	note $61
-	note $61
-	note $61
-	note $71
-	notetype $0c, $c7
-	note $80
-	note $02
-	octave2
-	note $80
-	note $0a
-	endchannel ; end
-; 0xebae7
+	note G_, 3
+	notetype $8, $c2
+	octave 3
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F#, 1
+	notetype $c, $c7
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 0
+	note __, 10
+	endchannel
+; ebae7
 
-_Music_TitleScreen_sub_0xebae7: ; 0xebae7
-; subroutine
-	notetype $0c, $b2
-	note $30
-	octave3
-	note $a0
-	octave4
-	note $30
-	note $a0
-	note $30
-	loopchannel $05, $7aeb
-	octave3
-	note $a0
-	octave4
-	note $30
-	note $a0
-	notetype $08, $b7
-	octave5
-	note $13
-	note $13
-	endchannel ; end
-; 0xebb01
+Music_TitleScreen_branch_ebae7: ; ebae7
+	notetype $c, $b2
+	note D_, 0
 
-_Music_TitleScreen_Ch3: ; 0xebb01
-	stereopanning $0f
+Music_TitleScreen_branch_ebaeb: ; ebaeb
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	note A_, 0
+	note D_, 0
+	loopchannel 5, Music_TitleScreen_branch_ebaeb
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	note A_, 0
+	notetype $8, $b7
+	octave 5
+	note C_, 3
+	note C_, 3
+	endchannel
+
+Music_TitleScreen_Ch3: ; ebb01
+	stereopanning $f
 	vibrato $10, $14
-	tone $0100
-	notetype $0c, $16
-	octave3
-	octave3
-	note $03
-	octave2
-	note $81
-	note $30
-	note $20
-	note $30
-	note $00
-	note $81
-	note $30
-	note $00
-	note $31
-	note $81
-	note $31
-	note $61
-	note $10
-	octave1
-	note $c0
-	octave2
-	note $10
-	note $00
-	note $61
-	note $10
-	note $00
-	note $11
-	note $61
-	note $11
-	note $81
-	note $30
-	note $20
-	note $30
-	note $00
-	note $81
-	note $30
-	note $00
-	note $31
-	note $81
-	note $31
-	note $a1
-	note $60
-	note $50
-	note $60
-	note $00
-	note $a1
-	note $61
-	note $a3
-	octave3
-	note $11
-	octave2
-	note $83
-	note $31
-	note $83
-	note $31
-	note $81
-	note $31
-	note $a3
-	note $61
-	note $a3
-	note $61
-	note $a1
-	octave3
-	note $11
-	octave2
-	note $c3
-	note $81
-	note $c3
-	note $81
-	note $c1
-	note $81
-	note $83
-	note $c1
-	note $a3
-	note $c1
-	octave3
-	note $13
-	octave2
-	note $83
-	note $31
-	note $83
-	note $31
-	note $81
-	note $31
-	note $a3
-	note $61
-	note $a3
-	note $61
-	note $a1
-	octave3
-	note $11
-	octave2
-	note $c3
-	note $81
-	note $c3
-	note $81
-	note $c1
-	octave3
-	note $11
-	octave2
-	note $c3
-	note $81
-	note $c3
-	note $81
-	octave3
-	note $33
-	octave2
-	note $83
-	note $31
-	note $83
-	note $31
-	note $81
-	note $31
-	note $a3
-	note $61
-	note $a3
-	note $61
-	note $a1
-	octave3
-	note $11
-	octave2
-	note $c3
-	note $81
-	note $c3
-	note $81
-	note $c1
-	note $81
-	octave3
-	note $33
-	octave2
-	note $81
-	octave3
-	note $33
-	octave2
-	note $81
-	octave3
-	note $31
-	octave2
-	note $a1
-	note $83
-	note $31
-	note $83
-	note $31
-	note $81
-	note $31
-	note $a3
-	note $61
-	note $a3
-	note $61
-	note $a1
-	octave3
-	note $11
-	octave2
-	note $c3
-	note $81
-	note $c3
-	note $81
-	octave3
-	note $31
-	octave2
-	note $81
-	note $81
-	note $31
-	note $81
-	note $a1
-	note $a1
-	note $61
-	note $a1
-	octave3
-	note $11
-	note $35
-	octave2
-	note $b5
-	octave3
-	note $63
-	note $b5
-	note $65
-	note $33
-	note $55
-	note $15
-	note $53
-	octave4
-	note $15
-	octave3
-	note $85
-	note $53
-	note $30
-	note $00
+	tone $0001
+	notetype $c, $16
+	octave 3
+	octave 3
+	note __, 3
+	octave 2
+	note G_, 1
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note __, 0
+	note G_, 1
+	note D_, 0
+	note __, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note F_, 1
+	note C_, 0
+	octave 1
+	note B_, 0
+	octave 2
+	note C_, 0
+	note __, 0
+	note F_, 1
+	note C_, 0
+	note __, 0
+	note C_, 1
+	note F_, 1
+	note C_, 1
+	note G_, 1
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note __, 0
+	note G_, 1
+	note D_, 0
+	note __, 0
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note A_, 1
+	note F_, 0
+	note E_, 0
+	note F_, 0
+	note __, 0
+	note A_, 1
+	note F_, 1
+	note A_, 3
+	octave 3
+	note C_, 1
+	octave 2
+	note G_, 3
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	note G_, 3
+	note B_, 1
+	note A_, 3
+	note B_, 1
+	octave 3
+	note C_, 3
+	octave 2
+	note G_, 3
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note G_, 3
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	note B_, 1
+	note G_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note G_, 1
+	octave 3
+	note D_, 3
+	octave 2
+	note G_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 3
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 3
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 3
+	note G_, 1
+	note B_, 3
+	note G_, 1
+	octave 3
+	note D_, 1
+	octave 2
+	note G_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note A_, 1
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	octave 3
+	note C_, 1
+	note D_, 5
+	octave 2
+	note A#, 5
+	octave 3
+	note F_, 3
+	note A#, 5
+	note F_, 5
+	note D_, 3
+	note E_, 5
+	note C_, 5
+	note E_, 3
+	octave 4
+	note C_, 5
+	octave 3
+	note G_, 5
+	note E_, 3
+	note D_, 0
+	note __, 0
 	stereopanning $ff
-	notetype $0c, $16
+	notetype $c, $16
 	tone $0000
-	octave4
-	note $a1
-	octave5
-	note $31
-	note $a5
-	note $81
-	note $71
-	note $30
-	note $01
-	note $50
-	note $73
-	notetype $08, $16
-	octave3
-	note $13
-	note $13
-	note $23
-	notetype $0c, $16
-	note $30
-	note $00
-	octave4
-	note $a1
-	octave5
-	note $31
-	note $a5
-	note $81
-	note $71
-	note $c0
-	note $01
-	note $a0
-	note $a3
-	notetype $08, $16
-	octave3
-	note $13
-	note $13
-	note $23
-	notetype $0c, $16
-	note $30
-	note $00
-	notetype $0c, $16
-	octave4
-	note $a1
-	octave5
-	note $31
-	note $85
-	note $51
-	note $81
-	note $70
-	note $50
-	note $35
-	tone $0100
-	notetype $08, $16
-	octave3
-	note $13
-	note $13
-	note $51
-	note $71
-	stereopanning $0f
-	notetype $0c, $16
-	note $8f
-	note $6f
-	note $87
-	note $35
-	note $30
-	note $50
-	note $61
-	note $6b
-	note $50
-	note $40
-	note $37
-	note $87
-	note $67
-	note $a7
-	note $87
-	note $35
-	note $30
-	note $50
-	note $6f
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $02
-	octave2
-	note $80
-	note $02
-	note $80
-	note $04
-	note $80
-	note $80
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $02
-	notetype $08, $16
-	note $61
-	note $61
-	note $61
-	note $61
-	note $61
-	note $a1
-	notetype $0c, $16
-	note $80
-	note $02
-	octave1
-	note $80
-	note $0a
-	endchannel ; end
-; 0xebc5c
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note A_, 5
+	note G_, 1
+	note F#, 1
+	note D_, 0
+	note __, 1
+	note E_, 0
+	note F#, 3
+	notetype $8, $16
+	octave 3
+	note C_, 3
+	note C_, 3
+	note C#, 3
+	notetype $c, $16
+	note D_, 0
+	note __, 0
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note A_, 5
+	note G_, 1
+	note F#, 1
+	note B_, 0
+	note __, 1
+	note A_, 0
+	note A_, 3
+	notetype $8, $16
+	octave 3
+	note C_, 3
+	note C_, 3
+	note C#, 3
+	notetype $c, $16
+	note D_, 0
+	note __, 0
+	notetype $c, $16
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note G_, 5
+	note E_, 1
+	note G_, 1
+	note F#, 0
+	note E_, 0
+	note D_, 5
+	tone $0001
+	notetype $8, $16
+	octave 3
+	note C_, 3
+	note C_, 3
+	note E_, 1
+	note F#, 1
+	stereopanning $f
+	notetype $c, $16
+	note G_, 15
+	note F_, 15
+	note G_, 7
+	note D_, 5
+	note D_, 0
+	note E_, 0
+	note F_, 1
+	note F_, 11
+	note E_, 0
+	note D#, 0
+	note D_, 7
+	note G_, 7
+	note F_, 7
+	note A_, 7
+	note G_, 7
+	note D_, 5
+	note D_, 0
+	note E_, 0
+	note F_, 15
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	octave 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 4
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	notetype $8, $16
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	note A_, 1
+	notetype $c, $16
+	note G_, 0
+	note __, 2
+	octave 1
+	note G_, 0
+	note __, 10
+	endchannel
 
-_Music_TitleScreen_Ch4: ; 0xebc5c
-	togglenoise $05
+Music_TitleScreen_Ch4: ; ebc5c
+	togglenoise $5
 	stereopanning $f0
-	notetype $0c
-	note $03
-	note $11
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $10
-	note $10
-	note $15
-	note $11
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $10
-	note $10
-	note $12
-	note $10
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $10
-	note $10
-	note $13
-	note $41
-	note $11
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $10
-	note $10
-	note $11
-	notetype $06
-	note $30
-	note $30
-	note $20
-	note $20
-	note $20
-	note $20
-	note $10
-	note $10
-	notetype $0c
-	callchannel _Music_TitleScreen_sub_0xebd77
-	callchannel _Music_TitleScreen_sub_0xebd81
-	callchannel _Music_TitleScreen_sub_0xebd81
-	note $11
-	note $41
-	note $11
-	note $41
-	note $41
-	note $10
-	note $10
-	note $11
-	notetype $06
-	note $20
-	note $20
-	note $10
-	note $10
-	notetype $0c
-	callchannel _Music_TitleScreen_sub_0xebd77
-	note $11
-	note $41
-	note $11
-	note $61
-	note $41
-	note $10
-	note $10
-	note $11
-	note $11
-	callchannel _Music_TitleScreen_sub_0xebd81
-	note $11
-	note $41
-	note $11
-	note $41
-	note $41
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	callchannel _Music_TitleScreen_sub_0xebd77
-	callchannel _Music_TitleScreen_sub_0xebd81
-	callchannel _Music_TitleScreen_sub_0xebd81
-	note $11
-	note $41
-	note $11
-	note $41
-	note $41
-	note $10
-	note $10
-	note $11
-	notetype $06
-	note $20
-	note $30
-	note $30
-	note $20
-	notetype $0c
-	callchannel _Music_TitleScreen_sub_0xebd77
-	callchannel _Music_TitleScreen_sub_0xebd81
-	note $11
-	note $41
-	note $11
-	note $61
-	note $41
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	note $11
-	note $41
-	note $11
-	note $41
-	note $41
-	note $10
-	note $10
-	note $11
-	notetype $06
-	note $30
-	note $30
-	note $20
-	note $20
-	notetype $0c
-	note $a1
-	note $43
-	note $a3
-	note $41
-	note $a3
-	note $a1
-	note $43
-	note $a3
-	note $41
-	note $a1
-	note $a1
-	note $a1
-	note $43
-	note $a3
-	note $41
-	note $a3
-	note $a3
-	note $a3
-	note $a1
-	note $30
-	note $30
-	note $20
-	note $20
-	note $10
-	note $10
-	callchannel _Music_TitleScreen_sub_0xebd8b
-	callchannel _Music_TitleScreen_sub_0xebd93
-	note $20
-	note $30
-	note $30
-	note $20
-	notetype $0c
-	callchannel _Music_TitleScreen_sub_0xebd8b
-	callchannel _Music_TitleScreen_sub_0xebd93
-	note $30
-	note $30
-	note $20
-	note $20
-	notetype $0c
-	callchannel _Music_TitleScreen_sub_0xebd8b
-	callchannel _Music_TitleScreen_sub_0xebd93
-	note $20
-	note $20
-	note $20
-	note $20
-	notetype $0c
-	note $9f
-	note $0f
-	loopchannel $06, $7d40
-	note $0b
-	notetype $06
-	note $30
-	note $20
-	note $30
-	note $20
-	note $30
-	note $20
-	note $10
-	note $10
-	notetype $0c
-	note $13
-	note $15
-	note $10
-	note $10
-	note $13
-	note $13
-	note $15
-	note $10
-	note $10
-	note $13
-	note $13
-	note $15
-	note $10
-	note $10
-	note $13
-	note $13
-	note $13
-	notetype $08
-	note $11
-	note $11
-	note $11
-	notetype $06
-	note $20
-	note $20
-	note $30
-	note $30
-	note $20
-	note $20
-	note $10
-	note $10
-	notetype $0c
-	note $13
-	note $c3
-	endchannel ; end
-; 0xebd77
+	notetype $c
+	note __, 3
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 5
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 2
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 3
+	note D#, 1
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C_, 0
+	note C_, 0
+	notetype $c
+	callchannel Music_TitleScreen_branch_ebd77
+	callchannel Music_TitleScreen_branch_ebd81
+	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	notetype $6
+	note C#, 0
+	note C#, 0
+	note C_, 0
+	note C_, 0
+	notetype $c
+	callchannel Music_TitleScreen_branch_ebd77
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note F_, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 1
+	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	callchannel Music_TitleScreen_branch_ebd77
+	callchannel Music_TitleScreen_branch_ebd81
+	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	notetype $6
+	note C#, 0
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	notetype $c
+	callchannel Music_TitleScreen_branch_ebd77
+	callchannel Music_TitleScreen_branch_ebd81
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note F_, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	notetype $6
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	notetype $c
+	note A_, 1
+	note D#, 3
+	note A_, 3
+	note D#, 1
+	note A_, 3
+	note A_, 1
+	note D#, 3
+	note A_, 3
+	note D#, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note D#, 3
+	note A_, 3
+	note D#, 1
+	note A_, 3
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note C_, 0
+	note C_, 0
+	callchannel Music_TitleScreen_branch_ebd8b
+	callchannel Music_TitleScreen_branch_ebd93
+	note C#, 0
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	notetype $c
+	callchannel Music_TitleScreen_branch_ebd8b
+	callchannel Music_TitleScreen_branch_ebd93
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	notetype $c
+	callchannel Music_TitleScreen_branch_ebd8b
+	callchannel Music_TitleScreen_branch_ebd93
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	note C#, 0
+	notetype $c
+	note G#, 15
 
-_Music_TitleScreen_sub_0xebd77: ; 0xebd77
-; subroutine
-	note $11
-	note $41
-	note $11
-	note $41
-	note $61
-	note $10
-	note $10
-	note $11
-	note $41
-	endchannel ; end
-; 0xebd81
+Music_TitleScreen_branch_ebd40: ; ebd40
+	note __, 15
+	loopchannel 6, Music_TitleScreen_branch_ebd40
+	note __, 11
+	notetype $6
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note D_, 0
+	note C#, 0
+	note C_, 0
+	note C_, 0
+	notetype $c
+	note C_, 3
+	note C_, 5
+	note C_, 0
+	note C_, 0
+	note C_, 3
+	note C_, 3
+	note C_, 5
+	note C_, 0
+	note C_, 0
+	note C_, 3
+	note C_, 3
+	note C_, 5
+	note C_, 0
+	note C_, 0
+	note C_, 3
+	note C_, 3
+	note C_, 3
+	notetype $8
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	notetype $6
+	note C#, 0
+	note C#, 0
+	note D_, 0
+	note D_, 0
+	note C#, 0
+	note C#, 0
+	note C_, 0
+	note C_, 0
+	notetype $c
+	note C_, 3
+	note B_, 3
+	endchannel
+; ebd77
 
-_Music_TitleScreen_sub_0xebd81: ; 0xebd81
-; subroutine
-	note $11
-	note $41
-	note $11
-	note $61
-	note $41
-	note $10
-	note $10
-	note $11
-	note $41
-	endchannel ; end
-; 0xebd8b
+Music_TitleScreen_branch_ebd77: ; ebd77
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note D#, 1
+	note F_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note D#, 1
+	endchannel
+; ebd81
 
-_Music_TitleScreen_sub_0xebd8b: ; 0xebd8b
-; subroutine
-	note $11
-	note $10
-	note $10
-	loopchannel $04, $7d8b
-	endchannel ; end
-; 0xebd93
+Music_TitleScreen_branch_ebd81: ; ebd81
+	note C_, 1
+	note D#, 1
+	note C_, 1
+	note F_, 1
+	note D#, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note D#, 1
+	endchannel
+; ebd8b
 
-_Music_TitleScreen_sub_0xebd93: ; 0xebd93
-; subroutine
-	note $11
-	note $10
-	note $10
-	note $11
-	note $10
-	note $10
-	notetype $08
-	note $13
-	note $13
-	endchannel ; end
-; 0xebd9e
+Music_TitleScreen_branch_ebd8b: ; ebd8b
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	loopchannel 4, Music_TitleScreen_branch_ebd8b
+	endchannel
+; ebd93
+
+Music_TitleScreen_branch_ebd93: ; ebd93
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	note C_, 1
+	note C_, 0
+	note C_, 0
+	notetype $8
+	note C_, 3
+	note C_, 3
+	endchannel
+; ebd9e
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -1,237 +1,240 @@
-_Music_TrainerVictory: ; 0xebeab
-	db $80
-	dw _Music_TrainerVictory_Ch1
-	db $01
-	dw _Music_TrainerVictory_Ch2
-	db $02
-	dw _Music_TrainerVictory_Ch3
-; 0xebeb4
+Music_TrainerVictory: ; ebeab
+	dbw $80, Music_TrainerVictory_Ch1
+	dbw $01, Music_TrainerVictory_Ch2
+	dbw $02, Music_TrainerVictory_Ch3
+; ebeb4
 
-_Music_TrainerVictory_Ch1: ; 0xebeb4
-	tempo $7800
+
+Music_TrainerVictory_Ch1: ; ebeb4
+	tempo 120
 	volume $77
-	dutycycle $02
-	tone $0100
-	notetype $08, $b1
-	octave4
-	note $51
-	note $51
-	note $51
-	note $51
-	note $71
-	note $81
+	dutycycle $2
+	tone $0001
+	notetype $8, $b1
+	octave 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
 	intensity $b6
-	note $ab
-	stereopanning $0f
+	note A_, 11
+	stereopanning $f
+
+Music_TrainerVictory_branch_ebecd: ; ebecd
 	intensity $72
-	callchannel _Music_TrainerVictory_sub_0xebf11
+	callchannel Music_TrainerVictory_branch_ebf11
 	intensity $51
-	note $21
-	note $51
-	note $71
-	note $a1
-	note $c1
-	octave4
-	note $21
+	note C#, 1
+	note E_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
 	intensity $72
-	octave3
-	note $a1
-	note $01
-	octave4
-	note $21
-	note $55
-	loopchannel $02, $7ecd
-	callchannel _Music_TrainerVictory_sub_0xebf11
-	note $a1
-	note $01
-	note $61
-	note $a5
-	note $b1
-	note $01
-	note $81
-	note $b5
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	note E_, 5
+	loopchannel 2, Music_TrainerVictory_branch_ebecd
+	callchannel Music_TrainerVictory_branch_ebf11
+	note A_, 1
+	note __, 1
+	note F_, 1
+	note A_, 5
+	note A#, 1
+	note __, 1
+	note G_, 1
+	note A#, 5
+
+Music_TrainerVictory_branch_ebef2: ; ebef2
 	intensity $72
-	octave4
-	note $31
-	note $21
-	octave3
-	note $a1
-	loopchannel $03, $7ef2
-	note $71
-	note $a1
-	octave4
-	note $31
-	octave4
-	note $21
-	octave3
-	note $c1
-	note $a1
-	loopchannel $03, $7f01
-	note $51
-	note $71
-	note $81
-	loopchannel $00, $7ecd ; end
-; 0xebf11
+	octave 4
+	note D_, 1
+	note C#, 1
+	octave 3
+	note A_, 1
+	loopchannel 3, Music_TrainerVictory_branch_ebef2
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 1
 
-_Music_TrainerVictory_sub_0xebf11: ; 0xebf11
-; subroutine
-	octave3
-	note $71
-	note $01
-	note $31
-	note $75
-	note $81
-	note $01
-	note $51
-	note $85
-	endchannel ; end
-; 0xebf1b
+Music_TrainerVictory_branch_ebf01: ; ebf01
+	octave 4
+	note C#, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	loopchannel 3, Music_TrainerVictory_branch_ebf01
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	loopchannel 0, Music_TrainerVictory_branch_ebecd
+; ebf11
 
-_Music_TrainerVictory_Ch2: ; 0xebf1b
+Music_TrainerVictory_branch_ebf11: ; ebf11
+	octave 3
+	note F#, 1
+	note __, 1
+	note D_, 1
+	note F#, 5
+	note G_, 1
+	note __, 1
+	note E_, 1
+	note G_, 5
+	endchannel
+
+Music_TrainerVictory_Ch2: ; ebf1b
 	vibrato $12, $34
-	dutycycle $03
-	notetype $08, $d1
-	octave4
-	note $a1
-	note $a1
-	note $a1
-	note $a1
-	note $c1
-	octave5
-	note $21
+	dutycycle $3
+	notetype $8, $d1
+	octave 4
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C#, 1
 	intensity $d6
-	note $3b
+	note D_, 11
 	stereopanning $f0
-	notetype $08, $82
-	callchannel _Music_TrainerVictory_sub_0xebf56
-	note $71
-	note $01
-	note $81
-	note $a5
-	note $51
-	note $01
-	note $71
-	note $85
-	loopchannel $02, $7f30
-	callchannel _Music_TrainerVictory_sub_0xebf56
-	note $61
-	note $01
-	note $11
-	note $65
-	note $81
-	note $01
-	note $31
-	note $85
-	notetype $0c, $88
-	note $7f
-	note $5f
-	loopchannel $00, $7f30 ; end
-; 0xebf56
 
-_Music_TrainerVictory_sub_0xebf56: ; 0xebf56
-; subroutine
-	octave4
-	note $31
-	note $01
-	octave3
-	note $a1
-	octave4
-	note $35
-	note $51
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $55
-	endchannel ; end
-; 0xebf64
+Music_TrainerVictory_branch_ebf30: ; ebf30
+	notetype $8, $82
+	callchannel Music_TrainerVictory_branch_ebf56
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note A_, 5
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note G_, 5
+	loopchannel 2, Music_TrainerVictory_branch_ebf30
+	callchannel Music_TrainerVictory_branch_ebf56
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note F_, 5
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note G_, 5
+	notetype $c, $88
+	note F#, 15
+	note E_, 15
+	loopchannel 0, Music_TrainerVictory_branch_ebf30
+; ebf56
 
-_Music_TrainerVictory_Ch3: ; 0xebf64
-	notetype $08, $25
-	octave3
-	note $85
-	note $80
-	note $00
-	note $80
-	note $00
-	note $80
-	note $00
-	note $75
-	note $31
-	note $21
-	octave2
-	note $c1
-	callchannel _Music_TrainerVictory_sub_0xebfb1
-	octave3
-	note $21
-	note $01
-	note $21
-	note $a1
-	note $71
-	note $21
-	octave2
-	note $a1
-	note $01
-	octave3
-	note $a0
-	note $00
-	note $a5
-	loopchannel $02, $7f74
-	callchannel _Music_TrainerVictory_sub_0xebfb1
-	octave3
-	note $11
-	note $01
-	note $11
-	note $a1
-	note $61
-	note $11
-	note $31
-	note $01
-	note $31
-	octave4
-	note $31
-	octave3
-	note $b1
-	note $81
-	note $31
-	note $71
-	note $a1
-	octave4
-	note $3b
-	octave3
-	note $a1
-	note $71
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $51
-	note $ab
-	note $81
-	note $51
-	note $21
-	loopchannel $00, $7f74 ; end
-; 0xebfb1
+Music_TrainerVictory_branch_ebf56: ; ebf56
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 5
+	note E_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 5
+	endchannel
 
-_Music_TrainerVictory_sub_0xebfb1: ; 0xebfb1
-; subroutine
-	octave2
-	note $a1
-	note $01
-	note $a1
-	octave3
-	note $71
-	note $31
-	octave2
-	note $a1
-	note $c1
-	note $01
-	note $c1
-	octave3
-	note $81
-	note $51
-	octave2
-	note $c1
-	endchannel ; end
-; 0xebfc3
+Music_TrainerVictory_Ch3: ; ebf64
+	notetype $8, $25
+	octave 3
+	note G_, 5
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 5
+	note D_, 1
+	note C#, 1
+	octave 2
+	note B_, 1
+
+Music_TrainerVictory_branch_ebf74: ; ebf74
+	callchannel Music_TrainerVictory_branch_ebfb1
+	octave 3
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note A_, 1
+	note F#, 1
+	note C#, 1
+	octave 2
+	note A_, 1
+	note __, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	note A_, 5
+	loopchannel 2, Music_TrainerVictory_branch_ebf74
+	callchannel Music_TrainerVictory_branch_ebfb1
+	octave 3
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note A_, 1
+	note F_, 1
+	note C_, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note A#, 1
+	note G_, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 11
+	octave 3
+	note A_, 1
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note E_, 1
+	note A_, 11
+	note G_, 1
+	note E_, 1
+	note C#, 1
+	loopchannel 0, Music_TrainerVictory_branch_ebf74
+; ebfb1
+
+Music_TrainerVictory_branch_ebfb1: ; ebfb1
+	octave 2
+	note A_, 1
+	note __, 1
+	note A_, 1
+	octave 3
+	note F#, 1
+	note D_, 1
+	octave 2
+	note A_, 1
+	note B_, 1
+	note __, 1
+	note B_, 1
+	octave 3
+	note G_, 1
+	note E_, 1
+	octave 2
+	note B_, 1
+	endchannel
+; ebfc3
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -1,265 +1,276 @@
-_Music_UnionCave: ; 0xf5c60
-	db $c0
-	dw _Music_UnionCave_Ch1
-	db $01
-	dw _Music_UnionCave_Ch2
-	db $02
-	dw _Music_UnionCave_Ch3
-	db $03
-	dw _Music_UnionCave_Ch4
-; 0xf5c6c
+Music_UnionCave: ; f5c60
+	dbw $c0, Music_UnionCave_Ch1
+	dbw $01, Music_UnionCave_Ch2
+	dbw $02, Music_UnionCave_Ch3
+	dbw $03, Music_UnionCave_Ch4
+; f5c6c
 
-_Music_UnionCave_Ch1: ; 0xf5c6c
-	tempo $a000
+
+Music_UnionCave_Ch1: ; f5c6c
+	tempo 160
 	volume $77
-	dutycycle $01
-	tone $0200
+	dutycycle $1
+	tone $0002
 	vibrato $18, $34
-	stereopanning $0f
-	notetype $0c, $b3
-	callchannel _Music_UnionCave_sub_0xf5ccf
-	loopchannel $04, $5c7e
-	octave2
-	note $91
-	octave3
-	note $21
-	note $53
-	note $21
-	note $51
-	note $63
-	loopchannel $08, $5c85
-	octave2
-	note $a1
-	octave3
-	note $31
-	note $63
-	note $31
-	note $61
-	note $73
-	loopchannel $04, $5c91
-	note $03
+	stereopanning $f
+
+Music_UnionCave_branch_f5c7b: ; f5c7b
+	notetype $c, $b3
+
+Music_UnionCave_branch_f5c7e: ; f5c7e
+	callchannel Music_UnionCave_branch_f5ccf
+	loopchannel 4, Music_UnionCave_branch_f5c7e
+
+Music_UnionCave_branch_f5c85: ; f5c85
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	note E_, 3
+	note C#, 1
+	note E_, 1
+	note F_, 3
+	loopchannel 8, Music_UnionCave_branch_f5c85
+
+Music_UnionCave_branch_f5c91: ; f5c91
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note F_, 3
+	note D_, 1
+	note F_, 1
+	note F#, 3
+	loopchannel 4, Music_UnionCave_branch_f5c91
+	note __, 3
 	intensity $80
-	note $6f
-	note $7f
-	note $8f
-	note $7f
-	note $87
-	note $77
-	note $67
-	note $57
-	note $87
-	note $77
-	octave4
-	note $17
-	octave3
-	note $a7
+	note F_, 15
+	note F#, 15
+	note G_, 15
+	note F#, 15
+	note G_, 7
+	note F#, 7
+	note F_, 7
+	note E_, 7
+	note G_, 7
+	note F#, 7
+	octave 4
+	note C_, 7
+	octave 3
+	note A_, 7
 	intensity $95
-	tone $0400
-	callchannel _Music_UnionCave_sub_0xf5ccf
-	tone $0800
-	callchannel _Music_UnionCave_sub_0xf5ccf
-	tone $0c00
-	callchannel _Music_UnionCave_sub_0xf5ccf
-	tone $1000
-	callchannel _Music_UnionCave_sub_0xf5ccf
-	tone $0200
-	loopchannel $00, $5c7b ; end
-; 0xf5ccf
+	tone $0004
+	callchannel Music_UnionCave_branch_f5ccf
+	tone $0008
+	callchannel Music_UnionCave_branch_f5ccf
+	tone $000c
+	callchannel Music_UnionCave_branch_f5ccf
+	tone $0010
+	callchannel Music_UnionCave_branch_f5ccf
+	tone $0002
+	loopchannel 0, Music_UnionCave_branch_f5c7b
+; f5ccf
 
-_Music_UnionCave_sub_0xf5ccf: ; 0xf5ccf
-; subroutine
-	octave2
-	note $91
-	octave3
-	note $21
-	note $5b
-	endchannel ; end
-; 0xf5cd5
+Music_UnionCave_branch_f5ccf: ; f5ccf
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	note E_, 11
+	endchannel
 
-_Music_UnionCave_Ch2: ; 0xf5cd5
-	dutycycle $03
-	vibrato $08, $24
-	notetype $0c, $c4
-	callchannel _Music_UnionCave_sub_0xf5d34
+Music_UnionCave_Ch2: ; f5cd5
+	dutycycle $3
+	vibrato $8, $24
+
+Music_UnionCave_branch_f5cda: ; f5cda
+	notetype $c, $c4
+	callchannel Music_UnionCave_branch_f5d34
 	intensity $c5
-	callchannel _Music_UnionCave_sub_0xf5d34
+	callchannel Music_UnionCave_branch_f5d34
 	intensity $c7
-	callchannel _Music_UnionCave_sub_0xf5d34
+	callchannel Music_UnionCave_branch_f5d34
 	intensity $c4
-	note $23
-	octave3
-	note $c3
-	octave4
-	note $31
-	note $51
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $23
-	octave3
-	note $c3
-	octave4
-	note $37
-	octave3
-	note $c3
-	octave4
-	note $33
-	note $71
-	note $61
-	note $21
-	octave3
-	note $c1
-	octave4
-	note $27
-	note $33
-	note $23
-	note $03
+	note C#, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note D_, 1
+	note E_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note D_, 7
+	octave 3
+	note B_, 3
+	octave 4
+	note D_, 3
+	note F#, 1
+	note F_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 7
+	note D_, 3
+	note C#, 3
+	note __, 3
 	intensity $a0
-	note $1f
-	note $2f
-	note $3f
-	note $2f
-	note $5f
-	note $4f
-	note $bf
-	note $af
+	note C_, 15
+	note C#, 15
+	note D_, 15
+	note C#, 15
+	note E_, 15
+	note D#, 15
+	note A#, 15
+	note A_, 15
 	intensity $a5
-	vibrato $06, $44
-	callchannel _Music_UnionCave_sub_0xf5d52
-	vibrato $04, $33
-	callchannel _Music_UnionCave_sub_0xf5d52
-	vibrato $02, $22
-	callchannel _Music_UnionCave_sub_0xf5d52
-	vibrato $01, $41
-	callchannel _Music_UnionCave_sub_0xf5d52
-	vibrato $08, $24
-	loopchannel $00, $5cda ; end
-; 0xf5d34
+	vibrato $6, $44
+	callchannel Music_UnionCave_branch_f5d52
+	vibrato $4, $33
+	callchannel Music_UnionCave_branch_f5d52
+	vibrato $2, $22
+	callchannel Music_UnionCave_branch_f5d52
+	vibrato $1, $41
+	callchannel Music_UnionCave_branch_f5d52
+	vibrato $8, $24
+	loopchannel 0, Music_UnionCave_branch_f5cda
+; f5d34
 
-_Music_UnionCave_sub_0xf5d34: ; 0xf5d34
-; subroutine
-	octave4
-	note $13
-	octave3
-	note $b3
-	octave4
-	note $21
-	note $41
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $13
-	octave3
-	note $b3
-	octave4
-	note $27
-	octave3
-	note $b3
-	octave4
-	note $23
-	note $61
-	note $51
-	note $11
-	octave3
-	note $b1
-	octave4
-	note $17
-	note $23
-	note $13
-	endchannel ; end
-; 0xf5d52
+Music_UnionCave_branch_f5d34: ; f5d34
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C#, 1
+	note D#, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 3
+	octave 3
+	note A#, 3
+	octave 4
+	note C#, 7
+	octave 3
+	note A#, 3
+	octave 4
+	note C#, 3
+	note F_, 1
+	note E_, 1
+	note C_, 1
+	octave 3
+	note A#, 1
+	octave 4
+	note C_, 7
+	note C#, 3
+	note C_, 3
+	endchannel
+; f5d52
 
-_Music_UnionCave_sub_0xf5d52: ; 0xf5d52
-; subroutine
-	octave2
-	note $91
-	octave3
-	note $21
-	note $5b
-	endchannel ; end
-; 0xf5d58
+Music_UnionCave_branch_f5d52: ; f5d52
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	note E_, 11
+	endchannel
 
-_Music_UnionCave_Ch3: ; 0xf5d58
-	notetype $0c, $16
+Music_UnionCave_Ch3: ; f5d58
+	notetype $c, $16
 	stereopanning $f0
-	note $0f
-	loopchannel $07, $5d5d
-	note $0d
-	octave4
-	note $11
-	note $01
-	octave3
-	note $51
-	note $01
-	note $51
-	note $91
-	note $51
-	note $01
-	octave4
-	note $11
-	loopchannel $04, $5d65
-	note $01
-	octave3
-	note $61
-	note $01
-	note $61
-	note $a1
-	note $61
-	note $01
-	octave4
-	note $21
-	loopchannel $04, $5d73
-	note $03
-	note $17
-	octave3
-	note $c7
-	note $b7
-	note $a7
-	octave4
-	note $27
-	note $17
-	octave3
-	note $c7
-	note $b7
-	note $a3
-	note $83
-	note $b1
-	octave4
-	note $11
-	octave3
-	note $a1
-	note $81
-	loopchannel $03, $5d8d
-	note $a3
-	note $83
-	note $b7
-	note $0f
-	loopchannel $04, $5d9c
-	loopchannel $00, $5d5d ; end
-; 0xf5da5
 
-_Music_UnionCave_Ch4: ; 0xf5da5
-	togglenoise $01
-	notetype $0c
+Music_UnionCave_branch_f5d5d: ; f5d5d
+	note __, 15
+	loopchannel 7, Music_UnionCave_branch_f5d5d
+	note __, 13
+	octave 4
+	note C_, 1
+
+Music_UnionCave_branch_f5d65: ; f5d65
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note G#, 1
+	note E_, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	loopchannel 4, Music_UnionCave_branch_f5d65
+
+Music_UnionCave_branch_f5d73: ; f5d73
+	note __, 1
+	octave 3
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	note __, 1
+	octave 4
+	note C#, 1
+	loopchannel 4, Music_UnionCave_branch_f5d73
+	note __, 3
+	note C_, 7
+	octave 3
+	note B_, 7
+	note A#, 7
+	note A_, 7
+	octave 4
+	note C#, 7
+	note C_, 7
+	octave 3
+	note B_, 7
+	note A#, 7
+
+Music_UnionCave_branch_f5d8d: ; f5d8d
+	note A_, 3
+	note G_, 3
+	note A#, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 1
+	note G_, 1
+	loopchannel 3, Music_UnionCave_branch_f5d8d
+	note A_, 3
+	note G_, 3
+	note A#, 7
+
+Music_UnionCave_branch_f5d9c: ; f5d9c
+	note __, 15
+	loopchannel 4, Music_UnionCave_branch_f5d9c
+	loopchannel 0, Music_UnionCave_branch_f5d5d
+
+Music_UnionCave_Ch4: ; f5da5
+	togglenoise $1
+	notetype $c
+
+Music_UnionCave_branch_f5da9: ; f5da9
 	stereopanning $f0
-	note $53
+	note E_, 3
 	stereopanning $ff
-	note $63
-	stereopanning $0f
-	note $93
-	note $07
-	stereopanning $0f
-	note $53
+	note F_, 3
+	stereopanning $f
+	note G#, 3
+	note __, 7
+	stereopanning $f
+	note E_, 3
 	stereopanning $ff
-	note $63
+	note F_, 3
 	stereopanning $f0
-	note $93
-	note $07
-	loopchannel $00, $5da9 ; end
-; 0xf5dc1
+	note G#, 3
+	note __, 7
+	loopchannel 0, Music_UnionCave_branch_f5da9
+; f5dc1
 
-; 0xf5dc1
-	loopchannel $00, $5da9
-; 0xf5dc5
\ No newline at end of file
+INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -1,357 +1,349 @@
-_Music_VermilionCity: ; 0xeb676
-	db $80
-	dw _Music_VermilionCity_Ch1
-	db $01
-	dw _Music_VermilionCity_Ch2
-	db $02
-	dw _Music_VermilionCity_Ch3
-; 0xeb67f
+Music_VermilionCity: ; eb676
+	dbw $80, Music_VermilionCity_Ch1
+	dbw $01, Music_VermilionCity_Ch2
+	dbw $02, Music_VermilionCity_Ch3
+; eb67f
 
-; 0xeb67f
-	db $03
-; 0xeb680
+INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f
 
-_Music_VermilionCity_Ch1: ; 0xeb680
-	stereopanning $0f
-	tempo $b000
+Music_VermilionCity_Ch1: ; eb680
+	stereopanning $f
+	tempo 176
 	volume $77
-	dutycycle $02
-	notetype $0c, $65
-	octave4
-	note $c3
-	note $93
-	note $73
-	note $53
-	note $33
-	octave3
-	note $c3
-	note $a1
-	note $c0
-	octave4
-	note $30
-	note $50
-	note $90
-	note $c0
-	octave5
-	note $30
+	dutycycle $2
+	notetype $c, $65
+	octave 4
+	note B_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note D_, 3
+	octave 3
+	note B_, 3
+	note A_, 1
+	note B_, 0
+	octave 4
+	note D_, 0
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	octave 5
+	note D_, 0
 	vibrato $10, $23
-	dutycycle $01
-	notetype $0c, $85
-	callchannel _Music_VermilionCity_sub_0xeb6f9
-	note $63
-	octave4
-	note $33
-	note $23
-	note $53
-	callchannel _Music_VermilionCity_sub_0xeb6f9
-	callchannel _Music_VermilionCity_sub_0xeb701
-	dutycycle $02
-	notetype $0c, $85
-	callchannel _Music_VermilionCity_sub_0xeb6f9
-	note $63
-	octave4
-	note $33
-	note $50
-	note $20
-	octave3
-	note $a0
-	note $50
-	octave4
-	note $20
-	octave3
-	note $a0
-	note $50
-	note $10
-	callchannel _Music_VermilionCity_sub_0xeb6f9
-	callchannel _Music_VermilionCity_sub_0xeb701
+
+Music_VermilionCity_branch_eb6a0: ; eb6a0
+	dutycycle $1
+	notetype $c, $85
+	callchannel Music_VermilionCity_branch_eb6f9
+	note F_, 3
+	octave 4
+	note D_, 3
+	note C#, 3
+	note E_, 3
+	callchannel Music_VermilionCity_branch_eb6f9
+	callchannel Music_VermilionCity_branch_eb701
+	dutycycle $2
+	notetype $c, $85
+	callchannel Music_VermilionCity_branch_eb6f9
+	note F_, 3
+	octave 4
+	note D_, 3
+	note E_, 0
+	note C#, 0
+	octave 3
+	note A_, 0
+	note E_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note A_, 0
+	note E_, 0
+	note C_, 0
+	callchannel Music_VermilionCity_branch_eb6f9
+	callchannel Music_VermilionCity_branch_eb701
 	intensity $93
-	dutycycle $00
-	note $01
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	callchannel _Music_VermilionCity_sub_0xeb70c
-	callchannel _Music_VermilionCity_sub_0xeb70c
+	dutycycle $0
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	callchannel Music_VermilionCity_branch_eb70c
+	callchannel Music_VermilionCity_branch_eb70c
 	intensity $87
-	dutycycle $02
-	octave4
-	note $37
-	octave3
-	note $97
-	note $57
-	note $c7
-	note $a3
-	note $93
-	note $73
-	note $53
-	octave2
-	note $c3
-	note $93
-	note $c3
-	octave3
-	note $33
-	loopchannel $00, $76a0 ; end
-; 0xeb6f9
+	dutycycle $2
+	octave 4
+	note D_, 7
+	octave 3
+	note G#, 7
+	note E_, 7
+	note B_, 7
+	note A_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	octave 2
+	note B_, 3
+	note G#, 3
+	note B_, 3
+	octave 3
+	note D_, 3
+	loopchannel 0, Music_VermilionCity_branch_eb6a0
+; eb6f9
 
-_Music_VermilionCity_sub_0xeb6f9: ; 0xeb6f9
-; subroutine
-	octave3
-	note $23
-	note $53
-	note $71
-	note $a1
-	note $51
-	note $91
-	endchannel ; end
-; 0xeb701
+Music_VermilionCity_branch_eb6f9: ; eb6f9
+	octave 3
+	note C#, 3
+	note E_, 3
+	note F#, 1
+	note A_, 1
+	note E_, 1
+	note G#, 1
+	endchannel
+; eb701
 
-_Music_VermilionCity_sub_0xeb701: ; 0xeb701
-; subroutine
-	note $31
-	note $61
-	note $a1
-	octave4
-	note $31
-	note $51
-	note $21
-	octave3
-	note $a1
-	note $51
-	endchannel ; end
-; 0xeb70c
+Music_VermilionCity_branch_eb701: ; eb701
+	note D_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note D_, 1
+	note E_, 1
+	note C#, 1
+	octave 3
+	note A_, 1
+	note E_, 1
+	endchannel
+; eb70c
 
-_Music_VermilionCity_sub_0xeb70c: ; 0xeb70c
-; subroutine
-	note $01
-	note $71
-	note $a1
-	note $71
-	octave4
-	note $31
-	octave3
-	note $71
-	note $a1
-	note $71
-	note $01
-	note $91
-	note $c1
-	note $91
-	octave4
-	note $51
-	octave3
-	note $91
-	note $c1
-	note $91
-	endchannel ; end
-; 0xeb721
+Music_VermilionCity_branch_eb70c: ; eb70c
+	note __, 1
+	note F#, 1
+	note A_, 1
+	note F#, 1
+	octave 4
+	note D_, 1
+	octave 3
+	note F#, 1
+	note A_, 1
+	note F#, 1
+	note __, 1
+	note G#, 1
+	note B_, 1
+	note G#, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G#, 1
+	note B_, 1
+	note G#, 1
+	endchannel
 
-_Music_VermilionCity_Ch2: ; 0xeb721
+Music_VermilionCity_Ch2: ; eb721
 	stereopanning $ff
-	dutycycle $03
-	notetype $0c, $77
+	dutycycle $3
+	notetype $c, $77
 	vibrato $10, $23
-	octave5
-	note $53
-	note $33
-	octave4
-	note $c3
-	note $93
-	note $73
-	note $53
-	note $73
-	note $93
-	notetype $0c, $97
-	callchannel _Music_VermilionCity_sub_0xeb768
-	note $91
-	callchannel _Music_VermilionCity_sub_0xeb768
-	note $51
+	octave 5
+	note E_, 3
+	note D_, 3
+	octave 4
+	note B_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+
+Music_VermilionCity_branch_eb735: ; eb735
+	notetype $c, $97
+	callchannel Music_VermilionCity_branch_eb768
+	note G#, 1
+	callchannel Music_VermilionCity_branch_eb768
+	note E_, 1
 	intensity $b7
-	octave3
-	note $c3
-	octave4
-	note $23
-	note $33
-	note $53
-	callchannel _Music_VermilionCity_sub_0xeb77e
-	callchannel _Music_VermilionCity_sub_0xeb77e
-	note $75
-	note $50
-	note $70
-	note $57
-	note $a5
-	note $90
-	note $a0
-	note $97
-	note $9d
-	notetype $06, $57
-	note $00
-	octave4
-	note $50
-	note $90
-	note $c0
-	notetype $0c, $87
-	octave5
-	note $5f
-	loopchannel $00, $7735 ; end
-; 0xeb768
+	octave 3
+	note B_, 3
+	octave 4
+	note C#, 3
+	note D_, 3
+	note E_, 3
+	callchannel Music_VermilionCity_branch_eb77e
+	callchannel Music_VermilionCity_branch_eb77e
+	note F#, 5
+	note E_, 0
+	note F#, 0
+	note E_, 7
+	note A_, 5
+	note G#, 0
+	note A_, 0
+	note G#, 7
+	note G#, 13
+	notetype $6, $57
+	note __, 0
+	octave 4
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	notetype $c, $87
+	octave 5
+	note E_, 15
+	loopchannel 0, Music_VermilionCity_branch_eb735
+; eb768
 
-_Music_VermilionCity_sub_0xeb768: ; 0xeb768
-; subroutine
-	octave1
-	note $a7
-	octave2
-	note $73
-	note $53
-	note $35
-	note $20
-	note $30
-	note $57
-	octave1
-	note $a7
-	octave2
-	note $73
-	note $53
-	note $35
-	note $50
-	note $30
-	note $21
-	note $51
-	octave1
-	note $a1
-	endchannel ; end
-; 0xeb77e
+Music_VermilionCity_branch_eb768: ; eb768
+	octave 1
+	note A_, 7
+	octave 2
+	note F#, 3
+	note E_, 3
+	note D_, 5
+	note C#, 0
+	note D_, 0
+	note E_, 7
+	octave 1
+	note A_, 7
+	octave 2
+	note F#, 3
+	note E_, 3
+	note D_, 5
+	note E_, 0
+	note D_, 0
+	note C#, 1
+	note E_, 1
+	octave 1
+	note A_, 1
+	endchannel
+; eb77e
 
-_Music_VermilionCity_sub_0xeb77e: ; 0xeb77e
-; subroutine
-	note $77
-	note $c7
-	note $a3
-	note $93
-	note $73
-	note $53
-	endchannel ; end
-; 0xeb785
+Music_VermilionCity_branch_eb77e: ; eb77e
+	note F#, 7
+	note B_, 7
+	note A_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	endchannel
 
-_Music_VermilionCity_Ch3: ; 0xeb785
+Music_VermilionCity_Ch3: ; eb785
 	stereopanning $f0
 	vibrato $22, $23
-	notetype $0c, $25
-	octave2
-	note $53
-	note $c3
-	octave3
-	note $53
-	note $c3
-	note $33
-	note $53
-	note $31
-	octave3
-	note $c0
-	note $90
-	note $70
-	note $50
-	note $30
-	octave2
-	note $c0
-	notetype $0c, $22
-	callchannel _Music_VermilionCity_sub_0xeb7de
-	octave5
-	note $a5
+	notetype $c, $25
+	octave 2
+	note E_, 3
+	note B_, 3
+	octave 3
+	note E_, 3
+	note B_, 3
+	note D_, 3
+	note E_, 3
+	note D_, 1
+	octave 3
+	note B_, 0
+	note G#, 0
+	note F#, 0
+	note E_, 0
+	note D_, 0
+	octave 2
+	note B_, 0
+
+Music_VermilionCity_branch_eb79e: ; eb79e
+	notetype $c, $22
+	callchannel Music_VermilionCity_branch_eb7de
+	octave 5
+	note A_, 5
 	intensity $24
-	note $50
-	note $90
-	callchannel _Music_VermilionCity_sub_0xeb7de
-	note $a7
+	note E_, 0
+	note G#, 0
+	callchannel Music_VermilionCity_branch_eb7de
+	note A_, 7
 	intensity $14
-	octave3
-	note $33
-	note $23
-	octave2
-	note $c3
-	note $a3
-	octave3
-	note $31
-	note $03
-	note $30
-	note $30
-	callchannel _Music_VermilionCity_sub_0xeb7f5
-	octave4
-	note $31
-	octave3
-	note $31
-	note $01
-	note $31
-	callchannel _Music_VermilionCity_sub_0xeb7f5
+	octave 3
+	note D_, 3
+	note C#, 3
+	octave 2
+	note B_, 3
+	note A_, 3
+	octave 3
+	note D_, 1
+	note __, 3
+	note D_, 0
+	note D_, 0
+	callchannel Music_VermilionCity_branch_eb7f5
+	octave 4
+	note D_, 1
+	octave 3
+	note D_, 1
+	note __, 1
+	note D_, 1
+	callchannel Music_VermilionCity_branch_eb7f5
 	intensity $25
-	octave3
-	note $57
-	octave4
-	note $57
-	octave3
-	note $c7
-	octave4
-	note $57
-	octave2
-	note $5f
-	octave3
-	note $5d
+	octave 3
+	note E_, 7
+	octave 4
+	note E_, 7
+	octave 3
+	note B_, 7
+	octave 4
+	note E_, 7
+	octave 2
+	note E_, 15
+	octave 3
+	note E_, 13
 	intensity $22
-	octave5
-	note $50
-	note $90
-	loopchannel $00, $779e ; end
-; 0xeb7de
+	octave 5
+	note E_, 0
+	note G#, 0
+	loopchannel 0, Music_VermilionCity_branch_eb79e
+; eb7de
 
-_Music_VermilionCity_sub_0xeb7de: ; 0xeb7de
-; subroutine
-	octave5
-	note $a7
-	octave6
-	note $33
-	note $23
-	octave5
-	note $c5
-	note $a0
-	note $c0
-	octave6
-	note $27
-	octave5
-	note $a7
-	octave6
-	note $33
-	note $23
-	octave5
-	note $c5
-	octave6
-	note $20
-	octave5
-	note $c0
-	endchannel ; end
-; 0xeb7f5
+Music_VermilionCity_branch_eb7de: ; eb7de
+	octave 5
+	note A_, 7
+	octave 6
+	note D_, 3
+	note C#, 3
+	octave 5
+	note B_, 5
+	note A_, 0
+	note B_, 0
+	octave 6
+	note C#, 7
+	octave 5
+	note A_, 7
+	octave 6
+	note D_, 3
+	note C#, 3
+	octave 5
+	note B_, 5
+	octave 6
+	note C#, 0
+	octave 5
+	note B_, 0
+	endchannel
+; eb7f5
 
-_Music_VermilionCity_sub_0xeb7f5: ; 0xeb7f5
-; subroutine
-	note $a0
-	note $00
-	note $a1
-	note $01
-	note $71
-	note $51
-	note $03
-	note $50
-	note $50
-	octave4
-	note $50
-	note $00
-	note $31
-	note $01
-	octave3
-	note $c0
-	octave4
-	note $20
-	endchannel ; end
-; 0xeb808
+Music_VermilionCity_branch_eb7f5: ; eb7f5
+	note A_, 0
+	note __, 0
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note E_, 1
+	note __, 3
+	note E_, 0
+	note E_, 0
+	octave 4
+	note E_, 0
+	note __, 0
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	endchannel
+; eb808
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -1,204 +1,211 @@
-_Music_VictoryRoad: ; 0xf6c72
-	db $c0
-	dw _Music_VictoryRoad_Ch1
-	db $01
-	dw _Music_VictoryRoad_Ch2
-	db $02
-	dw _Music_VictoryRoad_Ch3
-	db $03
-	dw _Music_VictoryRoad_Ch4
-; 0xf6c7e
+Music_VictoryRoad: ; f6c72
+	dbw $c0, Music_VictoryRoad_Ch1
+	dbw $01, Music_VictoryRoad_Ch2
+	dbw $02, Music_VictoryRoad_Ch3
+	dbw $03, Music_VictoryRoad_Ch4
+; f6c7e
 
-_Music_VictoryRoad_Ch1: ; 0xf6c7e
-	tempo $9000
+
+Music_VictoryRoad_Ch1: ; f6c7e
+	tempo 144
 	volume $77
-	stereopanning $0f
-	dutycycle $03
-	tone $0200
-	notetype $0c, $b3
-	callchannel _Music_VictoryRoad_sub_0xf6cb9
-	loopchannel $06, $6c8d
+	stereopanning $f
+	dutycycle $3
+	tone $0002
+	notetype $c, $b3
+
+Music_VictoryRoad_branch_f6c8d: ; f6c8d
+	callchannel Music_VictoryRoad_branch_f6cb9
+	loopchannel 6, Music_VictoryRoad_branch_f6c8d
+
+Music_VictoryRoad_branch_f6c94: ; f6c94
 	intensity $b2
-	octave2
-	note $a0
-	octave3
-	note $20
-	note $30
-	note $00
-	octave2
-	note $a0
+	octave 2
+	note A_, 0
+	octave 3
+	note C#, 0
+	note D_, 0
+	note __, 0
+	octave 2
+	note A_, 0
 	intensity $b7
-	octave3
-	note $22
-	octave2
-	note $a0
-	octave3
-	note $32
-	octave2
-	note $a0
-	octave3
-	note $92
-	loopchannel $02, $6c94
-	callchannel _Music_VictoryRoad_sub_0xf6cb9
-	loopchannel $02, $6cae
-	loopchannel $00, $6c8d ; end
-; 0xf6cb9
+	octave 3
+	note C#, 2
+	octave 2
+	note A_, 0
+	octave 3
+	note D_, 2
+	octave 2
+	note A_, 0
+	octave 3
+	note G#, 2
+	loopchannel 2, Music_VictoryRoad_branch_f6c94
 
-_Music_VictoryRoad_sub_0xf6cb9: ; 0xf6cb9
-; subroutine
+Music_VictoryRoad_branch_f6cae: ; f6cae
+	callchannel Music_VictoryRoad_branch_f6cb9
+	loopchannel 2, Music_VictoryRoad_branch_f6cae
+	loopchannel 0, Music_VictoryRoad_branch_f6c8d
+; f6cb9
+
+Music_VictoryRoad_branch_f6cb9: ; f6cb9
 	intensity $b2
-	octave2
-	note $80
-	note $c0
-	octave3
-	note $10
-	note $00
-	octave2
-	note $80
+	octave 2
+	note G_, 0
+	note B_, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	octave 2
+	note G_, 0
 	intensity $b7
-	note $c2
-	note $80
-	octave3
-	note $12
-	octave2
-	note $80
-	octave3
-	note $72
-	endchannel ; end
-; 0xf6cce
+	note B_, 2
+	note G_, 0
+	octave 3
+	note C_, 2
+	octave 2
+	note G_, 0
+	octave 3
+	note F#, 2
+	endchannel
 
-_Music_VictoryRoad_Ch2: ; 0xf6cce
-	dutycycle $03
+Music_VictoryRoad_Ch2: ; f6cce
+	dutycycle $3
 	vibrato $10, $24
-	notetype $0c, $c2
-	callchannel _Music_VictoryRoad_sub_0xf6d1e
-	note $01
-	callchannel _Music_VictoryRoad_sub_0xf6d1e
-	note $00
-	octave4
-	note $10
-	notetype $0c, $b0
-	note $57
-	octave5
-	note $13
-	octave4
-	note $c3
-	note $5e
-	note $40
-	notetype $0c, $b0
-	note $57
-	octave5
-	note $13
-	octave4
-	note $c3
-	notetype $0c, $b0
-	octave5
-	note $57
-	notetype $0c, $b7
-	note $57
-	notetype $0c, $c7
-	note $37
+
+Music_VictoryRoad_branch_f6cd3: ; f6cd3
+	notetype $c, $c2
+	callchannel Music_VictoryRoad_branch_f6d1e
+	note __, 1
+	callchannel Music_VictoryRoad_branch_f6d1e
+	note __, 0
+	octave 4
+	note C_, 0
+	notetype $c, $b0
+	note E_, 7
+	octave 5
+	note C_, 3
+	octave 4
+	note B_, 3
+	note E_, 14
+	note D#, 0
+	notetype $c, $b0
+	note E_, 7
+	octave 5
+	note C_, 3
+	octave 4
+	note B_, 3
+	notetype $c, $b0
+	octave 5
+	note E_, 7
+	notetype $c, $b7
+	note E_, 7
+	notetype $c, $c7
+	note D_, 7
 	stereopanning $f0
-	note $23
-	stereopanning $0f
-	octave4
-	note $a3
+	note C#, 3
+	stereopanning $f
+	octave 4
+	note A_, 3
 	stereopanning $ff
-	octave5
-	note $17
-	stereopanning $0f
-	octave4
-	note $b3
+	octave 5
+	note C_, 7
+	stereopanning $f
+	octave 4
+	note A#, 3
 	stereopanning $f0
-	note $63
+	note F_, 3
 	stereopanning $ff
-	note $ab
-	note $30
-	note $70
-	note $a0
-	octave5
-	note $20
-	note $3f
-	loopchannel $00, $6cd3 ; end
-; 0xf6d1e
+	note A_, 11
+	note D_, 0
+	note F#, 0
+	note A_, 0
+	octave 5
+	note C#, 0
+	note D_, 15
+	loopchannel 0, Music_VictoryRoad_branch_f6cd3
+; f6d1e
 
-_Music_VictoryRoad_sub_0xf6d1e: ; 0xf6d1e
-; subroutine
-	octave3
-	note $50
-	note $00
-	note $50
-	note $00
-	note $70
-	note $70
-	note $01
-	note $90
-	note $90
-	note $01
-	note $a0
-	note $a0
-	endchannel ; end
-; 0xf6d2c
+Music_VictoryRoad_branch_f6d1e: ; f6d1e
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note F#, 0
+	note F#, 0
+	note __, 1
+	note G#, 0
+	note G#, 0
+	note __, 1
+	note A_, 0
+	note A_, 0
+	endchannel
 
-_Music_VictoryRoad_Ch3: ; 0xf6d2c
+Music_VictoryRoad_Ch3: ; f6d2c
 	stereopanning $f0
-	notetype $0c, $28
-	callchannel _Music_VictoryRoad_sub_0xf6d52
-	loopchannel $06, $6d31
-	note $30
-	note $00
-	note $c0
-	note $00
-	note $60
-	note $a2
-	note $30
-	note $c0
-	note $01
-	note $30
-	note $c2
-	loopchannel $02, $6d38
-	callchannel _Music_VictoryRoad_sub_0xf6d52
-	loopchannel $02, $6d47
-	loopchannel $00, $6d31 ; end
-; 0xf6d52
+	notetype $c, $28
 
-_Music_VictoryRoad_sub_0xf6d52: ; 0xf6d52
-; subroutine
-	octave3
-	note $10
-	note $00
-	note $a0
-	note $00
-	note $40
-	note $82
-	note $10
-	note $a0
-	note $01
-	note $10
-	note $a2
-	endchannel ; end
-; 0xf6d5f
+Music_VictoryRoad_branch_f6d31: ; f6d31
+	callchannel Music_VictoryRoad_branch_f6d52
+	loopchannel 6, Music_VictoryRoad_branch_f6d31
 
-_Music_VictoryRoad_Ch4: ; 0xf6d5f
-	togglenoise $00
-	notetype $0c
-	note $31
-	note $31
-	note $40
-	note $32
-	note $40
-	note $32
-	note $40
-	note $32
-	note $31
-	note $31
-	note $40
-	note $32
-	note $40
-	note $40
-	note $31
-	note $40
-	note $31
-	note $40
-	loopchannel $00, $6d63 ; end
-; 0xf6d79
+Music_VictoryRoad_branch_f6d38: ; f6d38
+	note D_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note F_, 0
+	note A_, 2
+	note D_, 0
+	note B_, 0
+	note __, 1
+	note D_, 0
+	note B_, 2
+	loopchannel 2, Music_VictoryRoad_branch_f6d38
+
+Music_VictoryRoad_branch_f6d47: ; f6d47
+	callchannel Music_VictoryRoad_branch_f6d52
+	loopchannel 2, Music_VictoryRoad_branch_f6d47
+	loopchannel 0, Music_VictoryRoad_branch_f6d31
+; f6d52
+
+Music_VictoryRoad_branch_f6d52: ; f6d52
+	octave 3
+	note C_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note D#, 0
+	note G_, 2
+	note C_, 0
+	note A_, 0
+	note __, 1
+	note C_, 0
+	note A_, 2
+	endchannel
+
+Music_VictoryRoad_Ch4: ; f6d5f
+	togglenoise $0
+	notetype $c
+
+Music_VictoryRoad_branch_f6d63: ; f6d63
+	note D_, 1
+	note D_, 1
+	note D#, 0
+	note D_, 2
+	note D#, 0
+	note D_, 2
+	note D#, 0
+	note D_, 2
+	note D_, 1
+	note D_, 1
+	note D#, 0
+	note D_, 2
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D#, 0
+	note D_, 1
+	note D#, 0
+	loopchannel 0, Music_VictoryRoad_branch_f6d63
+; f6d79
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -1,785 +1,784 @@
-_Music_VioletCity: ; 0xf0000
-	db $c0
-	dw _Music_VioletCity_Ch1
-	db $01
-	dw _Music_VioletCity_Ch2
-	db $02
-	dw _Music_VioletCity_Ch3
-	db $03
-	dw _Music_VioletCity_Ch4
-; 0xf000c
+Music_VioletCity: ; f0000
+	dbw $c0, Music_VioletCity_Ch1
+	dbw $01, Music_VioletCity_Ch2
+	dbw $02, Music_VioletCity_Ch3
+	dbw $03, Music_VioletCity_Ch4
+; f000c
 
-_Music_VioletCity_Ch1: ; 0xf000c
-	tempo $a400
+
+Music_VioletCity_Ch1: ; f000c
+	tempo 164
 	volume $77
 	vibrato $12, $25
-	dutycycle $02
-	notetype $0c, $95
-	note $0f
+	dutycycle $2
+	notetype $c, $95
+	note __, 15
 	stereopanning $f0
-	octave2
-	note $50
-	note $90
-	note $c0
+	octave 2
+	note E_, 0
+	note G#, 0
+	note B_, 0
 	stereopanning $ff
-	octave3
-	note $40
-	note $90
-	note $00
-	note $b3
-	note $91
-	note $71
-	note $21
-	stereopanning $0f
-	octave2
-	note $40
-	note $70
-	note $b0
+	octave 3
+	note D#, 0
+	note G#, 0
+	note __, 0
+	note A#, 3
+	note G#, 1
+	note F#, 1
+	note C#, 1
+	stereopanning $f
+	octave 2
+	note D#, 0
+	note F#, 0
+	note A#, 0
 	stereopanning $ff
-	octave3
-	note $20
-	note $70
-	note $00
-	note $43
-	note $91
-	note $41
-	octave2
-	note $91
-	note $20
-	note $50
-	note $90
-	note $c0
-	octave3
-	note $90
-	note $00
-	octave2
-	note $c3
-	notetype $06, $91
-	octave3
-	note $21
-	note $61
-	note $21
-	note $61
-	note $91
-	note $c1
+	octave 3
+	note C#, 0
+	note F#, 0
+	note __, 0
+	note D#, 3
+	note G#, 1
+	note D#, 1
+	octave 2
+	note G#, 1
+	note C#, 0
+	note E_, 0
+	note G#, 0
+	note B_, 0
+	octave 3
+	note G#, 0
+	note __, 0
+	octave 2
+	note B_, 3
+	notetype $6, $91
+	octave 3
+	note C#, 1
+	note F_, 1
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
 	intensity $a4
-	octave2
-	note $c7
-	note $03
-	octave3
-	note $2b
-	note $07
-	notetype $06, $95
-	note $03
-	octave2
-	note $c1
-	octave3
-	note $21
-	note $43
-	note $41
-	note $51
-	note $41
-	note $01
-	note $71
-	note $01
-	note $91
-	note $01
-	note $c1
-	note $01
+	octave 2
+	note B_, 7
+	note __, 3
+	octave 3
+	note C#, 11
+	note __, 7
+
+Music_VioletCity_branch_f0056: ; f0056
+	notetype $6, $95
+	note __, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note C#, 1
+	note D#, 3
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note B_, 1
+	note __, 1
 	stereopanning $f0
-	octave4
-	note $21
-	octave3
-	note $91
-	note $51
-	octave4
-	note $21
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 1
+	note E_, 1
+	octave 4
+	note C#, 1
 	stereopanning $ff
-	note $11
-	octave3
-	note $91
-	note $51
-	octave4
-	note $11
-	stereopanning $0f
-	octave3
-	note $c1
-	note $01
-	note $c1
-	note $01
-	note $b7
+	note C_, 1
+	octave 3
+	note G#, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	stereopanning $f
+	octave 3
+	note B_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A#, 7
 	stereopanning $ff
-	note $03
-	note $21
-	note $51
-	note $b3
-	note $b1
-	octave4
-	note $21
-	octave3
-	note $b1
-	note $01
-	note $71
-	note $01
-	note $51
-	note $01
-	note $21
-	note $01
-	stereopanning $0f
-	note $47
+	note __, 3
+	note C#, 1
+	note E_, 1
+	note A#, 3
+	note A#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	stereopanning $f
+	note D#, 7
 	stereopanning $ff
-	note $57
+	note E_, 7
 	stereopanning $f0
-	note $61
-	note $01
-	note $61
-	note $01
-	note $71
-	note $01
-	note $83
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 3
 	stereopanning $ff
-	note $91
-	note $40
-	note $00
-	octave2
-	note $c0
-	note $00
-	octave3
-	note $40
-	note $00
-	note $c3
-	note $91
-	note $91
-	note $b1
-	note $01
-	note $b1
-	note $01
-	note $43
-	note $71
-	note $01
-	notetype $0c, $95
-	note $07
-	octave4
-	note $62
-	dutycycle $01
-	notetype $06, $75
-	note $90
-	note $c0
-	octave5
-	note $47
-	notetype $0c, $93
-	dutycycle $02
-	note $0f
-	notetype $06, $91
+	note G#, 1
+	note D#, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 0
+	octave 3
+	note D#, 0
+	note __, 0
+	note B_, 3
+	note G#, 1
+	note G#, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note D#, 3
+	note F#, 1
+	note __, 1
+	notetype $c, $95
+	note __, 7
+	octave 4
+	note F_, 2
+	dutycycle $1
+	notetype $6, $75
+	note G#, 0
+	note B_, 0
+	octave 5
+	note D#, 7
+	notetype $c, $93
+	dutycycle $2
+	note __, 15
+	notetype $6, $91
 	stereopanning $f0
-	octave3
-	note $51
-	octave2
-	note $c1
-	note $91
-	octave3
-	note $51
-	stereopanning $0f
-	octave2
-	note $c1
-	note $91
-	note $c1
-	octave3
-	note $51
+	octave 3
+	note E_, 1
+	octave 2
+	note B_, 1
+	note G#, 1
+	octave 3
+	note E_, 1
+	stereopanning $f
+	octave 2
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note E_, 1
 	intensity $a4
 	stereopanning $ff
-	note $47
-	note $07
-	dutycycle $03
+	note D#, 7
+	note __, 7
+	dutycycle $3
 	intensity $84
-	note $03
-	note $81
-	note $a1
-	note $c3
-	octave4
-	note $33
-	note $23
-	notetype $08, $84
-	octave3
-	note $c0
-	octave4
-	note $20
-	octave3
-	note $c0
-	note $a2
-	notetype $0c, $84
-	note $70
-	note $00
-	note $71
-	note $20
-	note $00
-	note $71
-	note $33
-	note $53
-	note $71
-	note $c0
-	note $00
-	note $c0
-	octave4
-	note $20
-	note $31
-	note $71
-	note $51
-	notetype $08, $84
-	note $30
-	note $50
-	note $30
-	note $22
-	notetype $0c, $84
-	octave3
-	note $c0
-	note $00
-	note $a1
-	note $70
-	note $00
-	note $a1
-	octave4
-	note $53
-	note $33
-	note $21
-	note $90
-	note $50
-	octave3
-	note $c0
-	octave4
-	note $50
-	note $90
-	note $00
-	note $90
-	note $b0
-	note $c3
-	note $03
-	note $90
-	note $60
-	octave3
-	note $c0
-	octave4
-	note $60
-	note $90
-	note $00
-	note $90
-	note $b0
-	note $c3
-	note $03
-	note $20
-	octave3
-	note $c0
-	note $70
-	octave4
-	note $20
-	octave3
-	note $c0
-	note $70
-	octave4
-	note $20
-	octave3
-	note $c0
-	note $70
-	note $20
-	note $70
-	note $b0
-	octave4
-	note $20
-	note $70
-	note $b0
-	octave5
-	note $20
-	dutycycle $02
-	octave4
-	note $25
-	note $10
-	octave3
-	note $c0
-	octave4
-	note $23
-	note $03
-	loopchannel $00, $4056 ; end
-; 0xf0162
+	note __, 3
+	note G_, 1
+	note A_, 1
+	note B_, 3
+	octave 4
+	note D_, 3
+	note C#, 3
+	notetype $8, $84
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	note A_, 2
+	notetype $c, $84
+	note F#, 0
+	note __, 0
+	note F#, 1
+	note C#, 0
+	note __, 0
+	note F#, 1
+	note D_, 3
+	note E_, 3
+	note F#, 1
+	note B_, 0
+	note __, 0
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D_, 1
+	note F#, 1
+	note E_, 1
+	notetype $8, $84
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note C#, 2
+	notetype $c, $84
+	octave 3
+	note B_, 0
+	note __, 0
+	note A_, 1
+	note F#, 0
+	note __, 0
+	note A_, 1
+	octave 4
+	note E_, 3
+	note D_, 3
+	note C#, 1
+	note G#, 0
+	note E_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note A#, 0
+	note B_, 3
+	note __, 3
+	note G#, 0
+	note F_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note F_, 0
+	note G#, 0
+	note __, 0
+	note G#, 0
+	note A#, 0
+	note B_, 3
+	note __, 3
+	note C#, 0
+	octave 3
+	note B_, 0
+	note F#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	note F#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 0
+	note F#, 0
+	note C#, 0
+	note F#, 0
+	note A#, 0
+	octave 4
+	note C#, 0
+	note F#, 0
+	note A#, 0
+	octave 5
+	note C#, 0
+	dutycycle $2
+	octave 4
+	note C#, 5
+	note C_, 0
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 3
+	note __, 3
+	loopchannel 0, Music_VioletCity_branch_f0056
 
-_Music_VioletCity_Ch2: ; 0xf0162
+Music_VioletCity_Ch2: ; f0162
 	vibrato $12, $24
-	dutycycle $02
-	notetype $0c, $c7
-	note $0f
-	octave3
-	note $90
-	note $00
-	note $b0
-	note $00
-	note $c0
-	note $00
-	octave4
-	note $43
-	note $21
-	octave3
-	note $b1
-	note $91
-	note $70
-	note $00
-	note $90
-	note $00
-	note $b0
-	note $00
-	octave4
-	note $23
-	octave3
-	note $c1
-	note $b1
-	note $c1
-	note $90
-	note $00
-	note $b0
-	note $00
-	note $c0
-	note $00
-	note $93
-	note $b1
-	note $c1
-	octave4
-	note $21
-	note $41
-	octave3
-	note $71
-	octave4
-	note $40
-	note $00
-	note $25
-	note $01
-	note $40
-	note $50
+	dutycycle $2
+	notetype $c, $c7
+	note __, 15
+	octave 3
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 4
+	note D#, 3
+	note C#, 1
+	octave 3
+	note A#, 1
+	note G#, 1
+	note F#, 0
+	note __, 0
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note G#, 0
+	note __, 0
+	note A#, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	note G#, 3
+	note A#, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	octave 3
+	note F#, 1
+	octave 4
+	note D#, 0
+	note __, 0
+	note C#, 5
+	note __, 1
+	note D#, 0
+	note E_, 0
+
+Music_VioletCity_branch_f0199: ; f0199
 	intensity $b7
-	note $73
-	note $01
-	note $70
-	note $90
-	note $70
-	note $00
-	note $50
-	note $00
-	note $40
-	note $00
-	note $70
-	note $00
-	note $5d
-	note $20
-	note $40
-	note $53
-	note $01
-	note $50
-	note $70
-	note $50
-	note $00
-	note $40
-	note $00
-	note $20
-	note $00
-	note $50
-	note $00
-	note $4b
-	note $01
-	octave3
-	note $c0
-	octave4
-	note $20
-	note $43
-	note $01
-	note $40
-	note $50
-	note $40
-	note $00
-	note $20
-	note $00
-	octave3
-	note $c1
-	octave4
-	note $20
-	note $00
-	note $43
-	note $93
-	note $c2
-	note $02
-	note $20
-	note $40
-	note $51
-	octave3
-	note $91
-	note $c1
-	octave4
-	note $51
-	note $40
-	octave3
-	note $70
-	note $c0
-	octave4
-	note $40
-	note $20
-	octave3
-	note $50
-	note $b0
-	octave4
-	note $20
-	octave3
-	note $cb
-	note $03
+	note F#, 3
+	note __, 1
+	note F#, 0
+	note G#, 0
+	note F#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	note E_, 13
+	note C#, 0
+	note D#, 0
+	note E_, 3
+	note __, 1
+	note E_, 0
+	note F#, 0
+	note E_, 0
+	note __, 0
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D#, 11
+	note __, 1
+	octave 3
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D#, 3
+	note __, 1
+	note D#, 0
+	note E_, 0
+	note D#, 0
+	note __, 0
+	note C#, 0
+	note __, 0
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	note D#, 3
+	note G#, 3
+	note B_, 2
+	note __, 2
+	note C#, 0
+	note D#, 0
+	note E_, 1
+	octave 3
+	note G#, 1
+	note B_, 1
+	octave 4
+	note E_, 1
+	note D#, 0
+	octave 3
+	note F#, 0
+	note B_, 0
+	octave 4
+	note D#, 0
+	note C#, 0
+	octave 3
+	note E_, 0
+	note A#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note B_, 11
+	note __, 3
 	intensity $a7
-	dutycycle $03
-	note $01
-	note $c0
-	octave4
-	note $20
-	note $31
-	note $71
-	note $51
-	notetype $08, $a7
-	note $30
-	note $50
-	note $30
-	note $22
-	notetype $0c, $a7
-	octave3
-	note $c0
-	note $00
-	note $a1
-	note $70
-	note $00
-	note $a1
-	octave4
-	note $53
-	note $33
-	note $21
-	note $01
-	note $80
-	note $a0
-	note $c1
-	octave5
-	note $31
-	note $21
-	notetype $08, $a7
-	octave4
-	note $c0
-	octave5
-	note $20
-	octave4
-	note $c0
-	note $a2
-	notetype $0c, $a7
-	note $80
-	note $00
-	note $71
-	note $20
-	note $00
-	note $71
-	vibrato $00, $00
+	dutycycle $3
+	note __, 1
+	note B_, 0
+	octave 4
+	note C#, 0
+	note D_, 1
+	note F#, 1
+	note E_, 1
+	notetype $8, $a7
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	note C#, 2
+	notetype $c, $a7
+	octave 3
+	note B_, 0
+	note __, 0
+	note A_, 1
+	note F#, 0
+	note __, 0
+	note A_, 1
+	octave 4
+	note E_, 3
+	note D_, 3
+	note C#, 1
+	note __, 1
+	note G_, 0
+	note A_, 0
+	note B_, 1
+	octave 5
+	note D_, 1
+	note C#, 1
+	notetype $8, $a7
+	octave 4
+	note B_, 0
+	octave 5
+	note C#, 0
+	octave 4
+	note B_, 0
+	note A_, 2
+	notetype $c, $a7
+	note G_, 0
+	note __, 0
+	note F#, 1
+	note C#, 0
+	note __, 0
+	note F#, 1
+	vibrato $0, $0
 	intensity $87
-	octave5
-	note $53
-	note $73
-	note $30
-	note $50
-	note $7b
-	note $01
-	note $30
-	note $50
-	note $7b
-	note $01
-	octave4
-	note $b0
-	note $c0
-	octave5
-	note $2a
-	note $04
+	octave 5
+	note E_, 3
+	note F#, 3
+	note D_, 0
+	note E_, 0
+	note F#, 11
+	note __, 1
+	note D_, 0
+	note E_, 0
+	note F#, 11
+	note __, 1
+	octave 4
+	note A#, 0
+	note B_, 0
+	octave 5
+	note C#, 10
+	note __, 4
 	vibrato $12, $24
 	intensity $a7
-	dutycycle $02
-	octave4
-	note $b5
-	note $a0
-	note $90
-	note $73
-	note $01
-	note $40
-	note $50
-	loopchannel $00, $4199 ; end
-; 0xf0247
+	dutycycle $2
+	octave 4
+	note A#, 5
+	note A_, 0
+	note G#, 0
+	note F#, 3
+	note __, 1
+	note D#, 0
+	note E_, 0
+	loopchannel 0, Music_VioletCity_branch_f0199
 
-_Music_VioletCity_Ch3: ; 0xf0247
-	notetype $0c, $25
-	note $0f
-	note $05
-	octave4
-	note $53
-	note $05
-	note $05
-	octave3
-	note $93
-	note $05
-	note $05
-	note $63
-	note $05
-	octave2
-	note $73
-	octave3
-	note $20
-	note $00
-	note $b3
-	note $a0
-	note $90
-	note $71
-	octave2
-	note $b1
-	notetype $0c, $25
-	note $c0
-	note $04
-	note $c0
-	note $c0
-	note $01
-	note $c0
-	note $00
-	octave3
-	note $71
-	octave2
-	note $70
-	note $00
-	octave3
-	note $20
-	note $04
-	note $20
-	note $20
-	note $01
-	note $20
-	note $00
-	note $91
-	octave2
-	note $90
-	note $00
-	note $70
-	note $04
-	note $70
-	note $70
-	note $70
-	note $00
-	note $70
-	note $00
-	octave3
-	note $71
-	note $20
-	note $00
-	octave2
-	note $c0
-	note $04
-	note $c0
-	note $c0
-	note $01
-	note $c0
-	note $00
-	octave3
-	note $c3
-	note $90
-	note $04
-	note $90
-	note $90
-	note $80
-	note $00
-	note $80
-	note $00
-	note $71
-	note $70
-	note $00
-	notetype $06, $25
-	octave3
-	note $21
-	note $61
-	note $91
-	note $c1
-	octave4
-	note $21
-	note $61
-	note $91
-	note $c1
-	octave4
-	note $25
-	notetype $0c, $25
-	note $04
-	notetype $06, $25
-	octave2
-	note $51
-	note $09
-	note $51
-	note $51
-	note $71
-	note $01
-	note $71
-	note $01
-	octave3
-	note $23
-	note $13
-	octave2
-	note $c1
-	note $09
-	note $c1
-	note $c1
-	note $03
-	note $c1
-	note $01
-	note $a7
-	callchannel _Music_VioletCity_sub_0xf0311
-	note $71
-	note $09
-	note $c1
-	note $c1
-	note $c1
-	note $01
-	note $b7
-	note $a1
-	note $01
-	callchannel _Music_VioletCity_sub_0xf0311
-	note $71
-	note $09
-	note $c1
-	note $c1
-	note $c1
-	note $01
-	note $b7
-	note $a1
-	note $01
-	octave3
-	note $51
-	note $09
-	note $51
-	note $51
-	note $03
-	note $51
-	note $01
-	note $c3
-	note $91
-	note $71
-	note $61
-	note $09
-	note $61
-	note $61
-	note $03
-	note $61
-	note $01
-	octave4
-	note $23
-	octave3
-	note $b1
-	note $91
-	note $71
-	note $09
-	note $71
-	note $71
-	octave2
-	note $71
-	note $01
-	note $71
-	note $01
-	octave3
-	note $73
-	octave2
-	note $71
-	note $91
-	octave3
-	note $7b
-	note $91
-	note $a1
-	note $b7
-	note $03
-	octave2
-	note $b3
-	loopchannel $00, $4261 ; end
-; 0xf0311
+Music_VioletCity_Ch3: ; f0247
+	notetype $c, $25
+	note __, 15
+	note __, 5
+	octave 4
+	note E_, 3
+	note __, 5
+	note __, 5
+	octave 3
+	note G#, 3
+	note __, 5
+	note __, 5
+	note F_, 3
+	note __, 5
+	octave 2
+	note F#, 3
+	octave 3
+	note C#, 0
+	note __, 0
+	note A#, 3
+	note A_, 0
+	note G#, 0
+	note F#, 1
+	octave 2
+	note A#, 1
 
-_Music_VioletCity_sub_0xf0311: ; 0xf0311
-; subroutine
-	note $81
-	note $09
-	note $81
-	note $81
-	note $a1
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $53
-	octave2
-	note $a3
-	endchannel ; end
-; 0xf031e
+Music_VioletCity_branch_f0261: ; f0261
+	notetype $c, $25
+	note B_, 0
+	note __, 4
+	note B_, 0
+	note B_, 0
+	note __, 1
+	note B_, 0
+	note __, 0
+	octave 3
+	note F#, 1
+	octave 2
+	note F#, 0
+	note __, 0
+	octave 3
+	note C#, 0
+	note __, 4
+	note C#, 0
+	note C#, 0
+	note __, 1
+	note C#, 0
+	note __, 0
+	note G#, 1
+	octave 2
+	note G#, 0
+	note __, 0
+	note F#, 0
+	note __, 4
+	note F#, 0
+	note F#, 0
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
+	octave 3
+	note F#, 1
+	note C#, 0
+	note __, 0
+	octave 2
+	note B_, 0
+	note __, 4
+	note B_, 0
+	note B_, 0
+	note __, 1
+	note B_, 0
+	note __, 0
+	octave 3
+	note B_, 3
+	note G#, 0
+	note __, 4
+	note G#, 0
+	note G#, 0
+	note G_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note F#, 1
+	note F#, 0
+	note __, 0
+	notetype $6, $25
+	octave 3
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
+	octave 4
+	note C#, 5
+	notetype $c, $25
+	note __, 4
+	notetype $6, $25
+	octave 2
+	note E_, 1
+	note __, 9
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	octave 3
+	note C#, 3
+	note C_, 3
+	octave 2
+	note B_, 1
+	note __, 9
+	note B_, 1
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 1
+	note A_, 7
+	callchannel Music_VioletCity_branch_f0311
+	note F#, 1
+	note __, 9
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note __, 1
+	note A#, 7
+	note A_, 1
+	note __, 1
+	callchannel Music_VioletCity_branch_f0311
+	note F#, 1
+	note __, 9
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note __, 1
+	note A#, 7
+	note A_, 1
+	note __, 1
+	octave 3
+	note E_, 1
+	note __, 9
+	note E_, 1
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 1
+	note B_, 3
+	note G#, 1
+	note F#, 1
+	note F_, 1
+	note __, 9
+	note F_, 1
+	note F_, 1
+	note __, 3
+	note F_, 1
+	note __, 1
+	octave 4
+	note C#, 3
+	octave 3
+	note A#, 1
+	note G#, 1
+	note F#, 1
+	note __, 9
+	note F#, 1
+	note F#, 1
+	octave 2
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	octave 3
+	note F#, 3
+	octave 2
+	note F#, 1
+	note G#, 1
+	octave 3
+	note F#, 11
+	note G#, 1
+	note A_, 1
+	note A#, 7
+	note __, 3
+	octave 2
+	note A#, 3
+	loopchannel 0, Music_VioletCity_branch_f0261
+; f0311
 
-_Music_VioletCity_Ch4: ; 0xf031e
-	togglenoise $03
-	notetype $0c
-	note $41
-	note $31
-	note $40
-	note $40
-	note $31
-	note $33
-	note $73
-	callchannel _Music_VioletCity_sub_0xf036c
-	callchannel _Music_VioletCity_sub_0xf036c
-	callchannel _Music_VioletCity_sub_0xf036c
-	note $31
-	note $40
-	note $40
-	note $31
-	note $17
-	note $41
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	callchannel _Music_VioletCity_sub_0xf037a
-	loopchannel $00, $4338 ; end
-; 0xf036c
+Music_VioletCity_branch_f0311: ; f0311
+	note G_, 1
+	note __, 9
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note E_, 3
+	octave 2
+	note A_, 3
+	endchannel
 
-_Music_VioletCity_sub_0xf036c: ; 0xf036c
-; subroutine
-	note $30
-	note $30
-	note $40
-	note $40
-	note $31
-	note $81
-	note $80
-	note $80
-	note $71
-	note $80
-	note $80
-	note $80
-	note $80
-	endchannel ; end
-; 0xf037a
+Music_VioletCity_Ch4: ; f031e
+	togglenoise $3
+	notetype $c
+	note D#, 1
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note D_, 3
+	note F#, 3
+	callchannel Music_VioletCity_branch_f036c
+	callchannel Music_VioletCity_branch_f036c
+	callchannel Music_VioletCity_branch_f036c
+	note D_, 1
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note C_, 7
+	note D#, 1
 
-_Music_VioletCity_sub_0xf037a: ; 0xf037a
-; subroutine
-	note $41
-	note $80
-	note $80
-	note $80
-	note $00
-	note $40
-	note $40
-	note $01
-	note $41
-	note $31
-	note $41
-	endchannel ; end
-; 0xf0386
+Music_VioletCity_branch_f0338: ; f0338
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	callchannel Music_VioletCity_branch_f037a
+	loopchannel 0, Music_VioletCity_branch_f0338
+; f036c
+
+Music_VioletCity_branch_f036c: ; f036c
+	note D_, 0
+	note D_, 0
+	note D#, 0
+	note D#, 0
+	note D_, 1
+	note G_, 1
+	note G_, 0
+	note G_, 0
+	note F#, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	endchannel
+; f037a
+
+Music_VioletCity_branch_f037a: ; f037a
+	note D#, 1
+	note G_, 0
+	note G_, 0
+	note G_, 0
+	note __, 0
+	note D#, 0
+	note D#, 0
+	note __, 1
+	note D#, 1
+	note D_, 1
+	note D#, 1
+	endchannel
+; f0386
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -1,809 +1,800 @@
-_Music_ViridianCity: ; 0xf4000
-	db $c0
-	dw _Music_ViridianCity_Ch1
-	db $01
-	dw _Music_ViridianCity_Ch2
-	db $02
-	dw _Music_ViridianCity_Ch3
-	db $03
-	dw _Music_ViridianCity_Ch4
-; 0xf400c
+Music_ViridianCity: ; f4000
+	dbw $c0, Music_ViridianCity_Ch1
+	dbw $01, Music_ViridianCity_Ch2
+	dbw $02, Music_ViridianCity_Ch3
+	dbw $03, Music_ViridianCity_Ch4
+; f400c
 
-_Music_ViridianCity_Ch1: ; 0xf400c
-	tempo $9d00
+
+Music_ViridianCity_Ch1: ; f400c
+	tempo 157
 	volume $77
-	stereopanning $0f
-	dutycycle $02
+	stereopanning $f
+	dutycycle $2
 	vibrato $12, $34
-	notetype $0c, $a7
-	octave3
-	note $70
-	note $02
-	note $71
-	note $03
-	note $71
-	note $01
-	note $70
-	note $00
-	note $73
-	note $01
-	octave4
-	note $31
-	note $01
-	octave3
-	note $a1
-	note $01
-	note $70
-	note $00
-	note $70
-	note $02
-	note $71
-	note $03
-	note $71
-	note $01
-	note $80
-	note $00
-	note $03
-	note $87
-	note $03
-	callchannel _Music_ViridianCity_sub_0xf40c5
-	note $03
-	callchannel _Music_ViridianCity_sub_0xf40c5
-	octave4
-	note $13
-	callchannel _Music_ViridianCity_sub_0xf410f
-	octave4
-	note $c1
-	note $81
-	note $31
-	octave3
-	note $c1
-	note $71
-	note $51
-	note $70
-	note $00
-	note $a0
-	note $02
-	note $71
-	note $a0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $01
-	octave3
-	note $a0
-	note $00
-	octave4
-	note $20
-	note $00
-	note $70
-	note $00
+	notetype $c, $a7
+	octave 3
+	note F#, 0
+	note __, 2
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note F#, 0
+	note __, 0
+	note F#, 3
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	note F#, 0
+	note __, 0
+	note F#, 0
+	note __, 2
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	note __, 3
+	note G_, 7
+	note __, 3
+
+Music_ViridianCity_branch_f4039: ; f4039
+	callchannel Music_ViridianCity_branch_f40c5
+	note __, 3
+	callchannel Music_ViridianCity_branch_f40c5
+	octave 4
+	note C_, 3
+	callchannel Music_ViridianCity_branch_f410f
+	octave 4
+	note B_, 1
+	note G_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	note F#, 1
+	note A_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note __, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 4
+	note C#, 0
+	note __, 0
+	note F#, 0
+	note __, 0
 	intensity $87
-	octave5
-	note $73
-	note $63
+	octave 5
+	note F#, 3
+	note F_, 3
 	intensity $a7
-	octave3
-	note $85
-	note $c7
-	octave4
-	note $51
-	note $01
-	note $51
-	octave3
-	note $c3
-	note $81
-	note $71
-	note $53
-	note $31
-	octave2
-	note $a1
-	octave3
-	note $30
-	note $00
-	note $70
-	note $02
-	note $31
-	note $70
-	note $00
-	note $a0
-	note $00
-	note $01
-	note $71
-	note $a0
-	note $00
-	octave4
-	note $10
-	note $00
-	note $41
-	note $11
-	octave3
-	note $c1
-	note $a1
-	callchannel _Music_ViridianCity_sub_0xf410f
-	octave4
-	note $a1
-	note $81
-	note $31
-	note $81
-	octave3
-	note $71
-	note $51
-	note $70
-	note $00
-	note $a0
-	note $02
-	note $71
-	note $a0
-	note $00
-	octave4
-	note $10
-	note $00
-	note $01
-	note $51
-	note $01
-	note $11
-	note $01
-	octave3
-	note $a1
-	note $01
-	note $71
-	note $85
-	note $c0
-	note $00
-	octave4
-	note $53
-	note $71
-	note $85
-	note $51
-	note $01
-	octave3
-	note $81
-	octave4
-	note $51
-	note $01
-	note $75
-	note $33
-	octave3
-	note $a3
-	note $73
-	note $80
-	note $02
-	note $87
-	note $b3
-	loopchannel $00, $4039 ; end
-; 0xf40c5
+	octave 3
+	note G_, 5
+	note B_, 7
+	octave 4
+	note E_, 1
+	note __, 1
+	note E_, 1
+	octave 3
+	note B_, 3
+	note G_, 1
+	note F#, 1
+	note E_, 3
+	note D_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	note F#, 0
+	note __, 2
+	note D_, 1
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	note __, 1
+	note F#, 1
+	note A_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note D#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	callchannel Music_ViridianCity_branch_f410f
+	octave 4
+	note A_, 1
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	octave 3
+	note F#, 1
+	note E_, 1
+	note F#, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	note F#, 1
+	note A_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	note __, 1
+	note E_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note G_, 5
+	note B_, 0
+	note __, 0
+	octave 4
+	note E_, 3
+	note F#, 1
+	note G_, 5
+	note E_, 1
+	note __, 1
+	octave 3
+	note G_, 1
+	octave 4
+	note E_, 1
+	note __, 1
+	note F#, 5
+	note D_, 3
+	octave 3
+	note A_, 3
+	note F#, 3
+	note G_, 0
+	note __, 2
+	note G_, 7
+	note A#, 3
+	loopchannel 0, Music_ViridianCity_branch_f4039
+; f40c5
 
-_Music_ViridianCity_sub_0xf40c5: ; 0xf40c5
-; subroutine
-	octave3
-	note $a0
-	note $02
-	note $a1
-	note $03
-	note $a1
-	note $01
-	note $a0
-	note $00
-	octave4
-	note $13
-	note $01
-	octave3
-	note $a1
-	note $01
-	octave4
-	note $11
-	octave3
-	note $a0
-	note $00
-	octave4
-	note $10
-	note $00
-	octave3
-	note $c0
-	note $02
-	note $81
-	note $03
-	note $81
-	note $01
-	octave4
-	note $31
-	note $01
-	octave3
-	note $c1
-	note $01
-	note $80
-	note $00
-	note $83
-	note $01
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $02
-	note $31
-	note $03
-	note $31
-	note $01
-	note $30
-	note $00
-	octave3
-	note $83
-	note $01
-	octave4
-	note $20
-	note $00
-	note $50
-	note $00
-	note $33
-	note $20
-	note $00
-	octave3
-	note $a0
-	note $02
-	note $71
-	note $03
-	note $71
-	note $01
-	note $80
-	note $00
-	note $03
-	note $87
-	endchannel ; end
-; 0xf410f
+Music_ViridianCity_branch_f40c5: ; f40c5
+	octave 3
+	note A_, 0
+	note __, 2
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note A_, 0
+	note __, 0
+	octave 4
+	note C_, 3
+	note __, 1
+	octave 3
+	note A_, 1
+	note __, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A_, 0
+	note __, 0
+	octave 4
+	note C_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 2
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 1
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 2
+	note D_, 1
+	note __, 3
+	note D_, 1
+	note __, 1
+	note D_, 0
+	note __, 0
+	octave 3
+	note G_, 3
+	note __, 1
+	octave 4
+	note C#, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note D_, 3
+	note C#, 0
+	note __, 0
+	octave 3
+	note A_, 0
+	note __, 2
+	note F#, 1
+	note __, 3
+	note F#, 1
+	note __, 1
+	note G_, 0
+	note __, 0
+	note __, 3
+	note G_, 7
+	endchannel
+; f410f
 
-_Music_ViridianCity_sub_0xf410f: ; 0xf410f
-; subroutine
-	octave3
-	note $c1
-	note $31
-	note $80
-	note $00
-	note $c0
-	note $02
-	note $81
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $00
-	note $01
-	octave3
-	note $c1
-	octave4
-	note $30
-	note $00
-	note $80
-	note $00
-	endchannel ; end
-; 0xf4125
+Music_ViridianCity_branch_f410f: ; f410f
+	octave 3
+	note B_, 1
+	note D_, 1
+	note G_, 0
+	note __, 0
+	note B_, 0
+	note __, 2
+	note G_, 1
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	endchannel
 
-_Music_ViridianCity_Ch2: ; 0xf4125
+Music_ViridianCity_Ch2: ; f4125
 	vibrato $10, $46
-	dutycycle $01
-	notetype $0c, $b7
+	dutycycle $1
+	notetype $c, $b7
 	stereopanning $f0
-	octave2
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $03
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $23
-	octave2
-	note $a0
-	note $00
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $01
-	note $50
-	note $00
-	note $03
-	note $57
-	note $03
-	callchannel _Music_ViridianCity_sub_0xf41c0
-	note $03
-	callchannel _Music_ViridianCity_sub_0xf41c0
-	octave2
-	note $73
-	callchannel _Music_ViridianCity_sub_0xf4201
-	note $83
-	note $01
-	octave3
-	note $30
-	note $00
-	octave2
-	note $80
-	note $00
-	octave3
-	note $33
-	octave2
-	note $c1
-	callchannel _Music_ViridianCity_sub_0xf420b
-	note $01
-	note $71
-	note $01
-	octave3
-	note $20
-	note $00
-	note $23
-	note $13
-	callchannel _Music_ViridianCity_sub_0xf4215
-	note $53
-	note $01
-	note $c0
-	note $00
-	note $51
-	note $c1
-	note $83
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $11
-	note $21
-	note $01
-	note $41
-	note $a0
-	note $00
-	octave3
-	note $10
-	note $00
-	note $41
-	note $11
-	octave2
-	note $a1
-	note $71
-	callchannel _Music_ViridianCity_sub_0xf4201
-	note $83
-	note $01
-	note $c0
-	note $00
-	note $80
-	note $00
-	note $c3
-	note $81
-	callchannel _Music_ViridianCity_sub_0xf420b
-	note $01
-	note $71
-	note $01
-	note $a1
-	note $01
-	octave3
-	note $11
-	note $01
-	octave2
-	note $41
-	callchannel _Music_ViridianCity_sub_0xf4215
-	note $53
-	note $01
-	note $b0
-	note $00
-	note $b3
-	note $01
-	note $80
-	note $00
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $01
-	note $30
-	note $00
-	note $50
-	note $02
-	note $57
-	octave1
-	note $a3
-	loopchannel $00, $414c ; end
-; 0xf41c0
+	octave 2
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 3
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C#, 3
+	octave 2
+	note A_, 0
+	note __, 0
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	note E_, 0
+	note __, 0
+	note __, 3
+	note E_, 7
+	note __, 3
 
-_Music_ViridianCity_sub_0xf41c0: ; 0xf41c0
-; subroutine
-	octave2
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $03
-	note $43
-	note $01
-	note $a0
-	note $00
-	note $a0
-	note $00
-	octave3
-	note $13
-	octave2
-	note $a0
-	note $00
-	note $53
-	note $01
-	note $c0
-	note $00
-	note $c3
-	note $03
-	note $53
-	note $01
-	note $c0
-	note $00
-	note $c0
-	note $00
-	octave3
-	note $33
-	octave2
-	note $c0
-	note $00
-	note $83
-	note $01
-	octave3
-	note $30
-	note $00
-	note $33
-	note $03
-	octave2
-	note $a3
-	note $01
-	octave3
-	note $50
-	note $00
-	note $50
-	note $00
-	note $83
-	note $50
-	note $00
-	octave2
-	note $33
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $01
-	note $50
-	note $00
-	note $03
-	note $57
-	endchannel ; end
-; 0xf4201
+Music_ViridianCity_branch_f414c: ; f414c
+	callchannel Music_ViridianCity_branch_f41c0
+	note __, 3
+	callchannel Music_ViridianCity_branch_f41c0
+	octave 2
+	note F#, 3
+	callchannel Music_ViridianCity_branch_f4201
+	note G_, 3
+	note __, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	octave 2
+	note G_, 0
+	note __, 0
+	octave 3
+	note D_, 3
+	octave 2
+	note B_, 1
+	callchannel Music_ViridianCity_branch_f420b
+	note __, 1
+	note F#, 1
+	note __, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 3
+	note C_, 3
+	callchannel Music_ViridianCity_branch_f4215
+	note E_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note E_, 1
+	note B_, 1
+	note G_, 3
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note C_, 1
+	note C#, 1
+	note __, 1
+	note D#, 1
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 0
+	note __, 0
+	note D#, 1
+	note C_, 1
+	octave 2
+	note A_, 1
+	note F#, 1
+	callchannel Music_ViridianCity_branch_f4201
+	note G_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note G_, 0
+	note __, 0
+	note B_, 3
+	note G_, 1
+	callchannel Music_ViridianCity_branch_f420b
+	note __, 1
+	note F#, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 3
+	note C_, 1
+	note __, 1
+	octave 2
+	note D#, 1
+	callchannel Music_ViridianCity_branch_f4215
+	note E_, 3
+	note __, 1
+	note A#, 0
+	note __, 0
+	note A#, 3
+	note __, 1
+	note G_, 0
+	note __, 0
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	note D_, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 7
+	octave 1
+	note A_, 3
+	loopchannel 0, Music_ViridianCity_branch_f414c
+; f41c0
 
-_Music_ViridianCity_sub_0xf4201: ; 0xf4201
-; subroutine
-	note $83
-	note $01
-	octave3
-	note $30
-	note $00
-	note $33
-	octave2
-	note $61
-	note $71
-	endchannel ; end
-; 0xf420b
+Music_ViridianCity_branch_f41c0: ; f41c0
+	octave 2
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 3
+	note D#, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 0
+	octave 3
+	note C_, 3
+	octave 2
+	note A_, 0
+	note __, 0
+	note E_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note B_, 3
+	note __, 3
+	note E_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note B_, 0
+	note __, 0
+	octave 3
+	note D_, 3
+	octave 2
+	note B_, 0
+	note __, 0
+	note G_, 3
+	note __, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	note D_, 3
+	note __, 3
+	octave 2
+	note A_, 3
+	note __, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	note E_, 0
+	note __, 0
+	note G_, 3
+	note E_, 0
+	note __, 0
+	octave 2
+	note D_, 3
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	note E_, 0
+	note __, 0
+	note __, 3
+	note E_, 7
+	endchannel
+; f4201
 
-_Music_ViridianCity_sub_0xf420b: ; 0xf420b
-; subroutine
-	note $73
-	note $01
-	octave3
-	note $20
-	note $00
-	note $23
-	octave2
-	note $51
-	note $61
-	endchannel ; end
-; 0xf4215
+Music_ViridianCity_branch_f4201: ; f4201
+	note G_, 3
+	note __, 1
+	octave 3
+	note D_, 0
+	note __, 0
+	note D_, 3
+	octave 2
+	note F_, 1
+	note F#, 1
+	endchannel
+; f420b
 
-_Music_ViridianCity_sub_0xf4215: ; 0xf4215
-; subroutine
-	octave2
-	note $53
-	note $01
-	note $c0
-	note $00
-	note $c3
-	note $31
-	note $41
-	endchannel ; end
-; 0xf421e
+Music_ViridianCity_branch_f420b: ; f420b
+	note F#, 3
+	note __, 1
+	octave 3
+	note C#, 0
+	note __, 0
+	note C#, 3
+	octave 2
+	note E_, 1
+	note F_, 1
+	endchannel
+; f4215
 
-_Music_ViridianCity_Ch3: ; 0xf421e
+Music_ViridianCity_branch_f4215: ; f4215
+	octave 2
+	note E_, 3
+	note __, 1
+	note B_, 0
+	note __, 0
+	note B_, 3
+	note D_, 1
+	note D#, 1
+	endchannel
+
+Music_ViridianCity_Ch3: ; f421e
 	vibrato $12, $24
-	notetype $0c, $13
+	notetype $c, $13
 	stereopanning $ff
-	octave4
-	note $a0
-	note $02
-	note $a1
-	note $03
-	note $a1
-	note $01
-	note $a0
-	note $00
-	note $a3
-	note $01
-	octave5
-	note $71
-	note $01
-	note $21
-	note $01
-	octave4
-	note $a0
-	note $00
-	note $a0
-	note $02
-	note $a1
-	note $03
-	note $a1
-	note $01
-	octave5
-	note $30
-	note $00
-	note $03
-	note $37
-	note $71
-	note $81
+	octave 4
+	note A_, 0
+	note __, 2
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	note A_, 0
+	note __, 0
+	note A_, 3
+	note __, 1
+	octave 5
+	note F#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 4
+	note A_, 0
+	note __, 0
+	note A_, 0
+	note __, 2
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	octave 5
+	note D_, 0
+	note __, 0
+	note __, 3
+	note D_, 7
+	note F#, 1
+	note G_, 1
+
+Music_ViridianCity_branch_f4246: ; f4246
 	intensity $13
-	callchannel _Music_ViridianCity_sub_0xf42a2
-	octave5
-	note $71
-	note $81
-	callchannel _Music_ViridianCity_sub_0xf42a2
-	note $53
+	callchannel Music_ViridianCity_branch_f42a2
+	octave 5
+	note F#, 1
+	note G_, 1
+	callchannel Music_ViridianCity_branch_f42a2
+	note E_, 3
 	vibrato $18, $25
 	intensity $25
-	note $cb
-	note $83
-	octave6
-	note $37
-	note $51
-	note $31
-	note $21
-	octave5
-	note $c1
-	note $ab
-	note $73
-	note $a7
-	note $a3
-	note $93
-	note $59
-	note $51
-	note $71
-	note $81
-	note $01
-	note $81
-	note $73
-	note $53
-	note $83
-	note $7b
-	note $33
-	note $a3
-	note $03
-	octave6
-	note $17
-	octave5
-	note $cb
-	octave6
-	note $21
-	note $31
-	note $51
-	note $01
-	note $31
-	note $01
-	note $21
-	note $01
-	octave5
-	note $c1
-	note $01
-	note $a9
-	note $a1
-	note $c1
-	octave6
-	note $11
-	note $01
-	octave5
-	note $c1
-	note $01
-	note $a1
-	note $01
-	note $71
-	note $01
-	note $8b
-	note $81
-	note $a1
-	note $b5
-	note $a1
-	note $01
-	note $81
-	note $b1
-	note $01
-	note $ad
-	note $03
-	note $30
-	note $02
-	note $37
-	note $53
-	loopchannel $00, $4246 ; end
-; 0xf42a2
+	note B_, 11
+	note G_, 3
+	octave 6
+	note D_, 7
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 5
+	note B_, 1
+	note A_, 11
+	note F#, 3
+	note A_, 7
+	note A_, 3
+	note G#, 3
+	note E_, 9
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note F#, 3
+	note E_, 3
+	note G_, 3
+	note F#, 11
+	note D_, 3
+	note A_, 3
+	note __, 3
+	octave 6
+	note C_, 7
+	octave 5
+	note B_, 11
+	octave 6
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 5
+	note B_, 1
+	note __, 1
+	note A_, 9
+	note A_, 1
+	note B_, 1
+	octave 6
+	note C_, 1
+	note __, 1
+	octave 5
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 11
+	note G_, 1
+	note A_, 1
+	note A#, 5
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note A#, 1
+	note __, 1
+	note A_, 13
+	note __, 3
+	note D_, 0
+	note __, 2
+	note D_, 7
+	note E_, 3
+	loopchannel 0, Music_ViridianCity_branch_f4246
+; f42a2
 
-_Music_ViridianCity_sub_0xf42a2: ; 0xf42a2
-; subroutine
-	octave5
-	note $a1
-	note $01
-	note $81
-	note $01
-	note $71
-	note $05
-	note $01
-	note $71
-	note $81
-	note $a1
-	note $01
-	note $a1
-	note $81
-	note $71
-	note $81
-	note $51
-	octave4
-	note $c1
-	note $03
-	note $c1
-	note $01
-	octave5
-	note $81
-	note $01
-	note $31
-	note $01
-	octave4
-	note $c0
-	note $00
-	note $c3
-	octave5
-	note $51
-	note $71
-	note $81
-	note $01
-	note $71
-	note $01
-	note $51
-	note $05
-	note $01
-	note $51
-	note $71
-	note $81
-	note $01
-	note $81
-	note $71
-	note $51
-	note $71
-	note $31
-	octave4
-	note $a1
-	note $03
-	note $a1
-	note $01
-	octave5
-	note $30
-	note $00
-	note $03
-	note $37
-	endchannel ; end
-; 0xf42df
+Music_ViridianCity_branch_f42a2: ; f42a2
+	octave 5
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 5
+	note __, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note E_, 1
+	octave 4
+	note B_, 1
+	note __, 3
+	note B_, 1
+	note __, 1
+	octave 5
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 4
+	note B_, 0
+	note __, 0
+	note B_, 3
+	octave 5
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note E_, 1
+	note __, 5
+	note __, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note D_, 1
+	octave 4
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 1
+	octave 5
+	note D_, 0
+	note __, 0
+	note __, 3
+	note D_, 7
+	endchannel
 
-_Music_ViridianCity_Ch4: ; 0xf42df
-	togglenoise $03
-	notetype $0c
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf432c
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf432c
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf431d
-	callchannel _Music_ViridianCity_sub_0xf432c
-	callchannel _Music_ViridianCity_sub_0xf433b
-	callchannel _Music_ViridianCity_sub_0xf434b
-	callchannel _Music_ViridianCity_sub_0xf433b
-	callchannel _Music_ViridianCity_sub_0xf433b
-	callchannel _Music_ViridianCity_sub_0xf433b
-	callchannel _Music_ViridianCity_sub_0xf434b
-	callchannel _Music_ViridianCity_sub_0xf433b
-	callchannel _Music_ViridianCity_sub_0xf433b
-	loopchannel $00, $42e9 ; end
-; 0xf431d
+Music_ViridianCity_Ch4: ; f42df
+	togglenoise $3
+	notetype $c
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f432c
 
-_Music_ViridianCity_sub_0xf431d: ; 0xf431d
-; subroutine
-	note $51
-	note $51
-	note $31
-	note $53
-	note $31
-	note $51
-	note $71
-	note $51
-	note $51
-	note $33
-	note $51
-	note $31
-	note $51
-	note $71
-	endchannel ; end
-; 0xf432c
+Music_ViridianCity_branch_f42e9: ; f42e9
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f432c
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f431d
+	callchannel Music_ViridianCity_branch_f432c
+	callchannel Music_ViridianCity_branch_f433b
+	callchannel Music_ViridianCity_branch_f434b
+	callchannel Music_ViridianCity_branch_f433b
+	callchannel Music_ViridianCity_branch_f433b
+	callchannel Music_ViridianCity_branch_f433b
+	callchannel Music_ViridianCity_branch_f434b
+	callchannel Music_ViridianCity_branch_f433b
+	callchannel Music_ViridianCity_branch_f433b
+	loopchannel 0, Music_ViridianCity_branch_f42e9
+; f431d
 
-_Music_ViridianCity_sub_0xf432c: ; 0xf432c
-; subroutine
-	note $51
-	note $51
-	note $31
-	note $53
-	note $31
-	note $51
-	note $71
-	note $51
-	note $51
-	note $73
-	note $31
-	note $31
-	note $b1
-	note $b1
-	endchannel ; end
-; 0xf433b
+Music_ViridianCity_branch_f431d: ; f431d
+	note E_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note D_, 3
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	endchannel
+; f432c
 
-_Music_ViridianCity_sub_0xf433b: ; 0xf433b
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $41
-	note $41
-	note $71
-	note $33
-	note $41
-	note $71
-	note $31
-	note $41
-	note $41
-	note $71
-	note $31
-	note $41
-	endchannel ; end
-; 0xf434b
+Music_ViridianCity_branch_f432c: ; f432c
+	note E_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 3
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note F#, 3
+	note D_, 1
+	note D_, 1
+	note A#, 1
+	note A#, 1
+	endchannel
+; f433b
 
-_Music_ViridianCity_sub_0xf434b: ; 0xf434b
-; subroutine
-	note $41
-	note $71
-	note $31
-	note $41
-	note $41
-	note $71
-	note $33
-	note $41
-	note $71
-	note $31
-	note $41
-	note $41
-	note $31
-	note $31
-	note $71
-	endchannel ; end
-; 0xf435b
+Music_ViridianCity_branch_f433b: ; f433b
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 3
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 1
+	endchannel
+; f434b
+
+Music_ViridianCity_branch_f434b: ; f434b
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note F#, 1
+	note D_, 3
+	note D#, 1
+	note F#, 1
+	note D_, 1
+	note D#, 1
+	note D#, 1
+	note D_, 1
+	note D_, 1
+	note F#, 1
+	endchannel
+; f435b
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -1,189 +1,194 @@
-_Music_WildPokemonVictory: ; 0xf4518
-	db $80
-	dw _Music_WildPokemonVictory_Ch1
-	db $01
-	dw _Music_WildPokemonVictory_Ch2
-	db $02
-	dw _Music_WildPokemonVictory_Ch3
-; 0xf4521
+Music_WildPokemonVictory: ; f4518
+	dbw $80, Music_WildPokemonVictory_Ch1
+	dbw $01, Music_WildPokemonVictory_Ch2
+	dbw $02, Music_WildPokemonVictory_Ch3
+; f4521
 
-_Music_WildPokemonVictory_Ch1: ; 0xf4521
-	tempo $7e00
+
+Music_WildPokemonVictory_Ch1: ; f4521
+	tempo 126
 	volume $77
-	dutycycle $03
-	tone $0100
-	notetype $0c, $b1
-	octave3
-	note $c0
-	note $a0
-	note $90
-	note $70
+	dutycycle $3
+	tone $0001
+	notetype $c, $b1
+	octave 3
+	note B_, 0
+	note A_, 0
+	note G#, 0
+	note F#, 0
 	intensity $b6
-	note $5b
-	stereopanning $0f
-	callchannel _Music_WildPokemonVictory_sub_0xf455c
-	note $71
-	note $71
-	note $73
-	callchannel _Music_WildPokemonVictory_sub_0xf455c
-	note $93
+	note E_, 11
+
+Music_SuccessfulCapture_branch_f4536: ; f4536
+	stereopanning $f
+
+Music_WildPokemonVictory_branch_f4538: ; f4538
+	callchannel Music_WildPokemonVictory_branch_f455c
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	callchannel Music_WildPokemonVictory_branch_f455c
+	note G#, 3
 	intensity $78
-	octave3
-	note $83
-	forceoctave $01
-	callchannel _Music_WildPokemonVictory_sub_0xf455c
-	note $71
-	note $71
-	note $73
-	callchannel _Music_WildPokemonVictory_sub_0xf455c
-	note $93
-	forceoctave $00
+	octave 3
+	note G_, 3
+	forceoctave $1
+	callchannel Music_WildPokemonVictory_branch_f455c
+	note F#, 1
+	note F#, 1
+	note F#, 3
+	callchannel Music_WildPokemonVictory_branch_f455c
+	note G#, 3
+	forceoctave $0
 	intensity $78
-	octave3
-	note $73
-	loopchannel $00, $4538 ; end
-; 0xf455c
+	octave 3
+	note F#, 3
+	loopchannel 0, Music_WildPokemonVictory_branch_f4538
+; f455c
 
-_Music_WildPokemonVictory_sub_0xf455c: ; 0xf455c
-; subroutine
+Music_WildPokemonVictory_branch_f455c: ; f455c
 	intensity $71
-	octave3
-	note $90
-	note $c0
-	octave4
-	note $51
-	octave3
-	note $c1
-	octave4
-	note $51
-	octave3
-	note $90
-	note $70
-	note $50
-	note $70
-	note $91
-	note $51
-	note $a0
-	octave4
-	note $20
-	note $51
-	note $51
-	note $a1
-	endchannel ; end
-; 0xf4575
+	octave 3
+	note G#, 0
+	note B_, 0
+	octave 4
+	note E_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	octave 3
+	note G#, 0
+	note F#, 0
+	note E_, 0
+	note F#, 0
+	note G#, 1
+	note E_, 1
+	note A_, 0
+	octave 4
+	note C#, 0
+	note E_, 1
+	note E_, 1
+	note A_, 1
+	endchannel
 
-_Music_WildPokemonVictory_Ch2: ; 0xf4575
+Music_WildPokemonVictory_Ch2: ; f4575
 	vibrato $12, $24
-	dutycycle $02
-	notetype $0c, $d1
-	octave4
-	note $50
-	note $70
-	note $90
-	note $a0
+	dutycycle $2
+	notetype $c, $d1
+	octave 4
+	note E_, 0
+	note F#, 0
+	note G#, 0
+	note A_, 0
 	intensity $d6
-	note $cb
+	note B_, 11
+
+Music_SuccessfulCapture_branch_f4585: ; f4585
 	stereopanning $f0
-	callchannel _Music_WildPokemonVictory_sub_0xf45b5
-	octave4
-	note $c1
-	note $c1
-	note $c3
-	callchannel _Music_WildPokemonVictory_sub_0xf45b5
-	octave4
-	note $c3
+
+Music_WildPokemonVictory_branch_f4587: ; f4587
+	callchannel Music_WildPokemonVictory_branch_f45b5
+	octave 4
+	note B_, 1
+	note B_, 1
+	note B_, 3
+	callchannel Music_WildPokemonVictory_branch_f45b5
+	octave 4
+	note B_, 3
 	intensity $81
-	note $10
-	note $50
-	note $80
-	note $b0
-	forceoctave $01
-	callchannel _Music_WildPokemonVictory_sub_0xf45b5
-	octave4
-	note $c1
-	note $c1
-	note $c3
-	callchannel _Music_WildPokemonVictory_sub_0xf45b5
-	octave4
-	note $c3
-	forceoctave $00
+	note C_, 0
+	note E_, 0
+	note G_, 0
+	note A#, 0
+	forceoctave $1
+	callchannel Music_WildPokemonVictory_branch_f45b5
+	octave 4
+	note B_, 1
+	note B_, 1
+	note B_, 3
+	callchannel Music_WildPokemonVictory_branch_f45b5
+	octave 4
+	note B_, 3
+	forceoctave $0
 	intensity $81
-	octave3
-	note $c0
-	octave4
-	note $40
-	note $70
-	note $a0
-	loopchannel $00, $4587 ; end
-; 0xf45b5
+	octave 3
+	note B_, 0
+	octave 4
+	note D#, 0
+	note F#, 0
+	note A_, 0
+	loopchannel 0, Music_WildPokemonVictory_branch_f4587
+; f45b5
 
-_Music_WildPokemonVictory_sub_0xf45b5: ; 0xf45b5
-; subroutine
+Music_WildPokemonVictory_branch_f45b5: ; f45b5
 	intensity $81
-	octave4
-	note $c1
-	note $a1
-	note $91
-	note $a1
-	note $c1
-	note $c1
-	note $c3
-	octave5
-	note $21
-	note $21
-	note $23
-	endchannel ; end
-; 0xf45c4
+	octave 4
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 3
+	octave 5
+	note C#, 1
+	note C#, 1
+	note C#, 3
+	endchannel
 
-_Music_WildPokemonVictory_Ch3: ; 0xf45c4
-	notetype $0c, $20
-	note $05
-	octave6
-	note $40
-	note $00
-	note $50
-	note $02
-	note $50
-	note $02
-	callchannel _Music_WildPokemonVictory_sub_0xf45f4
-	note $41
-	note $21
-	octave2
-	note $c1
-	note $01
-	callchannel _Music_WildPokemonVictory_sub_0xf45f4
-	note $51
-	note $01
-	note $13
-	forceoctave $01
-	callchannel _Music_WildPokemonVictory_sub_0xf45f4
-	note $41
-	note $21
-	octave2
-	note $c1
-	note $01
-	callchannel _Music_WildPokemonVictory_sub_0xf45f4
-	note $51
-	note $01
-	forceoctave $00
-	octave2
-	note $c3
-	loopchannel $00, $45cf ; end
-; 0xf45f4
+Music_WildPokemonVictory_Ch3: ; f45c4
+	notetype $c, $20
+	note __, 5
+	octave 6
+	note D#, 0
+	note __, 0
+	note E_, 0
+	note __, 2
+	note E_, 0
+	note __, 2
 
-_Music_WildPokemonVictory_sub_0xf45f4: ; 0xf45f4
-; subroutine
+Music_SuccessfulCapture_branch_f45cf: ; f45cf
+
+Music_WildPokemonVictory_branch_f45cf: ; f45cf
+	callchannel Music_WildPokemonVictory_branch_f45f4
+	note D#, 1
+	note C#, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	callchannel Music_WildPokemonVictory_branch_f45f4
+	note E_, 1
+	note __, 1
+	note C_, 3
+	forceoctave $1
+	callchannel Music_WildPokemonVictory_branch_f45f4
+	note D#, 1
+	note C#, 1
+	octave 2
+	note B_, 1
+	note __, 1
+	callchannel Music_WildPokemonVictory_branch_f45f4
+	note E_, 1
+	note __, 1
+	forceoctave $0
+	octave 2
+	note B_, 3
+	loopchannel 0, Music_WildPokemonVictory_branch_f45cf
+; f45f4
+
+Music_WildPokemonVictory_branch_f45f4: ; f45f4
 	intensity $25
-	octave3
-	note $51
-	note $03
-	note $51
-	note $01
-	note $31
-	note $01
-	note $31
-	note $21
-	note $03
-	note $21
-	endchannel ; end
-; 0xf4602
+	octave 3
+	note E_, 1
+	note __, 3
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note C#, 1
+	note __, 3
+	note C#, 1
+	endchannel
+; f4602