Build a separate audio object.

7 files changed, 163 insertions, 135 deletions

diff --git a/Makefile b/Makefile
index 7457f521..212efd54 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ includes  := $(PYTHON) scan_includes.py
 
 
 rom_obj := \
+audio.o \
 data/text/common.o \
 data/pokemon/dex_entries.o \
 wram.o \
diff --git a/audio.asm b/audio.asm
new file mode 100644
index 00000000..2eb4ce97
--- /dev/null
+++ b/audio.asm
@@ -0,0 +1,139 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Audio", ROMX
+
+INCLUDE "audio/engine.asm"
+INCLUDE "data/trainers/encounter_music.asm"
+INCLUDE "audio/music_pointers.asm"
+INCLUDE "audio/music/nothing.asm"
+INCLUDE "audio/cry_pointers.asm"
+INCLUDE "audio/sfx_pointers.asm"
+
+
+SECTION "Songs 1", ROMX
+
+INCLUDE "audio/music/route36.asm"
+INCLUDE "audio/music/rivalbattle.asm"
+INCLUDE "audio/music/rocketbattle.asm"
+INCLUDE "audio/music/elmslab.asm"
+INCLUDE "audio/music/darkcave.asm"
+INCLUDE "audio/music/johtogymbattle.asm"
+INCLUDE "audio/music/championbattle.asm"
+INCLUDE "audio/music/ssaqua.asm"
+INCLUDE "audio/music/newbarktown.asm"
+INCLUDE "audio/music/goldenrodcity.asm"
+INCLUDE "audio/music/vermilioncity.asm"
+INCLUDE "audio/music/titlescreen.asm"
+INCLUDE "audio/music/ruinsofalphinterior.asm"
+INCLUDE "audio/music/lookpokemaniac.asm"
+INCLUDE "audio/music/trainervictory.asm"
+
+
+SECTION "Songs 2", ROMX
+
+INCLUDE "audio/music/route1.asm"
+INCLUDE "audio/music/route3.asm"
+INCLUDE "audio/music/route12.asm"
+INCLUDE "audio/music/kantogymbattle.asm"
+INCLUDE "audio/music/kantotrainerbattle.asm"
+INCLUDE "audio/music/kantowildbattle.asm"
+INCLUDE "audio/music/pokemoncenter.asm"
+INCLUDE "audio/music/looklass.asm"
+INCLUDE "audio/music/lookofficer.asm"
+INCLUDE "audio/music/route2.asm"
+INCLUDE "audio/music/mtmoon.asm"
+INCLUDE "audio/music/showmearound.asm"
+INCLUDE "audio/music/gamecorner.asm"
+INCLUDE "audio/music/bicycle.asm"
+INCLUDE "audio/music/looksage.asm"
+INCLUDE "audio/music/pokemonchannel.asm"
+INCLUDE "audio/music/lighthouse.asm"
+INCLUDE "audio/music/lakeofrage.asm"
+INCLUDE "audio/music/indigoplateau.asm"
+INCLUDE "audio/music/route37.asm"
+INCLUDE "audio/music/rockethideout.asm"
+INCLUDE "audio/music/dragonsden.asm"
+INCLUDE "audio/music/ruinsofalphradio.asm"
+INCLUDE "audio/music/lookbeauty.asm"
+INCLUDE "audio/music/route26.asm"
+INCLUDE "audio/music/ecruteakcity.asm"
+INCLUDE "audio/music/lakeofragerocketradio.asm"
+INCLUDE "audio/music/magnettrain.asm"
+INCLUDE "audio/music/lavendertown.asm"
+INCLUDE "audio/music/dancinghall.asm"
+INCLUDE "audio/music/contestresults.asm"
+INCLUDE "audio/music/route30.asm"
+
+
+SECTION "Songs 3", ROMX
+
+INCLUDE "audio/music/violetcity.asm"
+INCLUDE "audio/music/route29.asm"
+INCLUDE "audio/music/halloffame.asm"
+INCLUDE "audio/music/healpokemon.asm"
+INCLUDE "audio/music/evolution.asm"
+INCLUDE "audio/music/printer.asm"
+
+
+SECTION "Songs 4", ROMX
+
+INCLUDE "audio/music/viridiancity.asm"
+INCLUDE "audio/music/celadoncity.asm"
+INCLUDE "audio/music/wildpokemonvictory.asm"
+INCLUDE "audio/music/successfulcapture.asm"
+INCLUDE "audio/music/gymleadervictory.asm"
+INCLUDE "audio/music/mtmoonsquare.asm"
+INCLUDE "audio/music/gym.asm"
+INCLUDE "audio/music/pallettown.asm"
+INCLUDE "audio/music/profoakspokemontalk.asm"
+INCLUDE "audio/music/profoak.asm"
+INCLUDE "audio/music/lookrival.asm"
+INCLUDE "audio/music/aftertherivalfight.asm"
+INCLUDE "audio/music/surf.asm"
+INCLUDE "audio/music/nationalpark.asm"
+INCLUDE "audio/music/azaleatown.asm"
+INCLUDE "audio/music/cherrygrovecity.asm"
+INCLUDE "audio/music/unioncave.asm"
+INCLUDE "audio/music/johtowildbattle.asm"
+INCLUDE "audio/music/johtowildbattlenight.asm"
+INCLUDE "audio/music/johtotrainerbattle.asm"
+INCLUDE "audio/music/lookyoungster.asm"
+INCLUDE "audio/music/tintower.asm"
+INCLUDE "audio/music/sprouttower.asm"
+INCLUDE "audio/music/burnedtower.asm"
+INCLUDE "audio/music/mom.asm"
+INCLUDE "audio/music/victoryroad.asm"
+INCLUDE "audio/music/pokemonlullaby.asm"
+INCLUDE "audio/music/pokemonmarch.asm"
+INCLUDE "audio/music/goldsilveropening.asm"
+INCLUDE "audio/music/goldsilveropening2.asm"
+INCLUDE "audio/music/lookhiker.asm"
+INCLUDE "audio/music/lookrocket.asm"
+INCLUDE "audio/music/rockettheme.asm"
+INCLUDE "audio/music/mainmenu.asm"
+INCLUDE "audio/music/lookkimonogirl.asm"
+INCLUDE "audio/music/pokeflutechannel.asm"
+INCLUDE "audio/music/bugcatchingcontest.asm"
+
+
+SECTION "Extra Songs 1", ROMX
+
+INCLUDE "audio/music/credits.asm"
+
+
+SECTION "Extra Songs 2", ROMX
+
+INCLUDE "audio/music/postcredits.asm"
+
+
+SECTION "Sound Effects", ROMX
+
+INCLUDE "audio/sfx.asm"
+
+
+SECTION "Cries", ROMX
+
+INCLUDE "data/pokemon/cries.asm"
+
+INCLUDE "audio/cries.asm"
diff --git a/home/audio.asm b/home/audio.asm
index bf080550..8f3ec91c 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -110,10 +110,10 @@ PlayCry:: ; 3de4 (0:3de4)
 	push af
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(CryHeaders) ; $3c
+	ld a, BANK(PokemonCries)
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
-	ld hl, CryHeaders ; $6747
+	ld hl, PokemonCries
 	add hl, de
 	add hl, de
 	add hl, de
diff --git a/main.asm b/main.asm
index c62986f7..df97fd10 100644
--- a/main.asm
+++ b/main.asm
@@ -738,8 +738,6 @@ SECTION "bank7", ROMX, BANK[$7]
 LoadMapGroupRoof::
 	dr $1c000, $1f84c
 
-INCLUDE "audio/music/credits.asm"
-
 SECTION "bank8", ROMX, BANK[$8]
 	dr $20000, $23e3d
 
@@ -1386,8 +1384,6 @@ PlayBattleAnim::
 BattleAnimCommands::
 	dr $cc283, $cfce3
 
-INCLUDE "audio/music/postcredits.asm"
-
 SECTION "bank34", ROMX, BANK[$34]
 	dr $d0000, $d4000
 
@@ -1448,116 +1444,6 @@ GoldSilverIntro:
 	dr $e4af9, $e8000
 ENDC
 
-SECTION "bank3a", ROMX, BANK[$3a]
-INCLUDE "audio/engine.asm"
-INCLUDE "data/trainers/encounter_music.asm"
-INCLUDE "audio/music_pointers.asm"
-INCLUDE "audio/music/nothing.asm"
-INCLUDE "audio/cry_pointers.asm"
-INCLUDE "audio/sfx_pointers.asm"
-
-INCLUDE "audio/music/route36.asm"
-INCLUDE "audio/music/rivalbattle.asm"
-INCLUDE "audio/music/rocketbattle.asm"
-INCLUDE "audio/music/elmslab.asm"
-INCLUDE "audio/music/darkcave.asm"
-INCLUDE "audio/music/johtogymbattle.asm"
-INCLUDE "audio/music/championbattle.asm"
-INCLUDE "audio/music/ssaqua.asm"
-INCLUDE "audio/music/newbarktown.asm"
-INCLUDE "audio/music/goldenrodcity.asm"
-INCLUDE "audio/music/vermilioncity.asm"
-INCLUDE "audio/music/titlescreen.asm"
-INCLUDE "audio/music/ruinsofalphinterior.asm"
-INCLUDE "audio/music/lookpokemaniac.asm"
-INCLUDE "audio/music/trainervictory.asm"
-
-SECTION "bank3b", ROMX, BANK[$3b]
-INCLUDE "audio/music/route1.asm"
-INCLUDE "audio/music/route3.asm"
-INCLUDE "audio/music/route12.asm"
-INCLUDE "audio/music/kantogymbattle.asm"
-INCLUDE "audio/music/kantotrainerbattle.asm"
-INCLUDE "audio/music/kantowildbattle.asm"
-INCLUDE "audio/music/pokemoncenter.asm"
-INCLUDE "audio/music/looklass.asm"
-INCLUDE "audio/music/lookofficer.asm"
-INCLUDE "audio/music/route2.asm"
-INCLUDE "audio/music/mtmoon.asm"
-INCLUDE "audio/music/showmearound.asm"
-INCLUDE "audio/music/gamecorner.asm"
-INCLUDE "audio/music/bicycle.asm"
-INCLUDE "audio/music/looksage.asm"
-INCLUDE "audio/music/pokemonchannel.asm"
-INCLUDE "audio/music/lighthouse.asm"
-INCLUDE "audio/music/lakeofrage.asm"
-INCLUDE "audio/music/indigoplateau.asm"
-INCLUDE "audio/music/route37.asm"
-INCLUDE "audio/music/rockethideout.asm"
-INCLUDE "audio/music/dragonsden.asm"
-INCLUDE "audio/music/ruinsofalphradio.asm"
-INCLUDE "audio/music/lookbeauty.asm"
-INCLUDE "audio/music/route26.asm"
-INCLUDE "audio/music/ecruteakcity.asm"
-INCLUDE "audio/music/lakeofragerocketradio.asm"
-INCLUDE "audio/music/magnettrain.asm"
-INCLUDE "audio/music/lavendertown.asm"
-INCLUDE "audio/music/dancinghall.asm"
-INCLUDE "audio/music/contestresults.asm"
-INCLUDE "audio/music/route30.asm"
-
-SECTION "bank3c", ROMX, BANK[$3c]
-INCLUDE "audio/music/violetcity.asm"
-INCLUDE "audio/music/route29.asm"
-INCLUDE "audio/music/halloffame.asm"
-INCLUDE "audio/music/healpokemon.asm"
-INCLUDE "audio/music/evolution.asm"
-INCLUDE "audio/music/printer.asm"
-
-INCLUDE "audio/sfx.asm"
-CryHeaders::
-INCLUDE "data/pokemon/cries.asm"
-INCLUDE "audio/cries.asm"
-
-SECTION "bank3d", ROMX, BANK[$3d]
-INCLUDE "audio/music/viridiancity.asm"
-INCLUDE "audio/music/celadoncity.asm"
-INCLUDE "audio/music/wildpokemonvictory.asm"
-INCLUDE "audio/music/successfulcapture.asm"
-INCLUDE "audio/music/gymleadervictory.asm"
-INCLUDE "audio/music/mtmoonsquare.asm"
-INCLUDE "audio/music/gym.asm"
-INCLUDE "audio/music/pallettown.asm"
-INCLUDE "audio/music/profoakspokemontalk.asm"
-INCLUDE "audio/music/profoak.asm"
-INCLUDE "audio/music/lookrival.asm"
-INCLUDE "audio/music/aftertherivalfight.asm"
-INCLUDE "audio/music/surf.asm"
-INCLUDE "audio/music/nationalpark.asm"
-INCLUDE "audio/music/azaleatown.asm"
-INCLUDE "audio/music/cherrygrovecity.asm"
-INCLUDE "audio/music/unioncave.asm"
-INCLUDE "audio/music/johtowildbattle.asm"
-INCLUDE "audio/music/johtowildbattlenight.asm"
-INCLUDE "audio/music/johtotrainerbattle.asm"
-INCLUDE "audio/music/lookyoungster.asm"
-INCLUDE "audio/music/tintower.asm"
-INCLUDE "audio/music/sprouttower.asm"
-INCLUDE "audio/music/burnedtower.asm"
-INCLUDE "audio/music/mom.asm"
-INCLUDE "audio/music/victoryroad.asm"
-INCLUDE "audio/music/pokemonlullaby.asm"
-INCLUDE "audio/music/pokemonmarch.asm"
-INCLUDE "audio/music/goldsilveropening.asm"
-INCLUDE "audio/music/goldsilveropening2.asm"
-INCLUDE "audio/music/lookhiker.asm"
-INCLUDE "audio/music/lookrocket.asm"
-INCLUDE "audio/music/rockettheme.asm"
-INCLUDE "audio/music/mainmenu.asm"
-INCLUDE "audio/music/lookkimonogirl.asm"
-INCLUDE "audio/music/pokeflutechannel.asm"
-INCLUDE "audio/music/bugcatchingcontest.asm"
-
 SECTION "bank3e", ROMX, BANK[$3e]
 Functionf8000::
 	dr $f8000, $f800c
diff --git a/pokegold.link b/pokegold.link
index f2dddc6d..6fc903c1 100644
--- a/pokegold.link
+++ b/pokegold.link
@@ -48,6 +48,7 @@ ROMX $06
 ROMX $07
 	org $4000
 	"bank7"
+	"Extra Songs 1"
 ROMX $08
 	org $4000
 	"bank8"
@@ -175,6 +176,7 @@ ROMX $32
 ROMX $33
 	org $4000
 	"bank33"
+	"Extra Songs 2"
 ROMX $34
 	org $4000
 	"bank34"
@@ -193,17 +195,16 @@ ROMX $39
 	org $4000
 	"bank39"
 ROMX $3a
-	org $4000
-	"bank3a"
+	"Audio"
+	"Songs 1"
 ROMX $3b
-	org $4000
-	"bank3b"
+	"Songs 2"
 ROMX $3c
-	org $4000
-	"bank3c"
+	"Songs 3"
+	"Sound Effects"
+	"Cries"
 ROMX $3d
-	org $4000
-	"bank3d"
+	"Songs 4"
 ROMX $3e
 	org $4000
 	"bank3e"
@@ -356,7 +357,7 @@ ROMX $7f
 	"bank7f"
 WRAM0
 	org $c000
-	"Audio"
+	"Audio RAM"
 	"WRAM"
 	"GBC Palettes"
 	"OAM Buffer"
diff --git a/pokesilver.link b/pokesilver.link
index f2dddc6d..6fc903c1 100644
--- a/pokesilver.link
+++ b/pokesilver.link
@@ -48,6 +48,7 @@ ROMX $06
 ROMX $07
 	org $4000
 	"bank7"
+	"Extra Songs 1"
 ROMX $08
 	org $4000
 	"bank8"
@@ -175,6 +176,7 @@ ROMX $32
 ROMX $33
 	org $4000
 	"bank33"
+	"Extra Songs 2"
 ROMX $34
 	org $4000
 	"bank34"
@@ -193,17 +195,16 @@ ROMX $39
 	org $4000
 	"bank39"
 ROMX $3a
-	org $4000
-	"bank3a"
+	"Audio"
+	"Songs 1"
 ROMX $3b
-	org $4000
-	"bank3b"
+	"Songs 2"
 ROMX $3c
-	org $4000
-	"bank3c"
+	"Songs 3"
+	"Sound Effects"
+	"Cries"
 ROMX $3d
-	org $4000
-	"bank3d"
+	"Songs 4"
 ROMX $3e
 	org $4000
 	"bank3e"
@@ -356,7 +357,7 @@ ROMX $7f
 	"bank7f"
 WRAM0
 	org $c000
-	"Audio"
+	"Audio RAM"
 	"WRAM"
 	"GBC Palettes"
 	"OAM Buffer"
diff --git a/wram.asm b/wram.asm
index 4ff882e2..02012ed9 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,7 +1,7 @@
 INCLUDE "includes.asm"
 INCLUDE "macros/wram.asm"
 
-SECTION "Audio", WRAM0
+SECTION "Audio RAM", WRAM0
 wc000::
 wMusic::
 wMusicPlaying:: ; c000