Merge pull request #46 from yenatch/master

parse and dump music data

constants.asm

@@ -31,6 +31,12 @@ TX_FAR: MACRO
 	db BANK(\1)
 	ENDM
 
+; eventually replace with python macro
+note: MACRO
+	db \1
+	ENDM
+
+
 BULBASAUR  EQU 1
 IVYSAUR    EQU 2
 VENUSAUR   EQU 3
@@ -3152,13 +3158,7 @@ _CH6 EQU $05
 _CH7 EQU $06
 _CH8 EQU $07
 
-note: MACRO
-	db \1
-	ENDM
-; eventually replace with this:
-; note: MACRO
-	; db NOTE_\1 + NOTE_\2
-	; ENDM
+
 
 NOTE_RST EQU $00
 NOTE_C EQU $10
@@ -3192,162 +3192,6 @@ NOTE_14 EQU $0d
 NOTE_15 EQU $0e
 NOTE_16 EQU $0f
 
-octave: MACRO
-; $d0-$d7
-	db $d8 - \1
-	ENDM
-notetype: MACRO
-	db $d8
-	db \1
-	ENDM
-forceoctave: MACRO
-	db $d9
-	db \1
-	ENDM
-tempo: MACRO
-	db $da
-	bigdw \1
-	ENDM
-dutycycle: MACRO
-	db $db
-	db \1
-	ENDM
-intensity: MACRO
-	db $dc
-	db \1
-	ENDM
-soundinput: MACRO
-	db $dd
-	db \1
-	ENDM
-unknownmusic0xde: MACRO
-	db $de
-	db \1
-	ENDM
-unknownmusic0xdf: MACRO
-	db $df
-	ENDM
-unknownmusic0xe0: MACRO
-	db $e0
-	db \1
-	db \2
-	db \3
-	ENDM
-vibrato: MACRO
-	db $e1
-	db \1
-	db \2
-	ENDM
-unknownmusic0xe2: MACRO
-	db $e2
-	db \1
-	ENDM
-togglenoise: MACRO
-	db $e3
-	ENDM
-panning: MACRO
-	db $e4
-	db \1
-	ENDM
-volume: MACRO
-	db $e5
-	db \1
-	ENDM
-tone: MACRO
-	db $e6
-	bigdw \1
-	ENDM
-unknownmusic0xe7: MACRO
-	db $e7
-	db \1
-	ENDM
-unknownmusic0xe8: MACRO
-	db $e8
-	db \1
-	ENDM
-globaltempo : MACRO
-	db $e9
-	bigdw \1
-	ENDM
-restartchannel: MACRO
-	db $ea
-	bigdw \1
-	ENDM
-newsong: MACRO
-	db $eb
-	dw \1
-	ENDM
-sfxpriorityon: MACRO
-	db $ec
-	ENDM
-sfxpriorityoff: MACRO
-	db $ed
-	ENDM
-unknownmusic0xee: MACRO
-	db $ee
-	dw \1
-	ENDM
-stereopanning: MACRO
-	db $ef
-	db \1
-	ENDM
-sfxtogglenoise: MACRO
-	db $f0
-	db \1
-	ENDM
-music0xf1: MACRO
-	db $f1
-	ENDM
-music0xf2: MACRO
-	db $f2
-	ENDM
-music0xf3: MACRO
-	db $f3
-	ENDM
-music0xf4: MACRO
-	db $f4
-	ENDM
-music0xf5: MACRO
-	db $f5
-	ENDM
-music0xf6: MACRO
-	db $f6
-	ENDM
-music0xf7: MACRO
-	db $f7
-	ENDM
-music0xf8: MACRO
-	db $f8
-	ENDM
-unknownmusic0xf9: MACRO
-	db $f9
-	ENDM
-setcondition: MACRO
-	db $fa
-	db \1
-	ENDM
-jumpif: MACRO
-	db $fb
-	db \1
-	dw \2
-	ENDM
-jumpchannel: MACRO
-	db $fc
-	dw \1
-	ENDM
-loopchannel: MACRO
-	db $fd
-	db \1
-	dw \2
-	ENDM
-callchannel: MACRO
-	db $fe
-	dw \1
-	ENDM
-endchannel: MACRO
-	db $ff
-	ENDM
-
 
 
 ; specials

extras/crystal.py

@@ -2934,6 +2934,87 @@ def create_command_classes(debug=False):
     return klasses
 command_classes = create_command_classes()
 
+
+
+music_commands_new = {
+    0xD0: ["octave8"],
+    0xD1: ["octave7"],
+    0xD2: ["octave6"],
+    0xD3: ["octave5"],
+    0xD4: ["octave4"],
+    0xD5: ["octave3"],
+    0xD6: ["octave2"],
+    0xD7: ["octave1"],
+    0xD8: ["notetype", ["note_length", SingleByteParam], ["intensity", SingleByteParam]], # only 1 param on ch3
+    0xD9: ["forceoctave", ["octave", SingleByteParam]],
+    0xDA: ["tempo", ["tempo", MultiByteParam]],
+    0xDB: ["dutycycle", ["duty_cycle", SingleByteParam]],
+    0xDC: ["intensity", ["intensity", SingleByteParam]],
+    0xDD: ["soundinput", ["input", SingleByteParam]],
+    0xDE: ["unknownmusic0xde", ["unknown", SingleByteParam]], # also updates duty cycle
+    0xDF: ["unknownmusic0xdf"],
+    0xE0: ["unknownmusic0xe0", ["unknown", SingleByteParam], ["unknown", SingleByteParam]],
+    0xE1: ["vibrato", ["delay", SingleByteParam], ["extent", SingleByteParam]],
+    0xE2: ["unknownmusic0xe2", ["unknown", SingleByteParam]],
+    0xE3: ["togglenoise", ["id", SingleByteParam]], # this can have 0-1 params!
+    0xE4: ["panning", ["tracks", SingleByteParam]],
+    0xE5: ["volume", ["volume", SingleByteParam]],
+    0xE6: ["tone", ["tone", MultiByteParam]], # big endian
+    0xE7: ["unknownmusic0xe7", ["unknown", SingleByteParam]],
+    0xE8: ["unknownmusic0xe8", ["unknown", SingleByteParam]],
+    0xE9: ["globaltempo", ["value", MultiByteParam]],
+    0xEA: ["restartchannel", ["address", PointerLabelParam]],
+    0xEB: ["newsong", ["id", MultiByteParam]],
+    0xEC: ["sfxpriorityon"],
+    0xED: ["sfxpriorityoff"],
+    0xEE: ["unknownmusic0xee", ["address", PointerLabelParam]],
+    0xEF: ["stereopanning", ["tracks", SingleByteParam]],
+    0xF0: ["sfxtogglenoise", ["id", SingleByteParam]], # 0-1 params
+    0xF1: ["music0xf1"], # nothing
+    0xF2: ["music0xf2"], # nothing
+    0xF3: ["music0xf3"], # nothing
+    0xF4: ["music0xf4"], # nothing
+    0xF5: ["music0xf5"], # nothing
+    0xF6: ["music0xf6"], # nothing
+    0xF7: ["music0xf7"], # nothing
+    0xF8: ["music0xf8"], # nothing
+    0xF9: ["unknownmusic0xf9"],
+    0xFA: ["setcondition", ["condition", SingleByteParam]],
+    0xFB: ["jumpif", ["condition", SingleByteParam], ["address", PointerLabelParam]],
+    0xFC: ["jumpchannel", ["address", PointerLabelParam]],
+    0xFD: ["loopchannel", ["count", SingleByteParam], ["address", PointerLabelParam]],
+    0xFE: ["callchannel", ["address", PointerLabelParam]],
+    0xFF: ["endchannel"],
+}
+
+music_command_enders = [0xEA, 0xEB, 0xEE, 0xFC, 0xFF,]
+# special case for 0xFD (if loopchannel.count = 0, break)
+
+
+
+def create_music_command_classes(debug=False):
+    klasses = [GivePoke]
+    for (byte, cmd) in music_commands_new.items():
+        cmd_name = cmd[0].replace(" ", "_")
+        params = {"id": byte, "size": 1, "end": byte in music_command_enders, "macro_name": cmd_name}
+        params["param_types"] = {}
+        if len(cmd) > 1:
+            param_types = cmd[1:]
+            for (i, each) in enumerate(param_types):
+                thing = {"name": each[0], "class": each[1]}
+                params["param_types"][i] = thing
+                if debug:
+                    print "each is: " + str(each)
+                    print "thing[class] is: " + str(thing["class"])
+                params["size"] += thing["class"].size
+        klass_name = cmd_name+"Command"
+        klass = classobj(klass_name, (Command,), params)
+        globals()[klass_name] = klass
+        klasses.append(klass)
+    # later an individual klass will be instantiated to handle something
+    return klasses
+music_classes = create_music_command_classes()
+
 def generate_macros(filename="../script_macros.asm"):
     """generates all macros based on commands
     this is dumped into script_macros.asm"""

music/aftertherivalfight.asm

@@ -0,0 +1,73 @@
+_Music_AfterTheRivalFight: ; 0xf5127
+	db $c0
+	dw _Music_AfterTheRivalFight_Ch1
+	db $01
+	dw _Music_AfterTheRivalFight_Ch2
+	db $02
+	dw _Music_AfterTheRivalFight_Ch3
+	db $03
+	dw _Music_AfterTheRivalFight_Ch4
+; 0xf5133
+
+_Music_AfterTheRivalFight_Ch1: ; 0xf5133
+	tempo $7000
+	volume $77
+	dutycycle $00
+	tone $0100
+	vibrato $08, $14
+	stereopanning $f0
+	notetype $0c, $b2
+	octave2
+	note $93
+	note $93
+	intensity $82
+	octave3
+	note $91
+	note $91
+	note $91
+	note $91
+	loopchannel $00, $4fb1 ; end
+; 0xf5153
+
+_Music_AfterTheRivalFight_Ch2: ; 0xf5153
+	dutycycle $01
+	vibrato $06, $35
+	stereopanning $0f
+	notetype $0c, $c2
+	octave4
+	note $93
+	note $93
+	intensity $a2
+	note $91
+	note $91
+	note $91
+	note $91
+	loopchannel $00, $502e ; end
+; 0xf516a
+
+_Music_AfterTheRivalFight_Ch3: ; 0xf516a
+	notetype $0c, $28
+	octave3
+	note $41
+	note $01
+	note $41
+	note $01
+	note $91
+	note $71
+	note $61
+	note $41
+	loopchannel $00, $509d ; end
+; 0xf517a
+
+_Music_AfterTheRivalFight_Ch4: ; 0xf517a
+	togglenoise $03
+	stereopanning $0f
+	notetype $0c
+	note $33
+	note $33
+	note $41
+	note $31
+	note $31
+	note $31
+	loopchannel $00, $5118 ; end
+; 0xf518a

music/battletowerlobby.asm

@@ -0,0 +1,313 @@
+_Music_BattleTowerLobby: ; 0x17948b
+	db $c0
+	dw _Music_BattleTowerLobby_Ch1
+	db $01
+	dw _Music_BattleTowerLobby_Ch2
+	db $02
+	dw _Music_BattleTowerLobby_Ch3
+	db $03
+	dw _Music_BattleTowerLobby_Ch4
+; 0x179497
+
+_Music_BattleTowerLobby_Ch1: ; 0x179497
+	tempo $9800
+	volume $77
+	dutycycle $03
+	tone $0100
+	vibrato $08, $22
+	stereopanning $f0
+	notetype $0c, $72
+	notetype $0c, $72
+	octave3
+	note $91
+	notetype $0c, $73
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $91
+	note $51
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $91
+	notetype $0c, $72
+	note $71
+	notetype $0c, $73
+	octave2
+	note $c1
+	octave3
+	note $71
+	note $51
+	note $41
+	octave2
+	note $c1
+	octave3
+	note $41
+	note $71
+	notetype $0c, $72
+	note $91
+	notetype $0c, $73
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $91
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $c1
+	octave4
+	note $51
+	notetype $0c, $72
+	note $72
+	notetype $0c, $73
+	note $30
+	note $51
+	octave3
+	note $c1
+	note $91
+	note $51
+	note $91
+	note $c1
+	notetype $0c, $72
+	note $21
+	notetype $0c, $73
+	note $41
+	note $51
+	note $20
+	octave2
+	note $c0
+	note $a3
+	notetype $0c, $62
+	note $a3
+	notetype $0c, $72
+	note $c1
+	notetype $0c, $73
+	octave3
+	note $21
+	note $41
+	note $50
+	note $70
+	note $93
+	notetype $0c, $62
+	octave2
+	note $93
+	notetype $0c, $72
+	note $a1
+	notetype $0c, $73
+	note $c1
+	octave3
+	note $21
+	note $30
+	note $50
+	note $31
+	note $51
+	note $71
+	note $a1
+	notetype $0c, $72
+	note $c1
+	notetype $0c, $73
+	note $c3
+	note $a0
+	note $90
+	notetype $0c, $72
+	note $73
+	notetype $0c, $75
+	octave2
+	note $c3
+	loopchannel $00, $54a9 ; end
+; 0x17953a
+
+_Music_BattleTowerLobby_Ch2: ; 0x17953a
+	dutycycle $02
+	vibrato $10, $34
+	stereopanning $0f
+	notetype $0c, $82
+	notetype $0c, $82
+	octave4
+	note $51
+	note $53
+	octave3
+	note $c0
+	octave4
+	note $50
+	note $c3
+	note $a1
+	note $91
+	note $a2
+	note $50
+	octave3
+	note $c3
+	notetype $0c, $65
+	note $73
+	octave2
+	note $c3
+	notetype $0c, $82
+	octave4
+	note $51
+	note $53
+	octave3
+	note $c0
+	octave4
+	note $50
+	note $c3
+	note $a1
+	note $91
+	note $a2
+	note $70
+	notetype $0c, $87
+	note $9b
+	notetype $0c, $82
+	octave3
+	note $a1
+	notetype $0c, $84
+	note $a3
+	note $70
+	note $90
+	note $a3
+	notetype $0c, $82
+	note $23
+	octave4
+	note $91
+	notetype $0c, $84
+	note $93
+	note $70
+	note $90
+	note $53
+	notetype $0c, $82
+	octave3
+	note $53
+	octave4
+	note $71
+	notetype $0c, $84
+	note $73
+	note $a0
+	note $90
+	note $a3
+	note $33
+	notetype $0c, $82
+	note $51
+	notetype $0c, $84
+	note $53
+	note $70
+	note $50
+	note $43
+	notetype $0c, $73
+	octave3
+	note $40
+	note $70
+	note $c0
+	octave4
+	note $40
+	loopchannel $00, $5544 ; end
+; 0x1795ae
+
+_Music_BattleTowerLobby_Ch3: ; 0x1795ae
+	notetype $0c, $11
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $01
+	note $51
+	note $01
+	note $41
+	note $01
+	note $41
+	octave2
+	note $c1
+	octave3
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	octave2
+	note $a1
+	octave3
+	note $31
+	note $01
+	octave2
+	note $a1
+	note $c1
+	octave3
+	note $51
+	note $01
+	note $51
+	octave2
+	note $a1
+	octave3
+	note $21
+	octave2
+	note $51
+	octave3
+	note $51
+	octave2
+	note $a1
+	octave3
+	note $21
+	note $51
+	note $01
+	octave2
+	note $c1
+	octave3
+	note $51
+	octave2
+	note $51
+	octave3
+	note $51
+	octave2
+	note $91
+	note $c1
+	octave3
+	note $51
+	note $01
+	note $31
+	octave2
+	note $71
+	note $a1
+	octave3
+	note $71
+	octave2
+	note $71
+	note $a1
+	octave3
+	note $31
+	note $71
+	note $51
+	octave2
+	note $c1
+	note $51
+	note $c1
+	note $71
+	note $51
+	note $41
+	note $71
+	loopchannel $00, $55b1 ; end
+; 0x179610
+
+_Music_BattleTowerLobby_Ch4: ; 0x179610
+	togglenoise $00
+	notetype $0c
+	note $01
+	note $63
+	note $63
+	note $61
+	note $63
+	loopchannel $00, $5612 ; end
+; 0x17961d

music/bugcatchingcontestresults.asm

@@ -0,0 +1,177 @@
+_Music_BugCatchingContestResults: ; 0xefb3e
+	db $c0
+	dw _Music_BugCatchingContestResults_Ch1
+	db $01
+	dw _Music_BugCatchingContestResults_Ch2
+	db $02
+	dw _Music_BugCatchingContestResults_Ch3
+	db $03
+	dw _Music_BugCatchingContestResults_Ch4
+; 0xefb4a
+
+_Music_BugCatchingContestResults_Ch1: ; 0xefb4a
+	tempo $9000
+	volume $77
+	notetype $0c, $51
+	note $01
+	octave2
+	note $80
+	note $02
+	note $80
+	note $02
+	note $80
+	note $02
+	note $80
+	note $00
+	note $01
+	note $a0
+	note $02
+	note $a0
+	note $02
+	note $a0
+	note $02
+	note $a0
+	note $00
+	note $01
+	note $a0
+	note $02
+	note $a0
+	note $02
+	note $a0
+	note $02
+	note $a0
+	note $00
+	note $01
+	note $c0
+	note $02
+	note $b0
+	note $02
+	note $a0
+	note $02
+	note $80
+	note $00
+	loopchannel $00, $7b52 ; end
+; 0xefb7b
+
+_Music_BugCatchingContestResults_Ch2: ; 0xefb7b
+	notetype $0c, $61
+	octave2
+	note $11
+	octave3
+	note $50
+	note $00
+	octave1
+	note $81
+	octave3
+	note $50
+	note $00
+	octave1
+	note $a1
+	octave3
+	note $50
+	note $00
+	octave1
+	note $c1
+	octave3
+	note $50
+	note $00
+	octave2
+	note $31
+	octave3
+	note $60
+	note $00
+	octave1
+	note $a1
+	octave3
+	note $60
+	note $00
+	octave1
+	note $c1
+	octave3
+	note $60
+	note $00
+	octave2
+	note $21
+	octave3
+	note $60
+	note $00
+	octave2
+	note $31
+	octave3
+	note $60
+	note $00
+	octave1
+	note $a1
+	octave3
+	note $60
+	note $00
+	loopchannel $02, $7ba6
+	octave2
+	note $81
+	octave3
+	note $80
+	note $00
+	octave2
+	note $31
+	octave3
+	note $70
+	note $00
+	octave2
+	note $81
+	octave3
+	note $60
+	note $00
+	octave2
+	note $31
+	octave3
+	note $30
+	note $00
+	loopchannel $00, $7b7e ; end
+; 0xefbcc
+
+_Music_BugCatchingContestResults_Ch3: ; 0xefbcc
+	vibrato $08, $24
+	notetype $0c, $23
+	octave4
+	note $54
+	note $00
+	note $50
+	note $60
+	note $83
+	octave5
+	note $13
+	octave4
+	note $c7
+	note $a7
+	note $34
+	note $00
+	note $30
+	note $50
+	note $63
+	note $c3
+	note $a7
+	note $87
+	loopchannel $00, $7bd2 ; end
+; 0xefbe9
+
+_Music_BugCatchingContestResults_Ch4: ; 0xefbe9
+	togglenoise $04
+	notetype $06
+	note $23
+	note $23
+	note $21
+	note $21
+	note $21
+	note $21
+	note $23
+	note $23
+	note $80
+	note $80
+	note $80
+	note $80
+	note $80
+	note $80
+	note $80
+	note $80
+	loopchannel $00, $7bed ; end
+; 0xefc01

music/burnedtower.asm

@@ -0,0 +1,262 @@
+_Music_BurnedTower: ; 0xf6a99
+	db $c0
+	dw _Music_BurnedTower_Ch1
+	db $01
+	dw _Music_BurnedTower_Ch2
+	db $02
+	dw _Music_BurnedTower_Ch3
+	db $03
+	dw _Music_BurnedTower_Ch4
+; 0xf6aa5
+
+_Music_BurnedTower_Ch1: ; 0xf6aa5
+	tempo $a800
+	volume $77
+	dutycycle $01
+	tone $0400
+	vibrato $08, $45
+	stereopanning $f0
+	notetype $0c, $91
+	note $01
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $80
+	octave3
+	note $45
+	intensity $91
+	note $33
+	note $33
+	note $31
+	intensity $80
+	note $25
+	intensity $91
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $80
+	note $b5
+	loopchannel $02, $6ac8
+	tempo $9600
+	intensity $b1
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $a0
+	octave3
+	note $45
+	intensity $b1
+	note $33
+	note $33
+	note $31
+	intensity $a0
+	note $25
+	intensity $b1
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $a0
+	note $b5
+	intensity $b1
+	note $a3
+	note $a3
+	note $a1
+	intensity $b3
+	note $bf
+	note $bf
+	note $bf
+	note $95
+	intensity $b1
+	note $a3
+	note $a3
+	note $a1
+	intensity $a0
+	note $b5
+	intensity $b1
+	note $c3
+	note $c3
+	note $c1
+	intensity $a0
+	octave3
+	note $65
+	intensity $b1
+	note $53
+	note $53
+	note $51
+	intensity $a0
+	note $45
+	intensity $b1
+	octave2
+	note $c3
+	note $c3
+	note $c1
+	intensity $a0
+	octave3
+	note $15
+	loopchannel $02, $6b17
+	loopchannel $00, $6ad8 ; end
+; 0xf6b29
+
+_Music_BurnedTower_Ch2: ; 0xf6b29
+	dutycycle $02
+	vibrato $20, $82
+	tone $0200
+	notetype $0c, $70
+	callchannel _Music_BurnedTower_sub_0xf6b8e
+	intensity $c5
+	callchannel _Music_BurnedTower_sub_0xf6b8e
+	intensity $c1
+	dutycycle $03
+	note $01
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $b0
+	octave3
+	note $45
+	intensity $c1
+	note $33
+	note $33
+	note $31
+	intensity $b0
+	note $25
+	intensity $c1
+	octave2
+	note $a3
+	note $a3
+	note $a1
+	intensity $b0
+	note $b3
+	intensity $c1
+	intensity $c2
+	octave3
+	note $a0
+	note $80
+	note $a0
+	octave4
+	note $10
+	vibrato $00, $00
+	intensity $3d
+	note $57
+	vibrato $20, $83
+	intensity $b0
+	octave2
+	note $83
+	dutycycle $02
+	intensity $b0
+	octave3
+	note $73
+	note $51
+	note $71
+	note $83
+	note $c3
+	octave4
+	note $23
+	note $31
+	note $21
+	octave3
+	note $c3
+	note $83
+	note $73
+	note $51
+	note $71
+	note $83
+	note $53
+	intensity $b7
+	note $7f
+	loopchannel $00, $6b39 ; end
+; 0xf6b8e
+
+_Music_BurnedTower_sub_0xf6b8e: ; 0xf6b8e
+; subroutine
+	octave3
+	note $53
+	note $31
+	note $51
+	note $63
+	note $a3
+	note $c3
+	octave4
+	note $11
+	octave3
+	note $c1
+	note $a3
+	note $63
+	note $53
+	note $31
+	note $51
+	note $63
+	note $33
+	note $5f
+	endchannel ; end
+; 0xf6ba2
+
+_Music_BurnedTower_Ch3: ; 0xf6ba2
+	stereopanning $0f
+	notetype $0c, $14
+	note $0f
+	note $0f
+	note $0f
+	note $0b
+	octave3
+	note $43
+	octave2
+	note $a1
+	octave3
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	note $63
+	octave2
+	note $a1
+	octave3
+	note $51
+	note $01
+	note $51
+	note $01
+	note $51
+	note $43
+	loopchannel $04, $6bad
+	octave2
+	note $c1
+	octave3
+	note $71
+	note $01
+	note $71
+	note $01
+	note $71
+	note $83
+	octave2
+	note $c1
+	octave3
+	note $71
+	note $01
+	note $71
+	note $01
+	note $71
+	note $63
+	loopchannel $02, $6bc3
+	loopchannel $00, $6bad ; end
+; 0xf6bdd
+
+_Music_BurnedTower_Ch4: ; 0xf6bdd
+	togglenoise $00
+	notetype $0c
+	note $0f
+	loopchannel $04, $6be1
+	note $01
+	stereopanning $f0
+	note $81
+	note $91
+	note $83
+	note $91
+	note $83
+	loopchannel $00, $6be7 ; end
+; 0xf6bf2

music/celadoncity.asm

@@ -0,0 +1,401 @@
+_Music_CeladonCity: ; 0xf435b
+	db $80
+	dw _Music_CeladonCity_Ch1
+	db $01
+	dw _Music_CeladonCity_Ch2
+	db $02
+	dw _Music_CeladonCity_Ch3
+; 0xf4364
+
+_Music_CeladonCity_Ch1: ; 0xf4364
+	tempo $9200
+	volume $77
+	tone $0100
+	stereopanning $0f
+	notetype $0c, $a6
+	octave3
+	note $a6
+	intensity $a1
+	note $90
+	note $a0
+	note $32
+	note $51
+	note $71
+	callchannel _Music_CeladonCity_sub_0xf43cc
+	note $31
+	note $70
+	note $a0
+	note $30
+	note $70
+	note $a0
+	note $70
+	loopchannel $03, $437d
+	note $31
+	note $80
+	note $c0
+	octave4
+	note $30
+	note $10
+	octave3
+	note $c0
+	note $80
+	callchannel _Music_CeladonCity_sub_0xf43cc
+	note $30
+	note $20
+	note $30
+	note $50
+	note $70
+	note $80
+	note $a0
+	note $c0
+	note $a1
+	note $81
+	note $71
+	note $51
+	note $7f
+	callchannel _Music_CeladonCity_sub_0xf43e1
+	callchannel _Music_CeladonCity_sub_0xf43fe
+	octave2
+	note $c1
+	note $b0
+	note $c0
+	octave3
+	note $30
+	note $80
+	note $a0
+	note $80
+	note $70
+	note $80
+	note $a0
+	note $90
+	note $a0
+	octave4
+	note $10
+	octave3
+	note $c0
+	note $a0
+	callchannel _Music_CeladonCity_sub_0xf43e1
+	callchannel _Music_CeladonCity_sub_0xf43fe
+	note $31
+	note $20
+	note $30
+	note $70
+	note $80
+	note $a0
+	note $80
+	note $a7
+	loopchannel $00, $436c ; end
+; 0xf43cc
+
+_Music_CeladonCity_sub_0xf43cc: ; 0xf43cc
+; subroutine
+	note $31
+	note $80
+	note $c0
+	note $30
+	note $80
+	note $c0
+	note $80
+	loopchannel $03, $43cc
+	note $31
+	note $70
+	note $a0
+	octave4
+	note $30
+	note $20
+	note $30
+	octave3
+	note $a0
+	endchannel ; end
+; 0xf43e1
+
+_Music_CeladonCity_sub_0xf43e1: ; 0xf43e1
+; subroutine
+	octave2
+	note $81
+	note $c0
+	octave3
+	note $30
+	loopchannel $04, $43e1
+	note $11
+	octave2
+	note $c0
+	octave3
+	note $10
+	note $30
+	note $50
+	note $70
+	note $a0
+	note $80
+	note $a0
+	note $c0
+	octave4
+	note $10
+	note $30
+	note $20
+	note $30
+	octave3
+	note $c0
+	endchannel ; end
+; 0xf43fe
+
+_Music_CeladonCity_sub_0xf43fe: ; 0xf43fe
+; subroutine
+	note $31
+	note $70
+	note $a0
+	loopchannel $04, $43fe
+	endchannel ; end
+; 0xf4406
+
+_Music_CeladonCity_Ch2: ; 0xf4406
+	vibrato $12, $34
+	dutycycle $02
+	stereopanning $f0
+	notetype $0c, $b7
+	octave4
+	note $30
+	note $20
+	note $30
+	note $50
+	note $70
+	note $50
+	note $70
+	note $80
+	note $a7
+	callchannel _Music_CeladonCity_sub_0xf4463
+	note $a3
+	note $73
+	note $a1
+	note $75
+	note $a0
+	note $80
+	note $70
+	note $80
+	note $a1
+	note $c1
+	note $83
+	note $c3
+	callchannel _Music_CeladonCity_sub_0xf4463
+	intensity $c1
+	note $a1
+	note $81
+	note $71
+	note $81
+	note $71
+	note $51
+	note $31
+	note $21
+	note $33
+	note $30
+	note $50
+	note $70
+	note $a0
+	intensity $b3
+	octave5
+	note $35
+	intensity $a2
+	octave1
+	note $71
+	callchannel _Music_CeladonCity_sub_0xf4474
+	octave1
+	note $82
+	note $c0
+	note $a1
+	octave2
+	note $31
+	octave1
+	note $a5
+	note $71
+	callchannel _Music_CeladonCity_sub_0xf4474
+	octave1
+	note $a2
+	octave2
+	note $30
+	note $a3
+	note $35
+	intensity $97
+	octave4
+	note $70
+	note $a0
+	octave5
+	note $3f
+	loopchannel $00, $441a ; end
+; 0xf4463
+
+_Music_CeladonCity_sub_0xf4463: ; 0xf4463
+; subroutine
+	intensity $b2
+	octave4
+	note $c3
+	note $83
+	note $c1
+	note $85
+	note $c0
+	note $80
+	note $a0
+	note $c0
+	octave5
+	note $11
+	octave4
+	note $c1
+	note $a7
+	endchannel ; end
+; 0xf4474
+
+_Music_CeladonCity_sub_0xf4474: ; 0xf4474
+; subroutine
+	note $82
+	note $c0
+	octave2
+	note $33
+	octave1
+	note $81
+	note $c1
+	octave2
+	note $33
+	octave1
+	note $82
+	octave2
+	note $10
+	note $33
+	octave1
+	note $81
+	note $c1
+	octave2
+	note $33
+	octave1
+	note $a2
+	octave2
+	note $30
+	note $73
+	octave1
+	note $a1
+	octave2
+	note $31
+	note $73
+	endchannel ; end
+; 0xf4492
+
+_Music_CeladonCity_Ch3: ; 0xf4492
+	vibrato $12, $24
+	notetype $0c, $25
+	octave3
+	note $a1
+	note $01
+	note $71
+	note $01
+	note $37
+	callchannel _Music_CeladonCity_sub_0xf44fd
+	octave2
+	note $a1
+	note $01
+	octave3
+	note $33
+	loopchannel $03, $44a1
+	octave2
+	note $80
+	note $00
+	note $c0
+	note $00
+	octave3
+	note $32
+	octave2
+	note $70
+	callchannel _Music_CeladonCity_sub_0xf44fd
+	note $a0
+	note $00
+	octave3
+	note $30
+	note $00
+	octave3
+	note $72
+	octave2
+	note $90
+	note $a0
+	note $00
+	octave3
+	note $20
+	note $00
+	note $51
+	note $21
+	note $31
+	note $05
+	octave2
+	note $a1
+	note $05
+	intensity $10
+	callchannel _Music_CeladonCity_sub_0xf4510
+	octave5
+	note $51
+	note $01
+	note $71
+	note $01
+	note $33
+	note $03
+	note $17
+	octave4
+	note $a1
+	note $c1
+	octave5
+	note $11
+	note $31
+	note $51
+	note $01
+	note $31
+	note $51
+	note $33
+	note $03
+	callchannel _Music_CeladonCity_sub_0xf4510
+	octave5
+	note $51
+	note $01
+	note $31
+	note $51
+	note $33
+	note $03
+	note $17
+	note $a1
+	note $81
+	note $71
+	note $51
+	note $71
+	note $51
+	note $31
+	note $51
+	note $31
+	note $05
+	loopchannel $00, $4495 ; end
+; 0xf44fd
+
+_Music_CeladonCity_sub_0xf44fd: ; 0xf44fd
+; subroutine
+	octave2
+	note $81
+	note $01
+	octave3
+	note $33
+	loopchannel $03, $44fd
+	octave2
+	note $a0
+	note $00
+	octave3
+	note $30
+	note $00
+	note $72
+	octave2
+	note $90
+	endchannel ; end
+; 0xf4510
+
+_Music_CeladonCity_sub_0xf4510: ; 0xf4510
+; subroutine
+	octave5
+	note $37
+	note $11
+	octave4
+	note $c1
+	note $a1
+	note $c1
+	endchannel ; end
+; 0xf4518

music/cherrygrovecity.asm

@@ -0,0 +1,310 @@
+_Music_CherrygroveCity: ; 0xf5b03
+	db $c0
+	dw _Music_CherrygroveCity_Ch1
+	db $01
+	dw _Music_CherrygroveCity_Ch2
+	db $02
+	dw _Music_CherrygroveCity_Ch3
+	db $03
+	dw _Music_CherrygroveCity_Ch4
+; 0xf5b0f
+
+_Music_CherrygroveCity_Ch1: ; 0xf5b0f
+	tempo $9800
+	volume $77
+	dutycycle $03
+	tone $0100
+	vibrato $08, $15
+	stereopanning $f0
+	notetype $0c, $b5
+	note $09
+	octave3
+	note $11
+	note $31
+	note $51
+	note $a3
+	note $91
+	note $a1
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $a5
+	note $61
+	note $11
+	octave2
+	note $b1
+	octave3
+	note $11
+	note $51
+	note $83
+	note $71
+	note $81
+	note $a1
+	note $81
+	note $61
+	note $51
+	note $85
+	note $51
+	note $11
+	octave2
+	note $b1
+	note $a1
+	octave3
+	note $11
+	intensity $b7
+	octave2
+	note $b5
+	octave3
+	note $35
+	note $b3
+	note $a5
+	note $61
+	note $17
+	octave2
+	note $b5
+	octave3
+	note $35
+	intensity $b5
+	note $a3
+	note $83
+	note $53
+	note $33
+	note $53
+	octave2
+	note $b5
+	octave3
+	note $35
+	note $b3
+	note $a5
+	note $61
+	note $13
+	octave2
+	note $c3
+	note $b5
+	octave3
+	note $21
+	octave2
+	note $b3
+	note $83
+	note $a3
+	octave3
+	note $13
+	octave2
+	note $a3
+	octave3
+	note $13
+	loopchannel $00, $5b26 ; end
+; 0xf5b74
+
+_Music_CherrygroveCity_Ch2: ; 0xf5b74
+	dutycycle $03
+	vibrato $10, $36
+	stereopanning $0f
+	notetype $0c, $c3
+	octave3
+	note $11
+	note $31
+	note $51
+	note $31
+	note $51
+	note $81
+	note $a1
+	note $b1
+	intensity $c6
+	octave4
+	note $15
+	note $33
+	intensity $b3
+	note $31
+	note $11
+	octave3
+	note $b1
+	intensity $c7
+	octave4
+	note $15
+	octave3
+	note $a1
+	note $67
+	intensity $c6
+	note $b5
+	octave4
+	note $13
+	intensity $b3
+	note $11
+	octave3
+	note $b1
+	note $a1
+	intensity $c7
+	note $b5
+	note $81
+	note $57
+	intensity $a0
+	note $35
+	note $65
+	octave4
+	note $33
+	note $15
+	intensity $a5
+	octave3
+	note $a1
+	intensity $c7
+	note $67
+	intensity $a0
+	note $35
+	note $65
+	octave4
+	note $33
+	intensity $c7
+	note $1f
+	intensity $b5
+	octave3
+	note $35
+	note $65
+	octave4
+	note $33
+	note $15
+	octave3
+	note $a1
+	note $67
+	note $25
+	note $65
+	note $83
+	intensity $a0
+	note $67
+	intensity $a7
+	note $67
+	loopchannel $00, $5b87 ; end
+; 0xf5bd8
+
+_Music_CherrygroveCity_Ch3: ; 0xf5bd8
+	notetype $0c, $16
+	note $03
+	octave4
+	note $11
+	octave3
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $51
+	note $a1
+	note $61
+	note $a1
+	octave4
+	note $13
+	octave3
+	note $61
+	note $81
+	note $a1
+	note $a1
+	note $61
+	note $a1
+	octave4
+	note $13
+	octave3
+	note $61
+	note $81
+	note $a1
+	note $b1
+	note $81
+	note $b1
+	octave4
+	note $13
+	octave3
+	note $61
+	note $81
+	note $a1
+	note $b3
+	octave4
+	note $11
+	octave3
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $51
+	note $31
+	note $63
+	note $b1
+	note $61
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $a3
+	note $61
+	note $a1
+	note $61
+	note $51
+	note $41
+	note $31
+	note $63
+	note $b1
+	note $61
+	note $b1
+	note $a1
+	note $81
+	note $51
+	note $81
+	note $b1
+	octave4
+	note $11
+	octave3
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $31
+	note $63
+	note $b1
+	note $61
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $a3
+	note $61
+	note $a1
+	note $61
+	note $51
+	note $41
+	note $21
+	note $63
+	note $b1
+	note $61
+	note $b1
+	note $a1
+	note $81
+	note $61
+	note $a1
+	note $61
+	note $a1
+	note $61
+	note $a1
+	note $61
+	note $a1
+	loopchannel $00, $5be4 ; end
+; 0xf5c48
+
+_Music_CherrygroveCity_Ch4: ; 0xf5c48
+	togglenoise $03
+	notetype $0c
+	note $0f
+	note $21
+	note $01
+	note $81
+	note $21
+	note $21
+	note $71
+	note $23
+	note $21
+	note $01
+	note $81
+	note $20
+	note $20
+	note $73
+	note $21
+	note $81
+	loopchannel $00, $5c4d ; end
+; 0xf5c60

music/clair.asm

@@ -0,0 +1,446 @@
+_Music_Clair: ; 0x1fa8d
+	db $c0
+	dw _Music_Clair_Ch1
+	db $01
+	dw _Music_Clair_Ch2
+	db $02
+	dw _Music_Clair_Ch3
+	db $03
+	dw _Music_Clair_Ch4
+; 0x1fa99
+
+_Music_Clair_Ch1: ; 0x1fa99
+	tempo $8800
+	volume $77
+	tone $0100
+	vibrato $12, $34
+	stereopanning $0f
+	notetype $0c, $93
+	dutycycle $03
+	octave4
+	note $60
+	note $70
+	note $60
+	note $00
+	note $20
+	note $00
+	loopchannel $02, $7aab
+	octave3
+	note $c0
+	note $00
+	note $90
+	dutycycle $02
+	intensity $92
+	octave5
+	note $60
+	note $83
+	intensity $a7
+	dutycycle $03
+	octave3
+	note $43
+	note $63
+	note $83
+	intensity $93
+	callchannel _Music_Clair_sub_0x1fb12
+	octave2
+	note $c0
+	octave3
+	note $20
+	note $41
+	octave2
+	note $80
+	note $b0
+	octave3
+	note $21
+	octave2
+	note $b0
+	note $80
+	callchannel _Music_Clair_sub_0x1fb12
+	note $40
+	note $20
+	note $41
+	octave4
+	note $b0
+	note $90
+	note $80
+	note $90
+	note $b0
+	octave5
+	note $40
+	callchannel _Music_Clair_sub_0x1fb2e
+	dutycycle $03
+	note $92
+	note $61
+	note $00
+	note $b3
+	dutycycle $02
+	note $40
+	note $20
+	note $40
+	note $80
+	note $b0
+	octave5
+	note $40
+	callchannel _Music_Clair_sub_0x1fb2e
+	dutycycle $03
+	note $42
+	note $21
+	note $00
+	octave3
+	note $c3
+	dutycycle $02
+	note $90
+	note $20
+	note $40
+	note $90
+	note $c0
+	octave4
+	note $40
+	loopchannel $00, $7ac9 ; end
+; 0x1fb12
+
+_Music_Clair_sub_0x1fb12: ; 0x1fb12
+; subroutine
+	dutycycle $03
+	stereopanning $ff
+	octave3
+	note $c0
+	note $01
+	note $94
+	dutycycle $02
+	stereopanning $0f
+	octave2
+	note $c1
+	note $90
+	note $c0
+	octave3
+	note $40
+	note $00
+	note $40
+	note $70
+	note $60
+	note $20
+	note $00
+	note $60
+	note $20
+	note $00
+	endchannel ; end
+; 0x1fb2e
+
+_Music_Clair_sub_0x1fb2e: ; 0x1fb2e
+; subroutine
+	octave4
+	note $70
+	note $40
+	note $00
+	note $70
+	note $40
+	note $00
+	octave3
+	note $40
+	note $90
+	note $c1
+	note $90
+	note $c0
+	octave4
+	note $40
+	note $00
+	note $40
+	note $70
+	endchannel ; end
+; 0x1fb41
+
+_Music_Clair_Ch2: ; 0x1fb41
+	dutycycle $03
+	vibrato $12, $34
+	notetype $06, $b7
+	octave3
+	note $b1
+	note $c1
+	note $b1
+	note $01
+	note $91
+	note $01
+	loopchannel $02, $7b49
+	note $61
+	note $01
+	note $21
+	note $01
+	intensity $82
+	note $41
+	note $b1
+	octave4
+	note $21
+	octave3
+	note $b1
+	intensity $92
+	note $81
+	octave4
+	note $21
+	note $41
+	octave3
+	note $b1
+	intensity $b2
+	octave4
+	note $21
+	note $41
+	note $81
+	note $41
+	intensity $c2
+	note $21
+	note $41
+	note $81
+	note $b1
+	intensity $b7
+	callchannel _Music_Clair_sub_0x1fba6
+	note $71
+	note $03
+	note $4b
+	note $01
+	note $43
+	note $23
+	octave3
+	note $c2
+	note $b0
+	note $c5
+	octave4
+	note $23
+	note $01
+	octave3
+	note $bf
+	note $03
+	forceoctave $0c
+	callchannel _Music_Clair_sub_0x1fba6
+	forceoctave $00
+	octave5
+	note $71
+	note $03
+	note $4b
+	note $01
+	octave4
+	note $93
+	note $b3
+	note $c2
+	octave5
+	note $10
+	note $25
+	octave4
+	note $b3
+	note $01
+	note $9f
+	note $03
+	loopchannel $00, $7b77 ; end
+; 0x1fba6
+
+_Music_Clair_sub_0x1fba6: ; 0x1fba6
+; subroutine
+	octave4
+	note $71
+	note $03
+	note $4b
+	note $01
+	octave3
+	note $93
+	note $b3
+	note $c2
+	octave4
+	note $10
+	note $25
+	octave3
+	note $c3
+	note $01
+	octave4
+	note $4f
+	note $03
+	endchannel ; end
+; 0x1fbb9
+
+_Music_Clair_Ch3: ; 0x1fbb9
+	notetype $0c, $14
+	forceoctave $0c
+	octave3
+	note $21
+	note $03
+	octave2
+	note $90
+	note $c0
+	octave3
+	note $21
+	note $03
+	octave2
+	note $90
+	note $c0
+	octave3
+	note $41
+	note $01
+	octave2
+	note $b3
+	note $93
+	note $83
+	callchannel _Music_Clair_sub_0x1fc3c
+	octave2
+	note $21
+	note $00
+	note $91
+	note $00
+	note $21
+	note $01
+	note $41
+	note $b1
+	note $41
+	callchannel _Music_Clair_sub_0x1fc3c
+	octave2
+	note $91
+	note $00
+	note $21
+	note $00
+	note $41
+	note $01
+	note $40
+	note $20
+	note $40
+	note $60
+	note $80
+	note $b0
+	octave1
+	note $91
+	note $00
+	octave2
+	note $41
+	note $00
+	octave1
+	note $91
+	octave3
+	note $70
+	note $00
+	octave1
+	note $90
+	octave3
+	note $40
+	octave2
+	note $41
+	octave1
+	note $91
+	octave2
+	note $21
+	note $00
+	note $91
+	note $00
+	note $21
+	octave3
+	note $40
+	note $00
+	octave2
+	note $40
+	octave3
+	note $b0
+	octave2
+	note $b1
+	octave3
+	note $80
+	octave2
+	note $40
+	octave1
+	note $91
+	note $00
+	octave2
+	note $41
+	note $00
+	octave1
+	note $91
+	octave3
+	note $70
+	note $00
+	octave1
+	note $90
+	octave3
+	note $40
+	octave2
+	note $41
+	octave1
+	note $91
+	octave2
+	note $41
+	note $00
+	note $81
+	note $00
+	note $91
+	octave2
+	note $c0
+	note $00
+	octave1
+	note $90
+	octave2
+	note $b0
+	note $41
+	note $90
+	octave1
+	note $90
+	loopchannel $00, $7bd1 ; end
+; 0x1fc3c
+
+_Music_Clair_sub_0x1fc3c: ; 0x1fc3c
+; subroutine
+	octave1
+	note $91
+	note $00
+	octave2
+	note $41
+	note $00
+	octave1
+	note $91
+	note $01
+	note $91
+	octave2
+	note $41
+	octave1
+	note $91
+	endchannel ; end
+; 0x1fc4b
+
+_Music_Clair_Ch4: ; 0x1fc4b
+	togglenoise $03
+	notetype $0c
+	stereopanning $f0
+	note $c7
+	note $c7
+	note $c5
+	stereopanning $ff
+	note $40
+	note $40
+	note $31
+	note $40
+	note $40
+	note $31
+	note $30
+	note $30
+	stereopanning $ff
+	callchannel _Music_Clair_sub_0x1fc6e
+	note $80
+	stereopanning $ff
+	callchannel _Music_Clair_sub_0x1fc6e
+	note $70
+	loopchannel $00, $7c5e ; end
+; 0x1fc6e
+
+_Music_Clair_sub_0x1fc6e: ; 0x1fc6e
+; subroutine
+	note $41
+	stereopanning $f0
+	note $81
+	stereopanning $ff
+	note $31
+	stereopanning $f0
+	note $80
+	note $80
+	note $81
+	stereopanning $ff
+	note $40
+	stereopanning $f0
+	note $80
+	stereopanning $ff
+	note $31
+	stereopanning $f0
+	note $80
+	endchannel ; end
+; 0x1fc87

music/crystalopening.asm

@@ -0,0 +1,368 @@
+_Music_CrystalOpening: ; 0x1786e8
+	db $c0
+	dw _Music_CrystalOpening_Ch1
+	db $01
+	dw _Music_CrystalOpening_Ch2
+	db $02
+	dw _Music_CrystalOpening_Ch3
+	db $03
+	dw _Music_CrystalOpening_Ch4
+; 0x1786f4
+
+_Music_CrystalOpening_Ch1: ; 0x1786f4
+	tempo $8800
+	volume $77
+	tone $0200
+	vibrato $10, $34
+	dutycycle $03
+	stereopanning $f0
+	notetype $0c, $92
+	octave2
+	note $71
+	note $73
+	note $71
+	note $71
+	note $73
+	note $71
+	note $71
+	note $73
+	note $71
+	note $71
+	note $75
+	notetype $0c, $b4
+	octave2
+	note $c1
+	note $71
+	note $51
+	note $c1
+	octave3
+	note $21
+	octave2
+	note $91
+	note $71
+	octave3
+	note $21
+	octave2
+	note $71
+	note $21
+	octave1
+	note $c1
+	octave2
+	note $71
+	octave3
+	note $71
+	octave2
+	note $71
+	note $c1
+	octave3
+	note $51
+	note $71
+	note $51
+	octave2
+	note $c1
+	note $71
+	note $c1
+	octave3
+	note $51
+	note $71
+	note $51
+	octave2
+	note $c1
+	note $71
+	note $c1
+	octave3
+	note $51
+	octave2
+	note $37
+	octave3
+	note $31
+	octave2
+	note $a1
+	note $81
+	octave3
+	note $31
+	note $51
+	octave2
+	note $c1
+	note $a1
+	octave3
+	note $51
+	octave2
+	note $a1
+	note $51
+	note $31
+	note $a1
+	octave3
+	note $a1
+	octave2
+	note $a1
+	octave3
+	note $31
+	note $51
+	note $a1
+	note $51
+	note $31
+	octave2
+	note $a1
+	octave3
+	note $31
+	note $51
+	note $a1
+	note $51
+	octave4
+	note $11
+	octave3
+	note $81
+	note $71
+	octave4
+	note $11
+	notetype $0c, $a0
+	note $37
+	note $37
+	notetype $0c, $a7
+	note $37
+	notetype $0c, $b2
+	octave2
+	note $3f
+	endchannel ; end
+; 0x17877a
+
+_Music_CrystalOpening_Ch2: ; 0x17877a
+	notetype $0c, $a2
+	dutycycle $03
+	vibrato $08, $44
+	octave2
+	note $c1
+	note $c3
+	note $c1
+	note $c1
+	note $c3
+	note $c1
+	note $c1
+	note $c3
+	note $c1
+	note $c1
+	note $c1
+	notetype $0c, $a2
+	octave2
+	note $50
+	note $c0
+	octave3
+	note $50
+	note $70
+	notetype $0c, $c7
+	note $57
+	note $77
+	octave2
+	note $c7
+	notetype $0c, $b0
+	octave3
+	note $c7
+	notetype $0c, $c7
+	note $cf
+	note $0f
+	note $87
+	note $a7
+	note $37
+	notetype $0c, $c7
+	octave4
+	note $37
+	notetype $0c, $7c
+	note $37
+	notetype $0c, $c7
+	note $37
+	note $87
+	notetype $0c, $b0
+	note $77
+	note $77
+	notetype $0c, $c7
+	note $77
+	notetype $0c, $c2
+	octave3
+	note $3f
+	endchannel ; end
+; 0x1787c8
+
+_Music_CrystalOpening_Ch3: ; 0x1787c8
+	notetype $0c, $16
+	octave1
+	note $c3
+	notetype $06, $16
+	note $c0
+	note $b0
+	note $a0
+	note $90
+	note $80
+	note $70
+	note $60
+	note $50
+	notetype $0c, $16
+	note $c3
+	note $c3
+	note $c3
+	notetype $06, $16
+	note $c0
+	note $b0
+	note $a0
+	note $90
+	note $80
+	note $70
+	note $60
+	note $50
+	notetype $0c, $16
+	note $c3
+	note $c3
+	octave2
+	note $c7
+	note $77
+	note $47
+	note $c3
+	note $73
+	note $c3
+	octave3
+	note $53
+	note $73
+	note $53
+	note $33
+	note $23
+	octave2
+	note $a7
+	octave3
+	note $37
+	octave2
+	note $a7
+	note $77
+	octave3
+	note $33
+	note $53
+	note $73
+	note $53
+	note $33
+	note $23
+	note $17
+	note $37
+	note $3f
+	octave2
+	note $30
+	note $0e
+	endchannel ; end
+; 0x178810
+
+_Music_CrystalOpening_Ch4: ; 0x178810
+	stereopanning $0f
+	togglenoise $03
+	notetype $0c
+	note $0f
+	note $0b
+	octave2
+	note $20
+	note $20
+	note $20
+	note $20
+	note $33
+	notetype $08
+	note $20
+	note $20
+	note $20
+	note $20
+	note $20
+	note $20
+	note $35
+	note $20
+	note $20
+	note $20
+	note $20
+	note $20
+	note $20
+	note $32
+	notetype $0c
+	note $20
+	note $20
+	note $80
+	note $80
+	note $20
+	note $20
+	note $21
+	note $20
+	note $20
+	note $81
+	note $30
+	note $20
+	note $a0
+	note $80
+	note $30
+	note $30
+	note $80
+	note $00
+	note $20
+	note $20
+	note $a0
+	note $80
+	note $20
+	note $30
+	note $80
+	note $80
+	note $30
+	note $30
+	note $a1
+	note $21
+	note $21
+	note $21
+	note $a1
+	note $31
+	note $20
+	note $20
+	note $20
+	note $20
+	note $33
+	note $20
+	note $20
+	note $20
+	note $20
+	note $33
+	note $20
+	note $20
+	note $20
+	note $20
+	note $a0
+	note $80
+	note $30
+	note $20
+	note $80
+	note $80
+	note $20
+	note $20
+	note $a0
+	note $80
+	note $30
+	note $20
+	note $80
+	note $80
+	note $30
+	note $20
+	note $a0
+	note $80
+	note $20
+	note $20
+	note $30
+	note $20
+	note $20
+	note $30
+	note $a0
+	note $80
+	note $30
+	note $20
+	note $20
+	note $80
+	note $30
+	note $20
+	note $21
+	note $31
+	note $01
+	note $31
+	note $31
+	note $05
+	note $0f
+	note $0f
+	endchannel ; end
+; 0x178889

music/dancinghall.asm

@@ -0,0 +1,315 @@
+_Music_DancingHall: ; 0xef9bc
+	db $80
+	dw _Music_DancingHall_Ch1
+	db $01
+	dw _Music_DancingHall_Ch2
+	db $02
+	dw _Music_DancingHall_Ch3
+; 0xef9c5
+
+; 0xef9c5
+	db $03
+; 0xef9c6
+
+_Music_DancingHall_Ch1: ; 0xef9c6
+	tempo $d000
+	volume $77
+	stereopanning $0f
+	notetype $06, $b7
+	note $02
+	dutycycle $00
+	notetype $0c, $b7
+	callchannel _Music_DancingHall_sub_0xefa17
+	note $0f
+	callchannel _Music_DancingHall_sub_0xefa17
+	note $0f
+	note $0f
+	note $0f
+	intensity $b1
+	octave2
+	note $c0
+	octave3
+	note $30
+	note $60
+	note $a0
+	note $c0
+	note $a0
+	note $c0
+	octave4
+	note $30
+	note $61
+	notetype $08, $b1
+	note $30
+	note $50
+	note $30
+	octave3
+	note $c2
+	note $a2
+	notetype $0c, $b1
+	note $c0
+	note $a0
+	note $30
+	note $50
+	octave4
+	note $61
+	notetype $08, $b1
+	octave3
+	note $c0
+	octave4
+	note $30
+	octave3
+	note $c0
+	notetype $0c, $b5
+	note $a0
+	note $00
+	note $c0
+	note $c0
+	note $a0
+	note $00
+	note $61
+	loopchannel $00, $79d3 ; end
+; 0xefa17
+
+_Music_DancingHall_sub_0xefa17: ; 0xefa17
+; subroutine
+	octave3
+	note $c0
+	note $00
+	note $a0
+	note $00
+	note $c0
+	note $00
+	note $a0
+	note $00
+	octave4
+	note $50
+	note $00
+	note $30
+	note $00
+	octave3
+	note $c0
+	note $00
+	octave4
+	note $30
+	note $00
+	endchannel ; end
+; 0xefa2c
+
+_Music_DancingHall_Ch2: ; 0xefa2c
+	stereopanning $f0
+	notetype $06, $a1
+	dutycycle $00
+	vibrato $10, $24
+	note $02
+	notetype $06, $a2
+	callchannel _Music_DancingHall_sub_0xefa7a
+	callchannel _Music_DancingHall_sub_0xefa7a
+	intensity $a7
+	octave2
+	note $3f
+	note $6f
+	notetype $0c, $a7
+	note $5f
+	octave3
+	note $60
+	note $a0
+	note $c0
+	octave4
+	note $30
+	note $50
+	note $30
+	note $50
+	note $a0
+	note $c1
+	notetype $08, $a7
+	note $a0
+	note $c0
+	note $a0
+	note $62
+	note $32
+	notetype $0c, $a7
+	note $50
+	note $30
+	octave3
+	note $a0
+	note $c0
+	octave4
+	note $a1
+	notetype $08, $a7
+	note $60
+	note $a0
+	note $60
+	notetype $0c, $a7
+	note $50
+	note $00
+	note $60
+	note $60
+	note $50
+	note $00
+	note $31
+	loopchannel $00, $7a37 ; end
+; 0xefa7a
+
+_Music_DancingHall_sub_0xefa7a: ; 0xefa7a
+; subroutine
+	intensity $a1
+	octave4
+	note $53
+	octave2
+	note $53
+	octave4
+	note $53
+	octave2
+	note $53
+	octave4
+	note $c3
+	note $a3
+	note $63
+	note $a3
+	intensity $33
+	note $30
+	note $60
+	intensity $63
+	note $30
+	note $60
+	intensity $93
+	note $30
+	note $60
+	intensity $c3
+	note $30
+	note $60
+	intensity $e3
+	note $30
+	note $60
+	intensity $a3
+	note $30
+	note $60
+	intensity $83
+	note $30
+	note $60
+	intensity $53
+	note $30
+	note $60
+	intensity $73
+	octave3
+	note $c0
+	octave4
+	note $50
+	intensity $a3
+	octave3
+	note $c0
+	octave4
+	note $50
+	intensity $b3
+	octave3
+	note $a0
+	octave4
+	note $30
+	intensity $c3
+	octave3
+	note $a0
+	octave4
+	note $30
+	intensity $d3
+	octave3
+	note $50
+	note $c0
+	intensity $e3
+	note $50
+	note $c0
+	intensity $f3
+	note $a0
+	octave4
+	note $30
+	intensity $f3
+	octave3
+	note $a0
+	octave4
+	note $30
+	endchannel ; end
+; 0xefad6
+
+_Music_DancingHall_Ch3: ; 0xefad6
+	stereopanning $ff
+	vibrato $16, $24
+	notetype $06, $10
+	octave5
+	note $a0
+	note $c0
+	octave6
+	note $30
+	note $5c
+	note $30
+	note $50
+	note $a0
+	note $cf
+	intensity $14
+	octave3
+	note $6f
+	note $5d
+	intensity $10
+	octave6
+	note $50
+	note $60
+	note $5c
+	note $30
+	note $50
+	note $a0
+	note $cf
+	intensity $14
+	octave3
+	note $6f
+	note $5f
+	intensity $13
+	octave4
+	note $61
+	note $a1
+	note $c1
+	octave5
+	note $31
+	note $51
+	note $31
+	note $51
+	note $a1
+	note $b0
+	note $c2
+	notetype $08, $13
+	note $a0
+	note $c0
+	note $a0
+	note $62
+	note $32
+	notetype $0c, $13
+	note $50
+	note $30
+	octave4
+	note $a0
+	note $c0
+	octave5
+	note $a1
+	notetype $08, $13
+	note $60
+	note $a0
+	note $60
+	notetype $06, $13
+	note $40
+	note $52
+	note $33
+	octave4
+	note $c3
+	octave5
+	note $33
+	intensity $14
+	octave3
+	note $3f
+	note $6f
+	note $5f
+	note $5c
+	intensity $10
+	octave5
+	note $a0
+	note $c0
+	octave6
+	note $30
+	loopchannel $00, $7ae3 ; end
+; 0xefb3e

music/darkcave.asm

@@ -1 +1,491 @@
-INCBIN "baserom.gbc",$ea2be,$ea50d - $ea2be
+_Music_DarkCave: ; 0xea2be
+	db $c0
+	dw _Music_DarkCave_Ch1
+	db $01
+	dw _Music_DarkCave_Ch2
+	db $02
+	dw _Music_DarkCave_Ch3
+	db $03
+	dw _Music_DarkCave_Ch4
+; 0xea2ca
+
+_Music_DarkCave_Ch1: ; 0xea2ca
+	tempo $8000
+	volume $77
+	dutycycle $03
+	tone $0100
+	vibrato $11, $15
+	stereopanning $f0
+	notetype $0c, $a7
+	note $0f
+	loopchannel $04, $62dc
+	octave3
+	note $4f
+	note $3f
+	note $2f
+	note $1f
+	intensity $a3
+	callchannel _Music_DarkCave_sub_0xea333
+	loopchannel $03, $62e8
+	intensity $b7
+	note $97
+	note $47
+	note $87
+	note $37
+	note $67
+	note $27
+	note $47
+	note $87
+	note $97
+	note $47
+	note $87
+	note $37
+	note $67
+	note $27
+	note $47
+	note $17
+	intensity $a3
+	callchannel _Music_DarkCave_sub_0xea333
+	loopchannel $02, $6303
+	note $0f
+	note $07
+	intensity $b7
+	octave2
+	note $61
+	note $81
+	note $93
+	octave3
+	note $4f
+	note $07
+	octave2
+	note $91
+	note $81
+	note $93
+	octave3
+	note $4f
+	note $81
+	note $05
+	note $61
+	note $81
+	note $93
+	note $8f
+	note $61
+	note $05
+	note $91
+	note $81
+	note $93
+	intensity $a3
+	callchannel _Music_DarkCave_sub_0xea333
+	loopchannel $02, $6328
+	loopchannel $00, $62e8 ; end
+; 0xea333
+
+_Music_DarkCave_sub_0xea333: ; 0xea333
+; subroutine
+	octave4
+	note $41
+	octave3
+	note $91
+	octave4
+	note $11
+	note $41
+	octave3
+	note $91
+	octave4
+	note $11
+	note $41
+	note $11
+	note $31
+	octave3
+	note $81
+	note $b1
+	octave4
+	note $31
+	octave3
+	note $81
+	note $b1
+	octave4
+	note $31
+	octave3
+	note $b1
+	octave4
+	note $21
+	octave3
+	note $61
+	note $b1
+	octave4
+	note $21
+	octave3
+	note $61
+	note $b1
+	octave4
+	note $21
+	octave3
+	note $b1
+	octave4
+	note $11
+	octave3
+	note $81
+	note $b1
+	octave4
+	note $11
+	octave3
+	note $81
+	note $b1
+	octave4
+	note $11
+	octave3
+	note $b1
+	endchannel ; end
+; 0xea36a
+
+_Music_DarkCave_Ch2: ; 0xea36a
+	dutycycle $01
+	vibrato $12, $36
+	stereopanning $0f
+	notetype $0c, $a7
+	note $0f
+	loopchannel $04, $6374
+	octave3
+	note $8f
+	note $bf
+	note $6f
+	note $8f
+	note $0f
+	loopchannel $04, $637e
+	note $07
+	stereopanning $ff
+	intensity $c7
+	octave5
+	note $17
+	intensity $c4
+	note $31
+	note $11
+	octave4
+	note $b1
+	note $83
+	note $b1
+	octave5
+	note $33
+	intensity $b0
+	note $23
+	intensity $b7
+	note $2b
+	intensity $59
+	note $17
+	intensity $c7
+	note $17
+	note $07
+	intensity $c7
+	note $17
+	intensity $c4
+	note $31
+	note $11
+	octave4
+	note $b1
+	note $81
+	note $81
+	note $b1
+	octave5
+	note $33
+	intensity $c7
+	note $2b
+	intensity $c3
+	note $11
+	note $21
+	intensity $b0
+	note $49
+	intensity $b7
+	note $45
+	stereopanning $0f
+	intensity $c4
+	octave4
+	note $63
+	note $41
+	note $31
+	note $43
+	note $31
+	note $11
+	note $31
+	note $11
+	octave3
+	note $b1
+	octave4
+	note $11
+	note $33
+	note $11
+	octave3
+	note $b1
+	octave4
+	note $27
+	octave3
+	note $b7
+	intensity $b0
+	octave4
+	note $41
+	note $31
+	note $11
+	octave3
+	note $b1
+	octave4
+	note $17
+	note $63
+	note $41
+	note $31
+	note $43
+	note $31
+	note $11
+	note $31
+	note $11
+	octave3
+	note $b1
+	octave4
+	note $11
+	note $33
+	note $11
+	octave3
+	note $b1
+	octave4
+	note $23
+	note $11
+	note $21
+	note $11
+	note $21
+	octave3
+	note $b1
+	octave4
+	note $21
+	intensity $b0
+	note $17
+	intensity $b7
+	note $17
+	intensity $c7
+	stereopanning $ff
+	note $07
+	octave5
+	note $17
+	intensity $c4
+	note $31
+	note $11
+	octave4
+	note $b1
+	note $83
+	note $b1
+	octave5
+	note $33
+	intensity $49
+	note $27
+	intensity $c7
+	note $27
+	intensity $b0
+	note $17
+	intensity $b7
+	note $17
+	note $07
+	intensity $c7
+	note $17
+	intensity $c4
+	note $31
+	note $11
+	octave4
+	note $b1
+	note $81
+	note $81
+	note $b1
+	octave5
+	note $33
+	intensity $b0
+	note $27
+	intensity $b7
+	note $27
+	intensity $b0
+	note $17
+	intensity $b7
+	note $17
+	intensity $c7
+	note $0f
+	stereopanning $0f
+	note $07
+	octave3
+	note $b1
+	octave4
+	note $11
+	note $23
+	note $1f
+	note $07
+	note $21
+	note $11
+	note $23
+	note $1f
+	intensity $c2
+	note $47
+	intensity $c7
+	octave3
+	note $b1
+	octave4
+	note $11
+	note $23
+	note $1f
+	intensity $c2
+	octave3
+	note $b7
+	intensity $c7
+	octave4
+	note $21
+	note $11
+	intensity $c4
+	note $2f
+	note $03
+	note $0f
+	note $0f
+	note $0f
+	intensity $b7
+	octave5
+	note $4f
+	note $3f
+	note $6f
+	note $4f
+	loopchannel $00, $637e ; end
+; 0xea46e
+
+_Music_DarkCave_Ch3: ; 0xea46e
+	notetype $0c, $27
+	callchannel _Music_DarkCave_sub_0xea4ce
+	loopchannel $02, $6471
+	callchannel _Music_DarkCave_sub_0xea4ce
+	loopchannel $07, $6478
+	callchannel _Music_DarkCave_sub_0xea4c3
+	octave3
+	note $13
+	note $81
+	note $43
+	note $81
+	note $43
+	note $61
+	note $01
+	octave2
+	note $bb
+	callchannel _Music_DarkCave_sub_0xea4c3
+	octave3
+	note $13
+	note $81
+	note $43
+	note $81
+	note $43
+	note $61
+	note $01
+	octave2
+	note $b3
+	octave3
+	note $21
+	note $11
+	note $23
+	callchannel _Music_DarkCave_sub_0xea4a7
+	callchannel _Music_DarkCave_sub_0xea4a7
+	loopchannel $00, $6478 ; end
+; 0xea4a7
+
+_Music_DarkCave_sub_0xea4a7: ; 0xea4a7
+; subroutine
+	octave3
+	note $13
+	note $81
+	note $43
+	note $81
+	note $63
+	note $41
+	note $01
+	octave2
+	note $b3
+	note $b1
+	octave3
+	note $11
+	note $23
+	note $13
+	note $81
+	note $43
+	note $81
+	note $43
+	note $61
+	note $01
+	octave2
+	note $b3
+	octave3
+	note $21
+	note $11
+	note $23
+	endchannel ; end
+; 0xea4c3
+
+_Music_DarkCave_sub_0xea4c3: ; 0xea4c3
+; subroutine
+	octave3
+	note $13
+	note $81
+	note $43
+	note $81
+	note $63
+	note $41
+	note $01
+	octave2
+	note $bb
+	endchannel ; end
+; 0xea4ce
+
+_Music_DarkCave_sub_0xea4ce: ; 0xea4ce
+; subroutine
+	octave2
+	note $13
+	note $81
+	note $43
+	note $81
+	note $63
+	note $41
+	note $01
+	octave1
+	note $b3
+	note $b1
+	octave2
+	note $11
+	note $23
+	note $13
+	note $81
+	note $43
+	note $81
+	note $43
+	note $61
+	note $01
+	octave1
+	note $b3
+	octave2
+	note $21
+	note $11
+	note $23
+	endchannel ; end
+; 0xea4ea
+
+_Music_DarkCave_Ch4: ; 0xea4ea
+	togglenoise $03
+	notetype $0c
+	stereopanning $ff
+	note $47
+	note $47
+	note $43
+	stereopanning $f0
+	note $23
+	stereopanning $0f
+	note $21
+	note $21
+	stereopanning $f0
+	note $23
+	stereopanning $ff
+	note $47
+	note $47
+	note $43
+	stereopanning $0f
+	note $27
+	stereopanning $f0
+	note $21
+	note $21
+	loopchannel $00, $64ee ; end
+; 0xea50d