Finish splitting all of the music

pret · Apr 28, 2019 · 4b39f99 · 4b39f99
1 parent 69dc44a
commit 4b39f99
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 24 deletions.
diff --git a/audio.asm b/audio.asm
@@ -1,13 +1,5 @@
 INCLUDE "constants.asm"
-
-SECTION "_MapSetup_Sound_Off - SFX", 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"
-
 INCLUDE "audio/music/route36.asm"
 INCLUDE "audio/music/rivalbattle.asm"
 INCLUDE "audio/music/rocketbattle.asm"
@@ -63,32 +55,23 @@ INCLUDE "audio/music/evolution.asm"
 INCLUDE "audio/music/printer.asm"
 INCLUDE "audio/music/viridiancity.asm"
 INCLUDE "audio/music/celadoncity.asm"
-
-SECTION "Music_WildPokemonVictory - Music_SuccessfulCapture_Ch3", ROMX
 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"
-
-SECTION "Music_LookRival - Music_AfterTheRivalFight_Ch4", ROMX
 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"
-
-SECTION "Music_JohtoWildBattle - Music_JohtoWildBattleNight_Ch3", ROMX
 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"
@@ -101,11 +84,8 @@ INCLUDE "audio/music/pokemonmarch.asm"
 INCLUDE "audio/music/goldsilveropening.asm"
 INCLUDE "audio/music/goldsilveropening2.asm"
 INCLUDE "audio/music/lookhiker.asm"
-
-SECTION "Music_LookRocket - Music_RocketTheme_branch_f78de", ROMX
 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"

diff --git a/audio/engine.asm b/audio/engine.asm
@@ -6,6 +6,9 @@
 ; 	FadeMusic
 ; 	PlayStereoSFX
 
+
+SECTION "_MapSetup_Sound_Off - SFX", ROMX
+
 _MapSetup_Sound_Off::
 ; restart sound operation
 ; clear all relevant hardware registers & wram
@@ -2848,3 +2851,13 @@ PlayTrainerEncounterMusic::
 	ld e, [hl]
 	call PlayMusic
 	ret
+
+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"
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm
@@ -1,3 +1,6 @@
+; FLOAT: Must be in the same bank as "Music_LookRival"
+SECTION "Music_AfterTheRivalFight", ROMX, BANK[$3d]
+
 Music_AfterTheRivalFight:
 	musicheader 4, 1, Music_AfterTheRivalFight_Ch1
 	musicheader 1, 2, Music_AfterTheRivalFight_Ch2

diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm
@@ -1,3 +1,6 @@
+; FLOAT: Referred to by "Music_JohtoWildBattleNight"
+SECTION "Music_JohtoWildBattle", ROMX, BANK[$3d]
+
 Music_JohtoWildBattle:
 	musicheader 3, 1, Music_JohtoWildBattle_Ch1
 	musicheader 1, 2, Music_JohtoWildBattle_Ch2

diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm
@@ -1,3 +1,6 @@
+; FLOAT: Must be in the same bank as "Music_JohtoWildBattle"
+SECTION "Music_JohtoWildBattleNight", ROMX, BANK[$3d]
+
 Music_JohtoWildBattleNight:
 	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
 	musicheader 1, 2, Music_JohtoWildBattleNight_Ch2

diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm
@@ -1,3 +1,6 @@
+; FLOAT: Referred to by "Music_AfterTheRivalFight"
+SECTION "Music_LookRival", ROMX, BANK[$3d]
+
 Music_LookRival:
 	musicheader 4, 1, Music_LookRival_Ch1
 	musicheader 1, 2, Music_LookRival_Ch2

diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm
@@ -1,3 +1,6 @@
+; FLOAT: Referred to by "Music_RocketTheme"
+SECTION "Music_LookRocket", ROMX, BANK[$3d]
+
 Music_LookRocket:
 	musicheader 4, 1, Music_LookRocket_Ch1
 	musicheader 1, 2, Music_LookRocket_Ch2

diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm
@@ -1,3 +1,6 @@
+; FLOAT: Must be in the same bank as "Music_LookRocket"
+SECTION "Music_RocketTheme", ROMX, BANK[$3d]
+
 Music_RocketTheme:
 	musicheader 4, 1, Music_RocketTheme_Ch1
 	musicheader 1, 2, Music_RocketTheme_Ch2

diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm
@@ -1,3 +1,6 @@
+; FLOAT: Must be in the same bank as "Music_WildPokemonVictory"
+SECTION "Music_SuccessfulCapture", ROMX, BANK[$3d]
+
 Music_SuccessfulCapture:
 	musicheader 3, 1, Music_SuccessfulCapture_Ch1
 	musicheader 1, 2, Music_SuccessfulCapture_Ch2

diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm
@@ -1,3 +1,6 @@
+; FLOAT: Referred to by "Music_SuccessfulCapture"
+SECTION "Music_WildPokemonVictory", ROMX, BANK[$3d]
+
 Music_WildPokemonVictory:
 	musicheader 3, 1, Music_WildPokemonVictory_Ch1
 	musicheader 1, 2, Music_WildPokemonVictory_Ch2

diff --git a/pokecrystal.link b/pokecrystal.link
@@ -1012,20 +1012,23 @@ ROMX $3c
 ROMX $3d
 	"Music_ViridianCity" ; audio/music/ViridianCity.asm
 	"Music_CeladonCity" ; audio/music/CeladonCity.asm
-	"Music_WildPokemonVictory - Music_SuccessfulCapture_Ch3" ; audio.asm
+	"Music_WildPokemonVictory" ; audio/music/WildPokemonVictory.asm
+	"Music_SuccessfulCapture" ; audio/music/SuccessfulCapture.asm
 	"Music_GymLeaderVictory" ; audio/music/GymLeaderVictory.asm
 	"Music_MtMoonSquare" ; audio/music/MtMoonSquare.asm
 	"Music_Gym" ; audio/music/Gym.asm
 	"Music_PalletTown" ; audio/music/PalletTown.asm
 	"Music_ProfOaksPokemonTalk" ; audio/music/ProfOaksPokemonTalk.asm
 	"Music_ProfOak" ; audio/music/ProfOak.asm
-	"Music_LookRival - Music_AfterTheRivalFight_Ch4" ; audio.asm
+	"Music_LookRival" ; audio/music/LookRival.asm
+	"Music_AfterTheRivalFight" ; audio/music/AfterTheRivalFight.asm
 	"Music_Surf" ; audio/music/Surf.asm
 	"Music_NationalPark" ; audio/music/NationalPark.asm
 	"Music_AzaleaTown" ; audio/music/AzaleaTown.asm
 	"Music_CherrygroveCity" ; audio/music/CherrygroveCity.asm
 	"Music_UnionCave" ; audio/music/UnionCave.asm
-	"Music_JohtoWildBattle - Music_JohtoWildBattleNight_Ch3" ; audio.asm
+	"Music_JohtoWildBattle" ; audio/music/JohtoWildBattle.asm
+	"Music_JohtoWildBattleNight" ; audio/music/JohtoWildBattleNight.asm
 	"Music_JohtoTrainerBattle" ; audio/music/JohtoTrainerBattle.asm
 	"Music_LookYoungster" ; audio/music/LookYoungster.asm
 	"Music_TinTower" ; audio/music/TinTower.asm
@@ -1038,7 +1041,8 @@ ROMX $3d
 	"Music_GoldSilverOpening" ; audio/music/GoldSilverOpening.asm
 	"Music_GoldSilverOpening2" ; audio/music/GoldSilverOpening2.asm
 	"Music_LookHiker" ; audio/music/LookHiker.asm
-	"Music_LookRocket - Music_RocketTheme_branch_f78de" ; audio.asm
+	"Music_LookRocket" ; audio/music/LookRocket.asm
+	"Music_RocketTheme" ; audio/music/RocketTheme.asm
 	"Music_MainMenu" ; audio/music/MainMenu.asm
 	"Music_LookKimonoGirl" ; audio/music/LookKimonoGirl.asm
 	"Music_PokeFluteChannel" ; audio/music/PokeFluteChannel.asm