Merge pull request #11 from dannye/music

Music

Makefile

@@ -4,7 +4,7 @@ TEXTFILES := $(shell find ./ -type f -name '*.asm')
 
 all: pokered.gbc
 
-pokered.o: pokered.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx}
+pokered.o: pokered.tx main.tx constants.tx wram.tx ${TEXTFILES:.asm=.tx}
 	rgbasm -o pokered.o pokered.tx
 	
 pokeblue.o: pokeblue.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx}

constants.asm

@@ -3367,146 +3367,193 @@ BRUNOS_ROOM_WIDTH  EQU $05
 AGATHAS_ROOM_HEIGHT EQU $06
 AGATHAS_ROOM_WIDTH  EQU $05
 
-;Sound Constants (Copied from pkms.asm with modifications)
-MUSIC		EQU 0
-SFX			EQU 4
-CH1			EQU 0
-CH2			EQU 1
-CH3			EQU 2
-CH4			EQU 3
+;1_channel	EQU $00
+;2_channels	EQU $40
+;3_channels	EQU $80
+;4_channels	EQU $C0
+
+CH0		EQU 0
+CH1		EQU 1
+CH2		EQU 2
+CH3		EQU 3
+CH4		EQU 4
+CH5		EQU 5
+CH6		EQU 6
+CH7		EQU 7
 
 ;Note Pitch
-noteC		EQU $0
-noteC#		EQU $1
-noteD		EQU $2
-noteD#		EQU $3
-noteE		EQU $4
-noteF		EQU $5
-noteF#		EQU $6
-noteG		EQU $7
-noteG#		EQU $8
-noteA		EQU $9
-noteA#		EQU $A
-noteB		EQU $B
-noteRst		EQU $C
+C_		EQU $0
+C#		EQU $1
+D_		EQU $2
+D#		EQU $3
+E_		EQU $4
+F_		EQU $5
+F#		EQU $6
+G_		EQU $7
+G#		EQU $8
+A_		EQU $9
+A#		EQU $A
+B_		EQU $B
 
-;Note Delay
-note16		EQU $0 ;1/16
-note8		EQU $1 ;1/8
-note8_16	EQU $2 ;1/8 + 1/16
-note4		EQU $3 ;1/4
-note4_16	EQU $4 ;1/4 + 1/16
-note4_8		EQU $5 ;1/4 + 1/8
-note4_8_16 	EQU $6 ;1/4 + 1/8 + 1/16
-note2		EQU $7 ;1/2
-note2_16	EQU $8 ;1/2 + 1/16
-note2_8		EQU $9 ;1/2 + 1/8
-note2_8_16	EQU $A ;1/2 + 1/8 + 1/16
-note2_4		EQU $B ;1/2 + 1/4
-note2_4_16 	EQU $C ;1/2 + 1/4 + 1/16
-note2_4_8	EQU $D ;1/2 + 1/4 + 1/8
-note2_4_8_16 EQU $E ;1/2 + 1/4 + 1/8 + 1/16
-note1		EQU $F ;1
+;drum instruments
+snare1		EQU $01
+snare2		EQU $02
+snare3		EQU $03
+snare4		EQU $04
+snare5		EQU $05
+triangle1	EQU $06
+triangle2	EQU $07
+snare6		EQU $08
+snare7		EQU $09
+snare8		EQU $0a
+snare9		EQU $0b
+cymbal1		EQU $0c
+cymbal2		EQU $0d
+cymbal3		EQU $0e
+mutedsnare1	EQU $0f
+triangle3	EQU $10
+mutedsnare2	EQU $11
+mutedsnare3	EQU $12
+mutedsnare4	EQU $13
 
-;Drum
-dNote		EQU $B0
-dRst		EQU $C0
-d5d3Spd		EQU $D4
-d4d3Spd		EQU $D8
-dNormSpd	EQU $DC
-d2Spd		EQU $D0
-
-; octaves
-oct0		EQU $E7
-oct1		EQU $E6
-oct2		EQU $E5
-oct3		EQU $E4
-oct4		EQU $E3
-oct5		EQU $E2
-oct6		EQU $E1
-oct7		EQU $E0
-
-;duty
-duty12_5	EQU $0
-duty25		EQU $1
-duty50		EQU $2
-duty75		EQU $3
-
-;Write a music note
-;format: mus_note pitch delay
-mus_note: MACRO
-	db ((\1 << 4) | \2)
+;format: note pitch, length (in 16ths)
+note: MACRO
+	db (\1 << 4) | (\2 - 1)
 ENDM
 
-;Write an octave note
-;format: mus_octave octave
-mus_octave: MACRO
-	db \1
+;format: dnote length (in 16ths), instrument
+dnote: MACRO
+	db $B0 | (\1 - 1)
+	db \2
 ENDM
 
-; set velocity/note fade (\1 is velocity, \2 is note length, both 0-15)
-; format: mus_vel vel, length
-mus_vel: MACRO
-	db $DC
-	db	((\1 << 4) | \2)
+;format: rest length (in 16ths)
+rest: MACRO
+	db $C0 | (\1 - 1)
 ENDM
 
-; stop sound
-; format: mus_end
-mus_end: MACRO
-	db $FF
+; format: notetype speed, volume, fade
+notetype: MACRO
+	db	$D0 | \1
+	db	(\2 << 4) | \3
 ENDM
 
-; ???
-; format: mus_E8
-mus_E8: MACRO
+dspeed: MACRO
+	db $D0 | \1
+ENDM
+
+octave: MACRO
+	db $E8 - \1
+ENDM
+
+unknownmusic0xe8: MACRO
 	db $E8
 ENDM
 
-; set modulation (\1 is delay, \2 is depth, \3 is rate)
-; format: mus_mod delay, depth, rate
-mus_mod: MACRO
-	db	$EA
-	db	\1
-	db	((\2 << 4) | \3)
+unknownmusic0xe9: MACRO
+	db $E9
 ENDM
 
-; set duty cycle (\1: 0 = 12.5%, 1 = 25%, 2 = 50%, 3 = 75%)
-; format: mus_duty duty
-mus_duty: MACRO
-	db	$EC
-	db	\1
+;format: vibrato delay, rate, depth
+vibrato: MACRO
+	db $EA
+	db \1
+	db (\2 << 4) | \3
 ENDM
 
-; set music tempo (\1 is divider, \2 is modifier)
-; format:	mus_tempo divider, modifier
-mus_tempo: MACRO
-	db	$ED
-	db	\1
-	db	\2
+pitchbend: MACRO
+	db $EB
+	db \1
+	db \2
 ENDM
 
-; set volume (\1 is volume)
-; format: mus_volume volume
-; (may actually be panning?)
-mus_volume: MACRO
-	db	$F0
-	db	\1
+duty: MACRO
+	db $EC
+	db \1
 ENDM
 
-; call \1
-; format: mus_call offset
-mus_call: MACRO
-	db	$FD
-	;dw	((\1 % $4000) + ((\1 >= $4000) * $4000))
-	dw \1
+tempo: MACRO
+	db $ED
+	db \1
+	db \2
 ENDM
 
-; jump \1 \2
-; format: mus_jump loop offset
-mus_jump: MACRO
-	db	$FE
-	db	\1
-	dw  \2
-	;dw	((\2 % $4000) + ((\2 >= $4000) * $4000))
+unknownmusic0xee: MACRO
+	db $EE
+	db \1
+ENDM
+
+unknownmusic0xef: MACRO
+	db $EF
+ENDM
+
+stereopanning: MACRO
+	db $F0
+	db \1
+ENDM
+
+unknownmusic0xf1: MACRO
+	db $F1
+ENDM
+
+unknownmusic0xf2: MACRO
+	db $F2
+ENDM
+
+unknownmusic0xf3: MACRO
+	db $F3
+ENDM
+
+unknownmusic0xf4: MACRO
+	db $F4
+ENDM
+
+unknownmusic0xf5: MACRO
+	db $F5
+ENDM
+
+unknownmusic0xf6: MACRO
+	db $F6
+ENDM
+
+unknownmusic0xf7: MACRO
+	db $F7
+ENDM
+
+unknownmusic0xf8: MACRO
+	db $F8
+ENDM
+
+unknownmusic0xf9: MACRO
+	db $F9
+ENDM
+
+unknownmusic0xfa: MACRO
+	db $FA
+ENDM
+
+unknownmusic0xfb: MACRO
+	db $FB
+ENDM
+
+dutycycle: MACRO
+	db $FC
+	db \1
+ENDM
+
+;format: callchannel address
+;callchannel: MACRO
+;	db $FD
+;	dw \1
+;ENDM
+
+;format: loopchannel count, address
+;loopchannel: MACRO
+;	db $FE
+;	db \1
+;	dw \2
+;ENDM
+
+endchannel: MACRO
+	db $FF
 ENDM

extras

@@ -1 +1 @@
-Subproject commit 2374a9ce905ccc4c701f81904b01019641e884b5
+Subproject commit c57e0f0706608a4acba89182945bec975a43acfd

music/bikeriding.asm

@@ -0,0 +1,705 @@
+Music_BikeRiding_Ch1: ; 7dbbb (1f:5bbb)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	vibrato 8, 1, 4
+	notetype 12, 11, 5
+	octave 3
+	note G_, 2
+
+Music_BikeRiding_branch_7dbc9:
+	octave 4
+	note C_, 4
+	note D_, 4
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note F_, 4
+	note D_, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note F_, 4
+	note D_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	notetype 12, 11, 6
+	note F_, 10
+	notetype 12, 10, 6
+	note F_, 2
+	note E_, 2
+	note F_, 2
+	note G_, 10
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 6
+	unknownmusic0xe8
+	notetype 12, 11, 3
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note E_, 1
+	note F_, 1
+	unknownmusic0xe8
+	notetype 12, 11, 5
+	note G_, 6
+	note G_, 6
+	note A_, 2
+	note F_, 2
+	note G_, 6
+	notetype 12, 11, 4
+	note G_, 2
+	note F_, 4
+	notetype 12, 10, 4
+	note E_, 2
+	note D_, 2
+	notetype 12, 9, 3
+	octave 3
+	note A_, 2
+	octave 4
+	note C_, 4
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 1
+	note B_, 1
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	octave 3
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note A_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note A_, 2
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 2
+	octave 4
+	note D_, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 4
+	notetype 12, 3, 13
+	note C_, 4
+	notetype 12, 11, 4
+	note F_, 6
+	note G_, 4
+	note F_, 1
+	note G_, 1
+	note F_, 4
+	note E_, 6
+	note F_, 2
+	note E_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 2
+	note C_, 2
+	notetype 12, 11, 5
+	octave 3
+	note A_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	note C_, 4
+	note F_, 4
+	note D_, 4
+	note F#, 4
+	vibrato 10, 2, 6
+	notetype 12, 8, 0
+	note G_, 16
+	note G_, 4
+	notetype 12, 8, 7
+	note G_, 12
+	notetype 12, 11, 5
+	vibrato 8, 1, 4
+	loopchannel 0, Music_BikeRiding_branch_7dbc9
+
+
+Music_BikeRiding_Ch2: ; 7dc6c (1f:5c6c)
+	duty 2
+	vibrato 6, 1, 5
+	notetype 12, 12, 3
+	octave 4
+	note C_, 2
+
+Music_BikeRiding_branch_7dc75:
+	note E_, 4
+	note F_, 4
+	note G_, 4
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 6
+	note A_, 1
+	note B_, 1
+	note A_, 10
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	octave 5
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 6
+	octave 4
+	note A_, 2
+	note G_, 4
+	duty 3
+	notetype 12, 8, 4
+	note A#, 6
+	duty 2
+	notetype 12, 12, 5
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note A_, 10
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G_, 10
+	notetype 12, 12, 3
+	octave 5
+	note C_, 4
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C_, 2
+	notetype 12, 11, 0
+	note D_, 4
+	notetype 12, 12, 7
+	note D_, 10
+	note D_, 1
+	note C_, 1
+	notetype 12, 11, 0
+	octave 4
+	note B_, 4
+	notetype 12, 12, 7
+	note B_, 12
+	notetype 12, 12, 4
+	note F_, 6
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 6
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note G_, 4
+	note A_, 2
+	note F_, 2
+	note E_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 6
+	notetype 6, 12, 2
+	note F_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	notetype 12, 12, 3
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note A#, 4
+	note A_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	notetype 8, 12, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	octave 5
+	note D_, 4
+	note E_, 4
+	note C_, 4
+	notetype 12, 12, 7
+	note D_, 12
+	note C_, 4
+	notetype 12, 11, 0
+	octave 4
+	note B_, 4
+	notetype 12, 12, 7
+	note B_, 12
+	notetype 12, 12, 3
+	loopchannel 0, Music_BikeRiding_branch_7dc75
+
+
+Music_BikeRiding_Ch3: ; 7dd14 (1f:5d14)
+	notetype 12, 1, 3
+	rest 2
+
+Music_BikeRiding_branch_7dd17:
+	octave 4
+	note C_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	octave 3
+	note G_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	loopchannel 0, Music_BikeRiding_branch_7dd17
+
+
+Music_BikeRiding_Ch4: ; 7de68 (1f:5e68)
+	dspeed 12
+	rest 2
+
+Music_BikeRiding_branch_7de6a:
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7deb4
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dec2
+	callchannel Music_BikeRiding_branch_7deb4
+	callchannel Music_BikeRiding_branch_7deb4
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7deb4
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dec2
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7deb4
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	callchannel Music_BikeRiding_branch_7dea7
+	loopchannel 0, Music_BikeRiding_branch_7de6a
+
+Music_BikeRiding_branch_7dea7:
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	endchannel
+
+Music_BikeRiding_branch_7deb4:
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	dnote 2, triangle3
+	dnote 2, triangle3
+	endchannel
+
+Music_BikeRiding_branch_7dec2:
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 2, triangle3
+	rest 2
+	dnote 1, triangle3
+	dnote 1, triangle3
+	endchannel
+; 0x7ded1

music/blue/sfx_1f_5d.asm

@@ -0,0 +1,52 @@
+SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
+	duty 2
+	note D_, 4
+	octave 4
+	note C_, 1
+	note C_, 7
+	note D_, 4
+	octave 4
+	note G#, 1
+	note C_, 7
+	note D_, 4
+	octave 4
+	rest 1
+	note C_, 7
+	note D_, 4
+	octave 4
+	note C_, 1
+	note C_, 8
+	note D_, 16
+	unknownmusic0xf2
+	octave 8
+	note C_, 8
+	endchannel
+
+
+SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
+	duty 2
+	note D_, 4
+	note C_, 9
+	note C_, 1
+	note C_, 1
+	note D_, 4
+	rest 5
+	note C_, 2
+	note C_, 7
+	note D_, 4
+	rest 5
+	note G#, 2
+	note C_, 7
+	note D_, 4
+	rest 5
+	rest 2
+	note C_, 7
+	note D_, 4
+	rest 5
+	note C_, 2
+	note C_, 8
+	note D_, 16
+	notetype 2, 14, 1
+	note C_, 8
+	endchannel
+; 0x7c490

music/celadon.asm

@@ -0,0 +1,412 @@
+Music_Celadon_Ch1: ; b6c7 (2:76c7)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	notetype 12, 2, 15
+	rest 8
+	octave 3
+	note D_, 8
+
+Music_Celadon_branch_b6d4:
+	duty 2
+	notetype 12, 11, 2
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note B_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A_, 8
+	note F#, 4
+	note A_, 4
+	note F#, 2
+	note A_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
+	octave 4
+	note G_, 4
+	octave 3
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A_, 8
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 4
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 8
+	notetype 12, 9, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	loopchannel 0, Music_Celadon_branch_b6d4
+
+
+Music_Celadon_Ch2: ; b73a (2:773a)
+	duty 3
+	notetype 12, 12, 2
+	octave 4
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	notetype 12, 10, 0
+	note A_, 8
+
+Music_Celadon_branch_b74a:
+	duty 2
+	notetype 12, 12, 2
+	octave 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 6
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 4
+	note F#, 4
+	note A_, 2
+	note F#, 6
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
+	note B_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 8
+	octave 5
+	note D_, 8
+	notetype 12, 11, 4
+	octave 4
+	note D_, 8
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note F#, 4
+	note D_, 8
+	note C_, 8
+	octave 3
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note D_, 8
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note C_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	loopchannel 0, Music_Celadon_branch_b74a
+
+
+Music_Celadon_Ch3: ; b7b5 (2:77b5)
+	notetype 12, 1, 3
+	rest 8
+	octave 5
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+
+Music_Celadon_branch_b7c1:
+	octave 4
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
+	rest 6
+	note F#, 2
+	rest 4
+	note F#, 2
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	octave 5
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 4
+	note B_, 2
+	note G_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	octave 5
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	octave 4
+	note B_, 2
+	note G_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note F#, 2
+	octave 5
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	loopchannel 0, Music_Celadon_branch_b7c1
+; 0xb86d

music/cinnabar.asm

@@ -0,0 +1,355 @@
+Music_Cinnabar_Ch1: ; b86d (2:786d)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	vibrato 12, 3, 4
+	unknownmusic0xe8
+
+Music_Cinnabar_branch_b878:
+	notetype 12, 11, 5
+	rest 4
+	octave 3
+	note D_, 4
+	note E_, 6
+	note C#, 2
+	notetype 12, 11, 1
+	note D_, 4
+	notetype 12, 11, 5
+	note B_, 4
+	octave 4
+	note C_, 6
+	octave 3
+	note A_, 2
+	notetype 12, 11, 1
+	note B_, 4
+	notetype 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	notetype 12, 11, 1
+	note G_, 4
+	notetype 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note F#, 6
+	note A_, 2
+	notetype 12, 11, 1
+	note G_, 4
+	notetype 12, 11, 5
+	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, 10, 2
+	note G_, 4
+	octave 4
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	notetype 12, 7, 2
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	notetype 12, 10, 7
+	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_Cinnabar_branch_b878
+
+
+Music_Cinnabar_Ch2: ; b8d4 (2:78d4)
+	duty 3
+	vibrato 10, 2, 3
+
+Music_Cinnabar_branch_b8d9:
+	notetype 12, 12, 7
+	octave 3
+	note G_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note D_, 4
+	notetype 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note D_, 4
+	notetype 12, 12, 7
+	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, 12, 1
+	note D_, 4
+	notetype 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note D_, 4
+	notetype 12, 12, 7
+	octave 3
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	notetype 12, 11, 0
+	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_Cinnabar_branch_b8d9
+
+
+Music_Cinnabar_Ch3: ; b93d (2:793d)
+	notetype 12, 1, 0
+
+Music_Cinnabar_branch_b93f:
+	octave 4
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note B_, 4
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 1
+	rest 3
+	octave 5
+	note D_, 2
+	octave 4
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 1
+	rest 1
+	note G_, 1
+	rest 3
+	octave 5
+	note E_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	note E_, 2
+	note C_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 3
+	octave 5
+	note A_, 2
+	note F#, 1
+	note F#, 1
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note D_, 2
+	note C_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 3
+	octave 5
+	note D_, 2
+	note C_, 1
+	note C_, 1
+	octave 4
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note A_, 2
+	octave 5
+	note C_, 1
+	rest 1
+	loopchannel 0, Music_Cinnabar_branch_b93f
+; 0xb9eb

music/cinnabarmansion.asm

@@ -0,0 +1,173 @@
+Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f)
+	tempo 0, 144
+	stereopanning 119
+	vibrato 11, 2, 5
+	duty 2
+
+Music_CinnabarMansion_branch_7ed19:
+	notetype 12, 6, 2
+	octave 5
+	note E_, 1
+	note E_, 1
+	octave 4
+	note B_, 1
+	note B_, 1
+	note C_, 1
+	rest 2
+	octave 5
+	note B_, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	note B_, 2
+	note E_, 2
+	note C_, 1
+	octave 5
+	note B_, 1
+	rest 2
+	loopchannel 14, Music_CinnabarMansion_branch_7ed19
+	notetype 12, 10, 5
+	rest 16
+	rest 16
+	rest 15
+	octave 4
+	note C_, 1
+	octave 5
+	note B_, 1
+	note B_, 2
+	loopchannel 0, Music_CinnabarMansion_branch_7ed19
+
+
+Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40)
+	duty 2
+	unknownmusic0xe8
+	vibrato 10, 2, 4
+	notetype 12, 12, 2
+
+Music_CinnabarMansion_branch_7ed48:
+	rest 16
+	rest 16
+	loopchannel 4, Music_CinnabarMansion_branch_7ed48
+
+Music_CinnabarMansion_branch_7ed4e:
+	notetype 12, 12, 2
+
+Music_CinnabarMansion_branch_7ed50:
+	callchannel Music_CinnabarMansion_branch_7ed6c
+	loopchannel 3, Music_CinnabarMansion_branch_7ed50
+	octave 3
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	rest 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note G_, 4
+	note D#, 4
+	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
+
+Music_CinnabarMansion_branch_7ed6c:
+	octave 3
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	rest 4
+	note A#, 4
+	endchannel
+
+
+Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e)
+	notetype 12, 1, 1
+
+Music_CinnabarMansion_branch_7ed80:
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	octave 3
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	loopchannel 8, Music_CinnabarMansion_branch_7ed80
+	note E_, 16
+	note D#, 16
+	note G_, 16
+	note G#, 8
+	note D#, 8
+	loopchannel 0, Music_CinnabarMansion_branch_7ed80
+
+
+Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0)
+	dspeed 6
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+
+Music_CinnabarMansion_branch_7edb5:
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+	dnote 4, cymbal2
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+	dnote 4, cymbal2
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+	dnote 4, cymbal2
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+	dnote 4, cymbal3
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+	rest 2
+	rest 10
+	rest 8
+	dnote 8, cymbal3
+	loopchannel 0, Music_CinnabarMansion_branch_7edb5
+; 0x7edda

music/cities1.asm

@@ -0,0 +1,658 @@
+Music_Cities1_branch_aa6f:
+	tempo 0, 232
+	loopchannel 0, Music_Cities1_branch_aa79
+
+Music_Cities1_Ch1: ; aa76 (2:6a76)
+	tempo 0, 144
+
+Music_Cities1_branch_aa79:
+	stereopanning 119
+	vibrato 8, 2, 4
+	duty 3
+
+Music_Cities1_branch_aa80:
+	notetype 12, 12, 5
+	octave 3
+	note G#, 4
+	note F#, 4
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
+	note D#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 2
+	note E_, 2
+	note E_, 4
+	notetype 12, 10, 5
+	note C#, 4
+	octave 2
+	note B_, 6
+	octave 3
+	note C#, 2
+	note C#, 4
+	octave 2
+	note B_, 4
+	notetype 12, 12, 5
+	callchannel Music_Cities1_branch_ab7d
+	octave 3
+	note D#, 6
+	note E_, 2
+	octave 2
+	note B_, 4
+	notetype 12, 10, 5
+	octave 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	note A_, 4
+	note B_, 4
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	notetype 12, 12, 5
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note E_, 4
+	note F#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C#, 2
+	note E_, 2
+	note E_, 4
+	notetype 12, 10, 5
+	note C#, 2
+	octave 2
+	note A_, 2
+	note B_, 6
+	octave 3
+	note C#, 2
+	note C#, 2
+	octave 2
+	note B_, 2
+	note B_, 4
+	notetype 12, 12, 5
+	callchannel Music_Cities1_branch_ab7d
+	octave 3
+	note D#, 4
+	note D#, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note G#, 2
+	note E_, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	notetype 12, 10, 5
+	note C#, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 4
+	note C#, 2
+	note E_, 4
+	notetype 12, 11, 3
+	callchannel Music_Cities1_branch_ab8a
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note F#, 4
+	note G#, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 4
+	note G#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 2
+	note B_, 2
+	octave 3
+
+Music_Cities1_branch_ab12:
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	octave 2
+	note B_, 4
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	loopchannel 2, Music_Cities1_branch_ab12
+	note E_, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note E_, 4
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note G#, 2
+	note G#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note F#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	callchannel Music_Cities1_branch_ab8a
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note C#, 2
+	note G#, 2
+	note C#, 2
+	note D#, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 4
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 4
+	note F#, 2
+	note D#, 2
+	note D#, 2
+	note F#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	octave 2
+	note B_, 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	notetype 12, 11, 6
+	note F#, 8
+	note F#, 4
+	note D#, 4
+	note E_, 8
+	notetype 12, 8, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note E_, 2
+	note F#, 2
+	loopchannel 0, Music_Cities1_branch_aa80
+
+Music_Cities1_branch_ab7d:
+	octave 3
+	note F#, 2
+	note D#, 4
+	note E_, 2
+	note D#, 4
+	note C#, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	endchannel
+
+Music_Cities1_branch_ab8a:
+	note A_, 2
+	note E_, 2
+	note C#, 2
+	note E_, 4
+	note A_, 2
+	note C#, 2
+	note E_, 2
+	endchannel
+
+
+Music_Cities1_Ch2: ; ab92 (2:6b92)
+	vibrato 5, 1, 5
+	callchannel Music_Cities1_branch_ac00
+	octave 4
+	note G#, 2
+	notetype 12, 12, 4
+	note E_, 6
+	notetype 12, 12, 5
+	duty 3
+	octave 3
+	note C#, 4
+	note D#, 4
+	note E_, 6
+	note F#, 6
+	note G#, 4
+	callchannel Music_Cities1_branch_ac00
+	octave 4
+	note G#, 2
+	notetype 12, 12, 4
+	note E_, 14
+	duty 3
+	octave 3
+	note E_, 6
+	note F#, 6
+	note G#, 4
+	notetype 12, 11, 7
+	duty 2
+	vibrato 8, 1, 7
+	octave 5
+	note C#, 12
+	octave 4
+	note A_, 4
+	octave 5
+	note E_, 8
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 4
+	note B_, 12
+	note G#, 4
+	note B_, 16
+	note F#, 12
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note G#, 12
+	note E_, 4
+	note B_, 16
+	octave 5
+	note C#, 12
+	note D#, 2
+	note E_, 2
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	octave 4
+	note B_, 12
+	octave 5
+	note C#, 2
+	note D#, 2
+	note C#, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note A_, 12
+	note B_, 2
+	octave 5
+	note C_, 2
+	note C_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note F#, 4
+	notetype 12, 11, 7
+	note A_, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 14
+	notetype 12, 8, 4
+	note G#, 1
+	notetype 12, 10, 4
+	note A_, 1
+	loopchannel 0, Music_Cities1_Ch2
+
+Music_Cities1_branch_ac00:
+	duty 2
+	notetype 12, 12, 3
+	octave 4
+	note B_, 4
+	note A_, 4
+	notetype 12, 12, 4
+	note G#, 10
+	notetype 12, 12, 3
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	notetype 12, 12, 4
+	note F#, 10
+	notetype 12, 12, 5
+	duty 3
+	octave 3
+	note E_, 4
+	note D#, 8
+	note E_, 4
+	note F#, 4
+	notetype 12, 12, 3
+	duty 2
+	octave 4
+	note A_, 4
+	note G#, 4
+	notetype 12, 12, 4
+	note F#, 10
+	notetype 12, 12, 3
+	note F#, 2
+	note G#, 2
+	note A_, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	endchannel
+
+
+Music_Cities1_Ch3: ; ac32 (2:6c32)
+	notetype 12, 1, 1
+	unknownmusic0xe8
+
+Music_Cities1_branch_ac35:
+	vibrato 0, 0, 0
+	octave 4
+	callchannel Music_Cities1_branch_acc5
+	callchannel Music_Cities1_branch_acc5
+	callchannel Music_Cities1_branch_acce
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	callchannel Music_Cities1_branch_acc5
+	note B_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	callchannel Music_Cities1_branch_acc5
+	callchannel Music_Cities1_branch_acce
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	vibrato 8, 2, 5
+	note A_, 8
+	note E_, 8
+	note A_, 8
+	note F#, 8
+	note G#, 8
+	note E_, 8
+	note G#, 12
+	note E_, 4
+	note F#, 2
+	note F#, 2
+	note D#, 2
+	note E_, 4
+	note F#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 8
+	note E_, 8
+	note A_, 8
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 8
+	note E_, 8
+	note B_, 4
+	note E_, 4
+	note F#, 4
+	note G#, 4
+	rest 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	rest 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 4
+	note F#, 2
+	note D#, 2
+	note A_, 2
+	note F#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 1
+	note G#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	loopchannel 0, Music_Cities1_branch_ac35
+
+Music_Cities1_branch_acc5:
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	endchannel
+
+Music_Cities1_branch_acce:
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	rest 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	rest 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	rest 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	rest 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	rest 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	rest 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	endchannel
+
+
+Music_Cities1_Ch4: ; acef (2:6cef)
+	dspeed 12
+	callchannel Music_Cities1_branch_ad36
+
+Music_Cities1_branch_acf3:
+	callchannel Music_Cities1_branch_ad36
+	callchannel Music_Cities1_branch_ad45
+	callchannel Music_Cities1_branch_ad45
+	loopchannel 2, Music_Cities1_branch_acf3
+	callchannel Music_Cities1_branch_ad36
+	callchannel Music_Cities1_branch_ad5f
+	callchannel Music_Cities1_branch_ad52
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 4, triangle2
+	callchannel Music_Cities1_branch_ad6e
+	callchannel Music_Cities1_branch_ad5f
+	callchannel Music_Cities1_branch_ad52
+	callchannel Music_Cities1_branch_ad6e
+	callchannel Music_Cities1_branch_ad52
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 2, triangle2
+	dnote 2, triangle1
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 4, triangle1
+	dnote 6, triangle1
+	dnote 6, snare6
+	dnote 4, snare6
+	loopchannel 0, Music_Cities1_Ch4
+
+Music_Cities1_branch_ad36:
+	dnote 6, snare6
+	dnote 6, snare6
+	dnote 4, snare6
+	dnote 6, snare6
+	dnote 6, snare6
+	dnote 2, snare6
+	dnote 2, snare6
+	endchannel
+
+Music_Cities1_branch_ad45:
+	dnote 6, snare6
+	dnote 6, snare6
+	dnote 4, snare6
+	dnote 6, snare6
+	dnote 6, snare6
+	dnote 4, snare6
+	endchannel
+
+Music_Cities1_branch_ad52:
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 4, triangle2
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 4, triangle2
+	endchannel
+
+Music_Cities1_branch_ad5f:
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 4, triangle2
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 2, triangle2
+	dnote 2, triangle1
+	endchannel
+
+Music_Cities1_branch_ad6e:
+	dnote 6, triangle1
+	dnote 6, triangle1
+	dnote 2, triangle2
+	dnote 2, triangle2
+	endchannel
+; 0xad77

music/cities2.asm

@@ -0,0 +1,417 @@
+Music_Cities2_Ch1: ; b504 (2:7504)
+	tempo 0, 148
+	stereopanning 119
+	duty 3
+	vibrato 8, 3, 2
+	unknownmusic0xe8
+	notetype 12, 11, 6
+	rest 8
+	octave 3
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	octave 2
+	note B_, 2
+	rest 14
+
+Music_Cities2_branch_b51a:
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	note D#, 1
+	note D_, 1
+	note C#, 4
+	octave 3
+	note B_, 4
+	note G#, 8
+	note E_, 8
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	rest 16
+	note C#, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 1
+	note D#, 1
+	note C#, 4
+	octave 3
+	note B_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 3
+	note G#, 8
+	note B_, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	rest 2
+	octave 4
+	note E_, 4
+	octave 3
+	note B_, 4
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	rest 2
+	octave 4
+	note F#, 4
+	note D#, 4
+	octave 3
+	note E_, 2
+	rest 4
+	note F#, 2
+	rest 4
+	note A_, 2
+	rest 2
+	note B_, 2
+	rest 16
+	rest 16
+	rest 14
+	note E_, 16
+	note F#, 8
+	note G#, 4
+	note F#, 4
+	note E_, 2
+	rest 14
+	loopchannel 0, Music_Cities2_branch_b51a
+
+
+Music_Cities2_Ch2: ; b569 (2:7569)
+	duty 3
+	vibrato 8, 2, 3
+	notetype 12, 12, 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
+	note E_, 6
+	notetype 12, 12, 2
+	duty 2
+	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
+
+Music_Cities2_branch_b58b:
+	notetype 12, 10, 6
+	note G#, 6
+	notetype 12, 12, 2
+	note A_, 1
+	note G#, 1
+	notetype 12, 12, 4
+	note F#, 14
+	notetype 12, 12, 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
+	notetype 12, 12, 4
+	note G#, 6
+	notetype 12, 12, 2
+	note E_, 1
+	note G#, 1
+	notetype 12, 12, 5
+	note B_, 14
+	notetype 12, 12, 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
+	notetype 12, 10, 6
+	note G#, 6
+	notetype 12, 12, 2
+	note A_, 1
+	note G#, 1
+	notetype 12, 12, 4
+	note F#, 8
+	notetype 12, 10, 1
+	duty 1
+	octave 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	rest 1
+	notetype 12, 12, 2
+	duty 2
+	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
+	notetype 12, 12, 4
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	notetype 12, 12, 6
+	note B_, 8
+	notetype 12, 12, 2
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note E_, 4
+	notetype 12, 12, 7
+	note G#, 4
+	note E_, 4
+	notetype 12, 12, 2
+	note D#, 1
+	note C#, 1
+	note D#, 1
+	note E_, 1
+	note F#, 4
+	notetype 12, 12, 7
+	note B_, 4
+	note F#, 4
+	notetype 12, 12, 2
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note E_, 2
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	note G#, 2
+	note G#, 1
+	note A_, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	note F#, 1
+	note D#, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D#, 1
+	note F#, 1
+	notetype 12, 12, 2
+	note B_, 8
+	notetype 12, 11, 7
+	octave 3
+	note E_, 8
+	octave 2
+	note B_, 4
+	octave 3
+	note F#, 4
+	note G#, 4
+	note A_, 4
+	note B_, 8
+	note B_, 8
+	note G#, 4
+	octave 4
+	note D#, 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	notetype 12, 12, 2
+	note E_, 6
+	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
+	loopchannel 0, Music_Cities2_branch_b58b
+
+
+Music_Cities2_Ch3: ; b640 (2:7640)
+	notetype 12, 1, 1
+	rest 16
+	octave 4
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+
+Music_Cities2_branch_b64c:
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	rest 2
+	note E_, 4
+	note G#, 4
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	rest 2
+	note F#, 4
+	note A_, 4
+	note C#, 2
+	rest 4
+	note E_, 2
+	rest 4
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	rest 8
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	loopchannel 0, Music_Cities2_branch_b64c
+; 0xb6c7

music/credits.asm

@@ -0,0 +1,821 @@
+Music_Credits_Ch1: ; 7fc1f (1f:7c1f)
+	tempo 0, 140
+	stereopanning 119
+	duty 3
+	vibrato 8, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 5
+	octave 4
+	note E_, 6
+	octave 3
+	note A_, 1
+	octave 4
+	note E_, 1
+	note D_, 6
+	octave 3
+	note G_, 1
+	octave 4
+	note D_, 1
+	note C#, 6
+	octave 3
+	note F#, 1
+	octave 4
+	note C#, 1
+	note D_, 4
+	note E_, 2
+	note C#, 1
+	note E_, 1
+	note C#, 1
+	rest 1
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	notetype 12, 11, 6
+	note A_, 4
+	note E_, 2
+	note A_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 6
+	note E_, 2
+	note A_, 4
+	note C#, 4
+	note E_, 4
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note A_, 4
+	note E_, 2
+	note A_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	note B_, 4
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	note E_, 6
+	note C#, 2
+	note A_, 4
+	note C#, 4
+	note E_, 4
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 6
+	note A_, 2
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	notetype 12, 11, 7
+	note E_, 6
+	note A_, 2
+	note G_, 4
+	note F#, 4
+	notetype 12, 12, 7
+	note A_, 4
+	note B_, 4
+	octave 4
+	note C#, 4
+	note D_, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	notetype 12, 9, 0
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note D_, 8
+	rest 16
+	rest 16
+	rest 8
+	notetype 12, 11, 6
+	note E_, 6
+	note D#, 1
+	note D_, 1
+	notetype 12, 10, 0
+	note C#, 8
+	notetype 12, 10, 7
+	note C#, 8
+	rest 16
+	rest 16
+	rest 8
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	notetype 12, 10, 0
+	note A_, 8
+	notetype 12, 10, 7
+	note A_, 8
+	notetype 12, 11, 6
+	note G_, 6
+	note D_, 4
+	note G_, 2
+	note B_, 4
+	notetype 12, 11, 7
+	note G_, 8
+	note F#, 4
+	note G#, 4
+	notetype 12, 9, 0
+	note A_, 8
+	note F#, 8
+	note E_, 8
+	note C#, 8
+	notetype 12, 11, 7
+	note D_, 8
+	note C#, 8
+	octave 2
+	note B_, 8
+	octave 3
+	note D_, 8
+	notetype 12, 9, 0
+	note E_, 8
+	note D_, 8
+	note F#, 8
+	note E_, 8
+	notetype 12, 10, 0
+	note D_, 8
+	note E_, 8
+	note D_, 8
+	note C_, 8
+	note G_, 8
+	note F_, 8
+	note E_, 8
+	note D_, 8
+	notetype 12, 10, 0
+	note C#, 6
+	notetype 12, 10, 7
+	note C#, 6
+	notetype 12, 11, 7
+	note D_, 4
+	note E_, 8
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	notetype 12, 10, 0
+	note E_, 6
+	notetype 12, 10, 7
+	note E_, 6
+	notetype 12, 11, 7
+	note D_, 4
+	notetype 12, 10, 0
+	note C#, 8
+	notetype 12, 10, 7
+	note C#, 8
+	notetype 12, 11, 7
+	note E_, 6
+	note D_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
+	note D_, 4
+	note C#, 4
+	note C#, 4
+	note E_, 4
+	note F#, 4
+	notetype 12, 10, 0
+	note E_, 6
+	notetype 12, 11, 7
+	note D_, 2
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 4
+	notetype 12, 10, 0
+	octave 4
+	note C#, 16
+	note C#, 8
+	notetype 12, 10, 7
+	note C#, 8
+	notetype 12, 11, 5
+	octave 3
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	note A_, 1
+	notetype 12, 11, 1
+	note A_, 8
+	endchannel
+
+
+Music_Credits_Ch2: ; 7fd5f (1f:7d5f)
+	duty 3
+	vibrato 10, 2, 5
+	notetype 12, 12, 5
+	octave 4
+	note A_, 6
+	note E_, 1
+	note A_, 1
+	note G_, 6
+	note D_, 1
+	note G_, 1
+	notetype 12, 12, 7
+	note F#, 12
+	note G#, 2
+	note E_, 1
+	note G#, 1
+	notetype 12, 12, 2
+	note A_, 2
+	notetype 12, 12, 1
+	octave 3
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A_, 2
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	note A_, 2
+	note A_, 2
+	notetype 12, 12, 4
+	note A_, 1
+	note F#, 1
+	note A_, 1
+	note B_, 1
+	notetype 12, 12, 7
+	octave 4
+	note C#, 6
+	note C#, 1
+	note D_, 1
+	note E_, 4
+	note C#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 6
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 8
+	octave 3
+	note A_, 6
+	note E_, 2
+	octave 4
+	note C#, 8
+	note C#, 6
+	note C#, 1
+	note D_, 1
+	note E_, 4
+	note C#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note C#, 6
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 8
+	octave 3
+	note A_, 6
+	note E_, 2
+	notetype 12, 11, 0
+	octave 4
+	note C#, 8
+	notetype 12, 12, 7
+	note D_, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note G_, 8
+	octave 3
+	note G_, 6
+	note D_, 2
+	note B_, 8
+	notetype 12, 11, 0
+	octave 4
+	note C#, 6
+	notetype 12, 11, 7
+	note C#, 6
+	note D_, 4
+	notetype 12, 10, 0
+	note E_, 8
+	notetype 12, 10, 7
+	note E_, 8
+	notetype 12, 12, 7
+	note D_, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note G_, 8
+	octave 3
+	note G_, 6
+	note D_, 2
+	note B_, 8
+	notetype 12, 11, 0
+	octave 4
+	note E_, 7
+	notetype 12, 11, 7
+	note E_, 7
+	notetype 12, 12, 3
+	note E_, 1
+	note G#, 1
+	notetype 12, 11, 0
+	note A_, 8
+	notetype 12, 11, 7
+	note A_, 8
+	notetype 12, 12, 6
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	notetype 12, 10, 0
+	note C#, 8
+	notetype 12, 10, 7
+	note C#, 8
+	notetype 12, 9, 0
+	octave 3
+	note A_, 8
+	notetype 12, 9, 7
+	note A_, 8
+	notetype 12, 11, 0
+	note E_, 8
+	notetype 12, 11, 7
+	note E_, 8
+	notetype 12, 12, 7
+	note D_, 8
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
+	notetype 12, 11, 7
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	notetype 12, 11, 0
+	note E_, 8
+	notetype 12, 11, 7
+	note E_, 8
+	notetype 12, 11, 0
+	note D_, 8
+	notetype 12, 11, 7
+	note D_, 8
+	notetype 12, 12, 7
+	octave 2
+	note B_, 8
+	octave 3
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note E_, 8
+	note B_, 6
+	note G_, 1
+	note B_, 1
+	notetype 12, 11, 0
+	octave 4
+	note C#, 8
+	notetype 12, 11, 7
+	note C#, 8
+	notetype 12, 11, 0
+	note D_, 8
+	notetype 12, 11, 7
+	note D_, 8
+	notetype 12, 12, 7
+	octave 3
+	note B_, 8
+	octave 4
+	note D_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	notetype 12, 11, 0
+	note C#, 6
+	notetype 12, 11, 7
+	note C#, 6
+	notetype 12, 12, 7
+	octave 3
+	note B_, 4
+	notetype 12, 11, 0
+	note A_, 8
+	notetype 12, 11, 7
+	note A_, 8
+	notetype 12, 11, 0
+	note F#, 6
+	notetype 12, 11, 7
+	note F#, 6
+	notetype 12, 12, 7
+	note G#, 4
+	note A_, 8
+	note F#, 8
+	notetype 12, 11, 0
+	note G#, 6
+	notetype 12, 11, 7
+	note G#, 6
+	notetype 12, 12, 7
+	note A_, 4
+	note B_, 8
+	note G#, 8
+	notetype 12, 11, 0
+	note A_, 6
+	notetype 12, 11, 7
+	note A_, 6
+	notetype 12, 12, 7
+	note B_, 4
+	octave 4
+	note C_, 8
+	octave 3
+	note A_, 8
+	notetype 12, 11, 0
+	note B_, 6
+	notetype 12, 11, 7
+	note B_, 6
+	notetype 12, 12, 7
+	octave 4
+	note C_, 4
+	notetype 12, 11, 0
+	note D_, 8
+	octave 3
+	note B_, 8
+	notetype 12, 11, 0
+	octave 4
+	note C#, 16
+	note C#, 8
+	notetype 12, 11, 7
+	note C#, 8
+	notetype 12, 11, 0
+	octave 3
+	note A_, 16
+	note A_, 8
+	notetype 12, 11, 7
+	note A_, 8
+	notetype 12, 12, 7
+	note G_, 6
+	note B_, 2
+	octave 4
+	note D_, 8
+	octave 3
+	note B_, 6
+	octave 4
+	note D_, 2
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
+	octave 3
+	note G_, 6
+	note F#, 1
+	note F_, 1
+	note E_, 8
+	note C#, 4
+	note D_, 4
+	note G_, 6
+	note B_, 2
+	octave 4
+	note D_, 8
+	octave 3
+	note B_, 6
+	octave 4
+	note D_, 2
+	note G_, 8
+	notetype 12, 11, 0
+	note A_, 16
+	notetype 12, 10, 0
+	note A_, 8
+	notetype 12, 10, 7
+	note A_, 8
+	notetype 12, 12, 1
+	note A_, 2
+	note A_, 4
+	note A_, 1
+	note A_, 1
+	notetype 12, 12, 1
+	note A_, 8
+	endchannel
+
+
+Music_Credits_Ch3: ; 7fec2 (1f:7ec2)
+	notetype 12, 1, 0
+	octave 5
+	note C#, 6
+	octave 4
+	note A_, 1
+	octave 5
+	note C#, 1
+	note D_, 6
+	octave 4
+	note B_, 1
+	octave 5
+	note D_, 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note A_, 4
+	note G#, 2
+	note E_, 1
+	note G#, 1
+	note A_, 1
+	rest 15
+	rest 16
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffa4
+	octave 4
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffc1
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffc1
+	callchannel Music_Credits_branch_7ffc1
+	octave 4
+	note G_, 4
+	note A_, 4
+	note B_, 4
+	octave 5
+	note D_, 4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffa4
+	note E_, 4
+	note A_, 2
+	note E_, 4
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffae
+	callchannel Music_Credits_branch_7ffa4
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	callchannel Music_Credits_branch_7ffd2
+	callchannel Music_Credits_branch_7ffd2
+	callchannel Music_Credits_branch_7ffdb
+	callchannel Music_Credits_branch_7ffdb
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffb8
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	note E_, 4
+	note A_, 4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffe4
+	callchannel Music_Credits_branch_7ffe4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffa4
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffb8
+	callchannel Music_Credits_branch_7ffed
+	callchannel Music_Credits_branch_7ffed
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	rest 7
+	endchannel
+
+Music_Credits_branch_7ffa4:
+	octave 4
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	endchannel
+
+Music_Credits_branch_7ffae:
+	octave 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	endchannel
+
+Music_Credits_branch_7ffb8:
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	endchannel
+
+Music_Credits_branch_7ffc1:
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	octave 5
+	note C#, 2
+	endchannel
+
+Music_Credits_branch_7ffd2:
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	endchannel
+
+Music_Credits_branch_7ffdb:
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	endchannel
+
+Music_Credits_branch_7ffe4:
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	endchannel
+
+Music_Credits_branch_7ffed:
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	note A_, 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	endchannel
+; 0x7fffa

music/defeatedgymleader.asm

@@ -0,0 +1,608 @@
+Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad)
+	tempo 0, 112
+	stereopanning 119
+	duty 3
+	vibrato 18, 3, 1
+	unknownmusic0xe8
+	tempo 0, 112
+	notetype 12, 10, 6
+	octave 4
+	note D_, 6
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	notetype 12, 10, 0
+	note A_, 8
+	notetype 12, 10, 7
+	note A_, 8
+
+Music_DefeatedGymLeader_branch_23ccc:
+	notetype 12, 11, 2
+	octave 3
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note D_, 4
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	notetype 12, 11, 1
+	octave 2
+	note B_, 8
+	notetype 12, 11, 2
+	octave 3
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 4
+	note D_, 4
+	note A_, 2
+	note A_, 2
+	note F#, 4
+	note G_, 2
+	note G_, 2
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	notetype 12, 11, 1
+	octave 2
+	note B_, 8
+	notetype 12, 9, 7
+	octave 3
+	note D_, 6
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note F#, 8
+	notetype 12, 11, 0
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	notetype 12, 9, 7
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note G#, 8
+	notetype 12, 11, 0
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	note B_, 8
+	notetype 12, 9, 7
+	note C#, 6
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 8
+	notetype 12, 11, 0
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note E_, 4
+	note G_, 4
+	notetype 12, 9, 0
+	note F#, 8
+	note E_, 8
+	note D_, 8
+	note C#, 8
+	notetype 12, 9, 7
+	note D_, 6
+	octave 2
+	note A_, 1
+	octave 3
+	note D_, 1
+	note F#, 8
+	notetype 12, 11, 0
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	notetype 12, 9, 7
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note G#, 8
+	notetype 12, 11, 0
+	note G#, 6
+	note E_, 1
+	note G#, 1
+	note B_, 8
+	notetype 12, 9, 7
+	note C#, 6
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 8
+	notetype 12, 11, 0
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note E_, 4
+	note G_, 4
+	notetype 12, 9, 7
+	note F#, 6
+	note E_, 1
+	note F#, 1
+	note A_, 8
+	notetype 12, 10, 7
+	note G_, 8
+	note E_, 8
+	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
+
+
+Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d)
+	duty 2
+	vibrato 24, 2, 4
+	notetype 12, 12, 4
+	octave 4
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 6
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	notetype 12, 11, 0
+	note F#, 8
+	notetype 12, 11, 7
+	note F#, 8
+
+Music_DefeatedGymLeader_branch_23d84:
+	notetype 12, 12, 2
+	octave 4
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	notetype 12, 12, 4
+	note A_, 4
+	note A_, 4
+	notetype 12, 12, 2
+	octave 4
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	notetype 12, 12, 1
+	note D_, 6
+	notetype 6, 12, 2
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	notetype 12, 12, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	notetype 12, 12, 4
+	note A_, 4
+	note A_, 3
+	notetype 6, 12, 2
+	note B_, 1
+	octave 4
+	note C#, 1
+	notetype 12, 12, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	notetype 12, 12, 1
+	note D_, 8
+	notetype 12, 12, 7
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	notetype 12, 11, 0
+	octave 4
+	note D_, 8
+	notetype 12, 10, 0
+	note D_, 8
+	notetype 12, 9, 7
+	note D_, 8
+	notetype 12, 12, 7
+	octave 3
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	notetype 12, 8, 0
+	octave 4
+	note E_, 8
+	notetype 12, 10, 0
+	note E_, 8
+	notetype 12, 12, 7
+	note E_, 8
+	octave 3
+	note G_, 6
+	note E_, 1
+	note G_, 1
+	notetype 12, 6, 15
+	octave 4
+	note C#, 8
+	notetype 12, 12, 7
+	note C#, 8
+	note F#, 4
+	note E_, 4
+	notetype 12, 11, 0
+	note D_, 14
+	octave 3
+	note B_, 2
+	notetype 12, 10, 0
+	note A_, 8
+	notetype 12, 11, 7
+	note A_, 8
+	notetype 12, 12, 7
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	notetype 12, 11, 0
+	octave 4
+	note D_, 8
+	notetype 12, 10, 0
+	note D_, 8
+	notetype 12, 9, 7
+	note D_, 8
+	notetype 12, 12, 7
+	octave 3
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	notetype 12, 4, 15
+	octave 4
+	note E_, 8
+	notetype 12, 11, 0
+	note E_, 8
+	notetype 12, 12, 7
+	note E_, 8
+	octave 3
+	note G_, 6
+	note E_, 1
+	note G_, 1
+	notetype 12, 11, 0
+	octave 4
+	note C#, 8
+	notetype 12, 11, 7
+	note C#, 8
+	octave 3
+	note A_, 4
+	octave 4
+	note C#, 4
+	notetype 12, 11, 0
+	note D_, 14
+	note E_, 2
+	note D_, 12
+	notetype 12, 12, 2
+	octave 3
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
+
+
+Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52)
+	notetype 12, 1, 0
+	vibrato 16, 1, 2
+	octave 4
+	note F#, 6
+	note D_, 1
+	note F#, 1
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	octave 5
+	note D_, 6
+	octave 4
+	note A_, 1
+	octave 5
+	note D_, 1
+	note F#, 8
+
+Music_DefeatedGymLeader_branch_23e65:
+	octave 4
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note F#, 3
+	rest 1
+	note F#, 3
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note D_, 1
+	rest 5
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 3
+	rest 1
+	note D_, 3
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 7
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note C#, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note E_, 2
+	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
+; 0x23f52

music/defeatedtrainer.asm

@@ -0,0 +1,267 @@
+Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
+	tempo 0, 224
+	stereopanning 119
+	duty 2
+	unknownmusic0xe8
+	tempo 0, 224
+	notetype 4, 10, 2
+	octave 4
+	note D_, 2
+	tempo 0, 224
+	notetype 4, 10, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 2
+	notetype 4, 11, 3
+	note F#, 12
+	duty 1
+	tempo 0, 224
+
+Music_DefeatedTrainer_branch_23a76:
+	notetype 4, 6, 3
+	octave 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
+	octave 4
+	note C#, 3
+	note D_, 3
+	note E_, 3
+	note F#, 3
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	octave 4
+	note C#, 3
+	octave 3
+	note A_, 6
+	note F#, 3
+	note A_, 3
+	note B_, 6
+	note G#, 3
+	note B_, 3
+	octave 4
+	note C_, 6
+	octave 3
+	note A_, 3
+	octave 4
+	note C_, 3
+	note D_, 3
+	octave 3
+	note B_, 3
+	octave 4
+	note D_, 6
+	note C#, 3
+	octave 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	note A_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 3
+	note B_, 3
+	loopchannel 0, Music_DefeatedTrainer_branch_23a76
+
+
+Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1)
+	duty 2
+	notetype 4, 12, 3
+	octave 4
+	note A_, 2
+	notetype 4, 12, 3
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C#, 2
+	notetype 4, 12, 4
+	note D_, 12
+
+Music_DefeatedTrainer_branch_23ad2:
+	notetype 4, 8, 5
+	octave 4
+	note D_, 6
+	octave 3
+	note A_, 3
+	octave 4
+	note D_, 3
+	note E_, 6
+	octave 3
+	note B_, 3
+	octave 4
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note E_, 3
+	note F#, 3
+	note G_, 6
+	note D_, 6
+	octave 3
+	note A_, 3
+	octave 4
+	note D_, 3
+	note E_, 6
+	octave 3
+	note B_, 3
+	octave 4
+	note E_, 3
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note F#, 3
+	note G_, 3
+	note A_, 6
+	note D_, 6
+	octave 3
+	note A_, 3
+	octave 4
+	note D_, 3
+	note E_, 6
+	octave 3
+	note B_, 3
+	octave 4
+	note E_, 3
+	note F_, 6
+	note C_, 3
+	note F_, 3
+	note G_, 3
+	note D_, 3
+	note G_, 6
+	notetype 4, 7, 0
+	note F#, 12
+	notetype 4, 7, 7
+	note F#, 12
+	notetype 4, 6, 0
+	note E_, 12
+	notetype 4, 6, 7
+	note E_, 12
+	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
+
+
+Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15)
+	notetype 4, 1, 0
+	octave 5
+	note D_, 2
+	notetype 4, 1, 0
+	note D_, 2
+	note D_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 12
+	notetype 4, 2, 1
+
+Music_DefeatedTrainer_branch_23b24:
+	note F#, 3
+	rest 3
+	note F#, 3
+	rest 3
+	note G#, 3
+	rest 3
+	note G#, 3
+	rest 3
+	note A_, 3
+	rest 3
+	note A_, 3
+	rest 3
+	note B_, 3
+	rest 3
+	note B_, 3
+	rest 3
+	note F#, 3
+	rest 3
+	note F#, 3
+	rest 3
+	note G#, 3
+	rest 3
+	note G#, 3
+	rest 3
+	note A_, 3
+	rest 3
+	note A_, 3
+	rest 3
+	octave 5
+	note C#, 3
+	rest 3
+	note C#, 3
+	octave 4
+	note A_, 3
+	note F#, 3
+	octave 5
+	note D_, 3
+	octave 4
+	note F#, 3
+	rest 3
+	note G#, 3
+	octave 5
+	note E_, 3
+	octave 4
+	note G#, 3
+	rest 3
+	note A_, 3
+	octave 5
+	note F_, 3
+	octave 4
+	note A_, 3
+	rest 3
+	note B_, 3
+	octave 5
+	note G_, 3
+	octave 4
+	note B_, 3
+	note A#, 3
+	note A_, 3
+	rest 3
+	note A_, 3
+	rest 3
+	note A_, 3
+	rest 3
+	note A_, 3
+	octave 5
+	note C_, 3
+	note C#, 3
+	rest 3
+	note C#, 3
+	rest 3
+	note C#, 3
+	rest 3
+	note C#, 3
+	octave 4
+	note A_, 3
+	loopchannel 0, Music_DefeatedTrainer_branch_23b24
+; 0x23b74

music/defeatedwildmon.asm

@@ -0,0 +1,303 @@
+Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74)
+	tempo 0, 112
+	stereopanning 119
+	unknownmusic0xf8
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	tempo 0, 112
+	notetype 12, 11, 7
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 12
+
+Music_DefeatedWildMon_branch_23b8b:
+	notetype 12, 6, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 8
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 8
+	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
+
+
+Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1)
+	unknownmusic0xf8
+	duty 2
+	notetype 12, 12, 3
+	octave 4
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	notetype 12, 12, 7
+	note B_, 12
+
+Music_DefeatedWildMon_branch_23bce:
+	notetype 12, 8, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	octave 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	octave 3
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	octave 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	octave 3
+	note B_, 8
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 8
+	loopchannel 0, Music_DefeatedWildMon_branch_23bce
+
+
+Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e)
+	unknownmusic0xf8
+	notetype 12, 2, 0
+	octave 5
+	note E_, 1
+	rest 1
+	octave 6
+	note C#, 1
+	rest 1
+	octave 5
+	note B_, 1
+	rest 1
+	octave 6
+	note D#, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+
+Music_DefeatedWildMon_branch_23c21:
+	octave 4
+	note E_, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 3
+	octave 5
+	note E_, 1
+	rest 3
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note F#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	octave 5
+	note D#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 1
+	octave 5
+	note E_, 1
+	rest 1
+	octave 4
+	note E_, 1
+	rest 3
+	octave 5
+	note E_, 1
+	rest 3
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note F#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	octave 5
+	note E_, 1
+	rest 3
+	octave 4
+	note D#, 4
+	octave 4
+	note F_, 1
+	rest 1
+	octave 5
+	note F_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	octave 5
+	note F_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 3
+	octave 5
+	note F_, 1
+	rest 3
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note G_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 3
+	note F_, 1
+	rest 1
+	octave 5
+	note F_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 5
+	note F_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 1
+	octave 5
+	note F_, 1
+	rest 1
+	octave 4
+	note F_, 1
+	rest 3
+	octave 5
+	note F_, 1
+	rest 3
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note G_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 3
+	octave 5
+	note F_, 1
+	rest 3
+	octave 4
+	note D#, 4
+	loopchannel 0, Music_DefeatedWildMon_branch_23c21
+; 0x23cad

music/dungeon1.asm

@@ -0,0 +1,676 @@
+Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	vibrato 10, 1, 4
+	notetype 12, 4, 13
+	rest 8
+	unknownmusic0xee 237
+	octave 4
+	note F#, 8
+	unknownmusic0xee 255
+
+Music_Dungeon1_branch_7dee5:
+	notetype 12, 11, 2
+	octave 3
+
+Music_Dungeon1_branch_7dee8:
+	callchannel Music_Dungeon1_branch_7dfaa
+	loopchannel 3, Music_Dungeon1_branch_7dee8
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	rest 1
+	note A#, 1
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+
+Music_Dungeon1_branch_7deff:
+	callchannel Music_Dungeon1_branch_7dfaa
+	loopchannel 4, Music_Dungeon1_branch_7deff
+	callchannel Music_Dungeon1_branch_7dfd5
+	octave 3
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note G_, 1
+	callchannel Music_Dungeon1_branch_7dfd5
+	octave 3
+	note A_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	callchannel Music_Dungeon1_branch_7dfd5
+	octave 3
+	note B_, 1
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	notetype 12, 12, 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	notetype 12, 12, 2
+	callchannel Music_Dungeon1_branch_7dfc5
+	octave 3
+	note B_, 3
+	callchannel Music_Dungeon1_branch_7dfc5
+	note C_, 3
+	callchannel Music_Dungeon1_branch_7dfc5
+	note C#, 3
+	notetype 12, 12, 3
+	octave 3
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
+	octave 2
+	note B_, 4
+	notetype 12, 12, 2
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note A#, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 1
+	note G#, 1
+	note B_, 1
+	octave 3
+	note C#, 1
+	note C_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 1
+	note C#, 1
+	note C_, 1
+	octave 2
+	note A_, 1
+	octave 3
+	note C_, 1
+	note D_, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 1
+
+Music_Dungeon1_branch_7df6e:
+	rest 16
+	loopchannel 8, Music_Dungeon1_branch_7df6e
+	notetype 12, 12, 3
+	callchannel Music_Dungeon1_branch_7dfbb
+	note B_, 2
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A_, 4
+	note F#, 2
+	callchannel Music_Dungeon1_branch_7dfbb
+	note A#, 2
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note D#, 2
+	notetype 12, 12, 2
+	callchannel Music_Dungeon1_branch_7dfc5
+	octave 3
+	note B_, 3
+	callchannel Music_Dungeon1_branch_7dfc5
+	note C_, 3
+	callchannel Music_Dungeon1_branch_7dfc5
+	note C#, 3
+	notetype 12, 12, 7
+	octave 3
+	note F#, 8
+	note D#, 8
+	notetype 12, 12, 2
+	callchannel Music_Dungeon1_branch_7dfaa
+	callchannel Music_Dungeon1_branch_7dfaa
+	loopchannel 0, Music_Dungeon1_branch_7dee5
+
+Music_Dungeon1_branch_7dfaa:
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	rest 1
+	note A#, 1
+	note E_, 1
+	note D#, 1
+	note B_, 1
+	note A#, 1
+	note G_, 1
+	note G#, 1
+	rest 1
+	note A#, 1
+	endchannel
+
+Music_Dungeon1_branch_7dfbb:
+	octave 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A#, 2
+	endchannel
+
+Music_Dungeon1_branch_7dfc5:
+	octave 3
+	note E_, 1
+	note E_, 1
+	note F_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note A_, 1
+	note E_, 1
+	note A#, 1
+	note E_, 1
+	note B_, 1
+	note E_, 1
+	octave 4
+	note C_, 1
+	endchannel
+
+Music_Dungeon1_branch_7dfd5:
+	note E_, 1
+	note E_, 1
+	rest 4
+	octave 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	endchannel
+
+
+Music_Dungeon1_Ch2: ; 7dfde (1f:5fde)
+	vibrato 11, 1, 5
+	duty 3
+	notetype 12, 0, 15
+	octave 4
+	note G#, 8
+	notetype 12, 4, 13
+	octave 5
+	note D_, 8
+
+Music_Dungeon1_branch_7dfeb:
+	notetype 12, 12, 2
+
+Music_Dungeon1_branch_7dfed:
+	callchannel Music_Dungeon1_branch_7e097
+	loopchannel 3, Music_Dungeon1_branch_7dfed
+	octave 2
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note A_, 1
+	note G_, 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note D#, 1
+
+Music_Dungeon1_branch_7e006:
+	callchannel Music_Dungeon1_branch_7e097
+	loopchannel 4, Music_Dungeon1_branch_7e006
+	rest 2
+	callchannel Music_Dungeon1_branch_7e0ab
+	octave 3
+	note C_, 4
+	callchannel Music_Dungeon1_branch_7e0ab
+	octave 3
+	note C#, 4
+	callchannel Music_Dungeon1_branch_7e0ab
+	octave 3
+	note D#, 4
+	notetype 12, 13, 3
+	octave 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	notetype 12, 13, 2
+	callchannel Music_Dungeon1_branch_7e0b5
+	octave 3
+	note F#, 4
+	callchannel Music_Dungeon1_branch_7e0b5
+	octave 3
+	note G_, 4
+	callchannel Music_Dungeon1_branch_7e0b5
+	octave 3
+	note A#, 4
+	notetype 12, 13, 3
+	octave 4
+	note E_, 4
+	note D#, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note G_, 4
+	note F#, 2
+	notetype 12, 13, 6
+	note E_, 8
+	note F_, 8
+	note F#, 8
+	note G_, 8
+	notetype 12, 13, 2
+	callchannel Music_Dungeon1_branch_7e0ba
+	rest 10
+	note E_, 1
+	rest 1
+	callchannel Music_Dungeon1_branch_7e0ba
+	rest 12
+	callchannel Music_Dungeon1_branch_7e0ba
+	rest 12
+	callchannel Music_Dungeon1_branch_7e0ba
+	rest 14
+	notetype 12, 13, 3
+	callchannel Music_Dungeon1_branch_7e0cd
+	note D#, 4
+	callchannel Music_Dungeon1_branch_7e0cd
+	note D#, 2
+	rest 2
+	notetype 12, 13, 2
+	callchannel Music_Dungeon1_branch_7e0c0
+	rest 2
+	octave 3
+	note F#, 4
+	octave 2
+	note E_, 1
+	note E_, 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note C_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note D_, 1
+	note C#, 1
+	rest 2
+	octave 3
+	note G_, 4
+	callchannel Music_Dungeon1_branch_7e0c0
+	octave 3
+	note A#, 4
+	notetype 12, 13, 6
+	note B_, 8
+	octave 4
+	note D#, 8
+	notetype 12, 13, 2
+	callchannel Music_Dungeon1_branch_7e097
+	callchannel Music_Dungeon1_branch_7e097
+	loopchannel 0, Music_Dungeon1_branch_7dfeb
+
+Music_Dungeon1_branch_7e097:
+	octave 2
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	note E_, 1
+	note E_, 1
+	note B_, 1
+	octave 3
+	note C_, 1
+	rest 2
+	note C_, 1
+	octave 2
+	note B_, 1
+	endchannel
+
+Music_Dungeon1_branch_7e0ab:
+	octave 2
+	note E_, 1
+	note E_, 1
+	rest 2
+	octave 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	endchannel
+
+Music_Dungeon1_branch_7e0b5:
+	octave 2
+	note E_, 1
+	note E_, 1
+	rest 10
+	endchannel
+
+Music_Dungeon1_branch_7e0ba:
+	octave 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	endchannel
+
+Music_Dungeon1_branch_7e0c0:
+	octave 2
+	note E_, 1
+	note E_, 1
+	octave 4
+	note E_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note C#, 1
+	note C_, 1
+	endchannel
+
+Music_Dungeon1_branch_7e0cd:
+	octave 3
+	note E_, 6
+	note G_, 6
+	note E_, 4
+	note A_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note B_, 4
+	note G_, 6
+	note A#, 6
+	note F#, 4
+	note E_, 6
+	note F#, 6
+	endchannel
+
+
+Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc)
+	notetype 12, 1, 1
+	vibrato 8, 2, 6
+	rest 14
+	octave 4
+	note D_, 1
+	note D#, 1
+
+Music_Dungeon1_branch_7e0e5:
+	callchannel Music_Dungeon1_branch_7e140
+	callchannel Music_Dungeon1_branch_7e140
+	octave 5
+	note E_, 2
+	rest 4
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	octave 4
+	note F#, 4
+	callchannel Music_Dungeon1_branch_7e154
+	octave 4
+	note G_, 4
+	callchannel Music_Dungeon1_branch_7e154
+	octave 4
+	note A_, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
+	rest 6
+	callchannel Music_Dungeon1_branch_7e177
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note F#, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 12
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 12
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 10
+	note E_, 1
+	rest 1
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 12
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 12
+	callchannel Music_Dungeon1_branch_7e15e
+	rest 10
+	note D_, 1
+	note D#, 1
+	callchannel Music_Dungeon1_branch_7e164
+	callchannel Music_Dungeon1_branch_7e164
+	note E_, 2
+	rest 4
+	callchannel Music_Dungeon1_branch_7e177
+	note B_, 8
+	note F#, 6
+	note D_, 1
+	note D#, 1
+	rest 16
+	rest 16
+	loopchannel 0, Music_Dungeon1_branch_7e0e5
+
+Music_Dungeon1_branch_7e140:
+	octave 5
+	note E_, 4
+	note B_, 4
+	note A#, 4
+	octave 6
+	note D_, 4
+	note C#, 4
+	octave 5
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	endchannel
+
+Music_Dungeon1_branch_7e154:
+	octave 6
+	note E_, 1
+	note E_, 1
+	rest 4
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	endchannel
+
+Music_Dungeon1_branch_7e15e:
+	octave 3
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note D#, 1
+	endchannel
+
+Music_Dungeon1_branch_7e164:
+	note E_, 4
+	note B_, 4
+	note A#, 4
+	octave 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	endchannel
+
+Music_Dungeon1_branch_7e177:
+	octave 4
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F#, 4
+	rest 6
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note G_, 4
+	rest 6
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note A#, 4
+	endchannel
+
+
+Music_Dungeon1_Ch4: ; 7e18a (1f:618a)
+	dspeed 12
+	rest 14
+	dnote 1, cymbal1
+	dnote 1, cymbal1
+
+Music_Dungeon1_branch_7e190:
+	callchannel Music_Dungeon1_branch_7e1f1
+	loopchannel 3, Music_Dungeon1_branch_7e190
+	dnote 4, cymbal2
+	dnote 4, cymbal1
+	dnote 4, cymbal2
+	dnote 2, cymbal1
+	dnote 2, cymbal1
+
+Music_Dungeon1_branch_7e1a1:
+	callchannel Music_Dungeon1_branch_7e1f1
+	loopchannel 3, Music_Dungeon1_branch_7e1a1
+	dnote 4, cymbal2
+	dnote 4, cymbal1
+	dnote 4, cymbal2
+	dnote 4, cymbal2
+
+Music_Dungeon1_branch_7e1b0:
+	callchannel Music_Dungeon1_branch_7e1fa
+	loopchannel 3, Music_Dungeon1_branch_7e1b0
+	callchannel Music_Dungeon1_branch_7e202
+
+Music_Dungeon1_branch_7e1ba:
+	callchannel Music_Dungeon1_branch_7e1fa
+	loopchannel 3, Music_Dungeon1_branch_7e1ba
+	callchannel Music_Dungeon1_branch_7e202
+	dnote 4, snare7
+	dnote 4, snare8
+	dnote 4, snare8
+	rest 2
+	dnote 2, snare7
+	dnote 4, cymbal2
+
+Music_Dungeon1_branch_7e1cf:
+	rest 16
+	loopchannel 13, Music_Dungeon1_branch_7e1cf
+	rest 12
+
+Music_Dungeon1_branch_7e1d5:
+	callchannel Music_Dungeon1_branch_7e1fa
+	loopchannel 3, Music_Dungeon1_branch_7e1d5
+	dnote 4, cymbal1
+	dnote 4, cymbal1
+	dnote 4, cymbal1
+	rest 2
+	dnote 1, cymbal1
+	dnote 1, cymbal1
+	callchannel Music_Dungeon1_branch_7e1f1
+	callchannel Music_Dungeon1_branch_7e1f1
+	loopchannel 0, Music_Dungeon1_branch_7e190
+
+Music_Dungeon1_branch_7e1f1:
+	dnote 4, cymbal2
+	dnote 4, cymbal1
+	dnote 4, cymbal2
+	dnote 4, cymbal1
+	endchannel
+
+Music_Dungeon1_branch_7e1fa:
+	dnote 1, cymbal1
+	dnote 1, cymbal1
+	rest 10
+	dnote 4, cymbal3
+	endchannel
+
+Music_Dungeon1_branch_7e202:
+	dnote 4, snare7
+	dnote 4, snare8
+	dnote 4, snare8
+	dnote 4, snare9
+	endchannel
+; 0x7e20b

music/dungeon2.asm

@@ -0,0 +1,318 @@
+Music_Dungeon2_Ch1: ; 7e887 (1f:6887)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	vibrato 10, 1, 4
+
+Music_Dungeon2_branch_7e892:
+	notetype 12, 11, 2
+	octave 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	octave 5
+	note C#, 4
+	note C#, 4
+	note C#, 4
+	note C#, 4
+	octave 3
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	octave 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A_, 4
+	note F#, 2
+	loopchannel 2, Music_Dungeon2_branch_7e892
+	notetype 12, 1, 15
+	octave 3
+	note E_, 16
+	note C_, 16
+	note D_, 16
+	octave 2
+	note A#, 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	loopchannel 0, Music_Dungeon2_branch_7e892
+
+
+Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8)
+	vibrato 11, 1, 5
+
+Music_Dungeon2_branch_7e8db:
+	duty 3
+	notetype 12, 12, 2
+	octave 3
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note C_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	octave 4
+	note F#, 4
+	note F#, 4
+	note F#, 4
+	note F#, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note F#, 4
+	loopchannel 2, Music_Dungeon2_branch_7e8db
+	octave 3
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
+	octave 5
+	note E_, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note C#, 2
+	note C_, 2
+	octave 4
+	note E_, 2
+	note G_, 2
+	octave 3
+	note A#, 2
+	note C#, 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
+	octave 5
+	note G_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note F_, 2
+	rest 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	notetype 12, 12, 7
+	duty 1
+	octave 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note D_, 16
+	loopchannel 0, Music_Dungeon2_branch_7e8db
+
+
+Music_Dungeon2_Ch3: ; 7e93b (1f:693b)
+	notetype 12, 1, 3
+	vibrato 8, 2, 6
+
+Music_Dungeon2_branch_7e940:
+	callchannel Music_Dungeon2_branch_7e9d1
+	loopchannel 16, Music_Dungeon2_branch_7e940
+	note E_, 4
+	rest 4
+	rest 4
+	note E_, 4
+	note C_, 4
+	rest 4
+	rest 4
+	note C_, 4
+	note D_, 4
+	rest 4
+	rest 4
+	note D_, 4
+	octave 3
+	note A#, 4
+	rest 4
+	rest 4
+	note A#, 4
+
+Music_Dungeon2_branch_7e958:
+	octave 5
+	note E_, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note A#, 2
+	rest 2
+	octave 6
+	note D_, 2
+	rest 2
+	note C#, 2
+	rest 2
+	octave 5
+	note G#, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note A#, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	loopchannel 3, Music_Dungeon2_branch_7e958
+	octave 4
+	note E_, 4
+	note B_, 4
+	note A#, 4
+	octave 5
+	note D_, 4
+	note C#, 4
+	octave 4
+	note G#, 4
+	note G_, 4
+	note B_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note A_, 4
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note D#, 4
+	octave 3
+	note E_, 16
+	note C_, 16
+	note D_, 16
+	octave 2
+	note A#, 16
+	octave 3
+	note E_, 16
+	note F_, 16
+	note G_, 16
+	octave 3
+	note B_, 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	callchannel Music_Dungeon2_branch_7e9d1
+	loopchannel 0, Music_Dungeon2_branch_7e940
+	octave 2
+	note G_, 2
+	note A#, 4
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A_, 2
+	note A#, 2
+	note G_, 2
+	octave 3
+	note C#, 4
+	octave 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
+	rest 2
+	endchannel
+
+Music_Dungeon2_branch_7e9d1:
+	octave 4
+	note E_, 2
+	rest 4
+	octave 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	octave 4
+	note F#, 4
+	endchannel
+
+
+Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc)
+	dspeed 12
+
+Music_Dungeon2_branch_7e9dd:
+	dnote 4, cymbal1
+	dnote 4, cymbal2
+	dnote 4, cymbal1
+	dnote 4, snare8
+	dnote 4, cymbal1
+	dnote 4, cymbal2
+	dnote 4, snare9
+	dnote 4, snare7
+	loopchannel 0, Music_Dungeon2_branch_7e9dd
+; 0x7e9f1

music/dungeon3.asm

@@ -0,0 +1,757 @@
+Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1)
+	tempo 0, 160
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	vibrato 8, 1, 4
+
+Music_Dungeon3_branch_7e9fc:
+	notetype 12, 12, 3
+
+Music_Dungeon3_branch_7e9fe:
+	callchannel Music_Dungeon3_branch_7eab2
+	loopchannel 3, Music_Dungeon3_branch_7e9fe
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note E_, 2
+
+Music_Dungeon3_branch_7ea11:
+	callchannel Music_Dungeon3_branch_7eac1
+	loopchannel 4, Music_Dungeon3_branch_7ea11
+
+Music_Dungeon3_branch_7ea18:
+	callchannel Music_Dungeon3_branch_7eab2
+	loopchannel 4, Music_Dungeon3_branch_7ea18
+	octave 4
+	note F_, 2
+	note F_, 2
+	rest 2
+	note F_, 2
+	note E_, 2
+	note E_, 2
+	note D#, 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	callchannel Music_Dungeon3_branch_7eafc
+	octave 4
+	note D_, 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	note D#, 2
+	note D#, 2
+	note E_, 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	note F_, 2
+	note F_, 2
+
+Music_Dungeon3_branch_7ea3c:
+	callchannel Music_Dungeon3_branch_7eace
+	loopchannel 4, Music_Dungeon3_branch_7ea3c
+
+Music_Dungeon3_branch_7ea43:
+	callchannel Music_Dungeon3_branch_7eadd
+	loopchannel 3, Music_Dungeon3_branch_7ea43
+	octave 3
+	note C#, 2
+	octave 2
+	note A_, 2
+	note F_, 2
+	octave 3
+	note C#, 2
+	octave 2
+	note A_, 2
+	note F_, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	callchannel Music_Dungeon3_branch_7eaea
+	callchannel Music_Dungeon3_branch_7eaea
+	octave 3
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G#, 2
+	note E_, 2
+	rest 16
+	rest 8
+	callchannel Music_Dungeon3_branch_7eaf7
+	callchannel Music_Dungeon3_branch_7eaf7
+	callchannel Music_Dungeon3_branch_7eaf7
+	callchannel Music_Dungeon3_branch_7eaf7
+	note D#, 2
+	rest 16
+	rest 16
+	loopchannel 0, Music_Dungeon3_branch_7e9fc
+
+Music_Dungeon3_branch_7eab2:
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	endchannel
+
+Music_Dungeon3_branch_7eac1:
+	note E_, 2
+	note G#, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note E_, 2
+	note G#, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note E_, 2
+	note G#, 2
+	endchannel
+
+Music_Dungeon3_branch_7eace:
+	octave 3
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note G_, 2
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note G_, 2
+	note D#, 2
+	octave 2
+	note B_, 2
+	endchannel
+
+Music_Dungeon3_branch_7eadd:
+	note A_, 2
+	note F_, 2
+	octave 3
+	note C#, 2
+	octave 2
+	note A_, 2
+	note F_, 2
+	octave 3
+	note C#, 2
+	octave 2
+	note A_, 2
+	note F_, 2
+	endchannel
+
+Music_Dungeon3_branch_7eaea:
+	octave 3
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G#, 2
+	note E_, 2
+	octave 4
+	note C_, 2
+	endchannel
+
+Music_Dungeon3_branch_7eaf7:
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	endchannel
+
+Music_Dungeon3_branch_7eafc:
+	tempo 0, 168
+	octave 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	tempo 0, 176
+	octave 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	tempo 0, 184
+	octave 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	tempo 0, 192
+	octave 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	tempo 0, 200
+	octave 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	tempo 0, 208
+	octave 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	tempo 0, 216
+	octave 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	note C#, 1
+	tempo 0, 224
+	octave 1
+	note F_, 1
+	note F#, 1
+	note G_, 1
+	note G#, 1
+	note A_, 1
+	note A#, 1
+	note B_, 1
+	octave 2
+	note C_, 1
+	tempo 0, 160
+	endchannel
+
+
+Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68)
+	vibrato 11, 1, 5
+	duty 3
+
+Music_Dungeon3_branch_7eb6d:
+	notetype 12, 13, 3
+	octave 4
+	note D#, 6
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 6
+	octave 4
+	note C#, 8
+	rest 2
+	note G#, 6
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note E_, 6
+	note F#, 6
+	note E_, 4
+	note D#, 6
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 6
+	octave 4
+	note C#, 8
+	rest 2
+	note G#, 2
+	note G#, 2
+	rest 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A#, 2
+	note A#, 2
+	rest 2
+	note A#, 2
+	note B_, 2
+	note B_, 2
+	rest 8
+	rest 8
+	rest 8
+	rest 8
+	rest 8
+	rest 8
+	rest 8
+	rest 8
+	octave 4
+	note B_, 2
+	note B_, 2
+	rest 2
+	note B_, 2
+	note A#, 2
+	note A#, 2
+	note A_, 2
+	note A_, 2
+	rest 2
+	note A_, 2
+	note G#, 2
+	note G#, 2
+	note C#, 8
+	rest 2
+	octave 3
+	note B_, 6
+	note A#, 2
+	note B_, 2
+	octave 4
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 6
+	note G_, 6
+	octave 3
+	note G_, 8
+	rest 2
+	note F_, 6
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note G_, 6
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	note G_, 6
+	note A_, 6
+	octave 4
+	note C#, 6
+	note G_, 8
+	rest 2
+	note F_, 6
+	note E_, 2
+	note F_, 2
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	note G_, 6
+	note A_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	note G_, 6
+	note A_, 6
+	octave 5
+	note C#, 6
+	octave 4
+	note F#, 8
+	rest 2
+	note E_, 6
+	note D#, 2
+	note E_, 2
+	note G#, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G#, 2
+	note F#, 6
+	note G#, 6
+	octave 5
+	note C_, 6
+	octave 3
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	note D#, 2
+	note G_, 2
+	note D#, 2
+	note C#, 6
+	octave 2
+	note E_, 2
+	note G#, 2
+	octave 3
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	octave 4
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note E_, 2
+	note G#, 2
+	note C_, 2
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	note G_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D#, 2
+	loopchannel 0, Music_Dungeon3_branch_7eb6d
+
+
+Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a)
+	notetype 12, 1, 2
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 12
+	notetype 6, 1, 0
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	rest 2
+	note C_, 1
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 1
+	rest 16
+	rest 16
+	rest 10
+	octave 5
+	note E_, 8
+	octave 4
+	note B_, 8
+	octave 5
+	note D#, 8
+	octave 4
+	note A#, 8
+	octave 5
+	note D_, 8
+	octave 4
+	note A_, 8
+	octave 5
+	note C#, 8
+	octave 4
+	note G#, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note G_, 8
+	note B_, 8
+	note F#, 8
+	note A#, 8
+	note F_, 8
+	note A_, 8
+	note E_, 8
+	rest 16
+	rest 16
+	rest 8
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	rest 2
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	rest 10
+	rest 16
+	notetype 12, 1, 0
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 10
+	loopchannel 0, Music_Dungeon3_Ch3
+
+
+Music_Dungeon3_Ch4: ; 7ece4 (1f:6ce4)
+	dspeed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 10
+	endchannel
+; 0x7ed0f

music/gamecorner.asm

@@ -0,0 +1,628 @@
+Music_GameCorner_Ch1: ; 7e20b (1f:620b)
+	tempo 0, 120
+	stereopanning 119
+	duty 3
+	vibrato 12, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 5
+	octave 3
+	note A_, 6
+	notetype 12, 11, 1
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 16
+
+Music_GameCorner_branch_7e222:
+	notetype 12, 11, 5
+	octave 3
+	note C#, 4
+	octave 2
+	note G#, 4
+	octave 3
+	note E_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note A_, 2
+	note G#, 8
+	notetype 12, 10, 7
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	notetype 12, 11, 5
+	note G#, 6
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	notetype 12, 10, 7
+	note F#, 8
+	note D#, 8
+	notetype 12, 11, 5
+	note D#, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note F#, 4
+	note D#, 4
+	note B_, 2
+	note A_, 8
+	notetype 12, 11, 7
+	octave 4
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 6
+	note C#, 2
+	octave 3
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note G#, 2
+	notetype 12, 9, 7
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 2
+	notetype 12, 11, 7
+	note F#, 8
+	notetype 12, 11, 5
+	note C#, 4
+	octave 2
+	note G#, 4
+	octave 3
+	note E_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note A_, 2
+	note G#, 8
+	notetype 12, 11, 7
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note G#, 6
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 8
+	notetype 12, 9, 7
+	note D#, 4
+	note C#, 4
+	notetype 12, 11, 5
+	note D#, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note F#, 4
+	note D#, 4
+	note B_, 2
+	note A_, 8
+	notetype 12, 11, 7
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 4
+	note A_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	notetype 12, 12, 2
+	note E_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note E_, 2
+	note E_, 4
+	note E_, 4
+	notetype 12, 11, 7
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 8
+	notetype 12, 11, 5
+	octave 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	note F#, 4
+	note D#, 4
+	notetype 12, 11, 7
+	note E_, 3
+	note D#, 1
+	notetype 12, 11, 2
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	notetype 12, 11, 7
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 2
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 8
+	notetype 12, 11, 5
+	octave 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	note F#, 4
+	note A_, 4
+	notetype 12, 11, 7
+	note G#, 2
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 1
+	note G_, 1
+	note G#, 8
+	loopchannel 0, Music_GameCorner_branch_7e222
+
+
+Music_GameCorner_Ch2: ; 7e2df (1f:62df)
+	duty 2
+	vibrato 10, 2, 3
+	notetype 12, 12, 6
+	octave 4
+	note C#, 6
+	notetype 12, 12, 1
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	duty 3
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
+	note A#, 1
+	note B_, 8
+
+Music_GameCorner_branch_7e2fa:
+	duty 2
+	notetype 12, 12, 7
+	octave 3
+	note E_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note G#, 4
+	note E_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 14
+	octave 4
+	note E_, 6
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 16
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	octave 4
+	note D#, 2
+	note C#, 14
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 16
+	note E_, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note G#, 4
+	note E_, 4
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 14
+	octave 4
+	note E_, 6
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 16
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	octave 4
+	note D#, 2
+	note C#, 14
+	note F#, 6
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	notetype 12, 12, 1
+	note E_, 2
+	notetype 12, 10, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 2
+	notetype 12, 12, 7
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	notetype 12, 12, 5
+	note F#, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note A_, 4
+	note G#, 3
+	note A_, 1
+	notetype 12, 12, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	notetype 12, 12, 7
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note D#, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 10
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note F#, 4
+	note D#, 4
+	note A_, 4
+	note F#, 4
+	note B_, 16
+	loopchannel 0, Music_GameCorner_branch_7e2fa
+
+
+Music_GameCorner_Ch3: ; 7e38b (1f:638b)
+	notetype 12, 1, 3
+	octave 5
+	note C#, 1
+	rest 5
+	octave 4
+	note F#, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note B_, 1
+	rest 9
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 1
+	note D#, 1
+	rest 1
+
+Music_GameCorner_branch_7e3a5:
+	callchannel Music_GameCorner_branch_7e418
+	callchannel Music_GameCorner_branch_7e42d
+	callchannel Music_GameCorner_branch_7e442
+	callchannel Music_GameCorner_branch_7e457
+	callchannel Music_GameCorner_branch_7e46c
+	callchannel Music_GameCorner_branch_7e481
+	callchannel Music_GameCorner_branch_7e496
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	callchannel Music_GameCorner_branch_7e418
+	callchannel Music_GameCorner_branch_7e42d
+	callchannel Music_GameCorner_branch_7e442
+	callchannel Music_GameCorner_branch_7e457
+	callchannel Music_GameCorner_branch_7e46c
+	callchannel Music_GameCorner_branch_7e481
+	callchannel Music_GameCorner_branch_7e496
+	note E_, 1
+	rest 3
+	octave 3
+	note B_, 1
+	rest 3
+	octave 4
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note B_, 1
+	rest 1
+	callchannel Music_GameCorner_branch_7e46c
+	callchannel Music_GameCorner_branch_7e418
+	callchannel Music_GameCorner_branch_7e4ab
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	callchannel Music_GameCorner_branch_7e46c
+	callchannel Music_GameCorner_branch_7e418
+	callchannel Music_GameCorner_branch_7e4ab
+	callchannel Music_GameCorner_branch_7e42d
+	loopchannel 0, Music_GameCorner_branch_7e3a5
+
+Music_GameCorner_branch_7e418:
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e42d:
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e442:
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e457:
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e46c:
+	note D#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e481:
+	note D#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e496:
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	endchannel
+
+Music_GameCorner_branch_7e4ab:
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	endchannel
+; 0x7e4c0

music/gym.asm

@@ -0,0 +1,358 @@
+Music_Gym_Ch1: ; bcbb (2:7cbb)
+	tempo 0, 138
+	stereopanning 119
+	duty 3
+	vibrato 8, 2, 2
+	unknownmusic0xe8
+	notetype 12, 11, 5
+	octave 3
+	note G_, 6
+	note C_, 1
+	note G_, 1
+	note F_, 6
+	octave 2
+	note A#, 1
+	octave 3
+	note F_, 1
+	note E_, 6
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note F_, 4
+	note G_, 4
+
+Music_Gym_branch_bcd8:
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	notetype 12, 11, 1
+	note D_, 3
+	notetype 12, 11, 5
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note A#, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	notetype 12, 11, 1
+	note A#, 3
+	notetype 12, 11, 5
+	note F_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note A#, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note A#, 2
+	note F_, 1
+	note A#, 1
+	octave 4
+	note D_, 4
+	octave 3
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 1
+	note G_, 1
+	note A#, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	loopchannel 0, Music_Gym_branch_bcd8
+
+
+Music_Gym_Ch2: ; bd6b (2:7d6b)
+	duty 3
+	vibrato 10, 2, 5
+	notetype 12, 12, 7
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 6
+	note F_, 1
+	note A#, 1
+	notetype 12, 10, 0
+	note A_, 12
+	notetype 12, 12, 7
+	note B_, 4
+
+Music_Gym_branch_bd82:
+	octave 4
+	note C_, 12
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	notetype 12, 12, 2
+	note D_, 3
+	octave 3
+	note A#, 1
+	notetype 12, 12, 7
+	note A#, 12
+	octave 4
+	note C_, 12
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	notetype 12, 12, 4
+	octave 3
+	note A#, 2
+	notetype 12, 12, 7
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 12
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	notetype 12, 12, 2
+	note F_, 3
+	note D_, 1
+	notetype 12, 12, 7
+	note D_, 4
+	notetype 12, 12, 2
+	note A#, 3
+	note F_, 1
+	notetype 12, 12, 7
+	note F_, 4
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 1
+	note F_, 1
+	note A#, 12
+	octave 3
+	note G_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	notetype 12, 12, 3
+	note E_, 2
+	notetype 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 6
+	note G_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G_, 2
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note C_, 2
+	note D_, 2
+	note G_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	notetype 12, 12, 3
+	note E_, 2
+	notetype 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 4
+	notetype 12, 12, 3
+	note G_, 2
+	notetype 12, 12, 7
+	note G_, 1
+	note A_, 1
+	note A#, 4
+	notetype 12, 12, 4
+	octave 4
+	note C_, 2
+	notetype 12, 12, 7
+	note C_, 1
+	note D_, 1
+	note E_, 12
+	loopchannel 0, Music_Gym_branch_bd82
+
+
+Music_Gym_Ch3: ; bdfa (2:7dfa)
+	notetype 12, 1, 1
+	rest 16
+	rest 10
+	octave 4
+	note G_, 2
+	note F_, 2
+	note D_, 2
+
+Music_Gym_branch_be02:
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be44
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be44
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be44
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be44
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be4d
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be4d
+	callchannel Music_Gym_branch_be3b
+	callchannel Music_Gym_branch_be4d
+	callchannel Music_Gym_branch_be3b
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note F_, 2
+	loopchannel 0, Music_Gym_branch_be02
+
+Music_Gym_branch_be3b:
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	endchannel
+
+Music_Gym_branch_be44:
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	endchannel
+
+Music_Gym_branch_be4d:
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	endchannel
+; 0xbe56

music/halloffame.asm

@@ -0,0 +1,97 @@
+Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf)
+	tempo 0, 112
+	stereopanning 119
+	duty 3
+	vibrato 12, 2, 2
+	unknownmusic0xe8
+	notetype 12, 11, 3
+	rest 16
+	rest 16
+	rest 16
+	rest 12
+	octave 3
+	note D_, 1
+	note E_, 1
+	note F_, 1
+	note F#, 1
+
+Music_HallOfFame_branch_7fbc5:
+	notetype 12, 8, 0
+	octave 4
+	note C_, 16
+	note E_, 16
+	note F#, 16
+	notetype 12, 6, 0
+	note F_, 16
+	loopchannel 3, Music_HallOfFame_branch_7fbc5
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	loopchannel 0, Music_HallOfFame_branch_7fbc5
+
+
+Music_HallOfFame_Ch2: ; 7fbda (1f:7bda)
+	vibrato 8, 2, 5
+	duty 3
+
+Music_HallOfFame_branch_7fbdf:
+	notetype 12, 12, 4
+	octave 3
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note A_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 10
+	note F_, 2
+	note C_, 2
+	note F_, 2
+	note A#, 4
+	note A_, 4
+	note F_, 2
+	loopchannel 0, Music_HallOfFame_branch_7fbdf
+
+
+Music_HallOfFame_Ch3: ; 7fbfc (1f:7bfc)
+	notetype 12, 1, 2
+
+Music_HallOfFame_branch_7fbfe:
+	octave 4
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	loopchannel 12, Music_HallOfFame_branch_7fbfe
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note F#, 4
+	note A_, 4
+	note E_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	loopchannel 0, Music_HallOfFame_Ch3
+; 0x7fc1f

music/headers/musicheaders02.asm

@@ -0,0 +1,186 @@
+Music_PalletTown: ; 822e (2:422e)
+	db ( $80 | CH0 )
+	dw Music_PalletTown_Ch1
+	db CH1
+	dw Music_PalletTown_Ch2
+	db CH2
+	dw Music_PalletTown_Ch3
+
+Music_Pokecenter: ; 8237 (2:4237)
+	db ( $80 | CH0 )
+	dw Music_Pokecenter_Ch1
+	db CH1
+	dw Music_Pokecenter_Ch2
+	db CH2
+	dw Music_Pokecenter_Ch3
+
+Music_Gym: ; 8240 (2:4240)
+	db ( $80 | CH0 )
+	dw Music_Gym_Ch1
+	db CH1
+	dw Music_Gym_Ch2
+	db CH2
+	dw Music_Gym_Ch3
+
+; Viridian City, Pewter City, Saffron City
+Music_Cities1: ; 8249 (2:4249)
+	db ( $C0 | CH0 )
+	dw Music_Cities1_Ch1
+	db CH1
+	dw Music_Cities1_Ch2
+	db CH2
+	dw Music_Cities1_Ch3
+	db CH3
+	dw Music_Cities1_Ch4
+
+; Cerulean City, Fuchsia City
+Music_Cities2: ; 8255 (2:4255)
+	db ( $80 | CH0 )
+	dw Music_Cities2_Ch1
+	db CH1
+	dw Music_Cities2_Ch2
+	db CH2
+	dw Music_Cities2_Ch3
+
+Music_Celadon: ; 825e (2:425e)
+	db ( $80 | CH0 )
+	dw Music_Celadon_Ch1
+	db CH1
+	dw Music_Celadon_Ch2
+	db CH2
+	dw Music_Celadon_Ch3
+
+Music_Cinnabar: ; 8267 (2:4267)
+	db ( $80 | CH0 )
+	dw Music_Cinnabar_Ch1
+	db CH1
+	dw Music_Cinnabar_Ch2
+	db CH2
+	dw Music_Cinnabar_Ch3
+
+Music_Vermilion: ; 8270 (2:4270)
+	db ( $C0 | CH0 )
+	dw Music_Vermilion_Ch1
+	db CH1
+	dw Music_Vermilion_Ch2
+	db CH2
+	dw Music_Vermilion_Ch3
+	db CH3
+	dw Music_Vermilion_Ch4
+
+Music_Lavender: ; 827c (2:427c)
+	db ( $C0 | CH0 )
+	dw Music_Lavender_Ch1
+	db CH1
+	dw Music_Lavender_Ch2
+	db CH2
+	dw Music_Lavender_Ch3
+	db CH3
+	dw Music_Lavender_Ch4
+
+Music_SSAnne: ; 8288 (2:4288)
+	db ( $80 | CH0 )
+	dw Music_SSAnne_Ch1
+	db CH1
+	dw Music_SSAnne_Ch2
+	db CH2
+	dw Music_SSAnne_Ch3
+
+Music_MeetProfOak: ; 8291 (2:4291)
+	db ( $80 | CH0 )
+	dw Music_MeetProfOak_Ch1
+	db CH1
+	dw Music_MeetProfOak_Ch2
+	db CH2
+	dw Music_MeetProfOak_Ch3
+
+Music_MeetRival: ; 829a (2:429a)
+	db ( $80 | CH0 )
+	dw Music_MeetRival_Ch1
+	db CH1
+	dw Music_MeetRival_Ch2
+	db CH2
+	dw Music_MeetRival_Ch3
+
+Music_MuseumGuy: ; 82a3 (2:42a3)
+	db ( $C0 | CH0 )
+	dw Music_MuseumGuy_Ch1
+	db CH1
+	dw Music_MuseumGuy_Ch2
+	db CH2
+	dw Music_MuseumGuy_Ch3
+	db CH3
+	dw Music_MuseumGuy_Ch4
+
+Music_SafariZone: ; 82af (2:42af)
+	db ( $80 | CH0 )
+	dw Music_SafariZone_Ch1
+	db CH1
+	dw Music_SafariZone_Ch2
+	db CH2
+	dw Music_SafariZone_Ch3
+
+Music_PkmnHealed: ; 82b8 (2:42b8)
+	db ( $80 | CH0 )
+	dw Music_PkmnHealed_Ch1
+	db CH1
+	dw Music_PkmnHealed_Ch2
+	db CH2
+	dw Music_PkmnHealed_Ch3
+
+; Routes 1 and 2
+Music_Routes1: ; 82c1 (2:42c1)
+	db ( $C0 | CH0 )
+	dw Music_Routes1_Ch1
+	db CH1
+	dw Music_Routes1_Ch2
+	db CH2
+	dw Music_Routes1_Ch3
+	db CH3
+	dw Music_Routes1_Ch4
+
+; Routes 24 and 25
+Music_Routes2: ; 82cd (2:42cd)
+	db ( $C0 | CH0 )
+	dw Music_Routes2_Ch1
+	db CH1
+	dw Music_Routes2_Ch2
+	db CH2
+	dw Music_Routes2_Ch3
+	db CH3
+	dw Music_Routes2_Ch4
+
+; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
+Music_Routes3: ; 82d9 (2:42d9)
+	db ( $C0 | CH0 )
+	dw Music_Routes3_Ch1
+	db CH1
+	dw Music_Routes3_Ch2
+	db CH2
+	dw Music_Routes3_Ch3
+	db CH3
+	dw Music_Routes3_Ch4
+
+; Routes 11, 12, 13, 14, 15
+Music_Routes4: ; 82d5 (2:42d5)
+	db ( $C0 | CH0 )
+	dw Music_Routes4_Ch1
+	db CH1
+	dw Music_Routes4_Ch2
+	db CH2
+	dw Music_Routes4_Ch3
+	db CH3
+	dw Music_Routes4_Ch4
+
+; Route 3, Indigo Plateau
+Music_IndigoPlateau: ; 82f1 (2:42f1)
+	db ( $C0 | CH0 )
+	dw Music_IndigoPlateau_Ch1
+	db CH1
+	dw Music_IndigoPlateau_Ch2
+	db CH2
+	dw Music_IndigoPlateau_Ch3
+	db CH3
+	dw Music_IndigoPlateau_Ch4
+	
+; 0x82fd

music/headers/musicheaders08.asm

@@ -0,0 +1,57 @@
+Music_GymLeaderBattle: ; 202be (8:42be)
+	db ( $80 | CH0 )
+	dw Music_GymLeaderBattle_Ch1
+	db CH1
+	dw Music_GymLeaderBattle_Ch2
+	db CH2
+	dw Music_GymLeaderBattle_Ch3
+
+Music_TrainerBattle: ; 202c7 (8:42c7)
+	db ( $80 | CH0 )
+	dw Music_TrainerBattle_Ch1
+	db CH1
+	dw Music_TrainerBattle_Ch2
+	db CH2
+	dw Music_TrainerBattle_Ch3
+
+Music_WildBattle: ; 202d0 (8:42d0)
+	db ( $80 | CH0 )
+	dw Music_WildBattle_Ch1
+	db CH1
+	dw Music_WildBattle_Ch2
+	db CH2
+	dw Music_WildBattle_Ch3
+
+Music_FinalBattle: ; 202d9 (8:42d9)
+	db ( $80 | CH0 )
+	dw Music_FinalBattle_Ch1
+	db CH1
+	dw Music_FinalBattle_Ch2
+	db CH2
+	dw Music_FinalBattle_Ch3
+
+Music_DefeatedTrainer: ; 202e2 (8:42e2)
+	db ( $80 | CH0 )
+	dw Music_DefeatedTrainer_Ch1
+	db CH1
+	dw Music_DefeatedTrainer_Ch2
+	db CH2
+	dw Music_DefeatedTrainer_Ch3
+
+Music_DefeatedWildMon: ; 202eb (8:42eb)
+	db ( $80 | CH0 )
+	dw Music_DefeatedWildMon_Ch1
+	db CH1
+	dw Music_DefeatedWildMon_Ch2
+	db CH2
+	dw Music_DefeatedWildMon_Ch3
+
+Music_DefeatedGymLeader: ; 202f4 (8:42f4)
+	db ( $80 | CH0 )
+	dw Music_DefeatedGymLeader_Ch1
+	db CH1
+	dw Music_DefeatedGymLeader_Ch2
+	db CH2
+	dw Music_DefeatedGymLeader_Ch3
+	
+; 202fd

music/headers/musicheaders1f.asm

@@ -0,0 +1,160 @@
+Music_TitleScreen: ; 7c249 (1f:4249)
+	db ( $C0 | CH0 )
+	dw Music_TitleScreen_Ch1
+	db CH1
+	dw Music_TitleScreen_Ch2
+	db CH2
+	dw Music_TitleScreen_Ch3
+	db CH3
+	dw Music_TitleScreen_Ch4
+
+Music_Credits: ; 7c255 (1f:4255)
+	db ( $80 | CH0 )
+	dw Music_Credits_Ch1
+	db CH1
+	dw Music_Credits_Ch2
+	db CH2
+	dw Music_Credits_Ch3
+
+Music_HallOfFame: ; 7c25e (1f:425e)
+	db ( $80 | CH0 )
+	dw Music_HallOfFame_Ch1
+	db CH1
+	dw Music_HallOfFame_Ch2
+	db CH2
+	dw Music_HallOfFame_Ch3
+
+Music_OaksLab: ; 7c267 (1f:4267)
+	db ( $80 | CH0 )
+	dw Music_OaksLab_Ch1
+	db CH1
+	dw Music_OaksLab_Ch2
+	db CH2
+	dw Music_OaksLab_Ch3
+
+Music_JigglypuffSong: ; 7c270 (1f:4270)
+	db $40
+	dw Music_JigglypuffSong_Ch1
+	db CH1
+	dw Music_JigglypuffSong_Ch2
+
+Music_BikeRiding: ; 7c276 (1f:4276)
+	db ( $C0 | CH0 )
+	dw Music_BikeRiding_Ch1
+	db CH1
+	dw Music_BikeRiding_Ch2
+	db CH2
+	dw Music_BikeRiding_Ch3
+	db CH3
+	dw Music_BikeRiding_Ch4
+
+Music_Surfing: ; 7c282 (1f:4282)
+	db ( $80 | CH0 )
+	dw Music_Surfing_Ch1
+	db CH1
+	dw Music_Surfing_Ch2
+	db CH2
+	dw Music_Surfing_Ch3
+
+Music_GameCorner: ; 7c28b (1f:428b)
+	db ( $80 | CH0 )
+	dw Music_GameCorner_Ch1
+	db CH1
+	dw Music_GameCorner_Ch2
+	db CH2
+	dw Music_GameCorner_Ch3
+
+Music_IntroBattle: ; 7c294 (1f:4294)
+	db ( $C0 | CH0 )
+	dw Music_IntroBattle_Ch1
+	db CH1
+	dw Music_IntroBattle_Ch2
+	db CH2
+	dw Music_IntroBattle_Ch3
+	db CH3
+	dw Music_IntroBattle_Ch4
+
+; Power Plant, Unknown Dungeon, Rocket HQ
+Music_Dungeon1: ; 7c2a0 (1f:42a0)
+	db ( $C0 | CH0 )
+	dw Music_Dungeon1_Ch1
+	db CH1
+	dw Music_Dungeon1_Ch2
+	db CH2
+	dw Music_Dungeon1_Ch3
+	db CH3
+	dw Music_Dungeon1_Ch4
+
+; Viridian Forest, Seafoam Islands
+Music_Dungeon2: ; 7c2ac (1f:42ac)
+	db ( $C0 | CH0 )
+	dw Music_Dungeon2_Ch1
+	db CH1
+	dw Music_Dungeon2_Ch2
+	db CH2
+	dw Music_Dungeon2_Ch3
+	db CH3
+	dw Music_Dungeon2_Ch4
+
+; Mt. Moon, Rock Tunnel, Victory Road
+Music_Dungeon3: ; 7c2b8 (1f:42b8)
+	db ( $C0 | CH0 )
+	dw Music_Dungeon3_Ch1
+	db CH1
+	dw Music_Dungeon3_Ch2
+	db CH2
+	dw Music_Dungeon3_Ch3
+	db CH3
+	dw Music_Dungeon3_Ch4
+
+Music_CinnabarMansion: ; 7c2c4 (1f:42c4)
+	db ( $C0 | CH0 )
+	dw Music_CinnabarMansion_Ch1
+	db CH1
+	dw Music_CinnabarMansion_Ch2
+	db CH2
+	dw Music_CinnabarMansion_Ch3
+	db CH3
+	dw Music_CinnabarMansion_Ch4
+
+Music_PokemonTower: ; 7c2d0 (1f:42d0)
+	db ( $80 | CH0 )
+	dw Music_PokemonTower_Ch1
+	db CH1
+	dw Music_PokemonTower_Ch2
+	db CH2
+	dw Music_PokemonTower_Ch3
+
+Music_SilphCo: ; 7c2d9 (1f:42d9)
+	db ( $80 | CH0 )
+	dw Music_SilphCo_Ch1
+	db CH1
+	dw Music_SilphCo_Ch2
+	db CH2
+	dw Music_SilphCo_Ch3
+
+Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2)
+	db ( $80 | CH0 )
+	dw Music_MeetEvilTrainer_Ch1
+	db CH1
+	dw Music_MeetEvilTrainer_Ch2
+	db CH2
+	dw Music_MeetEvilTrainer_Ch3
+
+Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb)
+	db ( $80 | CH0 )
+	dw Music_MeetFemaleTrainer_Ch1
+	db CH1
+	dw Music_MeetFemaleTrainer_Ch2
+	db CH2
+	dw Music_MeetFemaleTrainer_Ch3
+
+Music_MeetMaleTrainer: ; 7c2f4 (1f:42f4)
+	db ( $80 | CH0 )
+	dw Music_MeetMaleTrainer_Ch1
+	db CH1
+	dw Music_MeetMaleTrainer_Ch2
+	db CH2
+	dw Music_MeetMaleTrainer_Ch3
+
+; 0x7c2fd

music/headers/sfxheaders02.asm

@@ -0,0 +1,564 @@
+SFX_Headers_02:
+	db $ff, $ff, $ff ; padding
+
+SFX_02_01: ; 8003 (2:4003)
+	db CH7
+	dw SFX_02_01_Ch1
+
+SFX_02_02: ; 8006 (2:4006)
+	db CH7
+	dw SFX_02_02_Ch1
+
+SFX_02_03: ; 8009 (2:4009)
+	db CH7
+	dw SFX_02_03_Ch1
+
+SFX_02_04: ; 800c (2:400c)
+	db CH7
+	dw SFX_02_04_Ch1
+
+SFX_02_05: ; 800f (2:400f)
+	db CH7
+	dw SFX_02_05_Ch1
+
+SFX_02_06: ; 8012 (2:4012)
+	db CH7
+	dw SFX_02_06_Ch1
+
+SFX_02_07: ; 8015 (2:4015)
+	db CH7
+	dw SFX_02_07_Ch1
+
+SFX_02_08: ; 8018 (2:4018)
+	db CH7
+	dw SFX_02_08_Ch1
+
+SFX_02_09: ; 801b (2:401b)
+	db CH7
+	dw SFX_02_09_Ch1
+
+SFX_02_0a: ; 801e (2:401e)
+	db CH7
+	dw SFX_02_0a_Ch1
+
+SFX_02_0b: ; 8021 (2:4021)
+	db CH7
+	dw SFX_02_0b_Ch1
+
+SFX_02_0c: ; 8024 (2:4024)
+	db CH7
+	dw SFX_02_0c_Ch1
+
+SFX_02_0d: ; 8027 (2:4027)
+	db CH7
+	dw SFX_02_0d_Ch1
+
+SFX_02_0e: ; 802a (2:402a)
+	db CH7
+	dw SFX_02_0e_Ch1
+
+SFX_02_0f: ; 802d (2:402d)
+	db CH7
+	dw SFX_02_0f_Ch1
+
+SFX_02_10: ; 8030 (2:4030)
+	db CH7
+	dw SFX_02_10_Ch1
+
+SFX_02_11: ; 8033 (2:4033)
+	db CH7
+	dw SFX_02_11_Ch1
+
+SFX_02_12: ; 8036 (2:4036)
+	db CH7
+	dw SFX_02_12_Ch1
+
+SFX_02_13: ; 8039 (2:4039)
+	db CH7
+	dw SFX_02_13_Ch1
+
+SFX_02_14: ; 803c (2:403c)
+	db ( $80 | CH4 )
+	dw SFX_02_14_Ch1
+	db CH5
+	dw SFX_02_14_Ch2
+	db CH7
+	dw SFX_02_14_Ch3
+
+SFX_02_15: ; 8045 (2:4045)
+	db ( $80 | CH4 )
+	dw SFX_02_15_Ch1
+	db CH5
+	dw SFX_02_15_Ch2
+	db CH7
+	dw SFX_02_15_Ch3
+
+SFX_02_16: ; 804e (2:404e)
+	db ( $80 | CH4 )
+	dw SFX_02_16_Ch1
+	db CH5
+	dw SFX_02_16_Ch2
+	db CH7
+	dw SFX_02_16_Ch3
+
+SFX_02_17: ; 8057 (2:4057)
+	db ( $80 | CH4 )
+	dw SFX_02_17_Ch1
+	db CH5
+	dw SFX_02_17_Ch2
+	db CH7
+	dw SFX_02_17_Ch3
+
+SFX_02_18: ; 8060 (2:4060)
+	db ( $80 | CH4 )
+	dw SFX_02_18_Ch1
+	db CH5
+	dw SFX_02_18_Ch2
+	db CH7
+	dw SFX_02_18_Ch3
+
+SFX_02_19: ; 8069 (2:4069)
+	db ( $80 | CH4 )
+	dw SFX_02_19_Ch1
+	db CH5
+	dw SFX_02_19_Ch2
+	db CH7
+	dw SFX_02_19_Ch3
+
+SFX_02_1a: ; 8072 (2:4072)
+	db ( $80 | CH4 )
+	dw SFX_02_1a_Ch1
+	db CH5
+	dw SFX_02_1a_Ch2
+	db CH7
+	dw SFX_02_1a_Ch3
+
+SFX_02_1b: ; 807b (2:407b)
+	db ( $80 | CH4 )
+	dw SFX_02_1b_Ch1
+	db CH5
+	dw SFX_02_1b_Ch2
+	db CH7
+	dw SFX_02_1b_Ch3
+
+SFX_02_1c: ; 8084 (2:4084)
+	db ( $80 | CH4 )
+	dw SFX_02_1c_Ch1
+	db CH5
+	dw SFX_02_1c_Ch2
+	db CH7
+	dw SFX_02_1c_Ch3
+
+SFX_02_1d: ; 808d (2:408d)
+	db ( $80 | CH4 )
+	dw SFX_02_1d_Ch1
+	db CH5
+	dw SFX_02_1d_Ch2
+	db CH7
+	dw SFX_02_1d_Ch3
+
+SFX_02_1e: ; 8096 (2:4096)
+	db ( $80 | CH4 )
+	dw SFX_02_1e_Ch1
+	db CH5
+	dw SFX_02_1e_Ch2
+	db CH7
+	dw SFX_02_1e_Ch3
+
+SFX_02_1f: ; 809f (2:409f)
+	db ( $80 | CH4 )
+	dw SFX_02_1f_Ch1
+	db CH5
+	dw SFX_02_1f_Ch2
+	db CH7
+	dw SFX_02_1f_Ch3
+
+SFX_02_20: ; 80a8 (2:40a8)
+	db ( $80 | CH4 )
+	dw SFX_02_20_Ch1
+	db CH5
+	dw SFX_02_20_Ch2
+	db CH7
+	dw SFX_02_20_Ch3
+
+SFX_02_21: ; 80b1 (2:40b1)
+	db ( $80 | CH4 )
+	dw SFX_02_21_Ch1
+	db CH5
+	dw SFX_02_21_Ch2
+	db CH7
+	dw SFX_02_21_Ch3
+
+SFX_02_22: ; 80ba (2:40ba)
+	db ( $80 | CH4 )
+	dw SFX_02_22_Ch1
+	db CH5
+	dw SFX_02_22_Ch2
+	db CH7
+	dw SFX_02_22_Ch3
+
+SFX_02_23: ; 80c3 (2:40c3)
+	db ( $80 | CH4 )
+	dw SFX_02_23_Ch1
+	db CH5
+	dw SFX_02_23_Ch2
+	db CH7
+	dw SFX_02_23_Ch3
+
+SFX_02_24: ; 80cc (2:40cc)
+	db ( $80 | CH4 )
+	dw SFX_02_24_Ch1
+	db CH5
+	dw SFX_02_24_Ch2
+	db CH7
+	dw SFX_02_24_Ch3
+
+SFX_02_25: ; 80d5 (2:40d5)
+	db ( $80 | CH4 )
+	dw SFX_02_25_Ch1
+	db CH5
+	dw SFX_02_25_Ch2
+	db CH7
+	dw SFX_02_25_Ch3
+
+SFX_02_26: ; 80de (2:40de)
+	db ( $80 | CH4 )
+	dw SFX_02_26_Ch1
+	db CH5
+	dw SFX_02_26_Ch2
+	db CH7
+	dw SFX_02_26_Ch3
+
+SFX_02_27: ; 80e7 (2:40e7)
+	db ( $80 | CH4 )
+	dw SFX_02_27_Ch1
+	db CH5
+	dw SFX_02_27_Ch2
+	db CH7
+	dw SFX_02_27_Ch3
+
+SFX_02_28: ; 80f0 (2:40f0)
+	db ( $80 | CH4 )
+	dw SFX_02_28_Ch1
+	db CH5
+	dw SFX_02_28_Ch2
+	db CH7
+	dw SFX_02_28_Ch3
+
+SFX_02_29: ; 80f9 (2:40f9)
+	db ( $80 | CH4 )
+	dw SFX_02_29_Ch1
+	db CH5
+	dw SFX_02_29_Ch2
+	db CH7
+	dw SFX_02_29_Ch3
+
+SFX_02_2a: ; 8102 (2:4102)
+	db ( $80 | CH4 )
+	dw SFX_02_2a_Ch1
+	db CH5
+	dw SFX_02_2a_Ch2
+	db CH7
+	dw SFX_02_2a_Ch3
+
+SFX_02_2b: ; 810b (2:410b)
+	db ( $80 | CH4 )
+	dw SFX_02_2b_Ch1
+	db CH5
+	dw SFX_02_2b_Ch2
+	db CH7
+	dw SFX_02_2b_Ch3
+
+SFX_02_2c: ; 8114 (2:4114)
+	db ( $80 | CH4 )
+	dw SFX_02_2c_Ch1
+	db CH5
+	dw SFX_02_2c_Ch2
+	db CH7
+	dw SFX_02_2c_Ch3
+
+SFX_02_2d: ; 811d (2:411d)
+	db ( $80 | CH4 )
+	dw SFX_02_2d_Ch1
+	db CH5
+	dw SFX_02_2d_Ch2
+	db CH7
+	dw SFX_02_2d_Ch3
+
+SFX_02_2e: ; 8126 (2:4126)
+	db ( $80 | CH4 )
+	dw SFX_02_2e_Ch1
+	db CH5
+	dw SFX_02_2e_Ch2
+	db CH7
+	dw SFX_02_2e_Ch3
+
+SFX_02_2f: ; 812f (2:412f)
+	db ( $80 | CH4 )
+	dw SFX_02_2f_Ch1
+	db CH5
+	dw SFX_02_2f_Ch2
+	db CH7
+	dw SFX_02_2f_Ch3
+
+SFX_02_30: ; 8138 (2:4138)
+	db ( $80 | CH4 )
+	dw SFX_02_30_Ch1
+	db CH5
+	dw SFX_02_30_Ch2
+	db CH7
+	dw SFX_02_30_Ch3
+
+SFX_02_31: ; 8141 (2:4141)
+	db ( $80 | CH4 )
+	dw SFX_02_31_Ch1
+	db CH5
+	dw SFX_02_31_Ch2
+	db CH7
+	dw SFX_02_31_Ch3
+
+SFX_02_32: ; 814a (2:414a)
+	db ( $80 | CH4 )
+	dw SFX_02_32_Ch1
+	db CH5
+	dw SFX_02_32_Ch2
+	db CH7
+	dw SFX_02_32_Ch3
+
+SFX_02_33: ; 8153 (2:4153)
+	db ( $80 | CH4 )
+	dw SFX_02_33_Ch1
+	db CH5
+	dw SFX_02_33_Ch2
+	db CH7
+	dw SFX_02_33_Ch3
+
+SFX_02_34: ; 815c (2:415c)
+	db ( $80 | CH4 )
+	dw SFX_02_34_Ch1
+	db CH5
+	dw SFX_02_34_Ch2
+	db CH7
+	dw SFX_02_34_Ch3
+
+SFX_02_35: ; 8165 (2:4165)
+	db ( $80 | CH4 )
+	dw SFX_02_35_Ch1
+	db CH5
+	dw SFX_02_35_Ch2
+	db CH7
+	dw SFX_02_35_Ch3
+
+SFX_02_36: ; 816e (2:416e)
+	db ( $80 | CH4 )
+	dw SFX_02_36_Ch1
+	db CH5
+	dw SFX_02_36_Ch2
+	db CH7
+	dw SFX_02_36_Ch3
+
+SFX_02_37: ; 8177 (2:4177)
+	db ( $80 | CH4 )
+	dw SFX_02_37_Ch1
+	db CH5
+	dw SFX_02_37_Ch2
+	db CH7
+	dw SFX_02_37_Ch3
+
+SFX_02_38: ; 8180 (2:4180)
+	db ( $80 | CH4 )
+	dw SFX_02_38_Ch1
+	db CH5
+	dw SFX_02_38_Ch2
+	db CH7
+	dw SFX_02_38_Ch3
+
+SFX_02_39: ; 8189 (2:4189)
+	db ( $80 | CH4 )
+	dw SFX_02_39_Ch1
+	db CH5
+	dw SFX_02_39_Ch2
+	db CH7
+	dw SFX_02_39_Ch3
+
+SFX_02_3a: ; 8192 (2:4192)
+	db ( $80 | CH4 )
+	dw SFX_02_3a_Ch1
+	db CH5
+	dw SFX_02_3a_Ch2
+	db CH6
+	dw SFX_02_3a_Ch3
+
+SFX_02_3b: ; 819b (2:419b)
+	db ( $80 | CH4 )
+	dw SFX_02_3b_Ch1
+	db CH5
+	dw SFX_02_3b_Ch2
+	db CH6
+	dw SFX_02_3b_Ch3
+
+SFX_02_3c: ; 81a4 (2:41a4)
+	db CH4
+	dw SFX_02_3c_Ch1
+
+SFX_02_3d: ; 81a7 (2:41a7)
+	db CH4
+	dw SFX_02_3d_Ch1
+
+SFX_02_3e: ; 81aa (2:41aa)
+	db CH4
+	dw SFX_02_3e_Ch1
+
+SFX_02_3f: ; 81ad (2:41ad)
+	db CH7
+	dw SFX_02_3f_Ch1
+
+SFX_02_40: ; 81b0 (2:41b0)
+	db CH4
+	dw SFX_02_40_Ch1
+
+SFX_02_41: ; 81b3 (2:41b3)
+	db ( $80 | CH4 )
+	dw SFX_02_41_Ch1
+	db CH5
+	dw SFX_02_41_Ch2
+	db CH6
+	dw SFX_02_41_Ch3
+
+SFX_02_42: ; 81bc (2:41bc)
+	db ( $80 | CH4 )
+	dw SFX_02_42_Ch1
+	db CH5
+	dw SFX_02_42_Ch2
+	db CH6
+	dw SFX_02_42_Ch3
+
+SFX_02_43: ; 81c5 (2:41c5)
+	db CH4
+	dw SFX_02_43_Ch1
+
+SFX_02_44: ; 81c8 (2:41c8)
+	db CH4
+	dw SFX_02_44_Ch1
+
+SFX_02_45: ; 81cb (2:41cb)
+	db CH4
+	dw SFX_02_45_Ch1
+
+SFX_02_46: ; 81ce (2:41ce)
+	db CH4
+	dw SFX_02_46_Ch1
+
+SFX_02_47: ; 81d1 (2:41d1)
+	db CH4
+	dw SFX_02_47_Ch1
+
+SFX_02_48: ; 81d4 (2:41d4)
+	db CH4
+	dw SFX_02_48_Ch1
+
+SFX_02_49: ; 81d7 (2:41d7)
+	db CH4
+	dw SFX_02_49_Ch1
+
+SFX_02_4a: ; 81da (2:41da)
+	db CH4
+	dw SFX_02_4a_Ch1
+
+SFX_02_4b: ; 81dd (2:41dd)
+	db CH4
+	dw SFX_02_4b_Ch1
+
+SFX_02_4c: ; 81e0 (2:41e0)
+	db CH4
+	dw SFX_02_4c_Ch1
+
+SFX_02_4d: ; 81e3 (2:41e3)
+	db CH4
+	dw SFX_02_4d_Ch1
+
+SFX_02_4e: ; 81e6 (2:41e6)
+	db CH4
+	dw SFX_02_4e_Ch1
+
+SFX_02_4f: ; 81e9 (2:41e9)
+	db CH7
+	dw SFX_02_4f_Ch1
+
+SFX_02_50: ; 81ec (2:41ec)
+	db CH7
+	dw SFX_02_50_Ch1
+
+SFX_02_51: ; 81ef (2:41ef)
+	db ( $40 | CH4 )
+	dw SFX_02_51_Ch1
+	db CH5
+	dw SFX_02_51_Ch2
+
+SFX_02_52: ; 81f5 (2:41f5)
+	db CH4
+	dw SFX_02_52_Ch1
+
+SFX_02_53: ; 81f8 (2:41f8)
+	db CH7
+	dw SFX_02_53_Ch1
+
+SFX_02_54: ; 81fb (2:41fb)
+	db ( $40 | CH4 )
+	dw SFX_02_54_Ch1
+	db CH5
+	dw SFX_02_54_Ch2
+
+SFX_02_55: ; 8201 (2:4201)
+	db CH4
+	dw SFX_02_55_Ch1
+
+SFX_02_56: ; 8204 (2:4204)
+	db CH7
+	dw SFX_02_56_Ch1
+
+SFX_02_57: ; 8207 (2:4207)
+	db CH7
+	dw SFX_02_57_Ch1
+
+SFX_02_58: ; 820a (2:420a)
+	db ( $40 | CH4 )
+	dw SFX_02_58_Ch1
+	db CH5
+	dw SFX_02_58_Ch2
+
+SFX_02_59: ; 8210 (2:4210)
+	db ( $40 | CH4 )
+	dw SFX_02_59_Ch1
+	db CH5
+	dw SFX_02_59_Ch2
+
+SFX_02_5a: ; 8216 (2:4216)
+	db ( $40 | CH4 )
+	dw SFX_02_5a_Ch1
+	db CH5
+	dw SFX_02_5a_Ch2
+
+SFX_02_5b: ; 821c (2:421c)
+	db CH4
+	dw SFX_02_5b_Ch1
+
+SFX_02_5c: ; 821f (2:421f)
+	db CH7
+	dw SFX_02_5c_Ch1
+
+SFX_02_5d: ; 8222 (2:4222)
+	db ( $40 | CH4 )
+	dw SFX_02_5d_Ch1
+	db CH5
+	dw SFX_02_5d_Ch2
+
+SFX_02_5e: ; 8228 (2:4228)
+	db CH2
+	dw SFX_02_5e_Ch1
+
+SFX_02_5f: ; 822b (2:422b)
+	db CH4
+	dw SFX_02_5f_Ch1
+
+; 0x822e

music/headers/sfxheaders08.asm

@@ -0,0 +1,708 @@
+SFX_Headers_08:
+	db $ff, $ff, $ff ; padding
+
+SFX_08_01: ; 20003 (8:4003)
+	db CH7
+	dw SFX_08_01_Ch1
+
+SFX_08_02: ; 20006 (8:4006)
+	db CH7
+	dw SFX_08_02_Ch1
+
+SFX_08_03: ; 20009 (8:4009)
+	db CH7
+	dw SFX_08_03_Ch1
+
+SFX_08_04: ; 2000c (8:400c)
+	db CH7
+	dw SFX_08_04_Ch1
+
+SFX_08_05: ; 2000f (8:400f)
+	db CH7
+	dw SFX_08_05_Ch1
+
+SFX_08_06: ; 20012 (8:4012)
+	db CH7
+	dw SFX_08_06_Ch1
+
+SFX_08_07: ; 20015 (8:4015)
+	db CH7
+	dw SFX_08_07_Ch1
+
+SFX_08_08: ; 20018 (8:4018)
+	db CH7
+	dw SFX_08_08_Ch1
+
+SFX_08_09: ; 2001b (8:401b)
+	db CH7
+	dw SFX_08_09_Ch1
+
+SFX_08_0a: ; 2001e (8:401e)
+	db CH7
+	dw SFX_08_0a_Ch1
+
+SFX_08_0b: ; 20021 (8:4021)
+	db CH7
+	dw SFX_08_0b_Ch1
+
+SFX_08_0c: ; 20024 (8:4024)
+	db CH7
+	dw SFX_08_0c_Ch1
+
+SFX_08_0d: ; 20027 (8:4027)
+	db CH7
+	dw SFX_08_0d_Ch1
+
+SFX_08_0e: ; 2002a (8:402a)
+	db CH7
+	dw SFX_08_0e_Ch1
+
+SFX_08_0f: ; 2002d (8:402d)
+	db CH7
+	dw SFX_08_0f_Ch1
+
+SFX_08_10: ; 20030 (8:4030)
+	db CH7
+	dw SFX_08_10_Ch1
+
+SFX_08_11: ; 20033 (8:4033)
+	db CH7
+	dw SFX_08_11_Ch1
+
+SFX_08_12: ; 20036 (8:4036)
+	db CH7
+	dw SFX_08_12_Ch1
+
+SFX_08_13: ; 20039 (8:4039)
+	db CH7
+	dw SFX_08_13_Ch1
+
+SFX_08_14: ; 2003c (8:403c)
+	db ( $80 | CH4 )
+	dw SFX_08_14_Ch1
+	db CH5
+	dw SFX_08_14_Ch2
+	db CH7
+	dw SFX_08_14_Ch3
+
+SFX_08_15: ; 20045 (8:4045)
+	db ( $80 | CH4 )
+	dw SFX_08_15_Ch1
+	db CH5
+	dw SFX_08_15_Ch2
+	db CH7
+	dw SFX_08_15_Ch3
+
+SFX_08_16: ; 2004e (8:404e)
+	db ( $80 | CH4 )
+	dw SFX_08_16_Ch1
+	db CH5
+	dw SFX_08_16_Ch2
+	db CH7
+	dw SFX_08_16_Ch3
+
+SFX_08_17: ; 20057 (8:4057)
+	db ( $80 | CH4 )
+	dw SFX_08_17_Ch1
+	db CH5
+	dw SFX_08_17_Ch2
+	db CH7
+	dw SFX_08_17_Ch3
+
+SFX_08_18: ; 20060 (8:4060)
+	db ( $80 | CH4 )
+	dw SFX_08_18_Ch1
+	db CH5
+	dw SFX_08_18_Ch2
+	db CH7
+	dw SFX_08_18_Ch3
+
+SFX_08_19: ; 20069 (8:4069)
+	db ( $80 | CH4 )
+	dw SFX_08_19_Ch1
+	db CH5
+	dw SFX_08_19_Ch2
+	db CH7
+	dw SFX_08_19_Ch3
+
+SFX_08_1a: ; 20072 (8:4072)
+	db ( $80 | CH4 )
+	dw SFX_08_1a_Ch1
+	db CH5
+	dw SFX_08_1a_Ch2
+	db CH7
+	dw SFX_08_1a_Ch3
+
+SFX_08_1b: ; 2007b (8:407b)
+	db ( $80 | CH4 )
+	dw SFX_08_1b_Ch1
+	db CH5
+	dw SFX_08_1b_Ch2
+	db CH7
+	dw SFX_08_1b_Ch3
+
+SFX_08_1c: ; 20084 (8:4084)
+	db ( $80 | CH4 )
+	dw SFX_08_1c_Ch1
+	db CH5
+	dw SFX_08_1c_Ch2
+	db CH7
+	dw SFX_08_1c_Ch3
+
+SFX_08_1d: ; 2008d (8:408d)
+	db ( $80 | CH4 )
+	dw SFX_08_1d_Ch1
+	db CH5
+	dw SFX_08_1d_Ch2
+	db CH7
+	dw SFX_08_1d_Ch3
+
+SFX_08_1e: ; 20096 (8:4096)
+	db ( $80 | CH4 )
+	dw SFX_08_1e_Ch1
+	db CH5
+	dw SFX_08_1e_Ch2
+	db CH7
+	dw SFX_08_1e_Ch3
+
+SFX_08_1f: ; 2009f (8:409f)
+	db ( $80 | CH4 )
+	dw SFX_08_1f_Ch1
+	db CH5
+	dw SFX_08_1f_Ch2
+	db CH7
+	dw SFX_08_1f_Ch3
+
+SFX_08_20: ; 200a8 (8:40a8)
+	db ( $80 | CH4 )
+	dw SFX_08_20_Ch1
+	db CH5
+	dw SFX_08_20_Ch2
+	db CH7
+	dw SFX_08_20_Ch3
+
+SFX_08_21: ; 200b1 (8:40b1)
+	db ( $80 | CH4 )
+	dw SFX_08_21_Ch1
+	db CH5
+	dw SFX_08_21_Ch2
+	db CH7
+	dw SFX_08_21_Ch3
+
+SFX_08_22: ; 200ba (8:40ba)
+	db ( $80 | CH4 )
+	dw SFX_08_22_Ch1
+	db CH5
+	dw SFX_08_22_Ch2
+	db CH7
+	dw SFX_08_22_Ch3
+
+SFX_08_23: ; 200c3 (8:40c3)
+	db ( $80 | CH4 )
+	dw SFX_08_23_Ch1
+	db CH5
+	dw SFX_08_23_Ch2
+	db CH7
+	dw SFX_08_23_Ch3
+
+SFX_08_24: ; 200cc (8:40cc)
+	db ( $80 | CH4 )
+	dw SFX_08_24_Ch1
+	db CH5
+	dw SFX_08_24_Ch2
+	db CH7
+	dw SFX_08_24_Ch3
+
+SFX_08_25: ; 200d5 (8:40d5)
+	db ( $80 | CH4 )
+	dw SFX_08_25_Ch1
+	db CH5
+	dw SFX_08_25_Ch2
+	db CH7
+	dw SFX_08_25_Ch3
+
+SFX_08_26: ; 200de (8:40de)
+	db ( $80 | CH4 )
+	dw SFX_08_26_Ch1
+	db CH5
+	dw SFX_08_26_Ch2
+	db CH7
+	dw SFX_08_26_Ch3
+
+SFX_08_27: ; 200e7 (8:40e7)
+	db ( $80 | CH4 )
+	dw SFX_08_27_Ch1
+	db CH5
+	dw SFX_08_27_Ch2
+	db CH7
+	dw SFX_08_27_Ch3
+
+SFX_08_28: ; 200f0 (8:40f0)
+	db ( $80 | CH4 )
+	dw SFX_08_28_Ch1
+	db CH5
+	dw SFX_08_28_Ch2
+	db CH7
+	dw SFX_08_28_Ch3
+
+SFX_08_29: ; 200f9 (8:40f9)
+	db ( $80 | CH4 )
+	dw SFX_08_29_Ch1
+	db CH5
+	dw SFX_08_29_Ch2
+	db CH7
+	dw SFX_08_29_Ch3
+
+SFX_08_2a: ; 20102 (8:4102)
+	db ( $80 | CH4 )
+	dw SFX_08_2a_Ch1
+	db CH5
+	dw SFX_08_2a_Ch2
+	db CH7
+	dw SFX_08_2a_Ch3
+
+SFX_08_2b: ; 2010b (8:410b)
+	db ( $80 | CH4 )
+	dw SFX_08_2b_Ch1
+	db CH5
+	dw SFX_08_2b_Ch2
+	db CH7
+	dw SFX_08_2b_Ch3
+
+SFX_08_2c: ; 20114 (8:4114)
+	db ( $80 | CH4 )
+	dw SFX_08_2c_Ch1
+	db CH5
+	dw SFX_08_2c_Ch2
+	db CH7
+	dw SFX_08_2c_Ch3
+
+SFX_08_2d: ; 2011d (8:411d)
+	db ( $80 | CH4 )
+	dw SFX_08_2d_Ch1
+	db CH5
+	dw SFX_08_2d_Ch2
+	db CH7
+	dw SFX_08_2d_Ch3
+
+SFX_08_2e: ; 20126 (8:4126)
+	db ( $80 | CH4 )
+	dw SFX_08_2e_Ch1
+	db CH5
+	dw SFX_08_2e_Ch2
+	db CH7
+	dw SFX_08_2e_Ch3
+
+SFX_08_2f: ; 2012f (8:412f)
+	db ( $80 | CH4 )
+	dw SFX_08_2f_Ch1
+	db CH5
+	dw SFX_08_2f_Ch2
+	db CH7
+	dw SFX_08_2f_Ch3
+
+SFX_08_30: ; 20138 (8:4138)
+	db ( $80 | CH4 )
+	dw SFX_08_30_Ch1
+	db CH5
+	dw SFX_08_30_Ch2
+	db CH7
+	dw SFX_08_30_Ch3
+
+SFX_08_31: ; 20141 (8:4141)
+	db ( $80 | CH4 )
+	dw SFX_08_31_Ch1
+	db CH5
+	dw SFX_08_31_Ch2
+	db CH7
+	dw SFX_08_31_Ch3
+
+SFX_08_32: ; 2014a (8:414a)
+	db ( $80 | CH4 )
+	dw SFX_08_32_Ch1
+	db CH5
+	dw SFX_08_32_Ch2
+	db CH7
+	dw SFX_08_32_Ch3
+
+SFX_08_33: ; 20153 (8:4153)
+	db ( $80 | CH4 )
+	dw SFX_08_33_Ch1
+	db CH5
+	dw SFX_08_33_Ch2
+	db CH7
+	dw SFX_08_33_Ch3
+
+SFX_08_34: ; 2015c (8:415c)
+	db ( $80 | CH4 )
+	dw SFX_08_34_Ch1
+	db CH5
+	dw SFX_08_34_Ch2
+	db CH7
+	dw SFX_08_34_Ch3
+
+SFX_08_35: ; 20165 (8:4165)
+	db ( $80 | CH4 )
+	dw SFX_08_35_Ch1
+	db CH5
+	dw SFX_08_35_Ch2
+	db CH7
+	dw SFX_08_35_Ch3
+
+SFX_08_36: ; 2016e (8:416e)
+	db ( $80 | CH4 )
+	dw SFX_08_36_Ch1
+	db CH5
+	dw SFX_08_36_Ch2
+	db CH7
+	dw SFX_08_36_Ch3
+
+SFX_08_37: ; 20177 (8:4177)
+	db ( $80 | CH4 )
+	dw SFX_08_37_Ch1
+	db CH5
+	dw SFX_08_37_Ch2
+	db CH7
+	dw SFX_08_37_Ch3
+
+SFX_08_38: ; 20180 (8:4180)
+	db ( $80 | CH4 )
+	dw SFX_08_38_Ch1
+	db CH5
+	dw SFX_08_38_Ch2
+	db CH7
+	dw SFX_08_38_Ch3
+
+SFX_08_39: ; 20189 (8:4189)
+	db ( $80 | CH4 )
+	dw SFX_08_39_Ch1
+	db CH5
+	dw SFX_08_39_Ch2
+	db CH7
+	dw SFX_08_39_Ch3
+
+SFX_08_3a: ; 20192 (8:4192)
+	db ( $80 | CH4 )
+	dw SFX_08_3a_Ch1
+	db CH5
+	dw SFX_08_3a_Ch2
+	db CH6
+	dw SFX_08_3a_Ch3
+
+SFX_08_3b: ; 2019b (8:419b)
+	db ( $80 | CH4 )
+	dw SFX_08_3b_Ch1
+	db CH5
+	dw SFX_08_3b_Ch2
+	db CH6
+	dw SFX_08_3b_Ch3
+
+SFX_08_3c: ; 201a4 (8:41a4)
+	db CH4
+	dw SFX_08_3c_Ch1
+
+SFX_08_3d: ; 201a7 (8:41a7)
+	db CH4
+	dw SFX_08_3d_Ch1
+
+SFX_08_3e: ; 201aa (8:41aa)
+	db CH4
+	dw SFX_08_3e_Ch1
+
+SFX_08_3f: ; 201ad (8:41ad)
+	db CH7
+	dw SFX_08_3f_Ch1
+
+SFX_08_40: ; 201b0 (8:41b0)
+	db CH4
+	dw SFX_08_40_Ch1
+
+SFX_08_41: ; 201b3 (8:41b3)
+	db ( $40 | CH4 )
+	dw SFX_08_41_Ch1
+	db CH5
+	dw SFX_08_41_Ch2
+
+SFX_08_42: ; 201b9 (8:41b9)
+	db ( $40 | CH4 )
+	dw SFX_08_42_Ch1
+	db CH7
+	dw SFX_08_42_Ch2
+
+SFX_08_43: ; 201bf (8:41bf)
+	db ( $40 | CH4 )
+	dw SFX_08_43_Ch1
+	db CH7
+	dw SFX_08_43_Ch2
+
+SFX_08_44: ; 201c5 (8:41c5)
+	db CH7
+	dw SFX_08_44_Ch1
+
+SFX_08_45: ; 201c8 (8:41c8)
+	db ( $40 | CH4 )
+	dw SFX_08_45_Ch1
+	db CH5
+	dw SFX_08_45_Ch2
+
+SFX_08_46: ; 201ce (8:41ce)
+	db ( $80 | CH4 )
+	dw SFX_08_46_Ch1
+	db CH5
+	dw SFX_08_46_Ch2
+	db CH6
+	dw SFX_08_46_Ch3
+
+SFX_08_47: ; 201d7 (8:41d7)
+	db CH7
+	dw SFX_08_47_Ch1
+
+SFX_08_48: ; 201da (8:41da)
+	db CH4
+	dw SFX_08_48_Ch1
+
+SFX_08_49: ; 201dd (8:41dd)
+	db CH4
+	dw SFX_08_49_Ch1
+
+SFX_08_4a: ; 201e0 (8:41e0)
+	db CH7
+	dw SFX_08_4a_Ch1
+
+SFX_08_4b: ; 201e3 (8:41e3)
+	db CH7
+	dw SFX_08_4b_Ch1
+
+SFX_08_4c: ; 201e6 (8:41e6)
+	db CH7
+	dw SFX_08_4c_Ch1
+
+SFX_08_4d: ; 201e9 (8:41e9)
+	db CH7
+	dw SFX_08_4d_Ch1
+
+SFX_08_4e: ; 201ec (8:41ec)
+	db CH7
+	dw SFX_08_4e_Ch1
+
+SFX_08_4f: ; 201ef (8:41ef)
+	db CH7
+	dw SFX_08_4f_Ch1
+
+SFX_08_50: ; 201f2 (8:41f2)
+	db CH7
+	dw SFX_08_50_Ch1
+
+SFX_08_51: ; 201f5 (8:41f5)
+	db CH7
+	dw SFX_08_51_Ch1
+
+SFX_08_52: ; 201f8 (8:41f8)
+	db CH7
+	dw SFX_08_52_Ch1
+
+SFX_08_53: ; 201fb (8:41fb)
+	db CH7
+	dw SFX_08_53_Ch1
+
+SFX_08_54: ; 201fe (8:41fe)
+	db CH7
+	dw SFX_08_54_Ch1
+
+SFX_08_55: ; 20201 (8:4201)
+	db CH7
+	dw SFX_08_55_Ch1
+
+SFX_08_56: ; 20204 (8:4204)
+	db CH7
+	dw SFX_08_56_Ch1
+
+SFX_08_57: ; 20207 (8:4207)
+	db CH7
+	dw SFX_08_57_Ch1
+
+SFX_08_58: ; 2020a (8:420a)
+	db CH7
+	dw SFX_08_58_Ch1
+
+SFX_08_59: ; 2020d (8:420d)
+	db CH7
+	dw SFX_08_59_Ch1
+
+SFX_08_5a: ; 20210 (8:4210)
+	db CH7
+	dw SFX_08_5a_Ch1
+
+SFX_08_5b: ; 20213 (8:4213)
+	db CH7
+	dw SFX_08_5b_Ch1
+
+SFX_08_5c: ; 20216 (8:4216)
+	db CH7
+	dw SFX_08_5c_Ch1
+
+SFX_08_5d: ; 20219 (8:4219)
+	db CH7
+	dw SFX_08_5d_Ch1
+
+SFX_08_5e: ; 2021c (8:421c)
+	db ( $40 | CH4 )
+	dw SFX_08_5e_Ch1
+	db CH7
+	dw SFX_08_5e_Ch2
+
+SFX_08_5f: ; 20222 (8:4222)
+	db CH7
+	dw SFX_08_5f_Ch1
+
+SFX_08_60: ; 20225 (8:4225)
+	db CH7
+	dw SFX_08_60_Ch1
+
+SFX_08_61: ; 20228 (8:4228)
+	db CH7
+	dw SFX_08_61_Ch1
+
+SFX_08_62: ; 2022b (8:422b)
+	db CH7
+	dw SFX_08_62_Ch1
+
+SFX_08_63: ; 2022e (8:422e)
+	db CH7
+	dw SFX_08_63_Ch1
+
+SFX_08_64: ; 20231 (8:4231)
+	db ( $40 | CH4 )
+	dw SFX_08_64_Ch1
+	db CH7
+	dw SFX_08_64_Ch2
+
+SFX_08_65: ; 20237 (8:4237)
+	db CH7
+	dw SFX_08_65_Ch1
+
+SFX_08_66: ; 2023a (8:423a)
+	db CH7
+	dw SFX_08_66_Ch1
+
+SFX_08_67: ; 2023d (8:423d)
+	db ( $80 | CH4 )
+	dw SFX_08_67_Ch1
+	db CH5
+	dw SFX_08_67_Ch2
+	db CH7
+	dw SFX_08_67_Ch3
+
+SFX_08_68: ; 20246 (8:4246)
+	db ( $80 | CH4 )
+	dw SFX_08_68_Ch1
+	db CH5
+	dw SFX_08_68_Ch2
+	db CH7
+	dw SFX_08_68_Ch3
+
+SFX_08_69: ; 2024f (8:424f)
+	db ( $40 | CH4 )
+	dw SFX_08_69_Ch1
+	db CH7
+	dw SFX_08_69_Ch2
+
+SFX_08_6a: ; 20255 (8:4255)
+	db ( $80 | CH4 )
+	dw SFX_08_6a_Ch1
+	db CH5
+	dw SFX_08_6a_Ch2
+	db CH7
+	dw SFX_08_6a_Ch3
+
+SFX_08_6b: ; 2025e (8:425e)
+	db ( $40 | CH4 )
+	dw SFX_08_6b_Ch1
+	db CH7
+	dw SFX_08_6b_Ch2
+
+SFX_08_6c: ; 20264 (8:4264)
+	db ( $80 | CH4 )
+	dw SFX_08_6c_Ch1
+	db CH5
+	dw SFX_08_6c_Ch2
+	db CH7
+	dw SFX_08_6c_Ch3
+
+SFX_08_6d: ; 2026d (8:426d)
+	db ( $80 | CH4 )
+	dw SFX_08_6d_Ch1
+	db CH5
+	dw SFX_08_6d_Ch2
+	db CH7
+	dw SFX_08_6d_Ch3
+
+SFX_08_6e: ; 20276 (8:4276)
+	db ( $80 | CH4 )
+	dw SFX_08_6e_Ch1
+	db CH5
+	dw SFX_08_6e_Ch2
+	db CH7
+	dw SFX_08_6e_Ch3
+
+SFX_08_6f: ; 2027f (8:427f)
+	db ( $80 | CH4 )
+	dw SFX_08_6f_Ch1
+	db CH5
+	dw SFX_08_6f_Ch2
+	db CH7
+	dw SFX_08_6f_Ch3
+
+SFX_08_70: ; 20288 (8:4288)
+	db ( $80 | CH4 )
+	dw SFX_08_70_Ch1
+	db CH5
+	dw SFX_08_70_Ch2
+	db CH7
+	dw SFX_08_70_Ch3
+
+SFX_08_71: ; 20291 (8:4291)
+	db ( $40 | CH4 )
+	dw SFX_08_71_Ch1
+	db CH5
+	dw SFX_08_71_Ch2
+
+SFX_08_72: ; 20297 (8:4297)
+	db ( $40 | CH4 )
+	dw SFX_08_72_Ch1
+	db CH5
+	dw SFX_08_72_Ch2
+
+SFX_08_73: ; 2029d (8:429d)
+	db ( $40 | CH4 )
+	dw SFX_08_73_Ch1
+	db CH5
+	dw SFX_08_73_Ch2
+
+SFX_08_74: ; 202a3 (8:42a3)
+	db ( $80 | CH4 )
+	dw SFX_08_74_Ch1
+	db CH5
+	dw SFX_08_74_Ch2
+	db CH7
+	dw SFX_08_74_Ch3
+
+SFX_08_75: ; 202ac (8:42ac)
+	db ( $40 | CH4 )
+	dw SFX_08_75_Ch1
+	db CH5
+	dw SFX_08_75_Ch2
+
+SFX_08_76: ; 202b2 (8:42b2)
+	db ( $80 | CH4 )
+	dw SFX_08_76_Ch1
+	db CH5
+	dw SFX_08_76_Ch2
+	db CH7
+	dw SFX_08_76_Ch3
+
+SFX_08_77: ; 202bb (8:42bb)
+	db CH4
+	dw SFX_08_77_Ch1
+
+; 0x202be

music/headers/sfxheaders1f.asm

@@ -0,0 +1,598 @@
+SFX_Headers_1f:
+	db $ff, $ff, $ff ; padding
+
+SFX_1f_01: ; 7c003 (1f:4003)
+	db CH7
+	dw SFX_1f_01_Ch1
+
+SFX_1f_02: ; 7c006 (1f:4006)
+	db CH7
+	dw SFX_1f_02_Ch1
+
+SFX_1f_03: ; 7c009 (1f:4009)
+	db CH7
+	dw SFX_1f_03_Ch1
+
+SFX_1f_04: ; 7c00c (1f:400c)
+	db CH7
+	dw SFX_1f_04_Ch1
+
+SFX_1f_05: ; 7c00f (1f:400f)
+	db CH7
+	dw SFX_1f_05_Ch1
+
+SFX_1f_06: ; 7c012 (1f:4012)
+	db CH7
+	dw SFX_1f_06_Ch1
+
+SFX_1f_07: ; 7c015 (1f:4015)
+	db CH7
+	dw SFX_1f_07_Ch1
+
+SFX_1f_08: ; 7c018 (1f:4018)
+	db CH7
+	dw SFX_1f_08_Ch1
+
+SFX_1f_09: ; 7c01b (1f:401b)
+	db CH7
+	dw SFX_1f_09_Ch1
+
+SFX_1f_0a: ; 7c01e (1f:401e)
+	db CH7
+	dw SFX_1f_0a_Ch1
+
+SFX_1f_0b: ; 7c021 (1f:4021)
+	db CH7
+	dw SFX_1f_0b_Ch1
+
+SFX_1f_0c: ; 7c024 (1f:4024)
+	db CH7
+	dw SFX_1f_0c_Ch1
+
+SFX_1f_0d: ; 7c027 (1f:4027)
+	db CH7
+	dw SFX_1f_0d_Ch1
+
+SFX_1f_0e: ; 7c02a (1f:402a)
+	db CH7
+	dw SFX_1f_0e_Ch1
+
+SFX_1f_0f: ; 7c02d (1f:402d)
+	db CH7
+	dw SFX_1f_0f_Ch1
+
+SFX_1f_10: ; 7c030 (1f:4030)
+	db CH7
+	dw SFX_1f_10_Ch1
+
+SFX_1f_11: ; 7c033 (1f:4033)
+	db CH7
+	dw SFX_1f_11_Ch1
+
+SFX_1f_12: ; 7c036 (1f:4036)
+	db CH7
+	dw SFX_1f_12_Ch1
+
+SFX_1f_13: ; 7c039 (1f:4039)
+	db CH7
+	dw SFX_1f_13_Ch1
+
+SFX_1f_14: ; 7c03c (1f:403c)
+	db ( $80 | CH4 )
+	dw SFX_1f_14_Ch1
+	db CH5
+	dw SFX_1f_14_Ch2
+	db CH7
+	dw SFX_1f_14_Ch3
+
+SFX_1f_15: ; 7c045 (1f:4045)
+	db ( $80 | CH4 )
+	dw SFX_1f_15_Ch1
+	db CH5
+	dw SFX_1f_15_Ch2
+	db CH7
+	dw SFX_1f_15_Ch3
+
+SFX_1f_16: ; 7c04e (1f:404e)
+	db ( $80 | CH4 )
+	dw SFX_1f_16_Ch1
+	db CH5
+	dw SFX_1f_16_Ch2
+	db CH7
+	dw SFX_1f_16_Ch3
+
+SFX_1f_17: ; 7c057 (1f:4057)
+	db ( $80 | CH4 )
+	dw SFX_1f_17_Ch1
+	db CH5
+	dw SFX_1f_17_Ch2
+	db CH7
+	dw SFX_1f_17_Ch3
+
+SFX_1f_18: ; 7c060 (1f:4060)
+	db ( $80 | CH4 )
+	dw SFX_1f_18_Ch1
+	db CH5
+	dw SFX_1f_18_Ch2
+	db CH7
+	dw SFX_1f_18_Ch3
+
+SFX_1f_19: ; 7c069 (1f:4069)
+	db ( $80 | CH4 )
+	dw SFX_1f_19_Ch1
+	db CH5
+	dw SFX_1f_19_Ch2
+	db CH7
+	dw SFX_1f_19_Ch3
+
+SFX_1f_1a: ; 7c072 (1f:4072)
+	db ( $80 | CH4 )
+	dw SFX_1f_1a_Ch1
+	db CH5
+	dw SFX_1f_1a_Ch2
+	db CH7
+	dw SFX_1f_1a_Ch3
+
+SFX_1f_1b: ; 7c07b (1f:407b)
+	db ( $80 | CH4 )
+	dw SFX_1f_1b_Ch1
+	db CH5
+	dw SFX_1f_1b_Ch2
+	db CH7
+	dw SFX_1f_1b_Ch3
+
+SFX_1f_1c: ; 7c084 (1f:4084)
+	db ( $80 | CH4 )
+	dw SFX_1f_1c_Ch1
+	db CH5
+	dw SFX_1f_1c_Ch2
+	db CH7
+	dw SFX_1f_1c_Ch3
+
+SFX_1f_1d: ; 7c08d (1f:408d)
+	db ( $80 | CH4 )
+	dw SFX_1f_1d_Ch1
+	db CH5
+	dw SFX_1f_1d_Ch2
+	db CH7
+	dw SFX_1f_1d_Ch3
+
+SFX_1f_1e: ; 7c096 (1f:4096)
+	db ( $80 | CH4 )
+	dw SFX_1f_1e_Ch1
+	db CH5
+	dw SFX_1f_1e_Ch2
+	db CH7
+	dw SFX_1f_1e_Ch3
+
+SFX_1f_1f: ; 7c09f (1f:409f)
+	db ( $80 | CH4 )
+	dw SFX_1f_1f_Ch1
+	db CH5
+	dw SFX_1f_1f_Ch2
+	db CH7
+	dw SFX_1f_1f_Ch3
+
+SFX_1f_20: ; 7c0a8 (1f:40a8)
+	db ( $80 | CH4 )
+	dw SFX_1f_20_Ch1
+	db CH5
+	dw SFX_1f_20_Ch2
+	db CH7
+	dw SFX_1f_20_Ch3
+
+SFX_1f_21: ; 7c0b1 (1f:40b1)
+	db ( $80 | CH4 )
+	dw SFX_1f_21_Ch1
+	db CH5
+	dw SFX_1f_21_Ch2
+	db CH7
+	dw SFX_1f_21_Ch3
+
+SFX_1f_22: ; 7c0ba (1f:40ba)
+	db ( $80 | CH4 )
+	dw SFX_1f_22_Ch1
+	db CH5
+	dw SFX_1f_22_Ch2
+	db CH7
+	dw SFX_1f_22_Ch3
+
+SFX_1f_23: ; 7c0c3 (1f:40c3)
+	db ( $80 | CH4 )
+	dw SFX_1f_23_Ch1
+	db CH5
+	dw SFX_1f_23_Ch2
+	db CH7
+	dw SFX_1f_23_Ch3
+
+SFX_1f_24: ; 7c0cc (1f:40cc)
+	db ( $80 | CH4 )
+	dw SFX_1f_24_Ch1
+	db CH5
+	dw SFX_1f_24_Ch2
+	db CH7
+	dw SFX_1f_24_Ch3
+
+SFX_1f_25: ; 7c0d5 (1f:40d5)
+	db ( $80 | CH4 )
+	dw SFX_1f_25_Ch1
+	db CH5
+	dw SFX_1f_25_Ch2
+	db CH7
+	dw SFX_1f_25_Ch3
+
+SFX_1f_26: ; 7c0de (1f:40de)
+	db ( $80 | CH4 )
+	dw SFX_1f_26_Ch1
+	db CH5
+	dw SFX_1f_26_Ch2
+	db CH7
+	dw SFX_1f_26_Ch3
+
+SFX_1f_27: ; 7c0e7 (1f:40e7)
+	db ( $80 | CH4 )
+	dw SFX_1f_27_Ch1
+	db CH5
+	dw SFX_1f_27_Ch2
+	db CH7
+	dw SFX_1f_27_Ch3
+
+SFX_1f_28: ; 7c0f0 (1f:40f0)
+	db ( $80 | CH4 )
+	dw SFX_1f_28_Ch1
+	db CH5
+	dw SFX_1f_28_Ch2
+	db CH7
+	dw SFX_1f_28_Ch3
+
+SFX_1f_29: ; 7c0f9 (1f:40f9)
+	db ( $80 | CH4 )
+	dw SFX_1f_29_Ch1
+	db CH5
+	dw SFX_1f_29_Ch2
+	db CH7
+	dw SFX_1f_29_Ch3
+
+SFX_1f_2a: ; 7c102 (1f:4102)
+	db ( $80 | CH4 )
+	dw SFX_1f_2a_Ch1
+	db CH5
+	dw SFX_1f_2a_Ch2
+	db CH7
+	dw SFX_1f_2a_Ch3
+
+SFX_1f_2b: ; 7c10b (1f:410b)
+	db ( $80 | CH4 )
+	dw SFX_1f_2b_Ch1
+	db CH5
+	dw SFX_1f_2b_Ch2
+	db CH7
+	dw SFX_1f_2b_Ch3
+
+SFX_1f_2c: ; 7c114 (1f:4114)
+	db ( $80 | CH4 )
+	dw SFX_1f_2c_Ch1
+	db CH5
+	dw SFX_1f_2c_Ch2
+	db CH7
+	dw SFX_1f_2c_Ch3
+
+SFX_1f_2d: ; 7c11d (1f:411d)
+	db ( $80 | CH4 )
+	dw SFX_1f_2d_Ch1
+	db CH5
+	dw SFX_1f_2d_Ch2
+	db CH7
+	dw SFX_1f_2d_Ch3
+
+SFX_1f_2e: ; 7c126 (1f:4126)
+	db ( $80 | CH4 )
+	dw SFX_1f_2e_Ch1
+	db CH5
+	dw SFX_1f_2e_Ch2
+	db CH7
+	dw SFX_1f_2e_Ch3
+
+SFX_1f_2f: ; 7c12f (1f:412f)
+	db ( $80 | CH4 )
+	dw SFX_1f_2f_Ch1
+	db CH5
+	dw SFX_1f_2f_Ch2
+	db CH7
+	dw SFX_1f_2f_Ch3
+
+SFX_1f_30: ; 7c138 (1f:4138)
+	db ( $80 | CH4 )
+	dw SFX_1f_30_Ch1
+	db CH5
+	dw SFX_1f_30_Ch2
+	db CH7
+	dw SFX_1f_30_Ch3
+
+SFX_1f_31: ; 7c141 (1f:4141)
+	db ( $80 | CH4 )
+	dw SFX_1f_31_Ch1
+	db CH5
+	dw SFX_1f_31_Ch2
+	db CH7
+	dw SFX_1f_31_Ch3
+
+SFX_1f_32: ; 7c14a (1f:414a)
+	db ( $80 | CH4 )
+	dw SFX_1f_32_Ch1
+	db CH5
+	dw SFX_1f_32_Ch2
+	db CH7
+	dw SFX_1f_32_Ch3
+
+SFX_1f_33: ; 7c153 (1f:4153)
+	db ( $80 | CH4 )
+	dw SFX_1f_33_Ch1
+	db CH5
+	dw SFX_1f_33_Ch2
+	db CH7
+	dw SFX_1f_33_Ch3
+
+SFX_1f_34: ; 7c15c (1f:415c)
+	db ( $80 | CH4 )
+	dw SFX_1f_34_Ch1
+	db CH5
+	dw SFX_1f_34_Ch2
+	db CH7
+	dw SFX_1f_34_Ch3
+
+SFX_1f_35: ; 7c165 (1f:4165)
+	db ( $80 | CH4 )
+	dw SFX_1f_35_Ch1
+	db CH5
+	dw SFX_1f_35_Ch2
+	db CH7
+	dw SFX_1f_35_Ch3
+
+SFX_1f_36: ; 7c16e (1f:416e)
+	db ( $80 | CH4 )
+	dw SFX_1f_36_Ch1
+	db CH5
+	dw SFX_1f_36_Ch2
+	db CH7
+	dw SFX_1f_36_Ch3
+
+SFX_1f_37: ; 7c177 (1f:4177)
+	db ( $80 | CH4 )
+	dw SFX_1f_37_Ch1
+	db CH5
+	dw SFX_1f_37_Ch2
+	db CH7
+	dw SFX_1f_37_Ch3
+
+SFX_1f_38: ; 7c180 (1f:4180)
+	db ( $80 | CH4 )
+	dw SFX_1f_38_Ch1
+	db CH5
+	dw SFX_1f_38_Ch2
+	db CH7
+	dw SFX_1f_38_Ch3
+
+SFX_1f_39: ; 7c189 (1f:4189)
+	db ( $80 | CH4 )
+	dw SFX_1f_39_Ch1
+	db CH5
+	dw SFX_1f_39_Ch2
+	db CH7
+	dw SFX_1f_39_Ch3
+
+SFX_1f_3a: ; 7c192 (1f:4192)
+	db ( $80 | CH4 )
+	dw SFX_1f_3a_Ch1
+	db CH5
+	dw SFX_1f_3a_Ch2
+	db CH6
+	dw SFX_1f_3a_Ch3
+
+SFX_1f_3b: ; 7c19b (1f:419b)
+	db ( $80 | CH4 )
+	dw SFX_1f_3b_Ch1
+	db CH5
+	dw SFX_1f_3b_Ch2
+	db CH6
+	dw SFX_1f_3b_Ch3
+
+SFX_1f_3c: ; 7c1a4 (1f:41a4)
+	db CH4
+	dw SFX_1f_3c_Ch1
+
+SFX_1f_3d: ; 7c1a7 (1f:41a7)
+	db CH4
+	dw SFX_1f_3d_Ch1
+
+SFX_1f_3e: ; 7c1aa (1f:41aa)
+	db CH4
+	dw SFX_1f_3e_Ch1
+
+SFX_1f_3f: ; 7c1ad (1f:41ad)
+	db CH7
+	dw SFX_1f_3f_Ch1
+
+SFX_1f_40: ; 7c1b0 (1f:41b0)
+	db CH4
+	dw SFX_1f_40_Ch1
+
+SFX_1f_41: ; 7c1b3 (1f:41b3)
+	db ( $80 | CH4 )
+	dw SFX_1f_41_Ch1
+	db CH5
+	dw SFX_1f_41_Ch2
+	db CH6
+	dw SFX_1f_41_Ch3
+
+SFX_1f_42: ; 7c1bc (1f:41bc)
+	db ( $80 | CH4 )
+	dw SFX_1f_42_Ch1
+	db CH5
+	dw SFX_1f_42_Ch2
+	db CH6
+	dw SFX_1f_42_Ch3
+
+SFX_1f_43: ; 7c1c5 (1f:41c5)
+	db CH4
+	dw SFX_1f_43_Ch1
+
+SFX_1f_44: ; 7c1c8 (1f:41c8)
+	db CH4
+	dw SFX_1f_44_Ch1
+
+SFX_1f_45: ; 7c1cb (1f:41cb)
+	db CH4
+	dw SFX_1f_45_Ch1
+
+SFX_1f_46: ; 7c1ce (1f:41ce)
+	db CH4
+	dw SFX_1f_46_Ch1
+
+SFX_1f_47: ; 7c1d1 (1f:41d1)
+	db CH4
+	dw SFX_1f_47_Ch1
+
+SFX_1f_48: ; 7c1d4 (1f:41d4)
+	db CH4
+	dw SFX_1f_48_Ch1
+
+SFX_1f_49: ; 7c1d7 (1f:41d7)
+	db CH4
+	dw SFX_1f_49_Ch1
+
+SFX_1f_4a: ; 7c1da (1f:41da)
+	db CH4
+	dw SFX_1f_4a_Ch1
+
+SFX_1f_4b: ; 7c1dd (1f:41dd)
+	db CH4
+	dw SFX_1f_4b_Ch1
+
+SFX_1f_4c: ; 7c1e0 (1f:41e0)
+	db CH4
+	dw SFX_1f_4c_Ch1
+
+SFX_1f_4d: ; 7c1e3 (1f:41e3)
+	db CH4
+	dw SFX_1f_4d_Ch1
+
+SFX_1f_4e: ; 7c1e6 (1f:41e6)
+	db CH4
+	dw SFX_1f_4e_Ch1
+
+SFX_1f_4f: ; 7c1e9 (1f:41e9)
+	db CH7
+	dw SFX_1f_4f_Ch1
+
+SFX_1f_50: ; 7c1ec (1f:41ec)
+	db CH7
+	dw SFX_1f_50_Ch1
+
+SFX_1f_51: ; 7c1ef (1f:41ef)
+	db ( $40 | CH4 )
+	dw SFX_1f_51_Ch1
+	db CH5
+	dw SFX_1f_51_Ch2
+
+SFX_1f_52: ; 7c1f5 (1f:41f5)
+	db CH4
+	dw SFX_1f_52_Ch1
+
+SFX_1f_53: ; 7c1f8 (1f:41f8)
+	db CH7
+	dw SFX_1f_53_Ch1
+
+SFX_1f_54: ; 7c1fb (1f:41fb)
+	db ( $40 | CH4 )
+	dw SFX_1f_54_Ch1
+	db CH5
+	dw SFX_1f_54_Ch2
+
+SFX_1f_55: ; 7c201 (1f:4201)
+	db CH4
+	dw SFX_1f_55_Ch1
+
+SFX_1f_56: ; 7c204 (1f:4204)
+	db CH7
+	dw SFX_1f_56_Ch1
+
+SFX_1f_57: ; 7c207 (1f:4207)
+	db CH7
+	dw SFX_1f_57_Ch1
+
+SFX_1f_58: ; 7c20a (1f:420a)
+	db ( $40 | CH4 )
+	dw SFX_1f_58_Ch1
+	db CH5
+	dw SFX_1f_58_Ch2
+
+SFX_1f_59: ; 7c210 (1f:4210)
+	db ( $40 | CH4 )
+	dw SFX_1f_59_Ch1
+	db CH5
+	dw SFX_1f_59_Ch2
+
+SFX_1f_5a: ; 7c216 (1f:4216)
+	db ( $40 | CH4 )
+	dw SFX_1f_5a_Ch1
+	db CH5
+	dw SFX_1f_5a_Ch2
+
+SFX_1f_5b: ; 7c21c (1f:421c)
+	db CH4
+	dw SFX_1f_5b_Ch1
+
+SFX_1f_5c: ; 7c21f (1f:421f)
+	db CH7
+	dw SFX_1f_5c_Ch1
+
+SFX_1f_5d: ; 7c222 (1f:4222)
+	db ( $40 | CH4 )
+	dw SFX_1f_5d_Ch1
+	db CH5
+	dw SFX_1f_5d_Ch2
+
+SFX_1f_5e: ; 7c228 (1f:4228)
+	db CH7
+	dw SFX_1f_5e_Ch1
+
+SFX_1f_5f: ; 7c22b (1f:422b)
+	db CH4
+	dw SFX_1f_5f_Ch1
+
+SFX_1f_60: ; 7c22e (1f:422e)
+	db CH4
+	dw SFX_1f_60_Ch1
+
+SFX_1f_61: ; 7c231 (1f:4231)
+	db CH7
+	dw SFX_1f_61_Ch1
+
+SFX_1f_62: ; 7c234 (1f:4234)
+	db CH7
+	dw SFX_1f_62_Ch1
+
+SFX_1f_63: ; 7c237 (1f:4237)
+	db CH7
+	dw SFX_1f_63_Ch1
+
+SFX_1f_64: ; 7c23a (1f:423a)
+	db CH4
+	dw SFX_1f_64_Ch1
+
+SFX_1f_65: ; 7c23d (1f:423d)
+	db CH4
+	dw SFX_1f_65_Ch1
+
+SFX_1f_66: ; 7c240 (1f:4240)
+	db ( $40 | CH4 )
+	dw SFX_1f_66_Ch1
+	db CH5
+	dw SFX_1f_66_Ch2
+
+SFX_1f_67: ; 7c246 (1f:4246)
+	db CH4
+	dw SFX_1f_67_Ch1
+
+; 0x7c249

music/indigoplateau.asm

@@ -0,0 +1,322 @@
+Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0)
+	tempo 0, 132
+	stereopanning 119
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 2
+	octave 2
+	note A_, 8
+	note A_, 8
+	note A_, 8
+	note A_, 4
+	notetype 12, 10, 4
+	note A#, 4
+
+Music_IndigoPlateau_branch_a605:
+	callchannel Music_IndigoPlateau_branch_a659
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	callchannel Music_IndigoPlateau_branch_a659
+	notetype 12, 11, 4
+	octave 3
+	note D#, 4
+	callchannel Music_IndigoPlateau_branch_a659
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	callchannel Music_IndigoPlateau_branch_a659
+	notetype 12, 10, 0
+	octave 2
+	note A#, 4
+	callchannel Music_IndigoPlateau_branch_a659
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	notetype 12, 13, 4
+	octave 3
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	notetype 12, 11, 4
+	octave 3
+	note D#, 4
+	notetype 12, 13, 4
+	octave 3
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	notetype 12, 11, 4
+	octave 3
+	note F_, 2
+	notetype 12, 11, 4
+	octave 3
+	note G_, 2
+	notetype 12, 11, 0
+	note A_, 8
+	octave 2
+	note A_, 8
+	notetype 12, 11, 7
+	octave 3
+	note F_, 8
+	notetype 12, 4, 14
+	octave 2
+	note A#, 8
+	loopchannel 0, Music_IndigoPlateau_branch_a605
+
+Music_IndigoPlateau_branch_a659:
+	notetype 12, 11, 2
+	octave 2
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	note A_, 4
+	endchannel
+
+
+Music_IndigoPlateau_Ch2: ; a664 (2:6664)
+	duty 3
+	vibrato 8, 2, 5
+	notetype 12, 12, 2
+	octave 3
+	note D_, 8
+	note D_, 8
+	note D_, 8
+	note D_, 4
+	notetype 12, 5, 10
+	note D#, 4
+
+Music_IndigoPlateau_branch_a673:
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	note A_, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	note A#, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	note A_, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 7
+	note C#, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	note A_, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	note A#, 4
+	callchannel Music_IndigoPlateau_branch_a6af
+	notetype 12, 12, 5
+	octave 4
+	note C_, 2
+	notetype 12, 12, 7
+	octave 4
+	note C#, 2
+	note D_, 8
+	octave 3
+	note D_, 8
+	octave 4
+	note C_, 8
+	notetype 12, 4, 13
+	octave 4
+	note D#, 8
+	loopchannel 0, Music_IndigoPlateau_branch_a673
+
+Music_IndigoPlateau_branch_a6af:
+	notetype 12, 12, 2
+	octave 3
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	endchannel
+
+
+Music_IndigoPlateau_Ch3: ; a6ba (2:66ba)
+	notetype 12, 1, 0
+	octave 4
+	note D_, 2
+	rest 6
+	note D_, 2
+	rest 6
+	note D_, 2
+	rest 6
+	note D_, 2
+	rest 2
+	note D#, 4
+
+Music_IndigoPlateau_branch_a6c6:
+	callchannel Music_IndigoPlateau_branch_a6fe
+	callchannel Music_IndigoPlateau_branch_a6fe
+	callchannel Music_IndigoPlateau_branch_a6fe
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note F#, 4
+	callchannel Music_IndigoPlateau_branch_a6fe
+	callchannel Music_IndigoPlateau_branch_a6fe
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note A#, 1
+	rest 1
+	note A#, 1
+	rest 1
+	note A_, 8
+	note D_, 8
+	note A#, 8
+	note D#, 8
+	loopchannel 0, Music_IndigoPlateau_branch_a6c6
+
+Music_IndigoPlateau_branch_a6fe:
+	octave 4
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note D_, 2
+	rest 2
+	note A_, 4
+	endchannel
+
+
+Music_IndigoPlateau_Ch4: ; a70f (2:670f)
+	dspeed 6
+	dnote 16, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+
+Music_IndigoPlateau_branch_a728:
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a77e
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a7a8
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a77e
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a7a8
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a77e
+	callchannel Music_IndigoPlateau_branch_a791
+	callchannel Music_IndigoPlateau_branch_a7a8
+	callchannel Music_IndigoPlateau_branch_a77e
+	callchannel Music_IndigoPlateau_branch_a7a8
+	dnote 16, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 8, mutedsnare3
+	dnote 16, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	loopchannel 0, Music_IndigoPlateau_branch_a728
+
+Music_IndigoPlateau_branch_a77e:
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare4
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare4
+	dnote 2, mutedsnare4
+	dnote 2, mutedsnare3
+	endchannel
+
+Music_IndigoPlateau_branch_a791:
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare4
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	endchannel
+
+Music_IndigoPlateau_branch_a7a8:
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	endchannel
+; 0xa7c5

music/introbattle.asm

@@ -0,0 +1,330 @@
+Music_IntroBattle_Ch1: ; 7f844 (1f:7844)
+	tempo 0, 98
+	stereopanning 119
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 1
+	rest 8
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D#, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 10, 0
+	note A#, 4
+	notetype 12, 11, 1
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 2, 9
+	octave 3
+	note G_, 4
+	notetype 12, 11, 0
+	note A_, 8
+	octave 2
+	note A_, 8
+	notetype 12, 11, 7
+	octave 3
+	note F_, 8
+	notetype 12, 4, 15
+	octave 2
+	note F_, 8
+	notetype 12, 11, 1
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D_, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note D#, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note F_, 4
+	notetype 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	notetype 12, 11, 4
+	octave 3
+	note G_, 4
+	notetype 12, 11, 0
+	note F#, 16
+	notetype 12, 11, 1
+	octave 4
+	note D_, 16
+	endchannel
+
+
+Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc)
+	duty 3
+	vibrato 8, 2, 5
+	notetype 12, 12, 2
+	rest 8
+	octave 3
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A_, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A#, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A_, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 11, 7
+	note C#, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A_, 4
+	notetype 12, 12, 2
+	octave 3
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 7
+	octave 4
+	note C#, 4
+	note D_, 8
+	octave 3
+	note D_, 8
+	octave 4
+	note C_, 8
+	octave 3
+	note C_, 8
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A_, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	note A#, 4
+	notetype 12, 12, 2
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	octave 4
+	note C_, 4
+	notetype 12, 12, 2
+	octave 3
+	note D_, 2
+	note D_, 2
+	notetype 12, 12, 5
+	octave 4
+	note C#, 4
+	notetype 12, 2, 15
+	note D_, 16
+	notetype 12, 12, 1
+	octave 5
+	note D_, 16
+	endchannel
+
+
+Music_IntroBattle_Ch3: ; 7f91d (1f:791d)
+	notetype 12, 1, 0
+	rest 8
+	octave 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A#, 4
+	note A_, 8
+	note D_, 8
+	note A#, 8
+	note D_, 8
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A_, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A#, 4
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note A#, 4
+	note A_, 16
+	note D_, 1
+	rest 15
+	endchannel
+
+
+Music_IntroBattle_Ch4: ; 7f95b (1f:795b)
+	dspeed 6
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 16, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 1, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 16, mutedsnare2
+	dnote 2, mutedsnare2
+	rest 16
+	rest 14
+	endchannel
+; 0x7fa19

music/jigglypuffsong.asm

@@ -0,0 +1,41 @@
+Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d)
+	tempo 0, 144
+	stereopanning 119
+	vibrato 8, 2, 4
+	duty 2
+	dutycycle 165
+	unknownmusic0xe8
+	notetype 13, 6, 7
+	octave 4
+	note E_, 8
+	notetype 12, 6, 7
+	note B_, 2
+	note G#, 6
+	note F#, 8
+	note G#, 2
+	note A_, 6
+	note G#, 8
+	note F#, 4
+	note G#, 4
+	note E_, 10
+	endchannel
+
+
+Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a)
+	vibrato 5, 1, 5
+	duty 2
+	dutycycle 10
+	notetype 12, 10, 7
+	octave 4
+	note E_, 8
+	note B_, 2
+	note G#, 6
+	note F#, 8
+	note G#, 2
+	note A_, 6
+	note G#, 8
+	note F#, 4
+	note G#, 4
+	note E_, 10
+	endchannel
+; 0x7fbaf

music/lavender.asm

@@ -0,0 +1,200 @@
+Music_Lavender_Ch1: ; bb58 (2:7b58)
+	tempo 0, 152
+	stereopanning 119
+	duty 1
+	unknownmusic0xe8
+	vibrato 0, 8, 8
+	notetype 12, 8, 7
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	notetype 12, 10, 7
+
+Music_Lavender_branch_bb6b:
+	octave 3
+	note G_, 8
+	note G_, 8
+	note E_, 8
+	note E_, 8
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note C#, 8
+	note G_, 8
+	note G_, 8
+	note F#, 8
+	note F#, 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 4
+	note C_, 8
+	note C_, 8
+	octave 3
+	note G_, 8
+	note G_, 8
+	note E_, 8
+	note E_, 8
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 4
+	note C#, 8
+	note C#, 8
+	note G_, 8
+	note G_, 8
+	note F#, 8
+	note F#, 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note C_, 8
+	note C_, 8
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	loopchannel 0, Music_Lavender_branch_bb6b
+
+
+Music_Lavender_Ch2: ; bb9e (2:7b9e)
+	vibrato 0, 3, 4
+	duty 3
+	notetype 12, 9, 1
+
+Music_Lavender_branch_bba5:
+	octave 5
+	note C_, 4
+	note G_, 4
+	note B_, 4
+	note F#, 4
+	loopchannel 0, Music_Lavender_branch_bba5
+
+
+Music_Lavender_Ch3: ; bbae (2:7bae)
+	vibrato 4, 1, 1
+	notetype 12, 3, 5
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	notetype 12, 2, 5
+
+Music_Lavender_branch_bbb9:
+	octave 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	notetype 12, 3, 5
+	octave 6
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	notetype 12, 2, 5
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 7
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	note E_, 16
+	note D_, 16
+	note C_, 16
+	note E_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 4
+	notetype 12, 2, 5
+	octave 6
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 7
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 8
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	octave 4
+	note E_, 4
+	note G_, 4
+	note F#, 4
+	note B_, 4
+	loopchannel 0, Music_Lavender_branch_bbb9
+
+
+Music_Lavender_Ch4: ; bc21 (2:7c21)
+	dspeed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+
+Music_Lavender_branch_bc26:
+	dnote 8, triangle2
+	dnote 8, triangle2
+	loopchannel 0, Music_Lavender_branch_bc26
+; 0xbc2e

music/meeteviltrainer.asm

@@ -0,0 +1,81 @@
+Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d)
+	tempo 0, 124
+	stereopanning 119
+	duty 2
+	unknownmusic0xe8
+	notetype 12, 11, 1
+	rest 4
+	octave 3
+	note D_, 2
+	note C#, 2
+	notetype 12, 4, 15
+	note D_, 4
+
+Music_MeetEvilTrainer_branch_7f6ae:
+	notetype 12, 10, 1
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	notetype 12, 7, 0
+	note D_, 4
+	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
+
+
+Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba)
+	duty 1
+	notetype 12, 11, 6
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 8
+
+Music_MeetEvilTrainer_branch_7f6c2:
+	notetype 12, 12, 2
+	octave 4
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
+	octave 3
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	notetype 12, 4, 15
+	note A#, 4
+	notetype 12, 12, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	notetype 12, 3, 15
+	note A#, 4
+	notetype 12, 12, 2
+	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
+
+
+Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6)
+	notetype 12, 1, 0
+	rest 8
+	octave 4
+	note F#, 1
+	rest 1
+	note F_, 1
+	rest 1
+
+Music_MeetEvilTrainer_branch_7f6ee:
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note A#, 4
+	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
+; 0x7f6f9

music/meetfemaletrainer.asm

@@ -0,0 +1,119 @@
+Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9)
+	tempo 0, 124
+	stereopanning 119
+	duty 1
+	unknownmusic0xe8
+	notetype 12, 11, 2
+	octave 3
+	note G#, 6
+	octave 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	notetype 12, 8, 1
+
+Music_MeetFemaleTrainer_branch_7f70c:
+	octave 3
+	note E_, 4
+	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
+	note E_, 4
+	octave 2
+	note B_, 4
+	note B_, 4
+	octave 3
+	note E_, 4
+	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
+
+
+Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c)
+	duty 2
+	notetype 12, 12, 2
+	octave 3
+	note B_, 2
+	notetype 12, 12, 7
+	octave 4
+	note B_, 12
+
+Music_MeetFemaleTrainer_branch_7f726:
+	notetype 12, 12, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
+
+
+Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b)
+	notetype 12, 1, 0
+	rest 8
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 1
+	note A_, 1
+	rest 1
+
+Music_MeetFemaleTrainer_branch_7f756:
+	callchannel Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note E_, 1
+	rest 3
+	callchannel Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note B_, 1
+	rest 3
+	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
+
+Music_MeetFemaleTrainer_branch_7f770:
+	note G#, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	endchannel
+; 0x7f77b

music/meetmaletrainer.asm

@@ -0,0 +1,191 @@
+Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b)
+	tempo 0, 112
+	stereopanning 119
+	duty 3
+	vibrato 20, 3, 3
+	unknownmusic0xe8
+	notetype 12, 11, 4
+	octave 3
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	note E_, 1
+	note F_, 12
+	rest 16
+
+Music_MeetMaleTrainer_branch_7f78f:
+	octave 3
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 4
+	note E_, 6
+	note F_, 2
+	note F#, 4
+	note G_, 8
+	octave 4
+	note D_, 8
+	note E_, 16
+	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
+
+
+Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2)
+	duty 3
+	vibrato 24, 2, 2
+	notetype 12, 12, 4
+	octave 4
+	note E_, 1
+	note D#, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 12
+	rest 2
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 9
+
+Music_MeetMaleTrainer_branch_7f7b5:
+	notetype 12, 12, 4
+	octave 4
+	note E_, 6
+	note D#, 6
+	note C#, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	notetype 12, 12, 7
+	note F_, 16
+	notetype 12, 12, 5
+	octave 3
+	note F#, 8
+	octave 4
+	note C#, 8
+	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
+
+
+Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2)
+	notetype 12, 1, 0
+	rest 6
+	octave 4
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note F#, 1
+	rest 1
+
+Music_MeetMaleTrainer_branch_7f7ea:
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 1
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
+; 0x7f844

music/meetprofoak.asm

@@ -0,0 +1,424 @@
+Music_MeetProfOak_Ch1: ; af59 (2:6f59)
+	tempo 0, 112
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	notetype 12, 11, 4
+	octave 3
+	note F#, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+	note E_, 1
+	note F#, 12
+	notetype 12, 10, 2
+	octave 3
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note B_, 10
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+
+Music_MeetProfOak_branch_af85:
+	note F#, 6
+	note E_, 4
+	note A_, 2
+	note A_, 4
+	note F#, 6
+	note E_, 4
+	note A_, 2
+	note A_, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note E_, 6
+	note D#, 4
+	note F#, 2
+	note F#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	note F#, 6
+	note E_, 4
+	note G#, 2
+	note G#, 4
+	loopchannel 0, Music_MeetProfOak_branch_af85
+
+
+Music_MeetProfOak_Ch2: ; afa9 (2:6fa9)
+	vibrato 8, 1, 1
+	duty 2
+	notetype 12, 12, 4
+	octave 3
+	note B_, 1
+	octave 4
+	note D#, 1
+	note F#, 1
+	note A#, 1
+	note B_, 12
+	notetype 12, 11, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	notetype 12, 6, 4
+	octave 4
+	note B_, 2
+	octave 5
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	notetype 12, 11, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	notetype 12, 8, 1
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	notetype 12, 11, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	notetype 12, 6, 4
+	octave 4
+	note B_, 2
+	octave 5
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note D#, 2
+	note C#, 4
+	notetype 12, 11, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	notetype 12, 8, 1
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 4
+	note B_, 2
+	note B_, 4
+	notetype 12, 11, 5
+
+Music_MeetProfOak_branch_b005:
+	octave 4
+	note C#, 6
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note F#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	octave 3
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	octave 4
+	note E_, 8
+	notetype 12, 6, 5
+	octave 4
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	octave 5
+	note E_, 8
+	notetype 12, 11, 5
+	octave 3
+	note A_, 6
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D#, 8
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C_, 4
+	octave 3
+	note B_, 6
+	note G#, 1
+	note B_, 1
+	octave 4
+	note E_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	notetype 12, 11, 7
+	note G#, 16
+	loopchannel 0, Music_MeetProfOak_branch_b005
+
+
+Music_MeetProfOak_Ch3: ; b03d (2:703d)
+	notetype 12, 1, 2
+	rest 10
+	octave 4
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note B_, 1
+	rest 5
+	octave 5
+	note E_, 4
+	rest 6
+	octave 4
+	note B_, 1
+	rest 5
+	octave 5
+	note E_, 4
+	octave 4
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G#, 1
+	rest 1
+
+Music_MeetProfOak_branch_b0bc:
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	octave 4
+	note A_, 1
+	rest 1
+	octave 5
+	note C#, 1
+	rest 1
+	loopchannel 2, Music_MeetProfOak_branch_b0bc
+
+Music_MeetProfOak_branch_b0d8:
+	octave 4
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	loopchannel 2, Music_MeetProfOak_branch_b0d8
+
+Music_MeetProfOak_branch_b0ed:
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	loopchannel 2, Music_MeetProfOak_branch_b0ed
+
+Music_MeetProfOak_branch_b101:
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note B_, 1
+	rest 1
+	loopchannel 2, Music_MeetProfOak_branch_b101
+	loopchannel 0, Music_MeetProfOak_branch_b0bc
+; 0xb119

music/meetrival.asm

@@ -0,0 +1,397 @@
+Music_MeetRival_branch_b119:
+	tempo 0, 100
+	loopchannel 0, Music_MeetRival_branch_b123
+
+Music_MeetRival_Ch1: ; b120 (2:7120)
+	tempo 0, 112
+
+Music_MeetRival_branch_b123:
+	stereopanning 119
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 3
+	octave 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note A#, 2
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 6
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 5
+	note A_, 2
+	note G_, 2
+	note A_, 2
+
+Music_MeetRival_branch_b140:
+	note B_, 4
+	note A#, 2
+	note A_, 4
+	note G_, 2
+	octave 4
+	note C_, 4
+	note D_, 2
+	rest 4
+	note D_, 4
+	note C#, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 4
+	note E_, 2
+	note D_, 4
+	note C_, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C_, 2
+	rest 4
+	note G_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note F#, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 2
+	note F#, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note D_, 2
+	octave 4
+	note D_, 2
+	rest 2
+	octave 3
+	note D_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note F_, 2
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	note F_, 2
+	note D#, 2
+	note C_, 2
+	octave 3
+	note A#, 2
+	note G_, 2
+	rest 4
+	note A#, 4
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	octave 4
+	note C_, 2
+	notetype 12, 11, 7
+	octave 3
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note D_, 2
+	rest 4
+	note D_, 4
+	notetype 12, 11, 3
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	loopchannel 0, Music_MeetRival_branch_b140
+
+Music_MeetRival_branch_b19b:
+	tempo 0, 100
+	loopchannel 0, Music_MeetRival_branch_b1a5
+
+Music_MeetRival_branch_b1a2:
+	tempo 0, 112
+
+Music_MeetRival_branch_b1a5:
+	stereopanning 119
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 3
+	octave 3
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 5
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	loopchannel 0, Music_MeetRival_branch_b140
+
+
+Music_MeetRival_Ch2: ; b1bb (2:71bb)
+	duty 3
+	vibrato 10, 2, 6
+	notetype 12, 12, 7
+	octave 4
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 2
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 6
+	octave 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+
+Music_MeetRival_branch_b1d8:
+	notetype 12, 12, 7
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note G_, 2
+	rest 4
+	note G_, 4
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 2
+	note A#, 6
+	note B_, 4
+	octave 5
+	note C_, 2
+	rest 4
+	note C_, 4
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C_, 2
+	notetype 12, 11, 0
+	note D_, 16
+	notetype 12, 11, 5
+	note D_, 6
+	notetype 12, 12, 7
+	note F_, 4
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	notetype 12, 11, 0
+	note C_, 8
+	notetype 12, 12, 7
+	note C_, 8
+	octave 4
+	note C_, 2
+	rest 4
+	note A#, 4
+	note G_, 2
+	note F_, 2
+	notetype 12, 11, 0
+	note G_, 16
+	notetype 12, 11, 3
+	note G_, 2
+	octave 3
+	note G_, 2
+	rest 4
+	note G_, 4
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	loopchannel 0, Music_MeetRival_branch_b1d8
+
+Music_MeetRival_branch_b21d:
+	duty 3
+	vibrato 10, 2, 6
+	notetype 12, 12, 7
+	octave 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	loopchannel 0, Music_MeetRival_branch_b1d8
+
+
+Music_MeetRival_Ch3: ; b233 (2:7233)
+	notetype 12, 1, 4
+	octave 5
+	note D_, 2
+	rest 2
+	note C#, 2
+	rest 2
+	note C_, 2
+	rest 2
+	octave 4
+	note B_, 2
+	rest 2
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+
+Music_MeetRival_branch_b24b:
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	rest 4
+	octave 5
+	note D_, 4
+	octave 4
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	note G_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	octave 5
+	note C_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	note B_, 2
+	octave 5
+	note C_, 2
+	rest 4
+	note C_, 4
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	rest 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	rest 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note A_, 2
+	note E_, 2
+	octave 5
+	note C_, 2
+	rest 2
+	octave 4
+	note E_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 2
+	rest 4
+	note E_, 2
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
+	rest 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
+	rest 2
+	note A#, 2
+	note G_, 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	octave 5
+	note D_, 2
+	octave 4
+	note G_, 2
+	rest 2
+	octave 5
+	note D_, 2
+	loopchannel 0, Music_MeetRival_branch_b24b
+
+Music_MeetRival_branch_b2b5:
+	notetype 12, 1, 4
+	octave 4
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	loopchannel 0, Music_MeetRival_branch_b24b
+; 0xb2c8

music/museumguy.asm

@@ -0,0 +1,338 @@
+Music_MuseumGuy_Ch1: ; adae (2:6dae)
+	tempo 0, 128
+	stereopanning 119
+	duty 2
+	unknownmusic0xe8
+	notetype 12, 11, 1
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	octave 2
+	note B_, 4
+	note B_, 1
+	octave 3
+	note D#, 1
+	note E_, 1
+	note G#, 1
+	note B_, 10
+	callchannel Music_MuseumGuy_branch_ade7
+	callchannel Music_MuseumGuy_branch_adec
+	callchannel Music_MuseumGuy_branch_ade7
+	note E_, 4
+	note E_, 4
+	note E_, 2
+	note E_, 6
+
+Music_MuseumGuy_branch_add6:
+	callchannel Music_MuseumGuy_branch_ade7
+	callchannel Music_MuseumGuy_branch_adec
+	callchannel Music_MuseumGuy_branch_ade7
+	note E_, 4
+	note E_, 4
+	note E_, 2
+	note E_, 6
+	loopchannel 0, Music_MuseumGuy_branch_add6
+
+Music_MuseumGuy_branch_ade7:
+	note E_, 2
+	note E_, 6
+	note F#, 2
+	note F#, 6
+	endchannel
+
+Music_MuseumGuy_branch_adec:
+	note E_, 2
+	note E_, 6
+	note D_, 2
+	note D_, 6
+	endchannel
+
+
+Music_MuseumGuy_Ch2: ; adf1 (2:6df1)
+	duty 2
+	notetype 12, 12, 1
+	octave 4
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 4
+	note E_, 1
+	note G#, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+	note E_, 8
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note F#, 2
+	note A_, 4
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 4
+	note D_, 2
+	note F#, 2
+	note A_, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+
+Music_MuseumGuy_branch_ae26:
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 3
+	notetype 12, 8, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note D_, 2
+	note F#, 2
+	note A_, 3
+	notetype 12, 9, 1
+	note A_, 1
+	notetype 12, 12, 1
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 4
+	note D_, 1
+	note C#, 1
+	note C_, 1
+	octave 3
+	note B_, 1
+	note B_, 3
+	notetype 12, 10, 1
+	note G#, 1
+	notetype 12, 12, 1
+	note A_, 2
+	octave 4
+	note C#, 2
+	note E_, 3
+	notetype 12, 9, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note D_, 2
+	note F#, 2
+	note A_, 3
+	notetype 12, 8, 1
+	note A_, 1
+	notetype 12, 12, 1
+	note G#, 2
+	note E_, 1
+	notetype 12, 8, 1
+	note E_, 1
+	notetype 12, 12, 1
+	note F#, 2
+	notetype 12, 8, 1
+	note F#, 1
+	notetype 12, 12, 1
+	note G#, 1
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	loopchannel 0, Music_MuseumGuy_branch_ae26
+
+
+Music_MuseumGuy_Ch3: ; ae6e (2:6e6e)
+	notetype 12, 1, 0
+	rest 16
+	octave 4
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 9
+	callchannel Music_MuseumGuy_branch_aeb8
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 5
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 5
+	callchannel Music_MuseumGuy_branch_aeb8
+	note B_, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+
+Music_MuseumGuy_branch_ae8e:
+	callchannel Music_MuseumGuy_branch_aec1
+	rest 3
+	octave 6
+	note E_, 1
+	rest 1
+	octave 5
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	callchannel Music_MuseumGuy_branch_aec1
+	rest 1
+	octave 6
+	note E_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	octave 5
+	note B_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	loopchannel 0, Music_MuseumGuy_branch_ae8e
+
+Music_MuseumGuy_branch_aeb8:
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 5
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 5
+	endchannel
+
+Music_MuseumGuy_branch_aec1:
+	octave 6
+	note C#, 1
+	rest 1
+	octave 5
+	note A_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	octave 6
+	note F#, 1
+	rest 1
+	octave 5
+	note A_, 1
+	rest 1
+	note A_, 1
+	endchannel
+
+
+Music_MuseumGuy_Ch4: ; aed1 (2:6ed1)
+	dspeed 12
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	rest 14
+	dspeed 6
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+
+Music_MuseumGuy_branch_aee1:
+	dnote 4, mutedsnare2
+	dnote 6, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 6, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 6, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 6, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 6, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	loopchannel 0, Music_MuseumGuy_branch_aee1
+; 0xaf59

music/oakslab.asm

@@ -0,0 +1,394 @@
+Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9)
+	tempo 0, 140
+	stereopanning 119
+	duty 3
+	vibrato 16, 1, 2
+	unknownmusic0xe8
+	notetype 12, 11, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note B_, 1
+
+Music_OaksLab_branch_7eed0:
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 4
+	note G#, 2
+	note A_, 2
+	note B_, 1
+	rest 3
+	note A_, 6
+	note G#, 1
+	note B_, 1
+	octave 4
+	note C#, 4
+	octave 3
+	note A_, 4
+	note G#, 2
+	note A_, 2
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G#, 1
+	rest 3
+	note F#, 8
+	note E_, 4
+	note A_, 6
+	note E_, 1
+	note A_, 1
+	octave 4
+	note D_, 8
+	note C#, 6
+	octave 3
+	note A_, 1
+	octave 4
+	note C#, 1
+	note E_, 8
+	note D_, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note G#, 1
+	rest 3
+	note E_, 4
+	note F#, 4
+	note G#, 4
+	loopchannel 0, Music_OaksLab_branch_7eed0
+
+
+Music_OaksLab_Ch2: ; 7ef05 (1f:6f05)
+	duty 3
+	vibrato 10, 2, 5
+	notetype 12, 12, 4
+	octave 3
+	note G#, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G#, 1
+
+Music_OaksLab_branch_7ef16:
+	note A_, 6
+	note G#, 1
+	note F#, 1
+	note E_, 6
+	note D#, 1
+	note E_, 1
+	note F#, 1
+	rest 3
+	note E_, 8
+	note E_, 4
+	note F#, 6
+	note E_, 1
+	note D_, 1
+	note C#, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	rest 3
+	note C#, 8
+	note C#, 4
+	note D_, 6
+	octave 3
+	note A_, 1
+	octave 4
+	note D_, 1
+	note F#, 8
+	note E_, 6
+	note C#, 1
+	note E_, 1
+	note A_, 8
+	note G#, 4
+	note A_, 2
+	note G#, 2
+	note F#, 4
+	note G#, 2
+	note F#, 2
+	note E_, 1
+	rest 1
+	octave 3
+	note G#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 4
+	note C#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	loopchannel 0, Music_OaksLab_branch_7ef16
+
+
+Music_OaksLab_Ch3: ; 7ef52 (1f:6f52)
+	notetype 12, 1, 1
+	rest 2
+	octave 4
+	note G#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+
+Music_OaksLab_branch_7ef5c:
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 3
+	note G#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 5
+	note G#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	octave 3
+	note A_, 1
+	rest 1
+	octave 4
+	note F#, 1
+	rest 1
+	note C#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	octave 3
+	note B_, 1
+	rest 1
+	octave 4
+	note G#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note G#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note E_, 1
+	rest 3
+	loopchannel 0, Music_OaksLab_branch_7ef5c
+; 0x7f04a

music/pallettown.asm

@@ -0,0 +1,315 @@
+Music_PalletTown_Ch1: ; a7c5 (2:67c5)
+	tempo 0, 160
+	stereopanning 119
+	duty 2
+	notetype 12, 12, 3
+
+Music_PalletTown_branch_a7ce:
+	octave 3
+	note B_, 4
+	octave 4
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 4
+	note G_, 2
+	octave 4
+	note D_, 4
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	rest 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 8
+	rest 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note F#, 2
+	note B_, 4
+	octave 4
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 4
+	note G_, 2
+	octave 4
+	note D_, 4
+	note D_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note D_, 2
+	note C_, 4
+	octave 3
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note F#, 4
+	octave 4
+	note C_, 2
+	octave 3
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	notetype 12, 11, 3
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	loopchannel 0, Music_PalletTown_branch_a7ce
+	endchannel
+
+
+Music_PalletTown_Ch2: ; a85f (2:685f)
+	duty 2
+
+Music_PalletTown_branch_a861:
+	notetype 12, 13, 3
+	octave 5
+	note D_, 2
+	notetype 12, 10, 3
+	note C_, 2
+	notetype 12, 13, 3
+	octave 4
+	note B_, 2
+	notetype 12, 11, 3
+	note A_, 2
+	notetype 12, 13, 3
+	octave 5
+	note G_, 2
+	notetype 12, 11, 3
+	note E_, 2
+	notetype 12, 13, 3
+	note F#, 2
+	note E_, 2
+	note D_, 6
+	octave 4
+	note B_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 10
+	octave 4
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 6
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 8
+	octave 5
+	note D_, 2
+	notetype 12, 10, 3
+	note C_, 2
+	notetype 12, 13, 3
+	octave 4
+	note B_, 2
+	notetype 12, 11, 3
+	octave 5
+	note D_, 2
+	notetype 12, 13, 3
+	note G_, 2
+	notetype 12, 10, 3
+	note F#, 2
+	notetype 12, 11, 3
+	note F#, 2
+	notetype 12, 13, 3
+	note G_, 2
+	note E_, 6
+	note D_, 2
+	note D_, 8
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	octave 5
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 10
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 8
+	note D_, 6
+	note C_, 2
+	octave 4
+	note B_, 8
+	rest 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 4
+	note C_, 4
+	note D_, 6
+	note C_, 1
+	note D_, 1
+	octave 4
+	note B_, 8
+	rest 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 8
+	note E_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 4
+	note E_, 4
+	note F#, 8
+	note G_, 4
+	note B_, 4
+	note B_, 8
+	note A_, 8
+	loopchannel 0, Music_PalletTown_branch_a861
+	endchannel
+
+
+Music_PalletTown_Ch3: ; a8de (2:68de)
+	vibrato 24, 2, 8
+	notetype 12, 1, 2
+
+Music_PalletTown_branch_a8e3:
+	octave 4
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note E_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note A_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note E_, 4
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note A_, 4
+	note G_, 4
+	note E_, 8
+	note A_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note E_, 8
+	note F#, 8
+	loopchannel 0, Music_PalletTown_branch_a8e3
+	endchannel
+; 0xa913

music/pkmnhealed.asm

@@ -0,0 +1,48 @@
+Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3)
+	tempo 0, 144
+	stereopanning 119
+	duty 2
+	unknownmusic0xe8
+	notetype 12, 8, 1
+	rest 2
+	pitchbend 0, 75
+	note B_, 2
+	pitchbend 0, 84
+	note B_, 2
+	pitchbend 0, 68
+	note E_, 2
+	rest 4
+	pitchbend 0, 59
+	note E_, 4
+	pitchbend 0, 75
+	note B_, 4
+	endchannel
+
+
+Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4)
+	duty 2
+	notetype 12, 12, 3
+	octave 4
+	note B_, 4
+	note B_, 4
+	note B_, 2
+	note G#, 2
+	notetype 12, 12, 4
+	octave 5
+	note E_, 8
+	endchannel
+
+
+Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2)
+	notetype 12, 1, 0
+	octave 4
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	note G#, 2
+	note E_, 6
+	rest 2
+	endchannel
+; 0x9bde

music/pokecenter.asm

@@ -0,0 +1,376 @@
+Music_Pokecenter_Ch1: ; be56 (2:7e56)
+	tempo 0, 144
+	stereopanning 119
+	duty 3
+	vibrato 10, 2, 2
+	unknownmusic0xe8
+
+Music_Pokecenter_branch_be61:
+	notetype 12, 10, 3
+	octave 3
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	notetype 12, 11, 5
+	octave 4
+	note D_, 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	notetype 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	notetype 12, 11, 5
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	notetype 12, 10, 3
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	notetype 12, 11, 5
+	octave 4
+	note D_, 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	notetype 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	notetype 12, 11, 5
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 8
+	octave 4
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 4
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	loopchannel 0, Music_Pokecenter_branch_be61
+
+
+Music_Pokecenter_Ch2: ; bef9 (2:7ef9)
+	vibrato 8, 2, 5
+
+Music_Pokecenter_branch_befc:
+	callchannel Music_Pokecenter_branch_bf4e
+	duty 3
+	notetype 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	callchannel Music_Pokecenter_branch_bf60
+	note D_, 2
+	note F#, 6
+	duty 3
+	notetype 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	callchannel Music_Pokecenter_branch_bf4e
+	duty 3
+	notetype 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	callchannel Music_Pokecenter_branch_bf60
+	note D_, 8
+	duty 3
+	notetype 12, 10, 5
+	octave 3
+	note D_, 4
+	note E_, 4
+	duty 2
+	notetype 12, 12, 6
+	octave 4
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 8
+	note C#, 8
+	note E_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 8
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	loopchannel 0, Music_Pokecenter_branch_befc
+
+Music_Pokecenter_branch_bf4e:
+	duty 2
+	notetype 12, 12, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 2
+	notetype 12, 12, 3
+	note A_, 4
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note C#, 6
+	endchannel
+
+Music_Pokecenter_branch_bf60:
+	duty 2
+	notetype 12, 12, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	notetype 12, 12, 3
+	note F#, 4
+	note E_, 4
+	note C#, 2
+	endchannel
+
+
+Music_Pokecenter_Ch3: ; bf70 (2:7f70)
+	notetype 12, 1, 0
+
+Music_Pokecenter_branch_bf72:
+	octave 4
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	callchannel Music_Pokecenter_branch_bfd9
+	callchannel Music_Pokecenter_branch_bfe2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	callchannel Music_Pokecenter_branch_bfd9
+	callchannel Music_Pokecenter_branch_bfe2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	callchannel Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	callchannel Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	loopchannel 0, Music_Pokecenter_branch_bf72
+
+Music_Pokecenter_branch_bfd9:
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	endchannel
+
+Music_Pokecenter_branch_bfe2:
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	endchannel
+
+Music_Pokecenter_branch_bfeb:
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	endchannel
+; 0xbff4

music/pokemontower.asm

@@ -0,0 +1,459 @@
+Music_PokemonTower_Ch1: ; 7f04a (1f:704a)
+	tempo 0, 152
+	stereopanning 119
+	duty 3
+	unknownmusic0xe8
+	vibrato 12, 2, 3
+	notetype 12, 8, 0
+	rest 4
+	octave 4
+	note B_, 12
+
+Music_PokemonTower_branch_7f05a:
+	notetype 12, 11, 4
+	octave 4
+	note G_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	octave 3
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	octave 4
+	note F#, 1
+	rest 7
+	note C_, 1
+	octave 3
+	note B_, 1
+	note G_, 1
+	rest 5
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note D_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	octave 4
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C#, 1
+	rest 7
+	note C#, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 3
+	notetype 12, 8, 4
+	note C_, 1
+	rest 3
+	notetype 12, 11, 4
+	note D_, 1
+	rest 7
+	note D_, 1
+	rest 7
+	octave 3
+	note A_, 1
+	rest 7
+	note A_, 1
+	rest 7
+	notetype 12, 10, 7
+	note B_, 8
+	note B_, 8
+	octave 4
+	note C_, 8
+	note C_, 8
+	note C#, 8
+	note C#, 8
+	notetype 12, 10, 6
+	note D_, 16
+	rest 16
+	rest 16
+	rest 16
+	rest 16
+	notetype 12, 9, 2
+	note B_, 4
+	octave 5
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	octave 4
+	note B_, 4
+	octave 5
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	octave 4
+	note B_, 4
+	octave 5
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	octave 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	octave 5
+	note C_, 16
+	note C_, 16
+	loopchannel 0, Music_PokemonTower_branch_7f05a
+
+
+Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3)
+	vibrato 20, 3, 4
+	duty 3
+	notetype 12, 10, 0
+	octave 5
+	note C_, 12
+	octave 4
+	note E_, 4
+
+Music_PokemonTower_branch_7f0ee:
+	notetype 12, 12, 1
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	notetype 12, 12, 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	notetype 12, 11, 0
+	note G_, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	octave 5
+	note C_, 8
+	notetype 12, 11, 7
+	note C_, 8
+	notetype 12, 12, 2
+	octave 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	rest 1
+	notetype 12, 9, 6
+	octave 3
+	note G_, 4
+	notetype 12, 12, 7
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	notetype 12, 11, 0
+	octave 4
+	note C_, 16
+	note E_, 8
+	notetype 12, 11, 7
+	note E_, 12
+	notetype 12, 12, 5
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 4
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	notetype 12, 11, 0
+	note F#, 12
+	note G_, 4
+	notetype 12, 11, 0
+	note F#, 8
+	notetype 12, 11, 7
+	note F#, 8
+	notetype 12, 11, 0
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 16
+	notetype 12, 11, 0
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	notetype 12, 9, 0
+	octave 5
+	note C_, 16
+	notetype 12, 11, 0
+	note D_, 4
+	octave 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	notetype 12, 2, 15
+	octave 5
+	note D_, 16
+	notetype 12, 12, 0
+	note E_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	octave 5
+	note F_, 4
+	note C_, 4
+	octave 4
+	note A#, 4
+	note G#, 4
+	octave 5
+	note F#, 4
+	note D_, 4
+	note C_, 4
+	octave 4
+	note A#, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	notetype 12, 11, 0
+	note C_, 8
+	notetype 12, 9, 0
+	note C_, 8
+	notetype 12, 8, 0
+	note C_, 8
+	notetype 12, 7, 0
+	note C_, 8
+	notetype 12, 6, 0
+	note C_, 8
+	notetype 12, 6, 7
+	note C_, 8
+	rest 16
+	notetype 12, 10, 0
+	octave 5
+	note G_, 16
+	octave 6
+	note C_, 16
+	octave 5
+	note B_, 8
+	note G_, 8
+	note E_, 8
+	note G_, 8
+	octave 6
+	note C_, 16
+	vibrato 0, 3, 4
+	notetype 12, 10, 7
+	note C_, 16
+	loopchannel 0, Music_PokemonTower_branch_7f0ee
+
+
+Music_PokemonTower_Ch3: ; 7f19a (1f:719a)
+	vibrato 4, 1, 1
+	notetype 12, 1, 3
+	rest 8
+	octave 5
+	note G_, 8
+
+Music_PokemonTower_branch_7f1a2:
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 3
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
+	rest 7
+	note G_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note E_, 1
+	note D#, 1
+	octave 4
+	note B_, 1
+	rest 5
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	octave 5
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	octave 4
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	note B_, 1
+	rest 7
+	octave 5
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note C_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note F#, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note D_, 1
+	rest 7
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note E_, 1
+	rest 7
+	note E_, 1
+	rest 7
+	note F_, 1
+	rest 7
+	note F_, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note F#, 1
+	rest 7
+	note G_, 1
+	rest 15
+	notetype 12, 1, 5
+	octave 4
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 15
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 7
+	notetype 12, 1, 3
+	octave 6
+	note E_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note E_, 1
+	rest 15
+	note E_, 1
+	rest 15
+	note E_, 1
+	rest 15
+	note E_, 1
+	rest 15
+	note E_, 1
+	rest 15
+	note E_, 1
+	rest 7
+	octave 5
+	note E_, 1
+	rest 1
+	note D#, 1
+	rest 1
+	note F#, 1
+	rest 1
+	note D#, 1
+	rest 1
+	loopchannel 0, Music_PokemonTower_branch_7f1a2
+; 0x7f243

music/pokeredmusicdisasm/AbstractData.cpp

@@ -1,37 +0,0 @@
-#include "AbstractData.h"
-using namespace std;
-
-AbstractData::AbstractData()
-{
-    error = false;
-}
-
-// This method must always return "" if true but can return
-// any other value for false
-string AbstractData::GenAsm()
-{
-    if(error) return ";#Error";
-    else return "";
-}
-
-bool AbstractData::IsValid(unsigned char* byte)
-{
-	return true;
-}
-
-bool AbstractData::Parse(unsigned char* byte)
-{
-    // If it's not valid, don't even bother parsing
-    if(!IsValid(byte)) return false;
-    return true;
-}
-
-unsigned int AbstractData::Arguments()
-{
-	return 0;
-}
-
-bool AbstractData::GetError()
-{
-    return error;
-}

music/pokeredmusicdisasm/AbstractData.h

@@ -1,23 +0,0 @@
-#ifndef ABSTRACTDATA_H
-#define ABSTRACTDATA_H
-
-#include <string>
-
-// All information types inherit from here
-class AbstractData
-{
-public:
-    AbstractData();
-
-    virtual std::string GenAsm(); // Generate Assembly Output
-    virtual bool Parse(unsigned char* byte); // Parse Given Data
-	virtual bool GetError(); // Get Error (No Write, Error is read only)
-
-	virtual bool IsValid(unsigned char* byte); // Check for byte validity
-    virtual unsigned int Arguments(); // Number of arguments taken
-
-protected:
-    bool error; // Whether there's an error in parsing or not
-};
-
-#endif

music/pokeredmusicdisasm/Call.cpp

@@ -1,71 +0,0 @@
-#include <sstream>
-#include "Call.h"
-using namespace std;
-
-Call::Call()
-{
-    error = false;
-    address = 0;
-}
-
-Call::Call(unsigned char* byte)
-{
-    Parse(byte);
-}
-
-Call::Call(unsigned short value, bool)
-{
-    SetAddress(value);
-}
-
-unsigned short Call::GetAddress()
-{
-    return address;
-}
-
-void Call::SetAddress(unsigned short value)
-{
-    address = value;
-}
-
-string Call::GenAsm()
-{
-    string tmpRet = AbstractData::GenAsm();
-    if(tmpRet != "") return tmpRet;
-
-    stringstream tmpAsmOut;
-    tmpAsmOut << "mus_call" << " $" << hex << uppercase << address;
-    return tmpAsmOut.str();
-}
-
-bool Call::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xFD)
-	{
-		error = false;
-		return true;
-	}
-	else
-	{
-		error = true;
-		return false;
-	}
-}
-
-bool Call::Parse(unsigned char* byte)
-{
-    if(!AbstractData::Parse(byte)) return false;
-
-    // Get Address
-    address = byte[2];
-    address <<= 8;
-    address |= byte[1];
-
-    return true;
-}
-
-unsigned int Call::Arguments()
-{
-    // 1 2-byte argument = 2 bytes
-	return 2;
-}

music/pokeredmusicdisasm/Call.h

@@ -1,34 +0,0 @@
-#ifndef CALL_H
-#define CALL_H
-
-#include "AbstractData.h"
-
-// Represents 1 call
-class Call : public AbstractData
-{
-public:
-    // Constructors
-    Call(); // Default
-    Call(unsigned char* byte); // Parse Immidiately
-    Call(unsigned short value, bool); // Set value
-
-    // Direct Getter/Setter Functions
-    unsigned short GetAddress();
-    void SetAddress(unsigned short value);
-
-    // The standard re-implementations from AbstractData
-    virtual std::string GenAsm();
-    virtual bool IsValid(unsigned char* byte);
-    virtual bool Parse(unsigned char* byte);
-    virtual unsigned int Arguments();
-
-private:
-    unsigned short address;
-};
-
-#endif
-
-// Rqandom Notes
-//ED Speed of song
-//EC Instrument
-//DC Volume

music/pokeredmusicdisasm/Console.cpp

@@ -1,45 +0,0 @@
-#include "Console.h"
-
-using namespace std;
-
-// Basic
-void Console::Get(char* value)
-{
-    cin >> value;
-}
-void Console::Get(string& value)
-{
-    cin >> value;
-}
-void Console::Print(const char* value)
-{
-    cout << value;
-}
-void Console::Error(const char* value)
-{
-    cerr << value;
-}
-
-// Upper-Basic
-void Console::PrintLn(const char* value)
-{
-    Print(value);
-    cout << endl;
-}
-void Console::ErrorLn(const char* value)
-{
-    Error(value);
-    cerr << endl;
-}
-
-// Higher
-/*void Console::Ask(const char* question, char* answer)
-{
-    Print(question);
-    Get(answer);
-}
-void Console::Ask(const char* question, string& answer)
-{
-    Print(question);
-    Get(answer);
-}*/

music/pokeredmusicdisasm/Console.h

@@ -1,41 +0,0 @@
-#ifndef CONSOLE_H
-#define CONSOLE_H
-
-#include <iostream>
-#include <string>
-#include <sstream>
-
-// Just a Console Utility Library
-class Console
-{
-public:
-    // Basic
-    static void Get(char* value);
-    static void Get(std::string& value);
-    static void Print(const char* value);
-    static void Error(const char* value);
-
-    // Upper-Basic
-    static void PrintLn(const char* value);
-    static void ErrorLn(const char* value);
-
-    // Higher
-    //static void Ask(const char* question, char* answer);
-    //static void Ask(const char* question, std::string& answer);
-
-	template<class T>
-	static void Ask(const char* question, T& answer, std::ios_base::fmtflags flags = std::ios_base::dec)
-	{
-		std::stringstream _tmpstr;
-		std::string _tmp;
-
-		Print(question);
-		Get(_tmp);
-
-		_tmpstr << _tmp;
-		_tmpstr.flags(flags);
-		_tmpstr >> answer;
-	}
-};
-
-#endif // CONSOLE_H

music/pokeredmusicdisasm/Duty.cpp

@@ -1,93 +0,0 @@
-#include <sstream>
-#include "Duty.h"
-using namespace std;
-
-Duty::Duty()
-{
-    duty = 0;
-}
-
-Duty::Duty(unsigned char* byte) // Parse Immidiately
-{
-    Parse(byte);
-}
-
-Duty::Duty(unsigned char value, bool) // Set value
-{
-    SetDuty(value);
-}
-
-unsigned char Duty::GetDuty()
-{
-    return duty;
-}
-
-void Duty::SetDuty(unsigned char value)
-{
-    // Clamp duty to 3 since that's the highest possible
-    duty = value;
-    if(duty >= 3) duty = 3;
-}
-
-// Byte 0 - The Command Code
-// Byte 1 - The Value
-bool Duty::IsValid(unsigned char* byte)
-{
-	if((byte[0] == 0xEC) &&
-		(byte[1] >= 0x0) &&
-		(byte[1] <= 0x3))
-	{
-		error = false;	// Unblock assembling
-		return true;
-	}
-	else
-	{
-		error = true;	// Block assembling
-		return false;
-	}
-}
-
-string Duty::GenAsm()
-{
-	string ret = AbstractData::GenAsm();
-    if(ret != "") return ret;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_duty " << LookupDutyString();
-	return tmpAsmOut.str();
-}
-
-bool Duty::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-
-	duty = byte[1];
-        return true;
-}
-
-string Duty::LookupDutyString()
-{
-	// In case some error happens and the values doesn't match the list below
-	stringstream defTmp;
-
-	switch(duty)
-	{
-	case duty12_5:
-		return "duty12_5";
-	case duty25:
-		return "duty25";
-	case duty50:
-		return "duty50";
-	case duty75:
-		return "duty75";
-	default:
-		defTmp << "$" << uppercase << hex << (short)duty;
-		return defTmp.str();
-	}
-}
-
-unsigned int Duty::Arguments()
-{
-    //1 1-byte argument = 1
-    return 1;
-}

music/pokeredmusicdisasm/Duty.h

@@ -1,40 +0,0 @@
-#ifndef DUTY_H
-#define DUTY_H
-
-#include "AbstractData.h"
-
-//Represents 1 Duty data
-class Duty : public AbstractData
-{
-public:
-    // Constructors
-    Duty();
-    Duty(unsigned char* byte); // Parse Immidiately
-    Duty(unsigned char value, bool); // Set value
-
-    // Re-Implementations from Parent
-    virtual std::string GenAsm();
-    virtual bool IsValid(unsigned char* byte);
-    virtual bool Parse(unsigned char* byte);
-    virtual unsigned int Arguments();
-
-    // Direct Getters and Setters
-    unsigned char GetDuty();
-    void SetDuty(unsigned char value);
-
-    // Custom Functions
-    std::string LookupDutyString();
-
-    enum dutyList : unsigned char
-    {
-        duty12_5 = 0x0,
-        duty25 = 0x1,
-        duty50 = 0x2,
-        duty75 = 0x3
-    };
-
-private:
-	unsigned char duty;
-};
-
-#endif

music/pokeredmusicdisasm/File.h

@@ -1,26 +0,0 @@
-#ifndef FILE_H
-#define FILE_H
-
-#include <string>
-#include <vector>
-#include <fstream>
-
-class File
-{
-public:
-	File();
-	File(std::string filename, unsigned int offset = 0, unsigned int length = 0);
-
-	string GetFileName();
-	void SetFilename(string value);
-
-private:
-	std::string filename;
-	std::vector<unsigned char> fileBuffer;
-	std::fstream fileHandle;
-
-	std::vector<unsigned char>::iterator start;
-	std::vector<unsigned char>::iterator cur;
-};
-
-#endif

music/pokeredmusicdisasm/Jump.cpp

@@ -1,83 +0,0 @@
-#include <sstream>
-#include "Jump.h"
-using namespace std;
-
-Jump::Jump()
-{
-	address = 0x0000;
-	loop = 0;
-}
-
-Jump::Jump(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Jump::Jump(unsigned short value, unsigned char loop, bool) // Set value
-{
-	SetAddress(value);
-	SetLoop(loop);
-}
-
-unsigned short Jump::GetAddress()
-{
-	return address;
-}
-
-void Jump::SetAddress(unsigned short value)
-{
-	address = value;
-}
-
-unsigned char Jump::GetLoop()
-{
-	return loop;
-}
-
-void Jump::SetLoop(unsigned char value)
-{
-	loop = value;
-}
-
-string Jump::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_jump" << " " << (short)loop << ", $" << hex << uppercase << address;
-	return tmpAsmOut.str();
-}
-
-bool Jump::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xFE)
-	{
-		error = false;
-		return true;
-	}
-	else
-	{
-		error = true;
-		return false;
-	}
-}
-
-bool Jump::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-
-	loop = byte[1];
-
-    address = byte[3];
-    address <<= 8;
-    address |= byte[2];
-
-	return true;
-}
-
-unsigned int Jump::Arguments()
-{
-	// 1 1-byte command, 1 1-byte loop, 1 2-byte pointer = 4 bytes
-	return 3;
-}

music/pokeredmusicdisasm/Jump.h

@@ -1,33 +0,0 @@
-#ifndef JUMP_H
-#define JUMP_H
-
-#include "AbstractData.h"
-
-// Represents 1 Jump Class
-class Jump : public AbstractData
-{
-public:
-    // Constructors
-    Jump(); // Default
-    Jump(unsigned char* byte); // Parse Immidiately
-    Jump(unsigned short value, unsigned char loop, bool); // Set value
-
-    // Direct Getter/Setter Functions
-    unsigned short GetAddress();
-    void SetAddress(unsigned short value);
-
-	unsigned char GetLoop();
-    void SetLoop(unsigned char value);
-
-    // The standard re-implementations from AbstractData
-    virtual std::string GenAsm();
-    virtual bool IsValid(unsigned char* byte);
-    virtual bool Parse(unsigned char* byte);
-    virtual unsigned int Arguments();
-
-private:
-    unsigned short address;
-	unsigned char loop;
-};
-
-#endif

music/pokeredmusicdisasm/Makefile

@@ -1,68 +0,0 @@
-
-OBJECTS = main.o Jump.o Modulation.o Note.o Octave.o Parser.o Stop.o \
-Tempo.o UnkCode.o UnkEB.o Velocity.o Volume.o Console.o AbstractData.o Call.o \
-Duty.o args.o
-
-CC = g++
-CFLAGS = -std=c++0x
-
-pokeredmusicdisasm: $(OBJECTS)
-	$(CC) $(CFLAGS) $(OBJECTS) -o "../../extras/pokeredmusicdisasm.exe"
-
-Parser.o: Jump.h Modulation.h Note.h Octave.h Parser.h Stop.h \
-Tempo.h UnkCode.h UnkEB.h Velocity.h Volume.h
-	$(CC) $(CFLAGS) -c main.cpp Jump.cpp Modulation.cpp \
-Note.cpp Octave.cpp Parser.cpp Stop.cpp Tempo.cpp UnkCode.cpp UnkEB.cpp \
-Velocity.cpp Volume.cpp
-
-Duty.o: Duty.h AbstractData.h
-	$(CC) $(CFLAGS) -c Duty.cpp AbstractData.cpp
-
-Console.o: Console.h
-	$(CC) $(CFLAGS) -c Console.cpp
-
-AbstractData.o: AbstractData.h
-	$(CC) $(CFLAGS) -c AbstractData.cpp
-
-Call.o: Call.h Call.cpp AbstractData.h
-	$(CC) $(CFLAGS) -c Call.cpp AbstractData.cpp
-
-main.o: main.cpp Console.h Parser.h args.h
-	$(CC) $(CFLAGS) -c main.cpp Console.cpp Parser.cpp args.cpp
-
-Jump.o: Jump.h AbstractData.h
-	$(CC) $(CFLAGS) -c Jump.cpp AbstractData.cpp
-
-Modulation.o: Modulation.h AbstractData.h
-	$(CC) $(CFLAGS) -c Modulation.cpp AbstractData.cpp
-
-Note.o: Note.h AbstractData.h
-	$(CC) $(CFLAGS) -c Note.cpp AbstractData.cpp
-
-Octave.o: Octave.h AbstractData.h
-	$(CC) $(CFLAGS) -c Octave.cpp AbstractData.cpp
-
-Stop.o: Stop.h AbstractData.h
-	$(CC) $(CFLAGS) -c Stop.cpp AbstractData.cpp
-
-Tempo.o: Tempo.h AbstractData.h
-	$(CC) $(CFLAGS) -c Tempo.cpp AbstractData.cpp
-
-UnkCode.o: UnkCode.h AbstractData.h
-	$(CC) $(CFLAGS) -c UnkCode.cpp AbstractData.cpp
-
-UnkEB.o: UnkEB.h AbstractData.h
-	$(CC) $(CFLAGS) -c UnkEB.cpp AbstractData.cpp
-
-Velocity.o: Velocity.h AbstractData.h
-	$(CC) $(CFLAGS) -c Velocity.cpp AbstractData.cpp
-
-Volume.o: Volume.h AbstractData.h
-	$(CC) $(CFLAGS) -c Volume.cpp AbstractData.cpp
-
-args.o: args.h
-	$(CC) $(CFLAGS) -c args.cpp
-	
-clean:
-	rm *.o
-	rm ../../extras/pokeredmusicdisasm.exe

music/pokeredmusicdisasm/Modulation.cpp

@@ -1,96 +0,0 @@
-#include <sstream>
-#include "Modulation.h"
-using namespace std;
-
-Modulation::Modulation()
-{
-	delay = 0;
-	depth = 0;
-	rate = 0;
-}
-
-Modulation::Modulation(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Modulation::Modulation(unsigned char delay, unsigned char depth, unsigned char rate, bool) // Set value
-{
-	SetDelay(delay);
-	SetDepth(depth);
-	SetRate(rate);
-}
-
-// Direct Getter/Setter Functions
-unsigned char Modulation::GetDelay()
-{
-	return delay;
-}
-
-void Modulation::SetDelay(unsigned char value)
-{
-	delay = value;
-}
-
-unsigned char Modulation::GetDepth()
-{
-	return depth;
-}
-
-void Modulation::SetDepth(unsigned char value)
-{
-	depth = value;
-}
-
-unsigned char Modulation::GetRate()
-{
-	return rate;
-}
-
-void Modulation::SetRate(unsigned char value)
-{
-	rate = value;
-}
-
-bool Modulation::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xEA)
-	{
-		error = false;	// Unblock assembling
-		return true;
-	}
-	else
-	{
-		error = true;	// Block assembling
-		return false;
-	}
-}
-
-string Modulation::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_mod " << (short)delay << ", " << (short)depth << ", " << (short)rate;
-	return tmpAsmOut.str();
-}
-
-bool Modulation::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-	
-	delay = byte[1];
-	
-	depth = byte[2] & 0xF0;
-	depth >>= 4;
-
-	rate = byte[2] & 0x0F;
-	return true;
-}
-
-unsigned int Modulation::Arguments()
-{
-	// 2 1-byte arguments = 2
-	return 2;
-}

music/pokeredmusicdisasm/Modulation.h

@@ -1,37 +0,0 @@
-#ifndef MODULATION_H
-#define MODULATION_H
-
-#include "AbstractData.h"
-
-//Represents 1 modulation value
-class Modulation : public AbstractData
-{
-public:
-	// Constructors
-	Modulation();
-	Modulation(unsigned char* byte); // Parse Immidiately
-    Modulation(unsigned char delay, unsigned char depth, unsigned char rate, bool); // Set value
-
-	// Direct Getter/Setter Functions
-    unsigned char GetDelay();
-    void SetDelay(unsigned char value);
-
-	unsigned char GetDepth();
-    void SetDepth(unsigned char value);
-
-	unsigned char GetRate();
-    void SetRate(unsigned char value);
-
-	// Re-implemented
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char delay;
-	unsigned char depth;
-	unsigned char rate;
-};
-
-#endif

music/pokeredmusicdisasm/Note.cpp

@@ -1,174 +0,0 @@
-#include <sstream>
-#include "Note.h"
-
-using namespace std;
-
-Note::Note()
-{
-	pitch = 0x0;
-	delay = 0x0;
-}
-
-Note::Note(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Note::Note(unsigned char pitch, unsigned char delay,bool) // Set value
-{
-	SetPitch(pitch);
-	SetDelay(delay);
-}
-
-unsigned char Note::GetPitch()
-{
-	return pitch;
-}
-
-void Note::SetPitch(unsigned char value)
-{
-	pitch = value;
-}
-
-unsigned char Note::GetDelay()
-{
-	return delay;
-}
-
-void Note::SetDelay(unsigned char value)
-{
-	delay = value;
-}
-
-bool Note::IsValid(unsigned char* byte)
-{
-	// A Note is a byte that is between 0x00 and 0xCF
-	if((byte[0] >= 0x00) &&
-		(byte[0] <= 0xCF))
-	{
-		error = false;	// Unblock assembling
-		return true;
-	}
-	else
-	{
-		error = true;	// Block assembling
-		return false;
-	}
-}
-
-// Generates the assembly for this note
-string Note::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_note" << " " << LookupPitchStr() << ", " << LookupDelayStr();
-	return tmpAsmOut.str();
-}
-
-// Takes the raw byte and parses it's data, storing it
-bool Note::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-
-	pitch = byte[0] & 0xF0;
-	pitch >>= 4;
-
-	delay = byte[0] & 0x0F;
-	return true;
-}
-
-// Fetches the asm string name for the pitch
-string Note::LookupPitchStr()
-{
-	// In case some error happens and the values doesn't match the list below
-	stringstream defTmp;
-
-	switch(pitch)
-	{
-	case noteC:
-		return "noteC";
-	case noteCS:
-		return "noteC#";
-	case noteD:
-		return "noteD";
-	case noteDS:
-		return "noteD#";
-	case noteE:
-		return "noteE";
-	case noteF:
-		return "noteF";
-	case noteFS:
-		return "noteF#";
-	case noteG:
-		return "noteG";
-	case noteGS:
-		return "noteG#";
-	case noteA:
-		return "noteA";
-	case noteAS:
-		return "noteA#";
-	case noteB:
-		return "noteB";
-	case noteRst:
-		return "noteRst";
-	default:
-		defTmp.setf(ios_base::uppercase | ios_base::hex);
-		defTmp << "$" << pitch;
-		return defTmp.str();
-	}
-}
-
-// Fetches the asm string name for the delay
-string Note::LookupDelayStr()
-{
-	// In case some error happens and the values doesn't match the list below
-	stringstream defTmp;
-
-	switch(delay)
-	{
-	case note16:
-		return "note16";
-	case note8:
-		return "note8";
-	case note8_16:
-		return "note8_16";
-	case note4:
-		return "note4";
-	case note4_16:
-		return "note4_16";
-	case note4_8:
-		return "note4_8";
-	case note4_8_16:
-		return "note4_8_16";
-	case note2:
-		return "note2";
-	case note2_16:
-		return "note2_16";
-	case note2_8:
-		return "note2_8";
-	case note2_8_16:
-		return "note2_8_16";
-	case note2_4:
-		return "note2_4";
-	case note2_4_16:
-		return "note2_4_16";
-	case note2_4_8:
-		return "note2_4_8";
-	case note2_4_8_16:
-		return "note2_4_8_16";
-	case note1:
-		return "note1";
-	default:
-		defTmp.setf(ios_base::uppercase | ios_base::hex);
-		defTmp << "$" << (short)pitch;
-		return defTmp.str();
-	}
-}
-
-unsigned int Note::Arguments()
-{
-	// No Arguments
-	return 0;
-}

music/pokeredmusicdisasm/Note.h

@@ -1,73 +0,0 @@
-#ifndef NOTE_H
-#define NOTE_H
-
-#include "AbstractData.h"
-
-// Holds a single note
-class Note : public AbstractData
-{
-public:
-	// Constructors
-	Note();
-	Note(unsigned char* byte); // Parse Immidiately
-    Note(unsigned char pitch, unsigned char delay,bool); // Set value
-
-	// Reimplementations
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-	// Getters and Setters
-	unsigned char GetPitch();
-	void SetPitch(unsigned char value);
-
-	unsigned char GetDelay();
-	void SetDelay(unsigned char value);
-
-	// Specific Methods
-	std::string LookupPitchStr();
-	std::string LookupDelayStr();
-
-        enum pitch_code : unsigned char
-        {
-            noteC = 0x0,
-            noteCS = 0x1,
-            noteD = 0x2,
-            noteDS = 0x3,
-            noteE = 0x4,
-            noteF = 0x5,
-            noteFS = 0x6,
-            noteG = 0x7,
-            noteGS = 0x8,
-            noteA = 0x9,
-            noteAS = 0xA,
-            noteB = 0xB,
-            noteRst = 0xC
-        };
-
-        enum delay_code : unsigned char
-        {
-            note16 = 0x0,
-            note8 = 0x1,
-            note8_16 = 0x2,
-            note4 = 0x3,
-            note4_16 = 0x4,
-            note4_8 = 0x5,
-            note4_8_16 = 0x6,
-            note2 = 0x7,
-            note2_16 = 0x8,
-            note2_8 = 0x9,
-            note2_8_16 = 0xA,
-            note2_4 = 0xB,
-            note2_4_16 = 0xC,
-            note2_4_8 = 0xD,
-            note2_4_8_16 = 0xE,
-            note1 = 0xF
-        };
-private:
-	unsigned char pitch;
-	unsigned char delay;
-};
-
-#endif

music/pokeredmusicdisasm/Octave.cpp

@@ -1,97 +0,0 @@
-#include <sstream>
-#include "Octave.h"
-using namespace std;
-
-Octave::Octave()
-{
-	octave = 0;
-}
-
-Octave::Octave(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Octave::Octave(unsigned char octave, bool) // Set value
-{
-	SetOctave(octave);
-}
-
-unsigned char Octave::GetOctave()
-{
-	return octave;
-}
-
-void Octave::SetOctave(unsigned char value)
-{
-	octave = value;
-}
-
-bool Octave::IsValid(unsigned char* byte)
-{
-	if((byte[0] >= 0xE0) &&
-		(byte[0] <= 0xE7))
-	{
-		error = false;	// Unblock assembling
-		return true;
-	}
-	else
-	{
-		error = true;	// Block assembling
-		return false;
-	}
-}
-
-string Octave::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_octave" << " " << LookupOctString();
-	return tmpAsmOut.str();
-}
-
-bool Octave::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-
-	octave = byte[0];
-	return true;
-}
-
-string Octave::LookupOctString()
-{
-	// In case some error happens and the values doesn't match the list below
-	stringstream defTmp;
-
-	switch(octave)
-	{
-	case oct0:
-		return "oct0";
-	case oct1:
-		return "oct1";
-	case oct2:
-		return "oct2";
-	case oct3:
-		return "oct3";
-	case oct4:
-		return "oct4";
-	case oct5:
-		return "oct5";
-	case oct6:
-		return "oct6";
-	case oct7:
-		return "oct7";
-	default:
-		defTmp.setf(ios_base::uppercase | ios_base::hex);
-		defTmp << "$" << (short)octave;
-		return defTmp.str();
-	}
-}
-
-unsigned int Octave::Arguments()
-{
-	// No Arguments
-	return 0;
-}

music/pokeredmusicdisasm/Octave.h

@@ -1,43 +0,0 @@
-#ifndef OCTAVE_H
-#define OCTAVE_H
-
-#include "AbstractData.h"
-
-//Represents 1 octave value
-class Octave : public AbstractData
-{
-public:
-	// Constructors
-	Octave();
-	Octave(unsigned char* byte); // Parse Immidiately
-    Octave(unsigned char octave, bool); // Set value
-
-	// Direct Getters / Setters
-	unsigned char GetOctave();
-	void SetOctave(unsigned char value);
-
-	// Overides
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-	std::string LookupOctString();
-
-        enum OctaveCode : unsigned char
-        {
-            oct0 = 0xE7,
-            oct1 = 0xE6,
-            oct2 = 0xE5,
-            oct3 = 0xE4,
-            oct4 = 0xE3,
-            oct5 = 0xE2,
-            oct6 = 0xE1,
-            oct7 = 0xE0
-        };
-
-private:
-	unsigned char octave;
-};
-
-#endif

music/pokeredmusicdisasm/Parser.cpp

@@ -1,300 +0,0 @@
-#include <sstream>
-#include "Parser.h"
-using namespace std;
-
-// Constructors
-Parser::Parser()
-{
-	rawBytes = 0;
-	fileLength = 0;
-	filePos = 0;
-	stop = false;
-	stopAddress = 0;
-	force = false;
-}
-
-Parser::Parser(std::string filename)
-{
-	rawBytes = 0;
-	fileLength = 0;
-	filePos = 0;
-	stop = false;
-	stopAddress = 0;
-	force = false;
-
-	SetFilename(filename);
-}
-
-// Deconstructors
-Parser::~Parser()
-{
-	// Clear out temporary buffer
-	delete[] rawBytes;
-
-	// Clear out parsed buffer
-	for(unsigned int i = 0; i < parsedBytes.size(); i++)
-	{
-		delete parsedBytes[i];
-	}
-}
-
-// Getters / Setters
-string Parser::GetFilename()
-{
-	return filename;
-}
-
-void Parser::SetFilename(std::string value)
-{
-	filename = value;
-	Read();
-}
-
-unsigned int Parser::GetStopAddress()
-{
-	return stopAddress;
-}
-
-void Parser::SetStopAddress(unsigned int value)
-{
-	stopAddress = value;
-}
-
-bool Parser::GetForce()
-{
-	return force;
-}
-
-void Parser::SetForce(bool value)
-{
-	force = value;
-}
-
-string Parser::GetParsedAsm()
-{
-	string tmpStr;
-
-	for(unsigned int i = 0; i < parsedString.size(); i++)
-	{
-		// Ensure each line isn't already a new-line, this prevents double or tripple empty lines from piling up
-		if(parsedString[i] != "\n") tmpStr += parsedString[i] + "\n";
-		else tmpStr += parsedString[i];
-	}
-
-	return tmpStr;
-}
-
-// File Operations
-// Absolutely no error checking at all - likely needs to be done at somepoint
-void Parser::Read()
-{
-	// open File
-	fstream tmpFile(filename, ios_base::in | ios_base::binary);
-
-	// Get Length
-	tmpFile.seekg(0, ios::end);
-	fileLength = tmpFile.tellg();
-	tmpFile.seekg(0, ios::beg);
-
-	// Allocate proper memory
-	rawBytes = new char[fileLength];
-
-	// Read filedata
-	tmpFile.read(rawBytes, fileLength);
-	tmpFile.close();
-
-	rawBytesFixed = (unsigned char*)rawBytes;
-}
-
-// Code Operations
-void Parser::Parse(unsigned int offset)
-{
-	filePos = offset;
-	ParseNext();
-}
-
-template<class T>
-bool Parser::ParseData(unsigned int& pos, bool reado)
-{
-	// Create the class to use if correct and a dummy class for validating
-	T* tmpC = 0;
-	T dummy;
-
-	// If the bytes are this data type then create and save it
-	if(dummy.IsValid(&rawBytesFixed[pos]))
-	{
-		// Ensure this whole opperation isn't read-only (just peeking)
-		if(!reado)
-		{
-			// Initialize the class
-			tmpC = new T(&rawBytesFixed[pos]);
-
-			// Push it onto the stack and it's assembly generation onto the output class
-			parsedBytes.push_back(tmpC);	// 
-			parsedString.push_back(tmpC->GenAsm());
-
-			// If the class had any arguments, increment the counter that much forward
-			pos += tmpC->Arguments();
-		}
-		return true;	// Let the code know this class was valid
-	}
-
-	return false;	// Let the code know this class wasn't valid
-}
-
-void Parser::ParseNext() // Parses the block immidiately following
-{
-	stringstream tmpStr;
-	stop = false;
-
-	// Smart generation
-	bool firstNonNote = false;	// (unused so far)First byte wasn't a note or octacve switch, add ";Setup" comment
-	bool firstNote = false;	// (unused so far) First note or octave
-	unsigned char lDataType = DATA_NA;
-	bool newBranch = false;	// Create a new branch
-
-	stringstream pos;
-	pos << "; " << hex << uppercase << (unsigned int)filePos;
-	parsedString.push_back(pos.str());
-
-	unsigned int count = 1;	// Counter for processed instructions
-	newBranch = true;
-	for(unsigned int i = filePos; (i <= fileLength) && (stop == false); i++)
-	{
-		if(newBranch)
-		{
-			stringstream _tmpBr;
-			_tmpBr << "\n";
-			_tmpBr << "UnknSong_md_" << hex << i << ":";
-			parsedString.push_back(_tmpBr.str());
-
-			_tmpBr.str("");
-			newBranch = false;
-		}
-
-		// First peek to see what kind of data it is, then perform any pre and post setup
-		if(ParseData<Call>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Call>(i);
-			lDataType = DATA_CALL;
-		}
-		else if(ParseData<Duty>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Duty>(i);
-			lDataType = DATA_DUTY;
-		}
-		else if(ParseData<Jump>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Jump>(i);
-			lDataType = DATA_JUMP;
-		}
-		else if(ParseData<Modulation>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Modulation>(i);
-			lDataType = DATA_MODULATION;
-		}
-		else if(ParseData<Note>(i, true))
-		{
-			 // Insert a newline after certain types
-			if((lDataType == DATA_UNKCODE) ||
-				(lDataType == DATA_UNKEB)) parsedString.push_back("\n");
-
-			// If the previous item was a rest note then insert a new line
-			else if(lDataType == DATA_NOTE)
-			{
-				Note* _tmpNote = (Note*)parsedBytes[parsedBytes.size() - 1];
-				if(_tmpNote->GetPitch() == _tmpNote->noteRst) parsedString.push_back("\n");
-			}
-
-			ParseData<Note>(i);
-
-			// Further indent each note
-			parsedString[parsedString.size() - 1] = "\t" + parsedString[parsedString.size() - 1];
-			lDataType = DATA_NOTE;
-		}
-		else if(ParseData<Octave>(i, true))
-		{
-			// Insert new-line if previous line isn't a newline
-			if(parsedString[parsedString.size() - 1] != "\n") parsedString.push_back("\n");
-
-			ParseData<Octave>(i);
-			lDataType = DATA_OCTAVE;
-		}
-		else if(ParseData<Tempo>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Tempo>(i);
-			lDataType = DATA_TEMPO;
-		}
-		else if(ParseData<Velocity>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Velocity>(i);
-			lDataType = DATA_VELOCITY;
-		}
-		else if(ParseData<Volume>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Volume>(i);
-			lDataType = DATA_VOLUME;
-		}
-		else if(ParseData<UnkEB>(i, true))	// The opcode is 0xEB which is unknown and takes a 1-byte argument
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<UnkEB>(i);
-			lDataType = DATA_UNKEB;
-		}
-		else if(ParseData<Stop>(i, true))
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<Stop>(i);
-			if(!force) stop = true; // Raise the stop flag informing the parser to stop
-			newBranch = true;
-			lDataType = DATA_STOP;
-		}
-		else
-		{
-			if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes
-
-			ParseData<UnkCode>(i);	// The opcode is unknown - process the raw byte and move on
-			lDataType = DATA_UNKCODE;
-		}
-
-		// Put everything tabbed over at least 1 time to fix some weird RGBDS bug by pre-pending a tab character
-		parsedString[parsedString.size() - 1] = "\t" + parsedString[parsedString.size() - 1];
-
-		// Append File Position in hexidecimal at end of line every 5 instructions
-		if((count % 5) == 0)
-		{
-			stringstream _tmpCount;
-			_tmpCount << hex << uppercase << i;
-			parsedString[parsedString.size() - 1] = parsedString[parsedString.size() - 1] + "; " + _tmpCount.str();
-		}
-
-		filePos = i;
-		count++;
-
-		// If the stop address parameter is set, break when we get there
-		if( (stopAddress != 0) && (i >= stopAddress) ) break;
-	}
-
-	// Now record the postion we left off
-	pos.str("");
-	pos << "; " << hex << uppercase << (unsigned int)filePos;
-	parsedString.push_back(pos.str());
-
-	filePos += 1;		// increment 1 for the start of the next possible song
-}

music/pokeredmusicdisasm/Parser.h

@@ -1,93 +0,0 @@
-#ifndef PARSER_H
-#define PARSER_H
-
-#include <fstream>
-#include <string>
-#include <vector>
-
-#include "AbstractData.h"
-#include "Call.h"
-#include "Console.h"
-#include "Duty.h"
-#include "Jump.h"
-#include "Modulation.h"
-#include "Note.h"
-#include "Octave.h"
-#include "Stop.h"
-#include "Tempo.h"
-#include "Velocity.h"
-#include "Volume.h"
-#include "UnkCode.h"
-#include "UnkEB.h"
-
-// This is the final class, it takes all of the data types, abstract class, and helper functions and uses them
-// for parsing
-
-// the final decided plan was to read the whole file into memory (a rom isn't exactly a big memory breaker)
-class Parser
-{
-public:
-	// Constructors
-	Parser();
-	Parser(std::string filename);
-
-	// Deconstructors
-	~Parser();
-
-	// Getters / Setters
-	std::string GetFilename();
-	void SetFilename(std::string value);
-
-	unsigned int GetStopAddress();
-	void SetStopAddress(unsigned int value);
-
-	bool GetForce();
-	void SetForce(bool value);
-
-	std::string GetParsedAsm();
-
-	// File Operations
-	void Read();
-
-	// Code Operations
-	void Parse(unsigned int offset);
-	void ParseNext(); // Parses the block immidiately following
-
-	// Templates
-	template<class T>
-	bool ParseData(unsigned int& pos, bool reado = false);
-
-        enum dataType : unsigned char
-        {
-            DATA_NA,
-            DATA_CALL,
-            DATA_DUTY,
-            DATA_JUMP,
-            DATA_MODULATION,
-            DATA_NOTE,
-            DATA_OCTAVE,
-            DATA_STOP,
-            DATA_TEMPO,
-            DATA_UNKCODE,
-            DATA_UNKEB,
-            DATA_VELOCITY,
-            DATA_VOLUME
-        };
-
-private:
-	std::string filename;
-	std::vector<AbstractData*> parsedBytes;
-	std::vector<std::string> parsedString;
-
-	char* rawBytes;
-	unsigned char* rawBytesFixed;
-	unsigned int fileLength;
-	unsigned int filePos;
-	bool stop;
-	bool force;
-
-	// Optional Settings
-	unsigned int stopAddress;
-};
-
-#endif

music/pokeredmusicdisasm/README.txt

@@ -1,26 +0,0 @@
-Usage: [<offset> [<file> | --]]
-Usage: [--offset=<offset> | -o <offset>] [--file=[<file> | --] | -f [<file> | --]] [--stop=<offset> | -s <offset>]
-Usage: [-h | --help]
-
-Used without parameters will start in limited interactive mode where the program will ask you the file and offset
-An offset is a requirement but the file may be blank or explicitly set, whenever the file is set you may use '--' to substitute for the default file '../baserom.gbc'
-If parameter options are not used the ordering is important:
-There is an intentional glitch in the program, since long paramaters must be specified with --xxx= with or without a value, you may use the short option instead -xxx even though it's suppose to be -xxx=
-	* <offset> <file>
-If parameter options are used the ordering does not matter, ensure the <offset> parameter option or parameter is present
-You may mix and match parameters and parameter options, keep in mind that bare parameters must be in a certain order
-If the offset parameter is missing in any way the program will prompt you for it
-The program will stop parsing when it encounters mus_end regardlessly
-Parameter types
-	* <xxx> - Bare parameter, they must be in a certain order
-	* -xxx=xxx - Long parameter option, it can be in any order but is case sensitive, can contain no spaces, must contain the equal sign, and is read literally
-	* -xxx xxx - Short parameter option, it can be in any order but is case sensitive, must contain 1 space and is read literally
-----
-Breakdown of parameters:
-<offset> - A bare parameter, it must be in hexidecimal eith alone or prefixed with 0x and be the first parameter. It tells the parser where to start parsing
-<file> - A bare parameter, it must be the second parameter and tells the parser which rom file to parse
--- - A special file path value meaning use the default file '../baserom.gbc'
---offset, -o - the parameterized offset in hexidecimal, It tells the parser where to start parsing
---file, -f - the parameterized file path, It tells the parser which rom file to parse
---stop, -s - tells the parser to stop at that hexidecimal address or until it reaches mus_end.
-help, --help, -h - prints this info and exits, if the bare parameter is used it must be the first parameter

music/pokeredmusicdisasm/Stop.cpp

@@ -1,47 +0,0 @@
-#include <sstream>
-#include "Stop.h"
-using namespace std;
-
-Stop::Stop()
-{}
-
-Stop::Stop(unsigned char* byte)
-{
-	Parse(byte);
-}
-
-bool Stop::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xFF)
-	{
-		error = false;	// Unblock assembling
-		return true;
-	}
-	else
-	{
-		error = true;	// Block assembling
-		return false;
-	}
-}
-
-string Stop::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_end";
-	return tmpAsmOut.str();
-}
-
-bool Stop::Parse(unsigned char* byte)
-{
-	if(AbstractData::Parse(byte)) return false;
-	return true;
-}
-
-unsigned int Stop::Arguments()
-{
-	// No Arguments
-	return 0;
-}

music/pokeredmusicdisasm/Stop.h

@@ -1,21 +0,0 @@
-#ifndef STOP_H
-#define STOP_H
-
-#include "AbstractData.h"
-
-//Represents 1 end music data
-class Stop : public AbstractData
-{
-public:
-	// Constructors
-	Stop();
-	Stop(unsigned char* byte); // Parse Immidiately
-
-	// Re-Implementations
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-};
-
-#endif

music/pokeredmusicdisasm/Tempo.cpp

@@ -1,80 +0,0 @@
-#include <sstream>
-#include "Tempo.h"
-using namespace std;
-
-Tempo::Tempo()
-{
-	divider = 0;
-	modifier = 0;
-}
-
-Tempo::Tempo(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Tempo::Tempo(unsigned char divider, unsigned char modifier, bool) // Set value
-{
-	SetDivider(divider);
-	SetModifier(modifier);
-}
-
-unsigned char Tempo::GetDivider()
-{
-	return divider;
-}
-
-void Tempo::SetDivider(unsigned char value)
-{
-	divider = value;
-}
-
-unsigned char Tempo::Getmodifier()
-{
-	return modifier;
-}
-
-void Tempo::SetModifier(unsigned char value)
-{
-	modifier = value;
-}
-
-bool Tempo::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xED)
-	{
-		error = false;
-		return true;
-	}
-	else
-	{
-		error = true;
-		return false;
-	}
-}
-
-string Tempo::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_tempo" << " " << (short)divider << ", " << (short)modifier;
-	return tmpAsmOut.str();
-}
-
-bool Tempo::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-
-	divider = byte[1];
-	modifier = byte[2];
-
-	return true;
-}
-
-unsigned int Tempo::Arguments()
-{
-	// 2 1-byte arguments = 2
-	return 2;
-}

music/pokeredmusicdisasm/Tempo.h

@@ -1,32 +0,0 @@
-#ifndef TEMPO_H
-#define TEMPO_H
-
-#include "AbstractData.h"
-
-class Tempo : public AbstractData
-{
-public:
-	// Constructors
-	Tempo();
-	Tempo(unsigned char* byte); // Parse Immidiately
-    Tempo(unsigned char divider, unsigned char modifier, bool); // Set value
-
-	// Direct Getters and Setters
-	unsigned char GetDivider();
-	void SetDivider(unsigned char value);
-
-	unsigned char Getmodifier();
-	void SetModifier(unsigned char value);
-
-	// Overides
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char divider;
-	unsigned char modifier;
-};
-
-#endif

music/pokeredmusicdisasm/UnkCode.cpp

@@ -1,55 +0,0 @@
-#include <sstream>
-#include "UnkCode.h"
-
-using namespace std;
-
-UnkCode::UnkCode()
-{
-	code = 0;
-}
-
-UnkCode::UnkCode(unsigned char* byte)
-{
-	code = 0;
-	Parse(byte);
-}
-
-UnkCode::UnkCode(unsigned char code, bool)
-{
-	SetCode(code);
-}
-
-// Getters / Setters
-unsigned char UnkCode::GetCode()
-{
-	return code;
-}
-
-void UnkCode::SetCode(unsigned char value)
-{
-	code = value;
-}
-
-// Re-implemented
-string UnkCode::GenAsm()
-{
-	stringstream tmpAsmOut;
-	tmpAsmOut << "db $" << hex << (short)code;
-	return tmpAsmOut.str();
-}
-
-bool UnkCode::Parse(unsigned char* byte)
-{
-	code = byte[0];
-	return true;
-}
-
-bool UnkCode::IsValid(unsigned char* byte)
-{
-	return true;
-}
-
-unsigned int UnkCode::Arguments()
-{
-	return 0;
-}

music/pokeredmusicdisasm/UnkCode.h

@@ -1,29 +0,0 @@
-#ifndef UNKCODE_H
-#define UNKCODE_H
-
-#include "AbstractData.h"
-
-// Represents an unknown opcode
-class UnkCode : public AbstractData
-{
-public:
-	// Constructors
-	UnkCode();
-	UnkCode(unsigned char* byte); // Parse Immidiately
-	UnkCode(unsigned char code, bool); // Set Value
-
-	// Getters / Setters
-	unsigned char GetCode();
-	void SetCode(unsigned char value);
-
-	// Re-implemented
-	virtual std::string GenAsm();
-	virtual bool Parse(unsigned char* byte);
-	virtual bool IsValid(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char code;
-};
-
-#endif

music/pokeredmusicdisasm/UnkEB.cpp

@@ -1,57 +0,0 @@
-#include <sstream>
-#include "UnkEB.h"
-
-using namespace std;
-
-UnkEB::UnkEB()
-{
-	param = 0;
-}
-
-UnkEB::UnkEB(unsigned char* byte)
-{
-	param = 0;
-	Parse(byte);
-}
-
-UnkEB::UnkEB(unsigned char code, bool)
-{
-	SetParam(code);
-}
-
-// Getters / Setters
-unsigned char UnkEB::GetParam()
-{
-	return param;
-}
-
-void UnkEB::SetParam(unsigned char value)
-{
-	param = value;
-}
-
-// Re-implemented
-string UnkEB::GenAsm()
-{
-	stringstream tmpAsmOut;
-	tmpAsmOut << hex << "db $" << (short)0xEB << ", $" << (short)param;
-	return tmpAsmOut.str();
-}
-
-bool UnkEB::Parse(unsigned char* byte)
-{
-	param = byte[1];
-	return true;
-}
-
-bool UnkEB::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xEB) return true;
-	else return false;
-}
-
-unsigned int UnkEB::Arguments()
-{
-	// 1 1-Byte param
-	return 1;
-}

music/pokeredmusicdisasm/UnkEB.h

@@ -1,29 +0,0 @@
-#ifndef UNKEB_H
-#define UNKEB_H
-
-#include "AbstractData.h"
-
-// Represents an unknown opcode
-class UnkEB : public AbstractData
-{
-public:
-	// Constructors
-	UnkEB();
-	UnkEB(unsigned char* byte); // Parse Immidiately
-	UnkEB(unsigned char code, bool); // Set Value
-
-	// Getters / Setters
-	unsigned char GetParam();
-	void SetParam(unsigned char value);
-
-	// Re-implemented
-	virtual std::string GenAsm();
-	virtual bool Parse(unsigned char* byte);
-	virtual bool IsValid(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char param;
-};
-
-#endif

music/pokeredmusicdisasm/Velocity.cpp

@@ -1,82 +0,0 @@
-#include <sstream>
-#include "Velocity.h"
-using namespace std;
-
-Velocity::Velocity()
-{
-	velocity = 0;
-	length = 0;
-}
-
-Velocity::Velocity(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Velocity::Velocity(unsigned char velocity, unsigned char length, bool) // Set value
-{
-	SetVelocity(velocity);
-	SetLength(length);
-}
-
-// Direct Getters/Setters
-unsigned char Velocity::GetVelocity()
-{
-	return velocity;
-}
-
-void Velocity::SetVelocity(unsigned char value)
-{
-	velocity = value;
-}
-
-unsigned char Velocity::GetLength()
-{
-	return length;
-}
-
-void Velocity::SetLength(unsigned char value)
-{
-	length = value;
-}
-
-bool Velocity::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xDC)
-	{
-		error = false;
-		return true;
-	}
-	else
-	{
-		error = true;
-		return false;
-	}
-}
-
-string Velocity::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_vel" << " " << (short)velocity << ", " << (short)length;
-	return tmpAsmOut.str();
-}
-
-bool Velocity::Parse(unsigned char* byte)
-{
-	if(!AbstractData::Parse(byte)) return false;
-	
-	velocity = byte[1] & 0xF0;
-	velocity >>= 4;
-
-	length = byte[1] & 0x0F;
-	return true;
-}
-
-unsigned int Velocity::Arguments()
-{
-	// 1 1-byte argument
-	return 1;
-}

music/pokeredmusicdisasm/Velocity.h

@@ -1,32 +0,0 @@
-#ifndef VELOCITY_H
-#define VELOCITY_H
-
-#include "AbstractData.h"
-
-class Velocity : public AbstractData
-{
-public:
-	// Constructors
-	Velocity();
-	Velocity(unsigned char* byte); // Parse Immidiately
-    Velocity(unsigned char velocity, unsigned char length, bool); // Set value
-
-	// Direct Getters/Setters
-	unsigned char GetVelocity();
-	void SetVelocity(unsigned char value);
-
-	unsigned char GetLength();
-	void SetLength(unsigned char value);
-
-	// Overides
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char velocity;
-	unsigned char length;
-};
-
-#endif

music/pokeredmusicdisasm/Volume.cpp

@@ -1,67 +0,0 @@
-#include <sstream>
-#include "Volume.h"
-using namespace std;
-
-Volume::Volume()
-{
-	volume = 0;
-}
-
-Volume::Volume(unsigned char* byte) // Parse Immidiately
-{
-	Parse(byte);
-}
-
-Volume::Volume(unsigned char volume, bool) // Set value
-{
-	SetVolume(volume);
-}
-
-unsigned char Volume::GetVolume()
-{
-	return volume;
-}
-
-void Volume::SetVolume(unsigned char value)
-{
-	volume = value;
-}
-
-bool Volume::IsValid(unsigned char* byte)
-{
-	if(byte[0] == 0xF0)
-	{
-		error = false;
-		return true;
-	}
-	else
-	{
-		error = true;
-		return false;
-	}
-}
-
-string Volume::GenAsm()
-{
-	string tmpRet = AbstractData::GenAsm();
-	if(tmpRet != "") return tmpRet;
-
-	stringstream tmpAsmOut;
-	tmpAsmOut << "mus_volume" << " " << (short)volume;
-	return tmpAsmOut.str();
-}
-
-bool Volume::Parse(unsigned char* byte)
-{
-	// If it's not a Note, don't even bother parsing
-	if(!AbstractData::Parse(byte)) return false;
-
-	volume = byte[1];
-	return true;
-}
-
-unsigned int Volume::Arguments()
-{
-	// 1 1-byte argument = 1
-	return 1;
-}

music/pokeredmusicdisasm/Volume.h

@@ -1,28 +0,0 @@
-#ifndef VOLUME_H
-#define VOLUME_H
-
-#include "AbstractData.h"
-
-class Volume : public AbstractData
-{
-public:
-	// Constructors
-	Volume();
-	Volume(unsigned char* byte); // Parse Immidiately
-    Volume(unsigned char volume, bool); // Set value
-
-	// Direct Getters / Setters
-	unsigned char GetVolume();
-	void SetVolume(unsigned char value);
-
-	// Re-implementations
-	virtual std::string GenAsm();
-	virtual bool IsValid(unsigned char* byte);
-	virtual bool Parse(unsigned char* byte);
-	virtual unsigned int Arguments();
-
-private:
-	unsigned char volume;
-};
-
-#endif

music/pokeredmusicdisasm/args.cpp

@@ -1,93 +0,0 @@
-#include <sstream>
-#include "args.h"
-using namespace std;
-
-Args::Args(int _argc, char**& _argv)
-{
-	argc = _argc;
-	for(int i = 0; i < _argc; i++)
-	{
-		argv.push_back(string(_argv[i]));
-	}
-}
-
-//template<class T>
-/*export void Args::GetArg(unsigned int ind, T& var, ios_base::fmtflags flags)
-{
-	string stream _tmpstr;
-
-	_tmpstr << flags;
-	_tmpstr << GetArgv(ind);
-	_tmpstr >> var;
-}*/
-
-int Args::GetArgs()
-{
-	return argv.size();
-}
-
-string Args::GetArgv(int ind)
-{
-	return argv[ind];
-}
-
-bool Args::IsLongOption(int ind) // Is that argument a --long-key=value
-{
-	if(GetArgv(ind).substr(0, 2) == "--") return true;
-	else return false;
-}
-
-bool Args::IsShortOption(int ind, bool param2) // Is that argument a --long-key=value
-{
-	if(param2)
-	{
-		if(GetArgv(ind).substr(0, 1) == "-" &&		// The argument must start with -
-			GetArgv(ind).substr(0, 2) != "--" &&	// The argument can't start with "--"
-			ind + 1 < GetArgs()) return true;		// The second argument must exist
-	}
-	else
-	{
-		if(GetArgv(ind).substr(0, 1) == "-" &&				// The argument must start with -
-			GetArgv(ind).substr(0, 2) != "--") return true;	// The argument can't start with "--"
-	}
-
-	return false;
-}
-
-string Args::GetKey(int ind) // Get the key, if not a key/value then returns the arg
-{
-	if(IsLongOption(ind) && GetArgv(ind).find("=") != string::npos) return GetArgv(ind).substr(2, GetArgv(ind).find("=") - 2);
-	else if(IsShortOption(ind)) return GetArgv(ind).substr(1);
-	else return GetArgv(ind);
-}
-
-string Args::GetValue(int ind, bool param2) // Get the value , if not a key/value then returns the arg
-{
-	if(IsLongOption(ind) && GetArgv(ind).find("=") != string::npos) return GetArgv(ind).substr(GetArgv(ind).find("=") + 1);
-	else if(IsShortOption(ind, param2))
-	{
-		if(param2) return GetArgv(ind + 1);
-		else return GetArgv(ind);
-	}
-	
-	return GetArgv(ind);
-}
-
-int Args::SearchKeys(const char* str)
-{
-	string needle = str;
-	string scr = "";
-	unsigned int pos = -1;
-
-	for(int i = 0; i < GetArgs(); i++)
-	{
-		scr = GetKey(i);
-		if(scr == needle)
-		{
-			pos = i;
-			break;
-		}
-	}
-
-	return pos;
-}

music/pokeredmusicdisasm/args.h

@@ -1,38 +0,0 @@
-#ifndef ARGS_H
-#define ARGS_H
-
-#include <string>
-#include <vector>
-#include <sstream>
-
-class Args
-{
-public:
-	Args(int _argc, char**& _argv);
-
-	template<class T> // Get the argument automatically in any format that stringstream can output to
-	void GetValueC(int ind, T& var, std::ios_base::fmtflags flags = std::ios_base::dec, bool param2 = false)
-	{
-		std::stringstream _tmpstr;
-
-		_tmpstr << GetValue(ind, param2);
-		_tmpstr.flags(flags);
-		_tmpstr >> var;
-	}
-
-	int GetArgs(); // Get number of args
-	std::string GetArgv(int ind); // Get the arg based on true index
-	bool IsLongOption(int ind); // Is that argument a --long-key=value
-	bool IsShortOption(int ind, bool param2 = false); // Is that argument a --long-key=value
-
-	std::string GetKey(int ind); // Get the key, if not a key/value then returns the arg
-	std::string GetValue(int ind, bool param2 = false); // Get the value, if not a key/value then returns the arg
-
-	int SearchKeys(const char* str); // Return the index number of found key or -1 if not found
-
-private:
-	int argc;
-	std::vector<std::string> argv;
-};
-
-#endif

music/pokeredmusicdisasm/main.cpp

@@ -1,122 +0,0 @@
-#include "Console.h"
-#include "Parser.h"
-#include "args.h"
-#include <sstream>
-#include <string>
-
-using namespace std;
-
-void PrintUsage()
-{
-	Console::PrintLn("Usage: [<offset> [<file> | --]]");
-	Console::PrintLn("Usage: [--offset=<offset> | -o <offset>] [--file=[<file> | --] | -f [<file> | --]] [--stop=<offset> | -s <offset>]");
-	Console::PrintLn("Usage: [-h | --help]");
-	Console::PrintLn("");
-	Console::PrintLn("Used without parameters will start in limited interactive mode where the program will ask you the file and offset");
-	Console::PrintLn("An offset is a requirement but the file may be blank or explicitly set, whenever the file is set you may use '--' to substitute for the default file '../baserom.gbc'");
-	Console::PrintLn("If parameter options are not used the ordering is important:");
-	Console::PrintLn("There is an intentional glitch in the program, since long paramaters must be specified with --xxx= with or without a value, you may use the short option instead -xxx even though it's suppose to be -xxx=");
-		Console::PrintLn("\t* <offset> <file>");
-	Console::PrintLn("If parameter options are used the ordering does not matter, ensure the <offset> parameter option or parameter is present");
-	Console::PrintLn("You may mix and match parameters and parameter options, keep in mind that bare parameters must be in a certain order");
-	Console::PrintLn("If the offset parameter is missing in any way the program will prompt you for it");
-	Console::PrintLn("The program will stop parsing when it encounters mus_end regardlessly");
-	Console::PrintLn("Parameter types");
-		Console::PrintLn("\t* <xxx> - Bare parameter, they must be in a certain order");
-		Console::PrintLn("\t* -xxx=xxx - Long parameter option, it can be in any order but is case sensitive, can contain no spaces, must contain the equal sign, and is read literally");
-		Console::PrintLn("\t* -xxx xxx - Short parameter option, it can be in any order but is case sensitive, must contain 1 space and is read literally");
-	Console::PrintLn("----");
-	Console::PrintLn("Breakdown of parameters:");
-	Console::PrintLn("<offset> - A bare parameter, it must be in hexidecimal eith alone or prefixed with 0x and be the first parameter. It tells the parser where to start parsing");
-	Console::PrintLn("<file> - A bare parameter, it must be the second parameter and tells the parser which rom file to parse");
-	Console::PrintLn("-- - A special file path value meaning use the default file '../baserom.gbc'");
-	Console::PrintLn("--offset, -o - the parameterized offset in hexidecimal, It tells the parser where to start parsing");
-	Console::PrintLn("--file, -f - the parameterized file path, It tells the parser which rom file to parse");
-	Console::PrintLn("--stop, -s - tells the parser to stop at that hexidecimal address or until it reaches mus_end.");
-	Console::PrintLn("-fo - must be used with --stop, forces the program to proceed on despite discovering any mus_end");
-	Console::PrintLn("help, --help, -h - prints this info and exits, if the bare parameter is used it must be the first parameter");
-}
-
-/* 
-	Usage:
-		pokeredmusicdisasm [<offset> [<file> | --]]
-		pokeredmusicdisasm [--offset=<offset> | -o <offset>] [--file=[<file> | --] | -f [<file> | --]] [--stop=<offset> | -s <offset>]
-*/
-int main(int argc, char** argv)
-{
-	Args a(argc, argv);
-
-	const unsigned char parameters = 2;
-	const string defFileLoc = "../baserom.gbc";
-
-	string filePath = "";
-	unsigned int offset = 0;
-	unsigned int stop = 0;
-	bool force = false;
-
-	// Get the file path, this can be set with -f filename, --file=filename, arg #2, or missing (missing means default)
-	// the filepath can contain the actual filename or -- to use the built-in path, if the path is not missing then it must be set (can't be blank)
-	
-	// Is the user asking for help with -h, --help=, or help
-	if((a.SearchKeys("h") != -1) || (a.SearchKeys("help") != -1) || (a.GetArgv(1) == "help"))
-	{
-		PrintUsage();
-		return 0;
-	}
-
-	// Does a -f or --file key exist
-	if(a.SearchKeys("f") != -1) filePath = a.GetValue(a.SearchKeys("f"), true);
-	else if(a.SearchKeys("file") != -1) filePath = a.GetValue(a.SearchKeys("file"));
-
-	// BUG FIX: a short parameter can be either 1 or 2 parts so this causes the if statement below to load incorrect info if
-	// -f or --file isn't specified and the first argument is a short parameter "-x x"
-	else if((a.GetArgs() == (2 + 1)) && (a.IsShortOption(1, true))) filePath = defFileLoc;
-
-	// Does arg #2 exist
-	else if(a.GetArgs() >= 2 + 1) a.GetValueC<string>(2, filePath);
-
-	// Is there at least 1 arg (In that case it's missing and the default can be assumed)
-	else if(a.GetArgs() >= 1 + 1) filePath = defFileLoc;
-
-	// Ask the user
-	else Console::Ask("Filepath: ", filePath);
-
-	if(filePath == "--") filePath = defFileLoc;
-	else if(filePath == "")
-	{
-		Console::PrintLn("Filename can't be blank");
-		return 1;
-	}
-
-	// Get the offset, this can be set with -o <offset>, --offset=<offset>, or as arg #1
-	if(a.SearchKeys("o") != -1) a.GetValueC<unsigned int>(a.SearchKeys("o"), offset, ios_base::hex | ios_base::uppercase, true);
-	else if(a.SearchKeys("offset") != -1) a.GetValueC(a.SearchKeys("offset"), offset, ios_base::hex | ios_base::uppercase);
-
-	// Does arg #1 exist
-	else if(a.GetArgs() >= 1 + 1) a.GetValueC<unsigned int>(1, offset, ios_base::hex | ios_base::uppercase);
-
-	// Ask the user
-	else Console::Ask<unsigned int>("Offset: ", offset, ios_base::hex | ios_base::uppercase);
-
-	// Get the stop parameter, this can be set with -s <offset>, --stop=<offset> (it must be set via args)
-	if(a.SearchKeys("s") != -1) a.GetValueC<unsigned int>(a.SearchKeys("s"), stop, ios_base::hex | ios_base::uppercase, true);
-	else if(a.SearchKeys("stop") != -1) filePath = a.GetValue(a.SearchKeys("stop"));
-
-	// Get the force parameter, this can be set with -f (it must be set via args)
-	if(a.SearchKeys("fo") != -1) force = true;
-
-	if((stop == 0) && (force == true))
-	{
-		Console::ErrorLn("Error! You set the force command but did not set the stop command, this means it will parse every line until the end of the rom.");
-		return 1;
-	}
-
-	Parser p(filePath);
-	if(stop != 0) p.SetStopAddress(stop);
-	if(force) p.SetForce(true);
-	p.Parse(offset);
-
-	Console::PrintLn(p.GetParsedAsm().c_str());
-
-	return 0; 
-}

music/pokeredwavptnvis/Console.cpp

@@ -1,54 +0,0 @@
-#include "Console.h"
-
-using namespace std;
-
-// Basic
-void Console::Get(char* value)
-{
-    cin >> value;
-}
-void Console::Get(string& value)
-{
-    cin >> value;
-}
-void Console::Print(const char* value)
-{
-    cout << value;
-}
-void Console::Error(const char* value)
-{
-    cerr << value;
-}
-
-// Upper-Basic
-void Console::PrintLn(const char* value)
-{
-    Print(value);
-    cout << endl;
-}
-void Console::ErrorLn(const char* value)
-{
-    Error(value);
-    cerr << endl;
-}
-
-// Higher
-void Console::Ask(const char* question, char* answer)
-{
-    Print(question);
-    Get(answer);
-}
-void Console::Ask(const char* question, string& answer)
-{
-    Print(question);
-    Get(answer);
-}
-
-// Better Error Handling
-int Console::atoi_ex(const char* input, bool supress)
-{
-	//int convInp = atoi(input);
-	//if((supress == false) && (convInp == 0))
-	//		PrintLn("Warning: the converted integer input is 0, this may not be what you intended");
-	//	return convInp;
-}

music/pokeredwavptnvis/Console.h

@@ -1,29 +0,0 @@
-#ifndef CONSOLE_H
-#define CONSOLE_H
-
-#include <iostream>
-#include <string>
-
-// Just a Console Utility Library
-class Console
-{
-public:
-    // Basic
-    static void Get(char* value);
-    static void Get(std::string& value);
-    static void Print(const char* value);
-    static void Error(const char* value);
-
-    // Upper-Basic
-    static void PrintLn(const char* value);
-    static void ErrorLn(const char* value);
-
-    // Higher
-    static void Ask(const char* question, char* answer);
-    static void Ask(const char* question, std::string& answer);
-
-    // Better Error Handling
-    static int atoi_ex(const char* input, bool supress = false);
-};
-
-#endif // CONSOLE_H

music/pokeredwavptnvis/Makefile

@@ -1,18 +0,0 @@
-
-OBJECTS = Console.o main.o
-
-CC = g++
-CFLAGS = -std=c++0x
-
-pokeredwavptnvis: $(OBJECTS)
-	$(CC) $(CFLAGS) $(OBJECTS) -o "../../extras/pokeredwavptnvis.exe"
-
-Console.o: Console.h
-	$(CC) $(CFLAGS) -c Console.cpp
-
-main.o: main.cpp Console.h
-	$(CC) $(CFLAGS) -c main.cpp Console.cpp
-
-clean:
-	rm *.o
-	rm ../../extras/pokeredwavptnvis.exe

music/pokeredwavptnvis/README.txt

@@ -1,17 +0,0 @@
-to compile you must have g++ installed
-type: make
-and it will install to the extras folder
-
-if you want to unmake
-type: make clean
-and it will remove make objects and the executable
-
-the program usage is: pokeredwavptnvis [<offset> [<file> | --]
-offset is the rom offset in hexidecimal (FFFF or 0xFFFF)
-file is the rom file, you can use -- for "../baserom.gbc"
-
-to make things quick and easy you can just enter the hexidecimal offset
-pokeredwavptnvis <offset>
-
-you may enter limited interactive mode by not supplying any arguments
-pokeredwavptnvis

music/pokeredwavptnvis/main.cpp

@@ -1,156 +0,0 @@
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <vector>
-
-#include "Console.h"
-
-using namespace std;
-
-char* rawBytes = 0;
-unsigned int fileLength = 0;
-
-void Read(const char* filename)
-{
-	// open File
-	fstream tmpFile(filename, ios_base::in | ios_base::binary);
-
-	// Get Length
-	tmpFile.seekg(0, ios::end);
-	fileLength = tmpFile.tellg();
-	tmpFile.seekg(0, ios::beg);
-
-	// Allocate proper memory
-	rawBytes = new char[fileLength];
-
-	// Read filedata
-	tmpFile.read(rawBytes, fileLength);
-	tmpFile.close();
-}
-
-unsigned char GetNibble(unsigned char byte, bool high)
-{
-	if(high)
-	{
-		unsigned char tmp = byte & 0xF0;
-		tmp >>= 4;
-		return tmp;
-	}
-	else
-	{
-		unsigned char tmp = byte & 0x0F;
-		return tmp;
-	}
-}
-
-// Usage: pokeredwavptnvis [<offset> [<file> | --]]
-// If no parameters or a parameter is missing the program enters limited interactive mode
-int main(int argc, char** argv)
-{
-	const unsigned char parameters = 2;
-	const unsigned char self = 1;
-	const unsigned char _max_argc = parameters + self;
-	const string defFileLoc = "../baserom.gbc";
-
-	string arg1;	// Offset
-	string arg2;	// File or "--" (if "--" then the file is assumed)
-
-	string paramStopAddr;
-
-	if(argc >= _max_argc)
-	{
-		arg1 = argv[1];
-		arg2 = argv[2];
-	}
-	else if(argc == (_max_argc - 1))
-	{
-		arg1 = argv[1];
-		arg2 = defFileLoc;
-	}
-
-	if(arg1 == "") Console::Ask("What offset in the file in hex: ", arg1);
-	if(arg2 == "") Console::Ask("What file: ", arg2);
-	if(arg2 == "--") arg2 = defFileLoc;	// You can also put "--" for the default file location
-
-	stringstream arg1Conv;
-	unsigned int arg1ConvNum;
-	arg1Conv << arg1;
-	arg1Conv << hex;
-	arg1Conv >> arg1ConvNum;
-
-	Read(arg2.c_str());
-	unsigned char* rawBytesFixed = (unsigned char*)rawBytes;
-
-	// All the loading is done, create a 32x16 vector
-	vector<vector<bool>> image;
-	vector<string> lines;	// This is the array of output lines
-
-	// Initialize the vector image[x][y] and lines
-	for(unsigned char i = 0; i < 32; i++)
-	{
-		image.push_back(vector<bool>());
-
-		for(unsigned char j = 0; j < 16; j++)
-		{
-			image[i].push_back(false);
-			lines.push_back("");
-		}
-	}
-
-	unsigned char n1 = 0;
-	unsigned char n2 = 0;
-
-	vector<unsigned char> expBytes;
-	for(unsigned char i = 0; i < 16; i++)
-	{
-		n1 = GetNibble(rawBytesFixed[arg1ConvNum + i], true);
-		n2 = GetNibble(rawBytesFixed[arg1ConvNum + i], false);
-
-		expBytes.push_back(n1);
-		expBytes.push_back(n2);
-	}
-
-	// Go through each column in the vector and add a 1 on the appropiate line
-	for(unsigned char i = 0; i < 32; i++)
-	{
-		unsigned char _tmpVal = expBytes[i];	// Here for debugging reasons
-		image[i][_tmpVal] = true;
-	}
-
-	// Now draw the image
-	for(unsigned char i = 0; i < 32; i++)
-	{
-		for(unsigned char j = 0; j < 16; j++)
-		{
-			if(i == 0)
-			{
-				if(image[i][j]) lines[j].append("|*");
-				else lines[j].append("| ");
-			}
-			else if((i > 0) && (i < 31))
-			{
-				if(image[i][j]) lines[j].append(".*");
-				else lines[j].append(". ");
-			}
-			else
-			{
-				if(image[i][j]) lines[j].append(".*|");
-				else lines[j].append(". |");
-			}
-		}
-	}
-
-	// Now output the drawn lines (mirrored)
-	stringstream tmpCtr;
-	Console::PrintLn("  0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F");
-	Console::PrintLn("  ---------------------------------------------------------------");
-	for(unsigned char i = 0xF; (i >= 0x0) && (i < 0x10); i--)
-	{
-		tmpCtr << hex << uppercase << (short)i;
-		Console::Print(tmpCtr.str().c_str());
-		Console::PrintLn(lines[i].c_str());
-		tmpCtr.str("");
-	}
-
-	return 0;
-}

music/routes1.asm

@@ -0,0 +1,405 @@
+Music_Routes1_Ch1: ; 9bde (2:5bde)
+	tempo 0, 152
+	stereopanning 119
+	vibrato 4, 2, 3
+	duty 2
+	unknownmusic0xe8
+
+Music_Routes1_branch_9be9:
+	notetype 12, 10, 1
+	rest 4
+	octave 4
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note A_, 2
+	note A_, 2
+	note A_, 6
+	octave 4
+	note C#, 2
+	note C#, 6
+	note C#, 2
+	note C#, 4
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 4
+	octave 3
+	note A_, 2
+	note A_, 6
+	octave 4
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
+	octave 3
+	note B_, 2
+	note A_, 2
+	note A_, 6
+	octave 4
+	note C#, 2
+	note C#, 6
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 2
+	octave 3
+	note A_, 2
+	notetype 12, 10, 2
+	octave 4
+	note G_, 4
+	note E_, 4
+	note F#, 2
+	notetype 12, 10, 1
+	octave 3
+	note A_, 2
+	note A_, 6
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note B_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 4
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note G_, 2
+	note E_, 2
+	note C#, 4
+	note A_, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note A_, 4
+	note B_, 2
+	note G_, 2
+	note B_, 4
+	octave 4
+	note D_, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
+	octave 3
+	note A_, 2
+	note A_, 2
+	loopchannel 0, Music_Routes1_branch_9be9
+	endchannel
+
+
+Music_Routes1_Ch2: ; 9c51 (2:5c51)
+	duty 2
+
+Music_Routes1_branch_9c53:
+	notetype 12, 13, 1
+	callchannel Music_Routes1_branch_9c65
+	callchannel Music_Routes1_branch_9c78
+	callchannel Music_Routes1_branch_9c65
+	callchannel Music_Routes1_branch_9c8d
+	loopchannel 0, Music_Routes1_branch_9c53
+
+Music_Routes1_branch_9c65:
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note G_, 3
+	note F#, 1
+	note E_, 6
+	endchannel
+
+Music_Routes1_branch_9c78:
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note D_, 4
+	note F#, 2
+	endchannel
+
+Music_Routes1_branch_9c8d:
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	notetype 12, 13, 2
+	note B_, 4
+	notetype 6, 13, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	notetype 12, 13, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	note D_, 6
+	notetype 12, 13, 2
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	note F#, 2
+	note D_, 3
+	note F#, 1
+	note E_, 6
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	octave 4
+	note B_, 3
+	note G_, 1
+	note A_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note D_, 2
+	notetype 12, 13, 1
+	octave 4
+	note D_, 2
+	note D_, 2
+	endchannel
+	endchannel
+
+
+Music_Routes1_Ch3: ; 9cd8 (2:5cd8)
+	vibrato 8, 2, 5
+	notetype 12, 1, 3
+
+Music_Routes1_branch_9cdd:
+	rest 2
+	octave 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A_, 4
+	note B_, 4
+	note A_, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note A_, 4
+	note B_, 4
+	octave 4
+	note C_, 4
+	note C#, 4
+	octave 3
+	note A_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A_, 4
+	octave 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A_, 4
+	note B_, 4
+	note A_, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note B_, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note A_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note A_, 4
+	octave 4
+	note D_, 8
+	octave 3
+	note G_, 8
+	note A_, 8
+	octave 4
+	note C#, 8
+	note D_, 8
+	octave 3
+	note G_, 8
+	note A_, 8
+	octave 4
+	note D_, 6
+	loopchannel 0, Music_Routes1_branch_9cdd
+	endchannel
+
+
+Music_Routes1_Ch4: ; 9d24 (2:5d24)
+	dspeed 12
+	rest 4
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 4
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	rest 2
+	dnote 2, mutedsnare1
+	dnote 2, mutedsnare1
+	loopchannel 0, Music_Routes1_Ch4
+	endchannel
+; 0x9db9

music/routes2.asm

@@ -0,0 +1,426 @@
+Music_Routes2_Ch1: ; 9db9 (2:5db9)
+	tempo 0, 152
+	stereopanning 119
+	vibrato 9, 2, 5
+	duty 1
+
+Music_Routes2_branch_9dc3:
+	notetype 12, 11, 2
+	octave 2
+	note B_, 4
+	octave 3
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note E_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note F#, 4
+	octave 2
+	note B_, 4
+	octave 3
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note B_, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note B_, 4
+	notetype 8, 11, 2
+	octave 4
+	note E_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 2
+	note E_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note E_, 2
+	note D#, 2
+	octave 3
+	note G#, 2
+	octave 4
+	note D#, 2
+	note D#, 2
+	octave 3
+	note G#, 2
+	octave 4
+	note D#, 2
+	note C#, 2
+	octave 3
+	note F#, 2
+	octave 4
+	note C#, 2
+	note C#, 2
+	octave 3
+	note F#, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note E_, 2
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note E_, 2
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note E_, 2
+	note E_, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note E_, 2
+	loopchannel 0, Music_Routes2_branch_9dc3
+	endchannel
+
+
+Music_Routes2_Ch2: ; 9e4f (2:5e4f)
+	vibrato 8, 2, 6
+	duty 3
+
+Music_Routes2_branch_9e54:
+	notetype 12, 13, 4
+	octave 4
+	note E_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note F#, 8
+	octave 3
+	note D#, 4
+	octave 4
+	note E_, 6
+	octave 3
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note B_, 8
+	octave 3
+	note G#, 4
+	octave 5
+	note C#, 6
+	octave 4
+	note B_, 1
+	note A_, 1
+	note B_, 6
+	note A_, 1
+	note G#, 1
+	note A_, 6
+	note G#, 1
+	note F#, 1
+	note G#, 4
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F#, 8
+	note A_, 4
+	note G#, 3
+	note F#, 1
+	note E_, 8
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 1
+	note G#, 1
+	note A_, 4
+	octave 5
+	note C#, 4
+	octave 4
+	note B_, 3
+	note A_, 1
+	note G#, 8
+	rest 4
+	loopchannel 0, Music_Routes2_branch_9e54
+	endchannel
+
+
+Music_Routes2_Ch3: ; 9e9b (2:5e9b)
+	vibrato 9, 2, 8
+
+Music_Routes2_branch_9e9e:
+	notetype 12, 1, 1
+	octave 3
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note C#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note A_, 2
+	rest 2
+	octave 3
+	note D#, 2
+	rest 2
+	octave 2
+	note G#, 2
+	rest 2
+	octave 3
+	note C#, 2
+	rest 2
+	octave 2
+	note F#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	octave 3
+	note C#, 2
+	rest 2
+	octave 2
+	note A_, 2
+	octave 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note E_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	rest 2
+	loopchannel 0, Music_Routes2_branch_9e9e
+	endchannel
+
+
+Music_Routes2_Ch4: ; 9f08 (2:5f08)
+	dspeed 12
+	dnote 2, snare3
+	rest 2
+	dnote 1, snare3
+	rest 5
+	dnote 1, snare3
+	dnote 1, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	rest 2
+	dspeed 8
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	dnote 3, snare3
+	dspeed 12
+	dnote 1, snare3
+	rest 3
+	dnote 2, snare3
+	rest 2
+	dnote 2, snare3
+	rest 4
+	dnote 1, snare3
+	dnote 1, snare3
+	dnote 2, snare3
+	rest 2
+	dnote 2, snare3
+	rest 2
+	dspeed 8
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	dnote 3, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	rest 3
+	dspeed 12
+	dnote 1, snare3
+	rest 5
+	dnote 1, snare3
+	dnote 1, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	rest 2
+	dspeed 8
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	rest 3
+	dspeed 12
+	dnote 1, snare3
+	rest 3
+	dnote 2, snare3
+	rest 2
+	dnote 2, snare3
+	rest 4
+	dnote 1, snare3
+	dnote 1, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	rest 2
+	dspeed 8
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	rest 3
+	dnote 3, snare3
+	dnote 3, snare3
+	dnote 3, snare3
+	rest 3
+	dspeed 12
+	dnote 1, snare3
+	rest 5
+	dnote 1, snare3
+	dnote 1, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	rest 2
+	dspeed 8
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 2, snare3
+	dnote 3, snare3
+	rest 3
+	dnote 3, snare3
+	rest 3
+	loopchannel 0, Music_Routes2_Ch4
+	endchannel
+; 0x9fad

music/routes3.asm

@@ -0,0 +1,516 @@
+Music_Routes3_Ch1: ; 9fad (2:5fad)
+	tempo 0, 148
+	stereopanning 119
+	duty 3
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	notetype 12, 11, 5
+	octave 3
+	note E_, 1
+	note F#, 1
+	note G_, 6
+	note F_, 1
+	note G_, 1
+	note E_, 1
+	rest 16
+	rest 15
+
+Music_Routes3_branch_9fc3:
+	notetype 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	notetype 12, 10, 7
+	note A#, 8
+	note F_, 8
+	note D_, 8
+	note F_, 8
+	notetype 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	notetype 12, 10, 7
+	note A#, 8
+	note A#, 8
+	note D_, 8
+	note F_, 8
+	notetype 12, 11, 5
+	note E_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note B_, 2
+	octave 2
+	note G_, 4
+	octave 3
+	note B_, 8
+	note A_, 2
+	notetype 8, 12, 3
+	note A_, 4
+	note F_, 4
+	note A_, 4
+	notetype 8, 4, 15
+	note A_, 12
+	notetype 8, 9, 0
+	note F_, 12
+	note G_, 12
+	loopchannel 0, Music_Routes3_branch_9fc3
+
+
+Music_Routes3_Ch2: ; a009 (2:6009)
+	vibrato 8, 2, 3
+	duty 2
+	notetype 12, 12, 7
+	octave 3
+	note G_, 1
+	note A#, 1
+	note B_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 1
+	rest 15
+	rest 16
+
+Music_Routes3_branch_a01a:
+	notetype 12, 12, 7
+	duty 2
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 10
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	notetype 12, 12, 5
+	duty 3
+	octave 3
+	note A#, 8
+	note A_, 8
+	notetype 12, 12, 7
+	duty 2
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	note E_, 10
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	notetype 12, 12, 5
+	duty 3
+	octave 3
+	note A#, 8
+	octave 4
+	note D_, 6
+	notetype 12, 12, 7
+	duty 2
+	note C_, 1
+	note D_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 8
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 1
+	note D_, 2
+	octave 3
+	note G_, 4
+	octave 4
+	note G_, 8
+	note F_, 1
+	note E_, 1
+	notetype 8, 13, 3
+	note F_, 4
+	note E_, 4
+	notetype 8, 12, 4
+	note C_, 4
+	notetype 8, 12, 5
+	note C_, 12
+	notetype 12, 10, 0
+	duty 3
+	octave 3
+	note A_, 8
+	note B_, 8
+	loopchannel 0, Music_Routes3_branch_a01a
+
+
+Music_Routes3_Ch3: ; a07f (2:607f)
+	vibrato 4, 1, 0
+	notetype 6, 1, 2
+	octave 4
+	note G_, 2
+	note A#, 2
+	note B_, 8
+	note A_, 8
+	note G_, 2
+	rest 2
+	note G_, 7
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note G_, 8
+	note G_, 2
+	rest 2
+	note G_, 7
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note G_, 8
+
+Music_Routes3_branch_a0a3:
+	notetype 12, 1, 2
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 2
+	note F_, 2
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 2
+	note A_, 2
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 4
+	octave 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 4
+	octave 4
+	note F_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note F_, 1
+	rest 1
+	note A_, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 4
+	loopchannel 0, Music_Routes3_branch_a0a3
+
+
+Music_Routes3_Ch4: ; a131 (2:6131)
+	dspeed 6
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+
+Music_Routes3_branch_a17a:
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 10, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 10, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 10, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 8, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 12, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	loopchannel 0, Music_Routes3_branch_a17a
+; 0xa26a

music/routes4.asm

@@ -0,0 +1,682 @@
+Music_Routes4_Ch1: ; a26a (2:626a)
+	tempo 0, 148
+	stereopanning 119
+	duty 3
+	vibrato 10, 3, 4
+	unknownmusic0xe8
+	notetype 12, 10, 2
+	octave 2
+	note G#, 4
+	note G#, 4
+	note G#, 4
+	notetype 12, 7, 15
+	note G#, 4
+	notetype 12, 10, 2
+	note G#, 4
+	note G#, 4
+	note G#, 4
+	notetype 12, 11, 7
+	note B_, 1
+	octave 3
+	note E_, 1
+	note F#, 1
+	note B_, 1
+
+Music_Routes4_branch_a28a:
+	notetype 12, 11, 7
+	note B_, 6
+	note E_, 2
+	note E_, 4
+	octave 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	notetype 12, 11, 1
+	note G#, 3
+	notetype 12, 11, 7
+	note E_, 1
+	note F#, 12
+	note E_, 8
+	note D#, 4
+	note F#, 4
+	note B_, 6
+	note E_, 2
+	note E_, 4
+	octave 4
+	note E_, 4
+	note D_, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 4
+	notetype 12, 11, 1
+	note E_, 3
+	notetype 12, 11, 7
+	note D#, 1
+	note E_, 12
+	octave 3
+	note B_, 3
+	note A_, 1
+	note G#, 8
+	octave 4
+	note E_, 4
+	octave 3
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D_, 2
+	note D_, 2
+	octave 3
+	note A_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note D#, 2
+	note E_, 2
+	octave 3
+	note B_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note B_, 2
+	notetype 8, 11, 5
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	octave 4
+	note E_, 4
+	note D#, 4
+	note C#, 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note B_, 4
+	octave 4
+	note C#, 4
+	note D#, 4
+	octave 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	note B_, 4
+	octave 4
+	note C#, 4
+	note D#, 4
+	note E_, 3
+	octave 3
+	note B_, 3
+	note G#, 3
+	note F#, 3
+	note E_, 3
+	note F#, 3
+	note G#, 3
+	note A_, 3
+	loopchannel 0, Music_Routes4_branch_a28a
+
+
+Music_Routes4_Ch2: ; a304 (2:6304)
+	vibrato 12, 2, 4
+	duty 1
+	notetype 12, 9, 2
+	octave 3
+	note E_, 3
+	note F#, 1
+	notetype 12, 9, 0
+	note E_, 12
+	notetype 12, 9, 2
+	octave 2
+	note B_, 3
+	octave 3
+	note C_, 1
+	notetype 12, 9, 0
+	octave 2
+	note B_, 8
+	duty 3
+	notetype 12, 12, 7
+	octave 3
+	note E_, 1
+	note F#, 1
+	note B_, 1
+	octave 4
+	note D#, 1
+
+Music_Routes4_branch_a325:
+	notetype 12, 12, 7
+	note E_, 6
+	octave 3
+	note B_, 2
+	note B_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note F#, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	notetype 12, 12, 2
+	note G#, 3
+	note E_, 1
+	notetype 12, 10, 0
+	octave 3
+	note B_, 12
+	duty 0
+	notetype 12, 12, 2
+	octave 2
+	note B_, 3
+	notetype 12, 12, 7
+	octave 3
+	note C_, 1
+	octave 2
+	note B_, 8
+	octave 3
+	note D#, 4
+	duty 3
+	octave 4
+	note E_, 6
+	octave 3
+	note B_, 2
+	note B_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note A_, 1
+	octave 5
+	note C#, 1
+	octave 4
+	note B_, 1
+	note A_, 1
+	notetype 12, 12, 2
+	note B_, 3
+	notetype 12, 12, 7
+	note A_, 1
+	notetype 12, 11, 0
+	note G#, 6
+	notetype 12, 9, 0
+	note G#, 6
+	notetype 12, 7, 0
+	note G#, 6
+	notetype 12, 6, 15
+	note G#, 6
+	notetype 12, 12, 7
+	note G#, 4
+	notetype 8, 12, 3
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	notetype 8, 9, 0
+	note F#, 6
+	notetype 8, 7, 15
+	note F#, 6
+	duty 0
+	notetype 8, 9, 0
+	octave 3
+	note F#, 4
+	note E_, 4
+	note F#, 4
+	note A_, 6
+	duty 3
+	notetype 8, 12, 7
+	octave 4
+	note F#, 6
+	note G#, 4
+	note F#, 4
+	notetype 8, 12, 4
+	note E_, 4
+	notetype 8, 10, 0
+	note E_, 12
+	duty 0
+	notetype 8, 9, 0
+	octave 3
+	note E_, 4
+	note D#, 4
+	note E_, 4
+	note G#, 6
+	duty 3
+	notetype 8, 12, 7
+	octave 4
+	note E_, 6
+	note F#, 4
+	note D#, 4
+	octave 3
+	note B_, 4
+	notetype 8, 10, 0
+	octave 4
+	note B_, 16
+	notetype 8, 10, 7
+	note B_, 8
+	notetype 8, 11, 0
+	note A_, 6
+	notetype 8, 11, 7
+	note A_, 6
+	notetype 12, 10, 7
+	note G#, 1
+	note F#, 1
+	notetype 12, 11, 0
+	note E_, 12
+	notetype 12, 10, 0
+	note E_, 8
+	notetype 12, 10, 7
+	note E_, 10
+	loopchannel 0, Music_Routes4_branch_a325
+
+
+Music_Routes4_Ch3: ; a3c4 (2:63c4)
+	notetype 12, 1, 0
+	octave 4
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 3
+	note D#, 1
+	rest 3
+
+Music_Routes4_branch_a3d7:
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note A_, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note A_, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note D_, 1
+	rest 3
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
+	rest 1
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	note F#, 1
+	rest 1
+	note F#, 1
+	rest 3
+	note F#, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 3
+	note B_, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	rest 1
+	note G#, 1
+	rest 3
+	note G#, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 3
+	note D#, 1
+	rest 1
+	loopchannel 0, Music_Routes4_branch_a3d7
+
+
+Music_Routes4_Ch4: ; a49d (2:649d)
+	dspeed 12
+	rest 16
+	rest 12
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+
+Music_Routes4_branch_a4a8:
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 4, mutedsnare2
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare4
+	dnote 1, mutedsnare3
+	dnote 1, mutedsnare3
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	dnote 2, mutedsnare2
+	loopchannel 0, Music_Routes4_branch_a4a8
+; 0xa5f0

music/safarizone.asm

@@ -0,0 +1,112 @@
+Music_SafariZone_Ch1: ; bc2e (2:7c2e)
+	tempo 0, 132
+	stereopanning 119
+	vibrato 6, 3, 4
+	unknownmusic0xe8
+	duty 2
+	notetype 12, 9, 2
+	octave 3
+	pitchbend 0, 73
+	note C_, 1
+	pitchbend 0, 73
+	note G_, 1
+	pitchbend 0, 73
+	note C_, 1
+	pitchbend 0, 73
+	note G_, 1
+	rest 4
+	duty 3
+
+Music_SafariZone_branch_bc4f:
+	callchannel Music_SafariZone_branch_bc5f
+	notetype 12, 10, 4
+	note F#, 4
+	callchannel Music_SafariZone_branch_bc5f
+	notetype 12, 10, 4
+	note F#, 4
+	loopchannel 0, Music_SafariZone_branch_bc4f
+
+Music_SafariZone_branch_bc5f:
+	notetype 12, 10, 2
+	octave 3
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	endchannel
+
+
+Music_SafariZone_Ch2: ; bc6a (2:7c6a)
+	duty 2
+	vibrato 8, 2, 5
+	notetype 12, 10, 2
+	octave 4
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	rest 4
+	duty 3
+
+Music_SafariZone_branch_bc79:
+	callchannel Music_SafariZone_branch_bc89
+	notetype 12, 11, 5
+	note A_, 4
+	callchannel Music_SafariZone_branch_bc89
+	notetype 12, 11, 5
+	note B_, 4
+	loopchannel 0, Music_SafariZone_branch_bc79
+
+Music_SafariZone_branch_bc89:
+	notetype 12, 11, 2
+	octave 3
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	endchannel
+
+
+Music_SafariZone_Ch3: ; bc94 (2:7c94)
+	notetype 12, 1, 0
+	rest 8
+
+Music_SafariZone_branch_bc97:
+	callchannel Music_SafariZone_branch_bca5
+	octave 4
+	note A_, 4
+	callchannel Music_SafariZone_branch_bca5
+	octave 4
+	note B_, 4
+	loopchannel 0, Music_SafariZone_branch_bc97
+
+Music_SafariZone_branch_bca5:
+	octave 3
+	note A_, 2
+	rest 2
+	octave 4
+	note D_, 2
+	rest 2
+	octave 3
+	note A_, 2
+	rest 2
+	octave 4
+	note D_, 2
+	rest 2
+	octave 3
+	note A_, 2
+	rest 2
+	octave 4
+	note D_, 2
+	rest 2
+	octave 3
+	note A_, 2
+	rest 2
+	endchannel
+; 0xbcbb

music/sfx/sfx_02_01.asm

@@ -0,0 +1,6 @@
+SFX_02_01_Ch1: ; 82fd (2:42fd)
+	note D_, 1
+	rest 2
+	note D#, 4
+	endchannel
+; 0x8301

music/sfx/sfx_02_02.asm

@@ -0,0 +1,6 @@
+SFX_02_02_Ch1: ; 8301 (2:4301)
+	note D_, 1
+	note B_, 2
+	note D#, 4
+	endchannel
+; 0x8305

music/sfx/sfx_02_03.asm

@@ -0,0 +1,6 @@
+SFX_02_03_Ch1: ; 8305 (2:4305)
+	note D_, 1
+	note A#, 2
+	note D#, 4
+	endchannel
+; 0x8309

music/sfx/sfx_02_04.asm

@@ -0,0 +1,6 @@
+SFX_02_04_Ch1: ; 8309 (2:4309)
+	note D_, 1
+	note G#, 2
+	note D#, 4
+	endchannel
+; 0x830d

music/sfx/sfx_02_05.asm

@@ -0,0 +1,21 @@
+SFX_02_05_Ch1: ; 830d (2:430d)
+	note D_, 8
+	note G#, 5
+	note D#, 8
+	note D_, 7
+	note G#, 5
+	note D#, 7
+	note D_, 6
+	note G#, 4
+	note D#, 6
+	note D_, 5
+	note G#, 4
+	note D#, 5
+	note D_, 4
+	note G#, 3
+	note D#, 4
+	note D_, 3
+	note G#, 2
+	note D#, 3
+	endchannel
+; 0x8320

music/sfx/sfx_02_06.asm

@@ -0,0 +1,6 @@
+SFX_02_06_Ch1: ; 8320 (2:4320)
+	note D_, 1
+	note F_, 2
+	note D_, 11
+	endchannel
+; 0x8324

music/sfx/sfx_02_07.asm

@@ -0,0 +1,9 @@
+SFX_02_07_Ch1: ; 8324 (2:4324)
+	note D_, 2
+	note E_, 2
+	note D_, 12
+	note D_, 1
+	note F#, 2
+	note D_, 11
+	endchannel
+; 0x832b

music/sfx/sfx_02_08.asm

@@ -0,0 +1,6 @@
+SFX_02_08_Ch1: ; 832b (2:432b)
+	note D_, 1
+	note G#, 2
+	note C#, 1
+	endchannel
+; 0x832f

music/sfx/sfx_02_09.asm

@@ -0,0 +1,6 @@
+SFX_02_09_Ch1: ; 832f (2:432f)
+	note D_, 1
+	note G#, 3
+	note D_, 4
+	endchannel
+; 0x8333