summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2018-06-02 05:55:31 -0500
committerdannye <33dannye@gmail.com>2018-06-02 05:56:11 -0500
commitd3654bcbbe71149eb8741790a894baa7e0c4d73e (patch)
treecf157eec955a6285b2a9aabfc04c56dafd8ad085
parent56ecc42c12b73c23e7e0e8fbcfc0fc293cc63dde (diff)
Dump all songs
uses a slightly modified red sound engine only added feature is drumsets, which still need documenting
-rw-r--r--audio/engine.asm42
-rw-r--r--audio/song_header_pointers.inc14
-rwxr-xr-xaudio/songs/bicycle.inc720
-rwxr-xr-xaudio/songs/evolution.inc122
-rwxr-xr-xaudio/songs/heal.inc58
-rwxr-xr-xaudio/songs/leaderbattle.inc1411
-rwxr-xr-xaudio/songs/nidorinointro.inc343
-rwxr-xr-xaudio/songs/none.inc16
-rwxr-xr-xaudio/songs/oakintro.inc441
-rwxr-xr-xaudio/songs/route1.inc422
-rwxr-xr-xaudio/songs/spottedrocket.inc91
-rwxr-xr-xaudio/songs/title.inc691
-rwxr-xr-xaudio/songs/trainerbattle.inc1868
-rwxr-xr-xaudio/songs/victorytrainer.inc274
-rwxr-xr-xaudio/songs/viridiancity.inc673
-rw-r--r--constants/audio_constants.asm18
-rw-r--r--gfx.asm2
-rw-r--r--macros.asm1
-rwxr-xr-xmacros/audio.asm278
19 files changed, 7466 insertions, 19 deletions
diff --git a/audio/engine.asm b/audio/engine.asm
index 561d778..4c0ed21 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -166,3 +166,45 @@ _PlayMusic:: ; 3a:4d66
jr nz, .loop
xor a
; TODO
+
+SECTION "Song Header Pointers", ROMX[$52C7], BANK[$3A]
+INCLUDE "audio/song_header_pointers.inc"
+
+SECTION "Song None", ROMX[$52ee], BANK[$3a]
+INCLUDE "audio/songs/none.inc"
+
+SECTION "Song NidorinoIntro", ROMX[$4000], BANK[$3b]
+INCLUDE "audio/songs/nidorinointro.inc"
+
+SECTION "Song ViridianCity", ROMX[$41b9], BANK[$3b]
+INCLUDE "audio/songs/viridiancity.inc"
+
+SECTION "Song Route1", ROMX[$44c2], BANK[$3b]
+INCLUDE "audio/songs/route1.inc"
+
+SECTION "Song OakIntro", ROMX[$4685], BANK[$3b]
+INCLUDE "audio/songs/oakintro.inc"
+
+SECTION "Song LeaderBattle", ROMX[$4858], BANK[$3b]
+INCLUDE "audio/songs/leaderbattle.inc"
+
+SECTION "Song TrainerBattle", ROMX[$4e31], BANK[$3b]
+INCLUDE "audio/songs/trainerbattle.inc"
+
+SECTION "Song Heal", ROMX[$55f4], BANK[$3b]
+INCLUDE "audio/songs/heal.inc"
+
+SECTION "Song Bicycle", ROMX[$563e], BANK[$3b]
+INCLUDE "audio/songs/bicycle.inc"
+
+SECTION "Song SpottedRocket", ROMX[$5978], BANK[$3b]
+INCLUDE "audio/songs/spottedrocket.inc"
+
+SECTION "Song VictoryTrainer", ROMX[$59ea], BANK[$3b]
+INCLUDE "audio/songs/victorytrainer.inc"
+
+SECTION "Song Evolution", ROMX[$5b1c], BANK[$3b]
+INCLUDE "audio/songs/evolution.inc"
+
+SECTION "Song Title", ROMX[$62fe], BANK[$3c]
+INCLUDE "audio/songs/title.inc"
diff --git a/audio/song_header_pointers.inc b/audio/song_header_pointers.inc
new file mode 100644
index 0000000..231eba6
--- /dev/null
+++ b/audio/song_header_pointers.inc
@@ -0,0 +1,14 @@
+SongHeaderPointers:
+ dbw Bank(Song_None), Song_None
+ dbw Bank(Song_Title), Song_Title
+ dbw Bank(Song_Route1), Song_Route1
+ dbw Bank(Song_OakIntro), Song_OakIntro
+ dbw Bank(Song_LeaderBattle), Song_LeaderBattle
+ dbw Bank(Song_TrainerBattle), Song_TrainerBattle
+ dbw Bank(Song_NidorinoIntro), Song_NidorinoIntro
+ dbw Bank(Song_ViridianCity), Song_ViridianCity
+ dbw Bank(Song_Heal), Song_Heal
+ dbw Bank(Song_Bicycle), Song_Bicycle
+ dbw Bank(Song_SpottedRocket), Song_SpottedRocket
+ dbw Bank(Song_VictoryTrainer), Song_VictoryTrainer
+ dbw Bank(Song_Evolution), Song_Evolution
diff --git a/audio/songs/bicycle.inc b/audio/songs/bicycle.inc
new file mode 100755
index 0000000..63594e9
--- /dev/null
+++ b/audio/songs/bicycle.inc
@@ -0,0 +1,720 @@
+Song_Bicycle:: ; ed63e (3b:563e)
+ db 3 << 6 | 0
+ dw Song_Bicycle_Ch0
+ db 1
+ dw Song_Bicycle_Ch1
+ db 2
+ dw Song_Bicycle_Ch2
+ db 3
+ dw Song_Bicycle_Ch3
+
+Song_Bicycle_Ch0:: ; ed64a (3b:564a)
+ tempo 144
+ volume 7, 7
+ duty 3
+ vibrato 8, 1, 4
+ notetype 12, 11, 5
+ octave 3
+ G_ 2
+
+Song_Bicycle_branch_ed659::
+ octave 4
+ C_ 4
+ D_ 4
+ E_ 2
+ C_ 2
+ E_ 2
+ G_ 2
+ G_ 2
+ F_ 2
+ E_ 2
+ F_ 4
+ E_ 2
+ D_ 2
+ F_ 4
+ D_ 4
+ octave 3
+ B_ 2
+ octave 4
+ F_ 4
+ D_ 4
+ E_ 2
+ F_ 2
+ G_ 2
+ C_ 2
+ E_ 2
+ C_ 2
+ D_ 2
+ E_ 2
+ notetype 12, 11, 6
+ F_ 10
+ notetype 12, 10, 6
+ F_ 2
+ E_ 2
+ F_ 2
+ G_ 10
+ E_ 2
+ D_ 2
+ E_ 2
+ F_ 6
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 3
+ E_ 2
+ D_ 2
+ D_ 1
+ E_ 1
+ F_ 2
+ E_ 1
+ F_ 1
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 5
+ G_ 6
+ G_ 6
+ A_ 2
+ F_ 2
+ G_ 6
+ notetype 12, 11, 4
+ G_ 2
+ F_ 4
+ notetype 12, 10, 4
+ E_ 2
+ D_ 2
+ notetype 12, 9, 3
+ octave 3
+ A_ 2
+ octave 4
+ C_ 4
+ C_ 2
+ octave 3
+ B_ 2
+ A_ 1
+ B_ 1
+ A_ 2
+ B_ 2
+ octave 4
+ C_ 2
+ C_ 4
+ C_ 2
+ octave 3
+ A_ 2
+ B_ 2
+ B_ 2
+ A_ 2
+ octave 4
+ C_ 4
+ octave 3
+ A_ 2
+ B_ 1
+ octave 4
+ C_ 1
+ octave 3
+ B_ 2
+ octave 4
+ D_ 4
+ octave 3
+ B_ 2
+ octave 4
+ C_ 4
+ octave 3
+ B_ 1
+ octave 4
+ C_ 1
+ D_ 1
+ octave 3
+ B_ 1
+ octave 4
+ C_ 4
+ notetype 12, 3, 13
+ C_ 4
+ notetype 12, 11, 4
+ F_ 6
+ G_ 4
+ F_ 1
+ G_ 1
+ F_ 4
+ E_ 6
+ F_ 2
+ E_ 2
+ D_ 1
+ E_ 1
+ D_ 2
+ C_ 2
+ notetype 12, 11, 5
+ octave 3
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ B_ 4
+ octave 4
+ E_ 4
+ C_ 4
+ F_ 4
+ D_ 4
+ F# 4
+ vibrato 10, 2, 6
+ notetype 12, 8, 0
+ G_ 16
+ G_ 4
+ notetype 12, 8, 7
+ G_ 12
+ notetype 12, 11, 5
+ vibrato 8, 1, 4
+ loopchannel 0, Song_Bicycle_branch_ed659
+
+
+Song_Bicycle_Ch1:: ; ed70d (3b:570d)
+ duty 2
+ vibrato 6, 1, 5
+ notetype 12, 12, 3
+ octave 4
+ C_ 2
+
+Song_Bicycle_branch_ed717::
+ E_ 4
+ F_ 4
+ G_ 4
+ octave 5
+ C_ 4
+ octave 4
+ B_ 6
+ A_ 1
+ B_ 1
+ A_ 10
+ F_ 2
+ G_ 2
+ A_ 2
+ octave 5
+ D_ 2
+ C_ 2
+ octave 4
+ B_ 2
+ A_ 1
+ B_ 1
+ octave 5
+ C_ 6
+ octave 4
+ A_ 2
+ G_ 4
+ duty 3
+ notetype 12, 8, 4
+ A# 6
+ duty 2
+ notetype 12, 12, 5
+ octave 5
+ C_ 2
+ octave 4
+ B_ 2
+ octave 5
+ C_ 2
+ octave 4
+ A_ 10
+ octave 5
+ C_ 2
+ octave 4
+ B_ 2
+ octave 5
+ C_ 2
+ octave 4
+ G_ 10
+ notetype 12, 12, 3
+ octave 5
+ C_ 4
+ E_ 2
+ D_ 2
+ C_ 2
+ octave 4
+ B_ 2
+ octave 5
+ C_ 2
+ notetype 12, 11, 0
+ D_ 4
+ notetype 12, 12, 7
+ D_ 10
+ D_ 1
+ C_ 1
+ notetype 12, 11, 0
+ octave 4
+ B_ 4
+ notetype 12, 12, 7
+ B_ 12
+ notetype 12, 12, 4
+ F_ 6
+ F_ 2
+ G_ 2
+ F_ 2
+ E_ 2
+ D_ 2
+ E_ 6
+ E_ 2
+ F_ 2
+ E_ 2
+ D_ 2
+ C_ 2
+ F_ 2
+ E_ 2
+ D_ 2
+ F_ 2
+ G_ 4
+ A_ 2
+ F_ 2
+ E_ 2
+ G_ 4
+ F_ 2
+ E_ 6
+ notetype 6, 12, 2
+ F_ 1
+ G_ 1
+ A_ 1
+ B_ 1
+ notetype 12, 12, 3
+ octave 5
+ C_ 2
+ octave 4
+ B_ 2
+ A_ 2
+ octave 5
+ C_ 2
+ octave 4
+ B_ 4
+ A_ 4
+ G_ 2
+ A# 4
+ A_ 2
+ G_ 4
+ F_ 2
+ E_ 2
+ notetype 8, 12, 4
+ A_ 4
+ G_ 4
+ F_ 4
+ B_ 4
+ A_ 4
+ G_ 4
+ octave 5
+ C_ 4
+ octave 4
+ B_ 4
+ A_ 4
+ octave 5
+ D_ 4
+ E_ 4
+ C_ 4
+ notetype 12, 12, 7
+ D_ 12
+ C_ 4
+ notetype 12, 11, 0
+ octave 4
+ B_ 4
+ notetype 12, 12, 7
+ B_ 12
+ notetype 12, 12, 3
+ loopchannel 0, Song_Bicycle_branch_ed717
+
+
+Song_Bicycle_Ch2:: ; ed7c5 (3b:57c5)
+ notetype 12, 1, 3
+ rest 2
+
+Song_Bicycle_branch_ed7c9::
+ octave 4
+ C_ 1
+ rest 1
+ E_ 1
+ rest 1
+ octave 3
+ G_ 1
+ rest 1
+ octave 4
+ E_ 1
+ rest 1
+ C_ 1
+ rest 1
+ E_ 1
+ rest 1
+ C_ 1
+ rest 1
+ G_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ C_ 1
+ rest 1
+ A_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ E_ 1
+ rest 1
+ A_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ octave 3
+ A_ 1
+ rest 1
+ octave 4
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ C_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ C_ 1
+ rest 1
+ A_ 1
+ rest 1
+ F_ 1
+ rest 1
+ G_ 1
+ rest 1
+ A_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ C_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ octave 3
+ A_ 1
+ rest 1
+ octave 4
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ G_ 1
+ rest 1
+ C_ 1
+ rest 1
+ D_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ D_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ G_ 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ octave 3
+ A_ 1
+ rest 1
+ octave 4
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ C_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ octave 3
+ A_ 1
+ rest 1
+ octave 4
+ F_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ C_ 1
+ rest 1
+ G_ 1
+ rest 1
+ C_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ C_ 1
+ rest 1
+ A_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ F_ 1
+ rest 1
+ G_ 1
+ rest 1
+ A# 1
+ rest 1
+ E_ 1
+ rest 1
+ A# 1
+ rest 1
+ G_ 1
+ rest 1
+ A# 1
+ rest 1
+ A# 1
+ rest 1
+ G_ 1
+ rest 1
+ F_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ G_ 1
+ rest 1
+ E_ 1
+ rest 1
+ G_ 1
+ rest 1
+ B_ 1
+ rest 1
+ A_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ B_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ A_ 1
+ rest 1
+ G_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ G_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ G_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ G_ 1
+ rest 1
+ octave 5
+ C_ 1
+ rest 1
+ octave 4
+ G_ 1
+ rest 1
+ B_ 1
+ rest 1
+ G_ 1
+ rest 1
+ B_ 1
+ rest 1
+ F_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F_ 1
+ rest 1
+ loopchannel 0, Song_Bicycle_branch_ed7c9
+
+
+Song_Bicycle_Ch3:: ; ed91a (3b:591a)
+ drumset 1
+ dspeed 12
+ rest 2
+
+Song_Bicycle_branch_ed91f::
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed965
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed96e
+ callchannel Song_Bicycle_branch_ed965
+ callchannel Song_Bicycle_branch_ed965
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed965
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed96e
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed965
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ callchannel Song_Bicycle_branch_ed95c
+ loopchannel 0, Song_Bicycle_branch_ed91f
+
+Song_Bicycle_branch_ed95c::
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ endchannel
+
+Song_Bicycle_branch_ed965::
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ snare7 2
+ snare7 2
+ endchannel
+
+Song_Bicycle_branch_ed96e::
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ rest 2
+ snare7 2
+ rest 2
+ snare7 1
+ snare7 1
+ endchannel
+; 0xed978
diff --git a/audio/songs/evolution.inc b/audio/songs/evolution.inc
new file mode 100755
index 0000000..7c0ae11
--- /dev/null
+++ b/audio/songs/evolution.inc
@@ -0,0 +1,122 @@
+Song_Evolution:: ; edb1c (3b:5b1c)
+ db 2 << 6 | 0
+ dw Song_Evolution_Ch0
+ db 1
+ dw Song_Evolution_Ch1
+ db 2
+ dw Song_Evolution_Ch2
+
+Song_Evolution_Ch0:: ; edb25 (3b:5b25)
+ tempo 132
+ volume 7, 7
+ vibrato 6, 3, 4
+ toggleperfectpitch
+ rest 1
+ rest 2
+ duty 2
+ notetype 12, 9, 2
+ octave 3
+ pitchbend 0, 74
+ C_ 1
+ pitchbend 0, 74
+ G_ 1
+ pitchbend 0, 74
+ C_ 1
+ pitchbend 0, 74
+ G_ 1
+ rest 4
+ duty 3
+
+Song_Evolution_branch_edb49::
+ callchannel Song_Evolution_branch_edb5b
+ notetype 12, 10, 4
+ F# 4
+ callchannel Song_Evolution_branch_edb5b
+ notetype 12, 10, 4
+ F# 4
+ loopchannel 0, Song_Evolution_branch_edb49
+
+Song_Evolution_branch_edb5b::
+ notetype 12, 10, 2
+ octave 3
+ C_ 4
+ G_ 4
+ C_ 4
+ G_ 4
+ C_ 4
+ G_ 4
+ C_ 4
+ endchannel
+
+
+Song_Evolution_Ch1:: ; edb67 (3b:5b67)
+ duty 2
+ vibrato 8, 2, 5
+ notetype 12, 10, 2
+ octave 4
+ G_ 1
+ D_ 1
+ G_ 1
+ D_ 1
+ rest 4
+ duty 3
+
+Song_Evolution_branch_edb77::
+ callchannel Song_Evolution_branch_edb89
+ notetype 12, 11, 5
+ A_ 4
+ callchannel Song_Evolution_branch_edb89
+ notetype 12, 11, 5
+ B_ 4
+ loopchannel 0, Song_Evolution_branch_edb77
+
+Song_Evolution_branch_edb89::
+ notetype 12, 11, 2
+ octave 3
+ G_ 4
+ D_ 4
+ G_ 4
+ D_ 4
+ G_ 4
+ D_ 4
+ G_ 4
+ endchannel
+
+
+Song_Evolution_Ch2:: ; edb95 (3b:5b95)
+ notetype 12, 1, 0
+ rest 8
+
+Song_Evolution_branch_edb99::
+ callchannel Song_Evolution_branch_edba7
+ octave 4
+ A_ 4
+ callchannel Song_Evolution_branch_edba7
+ octave 4
+ B_ 4
+ loopchannel 0, Song_Evolution_branch_edb99
+
+Song_Evolution_branch_edba7::
+ octave 3
+ A_ 2
+ rest 2
+ octave 4
+ D_ 2
+ rest 2
+ octave 3
+ A_ 2
+ rest 2
+ octave 4
+ D_ 2
+ rest 2
+ octave 3
+ A_ 2
+ rest 2
+ octave 4
+ D_ 2
+ rest 2
+ octave 3
+ A_ 2
+ rest 2
+ endchannel
+; 0xedbbd
diff --git a/audio/songs/heal.inc b/audio/songs/heal.inc
new file mode 100755
index 0000000..cf765b1
--- /dev/null
+++ b/audio/songs/heal.inc
@@ -0,0 +1,58 @@
+Song_Heal:: ; ed5f4 (3b:55f4)
+ db 2 << 6 | 0
+ dw Song_Heal_Ch0
+ db 1
+ dw Song_Heal_Ch1
+ db 2
+ dw Song_Heal_Ch2
+
+Song_Heal_Ch0:: ; ed5fd (3b:55fd)
+ tempo 144
+ volume 7, 7
+ duty 2
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 8, 1
+ rest 2
+ pitchbend 0, 64
+ B_ 2
+ pitchbend 0, 85
+ B_ 2
+ pitchbend 0, 69
+ E_ 2
+ rest 4
+ pitchbend 0, 48
+ E_ 4
+ pitchbend 0, 64
+ B_ 4
+ endchannel
+
+
+Song_Heal_Ch1:: ; ed621 (3b:5621)
+ duty 2
+ notetype 12, 12, 3
+ octave 4
+ B_ 4
+ B_ 4
+ B_ 2
+ G# 2
+ notetype 12, 12, 4
+ octave 5
+ E_ 8
+ endchannel
+
+
+Song_Heal_Ch2:: ; ed631 (3b:5631)
+ notetype 12, 1, 0
+ octave 4
+ E_ 2
+ rest 2
+ E_ 2
+ rest 2
+ E_ 2
+ G# 2
+ E_ 6
+ rest 2
+ endchannel
+; 0xed63e
diff --git a/audio/songs/leaderbattle.inc b/audio/songs/leaderbattle.inc
new file mode 100755
index 0000000..649a930
--- /dev/null
+++ b/audio/songs/leaderbattle.inc
@@ -0,0 +1,1411 @@
+Song_LeaderBattle:: ; ec858 (3b:4858)
+ db 2 << 6 | 0
+ dw Song_LeaderBattle_Ch0
+ db 1
+ dw Song_LeaderBattle_Ch1
+ db 2
+ dw Song_LeaderBattle_Ch2
+
+Song_LeaderBattle_Ch0:: ; ec861 (3b:4861)
+ tempo 104
+ volume 7, 7
+ duty 3
+ vibrato 8, 3, 4
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 3
+ rest 6
+ octave 3
+ F# 1
+ F_ 1
+ E_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ D_ 1
+ C# 1
+ C_ 1
+ C# 1
+ C_ 1
+ octave 2
+ B_ 1
+ octave 1
+ G# 1
+ A_ 1
+ A# 1
+ A_ 1
+ A# 1
+ B_ 1
+ A# 1
+ B_ 1
+ octave 2
+ F# 1
+ rest 15
+ F# 1
+ rest 9
+ G_ 6
+ F# 1
+ rest 15
+ F# 1
+ rest 9
+ F_ 6
+ F# 1
+ rest 15
+ F# 1
+ rest 9
+ G_ 6
+ F# 1
+ rest 15
+ F# 1
+ rest 9
+ A_ 6
+
+Song_LeaderBattle_branch_ec8a4::
+ F# 1
+ octave 3
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ octave 2
+ E_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ F# 1
+ octave 3
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ C# 1
+ octave 2
+ E_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ octave 3
+ C# 1
+ octave 2
+ B_ 1
+ A_ 1
+ rest 2
+ octave 1
+ B_ 1
+ rest 1
+ octave 2
+ D_ 4
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ E_ 4
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ D_ 4
+ octave 1
+ B_ 1
+ rest 1
+ octave 2
+ C# 2
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ D_ 4
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ E_ 4
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ D_ 4
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 2
+ C# 2
+ octave 1
+ B_ 2
+ A_ 2
+ octave 2
+ C# 2
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ rest 16
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ B_ 1
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 11, 5
+ octave 3
+ C# 12
+ notetype 12, 11, 3
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 11, 5
+ octave 3
+ A_ 12
+ notetype 12, 11, 3
+ D# 4
+ C# 4
+ D# 4
+ E_ 2
+ F# 4
+ octave 2
+ B_ 2
+ octave 3
+ C# 2
+ F# 2
+ B_ 2
+ F# 2
+ D# 2
+ F# 2
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 11, 5
+ octave 3
+ A_ 12
+ notetype 12, 11, 3
+ C# 1
+ octave 2
+ B_ 1
+ octave 3
+ C# 1
+ D# 1
+ E_ 1
+ D# 1
+ E_ 1
+ F# 1
+ A_ 1
+ G# 1
+ F# 1
+ E_ 1
+ F# 1
+ E_ 1
+ D# 1
+ C# 1
+ notetype 12, 11, 5
+ D# 4
+ E_ 4
+ C# 2
+ D# 6
+ F# 4
+ E_ 2
+ D# 4
+ C# 6
+ rest 16
+ rest 10
+ E_ 6
+ D# 4
+ E_ 4
+ C# 2
+ D# 6
+ E_ 4
+ D# 2
+ C# 4
+ octave 2
+ B_ 6
+ octave 3
+ D# 4
+ E_ 4
+ C# 2
+ D# 6
+ F# 4
+ A_ 2
+ G# 4
+ E_ 6
+ loopchannel 0, Song_LeaderBattle_branch_ec8a4
+
+
+Song_LeaderBattle_Ch1:: ; eca9c (3b:4a9c)
+ duty 3
+ vibrato 8, 2, 5
+ notetype 12, 12, 3
+ octave 4
+ F_ 1
+ E_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 3
+ B_ 1
+ rest 5
+ F# 1
+ F_ 1
+ E_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ D_ 1
+ C# 1
+ B_ 1
+ rest 15
+ B_ 1
+ rest 9
+ octave 4
+ C_ 6
+ octave 3
+ B_ 1
+ rest 15
+ B_ 1
+ rest 9
+ A# 6
+ octave 3
+ B_ 1
+ rest 15
+ B_ 1
+ rest 9
+ octave 4
+ C_ 6
+ octave 3
+ B_ 1
+ rest 15
+ B_ 1
+ rest 9
+ octave 4
+ C# 6
+
+Song_LeaderBattle_branch_ecadc::
+ notetype 12, 12, 5
+ D# 4
+ C# 4
+ D# 4
+ E_ 2
+ F# 4
+ E_ 4
+ D# 2
+ C# 2
+ octave 3
+ B_ 2
+ octave 4
+ C# 2
+ D# 2
+ notetype 12, 11, 7
+ duty 2
+ octave 3
+ A_ 8
+ octave 4
+ C# 8
+ E_ 8
+ C# 8
+ notetype 12, 12, 5
+ duty 3
+ D# 4
+ C# 4
+ D# 4
+ E_ 2
+ F# 4
+ E_ 4
+ D# 2
+ C# 2
+ octave 3
+ B_ 2
+ octave 4
+ C# 2
+ D# 2
+ notetype 12, 11, 7
+ duty 2
+ C# 8
+ octave 3
+ B_ 8
+ A_ 8
+ notetype 12, 12, 3
+ octave 4
+ E_ 4
+ E_ 2
+ C# 2
+ notetype 12, 12, 5
+ duty 3
+ octave 1
+ B_ 1
+ rest 3
+ octave 3
+ D_ 1
+ C# 1
+ octave 2
+ B_ 1
+ octave 3
+ D_ 1
+ rest 4
+ E_ 1
+ D_ 1
+ octave 2
+ B_ 1
+ octave 3
+ E_ 1
+ rest 4
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ rest 2
+ E_ 1
+ C# 1
+ E_ 1
+ rest 1
+ F_ 1
+ rest 1
+ D_ 1
+ C# 1
+ octave 2
+ B_ 1
+ octave 3
+ D_ 1
+ rest 4
+ E_ 1
+ D_ 1
+ octave 2
+ B_ 1
+ octave 3
+ E_ 1
+ rest 4
+ F# 1
+ E_ 1
+ C# 1
+ F# 1
+ E_ 1
+ rest 1
+ C# 1
+ rest 1
+ D_ 1
+ rest 1
+ C# 1
+ rest 1
+ F# 1
+ rest 1
+ E_ 1
+ rest 1
+ octave 1
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ notetype 12, 11, 0
+ octave 3
+ B_ 4
+ octave 4
+ C_ 4
+ octave 3
+ A_ 4
+ B_ 4
+ octave 4
+ C_ 4
+ octave 3
+ A_ 4
+ G_ 4
+ notetype 12, 11, 0
+ F# 8
+ notetype 12, 11, 7
+ F# 8
+ notetype 12, 12, 3
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 2
+ B_ 1
+ A_ 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ A_ 1
+ B_ 1
+ notetype 12, 11, 0
+ octave 3
+ B_ 4
+ octave 4
+ C_ 4
+ octave 3
+ A_ 4
+ B_ 4
+ octave 4
+ C_ 4
+ octave 3
+ A_ 4
+ octave 4
+ C_ 4
+ notetype 12, 11, 0
+ octave 3
+ B_ 16
+ notetype 12, 3, 15
+ octave 4
+ F# 16
+ notetype 12, 12, 3
+ duty 3
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 12, 7
+ octave 3
+ A_ 12
+ notetype 12, 12, 3
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 12, 7
+ octave 4
+ C# 12
+ notetype 12, 11, 0
+ D# 16
+ notetype 12, 11, 7
+ D# 16
+ notetype 12, 12, 3
+ octave 1
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ notetype 12, 12, 7
+ octave 4
+ C# 12
+ notetype 12, 12, 0
+ A_ 8
+ E_ 8
+ B_ 16
+ notetype 12, 12, 7
+ B_ 16
+ notetype 12, 12, 4
+ octave 3
+ D# 4
+ E_ 4
+ C# 2
+ D# 6
+ F# 4
+ A_ 2
+ G# 4
+ rest 2
+ B_ 1
+ octave 4
+ D# 1
+ F# 1
+ A# 1
+ notetype 12, 12, 0
+ B_ 16
+ F# 16
+ A_ 16
+ octave 5
+ C# 8
+ rest 2
+ notetype 12, 12, 3
+ octave 4
+ A_ 6
+ loopchannel 0, Song_LeaderBattle_branch_ecadc
+
+
+Song_LeaderBattle_Ch2:: ; ecc05 (3b:4c05)
+ vibrato 0, 2, 0
+ notetype 12, 1, 3
+ rest 12
+ octave 3
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ C_ 1
+ C# 1
+ D_ 1
+ C# 1
+ D_ 1
+ D# 1
+ D_ 1
+ D# 1
+ E_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ E_ 1
+ F_ 1
+ F# 1
+ F_ 1
+ F# 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ C_ 6
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F_ 6
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ C_ 6
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ F# 1
+ rest 1
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ C# 6
+ notetype 12, 1, 4
+
+Song_LeaderBattle_branch_eccc9::
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ D_ 4
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ E_ 4
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ D_ 4
+ octave 3
+ B_ 1
+ rest 1
+ octave 4
+ C# 2
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ D_ 4
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ E_ 4
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ D_ 4
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 1
+ octave 4
+ C# 2
+ octave 3
+ B_ 2
+ A_ 2
+ octave 4
+ C# 2
+ octave 3
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ B_ 1
+ rest 1
+ B_ 1
+ rest 13
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 4
+ C# 12
+ octave 3
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 4
+ E_ 12
+ D# 16
+ octave 3
+ B_ 16
+ A_ 1
+ rest 1
+ A_ 1
+ rest 1
+ octave 4
+ E_ 12
+ C# 8
+ E_ 8
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ E_ 6
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ G_ 6
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ C_ 6
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ F# 2
+ octave 3
+ B_ 2
+ octave 4
+ G_ 6
+ loopchannel 0, Song_LeaderBattle_branch_eccc9
+; 0xece31
diff --git a/audio/songs/nidorinointro.inc b/audio/songs/nidorinointro.inc
new file mode 100755
index 0000000..44417f5
--- /dev/null
+++ b/audio/songs/nidorinointro.inc
@@ -0,0 +1,343 @@
+Song_NidorinoIntro:: ; ec000 (3b:4000)
+ db 3 << 6 | 0
+ dw Song_NidorinoIntro_Ch0
+ db 1
+ dw Song_NidorinoIntro_Ch1
+ db 2
+ dw Song_NidorinoIntro_Ch2
+ db 3
+ dw Song_NidorinoIntro_Ch3
+
+Song_NidorinoIntro_Ch0:: ; ec00c (3b:400c)
+ tempo 102
+ volume 7, 7
+ duty 3
+ vibrato 6, 3, 4
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 1
+ rest 8
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D_ 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D# 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D_ 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 10, 0
+ A# 4
+ notetype 12, 11, 1
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D_ 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 2, 9
+ octave 3
+ G_ 4
+ notetype 12, 11, 0
+ A_ 8
+ octave 2
+ A_ 8
+ notetype 12, 11, 7
+ octave 3
+ F_ 8
+ notetype 12, 4, 15
+ octave 2
+ F_ 8
+ notetype 12, 11, 1
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D_ 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ D# 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ F_ 4
+ notetype 12, 11, 1
+ octave 2
+ A_ 2
+ A_ 2
+ notetype 12, 11, 4
+ octave 3
+ G_ 4
+ notetype 12, 11, 0
+ F# 16
+ notetype 12, 11, 1
+ octave 4
+ D_ 16
+ endchannel
+
+
+Song_NidorinoIntro_Ch1:: ; ec09f (3b:409f)
+ duty 3
+ vibrato 8, 2, 5
+ notetype 12, 12, 2
+ rest 8
+ octave 3
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A_ 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A# 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A_ 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 11, 7
+ C# 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A_ 4
+ notetype 12, 12, 2
+ octave 3
+ D_ 2
+ D_ 2
+ notetype 12, 12, 7
+ octave 4
+ C# 4
+ D_ 8
+ octave 3
+ D_ 8
+ octave 4
+ C_ 8
+ octave 3
+ C_ 8
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A_ 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ A# 4
+ notetype 12, 12, 2
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ octave 4
+ C_ 4
+ notetype 12, 12, 2
+ octave 3
+ D_ 2
+ D_ 2
+ notetype 12, 12, 5
+ octave 4
+ C# 4
+ notetype 12, 2, 15
+ D_ 16
+ notetype 12, 12, 1
+ octave 5
+ D_ 16
+ endchannel
+
+
+Song_NidorinoIntro_Ch2:: ; ec116 (3b:4116)
+ notetype 12, 1, 0
+ rest 8
+ octave 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ F# 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A# 4
+ A_ 8
+ D_ 8
+ A# 8
+ D_ 8
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A_ 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A# 4
+ D_ 1
+ rest 1
+ D_ 1
+ rest 1
+ A# 4
+ A_ 16
+ D_ 1
+ rest 15
+ endchannel
+
+
+Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155)
+ drumset 2
+ dspeed 6
+ snare4 1
+ snare4 1
+ snare4 1
+ snare4 1
+ snare3 1
+ snare4 1
+ snare3 1
+ snare4 1
+ snare3 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare2 1
+ snare2 1
+ snare2 4
+ snare2 4
+ snare4 1
+ snare4 1
+ snare4 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare2 4
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 4
+ snare4 1
+ snare4 1
+ snare4 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare2 4
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 4
+ snare2 4
+ snare4 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare2 16
+ snare2 16
+ snare2 16
+ snare4 1
+ snare4 1
+ snare4 1
+ snare4 1
+ snare3 1
+ snare4 1
+ snare3 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare2 1
+ snare2 1
+ snare2 1
+ snare2 1
+ snare2 4
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 4
+ snare4 1
+ snare4 1
+ snare4 1
+ snare4 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare3 1
+ snare2 4
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 8
+ snare2 4
+ snare2 16
+ snare2 16
+ snare2 2
+ rest 16
+ rest 14
+ endchannel
+; 0xec1b9
diff --git a/audio/songs/none.inc b/audio/songs/none.inc
new file mode 100755
index 0000000..ee0f781
--- /dev/null
+++ b/audio/songs/none.inc
@@ -0,0 +1,16 @@
+Song_None:: ; e92ee (3a:52ee)
+ db 3 << 6 | 0
+ dw Song_None_Ch0
+ db 1
+ dw Song_None_Ch1
+ db 2
+ dw Song_None_Ch2
+ db 3
+ dw Song_None_Ch3
+
+Song_None_Ch0:: ; e92fa (3a:52fa)
+Song_None_Ch1:: ; e92fa (3a:52fa)
+Song_None_Ch2:: ; e92fa (3a:52fa)
+Song_None_Ch3:: ; e92fa (3a:52fa)
+ endchannel
+; 0xe92fb
diff --git a/audio/songs/oakintro.inc b/audio/songs/oakintro.inc
new file mode 100755
index 0000000..498be2e
--- /dev/null
+++ b/audio/songs/oakintro.inc
@@ -0,0 +1,441 @@
+Song_OakIntro:: ; ec685 (3b:4685)
+ db 3 << 6 | 0
+ dw Song_OakIntro_Ch0
+ db 1
+ dw Song_OakIntro_Ch1
+ db 2
+ dw Song_OakIntro_Ch2
+ db 3
+ dw Song_OakIntro_Ch3
+
+Song_OakIntro_Ch0:: ; ec691 (3b:4691)
+ tempo 152
+ volume 7, 7
+ vibrato 9, 2, 5
+ duty 1
+
+Song_OakIntro_branch_ec69b::
+ notetype 12, 11, 2
+ octave 2
+ B_ 4
+ octave 3
+ G# 6
+ F# 2
+ E_ 2
+ D# 1
+ F# 1
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ A_ 2
+ G# 4
+ F# 4
+ octave 2
+ B_ 4
+ octave 3
+ G# 6
+ F# 2
+ E_ 2
+ D# 1
+ F# 1
+ B_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ A_ 2
+ G# 4
+ B_ 4
+ notetype 8, 11, 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ E_ 2
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ D# 2
+ octave 3
+ G# 2
+ octave 4
+ D# 2
+ D# 2
+ octave 3
+ G# 2
+ octave 4
+ D# 2
+ C# 2
+ octave 3
+ F# 2
+ octave 4
+ C# 2
+ C# 2
+ octave 3
+ F# 2
+ octave 4
+ C# 2
+ octave 3
+ B_ 2
+ E_ 2
+ B_ 2
+ B_ 2
+ E_ 2
+ G# 2
+ F# 2
+ G# 2
+ A_ 2
+ A_ 2
+ F# 2
+ A_ 2
+ F# 2
+ G# 2
+ A_ 2
+ A_ 2
+ F# 2
+ A_ 2
+ G# 2
+ E_ 2
+ B_ 2
+ B_ 2
+ E_ 2
+ B_ 2
+ B_ 2
+ E_ 2
+ B_ 2
+ B_ 2
+ E_ 2
+ B_ 2
+ A_ 2
+ B_ 2
+ A_ 2
+ octave 4
+ C# 2
+ octave 3
+ B_ 2
+ octave 4
+ C# 2
+ D_ 2
+ octave 3
+ B_ 2
+ octave 4
+ D_ 2
+ F# 2
+ E_ 2
+ D# 2
+ E_ 2
+ octave 3
+ B_ 2
+ octave 4
+ E_ 2
+ E_ 2
+ octave 3
+ B_ 2
+ octave 4
+ E_ 2
+ E_ 2
+ octave 3
+ B_ 2
+ octave 4
+ E_ 2
+ E_ 2
+ octave 3
+ B_ 2
+ octave 4
+ E_ 2
+ loopchannel 0, Song_OakIntro_branch_ec69b
+ endchannel
+
+
+Song_OakIntro_Ch1:: ; ec729 (3b:4729)
+ vibrato 8, 2, 6
+ duty 3
+
+Song_OakIntro_branch_ec72e::
+ notetype 12, 13, 4
+ octave 4
+ E_ 6
+ octave 3
+ B_ 1
+ octave 4
+ E_ 1
+ F# 6
+ A_ 2
+ G# 3
+ E_ 1
+ F# 8
+ octave 3
+ D# 4
+ octave 4
+ E_ 6
+ octave 3
+ B_ 1
+ octave 4
+ E_ 1
+ F# 6
+ A_ 2
+ G# 3
+ E_ 1
+ B_ 8
+ octave 3
+ G# 4
+ octave 5
+ C# 6
+ octave 4
+ B_ 1
+ A_ 1
+ B_ 6
+ A_ 1
+ G# 1
+ A_ 6
+ G# 1
+ F# 1
+ G# 4
+ F# 2
+ E_ 2
+ D_ 2
+ D_ 1
+ E_ 1
+ F# 8
+ A_ 4
+ G# 3
+ F# 1
+ E_ 8
+ F# 2
+ E_ 2
+ stereopanning 70
+ D# 6
+ D_ 2
+ D_ 1
+ E_ 1
+ F# 2
+ F# 1
+ G# 1
+ A_ 4
+ octave 5
+ C# 4
+ octave 4
+ B_ 3
+ A_ 1
+ G# 8
+ rest 4
+ loopchannel 0, Song_OakIntro_branch_ec72e
+ endchannel
+
+
+Song_OakIntro_Ch2:: ; ec779 (3b:4779)
+ vibrato 9, 2, 8
+
+Song_OakIntro_branch_ec77c::
+ notetype 12, 1, 1
+ octave 3
+ E_ 2
+ rest 2
+ octave 2
+ B_ 6
+ octave 3
+ D_ 1
+ C# 1
+ D_ 2
+ D# 2
+ E_ 2
+ rest 2
+ octave 2
+ B_ 6
+ octave 3
+ D_ 1
+ C# 1
+ octave 2
+ A_ 2
+ octave 3
+ C# 2
+ E_ 2
+ rest 2
+ octave 2
+ B_ 6
+ octave 3
+ D_ 1
+ C# 1
+ D_ 2
+ D# 2
+ E_ 2
+ rest 2
+ octave 2
+ B_ 4
+ octave 3
+ C# 2
+ octave 2
+ B_ 2
+ octave 3
+ D_ 2
+ F# 2
+ E_ 2
+ rest 2
+ octave 2
+ A_ 2
+ rest 2
+ octave 3
+ D# 2
+ rest 2
+ octave 2
+ G# 2
+ rest 2
+ octave 3
+ C# 2
+ rest 2
+ octave 2
+ F# 2
+ rest 2
+ B_ 2
+ rest 2
+ E_ 2
+ G# 2
+ F# 2
+ rest 2
+ A_ 2
+ rest 2
+ F# 2
+ rest 2
+ A_ 2
+ rest 2
+ G# 2
+ rest 2
+ B_ 2
+ rest 2
+ G# 2
+ rest 2
+ B_ 2
+ rest 2
+ F# 2
+ rest 2
+ A_ 2
+ rest 2
+ octave 3
+ C# 2
+ rest 2
+ octave 2
+ A_ 2
+ octave 3
+ C# 2
+ octave 2
+ B_ 2
+ rest 2
+ octave 3
+ E_ 2
+ rest 2
+ G# 2
+ rest 2
+ E_ 2
+ rest 2
+ loopchannel 0, Song_OakIntro_branch_ec77c
+ endchannel
+
+
+Song_OakIntro_Ch3:: ; ec7e7 (3b:47e7)
+ drumset 0
+
+Song_OakIntro_branch_ec7e9::
+ dspeed 12
+ snare3 2
+ rest 2
+ snare3 1
+ rest 5
+ snare3 1
+ snare3 1
+ snare3 2
+ snare3 2
+ snare3 2
+ rest 2
+ dspeed 8
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ snare3 3
+ dspeed 12
+ snare3 1
+ rest 3
+ snare3 2
+ rest 2
+ snare3 2
+ rest 4
+ snare3 1
+ snare3 1
+ snare3 2
+ rest 2
+ snare3 2
+ rest 2
+ dspeed 8
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ snare3 3
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ rest 3
+ dspeed 12
+ snare3 1
+ rest 5
+ snare3 1
+ snare3 1
+ snare3 2
+ snare3 2
+ snare3 2
+ rest 2
+ dspeed 8
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ rest 3
+ dspeed 12
+ snare3 1
+ rest 3
+ snare3 2
+ rest 2
+ snare3 2
+ rest 4
+ snare3 1
+ snare3 1
+ snare3 2
+ snare3 2
+ snare3 2
+ rest 2
+ dspeed 8
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ rest 3
+ snare3 3
+ snare3 3
+ snare3 3
+ rest 3
+ dspeed 12
+ snare3 1
+ rest 5
+ snare3 1
+ snare3 1
+ snare3 2
+ snare3 2
+ snare3 2
+ rest 2
+ dspeed 8
+ snare3 2
+ snare3 2
+ snare3 2
+ snare3 3
+ rest 3
+ snare3 3
+ rest 3
+ loopchannel 0, Song_OakIntro_branch_ec7e9
+ endchannel
+; 0xec858
diff --git a/audio/songs/route1.inc b/audio/songs/route1.inc
new file mode 100755
index 0000000..59f2e4e
--- /dev/null
+++ b/audio/songs/route1.inc
@@ -0,0 +1,422 @@
+Song_Route1:: ; ec4c2 (3b:44c2)
+ db 3 << 6 | 0
+ dw Song_Route1_Ch0
+ db 1
+ dw Song_Route1_Ch1
+ db 2
+ dw Song_Route1_Ch2
+ db 3
+ dw Song_Route1_Ch3
+
+Song_Route1_Ch0:: ; ec4ce (3b:44ce)
+ tempo 152
+ volume 7, 7
+ vibrato 4, 2, 3
+ duty 2
+ toggleperfectpitch
+ rest 1
+ rest 2
+
+Song_Route1_branch_ec4db::
+ notetype 12, 10, 1
+ rest 4
+ octave 4
+ D_ 2
+ D_ 6
+ D_ 2
+ D_ 6
+ D_ 2
+ D_ 1
+ C# 1
+ octave 3
+ B_ 1
+ octave 4
+ C# 1
+ octave 3
+ A_ 2
+ A_ 2
+ A_ 6
+ octave 4
+ C# 2
+ C# 6
+ C# 2
+ C# 4
+ octave 3
+ A_ 2
+ octave 4
+ C# 2
+ octave 3
+ B_ 2
+ octave 4
+ C# 4
+ octave 3
+ A_ 2
+ A_ 6
+ octave 4
+ D_ 2
+ D_ 6
+ D_ 2
+ D_ 6
+ D_ 2
+ D_ 1
+ E_ 1
+ D_ 1
+ C# 1
+ octave 3
+ B_ 2
+ A_ 2
+ A_ 6
+ octave 4
+ C# 2
+ C# 6
+ octave 3
+ A_ 2
+ octave 4
+ E_ 2
+ octave 3
+ A_ 2
+ notetype 12, 10, 2
+ octave 4
+ G_ 4
+ E_ 4
+ F# 2
+ notetype 12, 10, 1
+ octave 3
+ A_ 2
+ A_ 6
+ A_ 2
+ F# 2
+ A_ 4
+ B_ 2
+ octave 4
+ C# 2
+ octave 3
+ B_ 4
+ A_ 2
+ F# 2
+ A_ 4
+ G_ 2
+ E_ 2
+ C# 4
+ A_ 2
+ octave 4
+ D_ 2
+ octave 3
+ A_ 4
+ B_ 2
+ G_ 2
+ B_ 4
+ octave 4
+ D_ 2
+ E_ 2
+ C# 2
+ D_ 2
+ octave 3
+ A_ 2
+ A_ 2
+ loopchannel 0, Song_Route1_branch_ec4db
+ endchannel
+
+
+Song_Route1_Ch1:: ; ec546 (3b:4546)
+ duty 2
+
+Song_Route1_branch_ec548::
+ notetype 12, 13, 1
+ callchannel Song_Route1_branch_ec55b
+ callchannel Song_Route1_branch_ec56e
+ callchannel Song_Route1_branch_ec55b
+ callchannel Song_Route1_branch_ec586
+ loopchannel 0, Song_Route1_branch_ec548
+
+Song_Route1_branch_ec55b::
+ octave 4
+ D_ 1
+ E_ 1
+ F# 2
+ F# 2
+ F# 2
+ D_ 1
+ E_ 1
+ F# 2
+ F# 2
+ F# 2
+ D_ 1
+ E_ 1
+ F# 2
+ F# 2
+ G_ 3
+ F# 1
+ E_ 6
+ endchannel
+
+Song_Route1_branch_ec56e::
+ C# 1
+ D_ 1
+ E_ 2
+ E_ 2
+ E_ 2
+ C# 1
+ D_ 1
+ E_ 2
+ E_ 2
+ E_ 2
+ C# 1
+ D_ 1
+ stereopanning 41
+ D# 8
+ E_ 2
+ E_ 2
+ F# 1
+ E_ 1
+ E_ 1
+ F# 1
+ D_ 4
+ F# 2
+ endchannel
+
+Song_Route1_branch_ec586::
+ C# 1
+ D_ 1
+ E_ 2
+ G_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ C# 2
+ octave 3
+ B_ 2
+ octave 4
+ C# 2
+ notetype 12, 13, 2
+ B_ 4
+ notetype 6, 13, 1
+ octave 3
+ B_ 1
+ octave 4
+ C# 1
+ notetype 12, 13, 1
+ octave 3
+ B_ 1
+ A_ 1
+ octave 4
+ C# 1
+ D_ 6
+ notetype 12, 13, 2
+ F# 1
+ G_ 1
+ A_ 2
+ A_ 2
+ F# 2
+ D_ 2
+ octave 5
+ D_ 2
+ C# 2
+ octave 4
+ B_ 2
+ octave 5
+ C# 2
+ octave 4
+ A_ 2
+ F# 2
+ D_ 3
+ F# 1
+ E_ 6
+ F# 1
+ G_ 1
+ A_ 2
+ A_ 2
+ F# 2
+ A_ 2
+ octave 5
+ D_ 2
+ C# 2
+ octave 4
+ B_ 3
+ G_ 1
+ A_ 2
+ octave 5
+ D_ 2
+ C# 2
+ E_ 2
+ D_ 2
+ notetype 12, 13, 1
+ octave 4
+ D_ 2
+ D_ 2
+ endchannel
+ endchannel
+
+
+Song_Route1_Ch2:: ; ec5d6 (3b:45d6)
+ vibrato 8, 2, 5
+ notetype 12, 1, 3
+
+Song_Route1_branch_ec5dc::
+ rest 2
+ octave 4
+ D_ 4
+ C# 4
+ octave 3
+ B_ 4
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ A_ 4
+ B_ 4
+ A_ 4
+ octave 4
+ C# 4
+ octave 3
+ A_ 4
+ B_ 4
+ octave 4
+ C_ 4
+ C# 4
+ octave 3
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ A_ 4
+ octave 4
+ D_ 4
+ C# 4
+ octave 3
+ B_ 4
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ A_ 4
+ B_ 4
+ A_ 4
+ octave 4
+ C# 4
+ octave 3
+ B_ 4
+ A_ 4
+ B_ 4
+ octave 4
+ C# 4
+ octave 3
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ A_ 4
+ octave 4
+ D_ 8
+ octave 3
+ G_ 8
+ A_ 8
+ octave 4
+ C# 8
+ D_ 8
+ octave 3
+ G_ 8
+ A_ 8
+ octave 4
+ D_ 6
+ loopchannel 0, Song_Route1_branch_ec5dc
+ endchannel
+
+
+Song_Route1_Ch3:: ; ec623 (3b:4623)
+ drumset 2
+
+Song_Route1_branch_ec625::
+ dspeed 12
+ rest 4
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ rest 4
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ snare4 2
+ rest 2
+ snare4 2
+ snare4 2
+ loopchannel 0, Song_Route1_branch_ec625
+ endchannel
+; 0xec685
diff --git a/audio/songs/spottedrocket.inc b/audio/songs/spottedrocket.inc
new file mode 100755
index 0000000..bdc4250
--- /dev/null
+++ b/audio/songs/spottedrocket.inc
@@ -0,0 +1,91 @@
+Song_SpottedRocket:: ; ed978 (3b:5978)
+ db 2 << 6 | 0
+ dw Song_SpottedRocket_Ch0
+ db 1
+ dw Song_SpottedRocket_Ch1
+ db 2
+ dw Song_SpottedRocket_Ch2
+
+Song_SpottedRocket_Ch0:: ; ed981 (3b:5981)
+ tempo 124
+ volume 7, 7
+ duty 2
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 1
+ rest 4
+ octave 3
+ D_ 2
+ C# 2
+ notetype 12, 4, 15
+ D_ 4
+
+Song_SpottedRocket_branch_ed996::
+ notetype 12, 10, 1
+ D_ 4
+ D_ 4
+ D_ 4
+ notetype 12, 7, 0
+ D_ 4
+ loopchannel 0, Song_SpottedRocket_branch_ed996
+
+
+Song_SpottedRocket_Ch1:: ; ed9a4 (3b:59a4)
+ duty 1
+ notetype 12, 11, 6
+ octave 3
+ B_ 2
+ A# 2
+ B_ 8
+
+Song_SpottedRocket_branch_ed9ad::
+ notetype 12, 12, 2
+ octave 4
+ D# 2
+ D_ 2
+ C# 2
+ C_ 2
+ octave 3
+ B_ 4
+ B_ 4
+ B_ 4
+ B_ 4
+ B_ 4
+ notetype 12, 4, 15
+ A# 4
+ notetype 12, 12, 2
+ G_ 2
+ G# 2
+ A_ 2
+ A# 2
+ B_ 4
+ B_ 4
+ B_ 4
+ B_ 4
+ B_ 4
+ notetype 12, 3, 15
+ A# 4
+ notetype 12, 12, 2
+ loopchannel 0, Song_SpottedRocket_branch_ed9ad
+
+
+Song_SpottedRocket_Ch2:: ; ed9d6 (3b:59d6)
+ notetype 12, 1, 0
+ rest 8
+ octave 4
+ F# 1
+ rest 1
+ F_ 1
+ rest 1
+
+Song_SpottedRocket_branch_ed9df::
+ F# 1
+ rest 3
+ F# 1
+ rest 3
+ F# 1
+ rest 3
+ A# 4
+ loopchannel 0, Song_SpottedRocket_branch_ed9df
+; 0xed9ea
diff --git a/audio/songs/title.inc b/audio/songs/title.inc
new file mode 100755
index 0000000..488b6b4
--- /dev/null
+++ b/audio/songs/title.inc
@@ -0,0 +1,691 @@
+Song_Title:: ; f22fe (3c:62fe)
+ db 3 << 6 | 0
+ dw Song_Title_Ch0
+ db 1
+ dw Song_Title_Ch1
+ db 2
+ dw Song_Title_Ch2
+ db 3
+ dw Song_Title_Ch3
+
+Song_Title_Ch0:: ; f230a (3c:630a)
+ tempo 144
+ volume 7, 7
+ vibrato 9, 3, 4
+ duty 3
+ notetype 12, 12, 1
+ octave 2
+ E_ 1
+ G_ 1
+ B_ 1
+ octave 3
+ D_ 1
+ octave 2
+ G_ 4
+ G_ 6
+ G_ 1
+ G_ 1
+ G_ 4
+ G_ 4
+ G_ 4
+ notetype 8, 12, 1
+ A_ 2
+ A_ 2
+ A_ 2
+ A_ 2
+ A_ 2
+ F# 2
+
+Song_Title_branch_f232e::
+ callchannel Song_Title_branch_f2395
+ callchannel Song_Title_branch_f239f
+ callchannel Song_Title_branch_f2395
+ octave 3
+ C_ 8
+ notetype 8, 12, 6
+ E_ 4
+ E_ 4
+ C_ 4
+ notetype 12, 12, 6
+ octave 2
+ B_ 8
+ notetype 8, 14, 7
+ octave 3
+ F_ 4
+ E_ 4
+ C_ 4
+ notetype 12, 14, 7
+ D_ 10
+ notetype 12, 12, 6
+ octave 2
+ B_ 2
+ octave 3
+ C_ 2
+ D_ 2
+ callchannel Song_Title_branch_f2395
+ callchannel Song_Title_branch_f239f
+ callchannel Song_Title_branch_f2395
+ C_ 6
+ C_ 6
+ E_ 4
+ D_ 6
+ F_ 2
+ G_ 2
+ D_ 4
+ G_ 2
+ G_ 6
+ A_ 4
+ F_ 2
+ A_ 2
+ octave 4
+ C_ 2
+ octave 3
+ D_ 12
+ E_ 4
+ F_ 8
+ G_ 4
+ F_ 4
+ E_ 12
+ F_ 4
+ G_ 8
+ notetype 12, 11, 6
+ octave 4
+ C_ 4
+ C# 4
+ callchannel Song_Title_branch_f23b3
+ notetype 8, 11, 4
+ octave 4
+ C_ 4
+ C_ 4
+ C# 4
+ callchannel Song_Title_branch_f23b3
+ notetype 8, 11, 2
+ octave 3
+ E_ 4
+ E_ 4
+ C# 4
+ loopchannel 0, Song_Title_branch_f232e
+
+Song_Title_branch_f2395::
+ notetype 12, 12, 6
+ octave 3
+ D_ 6
+ octave 2
+ B_ 2
+ octave 3
+ D_ 8
+ endchannel
+
+Song_Title_branch_f239f::
+ C_ 6
+ F_ 6
+ C_ 4
+ D_ 8
+ notetype 12, 14, 7
+ F_ 6
+ E_ 1
+ D# 1
+ D_ 8
+ notetype 8, 12, 6
+ C_ 4
+ octave 2
+ B_ 4
+ octave 3
+ C_ 4
+ endchannel
+
+Song_Title_branch_f23b3::
+ notetype 12, 12, 1
+ D_ 1
+ rest 1
+ octave 2
+ D_ 1
+ D_ 1
+ D_ 1
+ rest 1
+ D_ 1
+ D_ 1
+ D_ 1
+ rest 1
+ D_ 1
+ D_ 1
+ D_ 1
+ rest 1
+ D_ 1
+ D_ 1
+ D_ 1
+ rest 1
+ D_ 1
+ D_ 1
+ D_ 1
+ rest 1
+ D_ 1
+ D_ 1
+ endchannel
+
+
+Song_Title_Ch1:: ; f23d0 (3c:63d0)
+ vibrato 16, 4, 6
+ duty 1
+ notetype 12, 14, 1
+ octave 2
+ G_ 1
+ B_ 1
+ octave 3
+ D_ 1
+ F# 1
+ G_ 4
+ G_ 6
+ G_ 1
+ G_ 1
+ G_ 4
+ G_ 4
+ G_ 4
+ notetype 8, 14, 1
+ F_ 2
+ F_ 2
+ F_ 2
+ F_ 2
+ F_ 2
+ F# 2
+
+Song_Title_branch_f23ee::
+ vibrato 16, 4, 6
+ callchannel Song_Title_branch_f248a
+ unknown_f9
+ octave 2
+ A_ 4
+ F_ 4
+ callchannel Song_Title_branch_f2496
+ octave 2
+ A_ 8
+ B_ 16
+ callchannel Song_Title_branch_f248a
+ octave 2
+ A_ 6
+ F_ 2
+ notetype 8, 14, 7
+ octave 4
+ C_ 4
+ octave 3
+ B_ 4
+ octave 4
+ C_ 4
+ notetype 12, 14, 7
+ D_ 8
+ notetype 12, 9, 5
+ octave 2
+ D_ 6
+ D_ 1
+ F# 1
+ G_ 16
+ callchannel Song_Title_branch_f248a
+ octave 2
+ A_ 2
+ F_ 6
+ callchannel Song_Title_branch_f2496
+ octave 3
+ C_ 2
+ octave 2
+ A_ 6
+ B_ 6
+ G_ 2
+ F_ 8
+ callchannel Song_Title_branch_f248a
+ notetype 8, 9, 5
+ octave 2
+ G_ 4
+ F_ 5
+ A_ 3
+ notetype 8, 14, 6
+ octave 4
+ F_ 4
+ E_ 4
+ F_ 4
+ notetype 12, 14, 7
+ G_ 6
+ A# 2
+ G_ 8
+ unknown_f9
+ vibrato 16, 2, 6
+ duty 3
+ notetype 12, 0, 11
+ G_ 8
+ notetype 12, 14, 7
+ A_ 8
+ duty 1
+ notetype 12, 14, 7
+ A# 6
+ F_ 2
+ F_ 8
+ octave 3
+ D_ 8
+ octave 4
+ A# 4
+ B_ 4
+ octave 5
+ C_ 6
+ octave 4
+ G_ 2
+ G_ 8
+ octave 3
+ E_ 8
+ notetype 12, 13, 7
+ octave 5
+ C_ 4
+ C# 4
+ callchannel Song_Title_branch_f24a2
+ rest 3
+ D_ 1
+ rest 3
+ D_ 1
+ notetype 8, 14, 5
+ octave 5
+ C_ 4
+ C_ 4
+ C# 4
+ callchannel Song_Title_branch_f24a2
+ D_ 1
+ rest 2
+ D_ 1
+ rest 3
+ D_ 1
+ notetype 8, 14, 3
+ octave 5
+ C_ 4
+ C_ 4
+ octave 4
+ B_ 4
+ loopchannel 0, Song_Title_branch_f23ee
+
+Song_Title_branch_f248a::
+ notetype 12, 14, 7
+ octave 3
+ G_ 6
+ B_ 2
+ octave 4
+ D_ 8
+ notetype 12, 9, 5
+ endchannel
+
+Song_Title_branch_f2496::
+ notetype 12, 14, 7
+ octave 4
+ F_ 6
+ E_ 1
+ D# 1
+ D_ 8
+ notetype 12, 9, 5
+ endchannel
+
+Song_Title_branch_f24a2::
+ notetype 12, 14, 1
+ D_ 1
+ rest 2
+ octave 4
+ D_ 1
+ rest 3
+ D_ 1
+ rest 3
+ D_ 1
+ rest 3
+ D_ 1
+ endchannel
+
+
+Song_Title_Ch2:: ; f24b0 (3c:64b0)
+ notetype 12, 1, 0
+ octave 3
+ G_ 1
+ rest 1
+ D_ 1
+ rest 1
+ G_ 1
+ rest 3
+ G_ 1
+ rest 5
+ G_ 1
+ G_ 1
+ G_ 1
+ rest 3
+ G_ 1
+ rest 3
+ G_ 1
+ rest 3
+ notetype 8, 1, 0
+ F_ 2
+ F_ 2
+ F_ 2
+ F_ 2
+ F_ 2
+ A_ 2
+
+Song_Title_branch_f24cd::
+ callchannel Song_Title_branch_f253a
+ callchannel Song_Title_branch_f2541
+
+Song_Title_branch_f24d3::
+ callchannel Song_Title_branch_f253a
+ callchannel Song_Title_branch_f253a
+ callchannel Song_Title_branch_f253a
+ callchannel Song_Title_branch_f2541
+ loopchannel 3, Song_Title_branch_f24d3
+ callchannel Song_Title_branch_f253a
+ G_ 6
+ D_ 3
+ A_ 6
+ F_ 3
+ A_ 3
+ F_ 3
+ callchannel Song_Title_branch_f2548
+ A# 3
+ F_ 3
+ callchannel Song_Title_branch_f2548
+ B_ 3
+ G_ 3
+ callchannel Song_Title_branch_f254d
+ octave 4
+ C_ 3
+ octave 3
+ G_ 3
+ callchannel Song_Title_branch_f254d
+ octave 4
+ C# 3
+ octave 3
+ A_ 3
+ callchannel Song_Title_branch_f2556
+ octave 5
+ pitchbend 0, 67
+ D_ 4
+ rest 4
+ octave 6
+ pitchbend 0, 51
+ D_ 4
+ octave 5
+ pitchbend 0, 67
+ D_ 4
+ rest 2
+ notetype 8, 1, 0
+ octave 4
+ C_ 4
+ C_ 4
+ C# 4
+ callchannel Song_Title_branch_f2556
+ octave 6
+ pitchbend 0, 51
+ D_ 4
+ rest 4
+ octave 5
+ pitchbend 0, 67
+ D_ 4
+ rest 6
+ notetype 8, 1, 0
+ octave 4
+ C_ 4
+ C_ 4
+ octave 3
+ B_ 4
+ loopchannel 0, Song_Title_branch_f24cd
+
+Song_Title_branch_f253a::
+ G_ 6
+ D_ 3
+ G_ 6
+ D_ 3
+ G_ 3
+ D_ 3
+ endchannel
+
+Song_Title_branch_f2541::
+ F_ 6
+ C_ 3
+ F_ 6
+ C_ 3
+ F_ 3
+ C_ 3
+ endchannel
+
+Song_Title_branch_f2548::
+ A# 6
+ F_ 3
+ A# 6
+ F_ 3
+ endchannel
+
+Song_Title_branch_f254d::
+ octave 4
+ C_ 6
+ octave 3
+ G_ 3
+ octave 4
+ C_ 6
+ octave 3
+ G_ 3
+ endchannel
+
+Song_Title_branch_f2556::
+ notetype 12, 1, 0
+ octave 4
+ D_ 1
+ rest 5
+ endchannel
+
+
+Song_Title_Ch3:: ; f255d (3c:655d)
+ drumset 0
+ dspeed 6
+ rest 4
+ snare3 1
+ snare3 1
+ snare4 1
+ snare4 1
+ dspeed 12
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare2 1
+ snare2 1
+ rest 3
+ snare2 1
+ rest 3
+ snare2 1
+ rest 3
+ dspeed 8
+ snare3 2
+ snare4 2
+ snare2 2
+ snare3 2
+ snare2 2
+ snare1 2
+
+Song_Title_branch_f257c::
+ dspeed 12
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare2 1
+ snare3 1
+ rest 3
+ callchannel Song_Title_branch_f263c
+ callchannel Song_Title_branch_f263c
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare2 1
+ snare3 1
+ rest 1
+ snare3 1
+ snare2 1
+ callchannel Song_Title_branch_f2645
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 1
+ snare2 1
+ rest 1
+ callchannel Song_Title_branch_f2645
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 1
+ dspeed 6
+ snare3 1
+ snare3 1
+ snare4 1
+ snare4 1
+ dspeed 12
+ callchannel Song_Title_branch_f263c
+ callchannel Song_Title_branch_f2645
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 3
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare3 1
+ snare2 1
+ snare2 1
+ rest 1
+ snare3 1
+ snare2 1
+ callchannel Song_Title_branch_f263c
+ callchannel Song_Title_branch_f2645
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare3 1
+ snare2 1
+ snare2 1
+ rest 1
+ snare4 1
+ snare3 1
+ snare2 1
+ rest 3
+ snare3 1
+ rest 5
+ snare2 1
+ snare4 1
+ snare2 1
+ rest 1
+ dspeed 6
+ snare3 1
+ snare3 1
+ snare4 1
+ snare4 1
+ dspeed 12
+ snare1 1
+ rest 3
+ snare2 1
+ rest 5
+ snare3 1
+ snare2 1
+ snare1 1
+ rest 3
+ snare2 1
+ rest 3
+ snare3 1
+ rest 5
+ snare3 1
+ snare2 1
+ snare3 1
+ rest 3
+ snare2 1
+ rest 3
+ snare3 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare4 1
+ rest 1
+ snare3 1
+ snare2 1
+ snare2 1
+ rest 3
+ snare3 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 3
+ snare5 1
+ rest 5
+ snare2 1
+ rest 3
+ snare3 1
+ snare2 1
+ snare1 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 1
+ snare1 1
+ rest 1
+ dspeed 8
+ snare2 4
+ snare3 4
+ snare1 4
+ dspeed 12
+ snare5 1
+ rest 5
+ snare2 1
+ rest 3
+ snare3 1
+ snare2 1
+ snare3 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare1 1
+ rest 1
+ snare3 1
+ snare2 1
+ dspeed 8
+ snare2 4
+ snare3 4
+ snare2 4
+ loopchannel 0, Song_Title_branch_f257c
+
+Song_Title_branch_f263c::
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare2 1
+ snare3 1
+ snare2 1
+ rest 3
+ endchannel
+
+Song_Title_branch_f2645::
+ snare2 1
+ rest 3
+ snare2 1
+ rest 5
+ snare3 1
+ snare2 1
+ snare2 1
+ rest 3
+ endchannel
+; 0xf264e
diff --git a/audio/songs/trainerbattle.inc b/audio/songs/trainerbattle.inc
new file mode 100755
index 0000000..1c6531c
--- /dev/null
+++ b/audio/songs/trainerbattle.inc
@@ -0,0 +1,1868 @@
+Song_TrainerBattle:: ; ece31 (3b:4e31)
+ db 2 << 6 | 0
+ dw Song_TrainerBattle_Ch0
+ db 1
+ dw Song_TrainerBattle_Ch1
+ db 2
+ dw Song_TrainerBattle_Ch2
+
+Song_TrainerBattle_Ch0:: ; ece3a (3b:4e3a)
+ tempo 112
+ volume 7, 7
+ duty 3
+ vibrato 6, 3, 4
+ toggleperfectpitch
+ rest 1
+ rest 2
+ notetype 12, 11, 2
+ rest 8
+ octave 3
+ F_ 1
+ E_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ D_ 1
+ C# 1
+ C_ 1
+ C# 1
+ C_ 1
+ octave 2
+ B_ 1
+ octave 3
+ C_ 1
+ octave 2
+ B_ 1
+ A# 1
+ B_ 1
+ A# 1
+ A_ 1
+ A# 1
+ octave 3
+ D_ 6
+ E_ 6
+ F_ 4
+ D_ 2
+ E_ 4
+ F_ 6
+ C_ 4
+ D_ 6
+ E_ 6
+ F_ 4
+ D_ 2
+ E_ 4
+ F_ 6
+ C_ 2
+ C# 2
+ D_ 6
+ E_ 6
+ F_ 4
+ D_ 2
+ E_ 4
+ F_ 6
+ C_ 4
+ D_ 6
+ E_ 6
+ F_ 4
+ D_ 2
+ E_ 4
+ F_ 6
+ C_ 2
+ C# 2
+
+Song_TrainerBattle_branch_ece86::
+ notetype 12, 11, 5
+ D_ 2
+ E_ 4
+ C# 2
+ D_ 4
+ octave 2
+ B_ 4
+ F# 4
+ octave 3
+ E_ 2
+ D_ 4
+ C# 2
+ D_ 2
+ E_ 2
+ F_ 8
+ notetype 12, 11, 2
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ C_ 1
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ G# 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C_ 1
+ notetype 12, 11, 5
+ D_ 2
+ E_ 4
+ C# 2
+ D_ 4
+ octave 2
+ B_ 4
+ F# 4
+ octave 3
+ E_ 2
+ D_ 4
+ C# 2
+ octave 2
+ B_ 2
+ octave 3
+ C# 2
+ notetype 12, 10, 7
+ D_ 8
+ C# 8
+ octave 2
+ B_ 8
+ octave 3
+ C# 8
+ notetype 12, 11, 5
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ A_ 2
+ G_ 2
+ rest 2
+ octave 3
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ A_ 2
+ G_ 2
+ rest 2
+ octave 3
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ octave 3
+ C# 2
+ E_ 4
+ octave 2
+ G_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C# 1
+ D_ 4
+ octave 2
+ F# 1
+ G_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C# 4
+ octave 2
+ G_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ C# 1
+ D_ 4
+ octave 2
+ F# 1
+ G_ 1
+ A_ 1
+ B_ 1
+ octave 3
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ A_ 2
+ G_ 2
+ rest 2
+ octave 3
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ A_ 2
+ B_ 2
+ G_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ F# 2
+ G_ 2
+ A_ 2
+ B_ 2
+ A_ 2
+ G_ 2
+ A_ 2
+ rest 2
+ A_ 2
+ B_ 2
+ A_ 2
+ G_ 2
+ F# 2
+ G_ 2
+ A_ 2
+ E_ 2
+ G_ 2
+ F# 2
+ octave 2
+ B_ 1
+ octave 3
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ G# 1
+ A_ 1
+ A# 1
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 3
+ B_ 1
+ A# 1
+ A_ 1
+ G# 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ G# 1
+ A_ 1
+ A# 1
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 3
+ B_ 1
+ A# 1
+ A_ 1
+ G# 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ G# 1
+ A_ 1
+ A# 1
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 3
+ B_ 1
+ A# 1
+ A_ 1
+ G# 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ G_ 1
+ G# 1
+ A_ 1
+ A# 1
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ octave 3
+ B_ 1
+ A# 1
+ B_ 1
+ octave 4
+ C_ 1
+ C# 1
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ octave 3
+ A_ 4
+ octave 4
+ D_ 4
+ octave 3
+ A_ 2
+ D_ 1
+ E_ 1
+ F# 1
+ G_ 1
+ G# 1
+ A# 1
+ B_ 2
+ octave 4
+ C_ 2
+ octave 3
+ A_ 2
+ octave 4
+ C_ 2
+ octave 3
+ G_ 2
+ B_ 2
+ F_ 2
+ G_ 2
+ A_ 2
+ octave 4
+ C_ 2
+ D_ 2
+ rest 2
+ octave 3
+ A_ 4
+ octave 4
+ C_ 4
+ D_ 2
+ octave 3
+ F_ 1
+ G_ 1
+ A_ 1
+ B_ 1
+ octave 4
+ C_ 1
+ D_ 1
+ E_ 2
+ F_ 2
+ D_ 2
+ F_ 2
+ D_ 2
+ F_ 2
+ D_ 2
+ F_ 2
+ D_ 2
+ F_ 2
+ D_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ F_ 2
+ E_ 2
+ octave 3
+ B_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ C_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ D_ 2
+ F_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ C_ 2
+ octave 2
+ A_ 2
+ octave 3
+ C_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ D_ 2
+ F_ 2
+ D_ 16
+ C_ 16
+ octave 2
+ A# 16
+ G_ 12
+ octave 3
+ D_ 1
+ E_ 1
+ G_ 1
+ octave 4
+ C_ 1
+ D_ 8
+ F_ 8
+ octave 3
+ A# 8
+ octave 4
+ C_ 8
+ D_ 8
+ E_ 8
+ F_ 8
+ G_ 8
+ E_ 2
+ rest 4
+ E_ 2
+ rest 4
+ E_ 2
+ rest 2
+ E_ 2
+ rest 4
+ E_ 2
+ rest 4
+ E_ 2
+ rest 2
+ E_ 2
+ rest 4
+ E_ 2
+ rest 4
+ E_ 2
+ rest 2
+ E_ 2
+ rest 4
+ E_ 2
+ rest 4
+ E_ 2
+ rest 2
+ octave 3
+ C_ 2
+ D_ 4
+ octave 2
+ B_ 2
+ octave 3
+ C# 4
+ rest 2
+ C# 1
+ D_ 1
+ E_ 1
+ rest 1
+ D_ 1
+ rest 1
+ octave 2
+ B_ 1
+ rest 1
+ octave 3
+ C# 1
+ rest 9
+ D_ 1
+ D# 1
+ E_ 1
+ F_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ C# 1
+ rest 5
+ C# 1
+ D_ 1
+ E_ 1
+ rest 1
+ F_ 1
+ rest 1
+ E_ 1
+ rest 1
+ D_ 1
+ rest 1
+ D_ 2
+ E_ 2
+ F_ 2
+ G_ 2
+ D# 1
+ E_ 1
+ F_ 1
+ F# 1
+ F# 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ rest 9
+ F# 2
+ E_ 4
+ D# 2
+ E_ 2
+ F# 2
+ G# 2
+ E_ 8
+ F# 8
+ G_ 8
+ octave 4
+ C_ 4
+ octave 3
+ G_ 1
+ G# 1
+ A_ 1
+ A# 1
+ loopchannel 0, Song_TrainerBattle_branch_ece86
+
+
+Song_TrainerBattle_Ch1:: ; ed0d7 (3b:50d7)
+ duty 3
+ vibrato 10, 2, 5
+ notetype 12, 12, 2
+ octave 4
+ A_ 1
+ G# 1
+ G_ 1
+ F# 1
+ A_ 1
+ F_ 1
+ F# 1
+ F_ 1
+ A_ 1
+ E_ 1
+ F_ 1
+ E_ 1
+ A_ 1
+ D# 1
+ E_ 1
+ D# 1
+ A_ 1
+ D_ 1
+ D# 1
+ D_ 1
+ A_ 1
+ C# 1
+ D_ 1
+ C# 1
+ A_ 1
+ C_ 1
+ C# 1
+ C_ 1
+ A_ 1
+ octave 3
+ B_ 1
+ octave 4
+ C_ 1
+ octave 3
+ B_ 1
+ notetype 12, 14, 1
+ octave 4
+ B_ 16
+ rest 16
+ notetype 12, 13, 1
+ B_ 16
+ rest 12
+ A_ 4
+ notetype 12, 12, 2
+ octave 3
+ B_ 6
+ octave 4
+ C# 6
+ D_ 4
+ octave 3
+ B_ 2
+ octave 4
+ C# 4
+ D_ 6
+ A_ 2
+ A# 2
+ B_ 6
+ octave 5
+ C# 6
+ D_ 4
+ octave 4
+ B_ 2
+ octave 5
+ C# 4
+ D_ 6
+ octave 4
+ A_ 4
+
+Song_TrainerBattle_branch_ed129::
+ notetype 12, 12, 7
+ octave 3
+ B_ 6
+ F# 14
+ B_ 4
+ F# 4
+ B_ 4
+ notetype 12, 5, 0
+ octave 4
+ C_ 8
+ notetype 12, 3, 0
+ C_ 8
+ notetype 12, 4, 14
+ C_ 8
+ notetype 12, 12, 7
+ C_ 8
+ octave 3
+ B_ 6
+ F# 14
+ B_ 4
+ F# 4
+ B_ 4
+ notetype 12, 9, 0
+ A_ 8
+ notetype 12, 5, 0
+ A_ 8
+ notetype 12, 4, 0
+ A_ 8
+ notetype 12, 3, 0
+ A_ 8
+ notetype 12, 12, 7
+ G_ 16
+ octave 4
+ D_ 8
+ octave 3
+ G_ 8
+ notetype 12, 8, 0
+ A_ 8
+ notetype 12, 5, 0
+ A_ 8
+ notetype 12, 4, 0
+ A_ 8
+ notetype 12, 6, 0
+ A_ 8
+ notetype 12, 12, 7
+ G_ 16
+ octave 4
+ E_ 8
+ F# 8
+ E_ 16
+ notetype 12, 12, 5
+ G_ 4
+ A_ 2
+ G_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ E_ 2
+ notetype 12, 11, 7
+ F# 8
+ notetype 12, 5, 0
+ F# 8
+ notetype 12, 6, 0
+ F# 8
+ notetype 12, 7, 0
+ F# 8
+ notetype 12, 10, 0
+ G_ 8
+ notetype 12, 10, 7
+ G_ 8
+ notetype 12, 11, 7
+ G_ 4
+ notetype 12, 12, 5
+ A_ 2
+ G_ 2
+ G_ 2
+ F# 2
+ E_ 2
+ F# 2
+ notetype 12, 10, 0
+ G# 8
+ notetype 12, 7, 0
+ G# 8
+ notetype 12, 8, 0
+ G# 8
+ notetype 12, 6, 0
+ G# 8
+ notetype 12, 10, 0
+ A_ 16
+ notetype 12, 11, 0
+ octave 5
+ C# 8
+ E_ 8
+ notetype 12, 12, 0
+ D_ 4
+ octave 4
+ A_ 4
+ octave 5
+ C_ 2
+ notetype 12, 12, 7
+ octave 4
+ B_ 8
+ notetype 12, 6, 0
+ B_ 8
+ notetype 12, 6, 9
+ B_ 6
+ notetype 12, 9, 6
+ B_ 6
+ rest 2
+ notetype 12, 12, 0
+ octave 5
+ D_ 4
+ octave 4
+ A_ 4
+ A# 2
+ notetype 12, 11, 0
+ octave 5
+ F_ 14
+ notetype 12, 6, 0
+ G_ 16
+ notetype 12, 5, 0
+ E_ 16
+ notetype 12, 4, 0
+ E_ 16
+ notetype 12, 12, 7
+ octave 4
+ C_ 6
+ octave 3
+ A_ 14
+ octave 4
+ C_ 4
+ octave 3
+ A_ 4
+ octave 4
+ C_ 4
+ octave 3
+ A# 6
+ octave 4
+ F_ 14
+ octave 3
+ A# 4
+ octave 4
+ F_ 4
+ D_ 4
+ C_ 6
+ octave 3
+ A_ 14
+ octave 4
+ C_ 4
+ E_ 2
+ D_ 2
+ C_ 2
+ E_ 2
+ D_ 2
+ octave 3
+ A# 4
+ octave 4
+ F_ 10
+ G_ 6
+ F_ 6
+ D_ 4
+ notetype 12, 11, 0
+ F_ 16
+ E_ 16
+ D_ 16
+ E_ 16
+ notetype 12, 10, 0
+ octave 5
+ F_ 16
+ E_ 16
+ G_ 16
+ F_ 16
+ notetype 12, 13, 1
+ octave 3
+ A# 6
+ A# 6
+ A# 4
+ A_ 6
+ A_ 6
+ A_ 4
+ octave 4
+ C_ 6
+ C_ 6
+ C_ 4
+ octave 3
+ A# 6
+ A# 6
+ A_ 4
+ notetype 12, 12, 7
+ A_ 4
+ B_ 4
+ G_ 2
+ A_ 10
+ B_ 2
+ octave 4
+ C# 2
+ E_ 2
+ D_ 2
+ C# 2
+ octave 3
+ B_ 2
+ A# 16
+ rest 2
+ A# 2
+ octave 4
+ C_ 2
+ F_ 2
+ E_ 2
+ D_ 2
+ C_ 2
+ octave 3
+ A# 2
+ B_ 16
+ rest 2
+ B_ 2
+ octave 4
+ C# 2
+ G_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ octave 3
+ B_ 2
+ octave 4
+ C_ 16
+ E_ 8
+ G_ 8
+ loopchannel 0, Song_TrainerBattle_branch_ed129
+
+
+Song_TrainerBattle_Ch2:: ; ed26a (3b:526a)
+ vibrato 0, 2, 0
+ notetype 12, 1, 4
+ octave 3
+ B_ 1
+ A# 1
+ A_ 1
+ G# 1
+ A_ 1
+ G# 1
+ G_ 1
+ F# 1
+ G_ 1
+ F# 1
+ F_ 1
+ E_ 1
+ F_ 1
+ E_ 1
+ D# 1
+ D_ 1
+ D# 1
+ D_ 1
+ C# 1
+ C_ 1
+ C# 1
+ C_ 1
+ octave 2
+ B_ 1
+ A# 1
+ B_ 1
+ A# 1
+ A_ 1
+ G# 1
+ A_ 2
+ A# 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ C_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ C_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ C_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F_ 2
+ E_ 2
+ D_ 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D_ 2
+ octave 2
+ A# 2
+ octave 3
+ C_ 2
+
+Song_TrainerBattle_branch_ed2f7::
+ octave 2
+ A# 1
+ B_ 1
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ A_ 2
+ G_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ C_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ D_ 2
+ C# 2
+ D_ 2
+ C# 2
+ octave 2
+ A_ 2
+ G# 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ G# 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ octave 3
+ D_ 2
+ octave 2
+ G_ 2
+ G# 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ D_ 2
+ C# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ D_ 2
+ E_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ F# 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ D# 2
+ F_ 2
+ G_ 2
+ F_ 2
+ D# 2
+ G_ 2
+ C# 2
+ G# 2
+ C# 2
+ G# 2
+ C# 2
+ G# 2
+ C# 2
+ G# 2
+ C# 2
+ G# 2
+ E_ 2
+ F# 2
+ G# 2
+ F# 2
+ E_ 2
+ G# 2
+ D_ 2
+ A_ 2
+ D_ 2
+ A_ 2
+ D_ 2
+ A_ 2
+ D_ 2
+ A_ 2
+ D_ 2
+ A_ 2
+ F_ 2
+ G_ 2
+ A_ 2
+ G_ 2
+ F_ 2
+ E_ 2
+ D_ 4
+ octave 2
+ A_ 4
+ octave 3
+ C_ 2
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ octave 2
+ B_ 2
+ octave 3
+ G_ 2
+ D_ 4
+ octave 2
+ A_ 4
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 4
+ octave 3
+ F_ 4
+ octave 2
+ A# 4
+ octave 3
+ F_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ D_ 4
+ octave 2
+ A# 4
+ octave 3
+ D_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ F_ 4
+ octave 2
+ A# 4
+ octave 3
+ F_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ D_ 4
+ octave 2
+ A# 4
+ octave 3
+ D_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A# 4
+ octave 3
+ E_ 4
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ octave 2
+ B_ 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A_ 2
+ octave 3
+ E_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ A# 2
+ octave 3
+ F_ 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ C_ 2
+ G_ 2
+ F# 2
+ E_ 2
+ F# 2
+ E_ 2
+ D_ 2
+ C_ 2
+ loopchannel 0, Song_TrainerBattle_branch_ed2f7
+; 0xed5f4
diff --git a/audio/songs/victorytrainer.inc b/audio/songs/victorytrainer.inc
new file mode 100755
index 0000000..d6bc1de
--- /dev/null
+++ b/audio/songs/victorytrainer.inc
@@ -0,0 +1,274 @@
+Song_VictoryTrainer:: ; ed9ea (3b:59ea)
+ db 2 << 6 | 0
+ dw Song_VictoryTrainer_Ch0
+ db 1
+ dw Song_VictoryTrainer_Ch1
+ db 2
+ dw Song_VictoryTrainer_Ch2
+
+Song_VictoryTrainer_Ch0:: ; ed9f3 (3b:59f3)
+ tempo 224
+ volume 7, 7
+ duty 2
+ toggleperfectpitch
+ rest 1
+ rest 2
+ tempo 224
+ notetype 4, 10, 2
+ octave 4
+ D_ 2
+ tempo 224
+ D_ 2
+ D_ 2
+ D_ 2
+ octave 3
+ A_ 2
+ octave 4
+ D_ 2
+ notetype 4, 11, 3
+ F# 12
+ duty 1
+ tempo 224
+
+Song_VictoryTrainer_branch_eda18::
+ notetype 4, 6, 3
+ octave 3
+ A_ 6
+ F# 3
+ A_ 3
+ B_ 6
+ G# 3
+ B_ 3
+ octave 4
+ C# 3
+ octave 3
+ B_ 3
+ A_ 3
+ G_ 3
+ A_ 3
+ B_ 3
+ A_ 3
+ G_ 3
+ A_ 6
+ F# 3
+ A_ 3
+ B_ 6
+ G# 3
+ B_ 3
+ octave 4
+ C# 3
+ D_ 3
+ E_ 3
+ F# 3
+ C# 3
+ octave 3
+ B_ 3
+ A_ 3
+ octave 4
+ C# 3
+ octave 3
+ A_ 6
+ F# 3
+ A_ 3
+ B_ 6
+ G# 3
+ B_ 3
+ octave 4
+ C_ 6
+ octave 3
+ A_ 3
+ octave 4
+ C_ 3
+ D_ 3
+ octave 3
+ B_ 3
+ octave 4
+ D_ 6
+ C# 3
+ octave 3
+ B_ 3
+ A_ 3
+ G_ 3
+ F# 3
+ G_ 3
+ A_ 3
+ B_ 3
+ A_ 3
+ G_ 3
+ F# 3
+ E_ 3
+ F# 3
+ G_ 3
+ A_ 3
+ B_ 3
+ loopchannel 0, Song_VictoryTrainer_branch_eda18
+
+
+Song_VictoryTrainer_Ch1:: ; eda64 (3b:5a64)
+ duty 2
+ notetype 4, 12, 3
+ octave 4
+ A_ 2
+ A_ 2
+ A_ 2
+ A_ 2
+ B_ 2
+ octave 5
+ C# 2
+ notetype 4, 12, 4
+ D_ 12
+
+Song_VictoryTrainer_branch_eda75::
+ notetype 4, 8, 5
+ octave 4
+ D_ 6
+ octave 3
+ A_ 3
+ octave 4
+ D_ 3
+ E_ 6
+ octave 3
+ B_ 3
+ octave 4
+ E_ 3
+ F# 3
+ G_ 3
+ A_ 6
+ E_ 3
+ F# 3
+ G_ 6
+ D_ 6
+ octave 3
+ A_ 3
+ octave 4
+ D_ 3
+ E_ 6
+ octave 3
+ B_ 3
+ octave 4
+ E_ 3
+ F# 3
+ G_ 3
+ A_ 6
+ F# 3
+ G_ 3
+ A_ 6
+ D_ 6
+ octave 3
+ A_ 3
+ octave 4
+ D_ 3
+ E_ 6
+ octave 3
+ B_ 3
+ octave 4
+ E_ 3
+ F_ 6
+ C_ 3
+ F_ 3
+ G_ 3
+ D_ 3
+ G_ 6
+ notetype 4, 7, 0
+ F# 12
+ notetype 4, 7, 7
+ F# 12
+ notetype 4, 6, 0
+ E_ 12
+ notetype 4, 6, 7
+ E_ 12
+ loopchannel 0, Song_VictoryTrainer_branch_eda75
+
+
+Song_VictoryTrainer_Ch2:: ; edabd (3b:5abd)
+ notetype 4, 1, 0
+ octave 5
+ D_ 2
+ D_ 2
+ D_ 2
+ octave 4
+ B_ 2
+ A_ 2
+ G_ 2
+ A_ 12
+ notetype 4, 2, 1
+
+Song_VictoryTrainer_branch_edacc::
+ F# 3
+ rest 3
+ F# 3
+ rest 3
+ G# 3
+ rest 3
+ G# 3
+ rest 3
+ A_ 3
+ rest 3
+ A_ 3
+ rest 3
+ B_ 3
+ rest 3
+ B_ 3
+ rest 3
+ F# 3
+ rest 3
+ F# 3
+ rest 3
+ G# 3
+ rest 3
+ G# 3
+ rest 3
+ A_ 3
+ rest 3
+ A_ 3
+ rest 3
+ octave 5
+ C# 3
+ rest 3
+ C# 3
+ octave 4
+ A_ 3
+ F# 3
+ octave 5
+ D_ 3
+ octave 4
+ F# 3
+ rest 3
+ G# 3
+ octave 5
+ E_ 3
+ octave 4
+ G# 3
+ rest 3
+ A_ 3
+ octave 5
+ F_ 3
+ octave 4
+ A_ 3
+ rest 3
+ B_ 3
+ octave 5
+ G_ 3
+ octave 4
+ B_ 3
+ A# 3
+ A_ 3
+ rest 3
+ A_ 3
+ rest 3
+ A_ 3
+ rest 3
+ A_ 3
+ octave 5
+ C_ 3
+ C# 3
+ rest 3
+ C# 3
+ rest 3
+ C# 3
+ rest 3
+ C# 3
+ octave 4
+ A_ 3
+ loopchannel 0, Song_VictoryTrainer_branch_edacc
+; 0xedb1c
diff --git a/audio/songs/viridiancity.inc b/audio/songs/viridiancity.inc
new file mode 100755
index 0000000..9b7ac96
--- /dev/null
+++ b/audio/songs/viridiancity.inc
@@ -0,0 +1,673 @@
+Song_ViridianCity:: ; ec1b9 (3b:41b9)
+ db 3 << 6 | 0
+ dw Song_ViridianCity_Ch0
+ db 1
+ dw Song_ViridianCity_Ch1
+ db 2
+ dw Song_ViridianCity_Ch2
+ db 3
+ dw Song_ViridianCity_Ch3
+
+Song_ViridianCity_branch_ec1c5::
+ tempo 232
+ loopchannel 0, Song_ViridianCity_branch_ec1cf
+
+Song_ViridianCity_Ch0:: ; ec1cc (3b:41cc)
+ tempo 144
+
+Song_ViridianCity_branch_ec1cf::
+ volume 7, 7
+ vibrato 8, 2, 4
+ duty 3
+
+Song_ViridianCity_branch_ec1d6::
+ notetype 12, 12, 5
+ octave 3
+ G# 4
+ F# 4
+ E_ 2
+ E_ 2
+ F# 2
+ D# 2
+ E_ 2
+ E_ 2
+ D# 2
+ C# 4
+ D# 4
+ E_ 2
+ D# 4
+ C# 2
+ E_ 2
+ E_ 4
+ notetype 12, 10, 5
+ C# 4
+ octave 2
+ B_ 6
+ octave 3
+ C# 2
+ C# 4
+ octave 2
+ B_ 4
+ notetype 12, 12, 5
+ callchannel Song_ViridianCity_branch_ec2de
+ octave 3
+ D# 6
+ E_ 2
+ octave 2
+ B_ 4
+ notetype 12, 10, 5
+ octave 3
+ C# 2
+ octave 2
+ B_ 2
+ A_ 4
+ B_ 4
+ B_ 2
+ octave 3
+ C# 2
+ D# 2
+ E_ 2
+ D# 2
+ C# 2
+ D# 2
+ notetype 12, 12, 5
+ G# 2
+ E_ 2
+ F# 2
+ E_ 2
+ E_ 4
+ F# 2
+ D# 2
+ E_ 4
+ D# 2
+ C# 4
+ D# 4
+ E_ 2
+ D# 2
+ C# 2
+ C# 2
+ E_ 2
+ E_ 4
+ notetype 12, 10, 5
+ C# 2
+ octave 2
+ A_ 2
+ B_ 6
+ octave 3
+ C# 2
+ C# 2
+ octave 2
+ B_ 2
+ B_ 4
+ notetype 12, 12, 5
+ callchannel Song_ViridianCity_branch_ec2de
+ octave 3
+ D# 4
+ D# 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ C# 2
+ G# 2
+ E_ 4
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ notetype 12, 10, 5
+ C# 4
+ octave 2
+ B_ 2
+ octave 3
+ D# 4
+ C# 2
+ E_ 4
+ notetype 12, 11, 3
+ callchannel Song_ViridianCity_branch_ec2eb
+ A_ 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 4
+ F# 4
+ G# 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 4
+ G# 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ E_ 2
+ F# 2
+ E_ 2
+ D# 2
+ E_ 2
+ D# 2
+ C# 2
+ octave 2
+ B_ 2
+ octave 3
+
+Song_ViridianCity_branch_ec271::
+ C# 2
+ D# 2
+ C# 2
+ octave 2
+ B_ 4
+ B_ 2
+ octave 3
+ C# 2
+ D# 2
+ loopchannel 2, Song_ViridianCity_branch_ec271
+ E_ 2
+ octave 2
+ B_ 4
+ octave 3
+ E_ 4
+ octave 2
+ B_ 2
+ octave 3
+ C# 2
+ G# 2
+ G# 2
+ octave 2
+ B_ 2
+ octave 3
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D# 2
+ octave 2
+ B_ 2
+ octave 3
+ callchannel Song_ViridianCity_branch_ec2eb
+ A_ 2
+ E_ 2
+ A_ 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ F# 2
+ G# 2
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ C# 2
+ G# 2
+ C# 2
+ D# 2
+ B_ 2
+ E_ 2
+ G# 2
+ E_ 2
+ F# 2
+ E_ 4
+ G# 2
+ F# 2
+ D# 2
+ octave 2
+ B_ 2
+ octave 3
+ D# 4
+ F# 2
+ D# 2
+ D# 2
+ F# 2
+ octave 2
+ B_ 2
+ octave 3
+ E_ 2
+ octave 2
+ B_ 2
+ octave 3
+ D# 2
+ octave 2
+ B_ 2
+ B_ 2
+ octave 3
+ D# 2
+ notetype 12, 11, 6
+ F# 8
+ F# 4
+ D# 4
+ E_ 8
+ notetype 12, 8, 4
+ octave 2
+ B_ 4
+ octave 3
+ E_ 2
+ F# 2
+ loopchannel 0, Song_ViridianCity_branch_ec1d6
+
+Song_ViridianCity_branch_ec2de::
+ octave 3
+ F# 2
+ D# 4
+ E_ 2
+ D# 4
+ C# 4
+ octave 2
+ B_ 4
+ octave 3
+ C# 2
+ D# 2
+ C# 2
+ endchannel
+
+Song_ViridianCity_branch_ec2eb::
+ A_ 2
+ E_ 2
+ C# 2
+ E_ 4
+ A_ 2
+ C# 2
+ E_ 2
+ endchannel
+
+
+Song_ViridianCity_Ch1:: ; ec2f3 (3b:42f3)
+ vibrato 5, 1, 5
+ callchannel Song_ViridianCity_branch_ec368
+ octave 4
+ G# 2
+ notetype 12, 12, 4
+ E_ 6
+ notetype 12, 12, 5
+ duty 3
+ octave 3
+ C# 4
+ D# 4
+ E_ 6
+ F# 6
+ G# 4
+ callchannel Song_ViridianCity_branch_ec368
+ octave 4
+ G# 2
+ notetype 12, 12, 4
+ E_ 14
+ duty 3
+ octave 3
+ E_ 6
+ F# 6
+ G# 4
+ notetype 12, 11, 7
+ duty 2
+ vibrato 8, 1, 7
+ octave 5
+ C# 12
+ octave 4
+ A_ 4
+ octave 5
+ E_ 8
+ F# 2
+ E_ 2
+ D# 2
+ C# 2
+ octave 4
+ B_ 12
+ G# 4
+ B_ 16
+ F# 12
+ G# 2
+ A_ 2
+ B_ 4
+ A_ 4
+ G# 4
+ F# 4
+ G# 12
+ E_ 4
+ B_ 16
+ octave 5
+ C# 12
+ D# 2
+ E_ 2
+ F# 4
+ E_ 4
+ D# 4
+ C# 4
+ octave 4
+ B_ 12
+ octave 5
+ C# 2
+ D# 2
+ C# 4
+ octave 4
+ B_ 4
+ A_ 4
+ G# 4
+ A_ 12
+ B_ 2
+ octave 5
+ C_ 2
+ C_ 4
+ octave 4
+ B_ 4
+ A_ 4
+ F# 4
+ notetype 12, 11, 7
+ A_ 8
+ octave 5
+ C_ 8
+ octave 4
+ B_ 14
+ notetype 12, 8, 4
+ G# 1
+ notetype 12, 10, 4
+ A_ 1
+ loopchannel 0, Song_ViridianCity_Ch1
+
+Song_ViridianCity_branch_ec368::
+ duty 2
+ notetype 12, 12, 3
+ octave 4
+ B_ 4
+ A_ 4
+ notetype 12, 12, 4
+ G# 10
+ notetype 12, 12, 3
+ G# 2
+ A_ 2
+ B_ 4
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ notetype 12, 12, 4
+ F# 10
+ notetype 12, 12, 5
+ duty 3
+ octave 3
+ E_ 4
+ D# 8
+ E_ 4
+ F# 4
+ notetype 12, 12, 3
+ duty 2
+ octave 4
+ A_ 4
+ G# 4
+ notetype 12, 12, 4
+ F# 10
+ notetype 12, 12, 3
+ F# 2
+ G# 2
+ A_ 4
+ A_ 2
+ G# 2
+ F# 2
+ endchannel
+
+
+Song_ViridianCity_Ch2:: ; ec3a2 (3b:43a2)
+ notetype 12, 1, 1
+ toggleperfectpitch
+ rest 1
+ rest 2
+
+Song_ViridianCity_branch_ec3a8::
+ vibrato 0, 0, 0
+ octave 4
+ callchannel Song_ViridianCity_branch_ec438
+ callchannel Song_ViridianCity_branch_ec438
+ callchannel Song_ViridianCity_branch_ec441
+ G# 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ callchannel Song_ViridianCity_branch_ec438
+ B_ 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ callchannel Song_ViridianCity_branch_ec438
+ callchannel Song_ViridianCity_branch_ec441
+ G# 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ G# 2
+ E_ 2
+ B_ 2
+ rest 2
+ E_ 2
+ F# 2
+ E_ 2
+ G# 2
+ E_ 2
+ B_ 2
+ E_ 2
+ vibrato 8, 2, 5
+ A_ 8
+ E_ 8
+ A_ 8
+ F# 8
+ G# 8
+ E_ 8
+ G# 12
+ E_ 4
+ F# 2
+ F# 2
+ D# 2
+ E_ 4
+ F# 2
+ D# 2
+ E_ 2
+ F# 2
+ F# 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ G# 2
+ F# 2
+ G# 2
+ G# 2
+ E_ 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ B_ 2
+ A_ 2
+ G# 2
+ F# 2
+ A_ 8
+ E_ 8
+ A_ 8
+ B_ 2
+ A_ 2
+ G# 2
+ F# 2
+ G# 8
+ E_ 8
+ B_ 4
+ E_ 4
+ F# 4
+ G# 4
+ rest 2
+ D# 2
+ E_ 2
+ F# 2
+ rest 2
+ F# 2
+ B_ 2
+ A_ 2
+ A_ 4
+ G# 4
+ F# 2
+ D# 2
+ A_ 2
+ F# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 1
+ G# 1
+ E_ 1
+ F# 1
+ G# 4
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ G# 2
+ F# 2
+ loopchannel 0, Song_ViridianCity_branch_ec3a8
+
+Song_ViridianCity_branch_ec438::
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ rest 2
+ E_ 2
+ F# 2
+ G# 2
+ endchannel
+
+Song_ViridianCity_branch_ec441::
+ A_ 2
+ F# 2
+ G# 2
+ A_ 2
+ rest 2
+ A_ 2
+ G# 2
+ F# 2
+ rest 2
+ F# 2
+ G# 2
+ A_ 2
+ rest 2
+ A_ 2
+ G# 2
+ F# 2
+ D# 2
+ D# 2
+ E_ 2
+ F# 2
+ rest 2
+ D# 2
+ E_ 2
+ F# 2
+ rest 2
+ D# 2
+ E_ 2
+ F# 2
+ rest 2
+ D# 2
+ E_ 2
+ F# 2
+ endchannel
+
+
+Song_ViridianCity_Ch3:: ; ec462 (3b:4462)
+ drumset 0
+
+Song_ViridianCity_branch_ec464::
+ dspeed 12
+ callchannel Song_ViridianCity_branch_ec49f
+
+Song_ViridianCity_branch_ec469::
+ callchannel Song_ViridianCity_branch_ec49f
+ callchannel Song_ViridianCity_branch_ec4a7
+ callchannel Song_ViridianCity_branch_ec4a7
+ loopchannel 2, Song_ViridianCity_branch_ec469
+ callchannel Song_ViridianCity_branch_ec49f
+ callchannel Song_ViridianCity_branch_ec4b5
+ callchannel Song_ViridianCity_branch_ec4ae
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ callchannel Song_ViridianCity_branch_ec4bd
+ callchannel Song_ViridianCity_branch_ec4b5
+ callchannel Song_ViridianCity_branch_ec4ae
+ callchannel Song_ViridianCity_branch_ec4bd
+ callchannel Song_ViridianCity_branch_ec4ae
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle1 2
+ triangle1 6
+ triangle1 6
+ triangle1 4
+ triangle1 6
+ snare6 6
+ snare6 4
+ loopchannel 0, Song_ViridianCity_branch_ec464
+
+Song_ViridianCity_branch_ec49f::
+ snare6 6
+ snare6 6
+ snare6 4
+ snare6 6
+ snare6 6
+ snare6 2
+ snare6 2
+ endchannel
+
+Song_ViridianCity_branch_ec4a7::
+ snare6 6
+ snare6 6
+ snare6 4
+ snare6 6
+ snare6 6
+ snare6 4
+ endchannel
+
+Song_ViridianCity_branch_ec4ae::
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ endchannel
+
+Song_ViridianCity_branch_ec4b5::
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle1 2
+ endchannel
+
+Song_ViridianCity_branch_ec4bd::
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle2 2
+ endchannel
+; 0xec4c2
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index c341e90..8d25540 100644
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -1,21 +1,3 @@
-
-
-; pitch
- const_def
- const __
- const C_
- const C#
- const D_
- const D#
- const E_
- const F_
- const F#
- const G_
- const G#
- const A_
- const A#
- const B_
-
; channel
const_def
const CHAN1
diff --git a/gfx.asm b/gfx.asm
index c4b608e..92b7219 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -183,7 +183,7 @@ JugglerPic:: INCBIN "gfx/trainer/juggler.pic"
BlackbeltPic:: INCBIN "gfx/trainer/blackbelt.pic"
SportsmanPic:: INCBIN "gfx/trainer/sportsman.pic"
MediumPic:: INCBIN "gfx/trainer/medium.pic"
-SoldierPic::INCBIN "gfx/trainer/soldier.pic"
+SoldierPic:: INCBIN "gfx/trainer/soldier.pic"
KimonoGirlPic:: INCBIN "gfx/trainer/kimonogirl.pic"
TwinsPic:: INCBIN "gfx/trainer/twins.pic"
diff --git a/macros.asm b/macros.asm
index 7e5c924..a348650 100644
--- a/macros.asm
+++ b/macros.asm
@@ -8,3 +8,4 @@ INCLUDE "macros/coords.asm"
INCLUDE "macros/farcall.asm"
INCLUDE "macros/text.asm"
INCLUDE "macros/wram.asm"
+INCLUDE "macros/audio.asm"
diff --git a/macros/audio.asm b/macros/audio.asm
new file mode 100755
index 0000000..8ebf840
--- /dev/null
+++ b/macros/audio.asm
@@ -0,0 +1,278 @@
+Ch0 EQU 0
+Ch1 EQU 1
+Ch2 EQU 2
+Ch3 EQU 3
+Ch4 EQU 4
+Ch5 EQU 5
+Ch6 EQU 6
+Ch7 EQU 7
+
+audio: MACRO
+ db (_NARG - 2) << 6 | \2
+ dw \1_\2
+ IF _NARG > 2
+ db \3
+ dw \1_\3
+ ENDC
+ IF _NARG > 3
+ db \4
+ dw \1_\4
+ ENDC
+ IF _NARG > 4
+ db \5
+ dw \1_\5
+ ENDC
+ENDM
+
+;format: length [0, 7], pitch change [-7, 7]
+pitchenvelope: MACRO
+ db $10
+ IF \2 > 0
+ db (\1 << 4) | \2
+ ELSE
+ db (\1 << 4) | (%1000 | (\2 * -1))
+ ENDC
+ENDM
+
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+squarenote: MACRO
+ db $20 | \1
+ IF \3 < 0
+ db (\2 << 4) | (%1000 | (\3 * -1))
+ ELSE
+ db (\2 << 4) | \3
+ ENDC
+ dw \4
+ENDM
+
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+noisenote: MACRO
+ db $20 | \1
+ IF \3 < 0
+ db (\2 << 4) | (%1000 | (\3 * -1))
+ ELSE
+ db (\2 << 4) | \3
+ ENDC
+ db \4
+ENDM
+
+;format: rest length (in 16ths)
+rest: MACRO
+ db $00 | (\1 - 1)
+ENDM
+
+;format: pitch length (in 16ths)
+C_: MACRO
+ db $10 | (\1 - 1)
+ENDM
+
+C#: MACRO
+ db $20 | (\1 - 1)
+ENDM
+
+D_: MACRO
+ db $30 | (\1 - 1)
+ENDM
+
+D#: MACRO
+ db $40 | (\1 - 1)
+ENDM
+
+E_: MACRO
+ db $50 | (\1 - 1)
+ENDM
+
+F_: MACRO
+ db $60 | (\1 - 1)
+ENDM
+
+F#: MACRO
+ db $70 | (\1 - 1)
+ENDM
+
+G_: MACRO
+ db $80 | (\1 - 1)
+ENDM
+
+G#: MACRO
+ db $90 | (\1 - 1)
+ENDM
+
+A_: MACRO
+ db $A0 | (\1 - 1)
+ENDM
+
+A#: MACRO
+ db $B0 | (\1 - 1)
+ENDM
+
+B_: MACRO
+ db $C0 | (\1 - 1)
+ENDM
+
+;format: instrument length (in 16ths)
+snare1: MACRO
+ db $10 | (\1 - 1)
+ENDM
+
+snare2: MACRO
+ db $20 | (\1 - 1)
+ENDM
+
+snare3: MACRO
+ db $30 | (\1 - 1)
+ENDM
+
+snare4: MACRO
+ db $40 | (\1 - 1)
+ENDM
+
+snare5: MACRO
+ db $50 | (\1 - 1)
+ENDM
+
+triangle1: MACRO
+ db $60 | (\1 - 1)
+ENDM
+
+triangle2: MACRO
+ db $70 | (\1 - 1)
+ENDM
+
+snare6: MACRO
+ db $80 | (\1 - 1)
+ENDM
+
+snare7: MACRO
+ db $90 | (\1 - 1)
+ENDM
+
+snare8: MACRO
+ db $A0 | (\1 - 1)
+ENDM
+
+snare9: MACRO
+ db $B0 | (\1 - 1)
+ENDM
+
+cymbal1: MACRO
+ db $C0 | (\1 - 1)
+ENDM
+
+cymbal2: MACRO
+ db $D0 | (\1 - 1)
+ENDM
+
+cymbal3: MACRO
+ db $E0 | (\1 - 1)
+ENDM
+
+mutedsnare1: MACRO
+ db $F0 | (\1 - 1)
+ENDM
+
+; TODO: clean up handling of drumsets
+;triangle3: MACRO
+; db $10 | (\1 - 1)
+;ENDM
+
+;mutedsnare2: MACRO
+; db $11 | (\1 - 1)
+;ENDM
+
+;mutedsnare3: MACRO
+; db $12 | (\1 - 1)
+;ENDM
+
+;mutedsnare4: MACRO
+; db $13 | (\1 - 1)
+;ENDM
+
+octave: MACRO
+ db $D8 - \1
+ENDM
+
+; format: notetype speed, volume, fade
+notetype: MACRO
+ db $D8
+ db \1
+ db (\2 << 4) | \3
+ENDM
+
+dspeed: MACRO
+ db $D8
+ db \1
+ENDM
+
+tempo: MACRO
+ db $DA
+ db \1 / $100
+ db \1 % $100
+ENDM
+
+duty: MACRO
+ db $DB
+ db \1
+ENDM
+
+pitchbend: MACRO
+ db $E0
+ db \1
+ db \2
+ENDM
+
+;format: vibrato delay, rate, depth
+vibrato: MACRO
+ db $E1
+ db \1
+ db (\2 << 4) | \3
+ENDM
+
+drumset: MACRO
+ db $E3
+ db \1
+ENDM
+
+volume: MACRO
+ db $E5
+ db (\1 << 4) | \2
+ENDM
+
+toggleperfectpitch: MACRO
+ db $E6
+ENDM
+
+stereopanning: MACRO
+ db $EE
+ db \1
+ENDM
+
+;executemusic: MACRO
+; db $F8
+;ENDM
+
+unknown_f9: MACRO
+ db $F9
+ENDM
+
+;dutycycle: MACRO
+; db $FC
+; db \1
+;ENDM
+
+;format: loopchannel count, address
+loopchannel: MACRO
+ db $FD
+ db \1
+ dw \2
+ENDM
+
+;format: callchannel address
+callchannel: MACRO
+ db $FE
+ dw \1
+ENDM
+
+endchannel: MACRO
+ db $FF
+ENDM