Make songs their own individual objects

14 files changed, 52 insertions, 39 deletions

diff --git a/audio/engine.asm b/audio/engine.asm
index 4c0ed21..f7a9974 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -169,42 +169,3 @@ _PlayMusic:: ; 3a:4d66
 
 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/songs/bicycle.inc b/audio/songs/bicycle.asm
index 63594e9..7c773fa 100755
--- a/audio/songs/bicycle.inc
+++ b/audio/songs/bicycle.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song Bicycle", ROMX[$563e], BANK[$3b]
+
 Song_Bicycle:: ; ed63e (3b:563e)
 	db 3 << 6 | 0
 	dw Song_Bicycle_Ch0
diff --git a/audio/songs/evolution.inc b/audio/songs/evolution.asm
index 7c0ae11..98bfc0e 100755
--- a/audio/songs/evolution.inc
+++ b/audio/songs/evolution.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song Evolution", ROMX[$5b1c], BANK[$3b]
+
 Song_Evolution:: ; edb1c (3b:5b1c)
 	db 2 << 6 | 0
 	dw Song_Evolution_Ch0
diff --git a/audio/songs/heal.inc b/audio/songs/heal.asm
index cf765b1..9ea7368 100755
--- a/audio/songs/heal.inc
+++ b/audio/songs/heal.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song Heal", ROMX[$55f4], BANK[$3b]
+
 Song_Heal:: ; ed5f4 (3b:55f4)
 	db 2 << 6 | 0
 	dw Song_Heal_Ch0
diff --git a/audio/songs/leaderbattle.inc b/audio/songs/leaderbattle.asm
index 649a930..e013759 100755
--- a/audio/songs/leaderbattle.inc
+++ b/audio/songs/leaderbattle.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song LeaderBattle", ROMX[$4858], BANK[$3b]
+
 Song_LeaderBattle:: ; ec858 (3b:4858)
 	db 2 << 6 | 0
 	dw Song_LeaderBattle_Ch0
diff --git a/audio/songs/nidorinointro.inc b/audio/songs/nidorinointro.asm
index 44417f5..2124bc1 100755
--- a/audio/songs/nidorinointro.inc
+++ b/audio/songs/nidorinointro.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song NidorinoIntro", ROMX[$4000], BANK[$3b]
+
 Song_NidorinoIntro:: ; ec000 (3b:4000)
 	db 3 << 6 | 0
 	dw Song_NidorinoIntro_Ch0
diff --git a/audio/songs/none.inc b/audio/songs/none.asm
index ee0f781..746a1c9 100755
--- a/audio/songs/none.inc
+++ b/audio/songs/none.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song None", ROMX[$52ee], BANK[$3a]
+
 Song_None:: ; e92ee (3a:52ee)
 	db 3 << 6 | 0
 	dw Song_None_Ch0
diff --git a/audio/songs/oakintro.inc b/audio/songs/oakintro.asm
index 498be2e..e6d6bb4 100755
--- a/audio/songs/oakintro.inc
+++ b/audio/songs/oakintro.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song OakIntro", ROMX[$4685], BANK[$3b]
+
 Song_OakIntro:: ; ec685 (3b:4685)
 	db 3 << 6 | 0
 	dw Song_OakIntro_Ch0
diff --git a/audio/songs/route1.inc b/audio/songs/route1.asm
index 59f2e4e..0ad9311 100755
--- a/audio/songs/route1.inc
+++ b/audio/songs/route1.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song Route1", ROMX[$44c2], BANK[$3b]
+
 Song_Route1:: ; ec4c2 (3b:44c2)
 	db 3 << 6 | 0
 	dw Song_Route1_Ch0
diff --git a/audio/songs/spottedrocket.inc b/audio/songs/spottedrocket.asm
index bdc4250..aef6bb5 100755
--- a/audio/songs/spottedrocket.inc
+++ b/audio/songs/spottedrocket.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song SpottedRocket", ROMX[$5978], BANK[$3b]
+
 Song_SpottedRocket:: ; ed978 (3b:5978)
 	db 2 << 6 | 0
 	dw Song_SpottedRocket_Ch0
diff --git a/audio/songs/title.inc b/audio/songs/title.asm
index 488b6b4..087980d 100755
--- a/audio/songs/title.inc
+++ b/audio/songs/title.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song Title", ROMX[$62fe], BANK[$3c]
+
 Song_Title:: ; f22fe (3c:62fe)
 	db 3 << 6 | 0
 	dw Song_Title_Ch0
diff --git a/audio/songs/trainerbattle.inc b/audio/songs/trainerbattle.asm
index 1c6531c..a7e9a84 100755
--- a/audio/songs/trainerbattle.inc
+++ b/audio/songs/trainerbattle.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song TrainerBattle", ROMX[$4e31], BANK[$3b]
+
 Song_TrainerBattle:: ; ece31 (3b:4e31)
 	db 2 << 6 | 0
 	dw Song_TrainerBattle_Ch0
diff --git a/audio/songs/victorytrainer.inc b/audio/songs/victorytrainer.asm
index d6bc1de..3fe523e 100755
--- a/audio/songs/victorytrainer.inc
+++ b/audio/songs/victorytrainer.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song VictoryTrainer", ROMX[$59ea], BANK[$3b]
+
 Song_VictoryTrainer:: ; ed9ea (3b:59ea)
 	db 2 << 6 | 0
 	dw Song_VictoryTrainer_Ch0
diff --git a/audio/songs/viridiancity.inc b/audio/songs/viridiancity.asm
index 9b7ac96..4b3a35e 100755
--- a/audio/songs/viridiancity.inc
+++ b/audio/songs/viridiancity.asm
@@ -1,3 +1,7 @@
+INCLUDE "constants.asm"
+
+SECTION "Song ViridianCity", ROMX[$41b9], BANK[$3b]
+
 Song_ViridianCity:: ; ec1b9 (3b:41b9)
 	db 3 << 6 | 0
 	dw Song_ViridianCity_Ch0