Song headers

37 files changed, 920 insertions, 8 deletions

diff --git a/src/audio/music/azaleaandblackthorngym.asm b/src/audio/music/azaleaandblackthorngym.asm
new file mode 100644
index 0000000..f247a3a
--- /dev/null
+++ b/src/audio/music/azaleaandblackthorngym.asm
@@ -0,0 +1,17 @@
+Music_AzaleaAndBlackthornGym:: ; 185d0a (61:5d0a)
+	dw Music_AzaleaAndBlackthornGym_Ch1
+	dw Music_AzaleaAndBlackthornGym_Ch2
+	dw Music_AzaleaAndBlackthornGym_Ch3
+	dw Music_AzaleaAndBlackthornGym_Ch4
+
+Music_AzaleaAndBlackthornGym_Ch1:: ; 185d12 (61:5d12)
+	INCBIN "baserom.gbc",$185d12,$185e6a - $185d12
+
+Music_AzaleaAndBlackthornGym_Ch2:: ; 185e6a (61:5e6a)
+	INCBIN "baserom.gbc",$185e6a,$186158 - $185e6a
+
+Music_AzaleaAndBlackthornGym_Ch3:: ; 186158 (61:6158)
+	INCBIN "baserom.gbc",$186158,$18637c - $186158
+
+Music_AzaleaAndBlackthornGym_Ch4:: ; 18637c (61:637c)
+	INCBIN "baserom.gbc",$18637c,$186675 - $18637c
diff --git a/src/audio/music/cleffaandigglybuffstheme.asm b/src/audio/music/cleffaandigglybuffstheme.asm
new file mode 100644
index 0000000..df3b2f9
--- /dev/null
+++ b/src/audio/music/cleffaandigglybuffstheme.asm
@@ -0,0 +1,17 @@
+Music_CleffaAndIgglybuffsTheme:: ; 18ca9f (63:4a9f)
+	dw Music_CleffaAndIgglybuffsTheme_Ch1
+	dw Music_CleffaAndIgglybuffsTheme_Ch2
+	dw Music_CleffaAndIgglybuffsTheme_Ch3
+	dw Music_CleffaAndIgglybuffsTheme_Ch4
+
+Music_CleffaAndIgglybuffsTheme_Ch1:: ; 18caa7 (63:4aa7)
+	INCBIN "baserom.gbc",$18caa7,$18cc9b - $18caa7
+
+Music_CleffaAndIgglybuffsTheme_Ch2:: ; 18cc9b (63:4c9b)
+	INCBIN "baserom.gbc",$18cc9b,$18cf93 - $18cc9b
+
+Music_CleffaAndIgglybuffsTheme_Ch3:: ; 18cf93 (63:4f93)
+	INCBIN "baserom.gbc",$18cf93,$18d2a5 - $18cf93
+
+Music_CleffaAndIgglybuffsTheme_Ch4:: ; 18d2a5 (63:52a5)
+	INCBIN "baserom.gbc",$18d2a5,$18d4d9 - $18d2a5
diff --git a/src/audio/music/credits.asm b/src/audio/music/credits.asm
new file mode 100644
index 0000000..334105a
--- /dev/null
+++ b/src/audio/music/credits.asm
@@ -0,0 +1,17 @@
+Music_Credits:: ; 1906ba (64:46ba)
+	dw Music_Credits_Ch1
+	dw Music_Credits_Ch2
+	dw Music_Credits_Ch3
+	dw Music_Credits_Ch4
+
+Music_Credits_Ch1:: ; 1906c2 (64:46c2)
+	INCBIN "baserom.gbc",$1906c2,$19085f - $1906c2
+
+Music_Credits_Ch2:: ; 19085f (64:485f)
+	INCBIN "baserom.gbc",$19085f,$190c8f - $19085f
+
+Music_Credits_Ch3:: ; 190c8f (64:4c8f)
+	INCBIN "baserom.gbc",$190c8f,$190f8d - $190c8f
+
+Music_Credits_Ch4:: ; 190f8d (64:4f8d)
+	INCBIN "baserom.gbc",$190f8d,$1913f3 - $190f8d
diff --git a/src/audio/music/ecruteakandcianwoodgym.asm b/src/audio/music/ecruteakandcianwoodgym.asm
new file mode 100644
index 0000000..b499fbd
--- /dev/null
+++ b/src/audio/music/ecruteakandcianwoodgym.asm
@@ -0,0 +1,17 @@
+Music_EcruteakAndCianwoodGym:: ; 188ce0 (62:4ce0)
+	dw Music_EcruteakAndCianwoodGym_Ch1
+	dw Music_EcruteakAndCianwoodGym_Ch2
+	dw Music_EcruteakAndCianwoodGym_Ch3
+	dw Music_EcruteakAndCianwoodGym_Ch4
+
+Music_EcruteakAndCianwoodGym_Ch1:: ; 188ce8 (62:4ce8)
+	INCBIN "baserom.gbc",$188ce8,$188ff7 - $188ce8
+
+Music_EcruteakAndCianwoodGym_Ch2:: ; 188ff7 (62:4ff7)
+	INCBIN "baserom.gbc",$188ff7,$1892c7 - $188ff7
+
+Music_EcruteakAndCianwoodGym_Ch3:: ; 1892c7 (62:52c7)
+	INCBIN "baserom.gbc",$1892c7,$18951f - $1892c7
+
+Music_EcruteakAndCianwoodGym_Ch4:: ; 18951f (62:551f)
+	INCBIN "baserom.gbc",$18951f,$18961d - $18951f
diff --git a/src/audio/music/elekidandmagbystheme.asm b/src/audio/music/elekidandmagbystheme.asm
new file mode 100644
index 0000000..d3b9ea1
--- /dev/null
+++ b/src/audio/music/elekidandmagbystheme.asm
@@ -0,0 +1,17 @@
+Music_ElekidAndMagbysTheme:: ; 18d4d9 (63:54d9)
+	dw Music_ElekidAndMagbysTheme_Ch1
+	dw Music_ElekidAndMagbysTheme_Ch2
+	dw Music_ElekidAndMagbysTheme_Ch3
+	dw Music_ElekidAndMagbysTheme_Ch4
+
+Music_ElekidAndMagbysTheme_Ch1:: ; 18d4e1 (63:54e1)
+	INCBIN "baserom.gbc",$18d4e1,$18d658 - $18d4e1
+
+Music_ElekidAndMagbysTheme_Ch2:: ; 18d658 (63:5658)
+	INCBIN "baserom.gbc",$18d658,$18d8ab - $18d658
+
+Music_ElekidAndMagbysTheme_Ch3:: ; 18d8ab (63:58ab)
+	INCBIN "baserom.gbc",$18d8ab,$18dad9 - $18d8ab
+
+Music_ElekidAndMagbysTheme_Ch4:: ; 18dad9 (63:5ad9)
+	INCBIN "baserom.gbc",$18dad9,$18ddda - $18dad9
diff --git a/src/audio/music/elitefour.asm b/src/audio/music/elitefour.asm
new file mode 100644
index 0000000..5c94ce9
--- /dev/null
+++ b/src/audio/music/elitefour.asm
@@ -0,0 +1,17 @@
+Music_EliteFour:: ; 18961d (62:561d)
+	dw Music_EliteFour_Ch1
+	dw Music_EliteFour_Ch2
+	dw Music_EliteFour_Ch3
+	dw Music_EliteFour_Ch4
+
+Music_EliteFour_Ch1:: ; 189625 (62:5625)
+	INCBIN "baserom.gbc",$189625,$18975f - $189625
+
+Music_EliteFour_Ch2:: ; 18975f (62:575f)
+	INCBIN "baserom.gbc",$18975f,$189907 - $18975f
+
+Music_EliteFour_Ch3:: ; 189907 (62:5907)
+	INCBIN "baserom.gbc",$189907,$189aef - $189907
+
+Music_EliteFour_Ch4:: ; 189aef (62:5aef)
+	INCBIN "baserom.gbc",$189aef,$189d83 - $189aef
diff --git a/src/audio/music/elitefourdanger.asm b/src/audio/music/elitefourdanger.asm
new file mode 100644
index 0000000..f76d137
--- /dev/null
+++ b/src/audio/music/elitefourdanger.asm
@@ -0,0 +1,17 @@
+Music_EliteFourDanger:: ; 18ddda (63:5dda)
+	dw Music_EliteFourDanger_Ch1
+	dw Music_EliteFourDanger_Ch2
+	dw Music_EliteFourDanger_Ch3
+	dw Music_EliteFourDanger_Ch4
+
+Music_EliteFourDanger_Ch1:: ; 18dde2 (63:5de2)
+	INCBIN "baserom.gbc",$18dde2,$18e069 - $18dde2
+
+Music_EliteFourDanger_Ch2:: ; 18e069 (63:6069)
+	INCBIN "baserom.gbc",$18e069,$18e320 - $18e069
+
+Music_EliteFourDanger_Ch3:: ; 18e320 (63:6320)
+	INCBIN "baserom.gbc",$18e320,$18e740 - $18e320
+
+Music_EliteFourDanger_Ch4:: ; 18e740 (63:6740)
+	INCBIN "baserom.gbc",$18e740,$18ebd0 - $18e740
diff --git a/src/audio/music/gameover.asm b/src/audio/music/gameover.asm
new file mode 100644
index 0000000..9694b0e
--- /dev/null
+++ b/src/audio/music/gameover.asm
@@ -0,0 +1,14 @@
+Music_GameOver:: ; 18a872 (62:6872)
+	dw Music_GameOver_Ch1
+	dw Music_GameOver_Ch2
+	dw Music_GameOver_Ch3
+	dw $0000
+
+Music_GameOver_Ch1:: ; 18a87a (62:687a)
+	INCBIN "baserom.gbc",$18a87a,$18a8cf - $18a87a
+
+Music_GameOver_Ch2:: ; 18a8cf (62:68cf)
+	INCBIN "baserom.gbc",$18a8cf,$18a92e - $18a8cf
+
+Music_GameOver_Ch3:: ; 18a92e (62:692e)
+	INCBIN "baserom.gbc",$18a92e,$18a980 - $18a92e
diff --git a/src/audio/music/goldenrodgym.asm b/src/audio/music/goldenrodgym.asm
new file mode 100644
index 0000000..63bc4a7
--- /dev/null
+++ b/src/audio/music/goldenrodgym.asm
@@ -0,0 +1,17 @@
+Music_GoldenrodGym:: ; 18400c (61:400c)
+	dw Music_GoldenrodGym_Ch1
+	dw Music_GoldenrodGym_Ch2
+	dw Music_GoldenrodGym_Ch3
+	dw Music_GoldenrodGym_Ch4
+
+Music_GoldenrodGym_Ch1:: ; 184014 (61:4014)
+	INCBIN "baserom.gbc",$184014,$1841df - $184014
+
+Music_GoldenrodGym_Ch2:: ; 1841df (61:41df)
+	INCBIN "baserom.gbc",$1841df,$1844f6 - $1841df
+
+Music_GoldenrodGym_Ch3:: ; 1844f6 (61:44f6)
+	INCBIN "baserom.gbc",$1844f6,$184996 - $1844f6
+
+Music_GoldenrodGym_Ch4:: ; 184996 (61:4996)
+	INCBIN "baserom.gbc",$184996,$184d11 - $184996
diff --git a/src/audio/music/gymbattledanger.asm b/src/audio/music/gymbattledanger.asm
new file mode 100644
index 0000000..3683a62
--- /dev/null
+++ b/src/audio/music/gymbattledanger.asm
@@ -0,0 +1,17 @@
+Music_GymBattleDanger:: ; 18ed33 (63:6d33)
+	dw Music_GymBattleDanger_Ch1
+	dw Music_GymBattleDanger_Ch2
+	dw Music_GymBattleDanger_Ch3
+	dw Music_GymBattleDanger_Ch4
+
+Music_GymBattleDanger_Ch1:: ; 18ed3b (63:6d3b)
+	INCBIN "baserom.gbc",$18ed3b,$18f02b - $18ed3b
+
+Music_GymBattleDanger_Ch2:: ; 18f02b (63:702b)
+	INCBIN "baserom.gbc",$18f02b,$18f2bd - $18f02b
+
+Music_GymBattleDanger_Ch3:: ; 18f2bd (63:72bd)
+	INCBIN "baserom.gbc",$18f2bd,$18f5fc - $18f2bd
+
+Music_GymBattleDanger_Ch4:: ; 18f5fc (63:75fc)
+	INCBIN "baserom.gbc",$18f5fc,$18f986 - $18f5fc
diff --git a/src/audio/music/gymvictory.asm b/src/audio/music/gymvictory.asm
new file mode 100644
index 0000000..24df122
--- /dev/null
+++ b/src/audio/music/gymvictory.asm
@@ -0,0 +1,14 @@
+Music_GymVictory:: ; 188be2 (62:4be2)
+	dw Music_GymVictory_Ch1
+	dw Music_GymVictory_Ch2
+	dw Music_GymVictory_Ch3
+	dw $0000
+
+Music_GymVictory_Ch1:: ; 188bea (62:4bea)
+	INCBIN "baserom.gbc",$188bea,$188c44 - $188bea
+
+Music_GymVictory_Ch2:: ; 188c44 (62:4c44)
+	INCBIN "baserom.gbc",$188c44,$188c97 - $188c44
+
+Music_GymVictory_Ch3:: ; 188c97 (62:4c97)
+	INCBIN "baserom.gbc",$188c97,$188ce0 - $188c97
diff --git a/src/audio/music/herecomeslance.asm b/src/audio/music/herecomeslance.asm
new file mode 100644
index 0000000..316da2d
--- /dev/null
+++ b/src/audio/music/herecomeslance.asm
@@ -0,0 +1,17 @@
+Music_HereComesLance:: ; 18ebd0 (63:6bd0)
+	dw Music_HereComesLance_Ch1
+	dw Music_HereComesLance_Ch2
+	dw Music_HereComesLance_Ch3
+	dw Music_HereComesLance_Ch4
+
+Music_HereComesLance_Ch1:: ; 18ebd8 (63:6bd8)
+	INCBIN "baserom.gbc",$18ebd8,$18ec77 - $18ebd8
+
+Music_HereComesLance_Ch2:: ; 18ec77 (63:6c77)
+	INCBIN "baserom.gbc",$18ec77,$18ec98 - $18ec77
+
+Music_HereComesLance_Ch3:: ; 18ec98 (63:6c98)
+	INCBIN "baserom.gbc",$18ec98,$18ecc6 - $18ec98
+
+Music_HereComesLance_Ch4:: ; 18ecc6 (63:6cc6)
+	INCBIN "baserom.gbc",$18ecc6,$18ed33 - $18ecc6
diff --git a/src/audio/music/herecomestheelitefour.asm b/src/audio/music/herecomestheelitefour.asm
new file mode 100644
index 0000000..cab61c3
--- /dev/null
+++ b/src/audio/music/herecomestheelitefour.asm
@@ -0,0 +1,17 @@
+Music_HereComesTheEliteFour:: ; 18c8d7 (63:48d7)
+	dw Music_HereComesTheEliteFour_Ch1
+	dw Music_HereComesTheEliteFour_Ch2
+	dw Music_HereComesTheEliteFour_Ch3
+	dw Music_HereComesTheEliteFour_Ch4
+
+Music_HereComesTheEliteFour_Ch1:: ; 18c8df (63:48df)
+	INCBIN "baserom.gbc",$18c8df,$18c97d - $18c8df
+
+Music_HereComesTheEliteFour_Ch2:: ; 18c97d (63:497d)
+	INCBIN "baserom.gbc",$18c97d,$18c9ac - $18c97d
+
+Music_HereComesTheEliteFour_Ch3:: ; 18c9ac (63:49ac)
+	INCBIN "baserom.gbc",$18c9ac,$18ca29 - $18c9ac
+
+Music_HereComesTheEliteFour_Ch4:: ; 18ca29 (63:4a29)
+	INCBIN "baserom.gbc",$18ca29,$18ca9f - $18ca29
diff --git a/src/audio/music/intro.asm b/src/audio/music/intro.asm
new file mode 100644
index 0000000..d30c929
--- /dev/null
+++ b/src/audio/music/intro.asm
@@ -0,0 +1,17 @@
+Music_Intro:: ; 18a980 (62:6980)
+	dw Music_Intro_Ch1
+	dw Music_Intro_Ch2
+	dw Music_Intro_Ch3
+	dw Music_Intro_Ch4
+
+Music_Intro_Ch1:: ; 18a988 (62:6988)
+	INCBIN "baserom.gbc",$18a988,$18ad09 - $18a988
+
+Music_Intro_Ch2:: ; 18ad09 (62:6d09)
+	INCBIN "baserom.gbc",$18ad09,$18b2cc - $18ad09
+
+Music_Intro_Ch3:: ; 18b2cc (62:72cc)
+	INCBIN "baserom.gbc",$18b2cc,$18b74e - $18b2cc
+
+Music_Intro_Ch4:: ; 18b74e (62:774e)
+	INCBIN "baserom.gbc",$18b74e,$18c000 - $18b74e
diff --git a/src/audio/music/lance.asm b/src/audio/music/lance.asm
new file mode 100644
index 0000000..823a9df
--- /dev/null
+++ b/src/audio/music/lance.asm
@@ -0,0 +1,17 @@
+Music_Lance:: ; 189d83 (62:5d83)
+	dw Music_Lance_Ch1
+	dw Music_Lance_Ch2
+	dw Music_Lance_Ch3
+	dw Music_Lance_Ch4
+
+Music_Lance_Ch1:: ; 189d8b (62:5d8b)
+	INCBIN "baserom.gbc",$189d8b,$189fb3 - $189d8b
+
+Music_Lance_Ch2:: ; 189fb3 (62:5fb3)
+	INCBIN "baserom.gbc",$189fb3,$18a25d - $189fb3
+
+Music_Lance_Ch3:: ; 18a25d (62:625d)
+	INCBIN "baserom.gbc",$18a25d,$18a44d - $18a25d
+
+Music_Lance_Ch4:: ; 18a44d (62:644d)
+	INCBIN "baserom.gbc",$18a44d,$18a872 - $18a44d
diff --git a/src/audio/music/lancedanger.asm b/src/audio/music/lancedanger.asm
new file mode 100644
index 0000000..2bde677
--- /dev/null
+++ b/src/audio/music/lancedanger.asm
@@ -0,0 +1,17 @@
+Music_LanceDanger:: ; 1913f3 (64:53f3)
+	dw Music_LanceDanger_Ch1
+	dw Music_LanceDanger_Ch2
+	dw Music_LanceDanger_Ch3
+	dw Music_LanceDanger_Ch4
+
+Music_LanceDanger_Ch1:: ; 1913fb (64:53fb)
+	INCBIN "baserom.gbc",$1913fb,$191669 - $1913fb
+
+Music_LanceDanger_Ch2:: ; 191669 (64:5669)
+	INCBIN "baserom.gbc",$191669,$191aac - $191669
+
+Music_LanceDanger_Ch3:: ; 191aac (64:5aac)
+	INCBIN "baserom.gbc",$191aac,$19206b - $191aac
+
+Music_LanceDanger_Ch4:: ; 19206b (64:606b)
+	INCBIN "baserom.gbc",$19206b,$192339 - $19206b
diff --git a/src/audio/music/lineclearvictory.asm b/src/audio/music/lineclearvictory.asm
new file mode 100644
index 0000000..76aab21
--- /dev/null
+++ b/src/audio/music/lineclearvictory.asm
@@ -0,0 +1,17 @@
+Music_LineClearVictory:: ; 192564 (64:6564)
+	dw Music_LineClearVictory_Ch1
+	dw Music_LineClearVictory_Ch2
+	dw Music_LineClearVictory_Ch3
+	dw Music_LineClearVictory_Ch4
+
+Music_LineClearVictory_Ch1:: ; 19256c (64:656c)
+	INCBIN "baserom.gbc",$19256c,$1925b1 - $19256c
+
+Music_LineClearVictory_Ch2:: ; 1925b1 (64:65b1)
+	INCBIN "baserom.gbc",$1925b1,$1925e0 - $1925b1
+
+Music_LineClearVictory_Ch3:: ; 1925e0 (64:65e0)
+	INCBIN "baserom.gbc",$1925e0,$1925fe - $1925e0
+
+Music_LineClearVictory_Ch4:: ; 1925fe (64:65fe)
+	INCBIN "baserom.gbc",$1925fe,$194000 - $1925fe
diff --git a/src/audio/music/mahoganygym.asm b/src/audio/music/mahoganygym.asm
new file mode 100644
index 0000000..0ff27e3
--- /dev/null
+++ b/src/audio/music/mahoganygym.asm
@@ -0,0 +1,17 @@
+Music_MahoganyGym:: ; 188000 (62:4000)
+	dw Music_MahoganyGym_Ch1
+	dw Music_MahoganyGym_Ch2
+	dw Music_MahoganyGym_Ch3
+	dw Music_MahoganyGym_Ch4
+
+Music_MahoganyGym_Ch1:: ; 188008 (62:4008)
+	INCBIN "baserom.gbc",$188008,$1881c7 - $188008
+
+Music_MahoganyGym_Ch2:: ; 1881c7 (62:41c7)
+	INCBIN "baserom.gbc",$1881c7,$18844e - $1881c7
+
+Music_MahoganyGym_Ch3:: ; 18844e (62:444e)
+	INCBIN "baserom.gbc",$18844e,$1886e6 - $18844e
+
+Music_MahoganyGym_Ch4:: ; 1886e6 (62:46e6)
+	INCBIN "baserom.gbc",$1886e6,$188be2 - $1886e6
diff --git a/src/audio/music/mainmenu.asm b/src/audio/music/mainmenu.asm
new file mode 100644
index 0000000..b1de7a8
--- /dev/null
+++ b/src/audio/music/mainmenu.asm
@@ -0,0 +1,17 @@
+Music_MainMenu:: ; 186f53 (61:6f53)
+	dw Music_MainMenu_Ch1
+	dw Music_MainMenu_Ch2
+	dw Music_MainMenu_Ch3
+	dw Music_MainMenu_Ch4
+
+Music_MainMenu_Ch1:: ; 186f5b (61:6f5b)
+	INCBIN "baserom.gbc",$186f5b,$1870c8 - $186f5b
+
+Music_MainMenu_Ch2:: ; 1870c8 (61:70c8)
+	INCBIN "baserom.gbc",$1870c8,$187388 - $1870c8
+
+Music_MainMenu_Ch3:: ; 187388 (61:7388)
+	INCBIN "baserom.gbc",$187388,$1874e5 - $187388
+
+Music_MainMenu_Ch4:: ; 1874e5 (61:74e5)
+	INCBIN "baserom.gbc",$1874e5,$1875fd - $1874e5
diff --git a/src/audio/music/mainmenucopy.asm b/src/audio/music/mainmenucopy.asm
new file mode 100644
index 0000000..c3216ee
--- /dev/null
+++ b/src/audio/music/mainmenucopy.asm
@@ -0,0 +1,17 @@
+Music_MainMenuCopy:: ; 190000 (64:4000)
+	dw Music_MainMenuCopy_Ch1
+	dw Music_MainMenuCopy_Ch2
+	dw Music_MainMenuCopy_Ch3
+	dw Music_MainMenuCopy_Ch4
+
+Music_MainMenuCopy_Ch1:: ; 190008 (64:4008)
+	INCBIN "baserom.gbc",$190008,$190179 - $190008
+
+Music_MainMenuCopy_Ch2:: ; 190179 (64:4179)
+	INCBIN "baserom.gbc",$190179,$19043d - $190179
+
+Music_MainMenuCopy_Ch3:: ; 19043d (64:443d)
+	INCBIN "baserom.gbc",$19043d,$19059e - $19043d
+
+Music_MainMenuCopy_Ch4:: ; 19059e (64:459e)
+	INCBIN "baserom.gbc",$19059e,$1906ba - $19059e
diff --git a/src/audio/music/none.asm b/src/audio/music/none.asm
new file mode 100644
index 0000000..667f69b
--- /dev/null
+++ b/src/audio/music/none.asm
@@ -0,0 +1,17 @@
+Music_None:: ; 184000 (61:4000)
+	dw Music_None_Ch1
+	dw Music_None_Ch2
+	dw Music_None_Ch3
+	dw Music_None_Ch4
+
+Music_None_Ch1:: ; 184008 (61:4008)
+	INCBIN "baserom.gbc",$184008,$184009 - $184008
+
+Music_None_Ch2:: ; 184009 (61:4009)
+	INCBIN "baserom.gbc",$184009,$18400a - $184009
+
+Music_None_Ch3:: ; 18400a (61:400a)
+	INCBIN "baserom.gbc",$18400a,$18400b - $18400a
+
+Music_None_Ch4:: ; 18400b (61:400b)
+	INCBIN "baserom.gbc",$18400b,$18400c - $18400b
diff --git a/src/audio/music/paneldepon1.asm b/src/audio/music/paneldepon1.asm
new file mode 100644
index 0000000..6d32499
--- /dev/null
+++ b/src/audio/music/paneldepon1.asm
@@ -0,0 +1,17 @@
+Music_PanelDePon1:: ; 91365 (24:5365)
+	dw Music_PanelDePon1_Ch1
+	dw Music_PanelDePon1_Ch2
+	dw Music_PanelDePon1_Ch3
+	dw Music_PanelDePon1_Ch4
+
+Music_PanelDePon1_Ch1:: ; 9136d (24:536d)
+	INCBIN "baserom.gbc",$9136d,$9146c - $9136d
+
+Music_PanelDePon1_Ch2:: ; 9146c (24:546c)
+	INCBIN "baserom.gbc",$9146c,$9151a - $9146c
+
+Music_PanelDePon1_Ch3:: ; 9151a (24:551a)
+	INCBIN "baserom.gbc",$9151a,$915bf - $9151a
+
+Music_PanelDePon1_Ch4:: ; 915bf (24:55bf)
+	INCBIN "baserom.gbc",$915bf,$94000 - $915bf
diff --git a/src/audio/music/paneldepon2.asm b/src/audio/music/paneldepon2.asm
new file mode 100644
index 0000000..f361255
--- /dev/null
+++ b/src/audio/music/paneldepon2.asm
@@ -0,0 +1,17 @@
+Music_PanelDePon2:: ; 180000 (60:4000)
+	dw Music_PanelDePon2_Ch1
+	dw Music_PanelDePon2_Ch2
+	dw Music_PanelDePon2_Ch3
+	dw Music_PanelDePon2_Ch4
+
+Music_PanelDePon2_Ch1:: ; 180008 (60:4008)
+	INCBIN "baserom.gbc",$180008,$180191 - $180008
+
+Music_PanelDePon2_Ch2:: ; 180191 (60:4191)
+	INCBIN "baserom.gbc",$180191,$180307 - $180191
+
+Music_PanelDePon2_Ch3:: ; 180307 (60:4307)
+	INCBIN "baserom.gbc",$180307,$1804b5 - $180307
+
+Music_PanelDePon2_Ch4:: ; 1804b5 (60:44b5)
+	INCBIN "baserom.gbc",$1804b5,$184000 - $1804b5
diff --git a/src/audio/music/paneldepon3.asm b/src/audio/music/paneldepon3.asm
new file mode 100644
index 0000000..a0c5ad7
--- /dev/null
+++ b/src/audio/music/paneldepon3.asm
@@ -0,0 +1,17 @@
+Music_PanelDePon3:: ; 8f689 (23:7689)
+	dw Music_PanelDePon3_Ch1
+	dw Music_PanelDePon3_Ch2
+	dw Music_PanelDePon3_Ch3
+	dw Music_PanelDePon3_Ch4
+
+Music_PanelDePon3_Ch1:: ; 8f691 (23:7691)
+	INCBIN "baserom.gbc",$8f691,$8f6fc - $8f691
+
+Music_PanelDePon3_Ch2:: ; 8f6fc (23:76fc)
+	INCBIN "baserom.gbc",$8f6fc,$8f725 - $8f6fc
+
+Music_PanelDePon3_Ch3:: ; 8f725 (23:7725)
+	INCBIN "baserom.gbc",$8f725,$8f771 - $8f725
+
+Music_PanelDePon3_Ch4:: ; 8f771 (23:7771)
+	INCBIN "baserom.gbc",$8f771,$90000 - $8f771
diff --git a/src/audio/music/roundcleared.asm b/src/audio/music/roundcleared.asm
new file mode 100644
index 0000000..1c8f693
--- /dev/null
+++ b/src/audio/music/roundcleared.asm
@@ -0,0 +1,17 @@
+Music_RoundCleared:: ; 187940 (61:7940)
+	dw Music_RoundCleared_Ch1
+	dw Music_RoundCleared_Ch2
+	dw Music_RoundCleared_Ch3
+	dw Music_RoundCleared_Ch4
+
+Music_RoundCleared_Ch1:: ; 187948 (61:7948)
+	INCBIN "baserom.gbc",$187948,$187a39 - $187948
+
+Music_RoundCleared_Ch2:: ; 187a39 (61:7a39)
+	INCBIN "baserom.gbc",$187a39,$187b31 - $187a39
+
+Music_RoundCleared_Ch3:: ; 187b31 (61:7b31)
+	INCBIN "baserom.gbc",$187b31,$187bfd - $187b31
+
+Music_RoundCleared_Ch4:: ; 187bfd (61:7bfd)
+	INCBIN "baserom.gbc",$187bfd,$188000 - $187bfd
diff --git a/src/audio/music/secrettrainer.asm b/src/audio/music/secrettrainer.asm
new file mode 100644
index 0000000..ecfe732
--- /dev/null
+++ b/src/audio/music/secrettrainer.asm
@@ -0,0 +1,17 @@
+Music_SecretTrainer:: ; 18fae0 (63:7ae0)
+	dw Music_SecretTrainer_Ch1
+	dw Music_SecretTrainer_Ch2
+	dw Music_SecretTrainer_Ch3
+	dw Music_SecretTrainer_Ch4
+
+Music_SecretTrainer_Ch1:: ; 18fae8 (63:7ae8)
+	INCBIN "baserom.gbc",$18fae8,$18fb68 - $18fae8
+
+Music_SecretTrainer_Ch2:: ; 18fb68 (63:7b68)
+	INCBIN "baserom.gbc",$18fb68,$18fbce - $18fb68
+
+Music_SecretTrainer_Ch3:: ; 18fbce (63:7bce)
+	INCBIN "baserom.gbc",$18fbce,$18fc3a - $18fbce
+
+Music_SecretTrainer_Ch4:: ; 18fc3a (63:7c3a)
+	INCBIN "baserom.gbc",$18fc3a,$190000 - $18fc3a
diff --git a/src/audio/music/secrettrainervictory.asm b/src/audio/music/secrettrainervictory.asm
new file mode 100644
index 0000000..70dcd09
--- /dev/null
+++ b/src/audio/music/secrettrainervictory.asm
@@ -0,0 +1,14 @@
+Music_SecretTrainerVictory:: ; 18f986 (63:7986)
+	dw Music_SecretTrainerVictory_Ch1
+	dw Music_SecretTrainerVictory_Ch2
+	dw Music_SecretTrainerVictory_Ch3
+	dw $0000
+
+Music_SecretTrainerVictory_Ch1:: ; 18f98e (63:798e)
+	INCBIN "baserom.gbc",$18f98e,$18fa03 - $18f98e
+
+Music_SecretTrainerVictory_Ch2:: ; 18fa03 (63:7a03)
+	INCBIN "baserom.gbc",$18fa03,$18fa83 - $18fa03
+
+Music_SecretTrainerVictory_Ch3:: ; 18fa83 (63:7a83)
+	INCBIN "baserom.gbc",$18fa83,$18fae0 - $18fa83
diff --git a/src/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm
new file mode 100644
index 0000000..c02a002
--- /dev/null
+++ b/src/audio/music/titlescreen.asm
@@ -0,0 +1,17 @@
+Music_TitleScreen:: ; 18c000 (63:4000)
+	dw Music_TitleScreen_Ch1
+	dw Music_TitleScreen_Ch2
+	dw Music_TitleScreen_Ch3
+	dw Music_TitleScreen_Ch4
+
+Music_TitleScreen_Ch1:: ; 18c008 (63:4008)
+	INCBIN "baserom.gbc",$18c008,$18c2a3 - $18c008
+
+Music_TitleScreen_Ch2:: ; 18c2a3 (63:42a3)
+	INCBIN "baserom.gbc",$18c2a3,$18c51b - $18c2a3
+
+Music_TitleScreen_Ch3:: ; 18c51b (63:451b)
+	INCBIN "baserom.gbc",$18c51b,$18c6e0 - $18c51b
+
+Music_TitleScreen_Ch4:: ; 18c6e0 (63:46e0)
+	INCBIN "baserom.gbc",$18c6e0,$18c8d7 - $18c6e0
diff --git a/src/audio/music/travellingtothegyms.asm b/src/audio/music/travellingtothegyms.asm
new file mode 100644
index 0000000..3d8061b
--- /dev/null
+++ b/src/audio/music/travellingtothegyms.asm
@@ -0,0 +1,14 @@
+Music_TravellingToTheGyms:: ; 1875fd (61:75fd)
+	dw Music_TravellingToTheGyms_Ch1
+	dw Music_TravellingToTheGyms_Ch2
+	dw Music_TravellingToTheGyms_Ch3
+	dw $0000
+
+Music_TravellingToTheGyms_Ch1:: ; 187605 (61:7605)
+	INCBIN "baserom.gbc",$187605,$1876de - $187605
+
+Music_TravellingToTheGyms_Ch2:: ; 1876de (61:76de)
+	INCBIN "baserom.gbc",$1876de,$187802 - $1876de
+
+Music_TravellingToTheGyms_Ch3:: ; 187802 (61:7802)
+	INCBIN "baserom.gbc",$187802,$187940 - $187802
diff --git a/src/audio/music/unusedsong1.asm b/src/audio/music/unusedsong1.asm
new file mode 100644
index 0000000..7bedaea
--- /dev/null
+++ b/src/audio/music/unusedsong1.asm
@@ -0,0 +1,17 @@
+Music_UnusedSong1:: ; 1856af (61:56af)
+	dw Music_UnusedSong1_Ch1
+	dw Music_UnusedSong1_Ch2
+	dw Music_UnusedSong1_Ch3
+	dw Music_UnusedSong1_Ch4
+
+Music_UnusedSong1_Ch1:: ; 1856b7 (61:56b7)
+	INCBIN "baserom.gbc",$1856b7,$18581d - $1856b7
+
+Music_UnusedSong1_Ch2:: ; 18581d (61:581d)
+	INCBIN "baserom.gbc",$18581d,$18596e - $18581d
+
+Music_UnusedSong1_Ch3:: ; 18596e (61:596e)
+	INCBIN "baserom.gbc",$18596e,$185afc - $18596e
+
+Music_UnusedSong1_Ch4:: ; 185afc (61:5afc)
+	INCBIN "baserom.gbc",$185afc,$185d0a - $185afc
diff --git a/src/audio/music/unusedsong2.asm b/src/audio/music/unusedsong2.asm
new file mode 100644
index 0000000..a97c0ae
--- /dev/null
+++ b/src/audio/music/unusedsong2.asm
@@ -0,0 +1,17 @@
+Music_UnusedSong2:: ; 184d11 (61:4d11)
+	dw Music_UnusedSong2_Ch1
+	dw Music_UnusedSong2_Ch2
+	dw Music_UnusedSong2_Ch3
+	dw Music_UnusedSong2_Ch4
+
+Music_UnusedSong2_Ch1:: ; 184d19 (61:4d19)
+	INCBIN "baserom.gbc",$184d19,$184f3f - $184d19
+
+Music_UnusedSong2_Ch2:: ; 184f3f (61:4f3f)
+	INCBIN "baserom.gbc",$184f3f,$18512e - $184f3f
+
+Music_UnusedSong2_Ch3:: ; 18512e (61:512e)
+	INCBIN "baserom.gbc",$18512e,$1853a4 - $18512e
+
+Music_UnusedSong2_Ch4:: ; 1853a4 (61:53a4)
+	INCBIN "baserom.gbc",$1853a4,$1856af - $1853a4
diff --git a/src/audio/music/unusedsong3.asm b/src/audio/music/unusedsong3.asm
new file mode 100644
index 0000000..5bfdbb8
--- /dev/null
+++ b/src/audio/music/unusedsong3.asm
@@ -0,0 +1,14 @@
+Music_UnusedSong3:: ; 192339 (64:6339)
+	dw Music_UnusedSong3_Ch1
+	dw Music_UnusedSong3_Ch2
+	dw Music_UnusedSong3_Ch3
+	dw $0000
+
+Music_UnusedSong3_Ch1:: ; 192341 (64:6341)
+	INCBIN "baserom.gbc",$192341,$192430 - $192341
+
+Music_UnusedSong3_Ch2:: ; 192430 (64:6430)
+	INCBIN "baserom.gbc",$192430,$1924af - $192430
+
+Music_UnusedSong3_Ch3:: ; 1924af (64:64af)
+	INCBIN "baserom.gbc",$1924af,$192564 - $1924af
diff --git a/src/audio/music/violetandolivinegym.asm b/src/audio/music/violetandolivinegym.asm
new file mode 100644
index 0000000..23be97c
--- /dev/null
+++ b/src/audio/music/violetandolivinegym.asm
@@ -0,0 +1,17 @@
+Music_VioletAndOlivineGym:: ; 186675 (61:6675)
+	dw Music_VioletAndOlivineGym_Ch1
+	dw Music_VioletAndOlivineGym_Ch2
+	dw Music_VioletAndOlivineGym_Ch3
+	dw Music_VioletAndOlivineGym_Ch4
+
+Music_VioletAndOlivineGym_Ch1:: ; 18667d (61:667d)
+	INCBIN "baserom.gbc",$18667d,$18689b - $18667d
+
+Music_VioletAndOlivineGym_Ch2:: ; 18689b (61:689b)
+	INCBIN "baserom.gbc",$18689b,$186b2c - $18689b
+
+Music_VioletAndOlivineGym_Ch3:: ; 186b2c (61:6b2c)
+	INCBIN "baserom.gbc",$186b2c,$186d6f - $186b2c
+
+Music_VioletAndOlivineGym_Ch4:: ; 186d6f (61:6d6f)
+	INCBIN "baserom.gbc",$186d6f,$186f53 - $186d6f
diff --git a/src/audio/song_pointers.asm b/src/audio/song_pointers.asm
new file mode 100755
index 0000000..6a16eef
--- /dev/null
+++ b/src/audio/song_pointers.asm
@@ -0,0 +1,291 @@
+SongPointers: ; 8190e (20:590e)
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_UnusedSong1
+	db BANK(Music_UnusedSong1)
+
+	dw Music_GoldenrodGym
+	db BANK(Music_GoldenrodGym)
+
+	dw Music_AzaleaAndBlackthornGym
+	db BANK(Music_AzaleaAndBlackthornGym)
+
+	dw Music_UnusedSong2
+	db BANK(Music_UnusedSong2)
+
+	dw Music_VioletAndOlivineGym
+	db BANK(Music_VioletAndOlivineGym)
+
+	dw Music_MainMenu
+	db BANK(Music_MainMenu)
+
+	dw Music_TravellingToTheGyms
+	db BANK(Music_TravellingToTheGyms)
+
+	dw Music_MahoganyGym
+	db BANK(Music_MahoganyGym)
+
+	dw Music_GymVictory
+	db BANK(Music_GymVictory)
+
+	dw Music_EcruteakAndCianwoodGym
+	db BANK(Music_EcruteakAndCianwoodGym)
+
+	dw Music_EliteFour
+	db BANK(Music_EliteFour)
+
+	dw Music_Lance
+	db BANK(Music_Lance)
+
+	dw Music_GameOver
+	db BANK(Music_GameOver)
+
+	dw Music_Intro
+	db BANK(Music_Intro)
+
+	dw Music_TitleScreen
+	db BANK(Music_TitleScreen)
+
+	dw Music_HereComesTheEliteFour
+	db BANK(Music_HereComesTheEliteFour)
+
+	dw Music_CleffaAndIgglybuffsTheme
+	db BANK(Music_CleffaAndIgglybuffsTheme)
+
+	dw Music_ElekidAndMagbysTheme
+	db BANK(Music_ElekidAndMagbysTheme)
+
+	dw Music_EliteFourDanger
+	db BANK(Music_EliteFourDanger)
+
+	dw Music_HereComesLance
+	db BANK(Music_HereComesLance)
+
+	dw Music_RoundCleared
+	db BANK(Music_RoundCleared)
+
+	dw Music_GymBattleDanger
+	db BANK(Music_GymBattleDanger)
+
+	dw Music_SecretTrainer
+	db BANK(Music_SecretTrainer)
+
+	dw Music_SecretTrainerVictory
+	db BANK(Music_SecretTrainerVictory)
+
+	dw Music_MainMenuCopy
+	db BANK(Music_MainMenuCopy)
+
+	dw Music_Credits
+	db BANK(Music_Credits)
+
+	dw Music_LanceDanger
+	db BANK(Music_LanceDanger)
+
+	dw Music_UnusedSong3
+	db BANK(Music_UnusedSong3)
+
+	dw Music_LineClearVictory
+	db BANK(Music_LineClearVictory)
+
+	dw Music_PanelDePon1
+	db BANK(Music_PanelDePon1)
+
+	dw Music_PanelDePon2
+	db BANK(Music_PanelDePon2)
+
+	dw Music_PanelDePon3
+	db BANK(Music_PanelDePon3)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_GameOver
+	db BANK(Music_GameOver)
+
+	dw Music_GameOver
+	db BANK(Music_GameOver)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_MainMenu
+	db BANK(Music_MainMenu)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
+
+	dw Music_None
+	db BANK(Music_None)
diff --git a/src/constants.asm b/src/constants.asm
new file mode 100755
index 0000000..0ad0058
--- /dev/null
+++ b/src/constants.asm
@@ -0,0 +1 @@
+INCLUDE "constants/music_constants.asm"
diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm
new file mode 100755
index 0000000..ad3730b
--- /dev/null
+++ b/src/constants/music_constants.asm
@@ -0,0 +1,33 @@
+MUSIC_NONE                        EQU $00
+MUSIC_UNUSED_SONG1                EQU $01
+MUSIC_GOLDENROD_GYM               EQU $02
+MUSIC_AZALEA_AND_BLACKTHORN_GYM   EQU $03
+MUSIC_UNUSED_SONG2                EQU $04
+MUSIC_VIOLET_AND_OLIVINE_GYM      EQU $05
+MUSIC_MAIN_MENU                   EQU $06
+MUSIC_TRAVELLING_TO_THE_GYMS      EQU $07
+MUSIC_MAHOGANY_GYM                EQU $08
+MUSIC_GYM_VICTORY                 EQU $09
+MUSIC_ECRUTEAK_AND_CIANWOOD_GYM   EQU $0A
+MUSIC_ELITE_FOUR                  EQU $0B
+MUSIC_LANCE                       EQU $0C
+MUSIC_GAME_OVER                   EQU $0D
+MUSIC_INTRO                       EQU $0E
+MUSIC_TITLE_SCREEN                EQU $0F
+MUSIC_HERE_COMES_THE_ELITE_FOUR   EQU $10
+MUSIC_CLEFFA_AND_IGGLYBUFFS_THEME EQU $11
+MUSIC_ELEKID_AND_MAGBYS_THEME     EQU $12
+MUSIC_ELITE_FOUR_DANGER           EQU $13
+MUSIC_HERE_COMES_LANCE            EQU $14
+MUSIC_ROUND_CLEARED               EQU $15
+MUSIC_GYM_BATTLE_DANGER           EQU $16
+MUSIC_SECRET_TRAINER              EQU $17
+MUSIC_SECRET_TRAINER_VICTORY      EQU $18
+MUSIC_MAIN_MENU_COPY              EQU $19
+MUSIC_CREDITS                     EQU $1A
+MUSIC_LANCE_DANGER                EQU $1B
+MUSIC_UNUSED_SONG3                EQU $1C
+MUSIC_LINE_CLEAR_VICTORY          EQU $1D
+MUSIC_PANEL_DE_PON1               EQU $1E
+MUSIC_PANEL_DE_PON2               EQU $1F
+MUSIC_PANEL_DE_PON3               EQU $20
diff --git a/src/main.asm b/src/main.asm
index b2213da..a14f7ce 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -1,3 +1,5 @@
+INCLUDE "constants.asm"
+
 INCLUDE "home.asm"
 
 SECTION "bank1",ROMX,BANK[$1]
@@ -94,7 +96,11 @@ SECTION "bank1F",ROMX,BANK[$1F]
 INCBIN "baserom.gbc",$7C000,$7E21D - $7C000
 
 SECTION "bank20",ROMX,BANK[$20]
-INCBIN "baserom.gbc",$80000,$8371E - $80000
+INCBIN "baserom.gbc",$80000,$8190e - $80000
+
+INCLUDE "audio/song_pointers.asm"
+
+INCBIN "baserom.gbc",$81a31,$8371E - $81a31
 
 SECTION "bank21",ROMX,BANK[$21]
 INCBIN "baserom.gbc",$84000,$87A3F - $84000
@@ -103,10 +109,14 @@ SECTION "bank22",ROMX,BANK[$22]
 INCBIN "baserom.gbc",$88000,$896EA - $88000
 
 SECTION "bank23",ROMX,BANK[$23]
-INCBIN "baserom.gbc",$8C000,$8FF15 - $8C000
+INCBIN "baserom.gbc",$8C000,$8f689 - $8C000
+
+INCLUDE "audio/music/paneldepon3.asm"
 
 SECTION "bank24",ROMX,BANK[$24]
-INCBIN "baserom.gbc",$90000,$93E1D - $90000
+INCBIN "baserom.gbc",$90000,$91365 - $90000
+
+INCLUDE "audio/music/paneldepon1.asm"
 
 SECTION "bank25",ROMX,BANK[$25]
 INCBIN "baserom.gbc",$94000,$97EEE - $94000
@@ -277,19 +287,50 @@ SECTION "bank5C",ROMX,BANK[$5C]
 INCBIN "baserom.gbc",$170000,$170C98 - $170000
 
 SECTION "bank60",ROMX,BANK[$60]
-INCBIN "baserom.gbc",$180000,$181AE2 - $180000
+
+INCLUDE "audio/music/paneldepon2.asm"
 
 SECTION "bank61",ROMX,BANK[$61]
-INCBIN "baserom.gbc",$184000,$187CA9 - $184000
+
+INCLUDE "audio/music/none.asm"
+INCLUDE "audio/music/goldenrodgym.asm"
+INCLUDE "audio/music/unusedsong2.asm"
+INCLUDE "audio/music/unusedsong1.asm"
+INCLUDE "audio/music/azaleaandblackthorngym.asm"
+INCLUDE "audio/music/violetandolivinegym.asm"
+INCLUDE "audio/music/mainmenu.asm"
+INCLUDE "audio/music/travellingtothegyms.asm"
+INCLUDE "audio/music/roundcleared.asm"
 
 SECTION "bank62",ROMX,BANK[$62]
-INCBIN "baserom.gbc",$188000,$18BBAE - $188000
+
+INCLUDE "audio/music/mahoganygym.asm"
+INCLUDE "audio/music/gymvictory.asm"
+INCLUDE "audio/music/ecruteakandcianwoodgym.asm"
+INCLUDE "audio/music/elitefour.asm"
+INCLUDE "audio/music/lance.asm"
+INCLUDE "audio/music/gameover.asm"
+INCLUDE "audio/music/intro.asm"
 
 SECTION "bank63",ROMX,BANK[$63]
-INCBIN "baserom.gbc",$18C000,$18FC9A - $18C000
+
+INCLUDE "audio/music/titlescreen.asm"
+INCLUDE "audio/music/herecomestheelitefour.asm"
+INCLUDE "audio/music/cleffaandigglybuffstheme.asm"
+INCLUDE "audio/music/elekidandmagbystheme.asm"
+INCLUDE "audio/music/elitefourdanger.asm"
+INCLUDE "audio/music/herecomeslance.asm"
+INCLUDE "audio/music/gymbattledanger.asm"
+INCLUDE "audio/music/secrettrainervictory.asm"
+INCLUDE "audio/music/secrettrainer.asm"
 
 SECTION "bank64",ROMX,BANK[$64]
-INCBIN "baserom.gbc",$190000,$192640 - $190000
+
+INCLUDE "audio/music/mainmenucopy.asm"
+INCLUDE "audio/music/credits.asm"
+INCLUDE "audio/music/lancedanger.asm"
+INCLUDE "audio/music/unusedsong3.asm"
+INCLUDE "audio/music/lineclearvictory.asm"
 
 SECTION "bank66",ROMX,BANK[$66]
 INCBIN "baserom.gbc",$198000,$198CCF - $198000