Manually merge pokecrystal audio files

and remove more CrystalComplete leftovers

crysaudio/music/DPPt/EternaForest.asm

@@ -1,979 +0,0 @@
-Music_EternaForest::
-	dbw $C0, Music_EternaForest_Ch1
-	dbw $01, Music_EternaForest_Ch2
-	dbw $02, Music_EternaForest_Ch3
-	dbw $03, Music_EternaForest_Ch4
-
-Music_EternaForest_Ch1:
-	tempo $88
-	volume $77
-Music_EternaForest_Ch1_loop:
-	notetype $C, $82
-	dutycycle 0
-	octave 5
-	note __, 1
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 9
-	intensity $82
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 7
-	intensity $82
-	octave 4
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 9
-	intensity $82
-	octave 5
-	note F#, 5
-	intensity $72
-	note F#, 6
-	intensity $62
-	note F#, 6
-	intensity $52
-	note F#, 6
-	intensity $42
-	note F#, 9
-	intensity $82
-	octave 4
-	note F#, 5
-	intensity $72
-	note F#, 6
-	intensity $62
-	note F#, 6
-	intensity $82
-	note D_, 6
-	intensity $72
-	note D_, 4
-	intensity $82
-	note C_, 16
-	dutycycle 1
-	note __, 16
-	note __, 12
-	octave 6
-	note C_, 2
-	octave 5
-	note F#, 2
-	octave 6
-	note C_, 12
-	octave 5
-	note F#, 2
-	note C_, 2
-	note F#, 14
-	octave 4
-	note B_, 2
-	octave 5
-	note D_, 10
-	octave 3
-	note B_, 4
-	note A_, 2
-	note B_, 2
-	octave 4
-	note F#, 8
-	octave 3
-	note B_, 4
-	note F#, 2
-	octave 4
-	note D_, 6
-	octave 3
-	note G_, 2
-	octave 4
-	note D_, 6
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 16
-	note __, 16
-	note __, 2
-	octave 6
-	note D_, 2
-	octave 5
-	note G_, 2
-	notetype $F, $82
-	note B_, 16
-	notetype $C, $82
-	octave 6
-	note D_, 2
-	octave 5
-	note F#, 2
-	notetype $F, $82
-	note A_, 16
-	notetype $C, $82
-	octave 6
-	note D_, 2
-	octave 5
-	note G_, 2
-	note D_, 4
-	octave 3
-	note B_, 2
-	octave 4
-	note B_, 2
-	octave 3
-	note A_, 2
-	note B_, 2
-	octave 4
-	note F#, 8
-	octave 3
-	note B_, 2
-	octave 4
-	note B_, 2
-	octave 3
-	note F#, 2
-	octave 4
-	note F#, 2
-	octave 5
-	note F#, 4
-	octave 3
-	note G_, 2
-	octave 4
-	note G_, 2
-	octave 5
-	note G_, 4
-	octave 4
-	note D_, 2
-	octave 5
-	note D_, 2
-	octave 6
-	note D_, 8
-	octave 4
-	note G_, 2
-	octave 5
-	note C_, 2
-	note G_, 2
-	octave 4
-	note G_, 2
-	octave 6
-	note C_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note D_, 2
-	octave 4
-	note G_, 4
-	octave 5
-	note D_, 2
-	note G_, 8
-	octave 4
-	note G_, 2
-	note B_, 2
-	octave 5
-	note G_, 2
-	octave 4
-	note G_, 2
-	octave 5
-	note B_, 2
-	octave 6
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note D_, 2
-	octave 4
-	note G_, 4
-	octave 5
-	note D_, 2
-	note G_, 6
-	note B_, 4
-	note G_, 4
-	note A_, 2
-	note D_, 6
-	octave 4
-	note B_, 4
-	note G_, 4
-	note A_, 2
-	octave 5
-	note D_, 2
-	note E_, 16
-	note __, 6
-	note F#, 4
-	note G_, 2
-	note F#, 4
-	note D_, 16
-	note __, 6
-	note A_, 4
-	note B_, 2
-	note A_, 4
-	note E_, 16
-	note __, 16
-	note __, 2
-	octave 6
-	note D_, 2
-	note C_, 2
-	octave 5
-	note G_, 2
-	note E_, 2
-	note C_, 2
-	octave 4
-	note B_, 2
-	note G_, 2
-	note C_, 2
-	octave 6
-	note D#, 2
-	note C_, 2
-	octave 5
-	note A_, 2
-	note F#, 2
-	note D#, 2
-	note C_, 2
-	octave 4
-	note A_, 2
-	note D#, 3
-	dutycycle 0
-	octave 5
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 9
-	intensity $82
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 9
-	intensity $82
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 9
-	intensity $82
-	note B_, 5
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 6
-	intensity $42
-	note B_, 8
-	loopchannel 0, Music_EternaForest_Ch1_loop
-
-Music_EternaForest_Ch2:
-Music_EternaForest_Ch2_loop:
-	notetype $C, $92
-	dutycycle 0
-	octave 5
-	note D_, 6
-	intensity $82
-	note D_, 6
-	intensity $72
-	note D_, 6
-	intensity $62
-	note D_, 6
-	intensity $52
-	note D_, 8
-	intensity $92
-	note E_, 6
-	intensity $82
-	note E_, 6
-	intensity $72
-	note E_, 6
-	intensity $62
-	note E_, 6
-	intensity $52
-	note E_, 6
-	intensity $92
-	octave 4
-	note E_, 6
-	intensity $82
-	note E_, 6
-	intensity $72
-	note E_, 6
-	intensity $62
-	note E_, 6
-	intensity $52
-	note E_, 8
-	intensity $92
-	note B_, 6
-	intensity $82
-	note B_, 6
-	intensity $72
-	note B_, 6
-	intensity $62
-	note B_, 6
-	intensity $52
-	note B_, 8
-	intensity $92
-	octave 3
-	note B_, 6
-	intensity $82
-	note B_, 6
-	intensity $72
-	note B_, 6
-	intensity $62
-	note G_, 6
-	intensity $52
-	note G_, 4
-	intensity $92
-	note F#, 6
-	intensity $B6
-	dutycycle 2
-	octave 2
-	note C_, 2
-	note __, 4
-	octave 1
-	note C_, 2
-	note __, 16
-	note __, 8
-	octave 2
-	note C_, 2
-	note __, 4
-	octave 1
-	note C_, 2
-	note __, 16
-	note __, 8
-	note G_, 2
-	note __, 4
-	octave 1
-	note G_, 2
-	note __, 16
-	note __, 16
-	note __, 8
-	octave 1
-	note E_, 2
-	note __, 6
-	note D_, 2
-	note __, 6
-	octave 2
-	note C_, 2
-	note __, 4
-	octave 1
-	note C_, 2
-	note __, 16
-	note __, 8
-	octave 2
-	note C_, 2
-	note __, 4
-	octave 1
-	note C_, 2
-	note __, 16
-	note __, 8
-	note G_, 2
-	note __, 4
-	octave 1
-	note G_, 2
-	note __, 16
-	note __, 16
-	note __, 8
-	octave 1
-	note E_, 2
-	note __, 6
-	note D_, 2
-	note __, 6
-	octave 1
-	note A_, 2
-	note __, 4
-	note A_, 2
-	note __, 2
-	note A_, 2
-	note __, 1
-	note A_, 2
-	note __, 1
-	note B_, 2
-	note __, 4
-	note B_, 2
-	note __, 2
-	note B_, 2
-	note __, 1
-	note B_, 2
-	note __, 1
-	octave 1
-	note E_, 2
-	note __, 4
-	note E_, 2
-	note __, 2
-	note E_, 2
-	note __, 1
-	note E_, 2
-	note __, 1
-	note D_, 2
-	note __, 4
-	note D_, 2
-	note __, 2
-	note D_, 2
-	note __, 1
-	note D_, 2
-	note __, 1
-	octave 1
-	note A_, 2
-	note __, 6
-	note B_, 2
-	note __, 6
-	note A_, 2
-	note __, 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note C_, 2
-	note D_, 2
-	note __, 2
-	note C_, 16
-	note __, 16
-	note __, 2
-	octave 1
-	note B_, 16
-	note __, 16
-	note __, 4
-	octave 1
-	note A_, 4
-	octave 2
-	note C_, 4
-	octave 1
-	note A_, 4
-	note B_, 4
-	octave 2
-	note D_, 4
-	note F#, 4
-	note A_, 4
-	octave 3
-	note C_, 6
-	octave 2
-	note C_, 6
-	octave 3
-	note C_, 4
-	octave 4
-	note C_, 6
-	octave 3
-	note C_, 10
-	intensity $92
-	dutycycle 0
-	octave 5
-	note C_, 6
-	intensity $82
-	note C_, 6
-	intensity $72
-	note C_, 6
-	intensity $62
-	note C_, 6
-	intensity $52
-	note C_, 8
-	intensity $92
-	octave 4
-	note G_, 6
-	intensity $82
-	note G_, 6
-	intensity $72
-	note G_, 6
-	intensity $62
-	note G_, 6
-	intensity $52
-	note G_, 8
-	intensity $92
-	octave 5
-	note C_, 6
-	intensity $82
-	note C_, 6
-	intensity $72
-	note C_, 6
-	intensity $62
-	note C_, 6
-	intensity $52
-	note C_, 8
-	intensity $92
-	octave 4
-	note G_, 6
-	intensity $82
-	note G_, 6
-	intensity $72
-	note G_, 6
-	intensity $62
-	note G_, 6
-	intensity $52
-	note G_, 8
-	loopchannel 0, Music_EternaForest_Ch2_loop
-
-Music_EternaForest_Ch3:
-Music_EternaForest_Ch3_loop:
-	notetype $C, $12
-	vibrato $10, $14
-	octave 7
-	note __, 16
-	note __, 16
-	note __, 16
-	octave 5
-	note B_, 2
-	octave 6
-	note C_, 2
-	note __, 2
-	octave 5
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note __, 2
-	octave 6
-	note C_, 2
-	octave 5
-	note B_, 2
-	note __, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note A_, 2
-	note __, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note A_, 2
-	note G_, 2
-	note __, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note F#, 2
-	note D_, 2
-	note __, 2
-	octave 4
-	note B_, 2
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 2
-	octave 5
-	note B_, 2
-	octave 6
-	note C_, 2
-	note __, 2
-	octave 5
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note __, 2
-	octave 6
-	note C_, 2
-	octave 5
-	note B_, 2
-	note __, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note A_, 2
-	note __, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note A_, 2
-	note G_, 2
-	note __, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note __, 2
-	note F#, 2
-	note D_, 2
-	note __, 2
-	octave 4
-	note B_, 2
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 14
-	octave 5
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note B_, 2
-	note __, 2
-	note A_, 2
-	octave 6
-	note D_, 2
-	note C_, 2
-	note __, 2
-	octave 5
-	note B_, 2
-	note F#, 2
-	note __, 2
-	note G_, 2
-	note A_, 2
-	note __, 2
-	note B_, 2
-	note __, 2
-	octave 6
-	note C_, 2
-	octave 5
-	note B_, 2
-	octave 6
-	note C_, 2
-	note __, 2
-	note D_, 2
-	note __, 2
-	note A_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note __, 2
-	note D_, 2
-	note __, 2
-	octave 5
-	note B_, 2
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 4
-	octave 4
-	note G_, 8
-	octave 5
-	note C_, 4
-	octave 4
-	note B_, 8
-	octave 5
-	note D_, 4
-	note A_, 4
-	note G_, 12
-	octave 4
-	note B_, 4
-	octave 5
-	note D_, 8
-	note G_, 4
-	note A_, 4
-	note G_, 8
-	note E_, 4
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note B_, 4
-	octave 6
-	note C_, 2
-	note D_, 4
-	note E_, 2
-	notetype $8, $12
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note D_, 4
-	octave 5
-	note B_, 4
-	octave 6
-	note E_, 4
-	notetype $C, $12
-	octave 5
-	note G_, 16
-	notetype $8, $12
-	note A_, 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
-	note E_, 4
-	note A_, 4
-	notetype $C, $12
-	note D_, 12
-	note A_, 4
-	note G_, 8
-	note E_, 4
-	note A_, 8
-	note G_, 4
-	note B_, 4
-	note A_, 4
-	octave 6
-	note D_, 16
-	note C_, 16
-	note C_, 8
-	octave 5
-	note C_, 2
-	octave 6
-	note F#, 2
-	note F#, 2
-	octave 5
-	note C_, 2
-	octave 6
-	note A_, 2
-	note B_, 4
-	note __, 16
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 6
-	note D_, 2
-	note D_, 2
-	octave 4
-	note G_, 2
-	octave 6
-	note A_, 2
-	note B_, 4
-	note __, 16
-	note __, 2
-	octave 5
-	note C_, 2
-	octave 6
-	note F#, 2
-	note F#, 2
-	octave 5
-	note C_, 2
-	octave 6
-	note A_, 2
-	note B_, 2
-	octave 7
-	note D_, 2
-	note __, 16
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 6
-	note D_, 2
-	note D_, 2
-	octave 4
-	note G_, 2
-	octave 6
-	note A_, 2
-	note B_, 2
-	octave 7
-	note D_, 2
-	note __, 10
-	loopchannel 0, Music_EternaForest_Ch3_loop
-
-Music_EternaForest_Ch4:
-	togglenoise 4
-Music_EternaForest_Ch4_loop:
-	notetype $C
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 2
-	note D#, 2
-	note F#, 1
-	note D#, 1
-	note C_, 2
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 1
-	note F#, 2
-	note D#, 2
-	note F#, 1
-	note D#, 1
-	note C_, 2
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 1
-	note F#, 2
-	note D#, 2
-	note F#, 1
-	note D#, 1
-	note C_, 2
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 1
-	note F#, 2
-	note D#, 2
-	note F#, 1
-	note D#, 1
-	note C_, 2
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 1
-	note F#, 2
-	note D#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 2
-	note C_, 1
-	note D#, 2
-	note D#, 2
-	note C_, 1
-	note D#, 2
-	note C_, 1
-	note D#, 2
-	note D#, 2
-	note C_, 1
-	note C_, 2
-	note C_, 1
-	note C_, 2
-	note C_, 2
-	note C_, 1
-	note D#, 2
-	note C_, 1
-	note F#, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	loopchannel 0, Music_EternaForest_Ch4_loop

crysaudio/music/DPPt/WinPokeSinnoh.asm

@@ -1,289 +0,0 @@
-Music_WinPokeSinnoh::
-	dbw $80, Music_WinPokeSinnoh_Ch1
-	dbw $01, Music_WinPokeSinnoh_Ch2
-	dbw $02, Music_WinPokeSinnoh_Ch3
-
-Music_WinPokeSinnoh_Ch1:
-	tempo $68
-	volume $77
-	notetype $C, $A2
-	dutycycle 2
-	octave 3
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 2
-	octave 4
-	note D#, 2
-	note E_, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note E_, 4
-Music_WinPokeSinnoh_Ch1_loop:
-	octave 2
-	note E_, 4
-	octave 1
-	note B_, 4
-	octave 2
-	note E_, 2
-	note G#, 4
-	note E_, 4
-	note A_, 4
-	note E_, 2
-	note G#, 4
-	note E_, 4
-	note E_, 4
-	octave 1
-	note B_, 4
-	octave 2
-	note E_, 2
-	note G#, 4
-	note E_, 4
-	note A_, 4
-	note E_, 2
-	note G#, 4
-	note G_, 4
-	note F_, 4
-	note C_, 4
-	note F_, 2
-	note A_, 4
-	note F_, 4
-	note A#, 4
-	note F_, 2
-	note A_, 4
-	note F_, 4
-	note F_, 4
-	note C_, 4
-	note F_, 2
-	note A_, 4
-	note F_, 4
-	note A#, 4
-	note F_, 2
-	note A_, 4
-	note B_, 4
-	loopchannel 0, Music_WinPokeSinnoh_Ch1_loop
-
-Music_WinPokeSinnoh_Ch2:
-	notetype $C, $B2
-	dutycycle 2
-	octave 4
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	intensity $B7
-	note B_, 12
-Music_WinPokeSinnoh_Ch2_loop:
-	octave 4
-	intensity $B2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
-	octave 5
-	note C#, 2
-	note C#, 2
-	note C#, 4
-	octave 4
-	note B_, 2
-	note B_, 2
-	note B_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
-	octave 5
-	note C#, 2
-	note C#, 2
-	note C#, 4
-	octave 4
-	note B_, 8
-	octave 5
-	note C_, 2
-	octave 4
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	octave 5
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note C_, 2
-	octave 4
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	octave 5
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 8
-	loopchannel 0, Music_WinPokeSinnoh_Ch2_loop
-
-Music_WinPokeSinnoh_Ch3:
-	notetype $C, $12
-	octave 5
-	note __, 4
-	notetype $9, $12
-	note B_, 2
-	notetype $6, $12
-	note __, 1
-	note G#, 3
-	note __, 1
-	note E_, 3
-	note __, 1
-	octave 4
-	note B_, 3
-	note __, 1
-	octave 5
-	note E_, 3
-	note __, 1
-	note G#, 3
-	note __, 1
-Music_WinPokeSinnoh_Ch3_loop:
-	note G#, 3
-	note __, 1
-	note E_, 3
-	note __, 1
-	octave 4
-	note B_, 3
-	note __, 1
-	octave 5
-	note E_, 3
-	note __, 1
-	note G#, 3
-	note __, 1
-	octave 4
-	note B_, 3
-	note __, 1
-	octave 5
-	note E_, 3
-	note __, 5
-	note A_, 3
-	note __, 1
-	note C#, 3
-	note __, 1
-	note E_, 3
-	note __, 5
-	note G#, 3
-	note __, 1
-	octave 4
-	note B_, 3
-	note __, 1
-	octave 5
-	note E_, 3
-	note __, 5
-	note G#, 3
-	note __, 1
-	note E_, 3
-	note __, 1
-	octave 4
-	note G#, 3
-	note __, 1
-	note B_, 3
-	note __, 1
-	octave 5
-	note E_, 3
-	note __, 1
-	note G#, 3
-	note __, 1
-	octave 4
-	note B_, 3
-	note __, 5
-	octave 5
-	note E_, 3
-	note __, 1
-	note A_, 3
-	note __, 1
-	note C#, 3
-	note __, 5
-	note E_, 3
-	note __, 1
-	note D#, 3
-	note __, 1
-	note D_, 3
-	note __, 1
-	note C#, 3
-	note __, 1
-	note F_, 3
-	note __, 1
-	note C_, 3
-	note __, 1
-	octave 4
-	note A_, 3
-	note __, 1
-	octave 5
-	note C_, 3
-	note __, 1
-	note F_, 3
-	note __, 1
-	octave 4
-	note A_, 3
-	note __, 1
-	octave 5
-	note C_, 3
-	note __, 5
-	note F_, 3
-	note __, 1
-	octave 4
-	note A#, 3
-	note __, 1
-	octave 5
-	note D_, 3
-	note __, 5
-	note F_, 3
-	note __, 1
-	octave 4
-	note A_, 3
-	note __, 1
-	octave 5
-	note C_, 3
-	note __, 5
-	note F_, 3
-	note __, 1
-	note C_, 3
-	note __, 1
-	octave 4
-	note A_, 3
-	note __, 1
-	octave 5
-	note C_, 3
-	note __, 1
-	note F_, 3
-	note __, 1
-	note A_, 3
-	note __, 1
-	note C_, 3
-	note __, 5
-	note F_, 3
-	note __, 1
-	note A#, 3
-	note __, 1
-	note D_, 3
-	note __, 5
-	note F_, 3
-	note __, 1
-	note F_, 3
-	note __, 1
-	note F#, 3
-	note __, 1
-	note G_, 3
-	note __, 1
-	loopchannel 0, Music_WinPokeSinnoh_Ch3_loop

crysaudio/music/DPPt/WinTrainerSinnoh.asm

@@ -1,461 +0,0 @@
-Music_WinTrainerSinnoh::
-	dbw $80, Music_WinTrainerSinnoh_Ch1
-	dbw $01, Music_WinTrainerSinnoh_Ch2
-	dbw $02, Music_WinTrainerSinnoh_Ch3
-
-Music_WinTrainerSinnoh_Ch1:
-	tempo $7C
-	volume $77
-	notetype $C, $A2
-	dutycycle 2
-	octave 1
-	note __, 12
-	octave 5
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-Music_WinTrainerSinnoh_Ch1_loop:
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 3
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	note D#, 1
-	octave 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 1
-	note D#, 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 4
-	note D#, 1
-	octave 3
-	note D#, 1
-	octave 2
-	note D#, 1
-	octave 1
-	note D#, 1
-	loopchannel 0, Music_WinTrainerSinnoh_Ch1_loop
-
-Music_WinTrainerSinnoh_Ch2:
-	notetype $C, $B2
-	dutycycle 1
-	octave 4
-	note __, 8
-	octave 5
-	note G_, 1
-	octave 4
-	note A#, 1
-	note G_, 1
-	note D#, 1
-	note G_, 1
-	note D#, 1
-	octave 3
-	note A#, 1
-	note G_, 1
-Music_WinTrainerSinnoh_Ch2_loop:
-	intensity $97
-	octave 3
-	note A#, 7
-	octave 4
-	note G_, 1
-	octave 3
-	note A_, 7
-	octave 4
-	note A_, 1
-	octave 3
-	note A#, 7
-	octave 4
-	note A#, 1
-	octave 3
-	note G#, 7
-	octave 4
-	note G#, 1
-	octave 3
-	note G_, 1
-	octave 4
-	note G_, 1
-	octave 3
-	note G_, 5
-	octave 4
-	note G_, 1
-	octave 3
-	note A_, 1
-	octave 4
-	note A_, 1
-	octave 3
-	note A_, 5
-	octave 4
-	note A_, 1
-	octave 3
-	note A#, 1
-	octave 4
-	note A#, 1
-	octave 3
-	note A#, 5
-	octave 4
-	note A#, 1
-	octave 3
-	note F#, 1
-	octave 4
-	note F#, 1
-	octave 3
-	note F#, 5
-	intensity $B1
-	octave 5
-	note F#, 1
-	note G_, 1
-	note G_, 1
-	octave 4
-	note A#, 1
-	note A#, 1
-	octave 5
-	note D#, 1
-	note D#, 1
-	octave 4
-	note A#, 1
-	note A#, 1
-	octave 5
-	note G#, 1
-	note G#, 1
-	note C_, 1
-	note C_, 1
-	note F_, 1
-	note F_, 1
-	note C_, 1
-	note C_, 1
-	note A#, 1
-	note A#, 1
-	note C#, 1
-	note C#, 1
-	note F#, 1
-	note F#, 1
-	note C#, 1
-	note C#, 1
-	octave 6
-	note C_, 1
-	note C_, 1
-	octave 5
-	note D#, 1
-	note D#, 1
-	note G#, 1
-	note G#, 1
-	note D#, 1
-	note D#, 1
-	note A#, 1
-	note A#, 1
-	octave 4
-	note A#, 1
-	note A#, 1
-	octave 5
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	note D#, 1
-	octave 5
-	note G_, 1
-	note G_, 1
-	octave 4
-	note A#, 1
-	note A#, 1
-	octave 5
-	note D#, 1
-	note D#, 1
-	octave 4
-	note D#, 1
-	note D#, 1
-	octave 5
-	note G#, 1
-	note G#, 1
-	note C_, 1
-	note C_, 1
-	note F_, 1
-	note F_, 1
-	octave 4
-	note G#, 1
-	note G#, 1
-	octave 5
-	note D_, 1
-	note D_, 1
-	octave 4
-	note D_, 1
-	note D_, 1
-	octave 5
-	note G#, 1
-	note G#, 1
-	octave 4
-	note G#, 1
-	note G#, 1
-	loopchannel 0, Music_WinTrainerSinnoh_Ch2_loop
-
-Music_WinTrainerSinnoh_Ch3:
-	notetype $C, $12
-	vibrato $0E, $25
-	octave 5
-	note A#, 1
-	notetype $4, $12
-	note __, 1
-	note A#, 3
-	note __, 1
-	note A#, 3
-	note __, 1
-	note A#, 3
-	note __, 1
-	octave 6
-	note C_, 4
-	note D_, 4
-	notetype $C, $12
-	note D#, 8
-Music_WinTrainerSinnoh_Ch3_loop:
-	octave 5
-	note D#, 4
-	octave 4
-	note A#, 2
-	octave 5
-	note D#, 2
-	note F_, 4
-	note C_, 2
-	note F_, 2
-	note G_, 4
-	note G#, 2
-	note A#, 2
-	note F_, 4
-	note G_, 2
-	note G#, 2
-	note D#, 3
-	octave 4
-	note A#, 3
-	octave 5
-	note D#, 2
-	note F_, 3
-	note C_, 3
-	note F_, 2
-	note G_, 3
-	note G#, 3
-	note A#, 2
-	note F#, 3
-	note G#, 3
-	note A#, 2
-	note D#, 2
-	octave 4
-	note A#, 2
-	octave 5
-	note D#, 2
-	octave 4
-	note A#, 2
-	octave 5
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F#, 2
-	note C#, 2
-	note F#, 2
-	note C#, 2
-	note G#, 2
-	note D#, 2
-	note G#, 2
-	note D#, 2
-	note G_, 16
-	note F_, 16
-	loopchannel 0, Music_WinTrainerSinnoh_Ch3_loop

crysaudio/music/DPPt/jubilifecity.asm

@@ -1,614 +0,0 @@
-Music_JubilifeCity::
-	dbw $C0, Music_JubilifeCity_Ch1
-	dbw $01, Music_JubilifeCity_Ch2
-	dbw $02, Music_JubilifeCity_Ch3
-	dbw $03, Music_JubilifeCity_Ch4
-
-Music_JubilifeCity_Ch1:
-	tempo 140
-	stereopanning $f
-	volume $77
-Music_JubilifeCity_Loop1:
-	notetype $4, 179
-	dutycycle 2
-	note __, 16
-	note __, 16
-	note __, 4
-	octave 3
-	note A_, 12
-	note D_, 12
-	octave 2
-	note A_, 12
-	octave 3
-	note D_, 4
-	note D_, 8
-	note A_, 16
-	note __, 16
-	note __, 16
-	note A_, 12
-	note C#, 12
-	octave 2
-	note A_, 12
-	octave 3
-	note C#, 4
-	note C#, 8
-	note F#, 16
-	note __, 4
-	note E_, 12
-	note G_, 12
-	note F#, 8
-	note D_, 16
-	note F#, 12
-	note B_, 8
-	note E_, 8
-	note A#, 16
-	note __, 16
-	note __, 16
-	note __, 8
-	octave 4
-	note B_, 4
-	note A_, 12
-	note G_, 12
-	note F#, 12
-	note E_, 12
-	note D_, 12
-	octave 3
-	note A_, 16
-	note __, 16
-	octave 4
-	note B_, 4
-	note A_, 12
-	note G_, 12
-	note F#, 12
-	octave 3
-	note D_, 4
-	note E_, 4
-	note F#, 4
-	note G_, 8
-	note D_, 8
-	octave 4
-	note D_, 8
-	octave 3
-	note G_, 8
-	note A_, 8
-	octave 4
-	note D_, 8
-	octave 3
-	note G_, 12
-	note D_, 12
-	octave 2
-	note A_, 12
-	octave 3
-	note C#, 16
-	note __, 8
-	intensity 181
-	note E_, 16
-	note __, 8
-	octave 2
-	note B_, 16
-	note __, 8
-	octave 3
-	note G_, 16
-	note __, 8
-	note G#, 12
-	note D#, 16
-	note __, 4
-	note D#, 16
-	note __, 16
-	note __, 8
-	note D#, 12
-	note G#, 12
-	note C_, 8
-	note D#, 16
-	note __, 8
-	note D#, 16
-	note __, 16
-	note __, 8
-	note D#, 12
-	note C#, 12
-	note F#, 8
-	note C#, 16
-	note D#, 12
-	note C_, 16
-	note __, 8
-	note D#, 8
-	note D#, 12
-	note C_, 16
-	note __, 16
-	note __, 8
-	octave 2
-	note G_, 8
-	note G_, 16
-	octave 3
-	note C_, 8
-	note C_, 12
-	note D#, 12
-	note D#, 4
-	note C_, 8
-	note C_, 16
-	note D#, 16
-	note __, 16
-	note __, 16
-	note A#, 8
-	note A#, 16
-	note D#, 16
-	note __, 8
-	note D_, 16
-	note __, 16
-	note __, 16
-	note __, 12
-	note A_, 16
-	note __, 8
-	note G_, 12
-	loopchannel 0, Music_JubilifeCity_Loop1
-Music_JubilifeCity_Ch2:
-	stereopanning $f0
-	vibrato $12, $23
-Music_JubilifeCity_Loop2:
-	notetype $4, 194
-	dutycycle 1
-	note __, 12
-	octave 4
-	note A_, 12
-	note D_, 16
-	note __, 8
-	note G_, 12
-	note F#, 12
-	note D_, 4
-	octave 3
-	note A_, 8
-	octave 4
-	note E_, 16
-	note __, 8
-	note A_, 12
-	note D_, 16
-	note __, 8
-	note E_, 12
-	note D_, 12
-	octave 3
-	note A_, 4
-	note F#, 8
-	note B_, 12
-	note A_, 8
-	octave 4
-	note D_, 12
-	note D_, 4
-	note E_, 8
-	note D_, 8
-	octave 3
-	note A_, 8
-	note A#, 8
-	note B_, 12
-	octave 4
-	note D_, 4
-	note E_, 4
-	octave 3
-	note A#, 8
-	octave 4
-	note G_, 12
-	note F#, 8
-	note D_, 16
-	octave 3
-	note G_, 4
-	note F#, 8
-	octave 4
-	note D_, 16
-	note __, 16
-	note __, 16
-	note __, 4
-	note D_, 4
-	note E_, 4
-	note F#, 12
-	note D_, 12
-	note G_, 4
-	note F#, 8
-	note D_, 8
-	octave 3
-	note A_, 4
-	octave 4
-	note D_, 12
-	octave 3
-	note A_, 12
-	octave 4
-	note D_, 12
-	note E_, 4
-	note F#, 4
-	note G_, 4
-	note A_, 8
-	note D_, 8
-	octave 3
-	note A_, 8
-	octave 4
-	note A_, 8
-	note D_, 8
-	octave 3
-	note A_, 8
-	octave 4
-	note D_, 16
-	note __, 8
-	note E_, 8
-	note E_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	intensity 198
-	note C#, 16
-	note __, 8
-	octave 3
-	note B_, 16
-	note __, 8
-	octave 4
-	note C#, 16
-	note __, 8
-	note D_, 16
-	note __, 16
-	note __, 4
-	note F_, 12
-	note D#, 12
-	note F_, 4
-	note D#, 4
-	note G#, 4
-	note A#, 8
-	note A#, 8
-	note G#, 16
-	note D#, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note C_, 4
-	note C#, 4
-	note __, 12
-	note F_, 12
-	note D#, 12
-	note F_, 4
-	note D#, 4
-	note G#, 4
-	note A#, 8
-	note A#, 8
-	note G#, 16
-	note D#, 4
-	note C_, 4
-	note C#, 4
-	note D_, 4
-	note D#, 8
-	note D#, 12
-	octave 3
-	note G#, 4
-	note G#, 16
-	octave 4
-	note C_, 4
-	note C#, 4
-	note F_, 8
-	note D#, 12
-	octave 3
-	note G#, 4
-	note G#, 8
-	octave 4
-	note C_, 8
-	note C#, 8
-	note D#, 16
-	note C_, 4
-	note D#, 4
-	note G#, 16
-	note __, 8
-	note A#, 16
-	note C_, 4
-	note D#, 4
-	note A#, 12
-	note G#, 12
-	note G_, 8
-	note G#, 12
-	note G#, 12
-	note G_, 8
-	note G#, 4
-	note A#, 4
-	octave 5
-	note C_, 12
-	octave 4
-	note G_, 8
-	note G#, 8
-	note G_, 8
-	note G#, 4
-	note A#, 8
-	note G_, 16
-	note __, 4
-	note C_, 4
-	note C_, 16
-	note __, 8
-	note D_, 4
-	note __, 4
-	note E_, 4
-	note __, 8
-	note F#, 4
-	note __, 8
-	note G_, 4
-	note __, 12
-	loopchannel 0, Music_JubilifeCity_Loop2
-Music_JubilifeCity_Ch3:
-	stereopanning $ff
-	vibrato $8, $23
-	notetype $4, $20
-Music_JubilifeCity_Loop3:
-	octave 3
-	note G_, 16
-	note G_, 4
-	note G_, 16
-	note G_, 16
-	note G_, 8
-	note G_, 16
-	note G_, 8
-	note G_, 12
-	note F#, 16
-	note F#, 4
-	note F#, 16
-	note F#, 16
-	note F#, 8
-	note F#, 16
-	note F#, 8
-	note F#, 12
-	note E_, 8
-	note E_, 16
-	note F#, 8
-	note F#, 16
-	note B_, 8
-	note B_, 16
-	note A#, 8
-	note A#, 16
-	note G_, 12
-	note G_, 4
-	note D_, 8
-	note G_, 8
-	note G_, 16
-	note G_, 12
-	note G_, 4
-	note D_, 8
-	note G_, 8
-	note G_, 16
-	note F#, 12
-	note F#, 4
-	note C#, 8
-	note F#, 8
-	note F#, 16
-	note B_, 8
-	note B_, 16
-	note A#, 8
-	note A#, 16
-	note G_, 8
-	note G_, 8
-	note D_, 8
-	note G_, 8
-	note G_, 8
-	note B_, 8
-	note G_, 8
-	note G_, 12
-	note G_, 4
-	note A_, 8
-	note A_, 12
-	note A_, 4
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note A_, 12
-	note A_, 12
-	note A#, 12
-	note A#, 12
-	note C#, 16
-	note C#, 4
-	note C#, 16
-	note C#, 16
-	note C#, 16
-	note C#, 16
-	note C#, 12
-	note C_, 16
-	note C_, 4
-	note C_, 16
-	note C_, 12
-	note F_, 8
-	note F_, 16
-	note D#, 8
-	note D#, 16
-	note C#, 12
-	note C#, 12
-	note F_, 12
-	note G#, 12
-	note C#, 12
-	note F_, 12
-	note G#, 12
-	note F_, 12
-	note C_, 8
-	note C_, 16
-	note D#, 8
-	note D#, 16
-	note F_, 8
-	note F_, 16
-	note D#, 8
-	note D#, 16
-	note C#, 16
-	note C#, 16
-	note C#, 16
-	note C_, 16
-	note C_, 8
-	note F_, 16
-	note F_, 8
-	octave 4
-	note C_, 16
-	note C_, 16
-	note C_, 16
-	octave 3
-	note B_, 12
-	note B_, 12
-	note A_, 12
-	note A_, 12
-	loopchannel 0, Music_JubilifeCity_Loop3
-Music_JubilifeCity_Ch4:
-	notetype $4
-	togglenoise 3
-Music_JubilifeCity_Loop4:
-	note B_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 4
-	note B_, 8
-	note G#, 8
-	note G_, 4
-	note B_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 4
-	note B_, 8
-	note G#, 8
-	note G_, 4
-	note B_, 8
-	note G_, 8
-	note G_, 8
-	note B_, 8
-	note G_, 8
-	note G_, 8
-	note B_, 12
-	note G#, 8
-	note G_, 4
-	note G#, 12
-	note G#, 8
-	note G_, 4
-	note B_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 4
-	note B_, 8
-	note G#, 8
-	note G_, 4
-	note B_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 12
-	note G_, 8
-	note G#, 4
-	note G_, 4
-	note B_, 8
-	note G#, 8
-	note G_, 4
-	note G#, 8
-	note G_, 4
-	note B_, 12
-	note G#, 8
-	note G_, 4
-	note B_, 12
-	note B_, 12
-	note G#, 8
-	note G_, 4
-	note G#, 12
-	note G#, 8
-	note G_, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note G_, 4
-	note C#, 4
-	note D#, 4
-	note G_, 4
-	note C#, 4
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 8
-	note C#, 4
-	note G_, 4
-	note C#, 4
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 8
-	note C#, 4
-	note G_, 4
-	note C#, 4
-	note D#, 4
-	note D#, 8
-	note D#, 4
-	note C#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note D#, 8
-	note D#, 4
-	note C#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note D#, 8
-	note D#, 4
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note D#, 8
-	note D#, 4
-	note C#, 8
-	note C#, 4
-	note D#, 12
-	note C#, 8
-	note C#, 4
-	note B_, 12
-	note C#, 12
-	note G#, 12
-	note C#, 12
-	note G#, 12
-	note C#, 12
-	note G#, 12
-	note C#, 12
-	note D#, 12
-	note D#, 12
-	note D#, 12
-	note D#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	note D#, 12
-	note C#, 8
-	note D#, 4
-	loopchannel 0, Music_JubilifeCity_Loop4

crysaudio/music/DPPt/pokeradar.asm

@@ -1,209 +0,0 @@
-Music_PokeRadar::
-	dbw $80, Music_PokeRadar_Ch1
-	dbw $01, Music_PokeRadar_Ch2
-	dbw $02, Music_PokeRadar_Ch3
-
-Music_PokeRadar_Ch1:
-	tempo $68
-	volume $77
-	tone $0001
-	notetype $6, $91
-	dutycycle 2
-	octave 5
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 9
-Music_PokeRadar_Loop1:
-	notetype $C, $82
-	octave 3
-	note A#, 6
-	octave 4
-	note G#, 10
-	octave 3
-	note A#, 2
-	octave 4
-	note G#, 4
-	note F_, 2
-	intensity $86
-	note C#, 12
-	note D_, 6
-	note D#, 6
-	octave 3
-	note A#, 6
-	intensity $82
-	octave 4
-	note G#, 10
-	octave 3
-	note A#, 2
-	octave 4
-	note G#, 4
-	note F_, 2
-	intensity $86
-	note D_, 12
-	note C#, 6
-	note E_, 6
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 12
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note C#, 12
-	note D#, 4
-	note D_, 4
-	note C#, 4
-	note C_, 12
-	intensity $82
-	octave 3
-	note B_, 4
-	intensity $72
-	note B_, 4
-	intensity $62
-	note B_, 4
-	intensity $52
-	note B_, 4
-	intensity $42
-	note B_, 4
-	intensity $32
-	note B_, 14
-	note __, 14
-	loopchannel 0, Music_PokeRadar_Loop1
-Music_PokeRadar_Ch2:
-	notetype $6, $C1
-	dutycycle 2
-	octave 6
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	notetype $C, $C2
-	note F_, 4
-Music_PokeRadar_Loop2:
-	intensity $C2
-	dutycycle 1
-	octave 3
-	note A#, 6
-	octave 4
-	note G#, 10
-	octave 3
-	note A#, 2
-	octave 4
-	note G#, 4
-	note F_, 2
-	intensity $C7
-	note C#, 12
-	note D_, 6
-	note D#, 6
-	octave 3
-	note A#, 6
-	intensity $C2
-	octave 4
-	note G#, 10
-	octave 3
-	note A#, 2
-	octave 4
-	note G#, 4
-	note F_, 2
-	intensity $C7
-	note D_, 12
-	note C#, 6
-	note E_, 6
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 12
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note C#, 12
-	note D#, 4
-	note D_, 4
-	note C#, 4
-	note C_, 12
-	octave 3
-	note B_, 16
-	note __, 16
-	note __, 16
-	loopchannel 0, Music_PokeRadar_Loop2
-Music_PokeRadar_Ch3:
-	notetype $C, $10
-	note __, 6
-Music_PokeRadar_Loop3:
-	octave 2
-	note A#, 6
-	octave 3
-	note G#, 4
-	octave 2
-	note A_, 1
-	note __, 1
-	note A#, 2
-	note __, 2
-	note A#, 2
-	octave 3
-	note G#, 2
-	note __, 4
-	octave 2
-	note A#, 2
-	note __, 2
-	note A#, 2
-	note __, 2
-	intensity $20
-	note A#, 2
-	note __, 2
-	note A#, 2
-	note __, 2
-	intensity $30
-	note A#, 2
-	intensity $10
-	note F_, 6
-	note A#, 6
-	note F_, 2
-	note G#, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note A#, 10
-	note __, 2
-	note A#, 2
-	note __, 2
-	note A#, 2
-	note __, 2
-	intensity $20
-	note A#, 2
-	note __, 2
-	note A#, 2
-	note __, 2
-	intensity $30
-	note A#, 2
-	intensity $10
-	note F_, 4
-	octave 3
-	note C_, 2
-	octave 2
-	note F_, 10
-	octave 3
-	note C#, 1
-	note __, 1
-	note D_, 12
-	octave 2
-	note E_, 10
-	octave 3
-	note C_, 1
-	note __, 1
-	note C#, 12
-	octave 2
-	note D#, 10
-	note B_, 1
-	note __, 1
-	octave 3
-	note C_, 12
-	octave 2
-	note D#, 2
-	note __, 8
-	note D#, 12
-	note __, 12
-	note __, 14
-	loopchannel 0, Music_PokeRadar_Loop3

crysaudio/music/DPPt/route201.asm

@@ -1,381 +0,0 @@
-Music_Route201::
-	dbw $80, Music_Route201_Ch1
-	dbw $01, Music_Route201_Ch2
-	dbw $02, Music_Route201_Ch3
-
-Music_Route201_Ch1:
-	tempo $A4
-	volume $77
-	notetype $C, $A2
-	dutycycle 1
-	octave 2
-	note __, 4
-	octave 3
-	note E_, 2
-	octave 2
-	note G_, 6
-	octave 3
-	note F_, 2
-	octave 2
-	note A_, 6
-Music_Route201_Ch1_loop:
-	octave 3
-	note G_, 2
-	octave 2
-	note B_, 6
-	octave 3
-	note F_, 2
-	octave 2
-	note A_, 6
-	octave 3
-	note E_, 2
-	octave 2
-	note G_, 6
-	octave 3
-	note E_, 2
-	octave 2
-	note G_, 6
-	octave 3
-	note F_, 2
-	octave 2
-	note A_, 6
-	octave 3
-	note E_, 2
-	octave 2
-	note G_, 4
-	note A_, 2
-	octave 3
-	note F_, 2
-	octave 2
-	note A_, 4
-	note G_, 2
-	octave 3
-	note E_, 2
-	octave 2
-	note G_, 4
-	note A_, 2
-	octave 3
-	note F_, 2
-	note F#, 4
-	octave 2
-	note G_, 2
-	octave 3
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note G_, 2
-	octave 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note G_, 2
-	octave 3
-	note E_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note G_, 2
-	octave 3
-	note E_, 2
-	note C_, 2
-	note C_, 6
-	note E_, 6
-	note D_, 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	octave 2
-	note G_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note E_, 4
-	octave 3
-	note C_, 2
-	note C_, 6
-	note E_, 6
-	note D_, 4
-	note C_, 2
-	octave 2
-	note C_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note G_, 2
-	note B_, 2
-	octave 3
-	note C_, 4
-	note E_, 2
-	octave 2
-	note G_, 6
-	octave 3
-	note F_, 2
-	octave 2
-	note A_, 6
-	loopchannel 0, Music_Route201_Ch1_loop
-
-Music_Route201_Ch2:
-	notetype $C, $B1
-	octave 4
-	note __, 16
-Music_Route201_Ch2_loop:
-	notetype $C, $B1
-	dutycycle 2
-	octave 4
-	note __, 15
-	notetype $6, $B1
-	note E_, 1
-	note F_, 1
-	note G_, 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note C_, 4
-	octave 3
-	note G_, 8
-	note A_, 4
-	note G_, 4
-	note A_, 4
-	note B_, 4
-	octave 4
-	note C_, 4
-	note G_, 10
-	note F_, 1
-	note G_, 1
-	note A_, 4
-	note G_, 4
-	note A_, 4
-	note B_, 4
-	octave 5
-	note C_, 4
-	octave 4
-	note G_, 12
-	note F_, 4
-	note E_, 4
-	note D_, 4
-	note C_, 4
-	note A_, 8
-	note G_, 2
-	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 8
-	note C_, 8
-	note C_, 8
-	note C_, 8
-	note G_, 4
-	note F_, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note C_, 4
-	octave 2
-	note G_, 4
-	octave 3
-	note D_, 4
-	note C_, 8
-	note C_, 8
-	note C_, 8
-	note C_, 8
-	octave 2
-	note G_, 4
-	octave 3
-	note D_, 4
-	note E_, 4
-	note D_, 8
-	note C_, 10
-	intensity $98
-	dutycycle 0
-	vibrato $00, $15
-	octave 4
-	note E_, 1
-	note F_, 1
-	note G_, 12
-	octave 5
-	note C_, 12
-	octave 4
-	note B_, 8
-	note A_, 4
-	note G_, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note C_, 8
-	note A_, 4
-	note G_, 12
-	octave 5
-	note C_, 12
-	octave 4
-	note B_, 8
-	note A_, 4
-	note G_, 4
-	note E_, 4
-	note C_, 8
-	octave 3
-	note G_, 4
-	octave 4
-	note D_, 4
-	note C_, 16
-	intensity $A3
-	note C_, 4
-	note __, 16
-	loopchannel 0, Music_Route201_Ch2_loop
-
-Music_Route201_Ch3:
-	notetype $C, $10
-	octave 3
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-Music_Route201_Ch3_loop:
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	octave 2
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 5
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note F_, 1
-	note __, 1
-	note F_, 1
-	note __, 5
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note __, 5
-	note F_, 1
-	note __, 3
-	note F_, 1
-	note __, 3
-	note C_, 1
-	note __, 3
-	note C_, 1
-	note __, 3
-	note G_, 1
-	note __, 5
-	note G_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note F_, 1
-	note __, 3
-	note F_, 1
-	note __, 3
-	note C_, 1
-	note __, 3
-	note C_, 1
-	note __, 3
-	note G_, 1
-	note __, 5
-	note G_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note F_, 5
-	note __, 1
-	note F_, 2
-	note G_, 1
-	note __, 1
-	note G_, 3
-	note __, 1
-	note G_, 2
-	note E_, 5
-	note __, 1
-	note E_, 2
-	note C_, 1
-	note __, 1
-	note C_, 4
-	note E_, 2
-	note F_, 5
-	note __, 1
-	note F_, 2
-	note C_, 1
-	note __, 1
-	note C_, 3
-	note __, 1
-	note C_, 2
-	note F_, 5
-	note __, 1
-	note F_, 2
-	note G_, 1
-	note __, 1
-	note G_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	octave 3
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 5
-	loopchannel 0, Music_Route201_Ch3_loop

crysaudio/music/DPPt/route206.asm

@@ -1,984 +0,0 @@
-Music_Route206::
-	dbw $C0, Music_Route206_Ch1
-	dbw $01, Music_Route206_Ch2
-	dbw $02, Music_Route206_Ch3
-	dbw $03, Music_Route206_Ch4
-
-Music_Route206_Ch1:
-	tempo $A0
-	volume $77
-	notetype $4, $71
-	dutycycle 2
-	tone $0001
-	vibrato $10, $15
-	octave 2
-	note __, 2
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 2
-	intensity $A6
-	dutycycle 3
-	octave 3
-	note C#, 16
-	octave 2
-	note A_, 4
-	octave 3
-	note C#, 4
-	note D#, 16
-	octave 2
-	note B_, 4
-	octave 3
-	note D#, 4
-	note E_, 16
-	note C_, 4
-	note E_, 4
-	note F#, 16
-	note D_, 4
-	note F#, 4
-	note G#, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note E_, 4
-	octave 2
-	note B_, 12
-	octave 3
-	note G_, 12
-	octave 2
-	note B_, 4
-	octave 3
-	note E_, 4
-	note G_, 4
-	note E_, 14
-	intensity $81
-	dutycycle 2
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 2
-Music_Route206_Ch1_loop:
-	note __, 12
-	intensity $A4
-	dutycycle 3
-	octave 4
-	note D#, 12
-	note F#, 12
-	octave 5
-	note C#, 12
-	octave 4
-	note B_, 12
-	octave 5
-	note E_, 12
-	intensity $A6
-	octave 4
-	note B_, 16
-	note __, 16
-	note __, 4
-	intensity $A4
-	note E_, 12
-	note A_, 12
-	octave 5
-	note C#, 12
-	octave 4
-	note B_, 12
-	octave 5
-	note E_, 12
-	intensity $A6
-	octave 4
-	note B_, 16
-	note __, 16
-	note __, 4
-	intensity $A4
-	note D#, 4
-	note F#, 4
-	note A_, 4
-	octave 5
-	note C_, 8
-	note C_, 8
-	octave 4
-	note G#, 16
-	note __, 4
-	note C#, 4
-	note E_, 4
-	note G_, 4
-	note A#, 8
-	octave 5
-	note C#, 8
-	octave 4
-	note F#, 8
-	octave 2
-	note E_, 4
-	note A_, 4
-	octave 3
-	note C#, 4
-	octave 2
-	note A_, 4
-	octave 3
-	note C#, 4
-	note E_, 4
-	octave 4
-	note A_, 8
-	note B_, 8
-	octave 5
-	note F#, 8
-	intensity $A1
-	octave 2
-	note F#, 2
-	note B_, 2
-	octave 3
-	note C#, 2
-	note E_, 2
-	note C#, 2
-	octave 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	octave 3
-	note C#, 2
-	note F#, 2
-	note B_, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	octave 4
-	note C#, 2
-	note E_, 2
-	note F#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note E_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	octave 5
-	note D#, 2
-	dutycycle 2
-	octave 3
-	note B_, 2
-	note G_, 2
-	note E_, 2
-	note C_, 2
-	octave 2
-	note G_, 2
-	octave 3
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	octave 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	octave 3
-	note C_, 2
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	octave 5
-	note D_, 2
-	note F#, 2
-	note G#, 2
-	note E_, 2
-	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	octave 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	octave 3
-	note E_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note E_, 2
-	note F#, 2
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	octave 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	note E_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	octave 5
-	note D#, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	octave 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	octave 3
-	note E_, 2
-	note G#, 2
-	intensity $A6
-	dutycycle 3
-	octave 2
-	note A_, 12
-	note B_, 12
-	octave 3
-	note E_, 12
-	octave 2
-	note B_, 12
-	note G_, 12
-	note A_, 12
-	note B_, 12
-	octave 3
-	note C_, 12
-	octave 2
-	note B_, 16
-	note __, 16
-	note __, 16
-	note __, 14
-	intensity $81
-	dutycycle 2
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 2
-	loopchannel 0, Music_Route206_Ch1_loop
-
-Music_Route206_Ch2:
-	notetype $4, $91
-	dutycycle 2
-	vibrato $12, $36
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 4
-	dutycycle 3
-	octave 4
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	intensity $B4
-	note E_, 4
-	octave 3
-	note E_, 4
-	note B_, 4
-	octave 4
-	note E_, 4
-	note F#, 8
-	octave 3
-	note B_, 8
-	octave 4
-	note F#, 8
-	intensity $B1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	intensity $B4
-	note G_, 4
-	octave 3
-	note G_, 4
-	octave 4
-	note C_, 4
-	note G_, 4
-	note A_, 8
-	note D_, 8
-	note A_, 8
-	note B_, 4
-	note B_, 4
-	octave 5
-	note E_, 1
-	note F#, 1
-	note E_, 6
-	octave 4
-	note E_, 8
-	note G_, 4
-	note G_, 4
-	octave 5
-	note E_, 1
-	note F#, 1
-	note E_, 6
-	octave 3
-	note B_, 4
-	octave 4
-	note G_, 4
-	note G#, 12
-	intensity $91
-	dutycycle 2
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 4
-Music_Route206_Ch2_loop:
-	intensity $A5
-	dutycycle 3
-	octave 3
-	note B_, 16
-	note D#, 4
-	octave 4
-	note C#, 4
-	octave 3
-	note B_, 8
-	octave 4
-	note C#, 8
-	note D#, 8
-	note F#, 16
-	note E_, 4
-	octave 3
-	note B_, 4
-	note G#, 16
-	note __, 8
-	octave 4
-	note C#, 16
-	octave 3
-	note A_, 4
-	octave 4
-	note E_, 4
-	note D#, 8
-	note E_, 8
-	note F#, 8
-	note A_, 16
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 16
-	note __, 8
-	octave 4
-	note D#, 8
-	note F#, 8
-	note A_, 8
-	note G#, 4
-	note D#, 4
-	note C_, 4
-	octave 3
-	note G#, 12
-	octave 4
-	note C#, 8
-	note E_, 8
-	note G_, 8
-	note F#, 4
-	note C#, 4
-	octave 3
-	note A#, 4
-	note F#, 8
-	note G#, 4
-	note A_, 16
-	note C#, 4
-	note E_, 4
-	note A_, 8
-	note B_, 8
-	octave 4
-	note F#, 8
-	intensity $B7
-	note B_, 16
-	intensity $4D
-	note B_, 16
-	intensity $B8
-	note B_, 16
-	dutycycle 2
-	octave 3
-	note E_, 16
-	note E_, 8
-	note F#, 16
-	note F#, 8
-	note G#, 8
-	note E_, 4
-	octave 2
-	note B_, 16
-	note B_, 16
-	octave 3
-	note B_, 4
-	octave 4
-	note E_, 4
-	note E_, 16
-	note E_, 4
-	note F#, 4
-	note F#, 12
-	note E_, 4
-	note F#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 16
-	note B_, 8
-	note B_, 12
-	intensity $B4
-	octave 4
-	note E_, 8
-	note E_, 16
-	note __, 12
-	note E_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note G_, 4
-	octave 4
-	note E_, 4
-	note F#, 4
-	octave 3
-	note A_, 4
-	octave 4
-	note F#, 4
-	note G_, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note G_, 4
-	note C_, 4
-	note A_, 4
-	octave 5
-	note C_, 4
-	notetype $1, $B1
-	forceoctave 27
-	note C_, 4
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 4
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 4
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 4
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 4
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 4
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 4
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 4
-	note C_, 5
-	note D_, 5
-	note C_, 5
-	note D_, 5
-	notetype $4, $B7
-	forceoctave 28
-	octave 4
-	note B_, 12
-	intensity $91
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	octave 2
-	note B_, 4
-	loopchannel 0, Music_Route206_Ch2_loop
-
-Music_Route206_Ch3:
-	notetype $4, $12
-	octave 2
-	note __, 16
-	note __, 16
-	note __, 4
-	note A_, 8
-	note E_, 4
-	note A_, 4
-	note C#, 4
-	note E_, 4
-	note B_, 8
-	note F#, 4
-	note B_, 4
-	note D#, 4
-	note F#, 4
-	octave 3
-	note C_, 8
-	octave 2
-	note G_, 4
-	octave 3
-	note C_, 4
-	octave 2
-	note E_, 4
-	note G_, 4
-	octave 3
-	note D_, 8
-	octave 2
-	note A_, 4
-	octave 3
-	note D_, 4
-	octave 2
-	note F#, 4
-	note A_, 4
-	note E_, 4
-	note B_, 4
-	octave 3
-	note F#, 4
-	note E_, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note E_, 4
-	octave 2
-	note E_, 4
-	octave 3
-	note F#, 4
-	note E_, 4
-	octave 2
-	note B_, 4
-	note G_, 4
-	octave 3
-	note E_, 4
-	octave 2
-	note E_, 4
-	note B_, 4
-	octave 3
-	note E_, 4
-	octave 2
-	note B_, 8
-	note B_, 4
-	octave 3
-	note E_, 12
-	octave 2
-	note G#, 12
-Music_Route206_Ch3_loop:
-	note B_, 12
-	octave 1
-	note B_, 4
-	octave 2
-	note F#, 4
-	note A_, 4
-	note B_, 12
-	octave 1
-	note B_, 12
-	octave 2
-	note E_, 12
-	octave 1
-	note B_, 4
-	octave 2
-	note E_, 4
-	note G#, 4
-	note B_, 12
-	note E_, 12
-	note A_, 12
-	note C#, 4
-	note E_, 4
-	note A_, 4
-	note B_, 12
-	octave 1
-	note B_, 12
-	octave 2
-	note E_, 12
-	octave 1
-	note B_, 4
-	octave 2
-	note E_, 4
-	note A_, 4
-	note G#, 12
-	note E_, 12
-	note D#, 12
-	note C_, 4
-	note D#, 4
-	note F#, 4
-	note G#, 12
-	note F#, 4
-	note D#, 4
-	note C_, 4
-	note C#, 12
-	note E_, 4
-	note G_, 4
-	octave 3
-	note C#, 4
-	octave 2
-	note A#, 12
-	note F#, 4
-	note C#, 4
-	note F#, 4
-	octave 3
-	note C#, 12
-	octave 2
-	note E_, 12
-	note A_, 12
-	octave 3
-	note C#, 12
-	octave 2
-	note B_, 16
-	note B_, 8
-	octave 3
-	note E_, 12
-	note F#, 12
-	octave 2
-	note C_, 16
-	note C_, 4
-	note C_, 4
-	note D_, 16
-	note D_, 4
-	note D_, 4
-	note E_, 16
-	note E_, 16
-	note E_, 4
-	note E_, 12
-	note A_, 12
-	note A_, 12
-	note B_, 12
-	note B_, 12
-	note E_, 12
-	note E_, 12
-	note G#, 12
-	note G#, 12
-	note A_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
-	note A_, 4
-	note E_, 4
-	octave 3
-	note C#, 4
-	octave 2
-	note A_, 4
-	note E_, 4
-	note C#, 4
-	note E_, 4
-	note A_, 4
-	note G_, 4
-	note C_, 4
-	note G_, 4
-	note A_, 4
-	note C_, 4
-	note A_, 4
-	note B_, 4
-	note D_, 4
-	note B_, 4
-	octave 3
-	note C_, 4
-	octave 2
-	note G_, 4
-	octave 3
-	note C_, 4
-	octave 1
-	note B_, 4
-	note B_, 4
-	octave 2
-	note F#, 4
-	octave 1
-	note B_, 4
-	note B_, 4
-	octave 2
-	note F#, 4
-	octave 1
-	note B_, 4
-	note B_, 4
-	octave 2
-	note F#, 4
-	octave 1
-	note B_, 4
-	note B_, 4
-	octave 2
-	note F#, 4
-	octave 1
-	note B_, 4
-	octave 2
-	note F#, 4
-	note A_, 4
-	note B_, 4
-	note F#, 4
-	note B_, 4
-	octave 3
-	note E_, 12
-	octave 2
-	note G#, 12
-	loopchannel 0, Music_Route206_Ch3_loop
-
-Music_Route206_Ch4:
-	togglenoise 0
-	notetype $4
-	note __, 16
-	note __, 16
-	note __, 16
-	note C_, 4
-	note D#, 2
-	note D#, 2
-	note D#, 16
-	note G#, 16
-	note __, 8
-	note C_, 2
-	note D#, 2
-	note D#, 4
-	note D#, 16
-	note G#, 12
-	note C_, 4
-	note D#, 2
-	note D#, 2
-	note D#, 4
-	note G#, 12
-	note C_, 4
-	note D#, 2
-	note D#, 2
-	note D#, 4
-	note G#, 12
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note G#, 16
-Music_Route206_Ch4_loop:
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 4
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note C_, 4
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 8
-	note D#, 4
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note C_, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note G#, 4
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note D#, 2
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note G#, 4
-	note D#, 4
-	note D#, 4
-	note G#, 4
-	note D#, 4
-	note D#, 4
-	note G#, 4
-	note D#, 4
-	note D#, 4
-	note G#, 4
-	note D#, 4
-	note D#, 4
-	note G#, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 4
-	note D#, 4
-	note D#, 4
-	note C_, 12
-	note G#, 16
-	loopchannel 0, Music_Route206_Ch4_loop

crysaudio/music/RBY/defeatedgymleader.asm

@@ -4,7 +4,7 @@ Music_DefeatedGymLeader:
 	dbw $02, Music_DefeatedGymLeader_Ch3
 
 Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad)
-	ftempo 112
+	tempo 112
 	volume 119
 	dutycycle 3
 	vibrato 18, 49

crysaudio/music/RBY/defeatedtrainer.asm

@@ -4,7 +4,7 @@ Music_DefeatedTrainer:
 	dbw $02, Music_DefeatedTrainer_Ch3
 
 Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
-	ftempo 224
+	tempo 224
 	volume 119
 	dutycycle 2
 	notetype 4, 162

crysaudio/music/RBY/defeatedwildmon.asm

@@ -4,7 +4,7 @@ Music_DefeatedWildMon:
 	dbw $02, Music_DefeatedWildMon_Ch3
 
 Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74)
-	ftempo 112
+	tempo 112
 	volume 119
 	dutycycle 3
 	vibrato 6, 52

crysaudio/music/RBY/finalbattle.asm

@@ -4,7 +4,7 @@ Music_FinalBattle:
 	dbw $02, Music_FinalBattle_Ch3
 
 Music_FinalBattle_Ch1: 
-	ftempo 112
+	tempo 112
 	volume 119
 	dutycycle 3
 	vibrato $6, $34

crysaudio/music/RBY/gymleaderbattle.asm

@@ -4,7 +4,7 @@ Music_GymLeaderBattle:
 	dbw $02, Music_GymLeaderBattle_Ch3
 
 Music_GymLeaderBattle_Ch1: 
-	ftempo 104
+	tempo 104
 	volume 119
 	dutycycle 3
 	vibrato $8, $34

crysaudio/music/RBY/introbattle.asm

@@ -5,7 +5,7 @@ Music_IntroBattle:
 	dbw $03, Music_IntroBattle_Ch4
 
 Music_IntroBattle_Ch1: ; 7f844 (1f:7844)
-	ftempo 98
+	tempo 98
 	volume 119
 	dutycycle 3
 	vibrato 6, 52

crysaudio/music/RBY/jigglypuffsong.asm

@@ -3,11 +3,11 @@ Music_JigglypuffSong:
 	dbw $01, Music_JigglypuffSong_Ch2
 
 Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
-	ftempo 144
+	tempo 144
 	volume 119
 	vibrato 8, 36
 	dutycycle 2
-	unknownmusic0xde 165
+	sound_duty 165
 	
 	notetype 13, 103
 	octave 4
@@ -28,7 +28,7 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
 Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a)
 	vibrato 5, 21
 	dutycycle 2
-	unknownmusic0xde 10
+	sound_duty 10
 	notetype 12, 167
 	octave 4
 	note E_, 8

crysaudio/music/RBY/lavender.asm

@@ -90,7 +90,7 @@ Music_Lavender_Ch3: ; bbae (2:7bae)
 	note __, 16
 	note __, 16
 	notetype 12, $2f
-	db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $EA, $10, $14, $DC, $10, $E3, $41, $51, $73
+	load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3
 Music_Lavender_branch_bbb9:
 	octave 4
 	note E_, 16

crysaudio/music/RBY/pkmnhealed.asm

@@ -4,28 +4,28 @@ Music_PkmnHealed:
 	dbw $02, Music_PkmnHealed_Ch3
 
 Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3)
-	ftempo 144
+	tempo 144
 	volume 119
-	fdutycycle 2
+	dutycycle 2
 	
 	notetype 12, 129
 	note __, 2
-	unknownmusic0xe0 0, $4C
+	slidepitchto 1, 4, B_
 	note B_, 2
-	unknownmusic0xe0 0, $55
+	slidepitchto 1, 5, E_
 	note B_, 2
-	unknownmusic0xe0 0, $45
+	slidepitchto 1, 4, E_
 	note E_, 2
 	note __, 4
-	unknownmusic0xe0 0, $3C
+	slidepitchto 1, 3, B_
 	note E_, 4
-	unknownmusic0xe0 0, $4C
+	slidepitchto 1, 4, B_
 	note B_, 4
 	endchannel
 
 
 Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4)
-	fdutycycle 2
+	dutycycle 2
 	notetype 12, 195
 	octave 4
 	note B_, 4

crysaudio/music/RBY/pokemontower.asm

@@ -408,7 +408,7 @@ Music_PokemonTower_branch_7f1a2:
 	note G_, 1
 	note __, 15
 	notetype 12, $1f
-	db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $22, $F7, $24, $22, $F7, $34, $24, $F7, $44
+	load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 2, 2, 15, 7, 2, 4, 2, 2, 15, 7, 3, 4, 2, 4, 15, 7, 4, 4
 	octave 4
 	note F#, 1
 	note __, 3

crysaudio/music/RBY/safarizone.asm

@@ -4,20 +4,20 @@ Music_SafariZone:
 	dbw $02, Music_SafariZone_Ch3
 
 Music_SafariZone_Ch1: ; bc2e (2:7c2e)
-	ftempo 132
+	tempo 132
 	volume 119
 	vibrato 6, 52
 	
 	dutycycle 2
 	notetype 12, 146
 	octave 3
-	unknownmusic0xe0 0, $4A
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 0, $4A
+	slidepitchto 1, 4, A_
 	note G_, 1
-	unknownmusic0xe0 0, $4A
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 0, $4A
+	slidepitchto 1, 4, A_
 	note G_, 1
 	note __, 4
 	dutycycle 3

crysaudio/music/RBY/titlescreen.asm

@@ -5,7 +5,7 @@ Music_RBYTitleScreen:
 	dbw $03, Music_RBYTitleScreen_Ch4
 
 Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0)
-	ftempo 144
+	tempo 144
 	volume 119
 	vibrato 9, 52
 	dutycycle 3

crysaudio/music/RBY/trainerbattle.asm

@@ -4,7 +4,7 @@ Music_TrainerBattle:
 	dbw $02, Music_TrainerBattle_Ch3
 
 Music_TrainerBattle_Ch1: 
-	ftempo 112
+	tempo 112
 	volume 119
 	dutycycle 3
 	vibrato $6, $34

crysaudio/music/RBY/wildbattle.asm

@@ -4,7 +4,7 @@ Music_WildBattle:
 	dbw $02, Music_WildBattle_Ch3
 
 Music_WildBattle_Ch1: 
-	ftempo 104
+	tempo 104
 	volume 119
 	dutycycle 3
 	vibrato $6, $34

crysaudio/music/RBY/yellowintro.asm

@@ -4,7 +4,7 @@ Music_YellowIntro:
 	dbw $02, Music_YellowIntro_Ch3
 
 Music_YellowIntro_Ch1: 
-	ftempo 116
+	tempo 116
 	volume 119
 	dutycycle 3
 	vibrato $8, $14

crysaudio/music/RBY/yellowunusedsong.asm

@@ -5,7 +5,7 @@ Music_YellowUnusedSong:
 	dbw $03, Music_YellowUnusedSong_Ch4
 
 Music_YellowUnusedSong_Ch1: 
-	ftempo 140
+	tempo 140
 	volume 119
 	dutycycle 3
 	vibrato $8, $14

crysaudio/music/TCG2/credits.asm

@@ -3035,7 +3035,7 @@ Music_TCG2Credits_Ch1:
 
 Music_TCG2Credits_Ch3: 
 	notetype1 10
-	db $f3, $cc, $cc, $cc, $cc, $bc, $cc, $bc, $cc, $c0, $00, $00, $00, $00, $00, $00, $0b
+	load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11
 	notetype0 1
 	notetype1 1
 	octave 5

crysaudio/music/TCG2/diddly1.asm

@@ -168,7 +168,7 @@ Music_TCG2Diddly1_Ch1:
 
 Music_TCG2Diddly1_Ch3: 
 	notetype1 10
-	notetype2 15
+	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	notetype0 1
 	octave 2
 	notetype1 1

crysaudio/music/TCG2/diddly3.asm

@@ -45,7 +45,7 @@ Music_TCG2Diddly3_Ch1:
 
 Music_TCG2Diddly3_Ch3: 
 	notetype1 10
-	notetype2 15
+	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	notetype0 1
 	notetype1 2
 	notetype0 1

crysaudio/music/TCG2/diddly6.asm

@@ -192,7 +192,7 @@ Music_TCG2Diddly6_Ch1:
 
 Music_TCG2Diddly6_Ch3: 
 	notetype1 10
-	notetype2 15
+	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	notetype1 1
 	notetype0 1
 	note __, 10

crysaudio/music/TCG2/fort2.asm

@@ -821,7 +821,7 @@ Music_TCG2Fort2_Ch1:
 
 Music_TCG2Fort2_Ch3: 
 	notetype1 10
-	notetype2 15
+	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	notetype1 2
 	octave 4
 	octave 3

crysaudio/music/TCG2/grdueltheme2.asm

@@ -1471,7 +1471,7 @@ Branch_1efa62:
 
 Music_TCG2GRDuelTheme2_Ch3: 
 	notetype1 10
-	notetype2 15
+	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	notetype0 1
 	notetype1 1
 	octave 2

crysaudio/music/aftertherivalfight.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_AfterTheRivalFight_Ch1
+	musicheader 1, 2, Music_AfterTheRivalFight_Ch2
+	musicheader 1, 3, Music_AfterTheRivalFight_Ch3
+	musicheader 1, 4, Music_AfterTheRivalFight_Ch4
 
-Music_AfterTheRivalFight_Ch1: ; f5133
+Music_AfterTheRivalFight_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $0
@@ -23,9 +22,8 @@ Music_AfterTheRivalFight_Ch1: ; f5133
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
-; f5153
 
-Music_AfterTheRivalFight_Ch2: ; f5153
+Music_AfterTheRivalFight_Ch2:
 	dutycycle $1
 	vibrato $6, $35
 	stereopanning $f
@@ -39,9 +37,8 @@ Music_AfterTheRivalFight_Ch2: ; f5153
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
-; f516a
 
-Music_AfterTheRivalFight_Ch3: ; f516a
+Music_AfterTheRivalFight_Ch3:
 	notetype $c, $28
 	octave 3
 	note D#, 2
@@ -53,9 +50,8 @@ Music_AfterTheRivalFight_Ch3: ; f516a
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
-; f517a
 
-Music_AfterTheRivalFight_Ch4: ; f517a
+Music_AfterTheRivalFight_Ch4:
 	togglenoise $3
 	stereopanning $f
 	notetype $c
@@ -66,6 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
-; f518a
-
-

crysaudio/music/azaleatown.asm

@@ -1,18 +1,17 @@
-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:
+	musicheader 4, 1, Music_AzaleaTown_Ch1
+	musicheader 1, 2, Music_AzaleaTown_Ch2
+	musicheader 1, 3, Music_AzaleaTown_Ch3
+	musicheader 1, 4, Music_AzaleaTown_Ch4
 
-Music_AzaleaTown_Ch1: ; f57f4
+Music_AzaleaTown_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $2
 	stereopanning $f
 	notetype $c, $a1
 	note __, 2
-Music_AzaleaTown_branch_f5801: ; f5801
+Music_AzaleaTown_branch_f5801:
 	intensity $a1
 	octave 3
 	note F_, 2
@@ -27,7 +26,7 @@ Music_AzaleaTown_branch_f5801: ; f5801
 	note F_, 2
 	note F_, 2
 	loopchannel 2, Music_AzaleaTown_branch_f5801
-Music_AzaleaTown_branch_f5816: ; f5816
+Music_AzaleaTown_branch_f5816:
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
 	intensity $a4
@@ -119,9 +118,8 @@ Music_AzaleaTown_branch_f5816: ; f5816
 	note G#, 14
 	note __, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5816
-; f588c
 
-Music_AzaleaTown_branch_f588c: ; f588c
+Music_AzaleaTown_branch_f588c:
 	notetype $c, $a1
 	octave 4
 	note F_, 2
@@ -219,9 +217,8 @@ Music_AzaleaTown_branch_f588c: ; f588c
 	intensity $61
 	note C#, 2
 	endchannel
-; f5912
 
-Music_AzaleaTown_branch_f5912: ; f5912
+Music_AzaleaTown_branch_f5912:
 	intensity $61
 	note G#, 8
 	note G#, 8
@@ -230,9 +227,8 @@ Music_AzaleaTown_branch_f5912: ; f5912
 	intensity $a1
 	note A_, 8
 	endchannel
-; f591d
 
-Music_AzaleaTown_Ch2: ; f591d
+Music_AzaleaTown_Ch2:
 	vibrato $12, $23
 	dutycycle $2
 	stereopanning $f0
@@ -268,7 +264,7 @@ Music_AzaleaTown_Ch2: ; f591d
 	dutycycle $1
 	octave 5
 	note C_, 1
-Music_AzaleaTown_branch_f5952: ; f5952
+Music_AzaleaTown_branch_f5952:
 	callchannel Music_AzaleaTown_branch_f59c7
 	note C#, 4
 	note C_, 2
@@ -366,9 +362,8 @@ Music_AzaleaTown_branch_f5952: ; f5952
 	octave 5
 	note C_, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5952
-; f59c7
 
-Music_AzaleaTown_branch_f59c7: ; f59c7
+Music_AzaleaTown_branch_f59c7:
 	note C#, 4
 	octave 4
 	note G#, 2
@@ -420,9 +415,8 @@ Music_AzaleaTown_branch_f59c7: ; f59c7
 	note D#, 12
 	intensity $b4
 	endchannel
-; f5a08
 
-Music_AzaleaTown_Ch3: ; f5a08
+Music_AzaleaTown_Ch3:
 	stereopanning $ff
 	vibrato $6, $26
 	notetype $c, $25
@@ -446,7 +440,7 @@ Music_AzaleaTown_Ch3: ; f5a08
 	note C#, 1
 	note __, 1
 	note G#, 4
-Music_AzaleaTown_branch_f5a24: ; f5a24
+Music_AzaleaTown_branch_f5a24:
 	callchannel Music_AzaleaTown_branch_f5a86
 	note G#, 4
 	note D#, 2
@@ -534,9 +528,8 @@ Music_AzaleaTown_branch_f5a24: ; f5a24
 	octave 3
 	note C_, 1
 	loopchannel 0, Music_AzaleaTown_branch_f5a24
-; f5a86
 
-Music_AzaleaTown_branch_f5a86: ; f5a86
+Music_AzaleaTown_branch_f5a86:
 	note C#, 1
 	note __, 5
 	note C#, 1
@@ -608,9 +601,8 @@ Music_AzaleaTown_branch_f5a86: ; f5a86
 	note C_, 1
 	note __, 1
 	endchannel
-; f5acf
 
-Music_AzaleaTown_branch_f5acf: ; f5acf
+Music_AzaleaTown_branch_f5acf:
 	intensity $35
 	octave 3
 	note F_, 1
@@ -631,13 +623,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf
 	note F_, 1
 	note __, 1
 	endchannel
-; f5ae5
 
-Music_AzaleaTown_Ch4: ; f5ae5
+Music_AzaleaTown_Ch4:
 	togglenoise $3
 	notetype $c
 	note F_, 2
-Music_AzaleaTown_branch_f5aea: ; f5aea
+Music_AzaleaTown_branch_f5aea:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -660,6 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea
 	note D_, 2
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
-; f5b03
-
-

crysaudio/music/battletowerlobby.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_BattleTowerLobby_Ch1
+	musicheader 1, 2, Music_BattleTowerLobby_Ch2
+	musicheader 1, 3, Music_BattleTowerLobby_Ch3
+	musicheader 1, 4, Music_BattleTowerLobby_Ch4
 
-Music_BattleTowerLobby_Ch1: ; 179497
+Music_BattleTowerLobby_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_BattleTowerLobby_Ch1: ; 179497
 	vibrato $8, $22
 	stereopanning $f0
 	notetype $c, $72
-Music_BattleTowerLobby_branch_1794a9: ; 1794a9
+Music_BattleTowerLobby_branch_1794a9:
 	notetype $c, $72
 	octave 3
 	note G#, 2
@@ -116,14 +115,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
-; 17953a
 
-Music_BattleTowerLobby_Ch2: ; 17953a
+Music_BattleTowerLobby_Ch2:
 	dutycycle $2
 	vibrato $10, $34
 	stereopanning $f
 	notetype $c, $82
-Music_BattleTowerLobby_branch_179544: ; 179544
+Music_BattleTowerLobby_branch_179544:
 	notetype $c, $82
 	octave 4
 	note E_, 2
@@ -201,11 +199,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
-; 1795ae
 
-Music_BattleTowerLobby_Ch3: ; 1795ae
+Music_BattleTowerLobby_Ch3:
 	notetype $c, $11
-Music_BattleTowerLobby_branch_1795b1: ; 1795b1
+Music_BattleTowerLobby_branch_1795b1:
 	octave 2
 	note B_, 2
 	octave 3
@@ -298,11 +295,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
-; 179610
 
-Music_BattleTowerLobby_Ch4: ; 179610
+Music_BattleTowerLobby_Ch4:
 	togglenoise $0
-Music_BattleTowerLobby_branch_179612: ; 179612
+Music_BattleTowerLobby_branch_179612:
 	notetype $c
 	note __, 2
 	note F_, 4
@@ -310,6 +306,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
-; 17961d
-
-

crysaudio/music/battletowertheme.asm

@@ -1,18 +1,17 @@
-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:
+	musicheader 4, 1, Music_BattleTowerTheme_Ch1
+	musicheader 1, 2, Music_BattleTowerTheme_Ch2
+	musicheader 1, 3, Music_BattleTowerTheme_Ch3
+	musicheader 1, 4, Music_BattleTowerTheme_Ch4
 
-Music_BattleTowerTheme_Ch1: ; 178895
+Music_BattleTowerTheme_Ch1:
 	tempo 141
 	volume $77
 	tone $0001
 	vibrato $12, $34
 	stereopanning $f
 	notetype $6, $94
-Music_BattleTowerTheme_branch_1788a5: ; 1788a5
+Music_BattleTowerTheme_branch_1788a5:
 	note __, 16
 	note __, 16
 	note __, 12
@@ -185,9 +184,8 @@ Music_BattleTowerTheme_branch_1788a5: ; 1788a5
 	note E_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_1788a5
-; 17895e
 
-Music_BattleTowerTheme_branch_17895e: ; 17895e
+Music_BattleTowerTheme_branch_17895e:
 	intensity $94
 	note A_, 2
 	note __, 2
@@ -202,11 +200,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e
 	note __, 4
 	note A_, 4
 	endchannel
-; 17896d
 
-Music_BattleTowerTheme_Ch2: ; 17896d
+Music_BattleTowerTheme_Ch2:
 	vibrato $12, $34
-Music_BattleTowerTheme_branch_178970: ; 178970
+Music_BattleTowerTheme_branch_178970:
 	dutycycle $3
 	notetype $6, $b8
 	octave 3
@@ -242,7 +239,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
 	note __, 1
 	note F_, 4
 	note __, 4
-	tone $0000
+	tone 0
 	intensity $b7
 	note G_, 2
 	octave 4
@@ -345,9 +342,8 @@ Music_BattleTowerTheme_branch_178970: ; 178970
 	note D_, 2
 	note E_, 4
 	loopchannel 0, Music_BattleTowerTheme_branch_178970
-; 178a15
 
-Music_BattleTowerTheme_branch_178a15: ; 178a15
+Music_BattleTowerTheme_branch_178a15:
 	note F_, 2
 	note __, 2
 	note F_, 8
@@ -359,12 +355,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15
 	note A#, 4
 	note A_, 4
 	endchannel
-; 178a20
 
-Music_BattleTowerTheme_Ch3: ; 178a20
+Music_BattleTowerTheme_Ch3:
 	vibrato $12, $34
 	notetype $6, $16
-Music_BattleTowerTheme_branch_178a26: ; 178a26
+Music_BattleTowerTheme_branch_178a26:
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
 	note C_, 2
@@ -569,9 +564,8 @@ Music_BattleTowerTheme_branch_178a26: ; 178a26
 	note G_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_178a26
-; 178afe
 
-Music_BattleTowerTheme_branch_178afe: ; 178afe
+Music_BattleTowerTheme_branch_178afe:
 	octave 3
 	note C_, 2
 	note __, 2
@@ -587,12 +581,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe
 	note C_, 2
 	note __, 2
 	endchannel
-; 178b0d
 
-Music_BattleTowerTheme_Ch4: ; 178b0d
+Music_BattleTowerTheme_Ch4:
 	togglenoise $3
 	notetype $c
-Music_BattleTowerTheme_branch_178b11: ; 178b11
+Music_BattleTowerTheme_branch_178b11:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	note D_, 2
 	note D_, 4
@@ -603,7 +596,7 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11
 	note C#, 1
 	note D_, 1
 	note C#, 1
-Music_BattleTowerTheme_branch_178b1d: ; 178b1d
+Music_BattleTowerTheme_branch_178b1d:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	callchannel Music_BattleTowerTheme_branch_178b61
 	loopchannel 2, Music_BattleTowerTheme_branch_178b1d
@@ -615,7 +608,7 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	note D_, 1
 	note D_, 1
 	note D_, 8
-Music_BattleTowerTheme_branch_178b35: ; 178b35
+Music_BattleTowerTheme_branch_178b35:
 	callchannel Music_BattleTowerTheme_branch_178b76
 	note D_, 2
 	note D_, 2
@@ -641,9 +634,8 @@ Music_BattleTowerTheme_branch_178b35: ; 178b35
 	note D_, 1
 	note C#, 1
 	loopchannel 0, Music_BattleTowerTheme_branch_178b11
-; 178b58
 
-Music_BattleTowerTheme_branch_178b58: ; 178b58
+Music_BattleTowerTheme_branch_178b58:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -653,9 +645,8 @@ Music_BattleTowerTheme_branch_178b58: ; 178b58
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b61
 
-Music_BattleTowerTheme_branch_178b61: ; 178b61
+Music_BattleTowerTheme_branch_178b61:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -667,9 +658,8 @@ Music_BattleTowerTheme_branch_178b61: ; 178b61
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b6c
 
-Music_BattleTowerTheme_branch_178b6c: ; 178b6c
+Music_BattleTowerTheme_branch_178b6c:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -680,9 +670,8 @@ Music_BattleTowerTheme_branch_178b6c: ; 178b6c
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b76
 
-Music_BattleTowerTheme_branch_178b76: ; 178b76
+Music_BattleTowerTheme_branch_178b76:
 	note D_, 2
 	note C#, 2
 	note D_, 2
@@ -694,6 +683,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b81
-
-

crysaudio/music/bicycle.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_Bicycle_Ch1
+	musicheader 1, 2, Music_Bicycle_Ch2
+	musicheader 1, 3, Music_Bicycle_Ch3
+	musicheader 1, 4, Music_Bicycle_Ch4
 
-Music_Bicycle_Ch1: ; ee125
+Music_Bicycle_Ch1:
 	tempo 140
 	volume $77
 	dutycycle $3
@@ -23,7 +22,7 @@ Music_Bicycle_Ch1: ; ee125
 	note A_, 8
 	intensity $b2
 	note F#, 2
-Music_Bicycle_branch_ee144: ; ee144
+Music_Bicycle_branch_ee144:
 	stereopanning $f
 	intensity $b2
 	note G_, 2
@@ -169,9 +168,8 @@ Music_Bicycle_branch_ee144: ; ee144
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Bicycle_branch_ee144
-; ee1de
 
-Music_Bicycle_Ch2: ; ee1de
+Music_Bicycle_Ch2:
 	dutycycle $2
 	vibrato $10, $24
 	stereopanning $f0
@@ -195,7 +193,7 @@ Music_Bicycle_Ch2: ; ee1de
 	octave 3
 	note B_, 2
 	note A_, 2
-Music_Bicycle_branch_ee1fd: ; ee1fd
+Music_Bicycle_branch_ee1fd:
 	stereopanning $ff
 	dutycycle $2
 	intensity $c3
@@ -273,9 +271,8 @@ Music_Bicycle_branch_ee1fd: ; ee1fd
 	note G_, 2
 	note F#, 4
 	loopchannel 0, Music_Bicycle_branch_ee1fd
-; ee263
 
-Music_Bicycle_branch_ee263: ; ee263
+Music_Bicycle_branch_ee263:
 	note G_, 6
 	note B_, 6
 	note G_, 4
@@ -286,9 +283,8 @@ Music_Bicycle_branch_ee263: ; ee263
 	note G_, 6
 	note E_, 4
 	endchannel
-; ee26d
 
-Music_Bicycle_Ch3: ; ee26d
+Music_Bicycle_Ch3:
 	notetype $c, $14
 	note __, 16
 	octave 3
@@ -305,7 +301,7 @@ Music_Bicycle_Ch3: ; ee26d
 	octave 3
 	note A_, 1
 	note __, 1
-Music_Bicycle_branch_ee27f: ; ee27f
+Music_Bicycle_branch_ee27f:
 	callchannel Music_Bicycle_branch_ee333
 	note E_, 1
 	note __, 1
@@ -408,7 +404,7 @@ Music_Bicycle_branch_ee27f: ; ee27f
 	note __, 1
 	note A_, 1
 	note __, 1
-Music_Bicycle_branch_ee2e9: ; ee2e9
+Music_Bicycle_branch_ee2e9:
 	note G_, 1
 	note __, 1
 	note B_, 1
@@ -477,9 +473,8 @@ Music_Bicycle_branch_ee2e9: ; ee2e9
 	note __, 1
 	loopchannel 2, Music_Bicycle_branch_ee2e9
 	loopchannel 0, Music_Bicycle_branch_ee27f
-; ee333
 
-Music_Bicycle_branch_ee333: ; ee333
+Music_Bicycle_branch_ee333:
 	octave 3
 	note G_, 1
 	note __, 1
@@ -498,16 +493,15 @@ Music_Bicycle_branch_ee333: ; ee333
 	note B_, 1
 	note __, 1
 	endchannel
-; ee345
 
-Music_Bicycle_Ch4: ; ee345
+Music_Bicycle_Ch4:
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-Music_Bicycle_branch_ee34b: ; ee34b
+Music_Bicycle_branch_ee34b:
 	note __, 2
-Music_Bicycle_branch_ee34c: ; ee34c
+Music_Bicycle_branch_ee34c:
 	stereopanning $f0
 	note F_, 4
 	loopchannel 12, Music_Bicycle_branch_ee34c
@@ -518,6 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c
 	note F_, 2
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
-; ee35e
-
-

crysaudio/music/buenaspassword.asm

@@ -1,17 +1,16 @@
-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:
+	musicheader 4, 1, Music_BuenasPassword_Ch1
+	musicheader 1, 2, Music_BuenasPassword_Ch2
+	musicheader 1, 3, Music_BuenasPassword_Ch3
+	musicheader 1, 4, Music_BuenasPassword_Ch4
 
-Music_BuenasPassword_Ch1: ; 17815f
+Music_BuenasPassword_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
 	notetype $c, $b3
 	note __, 8
-Music_BuenasPassword_branch_17816b: ; 17816b
+Music_BuenasPassword_branch_17816b:
 	stereopanning $ff
 	note __, 16
 	note __, 16
@@ -138,9 +137,8 @@ Music_BuenasPassword_branch_17816b: ; 17816b
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_17816b
-; 178204
 
-Music_BuenasPassword_branch_178204: ; 178204
+Music_BuenasPassword_branch_178204:
 	stereopanning $f
 	notetype $6, $84
 	octave 4
@@ -162,9 +160,8 @@ Music_BuenasPassword_branch_178204: ; 178204
 	note __, 1
 	notetype $c, $84
 	endchannel
-; 178222
 
-Music_BuenasPassword_branch_178222: ; 178222
+Music_BuenasPassword_branch_178222:
 	octave 3
 	note D#, 1
 	note __, 1
@@ -180,16 +177,15 @@ Music_BuenasPassword_branch_178222: ; 178222
 	note D#, 1
 	note __, 2
 	endchannel
-; 178231
 
-Music_BuenasPassword_Ch2: ; 178231
+Music_BuenasPassword_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	notetype $c, $a5
 	note __, 7
 	octave 3
 	note F#, 1
-Music_BuenasPassword_branch_17823c: ; 17823c
+Music_BuenasPassword_branch_17823c:
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782df
 	callchannel Music_BuenasPassword_branch_1782a4
@@ -274,9 +270,8 @@ Music_BuenasPassword_branch_17823c: ; 17823c
 	note __, 1
 	intensity $a5
 	loopchannel 0, Music_BuenasPassword_branch_17823c
-; 1782a4
 
-Music_BuenasPassword_branch_1782a4: ; 1782a4
+Music_BuenasPassword_branch_1782a4:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -308,9 +303,8 @@ Music_BuenasPassword_branch_1782a4: ; 1782a4
 	note __, 1
 	notetype $c, $a5
 	endchannel
-; 1782cc
 
-Music_BuenasPassword_branch_1782cc: ; 1782cc
+Music_BuenasPassword_branch_1782cc:
 	octave 4
 	note G#, 2
 	note __, 2
@@ -330,9 +324,8 @@ Music_BuenasPassword_branch_1782cc: ; 1782cc
 	note D#, 2
 	note __, 2
 	endchannel
-; 1782df
 
-Music_BuenasPassword_branch_1782df: ; 1782df
+Music_BuenasPassword_branch_1782df:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -383,12 +376,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df
 	note B_, 1
 	note G#, 3
 	endchannel
-; 178311
 
-Music_BuenasPassword_Ch3: ; 178311
+Music_BuenasPassword_Ch3:
 	notetype $c, $14
 	note __, 8
-Music_BuenasPassword_branch_178315: ; 178315
+Music_BuenasPassword_branch_178315:
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -519,9 +511,8 @@ Music_BuenasPassword_branch_178315: ; 178315
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_178315
-; 1783a7
 
-Music_BuenasPassword_branch_1783a7: ; 1783a7
+Music_BuenasPassword_branch_1783a7:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -543,9 +534,8 @@ Music_BuenasPassword_branch_1783a7: ; 1783a7
 	note F_, 2
 	note C#, 1
 	endchannel
-; 1783bc
 
-Music_BuenasPassword_branch_1783bc: ; 1783bc
+Music_BuenasPassword_branch_1783bc:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -566,9 +556,8 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc
 	octave 2
 	note G#, 2
 	endchannel
-; 1783d0
 
-Music_BuenasPassword_Ch4: ; 1783d0
+Music_BuenasPassword_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -576,7 +565,7 @@ Music_BuenasPassword_Ch4: ; 1783d0
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_BuenasPassword_branch_1783d9: ; 1783d9
+Music_BuenasPassword_branch_1783d9:
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
@@ -602,9 +591,8 @@ Music_BuenasPassword_branch_1783d9: ; 1783d9
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_BuenasPassword_branch_1783d9
-; 17840c
 
-Music_BuenasPassword_branch_17840c: ; 17840c
+Music_BuenasPassword_branch_17840c:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -622,9 +610,8 @@ Music_BuenasPassword_branch_17840c: ; 17840c
 	stereopanning $f
 	note G_, 2
 	endchannel
-; 178424
 
-Music_BuenasPassword_branch_178424: ; 178424
+Music_BuenasPassword_branch_178424:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -642,6 +629,3 @@ Music_BuenasPassword_branch_178424: ; 178424
 	note D_, 1
 	note D_, 1
 	endchannel
-; 17843b
-
-

crysaudio/music/bugcatchingcontest.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_BugCatchingContest_Ch1
+	musicheader 1, 2, Music_BugCatchingContest_Ch2
+	musicheader 1, 3, Music_BugCatchingContest_Ch3
+	musicheader 1, 4, Music_BugCatchingContest_Ch4
 
-Music_BugCatchingContest_Ch1: ; f7c22
+Music_BugCatchingContest_Ch1:
 	tempo 144
 	volume $77
 	stereopanning $f
@@ -38,14 +37,14 @@ Music_BugCatchingContest_Ch1: ; f7c22
 	note __, 1
 	note E_, 1
 	note E_, 1
-Music_BugCatchingContest_branch_f7c4b: ; f7c4b
+Music_BugCatchingContest_branch_f7c4b:
 	notetype $c, $b1
-Music_BugCatchingContest_branch_f7c4e: ; f7c4e
+Music_BugCatchingContest_branch_f7c4e:
 	note __, 2
 	octave 2
 	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
-Music_BugCatchingContest_branch_f7c55: ; f7c55
+Music_BugCatchingContest_branch_f7c55:
 	note __, 2
 	note B_, 2
 	loopchannel 8, Music_BugCatchingContest_branch_f7c55
@@ -61,7 +60,7 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55
 	note E_, 1
 	intensity $b1
 	dutycycle $2
-Music_BugCatchingContest_branch_f7c6b: ; f7c6b
+Music_BugCatchingContest_branch_f7c6b:
 	note __, 2
 	octave 2
 	note A_, 2
@@ -91,7 +90,7 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b
 	note E_, 4
 	note __, 4
 	note E_, 4
-Music_BugCatchingContest_branch_f7c8e: ; f7c8e
+Music_BugCatchingContest_branch_f7c8e:
 	note __, 4
 	octave 2
 	note A_, 4
@@ -187,15 +186,14 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
-; f7cf4
 
-Music_BugCatchingContest_Ch2: ; f7cf4
+Music_BugCatchingContest_Ch2:
 	stereopanning $f0
 	vibrato $8, $23
 	dutycycle $1
 	notetype $c, $c7
 	note __, 8
-Music_BugCatchingContest_branch_f7cff: ; f7cff
+Music_BugCatchingContest_branch_f7cff:
 	octave 4
 	note A_, 1
 	note __, 1
@@ -204,7 +202,7 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff
 	note A_, 1
 	note A_, 1
 	loopchannel 4, Music_BugCatchingContest_branch_f7cff
-Music_BugCatchingContest_branch_f7d0a: ; f7d0a
+Music_BugCatchingContest_branch_f7d0a:
 	dutycycle $0
 	callchannel Music_BugCatchingContest_branch_f7d8e
 	octave 2
@@ -328,9 +326,8 @@ Music_BugCatchingContest_branch_f7d0a: ; f7d0a
 	note __, 3
 	note A_, 10
 	loopchannel 0, Music_BugCatchingContest_branch_f7d0a
-; f7d8e
 
-Music_BugCatchingContest_branch_f7d8e: ; f7d8e
+Music_BugCatchingContest_branch_f7d8e:
 	octave 2
 	note D_, 2
 	octave 3
@@ -372,9 +369,8 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e
 	note G_, 1
 	note __, 1
 	endchannel
-; f7db7
 
-Music_BugCatchingContest_Ch3: ; f7db7
+Music_BugCatchingContest_Ch3:
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $14
@@ -405,7 +401,7 @@ Music_BugCatchingContest_Ch3: ; f7db7
 	note __, 1
 	note C#, 1
 	note C#, 1
-Music_BugCatchingContest_branch_f7dda: ; f7dda
+Music_BugCatchingContest_branch_f7dda:
 	notetype $c, $14
 	note F#, 5
 	note __, 1
@@ -587,9 +583,8 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7dda
-; f7e9a
 
-Music_BugCatchingContest_Ch4: ; f7e9a
+Music_BugCatchingContest_Ch4:
 	togglenoise $4
 	notetype $6
 	note C#, 1
@@ -607,7 +602,7 @@ Music_BugCatchingContest_Ch4: ; f7e9a
 	note E_, 2
 	note E_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
-Music_BugCatchingContest_branch_f7eaf: ; f7eaf
+Music_BugCatchingContest_branch_f7eaf:
 	note D_, 4
 	note D_, 4
 	note D_, 2
@@ -651,9 +646,8 @@ Music_BugCatchingContest_branch_f7eaf: ; f7eaf
 	note D_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
 	loopchannel 0, Music_BugCatchingContest_branch_f7eaf
-; f7ee2
 
-Music_BugCatchingContest_branch_f7ee2: ; f7ee2
+Music_BugCatchingContest_branch_f7ee2:
 	note D_, 4
 	note B_, 8
 	note D_, 2
@@ -671,5 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2
 	note D_, 2
 	note D_, 2
 	endchannel
-; f7ef3
-

crysaudio/music/burnedtower.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_BurnedTower_Ch1
+	musicheader 1, 2, Music_BurnedTower_Ch2
+	musicheader 1, 3, Music_BurnedTower_Ch3
+	musicheader 1, 4, Music_BurnedTower_Ch4
 
-Music_BurnedTower_Ch1: ; f6aa5
+Music_BurnedTower_Ch1:
 	tempo 168
 	volume $77
 	dutycycle $1
@@ -27,7 +26,7 @@ Music_BurnedTower_Ch1: ; f6aa5
 	note D_, 2
 	intensity $80
 	note C#, 6
-Music_BurnedTower_branch_f6ac8: ; f6ac8
+Music_BurnedTower_branch_f6ac8:
 	intensity $91
 	octave 2
 	note A_, 4
@@ -37,7 +36,7 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8
 	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
-Music_BurnedTower_branch_f6ad8: ; f6ad8
+Music_BurnedTower_branch_f6ad8:
 	intensity $b1
 	octave 2
 	note A_, 4
@@ -87,7 +86,7 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8
 	note E_, 2
 	intensity $a0
 	note D#, 6
-Music_BurnedTower_branch_f6b17: ; f6b17
+Music_BurnedTower_branch_f6b17:
 	intensity $b1
 	octave 2
 	note B_, 4
@@ -98,16 +97,15 @@ Music_BurnedTower_branch_f6b17: ; f6b17
 	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
-; f6b29
 
-Music_BurnedTower_Ch2: ; f6b29
+Music_BurnedTower_Ch2:
 	dutycycle $2
 	vibrato $20, $82
 	tone $0002
 	notetype $c, $70
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c5
-Music_BurnedTower_branch_f6b39: ; f6b39
+Music_BurnedTower_branch_f6b39:
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
 	dutycycle $3
@@ -170,9 +168,8 @@ Music_BurnedTower_branch_f6b39: ; f6b39
 	intensity $b7
 	note F#, 16
 	loopchannel 0, Music_BurnedTower_branch_f6b39
-; f6b8e
 
-Music_BurnedTower_branch_f6b8e: ; f6b8e
+Music_BurnedTower_branch_f6b8e:
 	octave 3
 	note E_, 4
 	note D_, 2
@@ -193,9 +190,8 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e
 	note D_, 4
 	note E_, 16
 	endchannel
-; f6ba2
 
-Music_BurnedTower_Ch3: ; f6ba2
+Music_BurnedTower_Ch3:
 	stereopanning $f
 	notetype $c, $14
 	note __, 16
@@ -204,7 +200,7 @@ Music_BurnedTower_Ch3: ; f6ba2
 	note __, 12
 	octave 3
 	note D#, 4
-Music_BurnedTower_branch_f6bad: ; f6bad
+Music_BurnedTower_branch_f6bad:
 	octave 2
 	note A_, 2
 	octave 3
@@ -224,7 +220,7 @@ Music_BurnedTower_branch_f6bad: ; f6bad
 	note E_, 2
 	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
-Music_BurnedTower_branch_f6bc3: ; f6bc3
+Music_BurnedTower_branch_f6bc3:
 	octave 2
 	note B_, 2
 	octave 3
@@ -245,16 +241,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3
 	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
-; f6bdd
 
-Music_BurnedTower_Ch4: ; f6bdd
+Music_BurnedTower_Ch4:
 	togglenoise $0
 	notetype $c
-Music_BurnedTower_branch_f6be1: ; f6be1
+Music_BurnedTower_branch_f6be1:
 	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
 	note __, 2
-Music_BurnedTower_branch_f6be7: ; f6be7
+Music_BurnedTower_branch_f6be7:
 	stereopanning $f0
 	note G_, 2
 	note G#, 2
@@ -262,6 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7
 	note G#, 2
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
-; f6bf2
-
-

crysaudio/music/celadoncity.asm

@@ -1,14 +1,13 @@
-Music_CeladonCity: ; f435b
-	dbw $80, Music_CeladonCity_Ch1
-	dbw $01, Music_CeladonCity_Ch2
-	dbw $02, Music_CeladonCity_Ch3
-; f4364
+Music_CeladonCity:
+	musicheader 3, 1, Music_CeladonCity_Ch1
+	musicheader 1, 2, Music_CeladonCity_Ch2
+	musicheader 1, 3, Music_CeladonCity_Ch3
 
-Music_CeladonCity_Ch1: ; f4364
+Music_CeladonCity_Ch1:
 	tempo 146
 	volume $77
 	tone $0001
-Music_CeladonCity_branch_f436c: ; f436c
+Music_CeladonCity_branch_f436c:
 	stereopanning $f
 	notetype $c, $a6
 	octave 3
@@ -20,7 +19,7 @@ Music_CeladonCity_branch_f436c: ; f436c
 	note E_, 2
 	note F#, 2
 	callchannel Music_CeladonCity_branch_f43cc
-Music_CeladonCity_branch_f437d: ; f437d
+Music_CeladonCity_branch_f437d:
 	note D_, 2
 	note F#, 1
 	note A_, 1
@@ -84,9 +83,8 @@ Music_CeladonCity_branch_f437d: ; f437d
 	note G_, 1
 	note A_, 8
 	loopchannel 0, Music_CeladonCity_branch_f436c
-; f43cc
 
-Music_CeladonCity_branch_f43cc: ; f43cc
+Music_CeladonCity_branch_f43cc:
 	note D_, 2
 	note G_, 1
 	note B_, 1
@@ -105,9 +103,8 @@ Music_CeladonCity_branch_f43cc: ; f43cc
 	octave 3
 	note A_, 1
 	endchannel
-; f43e1
 
-Music_CeladonCity_branch_f43e1: ; f43e1
+Music_CeladonCity_branch_f43e1:
 	octave 2
 	note G_, 2
 	note B_, 1
@@ -134,17 +131,15 @@ Music_CeladonCity_branch_f43e1: ; f43e1
 	octave 3
 	note B_, 1
 	endchannel
-; f43fe
 
-Music_CeladonCity_branch_f43fe: ; f43fe
+Music_CeladonCity_branch_f43fe:
 	note D_, 2
 	note F#, 1
 	note A_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43fe
 	endchannel
-; f4406
 
-Music_CeladonCity_Ch2: ; f4406
+Music_CeladonCity_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	stereopanning $f0
@@ -159,7 +154,7 @@ Music_CeladonCity_Ch2: ; f4406
 	note F#, 1
 	note G_, 1
 	note A_, 8
-Music_CeladonCity_branch_f441a: ; f441a
+Music_CeladonCity_branch_f441a:
 	callchannel Music_CeladonCity_branch_f4463
 	note A_, 4
 	note F#, 4
@@ -218,9 +213,8 @@ Music_CeladonCity_branch_f441a: ; f441a
 	octave 5
 	note D_, 16
 	loopchannel 0, Music_CeladonCity_branch_f441a
-; f4463
 
-Music_CeladonCity_branch_f4463: ; f4463
+Music_CeladonCity_branch_f4463:
 	intensity $b2
 	octave 4
 	note B_, 4
@@ -237,9 +231,8 @@ Music_CeladonCity_branch_f4463: ; f4463
 	note B_, 2
 	note A_, 8
 	endchannel
-; f4474
 
-Music_CeladonCity_branch_f4474: ; f4474
+Music_CeladonCity_branch_f4474:
 	note G_, 3
 	note B_, 1
 	octave 2
@@ -270,11 +263,10 @@ Music_CeladonCity_branch_f4474: ; f4474
 	note D_, 2
 	note F#, 4
 	endchannel
-; f4492
 
-Music_CeladonCity_Ch3: ; f4492
+Music_CeladonCity_Ch3:
 	vibrato $12, $24
-Music_CeladonCity_branch_f4495: ; f4495
+Music_CeladonCity_branch_f4495:
 	notetype $c, $25
 	octave 3
 	note A_, 2
@@ -283,7 +275,7 @@ Music_CeladonCity_branch_f4495: ; f4495
 	note __, 2
 	note D_, 8
 	callchannel Music_CeladonCity_branch_f44fd
-Music_CeladonCity_branch_f44a1: ; f44a1
+Music_CeladonCity_branch_f44a1:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -363,9 +355,8 @@ Music_CeladonCity_branch_f44a1: ; f44a1
 	note D_, 2
 	note __, 6
 	loopchannel 0, Music_CeladonCity_branch_f4495
-; f44fd
 
-Music_CeladonCity_branch_f44fd: ; f44fd
+Music_CeladonCity_branch_f44fd:
 	octave 2
 	note G_, 2
 	note __, 2
@@ -382,9 +373,8 @@ Music_CeladonCity_branch_f44fd: ; f44fd
 	octave 2
 	note G#, 1
 	endchannel
-; f4510
 
-Music_CeladonCity_branch_f4510: ; f4510
+Music_CeladonCity_branch_f4510:
 	octave 5
 	note D_, 8
 	note C_, 2
@@ -393,6 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510
 	note A_, 2
 	note B_, 2
 	endchannel
-; f4518
-
-

crysaudio/music/championbattle.asm

@@ -1,11 +1,10 @@
-Music_ChampionBattle: ; ea9c1
-	dbw $80, Music_ChampionBattle_Ch1
-	dbw $01, Music_ChampionBattle_Ch2
-	dbw $02, Music_ChampionBattle_Ch3
-; ea9ca
+Music_ChampionBattle:
+	musicheader 3, 1, Music_ChampionBattle_Ch1
+	musicheader 1, 2, Music_ChampionBattle_Ch2
+	musicheader 1, 3, Music_ChampionBattle_Ch3
 
-Music_ChampionBattle_Ch1: ; ea9ca
-	ftempo 98
+Music_ChampionBattle_Ch1:
+	tempo 98
 	volume $77
 	dutycycle $3
 	tone $0002
@@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca
 	note A#, 4
 	intensity $b7
 	note B_, 4
-Music_ChampionBattle_branch_ea9e2: ; ea9e2
+Music_ChampionBattle_branch_ea9e2:
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note D#, 4
@@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note E_, 4
-Music_ChampionBattle_branch_ea9f0: ; ea9f0
+Music_ChampionBattle_branch_ea9f0:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 3, Music_ChampionBattle_branch_ea9f0
 	callchannel Music_ChampionBattle_branch_eab06
-Music_ChampionBattle_branch_ea9fa: ; ea9fa
+Music_ChampionBattle_branch_ea9fa:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
 	callchannel Music_ChampionBattle_branch_eab06
@@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	octave 4
 	note C_, 1
 	note C#, 1
-Music_ChampionBattle_branch_eaa35: ; eaa35
+Music_ChampionBattle_branch_eaa35:
 	callchannel Music_ChampionBattle_branch_eab0f
 	note E_, 2
 	note E_, 2
 	intensity $b7
 	note F#, 4
-Music_ChampionBattle_branch_eaa3d: ; eaa3d
+Music_ChampionBattle_branch_eaa3d:
 	intensity $b2
 	note E_, 2
 	note E_, 2
@@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $90
 	note D#, 16
 	note C#, 16
-Music_ChampionBattle_branch_eaab1: ; eaab1
+Music_ChampionBattle_branch_eaab1:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
 	octave 3
 	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
-Music_ChampionBattle_branch_eaabe: ; eaabe
+Music_ChampionBattle_branch_eaabe:
 	intensity $b2
 	note C_, 2
 	note C_, 2
@@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_ChampionBattle_branch_eaa35
-; eaaee
 
-Music_ChampionBattle_branch_eaaee: ; eaaee
+Music_ChampionBattle_branch_eaaee:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee
 	note A#, 2
 	intensity $b7
 	endchannel
-; eaafc
 
-Music_ChampionBattle_branch_eaafc: ; eaafc
+Music_ChampionBattle_branch_eaafc:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc
 	octave 3
 	note D#, 4
 	endchannel
-; eab06
 
-Music_ChampionBattle_branch_eab06: ; eab06
+Music_ChampionBattle_branch_eab06:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06
 	intensity $b7
 	note B_, 4
 	endchannel
-; eab0f
 
-Music_ChampionBattle_branch_eab0f: ; eab0f
+Music_ChampionBattle_branch_eab0f:
 	intensity $b5
 	octave 3
 	note D#, 2
@@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f
 	note G_, 2
 	intensity $b2
 	endchannel
-; eab24
 
-Music_ChampionBattle_branch_eab24: ; eab24
+Music_ChampionBattle_branch_eab24:
 	intensity $b2
 	octave 3
 	note A#, 2
@@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24
 	note A#, 2
 	intensity $b7
 	endchannel
-; eab31
 
-Music_ChampionBattle_branch_eab31: ; eab31
+Music_ChampionBattle_branch_eab31:
 	intensity $b2
 	note D#, 2
 	note D#, 2
@@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31
 	note C#, 4
 	intensity $b2
 	endchannel
-; eab4a
 
-Music_ChampionBattle_Ch2: ; eab4a
+Music_ChampionBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a
 	note E_, 8
 	intensity $3c
 	note E_, 8
-Music_ChampionBattle_branch_eab9d: ; eab9d
+Music_ChampionBattle_branch_eab9d:
 	intensity $c5
 	note D#, 6
 	octave 3
@@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
 	note F_, 16
 	note F#, 16
 	intensity $c4
-Music_ChampionBattle_branch_eabef: ; eabef
+Music_ChampionBattle_branch_eabef:
 	octave 5
 	note D#, 4
 	note D_, 4
@@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef
 	note F#, 8
 	note G#, 8
 	loopchannel 0, Music_ChampionBattle_branch_eab9d
-; eac4f
 
-Music_ChampionBattle_branch_eac4f: ; eac4f
+Music_ChampionBattle_branch_eac4f:
 	intensity $c2
 	note D#, 2
 	note D#, 6
@@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac5c
 
-Music_ChampionBattle_branch_eac5c: ; eac5c
+Music_ChampionBattle_branch_eac5c:
 	intensity $c2
 	octave 3
 	note D#, 2
@@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac79
 
-Music_ChampionBattle_branch_eac79: ; eac79
+Music_ChampionBattle_branch_eac79:
 	intensity $c1
 	note D#, 2
 	note D#, 4
@@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
 	note D#, 2
 	intensity $c5
 	endchannel
-; eac85
 
-Music_ChampionBattle_Ch3: ; eac85
+Music_ChampionBattle_Ch3:
 	notetype $c, $14
-Music_ChampionBattle_branch_eac88: ; eac88
+Music_ChampionBattle_branch_eac88:
 	octave 3
 	note D#, 1
 	note __, 7
@@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88
 	note A#, 2
 	note F_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacc6: ; eacc6
+Music_ChampionBattle_branch_eacc6:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
-Music_ChampionBattle_branch_eaccc: ; eaccc
+Music_ChampionBattle_branch_eaccc:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_eaccc
@@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
 	note B_, 2
 	note G_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacda: ; eacda
+Music_ChampionBattle_branch_eacda:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
-Music_ChampionBattle_branch_eace0: ; eace0
+Music_ChampionBattle_branch_eace0:
 	note E_, 2
 	note B_, 2
 	loopchannel 8, Music_ChampionBattle_branch_eace0
@@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0
 	note D#, 8
 	note B_, 8
 	note D#, 8
-Music_ChampionBattle_branch_ead05: ; ead05
+Music_ChampionBattle_branch_ead05:
 	note D#, 2
 	note F#, 2
 	loopchannel 16, Music_ChampionBattle_branch_ead05
@@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
-Music_ChampionBattle_branch_ead1d: ; ead1d
+Music_ChampionBattle_branch_ead1d:
 	octave 3
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
-Music_ChampionBattle_branch_ead24: ; ead24
+Music_ChampionBattle_branch_ead24:
 	note D#, 2
 	note A#, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead24
@@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24
 	note __, 2
 	note D#, 2
 	note __, 2
-Music_ChampionBattle_branch_ead32: ; ead32
+Music_ChampionBattle_branch_ead32:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead32
@@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32
 	note __, 2
 	note E_, 2
 	note __, 2
-Music_ChampionBattle_branch_ead40: ; ead40
+Music_ChampionBattle_branch_ead40:
 	note D#, 2
 	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
-Music_ChampionBattle_branch_ead46: ; ead46
+Music_ChampionBattle_branch_ead46:
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead46
 	note B_, 2
 	note A#, 2
-Music_ChampionBattle_branch_ead4e: ; ead4e
+Music_ChampionBattle_branch_ead4e:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e
 	note A#, 2
 	note G#, 2
 	loopchannel 0, Music_ChampionBattle_branch_eacc6
-; ead61
 
-Music_ChampionBattle_branch_ead61: ; ead61
+Music_ChampionBattle_branch_ead61:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61
 	note __, 1
 	note B_, 4
 	endchannel
-; ead6f
 
-Music_ChampionBattle_branch_ead6f: ; ead6f
+Music_ChampionBattle_branch_ead6f:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f
 	note D#, 1
 	note __, 1
 	endchannel
-; ead83
 
-Music_ChampionBattle_branch_ead83: ; ead83
+Music_ChampionBattle_branch_ead83:
 	octave 3
 	note D#, 2
 	note F#, 2
@@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83
 	note C#, 2
 	note C_, 2
 	endchannel
-; ead8e
 
-Music_ChampionBattle_branch_ead8e: ; ead8e
+Music_ChampionBattle_branch_ead8e:
 	octave 3
 	note E_, 2
 	note B_, 2
@@ -788,6 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
 	note D#, 2
 	note E_, 2
 	endchannel
-; ead99
-
-

crysaudio/music/cherrygrovecity.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_CherrygroveCity_Ch1
+	musicheader 1, 2, Music_CherrygroveCity_Ch2
+	musicheader 1, 3, Music_CherrygroveCity_Ch3
+	musicheader 1, 4, Music_CherrygroveCity_Ch4
 
-Music_CherrygroveCity_Ch1: ; f5b0f
+Music_CherrygroveCity_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $3
@@ -18,7 +17,7 @@ Music_CherrygroveCity_Ch1: ; f5b0f
 	note C_, 2
 	note D_, 2
 	note E_, 2
-Music_CherrygroveCity_branch_f5b26: ; f5b26
+Music_CherrygroveCity_branch_f5b26:
 	note A_, 4
 	note G#, 2
 	note A_, 2
@@ -92,9 +91,8 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_CherrygroveCity_branch_f5b26
-; f5b74
 
-Music_CherrygroveCity_Ch2: ; f5b74
+Music_CherrygroveCity_Ch2:
 	dutycycle $3
 	vibrato $10, $36
 	stereopanning $f
@@ -108,7 +106,7 @@ Music_CherrygroveCity_Ch2: ; f5b74
 	note G_, 2
 	note A_, 2
 	note A#, 2
-Music_CherrygroveCity_branch_f5b87: ; f5b87
+Music_CherrygroveCity_branch_f5b87:
 	intensity $c6
 	octave 4
 	note C_, 6
@@ -173,9 +171,8 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $a7
 	note F_, 8
 	loopchannel 0, Music_CherrygroveCity_branch_f5b87
-; f5bd8
 
-Music_CherrygroveCity_Ch3: ; f5bd8
+Music_CherrygroveCity_Ch3:
 	notetype $c, $16
 	note __, 4
 	octave 4
@@ -186,7 +183,7 @@ Music_CherrygroveCity_Ch3: ; f5bd8
 	note G_, 2
 	note F_, 2
 	note E_, 2
-Music_CherrygroveCity_branch_f5be4: ; f5be4
+Music_CherrygroveCity_branch_f5be4:
 	note A_, 2
 	note F_, 2
 	note A_, 2
@@ -284,13 +281,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5be4
-; f5c48
 
-Music_CherrygroveCity_Ch4: ; f5c48
+Music_CherrygroveCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
-Music_CherrygroveCity_branch_f5c4d: ; f5c4d
+Music_CherrygroveCity_branch_f5c4d:
 	note C#, 2
 	note __, 2
 	note G_, 2
@@ -307,6 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note C#, 2
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
-; f5c60
-
-

crysaudio/music/clair.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_Clair_Ch1
+	musicheader 1, 2, Music_Clair_Ch2
+	musicheader 1, 3, Music_Clair_Ch3
+	musicheader 1, 4, Music_Clair_Ch4
 
-Music_Clair_Ch1: ; 1fa99
+Music_Clair_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
@@ -13,7 +12,7 @@ Music_Clair_Ch1: ; 1fa99
 	stereopanning $f
 	notetype $c, $93
 	dutycycle $3
-Music_Clair_branch_1faab: ; 1faab
+Music_Clair_branch_1faab:
 	octave 4
 	note F_, 1
 	note F#, 1
@@ -37,7 +36,7 @@ Music_Clair_branch_1faab: ; 1faab
 	note D#, 4
 	note F_, 4
 	note G_, 4
-Music_Clair_branch_1fac9: ; 1fac9
+Music_Clair_branch_1fac9:
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
 	octave 2
@@ -95,9 +94,8 @@ Music_Clair_branch_1fac9: ; 1fac9
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_Clair_branch_1fac9
-; 1fb12
 
-Music_Clair_branch_1fb12: ; 1fb12
+Music_Clair_branch_1fb12:
 	dutycycle $3
 	stereopanning $ff
 	octave 3
@@ -122,9 +120,8 @@ Music_Clair_branch_1fb12: ; 1fb12
 	note C#, 1
 	note __, 1
 	endchannel
-; 1fb2e
 
-Music_Clair_branch_1fb2e: ; 1fb2e
+Music_Clair_branch_1fb2e:
 	octave 4
 	note F#, 1
 	note D#, 1
@@ -144,13 +141,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e
 	note D#, 1
 	note F#, 1
 	endchannel
-; 1fb41
 
-Music_Clair_Ch2: ; 1fb41
+Music_Clair_Ch2:
 	dutycycle $3
 	vibrato $12, $34
 	notetype $6, $b7
-Music_Clair_branch_1fb49: ; 1fb49
+Music_Clair_branch_1fb49:
 	octave 3
 	note A#, 2
 	note B_, 2
@@ -189,7 +185,7 @@ Music_Clair_branch_1fb49: ; 1fb49
 	note G_, 2
 	note A#, 2
 	intensity $b7
-Music_Clair_branch_1fb77: ; 1fb77
+Music_Clair_branch_1fb77:
 	callchannel Music_Clair_branch_1fba6
 	note F#, 2
 	note __, 4
@@ -207,9 +203,9 @@ Music_Clair_branch_1fb77: ; 1fb77
 	octave 3
 	note A#, 16
 	note __, 4
-	forceoctave $c
+	pitchoffset 0, CC
 	callchannel Music_Clair_branch_1fba6
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 5
 	note F#, 2
 	note __, 4
@@ -228,9 +224,8 @@ Music_Clair_branch_1fb77: ; 1fb77
 	note G#, 16
 	note __, 4
 	loopchannel 0, Music_Clair_branch_1fb77
-; 1fba6
 
-Music_Clair_branch_1fba6: ; 1fba6
+Music_Clair_branch_1fba6:
 	octave 4
 	note F#, 2
 	note __, 4
@@ -250,11 +245,10 @@ Music_Clair_branch_1fba6: ; 1fba6
 	note D#, 16
 	note __, 4
 	endchannel
-; 1fbb9
 
-Music_Clair_Ch3: ; 1fbb9
+Music_Clair_Ch3:
 	notetype $c, $14
-	forceoctave $c
+	pitchoffset 0, CC
 	octave 3
 	note C#, 2
 	note __, 4
@@ -274,7 +268,7 @@ Music_Clair_Ch3: ; 1fbb9
 	note A#, 4
 	note G#, 4
 	note G_, 4
-Music_Clair_branch_1fbd1: ; 1fbd1
+Music_Clair_branch_1fbd1:
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
 	note C#, 2
@@ -375,9 +369,8 @@ Music_Clair_branch_1fbd1: ; 1fbd1
 	octave 1
 	note G#, 1
 	loopchannel 0, Music_Clair_branch_1fbd1
-; 1fc3c
 
-Music_Clair_branch_1fc3c: ; 1fc3c
+Music_Clair_branch_1fc3c:
 	octave 1
 	note G#, 2
 	note __, 1
@@ -393,9 +386,8 @@ Music_Clair_branch_1fc3c: ; 1fc3c
 	octave 1
 	note G#, 2
 	endchannel
-; 1fc4b
 
-Music_Clair_Ch4: ; 1fc4b
+Music_Clair_Ch4:
 	togglenoise $3
 	notetype $c
 	stereopanning $f0
@@ -411,7 +403,7 @@ Music_Clair_Ch4: ; 1fc4b
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_Clair_branch_1fc5e: ; 1fc5e
+Music_Clair_branch_1fc5e:
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
 	note G_, 1
@@ -419,9 +411,8 @@ Music_Clair_branch_1fc5e: ; 1fc5e
 	callchannel Music_Clair_branch_1fc6e
 	note F#, 1
 	loopchannel 0, Music_Clair_branch_1fc5e
-; 1fc6e
 
-Music_Clair_branch_1fc6e: ; 1fc6e
+Music_Clair_branch_1fc6e:
 	note D#, 2
 	stereopanning $f0
 	note G_, 2
@@ -440,6 +431,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e
 	stereopanning $f0
 	note G_, 1
 	endchannel
-; 1fc87
-
-

crysaudio/music/contestresults.asm

@@ -1,15 +1,14 @@
-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_ContestResults:
+	musicheader 4, 1, Music_ContestResults_Ch1
+	musicheader 1, 2, Music_ContestResults_Ch2
+	musicheader 1, 3, Music_ContestResults_Ch3
+	musicheader 1, 4, Music_ContestResults_Ch4
 
-Music_ContestResults_Ch1: ; efb4a
+Music_ContestResults_Ch1:
 	tempo 144
 	volume $77
 	notetype $c, $51
-Music_ContestResults_branch_efb52: ; efb52
+Music_ContestResults_branch_efb52:
 	note __, 2
 	octave 2
 	note G_, 1
@@ -48,11 +47,10 @@ Music_ContestResults_branch_efb52: ; efb52
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
-; efb7b
 
-Music_ContestResults_Ch2: ; efb7b
+Music_ContestResults_Ch2:
 	notetype $c, $61
-Music_ContestResults_branch_efb7e: ; efb7e
+Music_ContestResults_branch_efb7e:
 	octave 2
 	note C_, 2
 	octave 3
@@ -93,7 +91,7 @@ Music_ContestResults_branch_efb7e: ; efb7e
 	octave 3
 	note F_, 1
 	note __, 1
-Music_ContestResults_branch_efba6: ; efba6
+Music_ContestResults_branch_efba6:
 	octave 2
 	note D_, 2
 	octave 3
@@ -126,12 +124,11 @@ Music_ContestResults_branch_efba6: ; efba6
 	note D_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
-; efbcc
 
-Music_ContestResults_Ch3: ; efbcc
+Music_ContestResults_Ch3:
 	vibrato $8, $24
 	notetype $c, $23
-Music_ContestResults_branch_efbd2: ; efbd2
+Music_ContestResults_branch_efbd2:
 	octave 4
 	note E_, 5
 	note __, 1
@@ -152,12 +149,11 @@ Music_ContestResults_branch_efbd2: ; efbd2
 	note A_, 8
 	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
-; efbe9
 
-Music_ContestResults_Ch4: ; efbe9
+Music_ContestResults_Ch4:
 	togglenoise $4
 	notetype $6
-Music_ContestResults_branch_efbed: ; efbed
+Music_ContestResults_branch_efbed:
 	note C#, 4
 	note C#, 4
 	note C#, 2
@@ -175,6 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed
 	note G_, 1
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
-; efc01
-
-

crysaudio/music/credits.asm

@@ -1,12 +1,11 @@
-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:
+	musicheader 4, 1, Music_Credits_Ch1
+	musicheader 1, 2, Music_Credits_Ch2
+	musicheader 1, 3, Music_Credits_Ch3
+	musicheader 1, 4, Music_Credits_Ch4
 
-Music_Credits_Ch1: ; 1f328
-	ftempo 139
+Music_Credits_Ch1:
+	tempo 139
 	volume $77
 	stereopanning $f
 	dutycycle $3
@@ -142,12 +141,12 @@ Music_Credits_Ch1: ; 1f328
 	note E_, 7
 	octave 3
 	note __, 1
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f483
 	callchannel Music_Credits_branch_1f4ed
 	callchannel Music_Credits_branch_1f4f8
 	callchannel Music_Credits_branch_1f559
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 3
 	note A_, 12
 	notetype $8, $a7
@@ -166,7 +165,7 @@ Music_Credits_Ch1: ; 1f328
 	octave 4
 	note C#, 6
 	callchannel Music_Credits_branch_1f582
-	ftempo 143
+	tempo 143
 	octave 4
 	note D_, 6
 	octave 3
@@ -174,14 +173,14 @@ Music_Credits_Ch1: ; 1f328
 	note G_, 6
 	octave 4
 	note D_, 6
-	ftempo 146
+	tempo 146
 	note E_, 6
 	note F#, 6
 	note A_, 6
 	octave 5
 	note C#, 6
 	notetype $c, $a7
-Music_Credits_branch_1f407: ; 1f407
+Music_Credits_branch_1f407:
 	octave 3
 	note A_, 1
 	octave 4
@@ -194,7 +193,7 @@ Music_Credits_branch_1f407: ; 1f407
 	note __, 1
 	note G#, 1
 	note __, 1
-	ftempo 153
+	tempo 153
 	notetype $c, $a7
 	octave 3
 	note C_, 1
@@ -245,7 +244,7 @@ Music_Credits_branch_1f407: ; 1f407
 	note __, 1
 	note A_, 1
 	note __, 1
-	ftempo 160
+	tempo 160
 	notetype $c, $a7
 	octave 2
 	note G_, 1
@@ -280,9 +279,8 @@ Music_Credits_branch_1f407: ; 1f407
 	note __, 16
 	note __, 16
 	endchannel
-; 1f483
 
-Music_Credits_branch_1f483: ; 1f483
+Music_Credits_branch_1f483:
 	note C_, 16
 	note F#, 1
 	note G_, 3
@@ -389,9 +387,8 @@ Music_Credits_branch_1f483: ; 1f483
 	note C_, 1
 	note __, 1
 	endchannel
-; 1f4ed
 
-Music_Credits_branch_1f4ed: ; 1f4ed
+Music_Credits_branch_1f4ed:
 	octave 4
 	note C_, 4
 	octave 3
@@ -403,9 +400,8 @@ Music_Credits_branch_1f4ed: ; 1f4ed
 	note C_, 4
 	note D#, 4
 	endchannel
-; 1f4f8
 
-Music_Credits_branch_1f4f8: ; 1f4f8
+Music_Credits_branch_1f4f8:
 	octave 3
 	note A_, 2
 	octave 4
@@ -503,9 +499,8 @@ Music_Credits_branch_1f4f8: ; 1f4f8
 	note C_, 2
 	note F_, 2
 	endchannel
-; 1f559
 
-Music_Credits_branch_1f559: ; 1f559
+Music_Credits_branch_1f559:
 	octave 3
 	note A_, 2
 	octave 4
@@ -547,9 +542,8 @@ Music_Credits_branch_1f559: ; 1f559
 	note A#, 2
 	note A_, 2
 	endchannel
-; 1f582
 
-Music_Credits_branch_1f582: ; 1f582
+Music_Credits_branch_1f582:
 	note __, 6
 	octave 3
 	note D_, 6
@@ -561,9 +555,8 @@ Music_Credits_branch_1f582: ; 1f582
 	note F#, 6
 	note C#, 6
 	endchannel
-; 1f58d
 
-Music_Credits_Ch2: ; 1f58d
+Music_Credits_Ch2:
 	dutycycle $1
 	vibrato $14, $23
 	notetype $c, $2f
@@ -664,11 +657,11 @@ Music_Credits_Ch2: ; 1f58d
 	note A_, 4
 	note G_, 4
 	notetype $6, $c7
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f6cb
 	callchannel Music_Credits_branch_1f73f
 	callchannel Music_Credits_branch_1f748
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 5
 	note C#, 1
 	note D_, 11
@@ -723,7 +716,7 @@ Music_Credits_Ch2: ; 1f58d
 	octave 2
 	note F#, 1
 	note __, 1
-Music_Credits_branch_1f657: ; 1f657
+Music_Credits_branch_1f657:
 	octave 1
 	note G_, 2
 	octave 2
@@ -818,9 +811,8 @@ Music_Credits_branch_1f657: ; 1f657
 	note __, 16
 	note __, 16
 	endchannel
-; 1f6cb
 
-Music_Credits_branch_1f6cb: ; 1f6cb
+Music_Credits_branch_1f6cb:
 	octave 2
 	note C_, 4
 	intensity $b1
@@ -931,9 +923,8 @@ Music_Credits_branch_1f6cb: ; 1f6cb
 	octave 3
 	note C_, 2
 	endchannel
-; 1f73f
 
-Music_Credits_branch_1f73f: ; 1f73f
+Music_Credits_branch_1f73f:
 	octave 1
 	note G_, 4
 	note __, 4
@@ -943,9 +934,8 @@ Music_Credits_branch_1f73f: ; 1f73f
 	note G_, 12
 	note F#, 8
 	endchannel
-; 1f748
 
-Music_Credits_branch_1f748: ; 1f748
+Music_Credits_branch_1f748:
 	octave 4
 	note A_, 8
 	note B_, 8
@@ -980,9 +970,8 @@ Music_Credits_branch_1f748: ; 1f748
 	octave 5
 	note C_, 4
 	endchannel
-; 1f772
 
-Music_Credits_Ch3: ; 1f772
+Music_Credits_Ch3:
 	vibrato $16, $23
 	notetype $c, $34
 	stereopanning $ff
@@ -1139,15 +1128,15 @@ Music_Credits_Ch3: ; 1f772
 	note F_, 1
 	note F#, 7
 	note G_, 8
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f8aa
 	callchannel Music_Credits_branch_1f8db
-	forceoctave $12
+	pitchoffset 1, D_
 	callchannel Music_Credits_branch_1f8e7
-	forceoctave $2
+	pitchoffset 0, D_
 	callchannel Music_Credits_branch_1f934
 	callchannel Music_Credits_branch_1f94b
-	forceoctave $0
+	pitchoffset 0, C_
 	octave 6
 	note C#, 2
 	octave 5
@@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1f772
 	note __, 16
 	note __, 16
 	endchannel
-; 1f8aa
 
-Music_Credits_branch_1f8aa: ; 1f8aa
+Music_Credits_branch_1f8aa:
 	note G_, 16
 	octave 6
 	note C#, 1
@@ -1280,9 +1268,8 @@ Music_Credits_branch_1f8aa: ; 1f8aa
 	notetype $c, $14
 	note D_, 16
 	endchannel
-; 1f8db
 
-Music_Credits_branch_1f8db: ; 1f8db
+Music_Credits_branch_1f8db:
 	notetype $6, $14
 	note F#, 1
 	note G_, 3
@@ -1293,9 +1280,8 @@ Music_Credits_branch_1f8db: ; 1f8db
 	note G_, 12
 	note G#, 8
 	endchannel
-; 1f8e7
 
-Music_Credits_branch_1f8e7: ; 1f8e7
+Music_Credits_branch_1f8e7:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -1373,9 +1359,8 @@ Music_Credits_branch_1f8e7: ; 1f8e7
 	octave 3
 	note G#, 2
 	endchannel
-; 1f934
 
-Music_Credits_branch_1f934: ; 1f934
+Music_Credits_branch_1f934:
 	octave 2
 	note F_, 4
 	note __, 2
@@ -1399,9 +1384,8 @@ Music_Credits_branch_1f934: ; 1f934
 	note E_, 2
 	note F_, 2
 	endchannel
-; 1f94b
 
-Music_Credits_branch_1f94b: ; 1f94b
+Music_Credits_branch_1f94b:
 	octave 2
 	note F#, 4
 	note __, 2
@@ -1442,9 +1426,8 @@ Music_Credits_branch_1f94b: ; 1f94b
 	note G_, 2
 	note D_, 2
 	endchannel
-; 1f973
 
-Music_Credits_Ch4: ; 1f973
+Music_Credits_Ch4:
 	togglenoise $3
 	notetype $c
 	note G#, 1
@@ -1480,7 +1463,7 @@ Music_Credits_Ch4: ; 1f973
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9a8: ; 1f9a8
+Music_Credits_branch_1f9a8:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1508,7 +1491,7 @@ Music_Credits_branch_1f9a8: ; 1f9a8
 	note C#, 1
 	note D_, 1
 	note D_, 1
-Music_Credits_branch_1f9c6: ; 1f9c6
+Music_Credits_branch_1f9c6:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1542,7 +1525,7 @@ Music_Credits_branch_1f9c6: ; 1f9c6
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9f2: ; 1f9f2
+Music_Credits_branch_1f9f2:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1621,9 +1604,8 @@ Music_Credits_branch_1f9f2: ; 1f9f2
 	note __, 16
 	note __, 16
 	endchannel
-; 1fa4d
 
-Music_Credits_branch_1fa4d: ; 1fa4d
+Music_Credits_branch_1fa4d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1656,9 +1638,8 @@ Music_Credits_branch_1fa4d: ; 1fa4d
 	note G_, 1
 	note F#, 2
 	endchannel
-; 1fa6d
 
-Music_Credits_branch_1fa6d: ; 1fa6d
+Music_Credits_branch_1fa6d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1691,6 +1672,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d
 	note A#, 1
 	note D_, 1
 	endchannel
-; 1fa8d
-
-

crysaudio/music/crystalopening.asm

@@ -1,12 +1,11 @@
-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:
+	musicheader 4, 1, Music_CrystalOpening_Ch1
+	musicheader 1, 2, Music_CrystalOpening_Ch2
+	musicheader 1, 3, Music_CrystalOpening_Ch3
+	musicheader 1, 4, Music_CrystalOpening_Ch4
 
-Music_CrystalOpening_Ch1: ; 1786f4
-	ftempo 136
+Music_CrystalOpening_Ch1:
+	tempo 136
 	volume $77
 	tone $0002
 	vibrato $10, $34
@@ -121,9 +120,8 @@ Music_CrystalOpening_Ch1: ; 1786f4
 	octave 2
 	note D_, 16
 	endchannel
-; 17877a
 
-Music_CrystalOpening_Ch2: ; 17877a
+Music_CrystalOpening_Ch2:
 	notetype $c, $a2
 	dutycycle $3
 	vibrato $8, $44
@@ -177,9 +175,8 @@ Music_CrystalOpening_Ch2: ; 17877a
 	octave 3
 	note D_, 16
 	endchannel
-; 1787c8
 
-Music_CrystalOpening_Ch3: ; 1787c8
+Music_CrystalOpening_Ch3:
 	notetype $c, $16
 	octave 1
 	note B_, 4
@@ -242,9 +239,8 @@ Music_CrystalOpening_Ch3: ; 1787c8
 	note D_, 1
 	note __, 15
 	endchannel
-; 178810
 
-Music_CrystalOpening_Ch4: ; 178810
+Music_CrystalOpening_Ch4:
 	stereopanning $f
 	togglenoise $3
 	notetype $c
@@ -361,6 +357,3 @@ Music_CrystalOpening_Ch4: ; 178810
 	note __, 16
 	note __, 16
 	endchannel
-; 178889
-
-

crysaudio/music/custom/ceruleanGSC.asm

@@ -1,948 +0,0 @@
-Music_CeruleanGSC: ; f5127
-	dbw $c0, Music_CeruleanGSC_Ch1
-	dbw $01, Music_CeruleanGSC_Ch2
-	dbw $02, Music_CeruleanGSC_Ch3
-	dbw $03, Music_CeruleanGSC_Ch4
-
-Music_CeruleanGSC_Ch1:
-	tempo $94
-	volume $77
-	notetype $C, $B2
-	dutycycle 2
-	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
-Music_CeruleanGSC_Loop1:
-	intensity $B1
-	octave 3
-	note G#, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note E_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note E_, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note G#, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note E_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note E_, 2
-	note D#, 2
-	note B_, 2
-	note D#, 2
-	note B_, 2
-	octave 3
-	note B_, 4
-	note B_, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
-	note F#, 2
-	intensity $B4
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 1
-	octave 3
-	note B_, 6
-	octave 4
-	note C#, 1
-	octave 3
-	note B_, 1
-	note A_, 8
-	intensity $B2
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
-	note F#, 2
-	intensity $B4
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 1
-	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
-	octave 4
-	note D#, 8
-	octave 3
-	note E_, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note __, 3
-	note B_, 4
-	note G#, 4
-	note B_, 2
-	note B_, 1
-	octave 4
-	note C#, 1
-	note D#, 1
-	note __, 3
-	note D#, 4
-	octave 3
-	note B_, 4
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 1
-	note __, 1
-	note C#, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	octave 5
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
-	octave 4
-	note B_, 1
-	octave 5
-	note C#, 1
-	note D#, 1
-	note F#, 1
-	note B_, 8
-	intensity $B6
-	octave 3
-	note G#, 8
-	note G#, 4
-	note B_, 4
-	octave 4
-	note E_, 4
-	note F#, 4
-	note G#, 8
-;Channel1_Bar16:
-	note D#, 8
-	octave 3
-	note B_, 4
-	octave 4
-	note B_, 4
-;Channel1_Bar17:
-	note A_, 4
-	note B_, 4
-	intensity $B2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
-;Channel1_Bar18:
-	loopchannel 0, Music_CeruleanGSC_Loop1
-
-Music_CeruleanGSC_Ch2:
-;Channel2_Bar1:
-	vibrato 12,$34
-	dutycycle 2
-	notetype 2, $C2
-	note __, 2
-	notetype 12, $C2
-	octave 5
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 4
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	octave 5
-	note C#, 2
-	notetype 2, $C2
-	note D#, 10
-;Channel2_Bar2:
-Music_CeruleanGSC_Loop2:
-	notetype 12, $C2
-	note E_, 6
-	octave 3
-	note E_, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar3:
-	intensity $C4
-	note G#, 6
-	note A_, 1
-	note G#, 1
-	note F#, 14
-;Channel2_Bar4:
-	intensity $C2
-	note E_, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar5:
-	intensity $C4
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 14
-;Channel2_Bar6:
-	intensity $C2
-	dutycycle 1
-	octave 4
-	note E_, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar7:
-	intensity $C4
-	note G#, 6
-	note A_, 1
-	note G#, 1
-	note F#, 8
-;Channel2_Bar8:
-	intensity $C2
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 2
-	note E_, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar9:
-	intensity $C4
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
-;Channel2_Bar10:
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 3
-	unknownmusic0xde 10
-	dutycycle 0
-	octave 4
-	note G#, 4
-	note E_, 4
-;Channel2_Bar11:
-	unknownmusic0xde 85
-	dutycycle 1
-	octave 3
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note __, 3
-	unknownmusic0xde 10
-	dutycycle 0
-	octave 4
-	note B_, 4
-	note F#, 4
-;Channel2_Bar12:
-	unknownmusic0xde 85
-	dutycycle 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note __, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-;Channel2_Bar13:
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note F#, 1
-	note B_, 8
-;Channel2_Bar14:
-	unknownmusic0xde 10
-	intensity $C6
-	dutycycle 2
-	octave 4
-	note E_, 8
-	octave 3
-	note B_, 4
-	octave 4
-	note F#, 4
-;Channel2_Bar15:
-	note G#, 4
-	note A_, 4
-	note B_, 8
-;Channel2_Bar16:
-	note B_, 8
-	note G#, 4
-	octave 5
-	note D#, 4
-;Channel2_Bar17:
-	note C#, 4
-	note D#, 4
-	unknownmusic0xde 170
-	notetype 2, $C2
-	note __, 2
-	notetype 12, $C2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	notetype 2, $C2
-	note D#, 10
-;Channel2_Bar18:
-	loopchannel 0, Music_CeruleanGSC_Loop2
-
-Music_CeruleanGSC_Ch3:
-	notetype 6, $15
-	vibrato 12, $24
-;Channel3_Bar1:
-	note __, 16
-	octave 4
-	note E_, 3
-	note __, 1
-	note D#, 3
-	note __, 1
-	note C#, 3
-	note __, 1
-	note C_, 3
-	note __, 1
-;Channel3_Bar2:
-Music_CeruleanGSC_Loop3:
-	octave 1
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 4
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 4
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 4
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 4
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 2
-	note B_, 2
-	note __, 2
-	octave 1
-	note B_, 2
-	octave 2
-	note B_, 2
-	octave 4
-	note B_, 2
-	octave 3
-	note B_, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 3
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 2
-	note E_, 2
-	octave 1
-	note E_, 2
-	octave 2
-	note E_, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 2
-	note F#, 2
-	note __, 2
-	octave 6
-	note C#, 1
-	note __, 3
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 6
-	note C#, 1
-	note __, 1
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 6
-	note D#, 1
-	note __, 1
-	octave 2
-	note B_, 2
-	octave 1
-	note B_, 2
-	octave 2
-	note B_, 2
-	octave 6
-	note D#, 1
-	note __, 1
-	octave 1
-	note B_, 2
-	octave 2
-	note E_, 2
-	octave 3
-	note E_, 2
-	octave 4
-	note E_, 2
-	octave 5
-	note E_, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 1
-	note __, 1
-	note E_, 2
-	note __, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 2
-	note E_, 2
-	octave 1
-	note E_, 2
-	octave 2
-	note E_, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 1
-	note E_, 2
-	note F#, 2
-	note __, 2
-	octave 5
-	note E_, 1
-	note __, 3
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 5
-	note E_, 1
-	note __, 1
-	octave 2
-	note C#, 2
-	octave 1
-	note B_, 2
-	note __, 2
-	octave 5
-	note F#, 1
-	note __, 1
-	octave 1
-	note B_, 2
-	note G#, 2
-	octave 4
-	note D#, 2
-	octave 5
-	note G#, 1
-	note __, 1
-	octave 3
-	note G#, 2
-	octave 2
-	note C#, 2
-	note __, 6
-	note C#, 2
-	note __, 4
-	note C#, 1
-	note __, 1
-	note C#, 2
-	note __, 2
-	octave 3
-	note C#, 2
-	note __, 2
-	octave 2
-	note C#, 2
-	note __, 2
-	octave 3
-	note C#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 6
-	note G#, 2
-	note __, 4
-	note G#, 1
-	note __, 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 2
-	octave 1
-	note A_, 4
-	octave 2
-	note A_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	note __, 2
-	note G#, 4
-	octave 2
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	note F#, 4
-	octave 2
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	note B_, 2
-	note __, 2
-	note B_, 8
-	note __, 16
-	note __, 4
-	octave 2
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 6
-	note E_, 2
-	note __, 2
-	octave 1
-	note E_, 2
-	note __, 2
-	octave 2
-	note E_, 2
-	note __, 6
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 2
-	note F#, 2
-	note __, 6
-	note F#, 2
-	note __, 2
-	octave 1
-	note F#, 2
-	note __, 2
-	octave 2
-	note F#, 2
-	note __, 6
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 6
-	note G#, 2
-	note __, 2
-	octave 1
-	note G#, 2
-	note __, 2
-	octave 2
-	note G#, 2
-	note __, 6
-	note A_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	note __, 6
-	note A_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	note __, 2
-	loopchannel 0, Music_CeruleanGSC_Loop3
-
-Music_CeruleanGSC_Ch4:
-	notetype $C
-	togglenoise 0
-;Channel4_Bar1:
-	note __, 16
-;Channel4_Bar2:
-Music_CeruleanGSC_Loop4:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar3:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar4:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar5:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note F_, 1
-;Channel4_Bar6:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar7:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A#, 2
-;Channel4_Bar8:
-	note F_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar9:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note A#, 2
-	note D_, 2
-	note D_, 1
-	note F_, 1
-;Channel4_Bar10:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar11:
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A#, 2
-;Channel4_Bar12:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note A_, 2
-	note G_, 1
-	note G_, 1
-;Channel4_Bar13:
-	note D_, 2
-	note D_, 2
-	note D_, 12
-;Channel4_Bar14:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar15:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar16:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-;Channel4_Bar17:
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 2
-	note D_, 2
-	note F_, 1
-	note F_, 1
-;Channel4_Bar18:
-	loopchannel 0, Music_CeruleanGSC_Loop4

crysaudio/music/custom/cinnabarGSC.asm

@@ -1,181 +0,0 @@
-Music_CinnabarGSC: ; f5127
-	dbw $40, Music_CinnabarGSC_Ch1
-	dbw $01, Music_CinnabarGSC_Ch2
-
-Music_CinnabarGSC_Ch1:
-	tempo	 $118
-	volume $77
-	dutycycle 1
-	notetype $C, $B6
-;Channel1_Bar1:
-Music_CinnabarGSC_Loop1:
-	note __, 4
-	octave 3
-	note D_, 4
-	note E_, 6
-	note C#, 2
-;Channel1_Bar2:
-	note D_, 4
-	note B_, 4
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-;Channel1_Bar3:
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 2
-	note F#, 2
-;Channel1_Bar4:
-	note G_, 8
-	note F#, 4
-	note E_, 4
-;Channel1_Bar5:
-	note D_, 4
-	note E_, 4
-	note F#, 6
-	note A_, 2
-;Channel1_Bar6:
-	note G_, 4
-	note B_, 4
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-;Channel1_Bar7:
-	note B_, 4
-	note G_, 4
-	note F#, 3
-	note E_, 1
-	note F#, 2
-	note A_, 2
-;Channel1_Bar8:
-	note G_, 4
-	octave 4
-	note D_, 1
-	note E_, 1
-	note D_, 4
-	note D_, 1
-	note E_, 1
-	note D_, 4
-;Channel1_Bar9:
-	octave 3
-	note B_, 6
-	note G_, 2
-	note E_, 8
-;Channel1_Bar10:
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-	note F#, 8
-;Channel1_Bar11:
-	octave 4
-	note F#, 6
-	note D_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-;Channel1_Bar12:
-	note G_, 8
-	note F#, 4
-	note E_, 4
-;Channel1_Bar13:
-	loopchannel 0, Music_CinnabarGSC_Loop1
-
-Music_CinnabarGSC_Ch2:
-	dutycycle 1
-	notetype $C, $C6
-;Channel2_Bar1:
-Music_CinnabarGSC_Loop2:
-	octave 3
-	note G_, 6
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-;Channel2_Bar2:
-	note D_, 4
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-;Channel2_Bar3:
-	note E_, 4
-	note D_, 4
-	note C_, 3
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 2
-	note E_, 2
-;Channel2_Bar4:
-	note D_, 4
-	octave 3
-	note B_, 8
-	note A_, 4
-;Channel2_Bar5:
-	note G_, 6
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-;Channel2_Bar6:
-	note D_, 4
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-;Channel2_Bar7:
-	note E_, 4
-	note D_, 4
-	note C_, 3
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
-;Channel2_Bar8:
-	note D_, 4
-	octave 3
-	note A_, 4
-	note G_, 4
-	note F#, 4
-;Channel2_Bar9:
-	octave 4
-	note D_, 6
-	octave 3
-	note B_, 2
-	note G_, 8
-;Channel2_Bar10:
-	octave 4
-	note E_, 6
-	note C_, 2
-	octave 3
-	note A_, 8
-;Channel2_Bar11:
-	octave 4
-	note A_, 6
-	note F#, 2
-	note D_, 2
-	note C_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-;Channel2_Bar12:
-	note B_, 4
-	octave 4
-	note D_, 4
-	octave 3
-	note B_, 2
-	note A_, 6
-;Channel2_Bar13:
-	loopchannel 0, Music_CinnabarGSC_Loop2

crysaudio/music/custom/cinnabarremix.asm

@@ -1,478 +0,0 @@
-Music_CinnabarRemix:
-	dbw $C0, Music_CinnabarRemix_Ch1
-	dbw $01, Music_CinnabarRemix_Ch2
-	dbw $02, Music_CinnabarRemix_Ch3
-	dbw $03, Music_CinnabarRemix_Ch4
-
-Music_CinnabarRemix_Ch1: ; b86d (2:786d)
-	tempo 144
-	volume 119
-	dutycycle 2
-	
-Music_CinnabarRemix_branch_b878:
-	notetype 12, 181
-	note __, 4
-	octave 3
-	note D_, 4
-	note E_, 6
-	note C#, 2
-	notetype 12, 177
-	note D_, 4
-	notetype 12, 181
-	note B_, 4
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-	notetype 12, 177
-	note B_, 4
-	notetype 12, 181
-	note G_, 4
-	note F#, 4
-	note E_, 2
-	note F#, 2
-	notetype 12, 177
-	note G_, 4
-	notetype 12, 181
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note F#, 6
-	note A_, 2
-	notetype 12, 177
-	note G_, 4
-	notetype 12, 181
-	note B_, 4
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-	note B_, 4
-	note G_, 4
-	note F#, 3
-	note E_, 1
-	note F#, 2
-	note A_, 2
-	notetype 12, 162
-	note G_, 4
-	octave 4
-	note D_, 1
-	note E_, 1
-	note D_, 4
-	notetype 12, 114
-	note D_, 1
-	note E_, 1
-	note D_, 4
-	notetype 12, 167
-	octave 3
-	note B_, 6
-	note G_, 2
-	note E_, 8
-	octave 4
-	note C_, 6
-	octave 3
-	note A_, 2
-	note F#, 8
-	octave 4
-	note F#, 6
-	note D_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 8
-	note F#, 4
-	note E_, 4
-	loopchannel 0, Music_CinnabarRemix_branch_b878
-
-
-Music_CinnabarRemix_Ch2: ; b8d4 (2:78d4)
-	dutycycle 2
-	vibrato 12,$34
-
-Music_CinnabarRemix_branch_b8d9:
-	unknownmusic0xde 170
-	notetype 12, $C2
-	octave 3
-	note G_, 6
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	notetype 12, 193
-	note D_, 4
-	notetype 12, 199
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
-	notetype 12, 193
-	note D_, 4
-	notetype 12, 199
-	octave 3
-	note B_, 8
-	note A_, 4
-	note G_, 6
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	notetype 12, 193
-	note D_, 4
-	notetype 12, 199
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
-	notetype 12, 193
-	note D_, 4
-	notetype 12, 199
-	octave 3
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	notetype 12, 176
-	unknownmusic0xde 10
-	octave 4
-	note D_, 6
-	octave 3
-	note B_, 2
-	note G_, 8
-	octave 4
-	note E_, 6
-	note C_, 2
-	octave 3
-	note A_, 8
-	octave 4
-	note A_, 6
-	note F#, 2
-	note D_, 2
-	note C_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 4
-	octave 4
-	note D_, 4
-	octave 3
-	note B_, 2
-	note A_, 6
-	loopchannel 0, Music_CinnabarRemix_branch_b8d9
-
-
-Music_CinnabarRemix_Ch3: ; b93d (2:793d)
-	notetype 6, $25
-	vibrato 12, $24
-Music_CinnabarRemix_branch_b93f:
-	octave 2
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note A_, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note F#, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	note B_, 4
-	note A_, 1
-	note __, 1
-	note A_, 1
-	note __, 1
-	octave 3
-	note C_, 4
-	octave 2
-	note B_, 1
-	note __, 3
-	octave 3
-	note D_, 2
-	octave 2
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	octave 3
-	note C_, 2
-	octave 2
-	note B_, 1
-	note __, 1
-	note G_, 1
-	note __, 3
-	octave 3
-	note E_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note __, 1
-	note C_, 1
-	note __, 1
-	note E_, 2
-	note C_, 1
-	note __, 1
-	octave 2
-	note A_, 1
-	note __, 3
-	octave 3
-	note A_, 2
-	note F#, 1
-	note F#, 1
-	note D_, 1
-	note __, 1
-	note D_, 1
-	note __, 1
-	note D_, 2
-	note C_, 1
-	note __, 1
-	octave 2
-	note B_, 1
-	note __, 3
-	octave 3
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	octave 2
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note A_, 2
-	octave 3
-	note C_, 1
-	note __, 1
-	loopchannel 0, Music_CinnabarRemix_branch_b93f
-; 0xb9eb
-Music_CinnabarRemix_Ch4:
-	notetype $c
-	togglenoise 0
-Music_CinnabarRemix_Loop4:
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 4
-	note A_, 4
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 4
-	note A#, 4
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 4
-	note A_, 4
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A#, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 2
-	note G_, 1
-	note G_, 1
-	note D_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 4
-	note A#, 4
-	note A_, 4
-	note A#, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 1
-	note G_, 1
-	note F_, 2
-	note G_, 1
-	note G_, 1
-	note F_, 2
-	note G_, 1
-	note G_, 1
-	note F_, 2
-	note G_, 1
-	note G_, 1
-	loopchannel 0, Music_CinnabarRemix_Loop4

crysaudio/music/custom/naljowildbattle.asm

@@ -1,810 +0,0 @@
-;Composed by LevusBevus for Koolboyman's Pokemon Prism
-;revised by FroggestSpirit
-Music_NaljoWildBattle:
-	dbw $80, Music_NaljoWildBattle_Ch1
-	dbw $01, Music_NaljoWildBattle_Ch2
-	dbw $02, Music_NaljoWildBattle_Ch3
-
-
-Music_NaljoWildBattle_Ch1:
-	ftempo 104
-	volume $77
-	stereopanning $f
-	dutycycle $3
-	tone $0002
-	vibrato $12, $15
-	notetype $c, $b2
-	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C#, 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 A_, 1
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	octave 2
-	intensity $b4
-	note A_, 2
-	note __, 2
-	note D_, 2
-	note F_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	octave 2
-	note D_, 2
-	note __, 2
-	note A#, 6
-	note A#, 2
-	note A#, 4
-	note A#, 4
-	octave 2
-	note A_, 2
-	note __, 2
-	note D_, 2
-	note F_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	octave 2
-	note D_, 2
-	note __, 2
-	note A_, 6
-	note A_, 2
-	note A_, 4
-	note A_, 4
-	octave 2
-	note A_, 2
-	note __, 2
-	note D_, 2
-	note F_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	octave 2
-	note D_, 2
-	note __, 2
-	note A#, 6
-	note A#, 2
-	note A#, 4
-	note A#, 4
-	octave 2
-	note A_, 2
-	note __, 2
-	note D_, 2
-	note F_, 2
-	note __, 2
-	octave 1
-	note A_, 2
-	octave 2
-	note D_, 2
-	note __, 2
-	intensity $b7
-	note F_, 8
-	note A_, 8
-
-Music_NaljoWildBattle_branch_19f26b: 
-	note D_, 6
-	note G_, 6
-	note D_, 4
-	note A_, 6
-	note G_, 6
-	note D_, 4
-	note C_, 6
-	note G_, 6
-	note C_, 4
-	note A_, 6
-	note G_, 6
-	note C_, 4
-	note D_, 6
-	note G_, 6
-	note D_, 4
-	note A_, 6
-	note G_, 6
-	note D_, 4
-	octave 1
-	note A_, 6
-	octave 2
-	note C#, 6
-	octave 1
-	note A_, 4
-	octave 2
-	note E_, 6
-	note C#, 6
-	octave 1
-	note A_, 4
-	octave 2
-	note D_, 6
-	note G_, 6
-	note D_, 4
-	note A_, 6
-	note G_, 6
-	note D_, 4
-	note C_, 6
-	note G_, 6
-	note C_, 4
-	note A_, 6
-	note G_, 6
-	note C_, 4
-	note D_, 6
-	note G_, 6
-	note D_, 4
-	note A_, 6
-	note G_, 6
-	note D_, 4
-	note D_, 6
-	note G_, 6
-	note D_, 4
-	note A#, 6
-	note G_, 6
-	note D_, 4
-	intensity $a2
-	dutycycle 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note G_, 2
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note G_, 2
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note G_, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note G_, 2
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note G_, 2
-	note __, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note G_, 2
-	octave 4
-	note G_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note F_, 2
-	note __, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note F_, 2
-	note __, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note F_, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note F_, 2
-	note __, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note F_, 2
-	note __, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note F_, 2
-	octave 4
-	note F_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	octave 4
-	note D_, 2
-	intensity $b7
-	dutycycle 3
-	octave 2
-	loopchannel 0, Music_NaljoWildBattle_branch_19f26b
-
-Music_NaljoWildBattle_Ch2: 
-	dutycycle $3
-	tone $0001
-	vibrato $8, $36
-	notetype $c, $c2
-
-Music_NaljoWildBattle_branch_19f11b:
-	octave 3
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 2
-	note B_, 1
-	loopchannel 8, Music_NaljoWildBattle_branch_19f11b
-	octave 3
-	intensity $c4
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	note D#, 6
-	note D#, 2
-	note D#, 4
-	note D#, 4
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	note E_, 6
-	note E_, 2
-	note E_, 4
-	note E_, 4
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	note D#, 6
-	note D#, 2
-	note D#, 4
-	note D#, 4
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	octave 2
-	note A_, 2
-	octave 3
-	note D_, 2
-	note __, 2
-	intensity $c7
-	note F_, 8
-	note D#, 8
-
-Music_NaljoWildBattle_branch_19f167: 
-	note D_, 6
-	note A_, 4
-	note G_, 1
-	note A_, 1
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note A#, 4
-	octave 4
-	note C_, 4
-	octave 3
-	note A#, 4
-	note A_, 16
-	note F_, 16
-	note D_, 6
-	note A_, 4
-	note G_, 1
-	note A_, 1
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note A#, 4
-	octave 4
-	note C_, 4
-	note C#, 4
-	octave 3
-	note A_, 16
-	note E_, 16
-	note D_, 6
-	note A_, 4
-	note G_, 1
-	note A_, 1
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note A#, 4
-	octave 4
-	note C_, 4
-	octave 3
-	note A#, 4
-	note A_, 16
-	note F_, 16
-	note D_, 6
-	note A_, 4
-	note G_, 1
-	note A_, 1
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note A#, 4
-	octave 4
-	note C_, 4
-	note C#, 4
-	note D_, 16
-	octave 3
-	note D_, 16
-	octave 4
-	intensity $c2
-	note D_, 2
-	note D_, 2
-	octave 3
-	intensity $c7
-	note A_, 8
-	note __, 2
-	intensity $c2
-	note D#, 2
-	note D_, 2
-	note D_, 2
-	octave 2
-	intensity $c7
-	note A_, 12
-	octave 3
-	note D_, 8
-	intensity $c2
-	note C_, 4
-	octave 2
-	note A#, 2
-	note A#, 1
-	note A_, 1
-	intensity $c7
-	note A#, 16
-	octave 4
-	intensity $c2
-	note D_, 2
-	note D_, 2
-	octave 3
-	intensity $c7
-	note A_, 8
-	note __, 2
-	intensity $c2
-	note D#, 2
-	note D_, 2
-	note D_, 2
-	octave 2
-	intensity $c7
-	note A_, 12
-	octave 3
-	note C_, 8
-	octave 2
-	intensity $c2
-	note F_, 3
-	note G_, 3
-	note A_, 2
-	intensity $c7
-	note G_, 8
-	octave 3
-	intensity $c2
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note A#, 1
-	octave 4
-	note C#, 1
-	note D_, 2
-	octave 3
-	note D_, 2
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	note D_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note D_, 2
-	intensity $c7
-	note F_, 8
-	note D#, 8
-	loopchannel 0, Music_NaljoWildBattle_branch_19f167
-
-
-Music_NaljoWildBattle_Ch3: 
-	notetype $c, $14
-	octave 4
-	note D_, 2
-	note D_, 1
-	note D_, 1
-	note D#, 2
-	note D#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note F_, 2
-	note F_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note F_, 1
-	note G_, 2
-	note G_, 1
-	note F#, 1
-	note G#, 2
-	note G#, 1
-	note G_, 1
-	note A_, 4
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note A_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	note F#, 2
-	note D#, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note D_, 16
-
-Music_NaljoWildBattle_branch_19f3ba: 
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3ba
-
-Music_NaljoWildBattle_branch_19f3c2: 
-	note C_, 2
-	note F_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3c2
-
-Music_NaljoWildBattle_branch_19f3c8: 
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3c8
-	octave 3
-
-Music_NaljoWildBattle_branch_19f3d1: 
-	note E_, 2
-	note A_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3d1
-
-Music_NaljoWildBattle_branch_19f3d7: 
-	octave 3
-	note A_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3d7
-
-Music_NaljoWildBattle_branch_19f3df: 
-	note C_, 2
-	note F_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3df
-
-Music_NaljoWildBattle_branch_19f3e5: 
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3e5
-
-Music_NaljoWildBattle_branch_19f3ed: 
-	note D_, 2
-	note G_, 2
-	loopchannel 8, Music_NaljoWildBattle_branch_19f3ed
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note D_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A#, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A#, 2
-	octave 5
-	note D_, 2
-	octave 4
-	note A#, 2
-	note G_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	octave 3
-	note A_, 2
-	octave 4
-	note D_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note D_, 2
-	octave 3
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note A_, 2
-	octave 4
-	note C_, 2
-	octave 3
-	note A_, 2
-	note F_, 2
-	octave 4
-	note D_, 4
-	note D_, 6
-	octave 3
-	note A_, 2
-	note A#, 2
-	octave 4
-	note C#, 2
-	note D_, 16
-	loopchannel 0, Music_NaljoWildBattle_branch_19f3ba
-	

crysaudio/music/custom/nuggetbridge.asm

@@ -1,663 +0,0 @@
-Music_NuggetBridge:
-	dbw $c0, Music_NuggetBridge_Ch1
-	dbw $01, Music_NuggetBridge_Ch2
-	dbw $02, Music_NuggetBridge_Ch3
-	dbw $03, Music_NuggetBridge_Ch4
-
-Music_NuggetBridge_Ch1:
-	tempo $A8
-	volume $77
-	dutycycle 1
-	notetype $C, $B5
-;Channel1_Bar1:
-	octave 2
-	note G#, 6
-	note G#, 1
-	note B_, 1
-	note A_, 4
-	note F#, 2
-	octave 3
-	note C#, 2
-;Channel1_Bar2:
-Music_NuggetBridge_Loop1:
-	octave 2
-	note B_, 3
-	note G#, 1
-	note A_, 6
-	dutycycle 2
-	note A_, 1
-	note G#, 1
-	note F#, 4
-;Channel1_Bar3:
-	dutycycle 1
-	note G#, 6
-	note G#, 1
-	note B_, 1
-	note A_, 4
-	note F#, 2
-	octave 3
-	note C#, 2
-;Channel1_Bar4:
-	octave 2
-	note B_, 3
-	note G#, 1
-	octave 3
-	note E_, 6
-	dutycycle 2
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D_, 4
-;Channel1_Bar5:
-	note A_, 2
-	note E_, 2
-	octave 2
-	note A_, 4
-	octave 3
-	note G#, 2
-	note E_, 2
-	octave 2
-	note G#, 4
-;Channel1_Bar6:
-	octave 3
-	note F#, 2
-	note C#, 2
-	octave 2
-	note F#, 4
-	octave 3
-	note E_, 2
-	note C#, 2
-	note D#, 2
-	note C#, 2
-;Channel1_Bar7:
-	octave 2
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 6
-	note F#, 2
-	octave 3
-	note D_, 4
-;Channel1_Bar8:
-	note E_, 3
-	octave 2
-	note A_, 1
-	note G#, 6
-	note E_, 2
-	note A_, 2
-	note G#, 2
-;Channel1_Bar9:
-	intensity $B2
-	note B_, 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note D_, 2
-	note A_, 4
-;Channel1_Bar10:
-	note G#, 3
-	note F#, 1
-	note E_, 6
-	intensity $B1
-	octave 2
-	note E_, 1
-	note F#, 1
-	note G#, 2
-	note F#, 1
-	note E_, 1
-;Channel1_Bar11:
-	intensity $B2
-	note B_, 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note D_, 2
-	note A_, 4
-;Channel1_Bar12:
-	note G#, 3
-	note F#, 1
-	note E_, 6
-	intensity $B1
-	octave 2
-	note G#, 1
-	note A_, 1
-	note B_, 2
-	note A_, 1
-	note G#, 1
-;Channel1_Bar13:
-	intensity $B2
-	note B_, 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
-;Channel1_Bar14:
-	octave 2
-	note B_, 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 2
-	note D#, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	intensity $B5
-	note A_, 4
-;Channel1_Bar15:
-	dutycycle 1
-	note G#, 6
-	octave 2
-	note G#, 1
-	note B_, 1
-	note A_, 4
-	note F#, 2
-	octave 3
-	note C#, 2
-;Channel1_Bar16:
-	loopchannel 0, Music_NuggetBridge_Loop1
-
-Music_NuggetBridge_Ch2:
-	dutycycle 1
-	notetype $C, $C5
-;Channel2_Bar1:
-	octave 3
-	note E_, 6
-	octave 2
-	note B_, 1
-	octave 3
-	note E_, 1
-	note F#, 6
-	note A_, 2
-;Channel2_Bar2:
-Music_NuggetBridge_Loop2:
-	note G#, 3
-	note E_, 1
-	note F#, 12
-;Channel2_Bar3:
-	note E_, 6
-	octave 2
-	note B_, 1
-	octave 3
-	note E_, 1
-	note F#, 6
-	note A_, 2
-;Channel2_Bar4:
-	note G#, 3
-	note E_, 1
-	note B_, 12
-;Channel2_Bar5:
-	dutycycle 0
-	octave 4
-	note C#, 6
-	octave 3
-	note B_, 1
-	note A_, 1
-	note B_, 6
-	note A_, 1
-	note G#, 1
-;Channel2_Bar6:
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note G#, 4
-	dutycycle 2
-	note F#, 2
-	note E_, 2
-;Channel2_Bar7:
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 8
-	note A_, 4
-;Channel2_Bar8:
-	note G#, 3
-	note F#, 1
-	note E_, 8
-	dutycycle 1
-	note F#, 2
-	note E_, 2
-;Channel2_Bar9:
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
-	octave 4
-	note C#, 4
-;Channel2_Bar10:
-	octave 3
-	note B_, 3
-	note A_, 1
-	note G#, 12
-;Channel2_Bar11:
-	dutycycle 0
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
-	octave 4
-	note C#, 4
-;Channel2_Bar12:
-	octave 3
-	note B_, 3
-	note A_, 1
-	note G#, 12
-;Channel2_Bar13:
-	dutycycle 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C#, 4
-;Channel2_Bar14:
-	octave 3
-	note D#, 2
-	note D#, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note B_, 1
-	octave 4
-	note C#, 1
-	notetype 6, $C5
-	note D#, 4
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 1
-	note C#, 1
-	note D#, 1
-;Channel2_Bar15:
-	notetype $C, $C5
-	dutycycle 1
-	note E_, 6
-	octave 2
-	note B_, 1
-	octave 3
-	note E_, 1
-	note F#, 6
-	note A_, 2
-;Channel2_Bar16:
-	loopchannel 0, Music_NuggetBridge_Loop2
-
-Music_NuggetBridge_Ch3:
-	notetype $C, $15
-;Channel3_Bar1:
-	octave 2
-	note E_, 4
-	note __, 8
-	note D_, 4
-;Channel3_Bar2:
-Music_NuggetBridge_Loop3:
-	note E_, 1
-	note __, 11
-	octave 1
-	note B_, 4
-;Channel3_Bar3:
-	octave 2
-	note E_, 4
-	note __, 8
-	note D_, 4
-;Channel3_Bar4:
-	note E_, 1
-	note __, 11
-	note G#, 4
-;Channel3_Bar5:
-	notetype 4, $24
-	octave 3
-	note A_, 2
-	octave 5
-	note C#, 2
-	note E_, 2
-	note A_, 2
-	octave 6
-	note C#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	octave 5
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note B_, 2
-	octave 5
-	note E_, 2
-	note G#, 2
-	note B_, 2
-	octave 6
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	octave 5
-	note B_, 2
-	note G#, 2
-	note E_, 2
-	octave 4
-	note B_, 2
-;Channel3_Bar6:
-	octave 3
-	note F#, 2
-	octave 4
-	note A_, 2
-	octave 5
-	note C#, 2
-	note F#, 2
-	note A_, 2
-	octave 6
-	note C#, 2
-	note F#, 2
-	note C#, 2
-	octave 5
-	note A_, 2
-	note F#, 2
-	note C#, 2
-	octave 4
-	note A_, 2
-	octave 3
-	note C#, 2
-	octave 4
-	note E_, 2
-	note G#, 2
-	octave 5
-	note C#, 2
-	note E_, 2
-	note G#, 2
-	octave 6
-	note C#, 3
-	note __, 9
-	notetype $C, $15
-	callchannel Music_NuggetBridge_Bar7
-	callchannel Music_NuggetBridge_Bar7
-	callchannel Music_NuggetBridge_Bar7
-	callchannel Music_NuggetBridge_Bar7
-	callchannel Music_NuggetBridge_Bar8
-	callchannel Music_NuggetBridge_Bar8
-	callchannel Music_NuggetBridge_Bar8
-	callchannel Music_NuggetBridge_Bar8
-	callchannel Music_NuggetBridge_Bar9
-	callchannel Music_NuggetBridge_Bar9
-	callchannel Music_NuggetBridge_Bar9
-	callchannel Music_NuggetBridge_Bar9
-	callchannel Music_NuggetBridge_Bar10
-	callchannel Music_NuggetBridge_Bar10
-	callchannel Music_NuggetBridge_Bar10
-	callchannel Music_NuggetBridge_Bar10
-	callchannel Music_NuggetBridge_Bar11
-	callchannel Music_NuggetBridge_Bar11
-	callchannel Music_NuggetBridge_Bar11
-	callchannel Music_NuggetBridge_Bar11
-	callchannel Music_NuggetBridge_Bar12
-	callchannel Music_NuggetBridge_Bar12
-	callchannel Music_NuggetBridge_Bar12
-	callchannel Music_NuggetBridge_Bar12
-;Channel3_Bar13:
-	notetype 6, $15
-	octave 1
-	note B_, 2
-	note __, 16
-	note __, 2
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note B_, 6
-	note __, 2
-;Channel3_Bar14:
-	note B_, 2
-	note __, 16
-	note __, 2
-	note B_, 1
-	note __, 1
-	note B_, 1
-	note __, 1
-	note B_, 6
-	note __, 2
-;Channel3_Bar15:
-	notetype $C, $15
-	octave 2
-	note E_, 4
-	note __, 8
-	note D_, 4
-;Channel3_Bar16:
-	loopchannel 0, Music_NuggetBridge_Loop3
-
-Music_NuggetBridge_Bar7:
-	octave 2
-	note D_, 1
-	note __, 1
-	intensity $24
-	octave 5
-	note A_, 1
-	octave 4
-	note D_, 1
-	intensity $15
-	endchannel 
-Music_NuggetBridge_Bar8:
-	octave 2
-	note E_, 1
-	note __, 1
-	intensity $24
-	octave 5
-	note B_, 1
-	octave 4
-	note E_, 1
-	intensity $15
-	endchannel 
-Music_NuggetBridge_Bar9:
-	octave 1
-	note B_, 1
-	note __, 1
-	intensity $24
-	octave 6
-	note D_, 1
-	octave 4
-	note F#, 1
-	intensity $15
-	endchannel 
-Music_NuggetBridge_Bar10:
-	octave 2
-	note E_, 1
-	note __, 1
-	intensity $24
-	octave 6
-	note E_, 1
-	octave 4
-	note B_, 1
-	intensity $15
-	endchannel 
-Music_NuggetBridge_Bar11:
-	octave 1
-	note B_, 1
-	intensity $24
-	octave 4
-	note A_, 1
-	octave 6
-	note F#, 1
-	octave 5
-	note D_, 1
-	intensity $15
-	endchannel 
-Music_NuggetBridge_Bar12:
-	octave 2
-	note E_, 1
-	intensity $24
-	octave 4
-	note B_, 1
-	octave 6
-	note G#, 1
-	octave 5
-	note E_, 1
-	intensity $15
-	endchannel 
-
-Music_NuggetBridge_Ch4:
-	notetype 4
-	togglenoise 0
-;Channel4_Bar1:
-	note A_, 16
-	note __, 2
-	note D_, 3
-	note D_, 3
-	note D_, 12
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar2:
-Music_NuggetBridge_Loop4:
-	note D_, 16
-	note __, 2
-	note D_, 3
-	note D_, 3
-	note D_, 12
-	note D_, 3
-	note D_, 3
-	note D_, 3
-	note D_, 3
-;Channel4_Bar3:
-	note D_, 16
-	note __, 2
-	note D_, 3
-	note D_, 3
-	note D_, 12
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar4:
-	note D_, 16
-	note __, 2
-	note D_, 3
-	note D_, 3
-	note D_, 12
-	note D_, 3
-	note D_, 3
-	note D_, 3
-	note D_, 3
-;Channel4_Bar5:
-	note A_, 16
-	note __, 16
-	note __, 16
-;Channel4_Bar6:
-	note __, 16
-	note __, 16
-	note __, 16
-;Channel4_Bar7:
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 3
-	note D_, 3
-;Channel4_Bar8:
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar9:
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 3
-	note D_, 3
-;Channel4_Bar10:
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar11:
-	note D_, 12
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 3
-	note D_, 3
-;Channel4_Bar12:
-	note D_, 12
-	note D_, 12
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 3
-	note D_, 3
-	note D_, 3
-	note D_, 3
-;Channel4_Bar13:
-	note D_, 16
-	note __, 14
-	note D_, 3
-	note D_, 3
-	note A_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar14:
-	note D_, 16
-	note __, 14
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 3
-	note D_, 3
-	note D_, 3
-	note D_, 3
-;Channel4_Bar15:
-	note A_, 16
-	note __, 2
-	note D_, 3
-	note D_, 3
-	note D_, 12
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
-;Channel4_Bar16:
-	loopchannel 0, Music_NuggetBridge_Loop4

crysaudio/music/custom/palletbattle.asm

@@ -1,670 +0,0 @@
-;Composed by Cat333Pokemon for Koolboyman's Pokemon Prism
-;revised by FroggestSpirit
-Music_PalletBattle: ; 1ec454
-	dbw $80, Music_PalletBattle_Ch1
-	dbw $01, Music_PalletBattle_Ch2
-	dbw $02, Music_PalletBattle_Ch3
-; 1ec45d
-
-
-Music_PalletBattle_Ch1: ; 1edb00
-	ftempo 96
-	volume $77
-	stereopanning $f0
-	dutycycle $3
-	tone $0002
-	vibrato $10, $12
-	notetype $c, $b2
-	octave 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
-	octave 2
-	note C_, 1
-	octave 1
-	note B_, 1
-	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
-	octave 3
-	note C_, 1
-
-Music_PalletBattle_branch_1edc47: ; 1edc47
-	note E_, 4
-	octave 2
-	note G_, 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note G_, 2
-	note E_, 2
-	note B_, 2
-	note G_, 4
-	octave 3
-	note D_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note E_, 2
-	octave 2
-	note F_, 2
-	note G_, 2
-	note D_, 4
-	octave 1
-	note B_, 4
-	octave 2
-	note G_, 4
-	note D_, 4
-	octave 1
-	note G_, 4
-	note D_, 4
-	note B_, 4
-	note G_, 4
-	octave 2
-	note G_, 4
-	octave 3
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note G_, 2
-	note B_, 4
-	octave 3
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note D_, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note G_, 4
-	note D_, 4
-	octave 2
-	note B_, 4
-	note G_, 4
-	octave 3
-	note D_, 4
-	octave 2
-	note G_, 2
-	note G_, 2
-	octave 3
-	note C_, 4
-	note D_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	note C_, 2
-	octave 2
-	note B_, 4
-	octave 3
-	note C_, 2
-	octave 2
-	note G_, 2
-	note G_, 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	note D_, 2
-	note D_, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note G_, 4
-	note D_, 4
-	octave 2
-	note B_, 4
-	note G_, 4
-	octave 3
-	note D_, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note G_, 4
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	octave 2
-	note G_, 2
-	note G_, 2
-	note B_, 2
-	octave 3
-	note C_, 4
-	note D_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	octave 2
-	note B_, 2
-	note G_, 2
-	octave 2
-	note G_, 4
-	note E_, 4
-	note C_, 4
-	octave 1
-	note G_, 4
-	octave 2
-	note C_, 4
-	octave 1
-	note G_, 4
-	note E_, 4
-	note C_, 4
-	note __, 16
-	note __, 16
-	note __, 16
-	note __, 16
-	octave 3
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	octave 3
-	note D#, 2
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	octave 2
-	note G#, 2
-	octave 3
-	note F_, 2
-	note F_, 2
-	octave 2
-	note A#, 2
-	octave 3
-	note F_, 2
-	note F_, 2
-	octave 2
-	note A#, 2
-	octave 3
-	note F_, 2
-	octave 2
-	note A#, 2
-	octave 3
-	note F#, 2
-	note F#, 2
-	note C_, 2
-	note F#, 2
-	note F#, 2
-	note C_, 2
-	note F#, 2
-	note C_, 2
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note D#, 2
-	note D#, 2
-	octave 2
-	note A#, 2
-	octave 3
-	note D#, 2
-	note D#, 2
-	octave 2
-	note A#, 2
-	octave 3
-	note D#, 2
-	octave 2
-	note A#, 2
-	intensity $b8
-	note G_, 16
-	note G_, 16
-	note D_, 16
-	note D_, 16
-	note G_, 16
-	note G_, 16
-	note D_, 16
-	note D_, 16
-	intensity $b2
-	octave 3
-	loopchannel 0, Music_PalletBattle_branch_1edc47
-
-Music_PalletBattle_Ch2: ; 1edc10
-	dutycycle $3
-	tone $0001
-	vibrato $8, $36
-	notetype $c, $c2
-	octave 5
-	note C#, 1
-	note C_, 1
-	octave 4
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note A#, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 1
-	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-
-Music_PalletBattle_branch_1edb37: ; 1edb37
-	note G_, 4
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	note C_, 4
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note G_, 2
-	octave 2
-	note A_, 2
-	note B_, 2
-	intensity $c7
-	note G_, 16
-	note __, 16
-	octave 3
-	intensity $c2
-	note C_, 4
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note D_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	octave 4
-	note C_, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	intensity $c7
-	note G_, 16
-	note __, 12
-	intensity $c2
-	note D_, 2
-	note D_, 2
-	note E_, 4
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 4
-	note E_, 2
-	note C_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	intensity $c7
-	note G_, 16
-	note __, 16
-	octave 4
-	intensity $c2
-	note C_, 4
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	note D_, 2
-	note E_, 4
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	octave 2
-	note B_, 2
-	octave 3
-	intensity $c7
-	note C_, 16
-	note __, 16
-
-Music_PalletBattle_branch_1edb87: ; 1edb87
-	octave 4
-	intensity $c2
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note G#, 2
-	loopchannel 2, Music_PalletBattle_branch_1edb87
-
-Music_PalletBattle_branch_1edb99: ; 1edb99
-	note G#, 2
-	note G#, 2
-	note D#, 2
-	note G#, 2
-	note G#, 2
-	note D#, 2
-	note G#, 2
-	note D#, 2
-	loopchannel 2, Music_PalletBattle_branch_1edb99
-
-Music_PalletBattle_branch_1edba5: ; 1edba5
-	octave 4
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note G#, 2
-	loopchannel 2, Music_PalletBattle_branch_1edba5
-
-Music_PalletBattle_branch_1edbb7: ; 1edbb7
-	note G#, 2
-	note G#, 2
-	note D#, 2
-	note G#, 2
-	note G#, 2
-	note D#, 2
-	note G#, 2
-	note D#, 2
-	loopchannel 2, Music_PalletBattle_branch_1edbb7
-	note A#, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note B_, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	octave 4
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note C#, 2
-	octave 3
-	note G#, 2
-	octave 4
-	note D#, 2
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	note D#, 2
-	octave 3
-	note A#, 2
-	octave 4
-	note D#, 2
-	octave 3
-	note A#, 2
-
-Music_PalletBattle_branch_1edbef: ; 1edbef
-	octave 3
-	intensity $c8
-	note C_, 16
-	note C_, 16
-	octave 2
-	note G_, 16
-	note G_, 16
-	loopchannel 2, Music_PalletBattle_branch_1edbef
-	intensity $c2
-	octave 3
-	loopchannel 0, Music_PalletBattle_branch_1edb37
-
-Music_PalletBattle_Ch3: ; 1ede10
-	notetype $c, $19
-	note __, 16
-	note __, 16
-
-Music_PalletBattle_branch_1ede24: ; 1ede24
-	octave 3
-
-Music_PalletBattle_branch_1ede25: ; 1ede25
-	note C_, 2
-	note G_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede25
-
-Music_PalletBattle_branch_1ede2b: ; 1ede2b
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede2b
-	octave 3
-
-Music_PalletBattle_branch_1ede34: ; 1ede34
-	note C_, 2
-	note G_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede34
-
-Music_PalletBattle_branch_1ede3a: ; 1ede3a
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede3a
-	octave 3
-
-Music_PalletBattle_branch_1ede43: ; 1ede43
-	note C_, 2
-	note G_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede43
-
-Music_PalletBattle_branch_1ede49: ; 1ede49
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede49
-	octave 3
-
-Music_PalletBattle_branch_1ede52: ; 1ede52
-	note C_, 2
-	note G_, 2
-	loopchannel 16, Music_PalletBattle_branch_1ede52
-	octave 3
-
-Music_PalletBattle_branch_1ede59: ; 1ede59
-	note C#, 2
-	note G#, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede59
-
-Music_PalletBattle_branch_1ede5f: ; 1ede5f
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede5f
-	octave 3
-
-Music_PalletBattle_branch_1ede68: ; 1ede68
-	note C#, 2
-	note G#, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede68
-
-Music_PalletBattle_branch_1ede6e: ; 1ede6e
-	octave 2
-	note G#, 2
-	octave 3
-	note D#, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede6e
-
-Music_PalletBattle_branch_1ede76: ; 1ede76
-	octave 2
-	note A#, 2
-	octave 3
-	note F_, 2
-	loopchannel 4, Music_PalletBattle_branch_1ede76
-
-Music_PalletBattle_branch_1ede7e: ; 1ede7e
-	octave 2
-	note B_, 2
-	octave 3
-	note F#, 2
-	loopchannel 4, Music_PalletBattle_branch_1ede7e
-
-Music_PalletBattle_branch_1ede86: ; 1ede86
-	octave 3
-	note C#, 2
-	note G#, 2
-	loopchannel 4, Music_PalletBattle_branch_1ede86
-
-Music_PalletBattle_branch_1ede8d: ; 1ede8d
-	note D#, 2
-	note A#, 2
-	loopchannel 4, Music_PalletBattle_branch_1ede8d
-	octave 3
-
-Music_PalletBattle_branch_1ede94: ; 1ede94
-	note C_, 2
-	note G_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede94
-
-Music_PalletBattle_branch_1ede9a: ; 1ede9a
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_PalletBattle_branch_1ede9a
-	octave 3
-
-Music_PalletBattle_branch_1edea3: ; 1edea3
-	note C_, 2
-	note G_, 2
-	loopchannel 8, Music_PalletBattle_branch_1edea3
-
-Music_PalletBattle_branch_1edea9: ; 1edea9
-	octave 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	loopchannel 8, Music_PalletBattle_branch_1edea9
-	loopchannel 0, Music_PalletBattle_branch_1ede24
-; 1edeb5

crysaudio/music/dancinghall.asm

@@ -1,20 +1,18 @@
-Music_DancingHall: ; ef9bc
-	dbw $80, Music_DancingHall_Ch1
-	dbw $01, Music_DancingHall_Ch2
-	dbw $02, Music_DancingHall_Ch3
-; ef9c5
+Music_DancingHall:
+	musicheader 3, 1, Music_DancingHall_Ch1
+	musicheader 1, 2, Music_DancingHall_Ch2
+	musicheader 1, 3, Music_DancingHall_Ch3
 
+	db $3
 
-
-
-Music_DancingHall_Ch1: ; ef9c6
+Music_DancingHall_Ch1:
 	tempo 208
 	volume $77
 	stereopanning $f
 	notetype $6, $b7
 	note __, 3
 	dutycycle $0
-Music_DancingHall_branch_ef9d3: ; ef9d3
+Music_DancingHall_branch_ef9d3:
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
 	note __, 16
@@ -65,9 +63,8 @@ Music_DancingHall_branch_ef9d3: ; ef9d3
 	note __, 1
 	note F_, 2
 	loopchannel 0, Music_DancingHall_branch_ef9d3
-; efa17
 
-Music_DancingHall_branch_efa17: ; efa17
+Music_DancingHall_branch_efa17:
 	octave 3
 	note B_, 1
 	note __, 1
@@ -89,15 +86,14 @@ Music_DancingHall_branch_efa17: ; efa17
 	note D_, 1
 	note __, 1
 	endchannel
-; efa2c
 
-Music_DancingHall_Ch2: ; efa2c
+Music_DancingHall_Ch2:
 	stereopanning $f0
 	notetype $6, $a1
 	dutycycle $0
 	vibrato $10, $24
 	note __, 3
-Music_DancingHall_branch_efa37: ; efa37
+Music_DancingHall_branch_efa37:
 	notetype $6, $a2
 	callchannel Music_DancingHall_branch_efa7a
 	callchannel Music_DancingHall_branch_efa7a
@@ -145,9 +141,8 @@ Music_DancingHall_branch_efa37: ; efa37
 	note __, 1
 	note D_, 2
 	loopchannel 0, Music_DancingHall_branch_efa37
-; efa7a
 
-Music_DancingHall_branch_efa7a: ; efa7a
+Music_DancingHall_branch_efa7a:
 	intensity $a1
 	octave 4
 	note E_, 4
@@ -223,9 +218,8 @@ Music_DancingHall_branch_efa7a: ; efa7a
 	octave 4
 	note D_, 1
 	endchannel
-; efad6
 
-Music_DancingHall_Ch3: ; efad6
+Music_DancingHall_Ch3:
 	stereopanning $ff
 	vibrato $16, $24
 	notetype $6, $10
@@ -234,7 +228,7 @@ Music_DancingHall_Ch3: ; efad6
 	note B_, 1
 	octave 6
 	note D_, 1
-Music_DancingHall_branch_efae3: ; efae3
+Music_DancingHall_branch_efae3:
 	note E_, 13
 	note D_, 1
 	note E_, 1
@@ -309,6 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3
 	octave 6
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
-; efb3e
-
-

crysaudio/music/darkcave.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_DarkCave_Ch1
+	musicheader 1, 2, Music_DarkCave_Ch2
+	musicheader 1, 3, Music_DarkCave_Ch3
+	musicheader 1, 4, Music_DarkCave_Ch4
 
-Music_DarkCave_Ch1: ; ea2ca
+Music_DarkCave_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_DarkCave_Ch1: ; ea2ca
 	vibrato $11, $15
 	stereopanning $f0
 	notetype $c, $a7
-Music_DarkCave_branch_ea2dc: ; ea2dc
+Music_DarkCave_branch_ea2dc:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
 	octave 3
@@ -22,7 +21,7 @@ Music_DarkCave_branch_ea2dc: ; ea2dc
 	note C#, 16
 	note C_, 16
 	intensity $a3
-Music_DarkCave_branch_ea2e8: ; ea2e8
+Music_DarkCave_branch_ea2e8:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
 	intensity $b7
@@ -43,7 +42,7 @@ Music_DarkCave_branch_ea2e8: ; ea2e8
 	note D#, 8
 	note C_, 8
 	intensity $a3
-Music_DarkCave_branch_ea303: ; ea303
+Music_DarkCave_branch_ea303:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
 	note __, 16
@@ -74,13 +73,12 @@ Music_DarkCave_branch_ea303: ; ea303
 	note G_, 2
 	note G#, 4
 	intensity $a3
-Music_DarkCave_branch_ea328: ; ea328
+Music_DarkCave_branch_ea328:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea328
 	loopchannel 0, Music_DarkCave_branch_ea2e8
-; ea333
 
-Music_DarkCave_branch_ea333: ; ea333
+Music_DarkCave_branch_ea333:
 	octave 4
 	note D#, 2
 	octave 3
@@ -136,14 +134,13 @@ Music_DarkCave_branch_ea333: ; ea333
 	octave 3
 	note A#, 2
 	endchannel
-; ea36a
 
-Music_DarkCave_Ch2: ; ea36a
+Music_DarkCave_Ch2:
 	dutycycle $1
 	vibrato $12, $36
 	stereopanning $f
 	notetype $c, $a7
-Music_DarkCave_branch_ea374: ; ea374
+Music_DarkCave_branch_ea374:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
 	octave 3
@@ -151,7 +148,7 @@ Music_DarkCave_branch_ea374: ; ea374
 	note A#, 16
 	note F_, 16
 	note G_, 16
-Music_DarkCave_branch_ea37e: ; ea37e
+Music_DarkCave_branch_ea37e:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
 	note __, 8
@@ -347,14 +344,13 @@ Music_DarkCave_branch_ea37e: ; ea37e
 	note F_, 16
 	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
-; ea46e
 
-Music_DarkCave_Ch3: ; ea46e
+Music_DarkCave_Ch3:
 	notetype $c, $27
-Music_DarkCave_branch_ea471: ; ea471
+Music_DarkCave_branch_ea471:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 2, Music_DarkCave_branch_ea471
-Music_DarkCave_branch_ea478: ; ea478
+Music_DarkCave_branch_ea478:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 7, Music_DarkCave_branch_ea478
 	callchannel Music_DarkCave_branch_ea4c3
@@ -386,9 +382,8 @@ Music_DarkCave_branch_ea478: ; ea478
 	callchannel Music_DarkCave_branch_ea4a7
 	callchannel Music_DarkCave_branch_ea4a7
 	loopchannel 0, Music_DarkCave_branch_ea478
-; ea4a7
 
-Music_DarkCave_branch_ea4a7: ; ea4a7
+Music_DarkCave_branch_ea4a7:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -417,9 +412,8 @@ Music_DarkCave_branch_ea4a7: ; ea4a7
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4c3
 
-Music_DarkCave_branch_ea4c3: ; ea4c3
+Music_DarkCave_branch_ea4c3:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -431,9 +425,8 @@ Music_DarkCave_branch_ea4c3: ; ea4c3
 	octave 2
 	note A#, 12
 	endchannel
-; ea4ce
 
-Music_DarkCave_branch_ea4ce: ; ea4ce
+Music_DarkCave_branch_ea4ce:
 	octave 2
 	note C_, 4
 	note G_, 2
@@ -462,12 +455,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4ea
 
-Music_DarkCave_Ch4: ; ea4ea
+Music_DarkCave_Ch4:
 	togglenoise $3
 	notetype $c
-Music_DarkCave_branch_ea4ee: ; ea4ee
+Music_DarkCave_branch_ea4ee:
 	stereopanning $ff
 	note D#, 8
 	note D#, 8
@@ -489,6 +481,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
-; ea50d
-
-

crysaudio/music/dragonsden.asm

@@ -1,18 +1,17 @@
-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:
+	musicheader 4, 1, Music_DragonsDen_Ch1
+	musicheader 1, 2, Music_DragonsDen_Ch2
+	musicheader 1, 3, Music_DragonsDen_Ch3
+	musicheader 1, 4, Music_DragonsDen_Ch4
 
-Music_DragonsDen_Ch1: ; eecf4
+Music_DragonsDen_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $0
 	tone $0004
 	stereopanning $f0
 	notetype $c, $80
-Music_DragonsDen_branch_eed03: ; eed03
+Music_DragonsDen_branch_eed03:
 	callchannel Music_DragonsDen_branch_eed1e
 	note __, 16
 	callchannel Music_DragonsDen_branch_eed2d
@@ -25,9 +24,8 @@ Music_DragonsDen_branch_eed03: ; eed03
 	note __, 10
 	notetype $c, $b7
 	loopchannel 0, Music_DragonsDen_branch_eed03
-; eed1e
 
-Music_DragonsDen_branch_eed1e: ; eed1e
+Music_DragonsDen_branch_eed1e:
 	octave 3
 	note A#, 12
 	note A_, 4
@@ -43,9 +41,8 @@ Music_DragonsDen_branch_eed1e: ; eed1e
 	octave 3
 	note G#, 16
 	endchannel
-; eed2d
 
-Music_DragonsDen_branch_eed2d: ; eed2d
+Music_DragonsDen_branch_eed2d:
 	intensity $b1
 	note __, 2
 	octave 4
@@ -60,14 +57,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d
 	note C#, 2
 	note C#, 2
 	endchannel
-; eed3c
 
-Music_DragonsDen_Ch2: ; eed3c
+Music_DragonsDen_Ch2:
 	dutycycle $0
 	tone $0004
 	stereopanning $f
 	notetype $c, $90
-Music_DragonsDen_branch_eed46: ; eed46
+Music_DragonsDen_branch_eed46:
 	callchannel Music_DragonsDen_branch_eed5e
 	note __, 16
 	callchannel Music_DragonsDen_branch_eed6b
@@ -77,9 +73,8 @@ Music_DragonsDen_branch_eed46: ; eed46
 	note __, 16
 	notetype $c, $c7
 	loopchannel 0, Music_DragonsDen_branch_eed46
-; eed5e
 
-Music_DragonsDen_branch_eed5e: ; eed5e
+Music_DragonsDen_branch_eed5e:
 	octave 4
 	note D#, 12
 	note D_, 4
@@ -93,11 +88,10 @@ Music_DragonsDen_branch_eed5e: ; eed5e
 	note G_, 4
 	note C#, 16
 	endchannel
-; eed6b
 
-Music_DragonsDen_branch_eed6b: ; eed6b
+Music_DragonsDen_branch_eed6b:
 	intensity $c1
-Music_DragonsDen_branch_eed6d: ; eed6d
+Music_DragonsDen_branch_eed6d:
 	octave 5
 	note C#, 4
 	octave 4
@@ -106,10 +100,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d
 	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
-; eed78
 
-Music_DragonsDen_Ch3: ; eed78
-Music_DragonsDen_branch_eed78: ; eed78
+Music_DragonsDen_Ch3:
+Music_DragonsDen_branch_eed78:
 	notetype $c, $14
 	octave 4
 	note C#, 2
@@ -136,7 +129,7 @@ Music_DragonsDen_branch_eed78: ; eed78
 	loopchannel 15, Music_DragonsDen_branch_eed78
 	note __, 16
 	notetype $6, $27
-Music_DragonsDen_branch_eed99: ; eed99
+Music_DragonsDen_branch_eed99:
 	octave 3
 	note C#, 4
 	octave 2
@@ -161,14 +154,13 @@ Music_DragonsDen_branch_eed99: ; eed99
 	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
-; eedb7
 
-Music_DragonsDen_Ch4: ; eedb7
+Music_DragonsDen_Ch4:
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-Music_DragonsDen_branch_eedbd: ; eedbd
+Music_DragonsDen_branch_eedbd:
 	stereopanning $f0
 	note F_, 4
 	stereopanning $f
@@ -177,6 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
-; eedcb
-
-

crysaudio/music/ecruteakcity.asm

@@ -1,16 +1,15 @@
-Music_EcruteakCity: ; ef2d0
-	dbw $80, Music_EcruteakCity_Ch1
-	dbw $01, Music_EcruteakCity_Ch2
-	dbw $02, Music_EcruteakCity_Ch3
-; ef2d9
+Music_EcruteakCity:
+	musicheader 3, 1, Music_EcruteakCity_Ch1
+	musicheader 1, 2, Music_EcruteakCity_Ch2
+	musicheader 1, 3, Music_EcruteakCity_Ch3
 
-Music_EcruteakCity_Ch1: ; ef2d9
+Music_EcruteakCity_Ch1:
 	tempo 197
 	volume $77
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
-Music_EcruteakCity_branch_ef2e5: ; ef2e5
+Music_EcruteakCity_branch_ef2e5:
 	notetype $c, $57
 	note __, 10
 	octave 4
@@ -145,9 +144,8 @@ Music_EcruteakCity_branch_ef2e5: ; ef2e5
 	note C_, 2
 	callchannel Music_EcruteakCity_branch_ef391
 	loopchannel 0, Music_EcruteakCity_branch_ef2e5
-; ef37f
 
-Music_EcruteakCity_branch_ef37f: ; ef37f
+Music_EcruteakCity_branch_ef37f:
 	octave 5
 	note E_, 2
 	note C_, 2
@@ -163,9 +161,8 @@ Music_EcruteakCity_branch_ef37f: ; ef37f
 	note C_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef37f
 	endchannel
-; ef391
 
-Music_EcruteakCity_branch_ef391: ; ef391
+Music_EcruteakCity_branch_ef391:
 	octave 5
 	note D_, 2
 	octave 4
@@ -211,7 +208,7 @@ Music_EcruteakCity_branch_ef391: ; ef391
 	note C_, 2
 	octave 3
 	note A_, 2
-Music_EcruteakCity_branch_ef3be: ; ef3be
+Music_EcruteakCity_branch_ef3be:
 	octave 4
 	note F_, 2
 	note A_, 2
@@ -227,7 +224,7 @@ Music_EcruteakCity_branch_ef3be: ; ef3be
 	note C_, 2
 	note F_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3be
-Music_EcruteakCity_branch_ef3d0: ; ef3d0
+Music_EcruteakCity_branch_ef3d0:
 	octave 4
 	note G_, 2
 	note B_, 2
@@ -249,13 +246,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	note G_, 16
 	dutycycle $2
 	endchannel
-; ef3eb
 
-Music_EcruteakCity_Ch2: ; ef3eb
+Music_EcruteakCity_Ch2:
 	vibrato $12, $25
 	dutycycle $3
 	stereopanning $f0
-Music_EcruteakCity_branch_ef3f2: ; ef3f2
+Music_EcruteakCity_branch_ef3f2:
 	notetype $6, $67
 	note __, 16
 	note __, 5
@@ -472,11 +468,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	note D_, 2
 	note E_, 16
 	loopchannel 0, Music_EcruteakCity_branch_ef3f2
-; ef4e1
 
-Music_EcruteakCity_Ch3: ; ef4e1
+Music_EcruteakCity_Ch3:
 	stereopanning $ff
-Music_EcruteakCity_branch_ef4e3: ; ef4e3
+Music_EcruteakCity_branch_ef4e3:
 	vibrato $12, $25
 	notetype $c, $25
 	octave 3
@@ -598,9 +593,8 @@ Music_EcruteakCity_branch_ef4e3: ; ef4e3
 	note E_, 8
 	note D_, 8
 	loopchannel 0, Music_EcruteakCity_branch_ef4e3
-; ef569
 
-Music_EcruteakCity_branch_ef569: ; ef569
+Music_EcruteakCity_branch_ef569:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -671,6 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569
 	note __, 1
 	note B_, 1
 	endchannel
-; ef5b1
-
-

crysaudio/music/elmslab.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_ElmsLab_Ch1
+	musicheader 1, 2, Music_ElmsLab_Ch2
+	musicheader 1, 3, Music_ElmsLab_Ch3
+	musicheader 1, 4, Music_ElmsLab_Ch4
 
-Music_ElmsLab_Ch1: ; ea04c
+Music_ElmsLab_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; ea04c
 	note A_, 4
 	note A_, 4
 	note A_, 2
-Music_ElmsLab_branch_ea075: ; ea075
+Music_ElmsLab_branch_ea075:
 	note __, 2
 	note A_, 2
 	note G#, 2
@@ -182,9 +181,8 @@ Music_ElmsLab_branch_ea075: ; ea075
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
-; ea128
 
-Music_ElmsLab_Ch2: ; ea128
+Music_ElmsLab_Ch2:
 	dutycycle $3
 	vibrato $10, $26
 	stereopanning $f
@@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea128
 	note C_, 4
 	note C_, 2
 	stereopanning $ff
-Music_ElmsLab_branch_ea14f: ; ea14f
+Music_ElmsLab_branch_ea14f:
 	intensity $c6
 	octave 4
 	note F_, 6
@@ -350,9 +348,8 @@ Music_ElmsLab_branch_ea14f: ; ea14f
 	octave 3
 	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
-; ea1fd
 
-Music_ElmsLab_Ch3: ; ea1fd
+Music_ElmsLab_Ch3:
 	stereopanning $f
 	notetype $c, $25
 	note __, 8
@@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1fd
 	note C_, 2
 	note D_, 2
 	note E_, 2
-Music_ElmsLab_branch_ea216: ; ea216
+Music_ElmsLab_branch_ea216:
 	note F_, 2
 	note A_, 2
 	note C_, 2
@@ -528,17 +525,13 @@ Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
-; ea2b1
 
-Music_ElmsLab_Ch4: ; ea2b1
+Music_ElmsLab_Ch4:
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 2
-Music_ElmsLab_branch_ea2b9: ; ea2b9
+Music_ElmsLab_branch_ea2b9:
 	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
-; ea2be
-
-

crysaudio/music/evolution.asm

@@ -1,30 +1,29 @@
-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:
+	musicheader 4, 1, Music_Evolution_Ch1
+	musicheader 1, 2, Music_Evolution_Ch2
+	musicheader 1, 3, Music_Evolution_Ch3
+	musicheader 1, 4, Music_Evolution_Ch4
 
-Music_Evolution_Ch1: ; f06ed
-	ftempo 132
+Music_Evolution_Ch1:
+	tempo 132
 	volume $77
 	vibrato $6, $34
 	tone $0001
 	dutycycle $2
 	notetype $c, $92
 	octave 3
-	unknownmusic0xe0 $0, $4a
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 $0, $4a
+	slidepitchto 1, 4, A_
 	note G_, 1
-	unknownmusic0xe0 $0, $4a
+	slidepitchto 1, 4, A_
 	note C_, 1
-	unknownmusic0xe0 $0, $4a
+	slidepitchto 1, 4, A_
 	note G_, 1
 	note __, 4
 	dutycycle $3
 	stereopanning $f
-Music_Evolution_branch_f0713: ; f0713
+Music_Evolution_branch_f0713:
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
 	note F#, 4
@@ -39,9 +38,8 @@ Music_Evolution_branch_f0713: ; f0713
 	notetype $c, $a4
 	note G#, 4
 	loopchannel 0, Music_Evolution_branch_f0713
-; f0737
 
-Music_Evolution_branch_f0737: ; f0737
+Music_Evolution_branch_f0737:
 	notetype $c, $a2
 	octave 3
 	note C_, 4
@@ -52,9 +50,8 @@ Music_Evolution_branch_f0737: ; f0737
 	note G_, 4
 	note C_, 4
 	endchannel
-; f0743
 
-Music_Evolution_branch_f0743: ; f0743
+Music_Evolution_branch_f0743:
 	notetype $c, $a2
 	octave 3
 	note D_, 4
@@ -65,9 +62,8 @@ Music_Evolution_branch_f0743: ; f0743
 	note A_, 4
 	note D_, 4
 	endchannel
-; f074f
 
-Music_Evolution_Ch2: ; f074f
+Music_Evolution_Ch2:
 	dutycycle $2
 	vibrato $8, $25
 	notetype $c, $a2
@@ -79,7 +75,7 @@ Music_Evolution_Ch2: ; f074f
 	note __, 4
 	dutycycle $3
 	stereopanning $f0
-Music_Evolution_branch_f0761: ; f0761
+Music_Evolution_branch_f0761:
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
 	note A_, 4
@@ -96,9 +92,8 @@ Music_Evolution_branch_f0761: ; f0761
 	note C#, 4
 	octave 3
 	loopchannel 0, Music_Evolution_branch_f0761
-; f0787
 
-Music_Evolution_branch_f0787: ; f0787
+Music_Evolution_branch_f0787:
 	notetype $c, $b2
 	octave 3
 	note G_, 4
@@ -109,9 +104,8 @@ Music_Evolution_branch_f0787: ; f0787
 	note D_, 4
 	note G_, 4
 	endchannel
-; f0793
 
-Music_Evolution_branch_f0793: ; f0793
+Music_Evolution_branch_f0793:
 	notetype $c, $b2
 	octave 3
 	note A_, 4
@@ -122,12 +116,11 @@ Music_Evolution_branch_f0793: ; f0793
 	note E_, 4
 	note A_, 4
 	endchannel
-; f079f
 
-Music_Evolution_Ch3: ; f079f
+Music_Evolution_Ch3:
 	notetype $c, $16
 	note __, 8
-Music_Evolution_branch_f07a3: ; f07a3
+Music_Evolution_branch_f07a3:
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
 	note A_, 4
@@ -142,9 +135,8 @@ Music_Evolution_branch_f07a3: ; f07a3
 	octave 4
 	note C#, 4
 	loopchannel 0, Music_Evolution_branch_f07a3
-; f07bf
 
-Music_Evolution_branch_f07bf: ; f07bf
+Music_Evolution_branch_f07bf:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -167,9 +159,8 @@ Music_Evolution_branch_f07bf: ; f07bf
 	note A_, 2
 	note __, 2
 	endchannel
-; f07d5
 
-Music_Evolution_branch_f07d5: ; f07d5
+Music_Evolution_branch_f07d5:
 	octave 2
 	note B_, 2
 	note __, 2
@@ -192,13 +183,12 @@ Music_Evolution_branch_f07d5: ; f07d5
 	note A_, 2
 	note __, 2
 	endchannel
-; f07eb
 
-Music_Evolution_Ch4: ; f07eb
+Music_Evolution_Ch4:
 	togglenoise $5
 	notetype $c
 	note __, 8
-Music_Evolution_branch_f07f0: ; f07f0
+Music_Evolution_branch_f07f0:
 	stereopanning $f0
 	note A#, 6
 	note A#, 4
@@ -207,6 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
-; f07fd
-
-

crysaudio/music/gamecorner.asm

@@ -1,17 +1,16 @@
-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:
+	musicheader 4, 1, Music_GameCorner_Ch1
+	musicheader 1, 2, Music_GameCorner_Ch2
+	musicheader 1, 3, Music_GameCorner_Ch3
+	musicheader 1, 4, Music_GameCorner_Ch4
 
-Music_GameCorner_Ch1: ; edd79
+Music_GameCorner_Ch1:
 	tempo 147
 	volume $77
 	stereopanning $f
 	notetype $c, $91
 	note __, 8
-Music_GameCorner_branch_edd84: ; edd84
+Music_GameCorner_branch_edd84:
 	intensity $91
 	note __, 16
 	note __, 16
@@ -39,7 +38,7 @@ Music_GameCorner_branch_edd84: ; edd84
 	note G#, 2
 	note G_, 2
 	intensity $71
-Music_GameCorner_branch_eddb1: ; eddb1
+Music_GameCorner_branch_eddb1:
 	octave 4
 	note G#, 1
 	octave 5
@@ -47,7 +46,7 @@ Music_GameCorner_branch_eddb1: ; eddb1
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_eddb1
-Music_GameCorner_branch_eddbb: ; eddbb
+Music_GameCorner_branch_eddbb:
 	octave 4
 	note A#, 1
 	octave 5
@@ -55,7 +54,7 @@ Music_GameCorner_branch_eddbb: ; eddbb
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddbb
-Music_GameCorner_branch_eddc5: ; eddc5
+Music_GameCorner_branch_eddc5:
 	octave 4
 	note D#, 1
 	note G_, 1
@@ -64,7 +63,7 @@ Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
 	note G_, 1
 	loopchannel 4, Music_GameCorner_branch_eddc5
-Music_GameCorner_branch_eddd0: ; eddd0
+Music_GameCorner_branch_eddd0:
 	octave 4
 	note F_, 1
 	note A_, 1
@@ -73,7 +72,7 @@ Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
 	note A_, 1
 	loopchannel 4, Music_GameCorner_branch_eddd0
-Music_GameCorner_branch_edddb: ; edddb
+Music_GameCorner_branch_edddb:
 	octave 4
 	note G#, 1
 	octave 5
@@ -81,7 +80,7 @@ Music_GameCorner_branch_edddb: ; edddb
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_edddb
-Music_GameCorner_branch_edde5: ; edde5
+Music_GameCorner_branch_edde5:
 	octave 4
 	note A#, 1
 	octave 5
@@ -89,7 +88,7 @@ Music_GameCorner_branch_edde5: ; edde5
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_edde5
-Music_GameCorner_branch_eddef: ; eddef
+Music_GameCorner_branch_eddef:
 	octave 4
 	note B_, 1
 	octave 5
@@ -104,9 +103,8 @@ Music_GameCorner_branch_eddef: ; eddef
 	note F_, 2
 	note F_, 9
 	loopchannel 0, Music_GameCorner_branch_edd84
-; ede03
 
-Music_GameCorner_branch_ede03: ; ede03
+Music_GameCorner_branch_ede03:
 	note __, 2
 	octave 4
 	note A#, 3
@@ -123,9 +121,8 @@ Music_GameCorner_branch_ede03: ; ede03
 	note G#, 1
 	note A#, 3
 	endchannel
-; ede13
 
-Music_GameCorner_branch_ede13: ; ede13
+Music_GameCorner_branch_ede13:
 	note __, 2
 	octave 4
 	note A#, 3
@@ -135,14 +132,13 @@ Music_GameCorner_branch_ede13: ; ede13
 	note F_, 3
 	note F_, 2
 	endchannel
-; ede1c
 
-Music_GameCorner_Ch2: ; ede1c
+Music_GameCorner_Ch2:
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $a1
 	note __, 8
-Music_GameCorner_branch_ede25: ; ede25
+Music_GameCorner_branch_ede25:
 	intensity $92
 	dutycycle $1
 	callchannel Music_GameCorner_branch_ede75
@@ -207,9 +203,8 @@ Music_GameCorner_branch_ede25: ; ede25
 	note A#, 9
 	intensity $a4
 	loopchannel 0, Music_GameCorner_branch_ede25
-; ede75
 
-Music_GameCorner_branch_ede75: ; ede75
+Music_GameCorner_branch_ede75:
 	octave 1
 	note C_, 2
 	octave 3
@@ -319,13 +314,12 @@ Music_GameCorner_branch_ede75: ; ede75
 	note D_, 2
 	note D#, 2
 	endchannel
-; edee8
 
-Music_GameCorner_Ch3: ; edee8
+Music_GameCorner_Ch3:
 	vibrato $8, $22
 	notetype $c, $14
 	note __, 8
-Music_GameCorner_branch_edeef: ; edeef
+Music_GameCorner_branch_edeef:
 	stereopanning $ff
 	notetype $c, $14
 	callchannel Music_GameCorner_branch_edfdd
@@ -504,9 +498,8 @@ Music_GameCorner_branch_edeef: ; edeef
 	note E_, 1
 	note D_, 1
 	loopchannel 0, Music_GameCorner_branch_edeef
-; edfdd
 
-Music_GameCorner_branch_edfdd: ; edfdd
+Music_GameCorner_branch_edfdd:
 	octave 2
 	note C_, 1
 	octave 3
@@ -534,9 +527,8 @@ Music_GameCorner_branch_edfdd: ; edfdd
 	octave 4
 	note A_, 2
 	endchannel
-; edff8
 
-Music_GameCorner_branch_edff8: ; edff8
+Music_GameCorner_branch_edff8:
 	octave 2
 	note C_, 1
 	octave 3
@@ -557,9 +549,8 @@ Music_GameCorner_branch_edff8: ; edff8
 	note A_, 1
 	note __, 1
 	endchannel
-; ee00c
 
-Music_GameCorner_branch_ee00c: ; ee00c
+Music_GameCorner_branch_ee00c:
 	octave 2
 	note F_, 1
 	octave 3
@@ -584,9 +575,8 @@ Music_GameCorner_branch_ee00c: ; ee00c
 	note C_, 1
 	note D_, 3
 	endchannel
-; ee024
 
-Music_GameCorner_branch_ee024: ; ee024
+Music_GameCorner_branch_ee024:
 	octave 2
 	note F_, 1
 	octave 3
@@ -614,9 +604,8 @@ Music_GameCorner_branch_ee024: ; ee024
 	note F_, 1
 	note __, 1
 	endchannel
-; ee03f
 
-Music_GameCorner_branch_ee03f: ; ee03f
+Music_GameCorner_branch_ee03f:
 	octave 2
 	note F_, 2
 	note __, 1
@@ -665,9 +654,8 @@ Music_GameCorner_branch_ee03f: ; ee03f
 	octave 3
 	note D_, 1
 	endchannel
-; ee06f
 
-Music_GameCorner_Ch4: ; ee06f
+Music_GameCorner_Ch4:
 	togglenoise $3
 	notetype $c
 	notetype $8
@@ -680,9 +668,9 @@ Music_GameCorner_Ch4: ; ee06f
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee07f: ; ee07f
+Music_GameCorner_branch_ee07f:
 	callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee082: ; ee082
+Music_GameCorner_branch_ee082:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -693,7 +681,7 @@ Music_GameCorner_branch_ee082: ; ee082
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee082
 	callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee091: ; ee091
+Music_GameCorner_branch_ee091:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -708,7 +696,7 @@ Music_GameCorner_branch_ee091: ; ee091
 	note D_, 1
 	note F#, 2
 	callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee0a4: ; ee0a4
+Music_GameCorner_branch_ee0a4:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -719,7 +707,7 @@ Music_GameCorner_branch_ee0a4: ; ee0a4
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee0a4
 	callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee0b3: ; ee0b3
+Music_GameCorner_branch_ee0b3:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -739,7 +727,7 @@ Music_GameCorner_branch_ee0b3: ; ee0b3
 	note D_, 1
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee0c9: ; ee0c9
+Music_GameCorner_branch_ee0c9:
 	note A#, 2
 	note F#, 1
 	note D#, 1
@@ -768,7 +756,7 @@ Music_GameCorner_branch_ee0c9: ; ee0c9
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee0e8: ; ee0e8
+Music_GameCorner_branch_ee0e8:
 	note A#, 2
 	note F#, 1
 	note D#, 1
@@ -793,9 +781,8 @@ Music_GameCorner_branch_ee0e8: ; ee0e8
 	note D_, 1
 	note D#, 2
 	loopchannel 0, Music_GameCorner_branch_ee07f
-; ee106
 
-Music_GameCorner_branch_ee106: ; ee106
+Music_GameCorner_branch_ee106:
 	note C_, 2
 	note F#, 2
 	note D_, 2
@@ -805,9 +792,8 @@ Music_GameCorner_branch_ee106: ; ee106
 	note D_, 2
 	note F#, 2
 	endchannel
-; ee10f
 
-Music_GameCorner_branch_ee10f: ; ee10f
+Music_GameCorner_branch_ee10f:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -818,6 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f
 	note D_, 1
 	note F#, 2
 	endchannel
-; ee119
-
-

crysaudio/music/goldenrodcity.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_GoldenrodCity_Ch1
+	musicheader 1, 2, Music_GoldenrodCity_Ch2
+	musicheader 1, 3, Music_GoldenrodCity_Ch3
+	musicheader 1, 4, Music_GoldenrodCity_Ch4
 
-Music_GoldenrodCity_Ch1: ; eb45f
+Music_GoldenrodCity_Ch1:
 	stereopanning $f
 	tempo 176
 	volume $77
@@ -14,7 +13,7 @@ Music_GoldenrodCity_Ch1: ; eb45f
 	note __, 16
 	note __, 16
 	note __, 16
-Music_GoldenrodCity_branch_eb46d: ; eb46d
+Music_GoldenrodCity_branch_eb46d:
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
 	octave 3
@@ -56,9 +55,8 @@ Music_GoldenrodCity_branch_eb46d: ; eb46d
 	octave 4
 	note C_, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb46d
-; eb4a9
 
-Music_GoldenrodCity_branch_eb4a9: ; eb4a9
+Music_GoldenrodCity_branch_eb4a9:
 	octave 4
 	note C#, 2
 	octave 3
@@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb4a9: ; eb4a9
 	octave 4
 	note C#, 2
 	endchannel
-; eb4d1
 
-Music_GoldenrodCity_branch_eb4d1: ; eb4d1
+Music_GoldenrodCity_branch_eb4d1:
 	octave 4
 	note F_, 1
 	note C#, 1
@@ -174,14 +171,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1
 	note D#, 1
 	note F#, 1
 	endchannel
-; eb519
 
-Music_GoldenrodCity_Ch2: ; eb519
+Music_GoldenrodCity_Ch2:
 	stereopanning $f0
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $97
-Music_GoldenrodCity_branch_eb523: ; eb523
+Music_GoldenrodCity_branch_eb523:
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
 	octave 4
@@ -216,9 +212,8 @@ Music_GoldenrodCity_branch_eb523: ; eb523
 	octave 4
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb523
-; eb555
 
-Music_GoldenrodCity_branch_eb555: ; eb555
+Music_GoldenrodCity_branch_eb555:
 	octave 4
 	note F_, 4
 	note C#, 4
@@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb555: ; eb555
 	note F#, 2
 	dutycycle $1
 	endchannel
-; eb572
 
-Music_GoldenrodCity_branch_eb572: ; eb572
+Music_GoldenrodCity_branch_eb572:
 	note C#, 6
 	note F_, 6
 	note C#, 4
@@ -268,13 +262,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572
 	note C_, 4
 	note D#, 2
 	endchannel
-; eb584
 
-Music_GoldenrodCity_Ch3: ; eb584
+Music_GoldenrodCity_Ch3:
 	stereopanning $ff
 	vibrato $8, $23
 	notetype $c, $25
-Music_GoldenrodCity_branch_eb58c: ; eb58c
+Music_GoldenrodCity_branch_eb58c:
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5d2
@@ -294,9 +287,8 @@ Music_GoldenrodCity_branch_eb58c: ; eb58c
 	octave 2
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb58c
-; eb5aa
 
-Music_GoldenrodCity_branch_eb5aa: ; eb5aa
+Music_GoldenrodCity_branch_eb5aa:
 	octave 3
 	note C#, 4
 	note __, 2
@@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb5aa: ; eb5aa
 	note G#, 1
 	note __, 1
 	endchannel
-; eb5d2
 
-Music_GoldenrodCity_branch_eb5d2: ; eb5d2
+Music_GoldenrodCity_branch_eb5d2:
 	note C#, 1
 	note __, 1
 	octave 4
@@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2
 	note __, 2
 	note G#, 1
 	endchannel
-; eb606
 
-Music_GoldenrodCity_Ch4: ; eb606
+Music_GoldenrodCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb606
 	note D_, 1
 	note D_, 1
 	note F#, 2
-Music_GoldenrodCity_branch_eb613: ; eb613
+Music_GoldenrodCity_branch_eb613:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -447,7 +437,7 @@ Music_GoldenrodCity_branch_eb613: ; eb613
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GoldenrodCity_branch_eb650: ; eb650
+Music_GoldenrodCity_branch_eb650:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -459,9 +449,8 @@ Music_GoldenrodCity_branch_eb650: ; eb650
 	loopchannel 3, Music_GoldenrodCity_branch_eb650
 	callchannel Music_GoldenrodCity_branch_eb663
 	loopchannel 0, Music_GoldenrodCity_branch_eb613
-; eb663
 
-Music_GoldenrodCity_branch_eb663: ; eb663
+Music_GoldenrodCity_branch_eb663:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb663: ; eb663
 	note D_, 1
 	note F#, 2
 	endchannel
-; eb66d
 
-Music_GoldenrodCity_branch_eb66d: ; eb66d
+Music_GoldenrodCity_branch_eb66d:
 	note D#, 2
 	note D_, 1
 	note D#, 3
@@ -484,6 +472,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb676
-
-

crysaudio/music/goldsilveropening.asm

@@ -1,11 +1,10 @@
-Music_GoldSilverOpening: ; f7055
-	dbw $80, Music_GoldSilverOpening_Ch1
-	dbw $01, Music_GoldSilverOpening_Ch2
-	dbw $02, Music_GoldSilverOpening_Ch3
-; f705e
+Music_GoldSilverOpening:
+	musicheader 3, 1, Music_GoldSilverOpening_Ch1
+	musicheader 1, 2, Music_GoldSilverOpening_Ch2
+	musicheader 1, 3, Music_GoldSilverOpening_Ch3
 
-Music_GoldSilverOpening_Ch1: ; f705e
-	ftempo 256
+Music_GoldSilverOpening_Ch1:
+	tempo 256
 	volume $77
 	tone $0001
 	dutycycle $2
@@ -14,7 +13,7 @@ Music_GoldSilverOpening_Ch1: ; f705e
 	octave 1
 	note G#, 16
 	note G#, 16
-	ftempo 168
+	tempo 168
 	dutycycle $3
 	notetype $6, $c7
 	octave 3
@@ -128,9 +127,8 @@ Music_GoldSilverOpening_Ch1: ; f705e
 	note G_, 2
 	note A_, 16
 	endchannel
-; f70f8
 
-Music_GoldSilverOpening_Ch2: ; f70f8
+Music_GoldSilverOpening_Ch2:
 	tone $0001
 	stereopanning $f
 	notetype $c, $b7
@@ -309,9 +307,8 @@ Music_GoldSilverOpening_Ch2: ; f70f8
 	note C_, 4
 	note D#, 16
 	endchannel
-; f71c8
 
-Music_GoldSilverOpening_Ch3: ; f71c8
+Music_GoldSilverOpening_Ch3:
 	notetype $6, $10
 	octave 2
 	note D_, 4
@@ -616,6 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8
 	note C_, 1
 	note __, 13
 	endchannel
-; f7308
-
-

crysaudio/music/goldsilveropening2.asm

@@ -1,12 +1,11 @@
-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:
+	musicheader 4, 1, Music_GoldSilverOpening2_Ch1
+	musicheader 1, 2, Music_GoldSilverOpening2_Ch2
+	musicheader 1, 3, Music_GoldSilverOpening2_Ch3
+	musicheader 1, 4, Music_GoldSilverOpening2_Ch4
 
-Music_GoldSilverOpening2_Ch1: ; f7314
-	ftempo 92
+Music_GoldSilverOpening2_Ch1:
+	tempo 92
 	volume $77
 	dutycycle $3
 	tone $0002
@@ -14,7 +13,7 @@ Music_GoldSilverOpening2_Ch1: ; f7314
 	notetype $c, $3d
 	octave 3
 	note D#, 8
-Music_GoldSilverOpening2_branch_f7325: ; f7325
+Music_GoldSilverOpening2_branch_f7325:
 	notetype $c, $c1
 	octave 3
 	note D_, 2
@@ -52,9 +51,8 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325
 	octave 4
 	note D_, 16
 	endchannel
-; f7358
 
-Music_GoldSilverOpening2_Ch2: ; f7358
+Music_GoldSilverOpening2_Ch2:
 	dutycycle $3
 	vibrato $14, $14
 	stereopanning $f0
@@ -105,9 +103,8 @@ Music_GoldSilverOpening2_Ch2: ; f7358
 	intensity $c2
 	note D_, 16
 	endchannel
-; f739c
 
-Music_GoldSilverOpening2_Ch3: ; f739c
+Music_GoldSilverOpening2_Ch3:
 	notetype $c, $17
 	note __, 8
 	octave 2
@@ -184,9 +181,8 @@ Music_GoldSilverOpening2_Ch3: ; f739c
 	note D_, 2
 	note __, 14
 	endchannel
-; f73ea
 
-Music_GoldSilverOpening2_Ch4: ; f73ea
+Music_GoldSilverOpening2_Ch4:
 	togglenoise $0
 	notetype $6
 	note D#, 2
@@ -198,7 +194,7 @@ Music_GoldSilverOpening2_Ch4: ; f73ea
 	note D_, 2
 	note D_, 2
 	notetype $c
-Music_GoldSilverOpening2_branch_f73f8: ; f73f8
+Music_GoldSilverOpening2_branch_f73f8:
 	note D_, 2
 	note D_, 2
 	note D_, 2
@@ -219,6 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
 	note C_, 16
 	endchannel
-; f7411
-
-

crysaudio/music/gym.asm

@@ -1,18 +1,17 @@
-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:
+	musicheader 4, 1, Music_Gym_Ch1
+	musicheader 1, 2, Music_Gym_Ch2
+	musicheader 1, 3, Music_Gym_Ch3
+	musicheader 1, 4, Music_Gym_Ch4
 
-Music_Gym_Ch1: ; f48ba
+Music_Gym_Ch1:
 	tempo 156
 	volume $77
 	stereopanning $f
 	vibrato $12, $24
 	dutycycle $1
 	notetype $c, $b7
-Music_Gym_branch_f48c9: ; f48c9
+Music_Gym_branch_f48c9:
 	octave 4
 	note F#, 2
 	octave 2
@@ -189,12 +188,11 @@ Music_Gym_branch_f48c9: ; f48c9
 	note F#, 1
 	note E_, 1
 	loopchannel 0, Music_Gym_branch_f48c9
-; f497c
 
-Music_Gym_Ch2: ; f497c
+Music_Gym_Ch2:
 	dutycycle $1
 	stereopanning $f0
-Music_Gym_branch_f4980: ; f4980
+Music_Gym_branch_f4980:
 	notetype $c, $c3
 	octave 2
 	note D_, 2
@@ -286,9 +284,8 @@ Music_Gym_branch_f4980: ; f4980
 	note F#, 2
 	note D_, 2
 	loopchannel 0, Music_Gym_branch_f4980
-; f49e9
 
-Music_Gym_branch_f49e9: ; f49e9
+Music_Gym_branch_f49e9:
 	octave 3
 	note D_, 3
 	octave 2
@@ -333,9 +330,8 @@ Music_Gym_branch_f49e9: ; f49e9
 	note C_, 1
 	note C_, 2
 	endchannel
-; f4a15
 
-Music_Gym_branch_f4a15: ; f4a15
+Music_Gym_branch_f4a15:
 	octave 2
 	note D_, 4
 	note D_, 2
@@ -370,12 +366,11 @@ Music_Gym_branch_f4a15: ; f4a15
 	note F#, 1
 	note F#, 1
 	endchannel
-; f4a37
 
-Music_Gym_Ch3: ; f4a37
+Music_Gym_Ch3:
 	vibrato $14, $23
 	stereopanning $ff
-Music_Gym_branch_f4a3c: ; f4a3c
+Music_Gym_branch_f4a3c:
 	notetype $c, $14
 	octave 6
 	note D_, 2
@@ -485,9 +480,8 @@ Music_Gym_branch_f4a3c: ; f4a3c
 	note F#, 8
 	note E_, 4
 	loopchannel 0, Music_Gym_branch_f4a3c
-; f4ab3
 
-Music_Gym_branch_f4ab3: ; f4ab3
+Music_Gym_branch_f4ab3:
 	octave 5
 	note A_, 6
 	octave 6
@@ -506,11 +500,10 @@ Music_Gym_branch_f4ab3: ; f4ab3
 	note G_, 1
 	note A_, 4
 	endchannel
-; f4ac5
 
-Music_Gym_Ch4: ; f4ac5
+Music_Gym_Ch4:
 	togglenoise $4
-Music_Gym_branch_f4ac7: ; f4ac7
+Music_Gym_branch_f4ac7:
 	notetype $c
 	note D_, 2
 	note C#, 1
@@ -535,7 +528,7 @@ Music_Gym_branch_f4ac7: ; f4ac7
 	note D_, 1
 	note D_, 1
 	notetype $6
-Music_Gym_branch_f4ae1: ; f4ae1
+Music_Gym_branch_f4ae1:
 	note D_, 6
 	note D_, 6
 	note D_, 4
@@ -558,7 +551,7 @@ Music_Gym_branch_f4ae1: ; f4ae1
 	note D_, 4
 	note B_, 8
 	loopchannel 4, Music_Gym_branch_f4ae1
-Music_Gym_branch_f4afa: ; f4afa
+Music_Gym_branch_f4afa:
 	note D#, 4
 	note F#, 4
 	note D_, 4
@@ -571,6 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa
 	note F#, 4
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
-; f4b0c
-
-

crysaudio/music/gymleadervictory.asm

@@ -1,12 +1,11 @@
-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:
+	musicheader 4, 1, Music_GymLeaderVictory_Ch1
+	musicheader 1, 2, Music_GymLeaderVictory_Ch2
+	musicheader 1, 3, Music_GymLeaderVictory_Ch3
+	musicheader 1, 4, Music_GymLeaderVictory_Ch4
 
-Music_GymLeaderVictory_Ch1: ; f4638
-	ftempo 116
+Music_GymLeaderVictory_Ch1:
+	tempo 116
 	volume $77
 	vibrato $12, $34
 	dutycycle $3
@@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638
 	octave 5
 	note D_, 8
 	stereopanning $f
-Music_GymLeaderVictory_branch_f4658: ; f4658
+Music_GymLeaderVictory_branch_f4658:
 	dutycycle $1
 	callchannel Music_GymLeaderVictory_branch_f4689
 	octave 4
@@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658
 	intensity $87
 	note F#, 16
 	loopchannel 0, Music_GymLeaderVictory_branch_f4658
-; f4689
 
-Music_GymLeaderVictory_branch_f4689: ; f4689
+Music_GymLeaderVictory_branch_f4689:
 	intensity $91
 	octave 3
 	note F#, 2
@@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689
 	note G_, 1
 	note D_, 1
 	endchannel
-; f46a0
 
-Music_GymLeaderVictory_branch_f46a0: ; f46a0
+Music_GymLeaderVictory_branch_f46a0:
 	intensity $87
 	octave 3
 	note F#, 14
@@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0
 	note C#, 1
 	note E_, 8
 	endchannel
-; f46bd
 
-Music_GymLeaderVictory_Ch2: ; f46bd
+Music_GymLeaderVictory_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $c, $d7
@@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd
 	octave 5
 	note D_, 1
 	note F#, 16
-Music_GymLeaderVictory_branch_f46d0: ; f46d0
+Music_GymLeaderVictory_branch_f46d0:
 	dutycycle $3
 	intensity $a1
 	callchannel Music_GymLeaderVictory_branch_f4711
@@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0
 	octave 5
 	note C#, 1
 	loopchannel 0, Music_GymLeaderVictory_branch_f46d0
-; f4711
 
-Music_GymLeaderVictory_branch_f4711: ; f4711
+Music_GymLeaderVictory_branch_f4711:
 	octave 5
 	note D_, 2
 	note C#, 2
@@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711
 	note G_, 2
 	note F#, 2
 	endchannel
-; f4720
 
-Music_GymLeaderVictory_branch_f4720: ; f4720
+Music_GymLeaderVictory_branch_f4720:
 	intensity $98
 	note A_, 6
 	note F#, 1
@@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720
 	note C#, 8
 	note C#, 8
 	endchannel
-; f4737
 
-Music_GymLeaderVictory_Ch3: ; f4737
+Music_GymLeaderVictory_Ch3:
 	notetype $c, $25
 	octave 3
 	note F#, 16
@@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737
 	octave 3
 	note C#, 2
 	stereopanning $f0
-Music_GymLeaderVictory_branch_f4744: ; f4744
+Music_GymLeaderVictory_branch_f4744:
 	note D_, 2
 	note __, 4
 	octave 2
@@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744
 	octave 3
 	note C#, 2
 	loopchannel 0, Music_GymLeaderVictory_branch_f4744
-; f479e
 
-Music_GymLeaderVictory_branch_f479e: ; f479e
+Music_GymLeaderVictory_branch_f479e:
 	octave 3
 	note D_, 2
 	note __, 2
@@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e
 	octave 2
 	note A_, 2
 	endchannel
-; f47e5
 
-Music_GymLeaderVictory_Ch4: ; f47e5
+Music_GymLeaderVictory_Ch4:
 	togglenoise $4
 	notetype $c
 	note B_, 16
 	note B_, 16
-Music_GymLeaderVictory_branch_f47eb: ; f47eb
+Music_GymLeaderVictory_branch_f47eb:
 	callchannel Music_GymLeaderVictory_branch_f480b
 	note D#, 6
 	note D#, 2
@@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	note C#, 1
 	note C#, 1
 	note C#, 1
-Music_GymLeaderVictory_branch_f47fb: ; f47fb
+Music_GymLeaderVictory_branch_f47fb:
 	note D#, 2
 	note G_, 2
 	note D_, 2
@@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb
 	note G_, 2
 	loopchannel 16, Music_GymLeaderVictory_branch_f47fb
 	loopchannel 0, Music_GymLeaderVictory_branch_f47eb
-; f480b
 
-Music_GymLeaderVictory_branch_f480b: ; f480b
+Music_GymLeaderVictory_branch_f480b:
 	note D#, 6
 	note D#, 2
 	note D#, 4
@@ -427,6 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b
 	note D#, 2
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
-; f4815
-
-

crysaudio/music/halloffame.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_HallOfFame_Ch1
+	musicheader 1, 2, Music_HallOfFame_Ch2
+	musicheader 1, 3, Music_HallOfFame_Ch3
+	musicheader 1, 4, Music_HallOfFame_Ch4
 
-Music_HallOfFame_Ch1: ; f05cb
+Music_HallOfFame_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $2
@@ -22,7 +21,7 @@ Music_HallOfFame_Ch1: ; f05cb
 	note E_, 1
 	note F_, 1
 	note F#, 1
-Music_HallOfFame_branch_f05e6: ; f05e6
+Music_HallOfFame_branch_f05e6:
 	intensity $97
 	octave 4
 	note C_, 8
@@ -46,12 +45,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6
 	note __, 16
 	note __, 16
 	loopchannel 0, Music_HallOfFame_branch_f05e6
-; f060b
 
-Music_HallOfFame_Ch2: ; f060b
+Music_HallOfFame_Ch2:
 	vibrato $8, $25
 	dutycycle $3
-Music_HallOfFame_branch_f0610: ; f0610
+Music_HallOfFame_branch_f0610:
 	notetype $c, $c4
 	octave 3
 	note G_, 2
@@ -77,12 +75,11 @@ Music_HallOfFame_branch_f0610: ; f0610
 	note A_, 4
 	note F_, 2
 	loopchannel 0, Music_HallOfFame_branch_f0610
-; f062e
 
-Music_HallOfFame_Ch3: ; f062e
-Music_HallOfFame_branch_f062e: ; f062e
+Music_HallOfFame_Ch3:
+Music_HallOfFame_branch_f062e:
 	notetype $c, $28
-Music_HallOfFame_branch_f0631: ; f0631
+Music_HallOfFame_branch_f0631:
 	octave 3
 	note D_, 2
 	note G_, 2
@@ -137,9 +134,8 @@ Music_HallOfFame_branch_f0631: ; f0631
 	note E_, 4
 	note G_, 4
 	loopchannel 0, Music_HallOfFame_branch_f062e
-; f066d
 
-Music_HallOfFame_Ch4: ; f066d
+Music_HallOfFame_Ch4:
 	togglenoise $5
 	notetype $c
 	note __, 16
@@ -147,7 +143,7 @@ Music_HallOfFame_Ch4: ; f066d
 	note __, 16
 	note __, 16
 	notetype $6
-Music_HallOfFame_branch_f0677: ; f0677
+Music_HallOfFame_branch_f0677:
 	stereopanning $f
 	note A#, 4
 	note A#, 8
@@ -174,6 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677
 	note A#, 1
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
-; f0697
-
-

crysaudio/music/healpokemon.asm

@@ -1,32 +1,30 @@
-Music_HealPokemon: ; f0697
-	dbw $80, Music_HealPokemon_Ch1
-	dbw $01, Music_HealPokemon_Ch2
-	dbw $02, Music_HealPokemon_Ch3
-; f06a0
+Music_HealPokemon:
+	musicheader 3, 1, Music_HealPokemon_Ch1
+	musicheader 1, 2, Music_HealPokemon_Ch2
+	musicheader 1, 3, Music_HealPokemon_Ch3
 
-Music_HealPokemon_Ch1: ; f06a0
-	ftempo 144
+Music_HealPokemon_Ch1:
+	tempo 144
 	volume $77
-	fdutycycle $2
+	dutycycle $2
 	tone $0001
 	notetype $c, $81
 	note __, 2
-	unknownmusic0xe0 $0, $40
+	slidepitchto 1, 4, __
 	note B_, 2
-	unknownmusic0xe0 $0, $55
+	slidepitchto 1, 5, E_
 	note B_, 2
-	unknownmusic0xe0 $0, $45
+	slidepitchto 1, 4, E_
 	note E_, 2
 	note __, 4
-	unknownmusic0xe0 $0, $30
+	slidepitchto 1, 3, __
 	note E_, 4
-	unknownmusic0xe0 $0, $40
+	slidepitchto 1, 4, __
 	note B_, 4
 	endchannel
-; f06c4
 
-Music_HealPokemon_Ch2: ; f06c4
-	fdutycycle $2
+Music_HealPokemon_Ch2:
+	dutycycle $2
 	notetype $c, $c3
 	octave 4
 	note B_, 4
@@ -37,9 +35,8 @@ Music_HealPokemon_Ch2: ; f06c4
 	octave 5
 	note E_, 8
 	endchannel
-; f06d4
 
-Music_HealPokemon_Ch3: ; f06d4
+Music_HealPokemon_Ch3:
 	notetype $c, $10
 	octave 4
 	note E_, 2
@@ -51,6 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4
 	note E_, 6
 	note __, 2
 	endchannel
-; f06e1
-
-

crysaudio/music/indigoplateau.asm

@@ -1,17 +1,16 @@
-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:
+	musicheader 4, 1, Music_IndigoPlateau_Ch1
+	musicheader 1, 2, Music_IndigoPlateau_Ch2
+	musicheader 1, 3, Music_IndigoPlateau_Ch3
+	musicheader 1, 4, Music_IndigoPlateau_Ch4
 
-Music_IndigoPlateau_Ch1: ; ee85e
+Music_IndigoPlateau_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
 	tone $0002
 	stereopanning $f
-Music_IndigoPlateau_branch_ee86a: ; ee86a
+Music_IndigoPlateau_branch_ee86a:
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
 	note D_, 4
@@ -24,9 +23,8 @@ Music_IndigoPlateau_branch_ee86a: ; ee86a
 	callchannel Music_IndigoPlateau_branch_ee881
 	note A#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee86a
-; ee881
 
-Music_IndigoPlateau_branch_ee881: ; ee881
+Music_IndigoPlateau_branch_ee881:
 	notetype $c, $b6
 	octave 2
 	note A_, 4
@@ -40,13 +38,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881
 	note A_, 2
 	intensity $a0
 	endchannel
-; ee892
 
-Music_IndigoPlateau_Ch2: ; ee892
+Music_IndigoPlateau_Ch2:
 	dutycycle $3
 	vibrato $10, $22
 	stereopanning $f0
-Music_IndigoPlateau_branch_ee899: ; ee899
+Music_IndigoPlateau_branch_ee899:
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
@@ -100,9 +97,8 @@ Music_IndigoPlateau_branch_ee899: ; ee899
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee899
-; ee8e9
 
-Music_IndigoPlateau_branch_ee8e9: ; ee8e9
+Music_IndigoPlateau_branch_ee8e9:
 	notetype $c, $c6
 	octave 3
 	note D_, 4
@@ -116,11 +112,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9
 	note D_, 2
 	intensity $b0
 	endchannel
-; ee8fa
 
-Music_IndigoPlateau_Ch3: ; ee8fa
+Music_IndigoPlateau_Ch3:
 	notetype $c, $19
-Music_IndigoPlateau_branch_ee8fd: ; ee8fd
+Music_IndigoPlateau_branch_ee8fd:
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
 	note A_, 4
@@ -134,9 +129,8 @@ Music_IndigoPlateau_branch_ee8fd: ; ee8fd
 	octave 3
 	note F#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee8fd
-; ee915
 
-Music_IndigoPlateau_branch_ee915: ; ee915
+Music_IndigoPlateau_branch_ee915:
 	octave 3
 	note D_, 1
 	note __, 3
@@ -152,13 +146,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915
 	note A_, 1
 	note __, 3
 	endchannel
-; ee924
 
-Music_IndigoPlateau_Ch4: ; ee924
+Music_IndigoPlateau_Ch4:
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
-Music_IndigoPlateau_branch_ee92a: ; ee92a
+Music_IndigoPlateau_branch_ee92a:
 	note D#, 4
 	note D_, 2
 	note D#, 2
@@ -187,6 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note D_, 2
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
-; ee94b
-
-

crysaudio/music/johtogymbattle.asm

@@ -1,24 +1,23 @@
-Music_JohtoGymBattle: ; ea50d
-	dbw $80, Music_JohtoGymBattle_Ch1
-	dbw $01, Music_JohtoGymBattle_Ch2
-	dbw $02, Music_JohtoGymBattle_Ch3
-; ea516
+Music_JohtoGymBattle:
+	musicheader 3, 1, Music_JohtoGymBattle_Ch1
+	musicheader 1, 2, Music_JohtoGymBattle_Ch2
+	musicheader 1, 3, Music_JohtoGymBattle_Ch3
 
-Music_JohtoGymBattle_Ch1: ; ea516
-	ftempo 101
+Music_JohtoGymBattle_Ch1:
+	tempo 101
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $b2
-Music_JohtoGymBattle_branch_ea526: ; ea526
+Music_JohtoGymBattle_branch_ea526:
 	octave 3
 	note A#, 1
 	note A_, 1
 	note G#, 1
 	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
-Music_JohtoGymBattle_branch_ea52f: ; ea52f
+Music_JohtoGymBattle_branch_ea52f:
 	note C#, 1
 	note C_, 1
 	octave 2
@@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	octave 3
 	note G#, 2
 	note F_, 2
-Music_JohtoGymBattle_branch_ea55d: ; ea55d
+Music_JohtoGymBattle_branch_ea55d:
 	intensity $b5
 	note D_, 6
 	note G_, 6
@@ -286,21 +285,20 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
-; ea65f
 
-Music_JohtoGymBattle_Ch2: ; ea65f
+Music_JohtoGymBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-Music_JohtoGymBattle_branch_ea66a: ; ea66a
+Music_JohtoGymBattle_branch_ea66a:
 	octave 4
 	note F#, 1
 	note F_, 1
 	note E_, 1
 	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-Music_JohtoGymBattle_branch_ea673: ; ea673
+Music_JohtoGymBattle_branch_ea673:
 	note F#, 1
 	note F_, 1
 	note F#, 1
@@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea673: ; ea673
 	octave 3
 	note G#, 1
 	note A_, 1
-Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
+Music_JohtoGymBattle_branch_ea6ee:
 	intensity $c7
 	note A#, 8
 	intensity $c4
@@ -613,9 +611,8 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	note B_, 16
 	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
-; ea7f4
 
-Music_JohtoGymBattle_Ch3: ; ea7f4
+Music_JohtoGymBattle_Ch3:
 	notetype $c, $19
 	octave 4
 	note F_, 1
@@ -685,7 +682,7 @@ Music_JohtoGymBattle_Ch3: ; ea7f4
 	octave 3
 	note A#, 2
 	note G#, 2
-Music_JohtoGymBattle_branch_ea83f: ; ea83f
+Music_JohtoGymBattle_branch_ea83f:
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea96a
@@ -900,9 +897,8 @@ Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea83f
-; ea952
 
-Music_JohtoGymBattle_branch_ea952: ; ea952
+Music_JohtoGymBattle_branch_ea952:
 	note G_, 2
 	note D_, 2
 	note F_, 2
@@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea952: ; ea952
 	note D#, 2
 	note F_, 2
 	endchannel
-; ea963
 
-Music_JohtoGymBattle_branch_ea963: ; ea963
+Music_JohtoGymBattle_branch_ea963:
 	note D_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea963
 	endchannel
-; ea96a
 
-Music_JohtoGymBattle_branch_ea96a: ; ea96a
+Music_JohtoGymBattle_branch_ea96a:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea96a
 	endchannel
-; ea971
 
-Music_JohtoGymBattle_branch_ea971: ; ea971
+Music_JohtoGymBattle_branch_ea971:
 	note C_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea971
 	endchannel
-; ea978
 
-Music_JohtoGymBattle_branch_ea978: ; ea978
+Music_JohtoGymBattle_branch_ea978:
 	octave 2
 	note A#, 2
 	octave 3
@@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea978: ; ea978
 	octave 2
 	note A#, 2
 	endchannel
-; ea983
 
-Music_JohtoGymBattle_branch_ea983: ; ea983
+Music_JohtoGymBattle_branch_ea983:
 	octave 3
 	note C_, 2
 	note G_, 2
@@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea983: ; ea983
 	octave 3
 	note C_, 2
 	endchannel
-; ea990
 
-Music_JohtoGymBattle_branch_ea990: ; ea990
+Music_JohtoGymBattle_branch_ea990:
 	note C#, 2
 	note G#, 2
 	octave 4
@@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea990: ; ea990
 	octave 3
 	note C#, 2
 	endchannel
-; ea99c
 
-Music_JohtoGymBattle_branch_ea99c: ; ea99c
+Music_JohtoGymBattle_branch_ea99c:
 	octave 3
 	note D_, 2
 	note A_, 2
@@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea99c: ; ea99c
 	octave 3
 	note D_, 2
 	endchannel
-; ea9a9
 
-Music_JohtoGymBattle_branch_ea9a9: ; ea9a9
+Music_JohtoGymBattle_branch_ea9a9:
 	octave 3
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
 	endchannel
-; ea9b1
 
-Music_JohtoGymBattle_branch_ea9b1: ; ea9b1
+Music_JohtoGymBattle_branch_ea9b1:
 	note C#, 2
 	note F#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
 	endchannel
-; ea9b8
 
-Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
+Music_JohtoGymBattle_branch_ea9b8:
 	note F_, 2
 	note C_, 2
 	note D#, 2
@@ -1029,6 +1015,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
 	note F_, 2
 	note D#, 2
 	endchannel
-; ea9c1
-
-

crysaudio/music/johtotrainerbattle.asm

@@ -1,11 +1,10 @@
-Music_JohtoTrainerBattle: ; f6096
-	dbw $80, Music_JohtoTrainerBattle_Ch1
-	dbw $01, Music_JohtoTrainerBattle_Ch2
-	dbw $02, Music_JohtoTrainerBattle_Ch3
-; f609f
+Music_JohtoTrainerBattle:
+	musicheader 3, 1, Music_JohtoTrainerBattle_Ch1
+	musicheader 1, 2, Music_JohtoTrainerBattle_Ch2
+	musicheader 1, 3, Music_JohtoTrainerBattle_Ch3
 
-Music_JohtoTrainerBattle_Ch1: ; f609f
-	ftempo 102
+Music_JohtoTrainerBattle_Ch1:
+	tempo 102
 	volume $77
 	dutycycle $3
 	tone $0002
@@ -86,7 +85,7 @@ Music_JohtoTrainerBattle_Ch1: ; f609f
 	note F_, 6
 	intensity $b7
 	note G_, 4
-Music_JohtoTrainerBattle_branch_f6102: ; f6102
+Music_JohtoTrainerBattle_branch_f6102:
 	intensity $b4
 	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
@@ -243,7 +242,7 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $a7
 	note D#, 12
 	note __, 16
-Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
+Music_JohtoTrainerBattle_branch_f61bd:
 	intensity $b7
 	note F_, 8
 	intensity $b4
@@ -428,9 +427,8 @@ Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $a7
 	note F_, 6
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6102
-; f629f
 
-Music_JohtoTrainerBattle_branch_f629f: ; f629f
+Music_JohtoTrainerBattle_branch_f629f:
 	octave 3
 	note E_, 2
 	note D_, 2
@@ -451,9 +449,8 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f
 	note F_, 2
 	note D_, 2
 	endchannel
-; f62b3
 
-Music_JohtoTrainerBattle_Ch2: ; f62b3
+Music_JohtoTrainerBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -547,7 +544,7 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3
 	note E_, 2
 	intensity $c7
 	note B_, 4
-Music_JohtoTrainerBattle_branch_f632a: ; f632a
+Music_JohtoTrainerBattle_branch_f632a:
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
 	note A#, 8
@@ -584,7 +581,7 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	note A_, 16
 	intensity $b7
 	note A_, 16
-Music_JohtoTrainerBattle_branch_f635a: ; f635a
+Music_JohtoTrainerBattle_branch_f635a:
 	intensity $c3
 	octave 3
 	note A_, 2
@@ -607,7 +604,7 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	note G_, 2
 	note A_, 2
 	note A#, 2
-Music_JohtoTrainerBattle_branch_f6376: ; f6376
+Music_JohtoTrainerBattle_branch_f6376:
 	note G_, 2
 	note F_, 2
 	note G_, 2
@@ -685,7 +682,7 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $a2
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
-Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
+Music_JohtoTrainerBattle_branch_f63dd:
 	octave 4
 	note D#, 2
 	octave 3
@@ -829,9 +826,8 @@ Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f632a
-; f649a
 
-Music_JohtoTrainerBattle_branch_f649a: ; f649a
+Music_JohtoTrainerBattle_branch_f649a:
 	octave 3
 	note A_, 6
 	note A_, 4
@@ -840,9 +836,8 @@ Music_JohtoTrainerBattle_branch_f649a: ; f649a
 	intensity $c7
 	note A#, 4
 	endchannel
-; f64a3
 
-Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
+Music_JohtoTrainerBattle_branch_f64a3:
 	intensity $c7
 	octave 3
 	note A_, 6
@@ -859,9 +854,8 @@ Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
 	intensity $b7
 	note F_, 8
 	endchannel
-; f64b6
 
-Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
+Music_JohtoTrainerBattle_branch_f64b6:
 	octave 3
 	note A#, 2
 	note D#, 2
@@ -870,9 +864,8 @@ Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
 	octave 3
 	note D#, 2
 	endchannel
-; f64be
 
-Music_JohtoTrainerBattle_branch_f64be: ; f64be
+Music_JohtoTrainerBattle_branch_f64be:
 	intensity $c7
 	octave 4
 	note F_, 4
@@ -891,9 +884,8 @@ Music_JohtoTrainerBattle_branch_f64be: ; f64be
 	note D#, 1
 	note F_, 2
 	endchannel
-; f64d2
 
-Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
+Music_JohtoTrainerBattle_branch_f64d2:
 	intensity $c7
 	octave 4
 	note D#, 6
@@ -905,9 +897,8 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
 	note F_, 4
 	note D#, 4
 	endchannel
-; f64de
 
-Music_JohtoTrainerBattle_Ch3: ; f64de
+Music_JohtoTrainerBattle_Ch3:
 	notetype $c, $19
 	octave 4
 	note E_, 1
@@ -941,7 +932,7 @@ Music_JohtoTrainerBattle_Ch3: ; f64de
 	note A#, 2
 	note A_, 2
 	note G#, 2
-Music_JohtoTrainerBattle_branch_f6501: ; f6501
+Music_JohtoTrainerBattle_branch_f6501:
 	note A_, 2
 	note E_, 2
 	note F#, 2
@@ -983,7 +974,7 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501
 	note A_, 2
 	note A#, 2
 	note G_, 2
-Music_JohtoTrainerBattle_branch_f6531: ; f6531
+Music_JohtoTrainerBattle_branch_f6531:
 	callchannel Music_JohtoTrainerBattle_branch_f6681
 	note E_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6692
@@ -1056,7 +1047,7 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	note F_, 8
 	note E_, 8
 	note D#, 8
-Music_JohtoTrainerBattle_branch_f6591: ; f6591
+Music_JohtoTrainerBattle_branch_f6591:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -1079,13 +1070,13 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	note F_, 2
 	note D#, 2
 	note G_, 2
-Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
+Music_JohtoTrainerBattle_branch_f65ac:
 	note C#, 2
 	note G#, 2
 	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
 	note B_, 2
 	note A_, 2
-Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
+Music_JohtoTrainerBattle_branch_f65b4:
 	note D_, 2
 	note A_, 2
 	loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4
@@ -1095,17 +1086,17 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
 	note F#, 2
 	note G#, 2
 	note A_, 2
-Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
+Music_JohtoTrainerBattle_branch_f65c0:
 	note A#, 4
 	note D#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
-Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
+Music_JohtoTrainerBattle_branch_f65c6:
 	octave 4
 	note G_, 4
 	octave 3
 	note A#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
-Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
+Music_JohtoTrainerBattle_branch_f65ce:
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
 	note D#, 2
 	note F_, 8
@@ -1179,11 +1170,11 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	note C_, 2
 	octave 3
 	note A#, 2
-Music_JohtoTrainerBattle_branch_f661e: ; f661e
+Music_JohtoTrainerBattle_branch_f661e:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
-Music_JohtoTrainerBattle_branch_f6624: ; f6624
+Music_JohtoTrainerBattle_branch_f6624:
 	note C#, 2
 	note G#, 2
 	loopchannel 6, Music_JohtoTrainerBattle_branch_f6624
@@ -1193,11 +1184,11 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624
 	octave 3
 	note A#, 2
 	note G#, 2
-Music_JohtoTrainerBattle_branch_f6630: ; f6630
+Music_JohtoTrainerBattle_branch_f6630:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
-Music_JohtoTrainerBattle_branch_f6636: ; f6636
+Music_JohtoTrainerBattle_branch_f6636:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f6636
@@ -1256,9 +1247,8 @@ Music_JohtoTrainerBattle_branch_f6636: ; f6636
 	octave 4
 	note D_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6531
-; f6676
 
-Music_JohtoTrainerBattle_branch_f6676: ; f6676
+Music_JohtoTrainerBattle_branch_f6676:
 	octave 4
 	note C_, 2
 	octave 3
@@ -1270,9 +1260,8 @@ Music_JohtoTrainerBattle_branch_f6676: ; f6676
 	note A#, 2
 	note G_, 2
 	endchannel
-; f6681
 
-Music_JohtoTrainerBattle_branch_f6681: ; f6681
+Music_JohtoTrainerBattle_branch_f6681:
 	octave 3
 	note E_, 2
 	note A_, 2
@@ -1290,9 +1279,8 @@ Music_JohtoTrainerBattle_branch_f6681: ; f6681
 	note F#, 2
 	note G_, 2
 	endchannel
-; f6692
 
-Music_JohtoTrainerBattle_branch_f6692: ; f6692
+Music_JohtoTrainerBattle_branch_f6692:
 	octave 3
 	note F_, 2
 	note A#, 2
@@ -1304,32 +1292,28 @@ Music_JohtoTrainerBattle_branch_f6692: ; f6692
 	octave 4
 	note D_, 2
 	endchannel
-; f669d
 
-Music_JohtoTrainerBattle_branch_f669d: ; f669d
+Music_JohtoTrainerBattle_branch_f669d:
 	octave 3
 	note E_, 2
 	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f669d
 	endchannel
-; f66a5
 
-Music_JohtoTrainerBattle_branch_f66a5: ; f66a5
+Music_JohtoTrainerBattle_branch_f66a5:
 	note D_, 2
 	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5
 	endchannel
-; f66ac
 
-Music_JohtoTrainerBattle_branch_f66ac: ; f66ac
+Music_JohtoTrainerBattle_branch_f66ac:
 	octave 3
 	note C_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac
 	endchannel
-; f66b4
 
-Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
+Music_JohtoTrainerBattle_branch_f66b4:
 	note A#, 4
 	note D#, 2
 	note A#, 2
@@ -1345,6 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
 	note G#, 1
 	note A#, 2
 	endchannel
-; f66c3
-
-

crysaudio/music/johtowildbattle.asm

@@ -1,16 +1,15 @@
-Music_JohtoWildBattle: ; f5dc5
-	dbw $80, Music_JohtoWildBattle_Ch1
-	dbw $01, Music_JohtoWildBattle_Ch2
-	dbw $02, Music_JohtoWildBattle_Ch3
-; f5dce
+Music_JohtoWildBattle:
+	musicheader 3, 1, Music_JohtoWildBattle_Ch1
+	musicheader 1, 2, Music_JohtoWildBattle_Ch2
+	musicheader 1, 3, Music_JohtoWildBattle_Ch3
 
-Music_JohtoWildBattle_Ch1: ; f5dce
-	ftempo 104
+Music_JohtoWildBattle_Ch1:
+	tempo 104
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
-Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
+Music_JohtoWildBattleNight_branch_f5ddb:
 	notetype $c, $b2
 	octave 4
 	note C_, 1
@@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	note D_, 4
 	intensity $6f
 	note D#, 8
-Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
+Music_JohtoWildBattle_branch_f5e2d:
 	intensity $b6
 	octave 3
 	note D_, 6
@@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	note F#, 4
 	note G_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
-; f5ea2
 
-Music_JohtoWildBattle_Ch2: ; f5ea2
+Music_JohtoWildBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2
 	notetype $c, $c2
 	octave 4
 	note G_, 6
-Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
+Music_JohtoWildBattleNight_branch_f5eb2:
 	octave 3
 	note D_, 6
 	note G_, 4
@@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	note G_, 4
 	intensity $6f
 	note G#, 8
-Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
+Music_JohtoWildBattle_branch_f5ed1:
 	intensity $c4
 	octave 3
 	note G_, 6
@@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	note A#, 4
 	note B_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
-; f5f5d
 
-Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
-Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
+Music_JohtoWildBattleNight_branch_f5f5d:
+Music_JohtoWildBattle_branch_f5f5d:
 	notetype $c, $c2
 	octave 4
 	note F_, 1
@@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	octave 5
 	note G_, 1
 	endchannel
-; f5f91
 
-Music_JohtoWildBattle_Ch3: ; f5f91
+Music_JohtoWildBattle_Ch3:
 	notetype $c, $14
-Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
+Music_JohtoWildBattleNight_branch_f5f94:
 	octave 4
 	note G_, 2
 	octave 5
@@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	note D#, 2
 	note G_, 2
 	note F_, 2
-Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
+Music_JohtoWildBattle_branch_f5fc6:
 	note D_, 2
 	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
@@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
 	note G_, 2
 	note F_, 2
 	note D#, 2
-Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
+Music_JohtoWildBattle_branch_f5fdb:
 	note D_, 2
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
 	note F#, 4
 	callchannel Music_JohtoWildBattle_branch_f6055
 	callchannel Music_JohtoWildBattle_branch_f6055
-Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
+Music_JohtoWildBattle_branch_f5fe8:
 	note D_, 2
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
 	note D_, 2
 	note A_, 2
-Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
+Music_JohtoWildBattle_branch_f5ff0:
 	note C_, 2
 	note F_, 2
 	loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
@@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
 	note D#, 2
 	note G#, 2
 	note G_, 4
-Music_JohtoWildBattle_branch_f6006: ; f6006
+Music_JohtoWildBattle_branch_f6006:
 	note E_, 2
 	note A_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6006
@@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006
 	note F#, 2
 	note F_, 2
 	note D#, 2
-Music_JohtoWildBattle_branch_f6027: ; f6027
+Music_JohtoWildBattle_branch_f6027:
 	note D_, 2
 	note G_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6027
-Music_JohtoWildBattle_branch_f602d: ; f602d
+Music_JohtoWildBattle_branch_f602d:
 	note C_, 2
 	note F_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f602d
@@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d
 	note G_, 4
 	note D_, 4
 	note G_, 4
-Music_JohtoWildBattle_branch_f6039: ; f6039
+Music_JohtoWildBattle_branch_f6039:
 	note D_, 2
 	note G_, 2
 	loopchannel 12, Music_JohtoWildBattle_branch_f6039
-Music_JohtoWildBattle_branch_f603f: ; f603f
+Music_JohtoWildBattle_branch_f603f:
 	note C_, 2
 	note E_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f603f
 	note F_, 2
 	note F#, 2
-Music_JohtoWildBattle_branch_f6047: ; f6047
+Music_JohtoWildBattle_branch_f6047:
 	note D_, 2
 	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f6047
@@ -580,13 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047
 	note F#, 2
 	note E_, 2
 	loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
-; f6055
 
-Music_JohtoWildBattle_branch_f6055: ; f6055
+Music_JohtoWildBattle_branch_f6055:
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoWildBattle_branch_f6055
 	endchannel
-; f605c
-
-

crysaudio/music/johtowildbattlenight.asm

@@ -1,19 +1,17 @@
-Music_JohtoWildBattleNight: ; f605c
-	dbw $80, Music_JohtoWildBattleNight_Ch1
-	dbw $01, Music_JohtoWildBattleNight_Ch2
-	dbw $02, Music_JohtoWildBattleNight_Ch3
-; f6065
+Music_JohtoWildBattleNight:
+	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
+	musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
+	musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
 
-Music_JohtoWildBattleNight_Ch1: ; f6065
-	ftempo 107
+Music_JohtoWildBattleNight_Ch1:
+	tempo 107
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $10, $25
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
-; f6076
 
-Music_JohtoWildBattleNight_Ch2: ; f6076
+Music_JohtoWildBattleNight_Ch2:
 	dutycycle $3
 	vibrato $20, $36
 	tone $0001
@@ -24,11 +22,7 @@ Music_JohtoWildBattleNight_Ch2: ; f6076
 	tone $0001
 	dutycycle $2
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
-; f608f
 
-Music_JohtoWildBattleNight_Ch3: ; f608f
+Music_JohtoWildBattleNight_Ch3:
 	notetype $c, $11
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
-; f6096
-
-

crysaudio/music/kantogymbattle.asm

@@ -1,11 +1,10 @@
-Music_KantoGymBattle: ; ec720
-	dbw $80, Music_KantoGymBattle_Ch1
-	dbw $01, Music_KantoGymBattle_Ch2
-	dbw $02, Music_KantoGymBattle_Ch3
-; ec729
+Music_KantoGymBattle:
+	musicheader 3, 1, Music_KantoGymBattle_Ch1
+	musicheader 1, 2, Music_KantoGymBattle_Ch2
+	musicheader 1, 3, Music_KantoGymBattle_Ch3
 
-Music_KantoGymBattle_Ch1: ; ec729
-	ftempo 101
+Music_KantoGymBattle_Ch1:
+	tempo 101
 	volume $77
 	dutycycle $3
 	tone $0002
@@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729
 	note E_, 4
 	note E_, 4
 	note E_, 2
-Music_KantoGymBattle_branch_ec78b: ; ec78b
+Music_KantoGymBattle_branch_ec78b:
 	callchannel Music_KantoGymBattle_branch_ec832
 	octave 2
 	note A#, 2
@@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b
 	octave 3
 	note D_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec78b
-; ec832
 
-Music_KantoGymBattle_branch_ec832: ; ec832
+Music_KantoGymBattle_branch_ec832:
 	intensity $b5
 	note D#, 2
 	octave 2
@@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832
 	note D#, 2
 	note C#, 2
 	endchannel
-; ec847
 
-Music_KantoGymBattle_Ch2: ; ec847
+Music_KantoGymBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-Music_KantoGymBattle_branch_ec852: ; ec852
+Music_KantoGymBattle_branch_ec852:
 	octave 4
 	note A#, 1
 	note G#, 1
@@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852
 	note D#, 1
 	loopchannel 8, Music_KantoGymBattle_branch_ec852
 	octave 3
-Music_KantoGymBattle_branch_ec85d: ; ec85d
+Music_KantoGymBattle_branch_ec85d:
 	intensity $c2
 	note D#, 2
 	note D#, 2
@@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
 	octave 4
 	loopchannel 2, Music_KantoGymBattle_branch_ec85d
-Music_KantoGymBattle_branch_ec894: ; ec894
+Music_KantoGymBattle_branch_ec894:
 	callchannel Music_KantoGymBattle_branch_ec907
 	note E_, 8
 	note G#, 8
@@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894
 	octave 3
 	note A_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec894
-; ec907
 
-Music_KantoGymBattle_branch_ec907: ; ec907
+Music_KantoGymBattle_branch_ec907:
 	dutycycle $2
 	intensity $d1
 	octave 3
@@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907
 	dutycycle $3
 	intensity $b0
 	endchannel
-; ec92e
 
-Music_KantoGymBattle_Ch3: ; ec92e
+Music_KantoGymBattle_Ch3:
 	notetype $c, $19
 	octave 2
 	note E_, 1
 	note __, 1
-Music_KantoGymBattle_branch_ec934: ; ec934
+Music_KantoGymBattle_branch_ec934:
 	note B_, 3
 	note __, 1
 	loopchannel 6, Music_KantoGymBattle_branch_ec934
 	note B_, 2
 	note G#, 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec93d: ; ec93d
+Music_KantoGymBattle_branch_ec93d:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec93d
-Music_KantoGymBattle_branch_ec965: ; ec965
+Music_KantoGymBattle_branch_ec965:
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec965
-Music_KantoGymBattle_branch_ec96c: ; ec96c
+Music_KantoGymBattle_branch_ec96c:
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec96c
@@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c
 	note E_, 2
 	octave 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec97f: ; ec97f
+Music_KantoGymBattle_branch_ec97f:
 	octave 2
 	note F#, 2
 	octave 3
 	note C#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec97f
-Music_KantoGymBattle_branch_ec987: ; ec987
+Music_KantoGymBattle_branch_ec987:
 	octave 2
 	note E_, 2
 	note B_, 2
@@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987
 	note E_, 2
 	octave 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec992: ; ec992
+Music_KantoGymBattle_branch_ec992:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec992
-Music_KantoGymBattle_branch_ec9a8: ; ec9a8
+Music_KantoGymBattle_branch_ec9a8:
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_KantoGymBattle_branch_ec9a8
@@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8
 	note B_, 2
 	octave 3
 	note E_, 2
-Music_KantoGymBattle_branch_ec9bb: ; ec9bb
+Music_KantoGymBattle_branch_ec9bb:
 	octave 2
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
-Music_KantoGymBattle_branch_ec9c2: ; ec9c2
+Music_KantoGymBattle_branch_ec9c2:
 	octave 2
 	note F#, 2
 	octave 3
@@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	note F#, 2
 	note E_, 2
 	note C#, 2
-Music_KantoGymBattle_branch_ec9d8: ; ec9d8
+Music_KantoGymBattle_branch_ec9d8:
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
-Music_KantoGymBattle_branch_ec9df: ; ec9df
+Music_KantoGymBattle_branch_ec9df:
 	note C#, 2
 	note G#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec9df
-Music_KantoGymBattle_branch_ec9e5: ; ec9e5
+Music_KantoGymBattle_branch_ec9e5:
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9e5
@@ -613,6 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note D#, 2
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
-; ec9fa
-
-

crysaudio/music/kantowildbattle.asm

@@ -1,14 +1,12 @@
-Music_KantoWildBattle: ; ed06d
-	dbw $80, Music_KantoWildBattle_Ch1
-	dbw $01, Music_KantoWildBattle_Ch2
-	dbw $02, Music_KantoWildBattle_Ch3
-; ed076
+Music_KantoWildBattle:
+	musicheader 3, 1, Music_KantoWildBattle_Ch1
+	musicheader 1, 2, Music_KantoWildBattle_Ch2
+	musicheader 1, 3, Music_KantoWildBattle_Ch3
 
+	db $3
 
-
-
-Music_KantoWildBattle_Ch1: ; ed077
-	ftempo 112
+Music_KantoWildBattle_Ch1:
+	tempo 112
 	volume $77
 	vibrato $12, $23
 	dutycycle $2
@@ -26,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077
 	note G_, 1
 	note F#, 1
 	note F_, 1
-Music_KantoWildBattle_branch_ed091: ; ed091
+Music_KantoWildBattle_branch_ed091:
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed18a
 	octave 4
@@ -209,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091
 	note D#, 1
 	note __, 5
 	note C#, 8
-Music_KantoWildBattle_branch_ed15b: ; ed15b
+Music_KantoWildBattle_branch_ed15b:
 	intensity $b1
 	octave 3
 	note C_, 1
@@ -217,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed15b
-Music_KantoWildBattle_branch_ed166: ; ed166
+Music_KantoWildBattle_branch_ed166:
 	note C#, 1
 	note F_, 1
 	note E_, 1
 	note D#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed166
-Music_KantoWildBattle_branch_ed16e: ; ed16e
+Music_KantoWildBattle_branch_ed16e:
 	note C_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
 	loopchannel 16, Music_KantoWildBattle_branch_ed16e
-Music_KantoWildBattle_branch_ed176: ; ed176
+Music_KantoWildBattle_branch_ed176:
 	note C#, 1
 	note E_, 1
 	note D#, 1
 	note D_, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed176
-Music_KantoWildBattle_branch_ed17e: ; ed17e
+Music_KantoWildBattle_branch_ed17e:
 	note C_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed17e
 	loopchannel 0, Music_KantoWildBattle_branch_ed091
-; ed18a
 
-Music_KantoWildBattle_branch_ed18a: ; ed18a
+Music_KantoWildBattle_branch_ed18a:
 	octave 4
 	note C_, 1
 	note __, 5
@@ -266,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a
 	note B_, 1
 	note __, 3
 	endchannel
-; ed19f
 
-Music_KantoWildBattle_Ch2: ; ed19f
+Music_KantoWildBattle_Ch2:
 	dutycycle $1
 	vibrato $12, $23
 	notetype $c, $b1
@@ -305,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f
 	note D#, 1
 	note D_, 1
 	note C#, 1
-Music_KantoWildBattle_branch_ed1c8: ; ed1c8
+Music_KantoWildBattle_branch_ed1c8:
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed2c6
 	octave 2
@@ -328,18 +324,17 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	notetype $6, $b7
 	callchannel Music_KantoWildBattle_branch_ed307
 	callchannel Music_KantoWildBattle_branch_ed307
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_KantoWildBattle_branch_ed307
 	callchannel Music_KantoWildBattle_branch_ed307
-	forceoctave $0
+	pitchoffset 0, C_
+rept 4
+	callchannel Music_KantoWildBattle_branch_ed307
+endr
+	pitchoffset 0, C#
 	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
+	pitchoffset 0, C_
 	callchannel Music_KantoWildBattle_branch_ed307
 	callchannel Music_KantoWildBattle_branch_ed307
 	note __, 16
@@ -386,9 +381,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	note G#, 1
 	notetype $6, $b7
 	callchannel Music_KantoWildBattle_branch_ed31b
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_KantoWildBattle_branch_ed31b
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_KantoWildBattle_branch_ed340
 	octave 2
 	note C_, 2
@@ -452,9 +447,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	callchannel Music_KantoWildBattle_branch_ed354
 	callchannel Music_KantoWildBattle_branch_ed340
 	callchannel Music_KantoWildBattle_branch_ed354
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_KantoWildBattle_branch_ed340
-	forceoctave $0
+	pitchoffset 0, C_
 	note C#, 2
 	note __, 2
 	octave 3
@@ -495,9 +490,8 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	note C_, 2
 	note __, 2
 	loopchannel 0, Music_KantoWildBattle_branch_ed1c8
-; ed2c6
 
-Music_KantoWildBattle_branch_ed2c6: ; ed2c6
+Music_KantoWildBattle_branch_ed2c6:
 	octave 2
 	note C_, 1
 	note __, 2
@@ -563,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6
 	octave 1
 	note G_, 2
 	endchannel
-; ed307
 
-Music_KantoWildBattle_branch_ed307: ; ed307
+Music_KantoWildBattle_branch_ed307:
 	octave 2
 	note C_, 2
 	note __, 4
@@ -586,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307
 	octave 2
 	note C_, 4
 	endchannel
-; ed31b
 
-Music_KantoWildBattle_branch_ed31b: ; ed31b
+Music_KantoWildBattle_branch_ed31b:
 	octave 2
 	note C_, 2
 	note __, 4
@@ -626,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b
 	octave 3
 	note C_, 2
 	endchannel
-; ed340
 
-Music_KantoWildBattle_branch_ed340: ; ed340
+Music_KantoWildBattle_branch_ed340:
 	octave 3
 	note G_, 4
 	octave 2
@@ -649,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340
 	note C_, 2
 	note __, 2
 	endchannel
-; ed354
 
-Music_KantoWildBattle_branch_ed354: ; ed354
+Music_KantoWildBattle_branch_ed354:
 	note C_, 2
 	note __, 2
 	octave 3
@@ -672,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354
 	note C_, 2
 	note __, 2
 	endchannel
-; ed368
 
-Music_KantoWildBattle_Ch3: ; ed368
+Music_KantoWildBattle_Ch3:
 	vibrato $14, $23
 	notetype $c, $14
 	octave 3
@@ -725,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368
 	note G_, 1
 	octave 4
 	note G_, 1
-Music_KantoWildBattle_branch_ed39e: ; ed39e
+Music_KantoWildBattle_branch_ed39e:
 	notetype $c, $14
 	octave 5
 	note G_, 1
@@ -1224,6 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e
 	note G_, 16
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
-; ed5c6
-
-

crysaudio/music/lakeofrage.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LakeOfRage_Ch1
+	musicheader 1, 2, Music_LakeOfRage_Ch2
+	musicheader 1, 3, Music_LakeOfRage_Ch3
+	musicheader 1, 4, Music_LakeOfRage_Ch4
 
-Music_LakeOfRage_Ch1: ; ee6d1
+Music_LakeOfRage_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -19,7 +18,7 @@ Music_LakeOfRage_Ch1: ; ee6d1
 	note D_, 6
 	note D_, 6
 	note E_, 4
-Music_LakeOfRage_branch_ee6e9: ; ee6e9
+Music_LakeOfRage_branch_ee6e9:
 	intensity $b5
 	note F#, 6
 	note E_, 6
@@ -93,9 +92,8 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $a7
 	note D_, 6
 	loopchannel 0, Music_LakeOfRage_branch_ee6e9
-; ee749
 
-Music_LakeOfRage_Ch2: ; ee749
+Music_LakeOfRage_Ch2:
 	dutycycle $3
 	vibrato $20, $44
 	stereopanning $ff
@@ -108,7 +106,7 @@ Music_LakeOfRage_Ch2: ; ee749
 	note A_, 8
 	intensity $a7
 	note A_, 8
-Music_LakeOfRage_branch_ee75e: ; ee75e
+Music_LakeOfRage_branch_ee75e:
 	notetype $8, $c7
 	octave 4
 	note D_, 16
@@ -183,9 +181,8 @@ Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $c, $c7
 	note A_, 16
 	loopchannel 0, Music_LakeOfRage_branch_ee75e
-; ee7c1
 
-Music_LakeOfRage_Ch3: ; ee7c1
+Music_LakeOfRage_Ch3:
 	stereopanning $f
 	notetype $c, $16
 	octave 3
@@ -198,7 +195,7 @@ Music_LakeOfRage_Ch3: ; ee7c1
 	note F#, 4
 	note __, 2
 	note E_, 4
-Music_LakeOfRage_branch_ee7d0: ; ee7d0
+Music_LakeOfRage_branch_ee7d0:
 	octave 3
 	note D_, 4
 	octave 2
@@ -297,13 +294,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 2
 	note A_, 2
 	loopchannel 0, Music_LakeOfRage_branch_ee7d0
-; ee835
 
-Music_LakeOfRage_Ch4: ; ee835
+Music_LakeOfRage_Ch4:
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
-Music_LakeOfRage_branch_ee83b: ; ee83b
+Music_LakeOfRage_branch_ee83b:
 	note D_, 2
 	note D_, 1
 	note D_, 1
@@ -324,6 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
-; ee852
-
-

crysaudio/music/lakeofragerocketradio.asm

@@ -1,17 +1,16 @@
-Music_LakeOfRageRocketRadio: ; ef5b1
-	dbw $80, Music_LakeOfRageRocketRadio_Ch1
-	dbw $01, Music_LakeOfRageRocketRadio_Ch2
-	dbw $02, Music_LakeOfRageRocketRadio_Ch3
-; ef5ba
+Music_LakeOfRageRocketRadio:
+	musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1
+	musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2
+	musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3
 
-Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
+Music_LakeOfRageRocketRadio_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $1
 	tone $1118
 	vibrato $0, $f0
 	stereopanning $f0
-Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
+Music_LakeOfRageRocketRadio_branch_ef5c9:
 	notetype $c, $a7
 	octave 7
 	note G_, 4
@@ -20,22 +19,17 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	note F#, 4
 	note __, 16
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5d6
 
-Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
+Music_LakeOfRageRocketRadio_Ch2:
 	dutycycle $1
 	vibrato $13, $e8
 	notetype $c, $a7
 	note __, 2
 	stereopanning $f
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5e5
 
-Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
+Music_LakeOfRageRocketRadio_Ch3:
 	notetype $c, $26
 	vibrato $10, $44
 	note __, 4
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5f0
-
-

crysaudio/music/lavendertown.asm

@@ -1,13 +1,11 @@
-Music_LavenderTown: ; ef72f
-	dbw $80, Music_LavenderTown_Ch1
-	dbw $01, Music_LavenderTown_Ch2
-	dbw $02, Music_LavenderTown_Ch3
-; ef738
+Music_LavenderTown:
+	musicheader 3, 1, Music_LavenderTown_Ch1
+	musicheader 1, 2, Music_LavenderTown_Ch2
+	musicheader 1, 3, Music_LavenderTown_Ch3
 
+	db $3
 
-
-
-Music_LavenderTown_Ch1: ; ef739
+Music_LavenderTown_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -18,7 +16,7 @@ Music_LavenderTown_Ch1: ; ef739
 	note __, 16
 	note __, 16
 	note __, 16
-Music_LavenderTown_branch_ef74c: ; ef74c
+Music_LavenderTown_branch_ef74c:
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
 	octave 5
@@ -104,7 +102,7 @@ Music_LavenderTown_branch_ef74c: ; ef74c
 	octave 3
 	note A_, 2
 	note F_, 2
-Music_LavenderTown_branch_ef7ca: ; ef7ca
+Music_LavenderTown_branch_ef7ca:
 	octave 3
 	note C_, 2
 	note E_, 2
@@ -150,9 +148,8 @@ Music_LavenderTown_branch_ef7ca: ; ef7ca
 	note B_, 8
 	note B_, 8
 	loopchannel 0, Music_LavenderTown_branch_ef74c
-; ef7fd
 
-Music_LavenderTown_branch_ef7fd: ; ef7fd
+Music_LavenderTown_branch_ef7fd:
 	intensity $83
 	octave 5
 	note C_, 2
@@ -243,9 +240,8 @@ Music_LavenderTown_branch_ef7fd: ; ef7fd
 	intensity $43
 	note F_, 2
 	endchannel
-; ef87f
 
-Music_LavenderTown_branch_ef87f: ; ef87f
+Music_LavenderTown_branch_ef87f:
 	intensity $93
 	octave 5
 	note G_, 2
@@ -264,13 +260,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f
 	intensity $43
 	note G_, 2
 	endchannel
-; ef899
 
-Music_LavenderTown_Ch2: ; ef899
+Music_LavenderTown_Ch2:
 	dutycycle $1
 	vibrato $8, $24
 	stereopanning $ff
-Music_LavenderTown_branch_ef8a0: ; ef8a0
+Music_LavenderTown_branch_ef8a0:
 	notetype $c, $a3
 	octave 5
 	note C_, 2
@@ -306,7 +301,7 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0
 	note D_, 2
 	intensity $63
 	note D_, 2
-Music_LavenderTown_branch_ef8d7: ; ef8d7
+Music_LavenderTown_branch_ef8d7:
 	intensity $b5
 	callchannel Music_LavenderTown_branch_ef915
 	octave 2
@@ -359,9 +354,8 @@ Music_LavenderTown_branch_ef8d7: ; ef8d7
 	note F_, 1
 	note G_, 6
 	loopchannel 0, Music_LavenderTown_branch_ef8d7
-; ef915
 
-Music_LavenderTown_branch_ef915: ; ef915
+Music_LavenderTown_branch_ef915:
 	octave 2
 	note C_, 4
 	note G_, 4
@@ -391,9 +385,8 @@ Music_LavenderTown_branch_ef915: ; ef915
 	note A_, 4
 	note C_, 4
 	endchannel
-; ef932
 
-Music_LavenderTown_Ch3: ; ef932
+Music_LavenderTown_Ch3:
 	vibrato $12, $24
 	notetype $c, $13
 	stereopanning $f0
@@ -404,7 +397,7 @@ Music_LavenderTown_Ch3: ; ef932
 	octave 5
 	note E_, 4
 	note F_, 4
-Music_LavenderTown_branch_ef941: ; ef941
+Music_LavenderTown_branch_ef941:
 	intensity $12
 	octave 5
 	note G_, 4
@@ -519,6 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
-; ef9bc
-
-

crysaudio/music/lighthouse.asm

@@ -1,18 +1,17 @@
-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:
+	musicheader 4, 1, Music_Lighthouse_Ch1
+	musicheader 1, 2, Music_Lighthouse_Ch2
+	musicheader 1, 3, Music_Lighthouse_Ch3
+	musicheader 1, 4, Music_Lighthouse_Ch4
 
-Music_Lighthouse_Ch1: ; ee575
+Music_Lighthouse_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
 	tone $0004
 	vibrato $8, $45
 	stereopanning $f
-Music_Lighthouse_branch_ee584: ; ee584
+Music_Lighthouse_branch_ee584:
 	notetype $c, $b3
 	octave 3
 	note C#, 8
@@ -128,13 +127,12 @@ Music_Lighthouse_branch_ee584: ; ee584
 	note A_, 2
 	note G#, 8
 	loopchannel 0, Music_Lighthouse_branch_ee584
-; ee5fc
 
-Music_Lighthouse_Ch2: ; ee5fc
+Music_Lighthouse_Ch2:
 	dutycycle $3
 	tone $0002
 	vibrato $10, $45
-Music_Lighthouse_branch_ee604: ; ee604
+Music_Lighthouse_branch_ee604:
 	notetype $c, $c5
 	octave 3
 	note G#, 12
@@ -211,12 +209,11 @@ Music_Lighthouse_branch_ee604: ; ee604
 	note C#, 2
 	note C_, 8
 	loopchannel 0, Music_Lighthouse_branch_ee604
-; ee656
 
-Music_Lighthouse_Ch3: ; ee656
+Music_Lighthouse_Ch3:
 	notetype $c, $19
 	stereopanning $f0
-Music_Lighthouse_branch_ee65b: ; ee65b
+Music_Lighthouse_branch_ee65b:
 	octave 2
 	note G#, 2
 	note __, 2
@@ -226,7 +223,7 @@ Music_Lighthouse_branch_ee65b: ; ee65b
 	note __, 2
 	note G_, 2
 	note __, 2
-Music_Lighthouse_branch_ee664: ; ee664
+Music_Lighthouse_branch_ee664:
 	note G#, 2
 	note __, 2
 	note D#, 2
@@ -255,7 +252,7 @@ Music_Lighthouse_branch_ee664: ; ee664
 	octave 3
 	note C_, 2
 	note __, 2
-Music_Lighthouse_branch_ee683: ; ee683
+Music_Lighthouse_branch_ee683:
 	note C#, 2
 	note __, 2
 	octave 2
@@ -277,7 +274,7 @@ Music_Lighthouse_branch_ee683: ; ee683
 	octave 3
 	note D#, 2
 	note F#, 2
-Music_Lighthouse_branch_ee69b: ; ee69b
+Music_Lighthouse_branch_ee69b:
 	note E_, 2
 	note __, 2
 	octave 2
@@ -290,12 +287,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b
 	note __, 2
 	loopchannel 8, Music_Lighthouse_branch_ee69b
 	loopchannel 0, Music_Lighthouse_branch_ee65b
-; ee6ad
 
-Music_Lighthouse_Ch4: ; ee6ad
+Music_Lighthouse_Ch4:
 	togglenoise $0
 	notetype $c
-Music_Lighthouse_branch_ee6b1: ; ee6b1
+Music_Lighthouse_branch_ee6b1:
 	stereopanning $f
 	note G#, 4
 	note F_, 2
@@ -311,6 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
-; ee6c5
-
-

crysaudio/music/lookbeauty.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LookBeauty_Ch1
+	musicheader 1, 2, Music_LookBeauty_Ch2
+	musicheader 1, 3, Music_LookBeauty_Ch3
+	musicheader 1, 4, Music_LookBeauty_Ch4
 
-Music_LookBeauty_Ch1: ; eee4a
+Music_LookBeauty_Ch1:
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
@@ -17,7 +16,7 @@ Music_LookBeauty_Ch1: ; eee4a
 	octave 4
 	note C_, 8
 	dutycycle $3
-Music_LookBeauty_branch_eee5f: ; eee5f
+Music_LookBeauty_branch_eee5f:
 	note __, 4
 	octave 3
 	note D_, 1
@@ -76,9 +75,8 @@ Music_LookBeauty_branch_eee5f: ; eee5f
 	octave 4
 	note C_, 1
 	loopchannel 0, Music_LookBeauty_branch_eee5f
-; eee9c
 
-Music_LookBeauty_Ch2: ; eee9c
+Music_LookBeauty_Ch2:
 	stereopanning $f0
 	vibrato $10, $23
 	dutycycle $2
@@ -113,7 +111,7 @@ Music_LookBeauty_Ch2: ; eee9c
 	note F#, 1
 	note __, 1
 	dutycycle $3
-Music_LookBeauty_branch_eeec5: ; eeec5
+Music_LookBeauty_branch_eeec5:
 	notetype $c, $c7
 	note G_, 16
 	note A_, 8
@@ -154,9 +152,8 @@ Music_LookBeauty_branch_eeec5: ; eeec5
 	note F#, 8
 	note A_, 8
 	loopchannel 0, Music_LookBeauty_branch_eeec5
-; eeefa
 
-Music_LookBeauty_Ch3: ; eeefa
+Music_LookBeauty_Ch3:
 	stereopanning $ff
 	vibrato $8, $12
 	notetype $c, $15
@@ -173,7 +170,7 @@ Music_LookBeauty_Ch3: ; eeefa
 	octave 3
 	note D_, 7
 	note F#, 1
-Music_LookBeauty_branch_eef0f: ; eef0f
+Music_LookBeauty_branch_eef0f:
 	note G_, 4
 	octave 4
 	note B_, 1
@@ -295,22 +292,20 @@ Music_LookBeauty_branch_eef0f: ; eef0f
 	octave 3
 	note D_, 8
 	loopchannel 0, Music_LookBeauty_branch_eef0f
-; eef8b
 
-Music_LookBeauty_Ch4: ; eef8b
+Music_LookBeauty_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
 	note __, 16
-Music_LookBeauty_branch_eef91: ; eef91
+Music_LookBeauty_branch_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
+Music_LookBeauty_branch_eefa1:
 	note F#, 2
 	note G_, 2
 	note D_, 2
@@ -328,6 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1
 	note D_, 2
 	note G_, 2
 	endchannel
-; eefb2
-
-

crysaudio/music/lookhiker.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LookHiker_Ch1
+	musicheader 1, 2, Music_LookHiker_Ch2
+	musicheader 1, 3, Music_LookHiker_Ch3
+	musicheader 1, 4, Music_LookHiker_Ch4
 
-Music_LookHiker_Ch1: ; f741d
+Music_LookHiker_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -17,7 +16,7 @@ Music_LookHiker_Ch1: ; f741d
 	note F#, 2
 	note F_, 2
 	note F#, 8
-Music_LookHiker_branch_f7433: ; f7433
+Music_LookHiker_branch_f7433:
 	note D_, 2
 	note D#, 2
 	note E_, 2
@@ -31,9 +30,8 @@ Music_LookHiker_branch_f7433: ; f7433
 	note F#, 2
 	note __, 6
 	loopchannel 0, Music_LookHiker_branch_f7433
-; f7443
 
-Music_LookHiker_Ch2: ; f7443
+Music_LookHiker_Ch2:
 	dutycycle $0
 	notetype $c, $a1
 	note __, 4
@@ -50,7 +48,7 @@ Music_LookHiker_Ch2: ; f7443
 	note F#, 1
 	note D_, 1
 	intensity $a1
-Music_LookHiker_branch_f7457: ; f7457
+Music_LookHiker_branch_f7457:
 	octave 1
 	note B_, 1
 	note B_, 2
@@ -68,9 +66,8 @@ Music_LookHiker_branch_f7457: ; f7457
 	note F#, 1
 	note D_, 1
 	loopchannel 0, Music_LookHiker_branch_f7457
-; f746b
 
-Music_LookHiker_Ch3: ; f746b
+Music_LookHiker_Ch3:
 	vibrato $12, $24
 	stereopanning $f0
 	notetype $c, $14
@@ -78,7 +75,7 @@ Music_LookHiker_Ch3: ; f746b
 	note B_, 2
 	note A#, 2
 	note B_, 8
-Music_LookHiker_branch_f7477: ; f7477
+Music_LookHiker_branch_f7477:
 	octave 5
 	note D#, 2
 	note D_, 2
@@ -91,9 +88,8 @@ Music_LookHiker_branch_f7477: ; f7477
 	note A#, 2
 	callchannel Music_LookHiker_branch_f748a
 	loopchannel 0, Music_LookHiker_branch_f7477
-; f748a
 
-Music_LookHiker_branch_f748a: ; f748a
+Music_LookHiker_branch_f748a:
 	octave 4
 	note B_, 2
 	note __, 4
@@ -104,19 +100,15 @@ Music_LookHiker_branch_f748a: ; f748a
 	note B_, 2
 	note __, 6
 	endchannel
-; f7494
 
-Music_LookHiker_Ch4: ; f7494
+Music_LookHiker_Ch4:
 	togglenoise $3
 	notetype $c
 	note F_, 4
 	note __, 16
-Music_LookHiker_branch_f749a: ; f749a
+Music_LookHiker_branch_f749a:
 	note D#, 2
 	note G_, 2
 	note D_, 2
 	note G_, 2
 	loopchannel 0, Music_LookHiker_branch_f749a
-; f74a2
-
-

crysaudio/music/lookkimonogirl.asm

@@ -1,13 +1,11 @@
-Music_LookKimonoGirl: ; f79b8
-	dbw $80, Music_LookKimonoGirl_Ch1
-	dbw $01, Music_LookKimonoGirl_Ch2
-	dbw $02, Music_LookKimonoGirl_Ch3
-; f79c1
+Music_LookKimonoGirl:
+	musicheader 3, 1, Music_LookKimonoGirl_Ch1
+	musicheader 1, 2, Music_LookKimonoGirl_Ch2
+	musicheader 1, 3, Music_LookKimonoGirl_Ch3
 
+	db $3
 
-
-
-Music_LookKimonoGirl_Ch1: ; f79c2
+Music_LookKimonoGirl_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -15,8 +13,8 @@ Music_LookKimonoGirl_Ch1: ; f79c2
 	notetype $6, $87
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-	tone $0000
-Music_LookKimonoGirl_branch_f79d7: ; f79d7
+	tone 0
+Music_LookKimonoGirl_branch_f79d7:
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13
 	callchannel Music_LookKimonoGirl_branch_f7a13
@@ -50,9 +48,8 @@ Music_LookKimonoGirl_branch_f79d7: ; f79d7
 	octave 3
 	note A_, 1
 	loopchannel 0, Music_LookKimonoGirl_branch_f79d7
-; f7a13
 
-Music_LookKimonoGirl_branch_f7a13: ; f7a13
+Music_LookKimonoGirl_branch_f7a13:
 	intensity $b4
 	octave 2
 	note F_, 1
@@ -78,9 +75,8 @@ Music_LookKimonoGirl_branch_f7a13: ; f7a13
 	octave 4
 	note D_, 1
 	endchannel
-; f7a34
 
-Music_LookKimonoGirl_branch_f7a34: ; f7a34
+Music_LookKimonoGirl_branch_f7a34:
 	intensity $b4
 	octave 2
 	note E_, 1
@@ -106,14 +102,13 @@ Music_LookKimonoGirl_branch_f7a34: ; f7a34
 	octave 4
 	note D_, 1
 	endchannel
-; f7a55
 
-Music_LookKimonoGirl_Ch2: ; f7a55
+Music_LookKimonoGirl_Ch2:
 	dutycycle $0
 	notetype $6, $a7
 	stereopanning $f0
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
+Music_LookKimonoGirl_branch_f7a5f:
 	dutycycle $3
 	notetype $c, $91
 	octave 5
@@ -157,9 +152,8 @@ Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
 	note D_, 1
 	callchannel Music_LookKimonoGirl_branch_f7a94
 	loopchannel 0, Music_LookKimonoGirl_branch_f7a5f
-; f7a94
 
-Music_LookKimonoGirl_branch_f7a94: ; f7a94
+Music_LookKimonoGirl_branch_f7a94:
 	octave 5
 	note B_, 1
 	note A_, 1
@@ -180,9 +174,8 @@ Music_LookKimonoGirl_branch_f7a94: ; f7a94
 	note B_, 1
 	note E_, 1
 	endchannel
-; f7aa8
 
-Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
+Music_LookKimonoGirl_branch_f7aa8:
 	octave 4
 	note E_, 1
 	octave 5
@@ -216,9 +209,8 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
 	note E_, 1
 	note E_, 1
 	endchannel
-; f7ad4
 
-Music_LookKimonoGirl_Ch3: ; f7ad4
+Music_LookKimonoGirl_Ch3:
 	stereopanning $ff
 	vibrato $12, $24
 	notetype $6, $13
@@ -234,7 +226,7 @@ Music_LookKimonoGirl_Ch3: ; f7ad4
 	octave 5
 	note D_, 2
 	note E_, 2
-Music_LookKimonoGirl_branch_f7aec: ; f7aec
+Music_LookKimonoGirl_branch_f7aec:
 	octave 5
 	note D_, 4
 	note E_, 4
@@ -271,6 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	note D_, 8
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
-; f7b13
-
-

crysaudio/music/looklass.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LookLass_Ch1
+	musicheader 1, 2, Music_LookLass_Ch2
+	musicheader 1, 3, Music_LookLass_Ch3
+	musicheader 1, 4, Music_LookLass_Ch4
 
-Music_LookLass_Ch1: ; ed7a7
+Music_LookLass_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -18,7 +17,7 @@ Music_LookLass_Ch1: ; ed7a7
 	note B_, 14
 	stereopanning $f
 	dutycycle $0
-Music_LookLass_branch_ed7bd: ; ed7bd
+Music_LookLass_branch_ed7bd:
 	intensity $a2
 	octave 3
 	note E_, 4
@@ -29,14 +28,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a3
 	note B_, 2
 	loopchannel 0, Music_LookLass_branch_ed7bd
-; ed7cd
 
-Music_LookLass_Ch2: ; ed7cd
+Music_LookLass_Ch2:
 	stereopanning $f0
 	dutycycle $0
 	notetype $c, $83
 	note __, 16
-Music_LookLass_branch_ed7d5: ; ed7d5
+Music_LookLass_branch_ed7d5:
 	intensity $92
 	octave 2
 	note B_, 4
@@ -48,9 +46,8 @@ Music_LookLass_branch_ed7d5: ; ed7d5
 	octave 3
 	note G#, 2
 	loopchannel 0, Music_LookLass_branch_ed7d5
-; ed7e6
 
-Music_LookLass_Ch3: ; ed7e6
+Music_LookLass_Ch3:
 	notetype $c, $10
 	note __, 8
 	octave 6
@@ -58,7 +55,7 @@ Music_LookLass_Ch3: ; ed7e6
 	note D#, 2
 	note C#, 2
 	note C_, 2
-Music_LookLass_branch_ed7ef: ; ed7ef
+Music_LookLass_branch_ed7ef:
 	octave 5
 	note B_, 2
 	note __, 2
@@ -99,13 +96,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_LookLass_branch_ed7ef
-; ed81a
 
-Music_LookLass_Ch4: ; ed81a
+Music_LookLass_Ch4:
 	togglenoise $4
 	notetype $c
 	note C_, 16
-Music_LookLass_branch_ed81f: ; ed81f
+Music_LookLass_branch_ed81f:
 	notetype $6
 	note D_, 8
 	note C#, 8
@@ -116,6 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
-; ed82d
-
-

crysaudio/music/lookmysticalman.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LookMysticalMan_Ch1
+	musicheader 1, 2, Music_LookMysticalMan_Ch2
+	musicheader 1, 3, Music_LookMysticalMan_Ch3
+	musicheader 1, 4, Music_LookMysticalMan_Ch4
 
-Music_LookMysticalMan_Ch1: ; 178447
+Music_LookMysticalMan_Ch1:
 	tempo 136
 	volume $77
 	vibrato $a, $34
@@ -13,7 +12,7 @@ Music_LookMysticalMan_Ch1: ; 178447
 	stereopanning $f
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178458: ; 178458
+Music_LookMysticalMan_branch_178458:
 	dutycycle $3
 	notetype $6, $96
 	octave 3
@@ -94,7 +93,7 @@ Music_LookMysticalMan_branch_178458: ; 178458
 	note A#, 6
 	dutycycle $2
 	intensity $72
-Music_LookMysticalMan_branch_1784b4: ; 1784b4
+Music_LookMysticalMan_branch_1784b4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -124,7 +123,7 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	note D_, 2
 	note F#, 2
 	note B_, 2
-Music_LookMysticalMan_branch_1784d4: ; 1784d4
+Music_LookMysticalMan_branch_1784d4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -156,9 +155,8 @@ Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	note F#, 2
 	note A#, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178458
-; 1784f9
 
-Music_LookMysticalMan_branch_1784f9: ; 1784f9
+Music_LookMysticalMan_branch_1784f9:
 	note D_, 16
 	octave 4
 	note D_, 2
@@ -192,14 +190,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9
 	note B_, 2
 	note A_, 6
 	endchannel
-; 17851a
 
-Music_LookMysticalMan_Ch2: ; 17851a
+Music_LookMysticalMan_Ch2:
 	dutycycle $3
 	vibrato $a, $34
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178523: ; 178523
+Music_LookMysticalMan_branch_178523:
 	stereopanning $f0
 	notetype $6, $b8
 	octave 3
@@ -297,9 +294,8 @@ Music_LookMysticalMan_branch_178523: ; 178523
 	note A#, 16
 	note __, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178523
-; 17859a
 
-Music_LookMysticalMan_branch_17859a: ; 17859a
+Music_LookMysticalMan_branch_17859a:
 	note B_, 2
 	note __, 2
 	octave 4
@@ -343,9 +339,8 @@ Music_LookMysticalMan_branch_17859a: ; 17859a
 	note F#, 2
 	note E_, 6
 	endchannel
-; 1785c8
 
-Music_LookMysticalMan_branch_1785c8: ; 1785c8
+Music_LookMysticalMan_branch_1785c8:
 	note C#, 8
 	intensity $88
 	note C_, 1
@@ -361,12 +356,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8
 	note __, 1
 	intensity $b8
 	endchannel
-; 1785db
 
-Music_LookMysticalMan_Ch3: ; 1785db
+Music_LookMysticalMan_Ch3:
 	notetype $6, $16
 	note __, 16
-Music_LookMysticalMan_branch_1785df: ; 1785df
+Music_LookMysticalMan_branch_1785df:
 	octave 2
 	note B_, 4
 	octave 3
@@ -421,7 +415,7 @@ Music_LookMysticalMan_branch_1785df: ; 1785df
 	note A_, 2
 	octave 3
 	note E_, 2
-Music_LookMysticalMan_branch_178615: ; 178615
+Music_LookMysticalMan_branch_178615:
 	octave 2
 	note F#, 4
 	note A#, 2
@@ -537,9 +531,8 @@ Music_LookMysticalMan_branch_178615: ; 178615
 	note B_, 8
 	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
-; 17868e
 
-Music_LookMysticalMan_Ch4: ; 17868e
+Music_LookMysticalMan_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -547,7 +540,7 @@ Music_LookMysticalMan_Ch4: ; 17868e
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_178697: ; 178697
+Music_LookMysticalMan_branch_178697:
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
 	callchannel Music_LookMysticalMan_branch_1786d3
@@ -566,7 +559,7 @@ Music_LookMysticalMan_branch_178697: ; 178697
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_1786ba: ; 1786ba
+Music_LookMysticalMan_branch_1786ba:
 	note D_, 2
 	note D#, 2
 	note D_, 3
@@ -586,27 +579,24 @@ Music_LookMysticalMan_branch_1786ba: ; 1786ba
 	note D_, 1
 	loopchannel 2, Music_LookMysticalMan_branch_1786ba
 	loopchannel 0, Music_LookMysticalMan_branch_178697
-; 1786d3
 
-Music_LookMysticalMan_branch_1786d3: ; 1786d3
+Music_LookMysticalMan_branch_1786d3:
 	note D#, 4
 	note D_, 3
 	note D#, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786d9
 
-Music_LookMysticalMan_branch_1786d9: ; 1786d9
+Music_LookMysticalMan_branch_1786d9:
 	note D#, 4
 	note D_, 3
 	note D_, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786df
 
-Music_LookMysticalMan_branch_1786df: ; 1786df
+Music_LookMysticalMan_branch_1786df:
 	note D#, 4
 	note D_, 2
 	note D#, 1
@@ -616,6 +606,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1786e8
-
-

crysaudio/music/lookofficer.asm

@@ -1,10 +1,9 @@
-Music_LookOfficer: ; ed82d
-	dbw $80, Music_LookOfficer_Ch1
-	dbw $01, Music_LookOfficer_Ch2
-	dbw $02, Music_LookOfficer_Ch3
-; ed836
+Music_LookOfficer:
+	musicheader 3, 1, Music_LookOfficer_Ch1
+	musicheader 1, 2, Music_LookOfficer_Ch2
+	musicheader 1, 3, Music_LookOfficer_Ch3
 
-Music_LookOfficer_Ch1: ; ed836
+Music_LookOfficer_Ch1:
 	tempo 116
 	volume $77
 	tone $0001
@@ -21,7 +20,7 @@ Music_LookOfficer_Ch1: ; ed836
 	intensity $2f
 	octave 3
 	note B_, 16
-Music_LookOfficer_branch_ed852: ; ed852
+Music_LookOfficer_branch_ed852:
 	intensity $82
 	note __, 4
 	note B_, 6
@@ -34,9 +33,8 @@ Music_LookOfficer_branch_ed852: ; ed852
 	note A#, 16
 	note A_, 16
 	loopchannel 0, Music_LookOfficer_branch_ed852
-; ed863
 
-Music_LookOfficer_Ch2: ; ed863
+Music_LookOfficer_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $c, $b7
@@ -61,7 +59,7 @@ Music_LookOfficer_Ch2: ; ed863
 	note B_, 2
 	octave 2
 	note D#, 2
-Music_LookOfficer_branch_ed882: ; ed882
+Music_LookOfficer_branch_ed882:
 	note E_, 2
 	note G#, 2
 	octave 3
@@ -73,14 +71,13 @@ Music_LookOfficer_branch_ed882: ; ed882
 	note E_, 2
 	note G#, 2
 	loopchannel 2, Music_LookOfficer_branch_ed882
-	forceoctave $1
+	pitchoffset 0, C#
 	callchannel Music_LookOfficer_branch_ed89e
-	forceoctave $0
+	pitchoffset 0, C_
 	callchannel Music_LookOfficer_branch_ed89e
 	loopchannel 0, Music_LookOfficer_branch_ed882
-; ed89e
 
-Music_LookOfficer_branch_ed89e: ; ed89e
+Music_LookOfficer_branch_ed89e:
 	octave 1
 	note A_, 2
 	octave 2
@@ -96,9 +93,8 @@ Music_LookOfficer_branch_ed89e: ; ed89e
 	octave 2
 	note C#, 2
 	endchannel
-; ed8ad
 
-Music_LookOfficer_Ch3: ; ed8ad
+Music_LookOfficer_Ch3:
 	vibrato $14, $14
 	stereopanning $f0
 	notetype $c, $14
@@ -120,7 +116,7 @@ Music_LookOfficer_Ch3: ; ed8ad
 	note C#, 2
 	note __, 1
 	note D#, 2
-Music_LookOfficer_branch_ed8c8: ; ed8c8
+Music_LookOfficer_branch_ed8c8:
 	note E_, 6
 	note D#, 6
 	note C#, 4
@@ -139,6 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note E_, 8
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
-; ed8dd
-
-

crysaudio/music/lookpokemaniac.asm

@@ -1,10 +1,9 @@
-Music_LookPokemaniac: ; ebde1
-	dbw $80, Music_LookPokemaniac_Ch1
-	dbw $01, Music_LookPokemaniac_Ch2
-	dbw $02, Music_LookPokemaniac_Ch3
-; ebdea
+Music_LookPokemaniac:
+	musicheader 3, 1, Music_LookPokemaniac_Ch1
+	musicheader 1, 2, Music_LookPokemaniac_Ch2
+	musicheader 1, 3, Music_LookPokemaniac_Ch3
 
-Music_LookPokemaniac_Ch1: ; ebdea
+Music_LookPokemaniac_Ch1:
 	stereopanning $f
 	tempo 144
 	volume $77
@@ -12,7 +11,7 @@ Music_LookPokemaniac_Ch1: ; ebdea
 	tone $0002
 	notetype $c, $b3
 	note __, 8
-Music_LookPokemaniac_branch_ebdfb: ; ebdfb
+Music_LookPokemaniac_branch_ebdfb:
 	note __, 4
 	octave 3
 	note A#, 1
@@ -27,9 +26,8 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
-; ebe12
 
-Music_LookPokemaniac_Ch2: ; ebe12
+Music_LookPokemaniac_Ch2:
 	stereopanning $ff
 	vibrato $2, $33
 	tone $0001
@@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe12
 	note C_, 1
 	octave 1
 	note A_, 4
-Music_LookPokemaniac_branch_ebe24: ; ebe24
+Music_LookPokemaniac_branch_ebe24:
 	octave 2
 	note C_, 2
 	note __, 2
@@ -59,7 +57,7 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24
 	note D#, 1
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
-Music_LookPokemaniac_branch_ebe38: ; ebe38
+Music_LookPokemaniac_branch_ebe38:
 	octave 1
 	note A_, 2
 	note __, 2
@@ -79,9 +77,8 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
-; ebe51
 
-Music_LookPokemaniac_Ch3: ; ebe51
+Music_LookPokemaniac_Ch3:
 	stereopanning $f0
 	vibrato $6, $33
 	notetype $c, $15
@@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe51
 	octave 5
 	note C_, 4
 	intensity $10
-Music_LookPokemaniac_branch_ebe62: ; ebe62
+Music_LookPokemaniac_branch_ebe62:
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $10
 	loopchannel 0, Music_LookPokemaniac_branch_ebe62
-; ebe70
 
-Music_LookPokemaniac_branch_ebe70: ; ebe70
+Music_LookPokemaniac_branch_ebe70:
 	note A#, 6
 	note A_, 2
 	note G#, 2
@@ -161,6 +157,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70
 	note C_, 1
 	note __, 1
 	endchannel
-; ebeab
-
-

crysaudio/music/lookrival.asm

@@ -1,11 +1,10 @@
-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:
+	musicheader 4, 1, Music_LookRival_Ch1
+	musicheader 1, 2, Music_LookRival_Ch2
+	musicheader 1, 3, Music_LookRival_Ch3
+	musicheader 1, 4, Music_LookRival_Ch4
 
-Music_LookRival_Ch1: ; f4f85
+Music_LookRival_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $1
@@ -34,8 +33,8 @@ Music_LookRival_Ch1: ; f4f85
 	note G#, 8
 	intensity $a6
 	note F#, 8
-Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
-Music_LookRival_branch_f4fb1: ; f4fb1
+Music_AfterTheRivalFight_branch_f4fb1:
+Music_LookRival_branch_f4fb1:
 	intensity $b5
 	note F_, 4
 	note D#, 2
@@ -99,7 +98,7 @@ Music_LookRival_branch_f4fb1: ; f4fb1
 	note G#, 8
 	note F_, 6
 	note C_, 2
-Music_LookRival_branch_f4ff7: ; f4ff7
+Music_LookRival_branch_f4ff7:
 	intensity $b2
 	note F_, 6
 	intensity $b7
@@ -115,9 +114,8 @@ Music_LookRival_branch_f4ff7: ; f4ff7
 	note G#, 6
 	note F#, 4
 	loopchannel 0, Music_LookRival_branch_f4fb1
-; f5010
 
-Music_LookRival_Ch2: ; f5010
+Music_LookRival_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	stereopanning $f0
@@ -138,8 +136,8 @@ Music_LookRival_Ch2: ; f5010
 	note D#, 10
 	intensity $b7
 	note D#, 16
-Music_AfterTheRivalFight_branch_f502e: ; f502e
-Music_LookRival_branch_f502e: ; f502e
+Music_AfterTheRivalFight_branch_f502e:
+Music_LookRival_branch_f502e:
 	intensity $c7
 	note C_, 12
 	intensity $c4
@@ -192,7 +190,7 @@ Music_LookRival_branch_f502e: ; f502e
 	note D#, 1
 	note D_, 1
 	note D#, 2
-Music_LookRival_branch_f5070: ; f5070
+Music_LookRival_branch_f5070:
 	intensity $c2
 	note C_, 6
 	intensity $c7
@@ -205,9 +203,8 @@ Music_LookRival_branch_f5070: ; f5070
 	intensity $c7
 	note D#, 10
 	loopchannel 0, Music_LookRival_branch_f502e
-; f5086
 
-Music_LookRival_Ch3: ; f5086
+Music_LookRival_Ch3:
 	notetype $c, $28
 	note __, 2
 	octave 4
@@ -229,8 +226,8 @@ Music_LookRival_Ch3: ; f5086
 	note C_, 2
 	note D#, 2
 	note F#, 2
-Music_AfterTheRivalFight_branch_f509d: ; f509d
-Music_LookRival_branch_f509d: ; f509d
+Music_AfterTheRivalFight_branch_f509d:
+Music_LookRival_branch_f509d:
 	callchannel Music_LookRival_branch_f50ef
 	loopchannel 3, Music_LookRival_branch_f509d
 	note F_, 4
@@ -293,9 +290,8 @@ Music_LookRival_branch_f509d: ; f509d
 	note F#, 2
 	note E_, 2
 	loopchannel 0, Music_LookRival_branch_f509d
-; f50ef
 
-Music_LookRival_branch_f50ef: ; f50ef
+Music_LookRival_branch_f50ef:
 	note F_, 2
 	note C_, 2
 	note D_, 2
@@ -304,9 +300,8 @@ Music_LookRival_branch_f50ef: ; f50ef
 	note D_, 2
 	note D#, 2
 	endchannel
-; f50f7
 
-Music_LookRival_branch_f50f7: ; f50f7
+Music_LookRival_branch_f50f7:
 	note A#, 2
 	note F_, 2
 	note G_, 2
@@ -315,9 +310,8 @@ Music_LookRival_branch_f50f7: ; f50f7
 	note G_, 2
 	note G#, 2
 	endchannel
-; f50ff
 
-Music_LookRival_branch_f50ff: ; f50ff
+Music_LookRival_branch_f50ff:
 	note A#, 4
 	note F_, 2
 	note G#, 4
@@ -325,9 +319,8 @@ Music_LookRival_branch_f50ff: ; f50ff
 	note G_, 2
 	note G#, 2
 	endchannel
-; f5106
 
-Music_LookRival_Ch4: ; f5106
+Music_LookRival_Ch4:
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
@@ -343,8 +336,8 @@ Music_LookRival_Ch4: ; f5106
 	note D_, 2
 	note D_, 2
 	note D_, 2
-Music_AfterTheRivalFight_branch_f5118: ; f5118
-Music_LookRival_branch_f5118: ; f5118
+Music_AfterTheRivalFight_branch_f5118:
+Music_LookRival_branch_f5118:
 	note D#, 4
 	note D_, 2
 	note D#, 4
@@ -357,6 +350,3 @@ Music_LookRival_branch_f5118: ; f5118
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
-; f5127
-
-

crysaudio/music/lookrocket.asm

@@ -1,14 +1,13 @@
-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:
+	musicheader 4, 1, Music_LookRocket_Ch1
+	musicheader 1, 2, Music_LookRocket_Ch2
+	musicheader 1, 3, Music_LookRocket_Ch3
+	musicheader 1, 4, Music_LookRocket_Ch4
 
-Music_LookRocket_Ch1: ; f74ae
+Music_LookRocket_Ch1:
 	tempo 123
 	volume $77
-	forceoctave $2
+	pitchoffset 0, D_
 	stereopanning $f
 	dutycycle $3
 	vibrato $5, $64
@@ -18,7 +17,7 @@ Music_LookRocket_Ch1: ; f74ae
 	note D_, 1
 	callchannel Music_LookRocket_branch_f74e6
 	dutycycle $1
-Music_LookRocket_branch_f74c7: ; f74c7
+Music_LookRocket_branch_f74c7:
 	intensity $a8
 	callchannel Music_LookRocket_branch_f74f7
 	callchannel Music_LookRocket_branch_f758a
@@ -33,10 +32,9 @@ Music_LookRocket_branch_f74c7: ; f74c7
 	callchannel Music_LookRocket_branch_f750c
 	note __, 16
 	loopchannel 0, Music_LookRocket_branch_f74c7
-; f74e6
 
-Music_LookRocket_branch_f74e6: ; f74e6
-Music_RocketTheme_branch_f74e6: ; f74e6
+Music_LookRocket_branch_f74e6:
+Music_RocketTheme_branch_f74e6:
 	note D#, 1
 	note __, 1
 	note D_, 1
@@ -54,10 +52,9 @@ Music_RocketTheme_branch_f74e6: ; f74e6
 	note F_, 1
 	note G#, 1
 	endchannel
-; f74f7
 
-Music_LookRocket_branch_f74f7: ; f74f7
-Music_RocketTheme_branch_f74f7: ; f74f7
+Music_LookRocket_branch_f74f7:
+Music_RocketTheme_branch_f74f7:
 	note __, 2
 	octave 3
 	note D#, 1
@@ -79,10 +76,9 @@ Music_RocketTheme_branch_f74f7: ; f74f7
 	note F#, 1
 	note __, 1
 	endchannel
-; f750c
 
-Music_LookRocket_branch_f750c: ; f750c
-Music_RocketTheme_branch_f750c: ; f750c
+Music_LookRocket_branch_f750c:
+Music_RocketTheme_branch_f750c:
 	note __, 2
 	octave 2
 	note B_, 1
@@ -91,10 +87,9 @@ Music_RocketTheme_branch_f750c: ; f750c
 	note C_, 1
 	note __, 5
 	endchannel
-; f7514
 
-Music_LookRocket_Ch2: ; f7514
-	forceoctave $2
+Music_LookRocket_Ch2:
+	pitchoffset 0, D_
 	vibrato $4, $64
 	dutycycle $3
 	notetype $c, $b7
@@ -103,7 +98,7 @@ Music_LookRocket_Ch2: ; f7514
 	note C_, 1
 	note D_, 1
 	callchannel Music_LookRocket_branch_f7547
-Music_LookRocket_branch_f7526: ; f7526
+Music_LookRocket_branch_f7526:
 	intensity $b7
 	callchannel Music_LookRocket_branch_f758a
 	octave 5
@@ -118,10 +113,9 @@ Music_LookRocket_branch_f7526: ; f7526
 	callchannel Music_LookRocket_branch_f7568
 	callchannel Music_LookRocket_branch_f756f
 	loopchannel 0, Music_LookRocket_branch_f7526
-; f7547
 
-Music_LookRocket_branch_f7547: ; f7547
-Music_RocketTheme_branch_f7547: ; f7547
+Music_LookRocket_branch_f7547:
+Music_RocketTheme_branch_f7547:
 	note D#, 1
 	note __, 1
 	note D_, 1
@@ -134,10 +128,9 @@ Music_RocketTheme_branch_f7547: ; f7547
 	note B_, 6
 	dutycycle $0
 	endchannel
-; f7554
 
-Music_LookRocket_branch_f7554: ; f7554
-Music_RocketTheme_branch_f7554: ; f7554
+Music_LookRocket_branch_f7554:
+Music_RocketTheme_branch_f7554:
 	note __, 2
 	octave 4
 	note D#, 1
@@ -158,10 +151,9 @@ Music_RocketTheme_branch_f7554: ; f7554
 	note D#, 1
 	note __, 1
 	endchannel
-; f7568
 
-Music_LookRocket_branch_f7568: ; f7568
-Music_RocketTheme_branch_f7568: ; f7568
+Music_LookRocket_branch_f7568:
+Music_RocketTheme_branch_f7568:
 	note __, 2
 	octave 3
 	note F_, 1
@@ -169,10 +161,9 @@ Music_RocketTheme_branch_f7568: ; f7568
 	note F#, 1
 	note __, 5
 	endchannel
-; f756f
 
-Music_LookRocket_branch_f756f: ; f756f
-Music_RocketTheme_branch_f756f: ; f756f
+Music_LookRocket_branch_f756f:
+Music_RocketTheme_branch_f756f:
 	intensity $63
 	note G#, 1
 	note F_, 1
@@ -196,10 +187,9 @@ Music_RocketTheme_branch_f756f: ; f756f
 	note F_, 1
 	note D_, 1
 	endchannel
-; f758a
 
-Music_LookRocket_branch_f758a: ; f758a
-Music_RocketTheme_branch_f758a: ; f758a
+Music_LookRocket_branch_f758a:
+Music_RocketTheme_branch_f758a:
 	octave 3
 	note __, 2
 	note G_, 1
@@ -213,16 +203,15 @@ Music_RocketTheme_branch_f758a: ; f758a
 	note A_, 1
 	note __, 1
 	endchannel
-; f7597
 
-Music_LookRocket_Ch3: ; f7597
-	forceoctave $2
+Music_LookRocket_Ch3:
+	pitchoffset 0, D_
 	vibrato $4, $22
 	notetype $c, $14
 	stereopanning $f0
 	note __, 2
 	callchannel Music_LookRocket_branch_f75bf
-Music_LookRocket_branch_f75a5: ; f75a5
+Music_LookRocket_branch_f75a5:
 	callchannel Music_LookRocket_branch_f75fe
 	callchannel Music_LookRocket_branch_f75fe
 	intensity $24
@@ -232,10 +221,9 @@ Music_LookRocket_branch_f75a5: ; f75a5
 	callchannel Music_LookRocket_branch_f7623
 	callchannel Music_LookRocket_branch_f75e1
 	loopchannel 0, Music_LookRocket_branch_f75a5
-; f75bf
 
-Music_LookRocket_branch_f75bf: ; f75bf
-Music_RocketTheme_branch_f75bf: ; f75bf
+Music_LookRocket_branch_f75bf:
+Music_RocketTheme_branch_f75bf:
 	octave 3
 	note F_, 1
 	note __, 1
@@ -249,10 +237,9 @@ Music_RocketTheme_branch_f75bf: ; f75bf
 	octave 3
 	note D_, 6
 	endchannel
-; f75cc
 
-Music_LookRocket_branch_f75cc: ; f75cc
-Music_RocketTheme_branch_f75cc: ; f75cc
+Music_LookRocket_branch_f75cc:
+Music_RocketTheme_branch_f75cc:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -274,10 +261,9 @@ Music_RocketTheme_branch_f75cc: ; f75cc
 	note F#, 1
 	note __, 1
 	endchannel
-; f75e1
 
-Music_LookRocket_branch_f75e1: ; f75e1
-Music_RocketTheme_branch_f75e1: ; f75e1
+Music_LookRocket_branch_f75e1:
+Music_RocketTheme_branch_f75e1:
 	intensity $24
 	octave 2
 	note G#, 1
@@ -305,10 +291,9 @@ Music_RocketTheme_branch_f75e1: ; f75e1
 	note G#, 1
 	note __, 1
 	endchannel
-; f75fe
 
-Music_LookRocket_branch_f75fe: ; f75fe
-Music_RocketTheme_branch_f75fe: ; f75fe
+Music_LookRocket_branch_f75fe:
+Music_RocketTheme_branch_f75fe:
 	note C_, 1
 	note __, 1
 	octave 4
@@ -346,10 +331,9 @@ Music_RocketTheme_branch_f75fe: ; f75fe
 	note A_, 1
 	note __, 1
 	endchannel
-; f7623
 
-Music_LookRocket_branch_f7623: ; f7623
-Music_RocketTheme_branch_f7623: ; f7623
+Music_LookRocket_branch_f7623:
+Music_RocketTheme_branch_f7623:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -371,14 +355,13 @@ Music_RocketTheme_branch_f7623: ; f7623
 	note D#, 1
 	note C_, 1
 	endchannel
-; f7638
 
-Music_LookRocket_Ch4: ; f7638
+Music_LookRocket_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
 	callchannel Music_LookRocket_branch_f765c
-Music_LookRocket_branch_f7640: ; f7640
+Music_LookRocket_branch_f7640:
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
@@ -388,10 +371,9 @@ Music_LookRocket_branch_f7640: ; f7640
 	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
+Music_LookRocket_branch_f765c:
+Music_RocketTheme_branch_f765c:
 	note C_, 8
 	note D_, 2
 	note D#, 2
@@ -400,10 +382,9 @@ Music_RocketTheme_branch_f765c: ; f765c
 	note D_, 1
 	note D_, 1
 	endchannel
-; f7664
 
-Music_LookRocket_branch_f7664: ; f7664
-Music_RocketTheme_branch_f7664: ; f7664
+Music_LookRocket_branch_f7664:
+Music_RocketTheme_branch_f7664:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -413,6 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664
 	note D_, 2
 	note F#, 2
 	endchannel
-; f766d
-
-

crysaudio/music/looksage.asm

@@ -1,9 +1,8 @@
-Music_LookSage: ; ee35e
-	dbw $40, Music_LookSage_Ch1
-	dbw $02, Music_LookSage_Ch3
-; ee364
+Music_LookSage:
+	musicheader 2, 1, Music_LookSage_Ch1
+	musicheader 1, 3, Music_LookSage_Ch3
 
-Music_LookSage_Ch1: ; ee364
+Music_LookSage_Ch1:
 	tempo 144
 	stereopanning $f
 	volume $77
@@ -29,7 +28,7 @@ Music_LookSage_Ch1: ; ee364
 	note F_, 2
 	intensity $93
 	note F_, 2
-Music_LookSage_branch_ee38e: ; ee38e
+Music_LookSage_branch_ee38e:
 	intensity $b3
 	note D_, 2
 	intensity $93
@@ -101,9 +100,8 @@ Music_LookSage_branch_ee38e: ; ee38e
 	note B_, 2
 	callchannel Music_LookSage_branch_ee3fa
 	loopchannel 0, Music_LookSage_branch_ee38e
-; ee3fa
 
-Music_LookSage_branch_ee3fa: ; ee3fa
+Music_LookSage_branch_ee3fa:
 	intensity $b3
 	octave 2
 	note E_, 2
@@ -122,9 +120,8 @@ Music_LookSage_branch_ee3fa: ; ee3fa
 	intensity $93
 	note A_, 2
 	endchannel
-; ee414
 
-Music_LookSage_Ch3: ; ee414
+Music_LookSage_Ch3:
 	stereopanning $f0
 	vibrato $16, $23
 	notetype $c, $10
@@ -144,7 +141,7 @@ Music_LookSage_Ch3: ; ee414
 	note E_, 14
 	note G_, 1
 	note G#, 1
-Music_LookSage_branch_ee430: ; ee430
+Music_LookSage_branch_ee430:
 	note A_, 12
 	note B_, 4
 	note D_, 9
@@ -179,6 +176,3 @@ Music_LookSage_branch_ee430: ; ee430
 	note G_, 1
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
-; ee45f
-
-

crysaudio/music/lookyoungster.asm

@@ -1,10 +1,9 @@
-Music_LookYoungster: ; f66c3
-	dbw $80, Music_LookYoungster_Ch1
-	dbw $01, Music_LookYoungster_Ch2
-	dbw $02, Music_LookYoungster_Ch3
-; f66cc
+Music_LookYoungster:
+	musicheader 3, 1, Music_LookYoungster_Ch1
+	musicheader 1, 2, Music_LookYoungster_Ch2
+	musicheader 1, 3, Music_LookYoungster_Ch3
 
-Music_LookYoungster_Ch1: ; f66cc
+Music_LookYoungster_Ch1:
 	tempo 118
 	volume $77
 	stereopanning $f
@@ -25,7 +24,7 @@ Music_LookYoungster_Ch1: ; f66cc
 	note __, 2
 	note C_, 6
 	intensity $b3
-Music_LookYoungster_branch_f66ea: ; f66ea
+Music_LookYoungster_branch_f66ea:
 	note __, 2
 	octave 3
 	note G_, 1
@@ -59,12 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 1
 	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
-; f670e
 
+	db $ff
 
-
-
-Music_LookYoungster_Ch2: ; f670f
+Music_LookYoungster_Ch2:
 	stereopanning $f0
 	vibrato $12, $26
 	dutycycle $1
@@ -85,7 +82,7 @@ Music_LookYoungster_Ch2: ; f670f
 	note F_, 4
 	note __, 2
 	note F#, 6
-Music_LookYoungster_branch_f672f: ; f672f
+Music_LookYoungster_branch_f672f:
 	dutycycle $3
 	intensity $b3
 	note __, 2
@@ -159,12 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f
 	note C_, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
-; f6783
 
+	db $ff
 
-
-
-Music_LookYoungster_Ch3: ; f6784
+Music_LookYoungster_Ch3:
 	stereopanning $ff
 	vibrato $2, $24
 	notetype $c, $25
@@ -200,7 +195,7 @@ Music_LookYoungster_Ch3: ; f6784
 	note __, 2
 	note G#, 6
 	intensity $25
-Music_LookYoungster_branch_f67ae: ; f67ae
+Music_LookYoungster_branch_f67ae:
 	octave 2
 	note G_, 1
 	note __, 1
@@ -296,9 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f67ae
-; f6810
-
-
-
-
 
+	db $ff