new and updated music macros

2024-11-16 11:27:33 -08:00 · 2015-12-07 11:28:58 -05:00 · 2015-12-07 11:28:58 -05:00 · 159d3efc8f
commit 159d3efc8f
parent 02d05255fe
118 changed files with 3314 additions and 3200 deletions
--- a/audio/cries.asm
+++ b/audio/cries.asm
--- a/audio/engine.asm
+++ b/audio/engine.asm
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@ -1,8 +1,8 @@
 Music_AfterTheRivalFight: ; f5127
-	dbw $c0, Music_AfterTheRivalFight_Ch1
-	dbw $01, Music_AfterTheRivalFight_Ch2
-	dbw $02, Music_AfterTheRivalFight_Ch3
-	dbw $03, Music_AfterTheRivalFight_Ch4
+	musicheader 4, 1, Music_AfterTheRivalFight_Ch1
+	musicheader 1, 2, Music_AfterTheRivalFight_Ch2
+	musicheader 1, 3, Music_AfterTheRivalFight_Ch3
+	musicheader 1, 4, Music_AfterTheRivalFight_Ch4
 ; f5133

 Music_AfterTheRivalFight_Ch1: ; f5133
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@ -1,8 +1,8 @@
 Music_AzaleaTown: ; f57e8
-	dbw $c0, Music_AzaleaTown_Ch1
-	dbw $01, Music_AzaleaTown_Ch2
-	dbw $02, Music_AzaleaTown_Ch3
-	dbw $03, Music_AzaleaTown_Ch4
+	musicheader 4, 1, Music_AzaleaTown_Ch1
+	musicheader 1, 2, Music_AzaleaTown_Ch2
+	musicheader 1, 3, Music_AzaleaTown_Ch3
+	musicheader 1, 4, Music_AzaleaTown_Ch4
 ; f57f4

 Music_AzaleaTown_Ch1: ; f57f4
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@ -1,8 +1,8 @@
 Music_BattleTowerLobby: ; 17948b
-	dbw $c0, Music_BattleTowerLobby_Ch1
-	dbw $01, Music_BattleTowerLobby_Ch2
-	dbw $02, Music_BattleTowerLobby_Ch3
-	dbw $03, Music_BattleTowerLobby_Ch4
+	musicheader 4, 1, Music_BattleTowerLobby_Ch1
+	musicheader 1, 2, Music_BattleTowerLobby_Ch2
+	musicheader 1, 3, Music_BattleTowerLobby_Ch3
+	musicheader 1, 4, Music_BattleTowerLobby_Ch4
 ; 179497

 Music_BattleTowerLobby_Ch1: ; 179497
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@ -1,8 +1,8 @@
 Music_BattleTowerTheme: ; 178889
-	dbw $c0, Music_BattleTowerTheme_Ch1
-	dbw $01, Music_BattleTowerTheme_Ch2
-	dbw $02, Music_BattleTowerTheme_Ch3
-	dbw $03, Music_BattleTowerTheme_Ch4
+	musicheader 4, 1, Music_BattleTowerTheme_Ch1
+	musicheader 1, 2, Music_BattleTowerTheme_Ch2
+	musicheader 1, 3, Music_BattleTowerTheme_Ch3
+	musicheader 1, 4, Music_BattleTowerTheme_Ch4
 ; 178895

 Music_BattleTowerTheme_Ch1: ; 178895
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@ -1,8 +1,8 @@
 Music_Bicycle: ; ee119
-	dbw $c0, Music_Bicycle_Ch1
-	dbw $01, Music_Bicycle_Ch2
-	dbw $02, Music_Bicycle_Ch3
-	dbw $03, Music_Bicycle_Ch4
+	musicheader 4, 1, Music_Bicycle_Ch1
+	musicheader 1, 2, Music_Bicycle_Ch2
+	musicheader 1, 3, Music_Bicycle_Ch3
+	musicheader 1, 4, Music_Bicycle_Ch4
 ; ee125

 Music_Bicycle_Ch1: ; ee125
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@ -1,8 +1,8 @@
 Music_BuenasPassword: ; 178153
-	dbw $c0, Music_BuenasPassword_Ch1
-	dbw $01, Music_BuenasPassword_Ch2
-	dbw $02, Music_BuenasPassword_Ch3
-	dbw $03, Music_BuenasPassword_Ch4
+	musicheader 4, 1, Music_BuenasPassword_Ch1
+	musicheader 1, 2, Music_BuenasPassword_Ch2
+	musicheader 1, 3, Music_BuenasPassword_Ch3
+	musicheader 1, 4, Music_BuenasPassword_Ch4
 ; 17815f

 Music_BuenasPassword_Ch1: ; 17815f
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@ -1,8 +1,8 @@
 Music_BugCatchingContest: ; f7c16
-	dbw $c0, Music_BugCatchingContest_Ch1
-	dbw $01, Music_BugCatchingContest_Ch2
-	dbw $02, Music_BugCatchingContest_Ch3
-	dbw $03, Music_BugCatchingContest_Ch4
+	musicheader 4, 1, Music_BugCatchingContest_Ch1
+	musicheader 1, 2, Music_BugCatchingContest_Ch2
+	musicheader 1, 3, Music_BugCatchingContest_Ch3
+	musicheader 1, 4, Music_BugCatchingContest_Ch4
 ; f7c22

 Music_BugCatchingContest_Ch1: ; f7c22
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@ -1,8 +1,8 @@
 Music_BurnedTower: ; f6a99
-	dbw $c0, Music_BurnedTower_Ch1
-	dbw $01, Music_BurnedTower_Ch2
-	dbw $02, Music_BurnedTower_Ch3
-	dbw $03, Music_BurnedTower_Ch4
+	musicheader 4, 1, Music_BurnedTower_Ch1
+	musicheader 1, 2, Music_BurnedTower_Ch2
+	musicheader 1, 3, Music_BurnedTower_Ch3
+	musicheader 1, 4, Music_BurnedTower_Ch4
 ; f6aa5

 Music_BurnedTower_Ch1: ; f6aa5
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@ -1,7 +1,7 @@
 Music_CeladonCity: ; f435b
-	dbw $80, Music_CeladonCity_Ch1
-	dbw $01, Music_CeladonCity_Ch2
-	dbw $02, Music_CeladonCity_Ch3
+	musicheader 3, 1, Music_CeladonCity_Ch1
+	musicheader 1, 2, Music_CeladonCity_Ch2
+	musicheader 1, 3, Music_CeladonCity_Ch3
 ; f4364

 Music_CeladonCity_Ch1: ; f4364
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@ -1,7 +1,7 @@
 Music_ChampionBattle: ; ea9c1
-	dbw $80, Music_ChampionBattle_Ch1
-	dbw $01, Music_ChampionBattle_Ch2
-	dbw $02, Music_ChampionBattle_Ch3
+	musicheader 3, 1, Music_ChampionBattle_Ch1
+	musicheader 1, 2, Music_ChampionBattle_Ch2
+	musicheader 1, 3, Music_ChampionBattle_Ch3
 ; ea9ca

 Music_ChampionBattle_Ch1: ; ea9ca
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@ -1,8 +1,8 @@
 Music_CherrygroveCity: ; f5b03
-	dbw $c0, Music_CherrygroveCity_Ch1
-	dbw $01, Music_CherrygroveCity_Ch2
-	dbw $02, Music_CherrygroveCity_Ch3
-	dbw $03, Music_CherrygroveCity_Ch4
+	musicheader 4, 1, Music_CherrygroveCity_Ch1
+	musicheader 1, 2, Music_CherrygroveCity_Ch2
+	musicheader 1, 3, Music_CherrygroveCity_Ch3
+	musicheader 1, 4, Music_CherrygroveCity_Ch4
 ; f5b0f

 Music_CherrygroveCity_Ch1: ; f5b0f
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@ -1,8 +1,8 @@
 Music_Clair: ; 1fa8d
-	dbw $c0, Music_Clair_Ch1
-	dbw $01, Music_Clair_Ch2
-	dbw $02, Music_Clair_Ch3
-	dbw $03, Music_Clair_Ch4
+	musicheader 4, 1, Music_Clair_Ch1
+	musicheader 1, 2, Music_Clair_Ch2
+	musicheader 1, 3, Music_Clair_Ch3
+	musicheader 1, 4, Music_Clair_Ch4
 ; 1fa99

 Music_Clair_Ch1: ; 1fa99
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@ -1,8 +1,8 @@
 Music_ContestResults: ; efb3e
-	dbw $c0, Music_ContestResults_Ch1
-	dbw $01, Music_ContestResults_Ch2
-	dbw $02, Music_ContestResults_Ch3
-	dbw $03, Music_ContestResults_Ch4
+	musicheader 4, 1, Music_ContestResults_Ch1
+	musicheader 1, 2, Music_ContestResults_Ch2
+	musicheader 1, 3, Music_ContestResults_Ch3
+	musicheader 1, 4, Music_ContestResults_Ch4
 ; efb4a

 Music_ContestResults_Ch1: ; efb4a
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@ -1,8 +1,8 @@
 Music_Credits: ; 1f31c
-	dbw $c0, Music_Credits_Ch1
-	dbw $01, Music_Credits_Ch2
-	dbw $02, Music_Credits_Ch3
-	dbw $03, Music_Credits_Ch4
+	musicheader 4, 1, Music_Credits_Ch1
+	musicheader 1, 2, Music_Credits_Ch2
+	musicheader 1, 3, Music_Credits_Ch3
+	musicheader 1, 4, Music_Credits_Ch4
 ; 1f328

 Music_Credits_Ch1: ; 1f328
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@ -1,8 +1,8 @@
 Music_CrystalOpening: ; 1786e8
-	dbw $c0, Music_CrystalOpening_Ch1
-	dbw $01, Music_CrystalOpening_Ch2
-	dbw $02, Music_CrystalOpening_Ch3
-	dbw $03, Music_CrystalOpening_Ch4
+	musicheader 4, 1, Music_CrystalOpening_Ch1
+	musicheader 1, 2, Music_CrystalOpening_Ch2
+	musicheader 1, 3, Music_CrystalOpening_Ch3
+	musicheader 1, 4, Music_CrystalOpening_Ch4
 ; 1786f4

 Music_CrystalOpening_Ch1: ; 1786f4
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@ -1,7 +1,7 @@
 Music_DancingHall: ; ef9bc
-	dbw $80, Music_DancingHall_Ch1
-	dbw $01, Music_DancingHall_Ch2
-	dbw $02, Music_DancingHall_Ch3
+	musicheader 3, 1, Music_DancingHall_Ch1
+	musicheader 1, 2, Music_DancingHall_Ch2
+	musicheader 1, 3, Music_DancingHall_Ch3
 ; ef9c5

 	db $3
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@ -1,8 +1,8 @@
 Music_DarkCave: ; ea2be
-	dbw $c0, Music_DarkCave_Ch1
-	dbw $01, Music_DarkCave_Ch2
-	dbw $02, Music_DarkCave_Ch3
-	dbw $03, Music_DarkCave_Ch4
+	musicheader 4, 1, Music_DarkCave_Ch1
+	musicheader 1, 2, Music_DarkCave_Ch2
+	musicheader 1, 3, Music_DarkCave_Ch3
+	musicheader 1, 4, Music_DarkCave_Ch4
 ; ea2ca

 Music_DarkCave_Ch1: ; ea2ca
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@ -1,8 +1,8 @@
 Music_DragonsDen: ; eece8
-	dbw $c0, Music_DragonsDen_Ch1
-	dbw $01, Music_DragonsDen_Ch2
-	dbw $02, Music_DragonsDen_Ch3
-	dbw $03, Music_DragonsDen_Ch4
+	musicheader 4, 1, Music_DragonsDen_Ch1
+	musicheader 1, 2, Music_DragonsDen_Ch2
+	musicheader 1, 3, Music_DragonsDen_Ch3
+	musicheader 1, 4, Music_DragonsDen_Ch4
 ; eecf4

 Music_DragonsDen_Ch1: ; eecf4
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@ -1,7 +1,7 @@
 Music_EcruteakCity: ; ef2d0
-	dbw $80, Music_EcruteakCity_Ch1
-	dbw $01, Music_EcruteakCity_Ch2
-	dbw $02, Music_EcruteakCity_Ch3
+	musicheader 3, 1, Music_EcruteakCity_Ch1
+	musicheader 1, 2, Music_EcruteakCity_Ch2
+	musicheader 1, 3, Music_EcruteakCity_Ch3
 ; ef2d9

 Music_EcruteakCity_Ch1: ; ef2d9
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@ -1,8 +1,8 @@
 Music_ElmsLab: ; ea040
-	dbw $c0, Music_ElmsLab_Ch1
-	dbw $01, Music_ElmsLab_Ch2
-	dbw $02, Music_ElmsLab_Ch3
-	dbw $03, Music_ElmsLab_Ch4
+	musicheader 4, 1, Music_ElmsLab_Ch1
+	musicheader 1, 2, Music_ElmsLab_Ch2
+	musicheader 1, 3, Music_ElmsLab_Ch3
+	musicheader 1, 4, Music_ElmsLab_Ch4
 ; ea04c

 Music_ElmsLab_Ch1: ; ea04c
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@ -1,8 +1,8 @@
 Music_Evolution: ; f06e1
-	dbw $c0, Music_Evolution_Ch1
-	dbw $01, Music_Evolution_Ch2
-	dbw $02, Music_Evolution_Ch3
-	dbw $03, Music_Evolution_Ch4
+	musicheader 4, 1, Music_Evolution_Ch1
+	musicheader 1, 2, Music_Evolution_Ch2
+	musicheader 1, 3, Music_Evolution_Ch3
+	musicheader 1, 4, Music_Evolution_Ch4
 ; f06ed

 Music_Evolution_Ch1: ; f06ed
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@ -1,8 +1,8 @@
 Music_GameCorner: ; edd6d
-	dbw $c0, Music_GameCorner_Ch1
-	dbw $01, Music_GameCorner_Ch2
-	dbw $02, Music_GameCorner_Ch3
-	dbw $03, Music_GameCorner_Ch4
+	musicheader 4, 1, Music_GameCorner_Ch1
+	musicheader 1, 2, Music_GameCorner_Ch2
+	musicheader 1, 3, Music_GameCorner_Ch3
+	musicheader 1, 4, Music_GameCorner_Ch4
 ; edd79

 Music_GameCorner_Ch1: ; edd79
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@ -1,8 +1,8 @@
 Music_GoldenrodCity: ; eb453
-	dbw $c0, Music_GoldenrodCity_Ch1
-	dbw $01, Music_GoldenrodCity_Ch2
-	dbw $02, Music_GoldenrodCity_Ch3
-	dbw $03, Music_GoldenrodCity_Ch4
+	musicheader 4, 1, Music_GoldenrodCity_Ch1
+	musicheader 1, 2, Music_GoldenrodCity_Ch2
+	musicheader 1, 3, Music_GoldenrodCity_Ch3
+	musicheader 1, 4, Music_GoldenrodCity_Ch4
 ; eb45f

 Music_GoldenrodCity_Ch1: ; eb45f
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@ -1,7 +1,7 @@
 Music_GoldSilverOpening: ; f7055
-	dbw $80, Music_GoldSilverOpening_Ch1
-	dbw $01, Music_GoldSilverOpening_Ch2
-	dbw $02, Music_GoldSilverOpening_Ch3
+	musicheader 3, 1, Music_GoldSilverOpening_Ch1
+	musicheader 1, 2, Music_GoldSilverOpening_Ch2
+	musicheader 1, 3, Music_GoldSilverOpening_Ch3
 ; f705e

 Music_GoldSilverOpening_Ch1: ; f705e
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@ -1,8 +1,8 @@
 Music_GoldSilverOpening2: ; f7308
-	dbw $c0, Music_GoldSilverOpening2_Ch1
-	dbw $01, Music_GoldSilverOpening2_Ch2
-	dbw $02, Music_GoldSilverOpening2_Ch3
-	dbw $03, Music_GoldSilverOpening2_Ch4
+	musicheader 4, 1, Music_GoldSilverOpening2_Ch1
+	musicheader 1, 2, Music_GoldSilverOpening2_Ch2
+	musicheader 1, 3, Music_GoldSilverOpening2_Ch3
+	musicheader 1, 4, Music_GoldSilverOpening2_Ch4
 ; f7314

 Music_GoldSilverOpening2_Ch1: ; f7314
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@ -1,8 +1,8 @@
 Music_Gym: ; f48ae
-	dbw $c0, Music_Gym_Ch1
-	dbw $01, Music_Gym_Ch2
-	dbw $02, Music_Gym_Ch3
-	dbw $03, Music_Gym_Ch4
+	musicheader 4, 1, Music_Gym_Ch1
+	musicheader 1, 2, Music_Gym_Ch2
+	musicheader 1, 3, Music_Gym_Ch3
+	musicheader 1, 4, Music_Gym_Ch4
 ; f48ba

 Music_Gym_Ch1: ; f48ba
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@ -1,8 +1,8 @@
 Music_GymLeaderVictory: ; f462c
-	dbw $c0, Music_GymLeaderVictory_Ch1
-	dbw $01, Music_GymLeaderVictory_Ch2
-	dbw $02, Music_GymLeaderVictory_Ch3
-	dbw $03, Music_GymLeaderVictory_Ch4
+	musicheader 4, 1, Music_GymLeaderVictory_Ch1
+	musicheader 1, 2, Music_GymLeaderVictory_Ch2
+	musicheader 1, 3, Music_GymLeaderVictory_Ch3
+	musicheader 1, 4, Music_GymLeaderVictory_Ch4
 ; f4638

 Music_GymLeaderVictory_Ch1: ; f4638
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@ -1,8 +1,8 @@
 Music_HallOfFame: ; f05bf
-	dbw $c0, Music_HallOfFame_Ch1
-	dbw $01, Music_HallOfFame_Ch2
-	dbw $02, Music_HallOfFame_Ch3
-	dbw $03, Music_HallOfFame_Ch4
+	musicheader 4, 1, Music_HallOfFame_Ch1
+	musicheader 1, 2, Music_HallOfFame_Ch2
+	musicheader 1, 3, Music_HallOfFame_Ch3
+	musicheader 1, 4, Music_HallOfFame_Ch4
 ; f05cb

 Music_HallOfFame_Ch1: ; f05cb
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@ -1,7 +1,7 @@
 Music_HealPokemon: ; f0697
-	dbw $80, Music_HealPokemon_Ch1
-	dbw $01, Music_HealPokemon_Ch2
-	dbw $02, Music_HealPokemon_Ch3
+	musicheader 3, 1, Music_HealPokemon_Ch1
+	musicheader 1, 2, Music_HealPokemon_Ch2
+	musicheader 1, 3, Music_HealPokemon_Ch3
 ; f06a0

 Music_HealPokemon_Ch1: ; f06a0
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@ -1,8 +1,8 @@
 Music_IndigoPlateau: ; ee852
-	dbw $c0, Music_IndigoPlateau_Ch1
-	dbw $01, Music_IndigoPlateau_Ch2
-	dbw $02, Music_IndigoPlateau_Ch3
-	dbw $03, Music_IndigoPlateau_Ch4
+	musicheader 4, 1, Music_IndigoPlateau_Ch1
+	musicheader 1, 2, Music_IndigoPlateau_Ch2
+	musicheader 1, 3, Music_IndigoPlateau_Ch3
+	musicheader 1, 4, Music_IndigoPlateau_Ch4
 ; ee85e

 Music_IndigoPlateau_Ch1: ; ee85e
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@ -1,7 +1,7 @@
 Music_JohtoGymBattle: ; ea50d
-	dbw $80, Music_JohtoGymBattle_Ch1
-	dbw $01, Music_JohtoGymBattle_Ch2
-	dbw $02, Music_JohtoGymBattle_Ch3
+	musicheader 3, 1, Music_JohtoGymBattle_Ch1
+	musicheader 1, 2, Music_JohtoGymBattle_Ch2
+	musicheader 1, 3, Music_JohtoGymBattle_Ch3
 ; ea516

 Music_JohtoGymBattle_Ch1: ; ea516
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@ -1,7 +1,7 @@
 Music_JohtoTrainerBattle: ; f6096
-	dbw $80, Music_JohtoTrainerBattle_Ch1
-	dbw $01, Music_JohtoTrainerBattle_Ch2
-	dbw $02, Music_JohtoTrainerBattle_Ch3
+	musicheader 3, 1, Music_JohtoTrainerBattle_Ch1
+	musicheader 1, 2, Music_JohtoTrainerBattle_Ch2
+	musicheader 1, 3, Music_JohtoTrainerBattle_Ch3
 ; f609f

 Music_JohtoTrainerBattle_Ch1: ; f609f
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@ -1,7 +1,7 @@
 Music_JohtoWildBattle: ; f5dc5
-	dbw $80, Music_JohtoWildBattle_Ch1
-	dbw $01, Music_JohtoWildBattle_Ch2
-	dbw $02, Music_JohtoWildBattle_Ch3
+	musicheader 3, 1, Music_JohtoWildBattle_Ch1
+	musicheader 1, 2, Music_JohtoWildBattle_Ch2
+	musicheader 1, 3, Music_JohtoWildBattle_Ch3
 ; f5dce

 Music_JohtoWildBattle_Ch1: ; f5dce
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@ -1,7 +1,7 @@
 Music_JohtoWildBattleNight: ; f605c
-	dbw $80, Music_JohtoWildBattleNight_Ch1
-	dbw $01, Music_JohtoWildBattleNight_Ch2
-	dbw $02, Music_JohtoWildBattleNight_Ch3
+	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
+	musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
+	musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
 ; f6065

 Music_JohtoWildBattleNight_Ch1: ; f6065
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@ -1,7 +1,7 @@
 Music_KantoGymBattle: ; ec720
-	dbw $80, Music_KantoGymBattle_Ch1
-	dbw $01, Music_KantoGymBattle_Ch2
-	dbw $02, Music_KantoGymBattle_Ch3
+	musicheader 3, 1, Music_KantoGymBattle_Ch1
+	musicheader 1, 2, Music_KantoGymBattle_Ch2
+	musicheader 1, 3, Music_KantoGymBattle_Ch3
 ; ec729

 Music_KantoGymBattle_Ch1: ; ec729
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@ -1,7 +1,7 @@
 Music_KantoTrainerBattle: ; ec9fa
-	dbw $80, Music_KantoTrainerBattle_Ch1
-	dbw $01, Music_KantoTrainerBattle_Ch2
-	dbw $02, Music_KantoTrainerBattle_Ch3
+	musicheader 3, 1, Music_KantoTrainerBattle_Ch1
+	musicheader 1, 2, Music_KantoTrainerBattle_Ch2
+	musicheader 1, 3, Music_KantoTrainerBattle_Ch3
 ; eca03

 	db $3
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@ -1,7 +1,7 @@
 Music_KantoWildBattle: ; ed06d
-	dbw $80, Music_KantoWildBattle_Ch1
-	dbw $01, Music_KantoWildBattle_Ch2
-	dbw $02, Music_KantoWildBattle_Ch3
+	musicheader 3, 1, Music_KantoWildBattle_Ch1
+	musicheader 1, 2, Music_KantoWildBattle_Ch2
+	musicheader 1, 3, Music_KantoWildBattle_Ch3
 ; ed076

 	db $3
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@ -1,8 +1,8 @@
 Music_LakeOfRage: ; ee6c5
-	dbw $c0, Music_LakeOfRage_Ch1
-	dbw $01, Music_LakeOfRage_Ch2
-	dbw $02, Music_LakeOfRage_Ch3
-	dbw $03, Music_LakeOfRage_Ch4
+	musicheader 4, 1, Music_LakeOfRage_Ch1
+	musicheader 1, 2, Music_LakeOfRage_Ch2
+	musicheader 1, 3, Music_LakeOfRage_Ch3
+	musicheader 1, 4, Music_LakeOfRage_Ch4
 ; ee6d1

 Music_LakeOfRage_Ch1: ; ee6d1
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@ -1,7 +1,7 @@
 Music_LakeOfRageRocketRadio: ; ef5b1
-	dbw $80, Music_LakeOfRageRocketRadio_Ch1
-	dbw $01, Music_LakeOfRageRocketRadio_Ch2
-	dbw $02, Music_LakeOfRageRocketRadio_Ch3
+	musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1
+	musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2
+	musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3
 ; ef5ba

 Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@ -1,7 +1,7 @@
 Music_LavenderTown: ; ef72f
-	dbw $80, Music_LavenderTown_Ch1
-	dbw $01, Music_LavenderTown_Ch2
-	dbw $02, Music_LavenderTown_Ch3
+	musicheader 3, 1, Music_LavenderTown_Ch1
+	musicheader 1, 2, Music_LavenderTown_Ch2
+	musicheader 1, 3, Music_LavenderTown_Ch3
 ; ef738

 	db $3
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@ -1,8 +1,8 @@
 Music_Lighthouse: ; ee569
-	dbw $c0, Music_Lighthouse_Ch1
-	dbw $01, Music_Lighthouse_Ch2
-	dbw $02, Music_Lighthouse_Ch3
-	dbw $03, Music_Lighthouse_Ch4
+	musicheader 4, 1, Music_Lighthouse_Ch1
+	musicheader 1, 2, Music_Lighthouse_Ch2
+	musicheader 1, 3, Music_Lighthouse_Ch3
+	musicheader 1, 4, Music_Lighthouse_Ch4
 ; ee575

 Music_Lighthouse_Ch1: ; ee575
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@ -1,8 +1,8 @@
 Music_LookBeauty: ; eee3e
-	dbw $c0, Music_LookBeauty_Ch1
-	dbw $01, Music_LookBeauty_Ch2
-	dbw $02, Music_LookBeauty_Ch3
-	dbw $03, Music_LookBeauty_Ch4
+	musicheader 4, 1, Music_LookBeauty_Ch1
+	musicheader 1, 2, Music_LookBeauty_Ch2
+	musicheader 1, 3, Music_LookBeauty_Ch3
+	musicheader 1, 4, Music_LookBeauty_Ch4
 ; eee4a

 Music_LookBeauty_Ch1: ; eee4a
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@ -1,8 +1,8 @@
 Music_LookHiker: ; f7411
-	dbw $c0, Music_LookHiker_Ch1
-	dbw $01, Music_LookHiker_Ch2
-	dbw $02, Music_LookHiker_Ch3
-	dbw $03, Music_LookHiker_Ch4
+	musicheader 4, 1, Music_LookHiker_Ch1
+	musicheader 1, 2, Music_LookHiker_Ch2
+	musicheader 1, 3, Music_LookHiker_Ch3
+	musicheader 1, 4, Music_LookHiker_Ch4
 ; f741d

 Music_LookHiker_Ch1: ; f741d
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@ -1,7 +1,7 @@
 Music_LookKimonoGirl: ; f79b8
-	dbw $80, Music_LookKimonoGirl_Ch1
-	dbw $01, Music_LookKimonoGirl_Ch2
-	dbw $02, Music_LookKimonoGirl_Ch3
+	musicheader 3, 1, Music_LookKimonoGirl_Ch1
+	musicheader 1, 2, Music_LookKimonoGirl_Ch2
+	musicheader 1, 3, Music_LookKimonoGirl_Ch3
 ; f79c1

 	db $3
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@ -1,8 +1,8 @@
 Music_LookLass: ; ed79b
-	dbw $c0, Music_LookLass_Ch1
-	dbw $01, Music_LookLass_Ch2
-	dbw $02, Music_LookLass_Ch3
-	dbw $03, Music_LookLass_Ch4
+	musicheader 4, 1, Music_LookLass_Ch1
+	musicheader 1, 2, Music_LookLass_Ch2
+	musicheader 1, 3, Music_LookLass_Ch3
+	musicheader 1, 4, Music_LookLass_Ch4
 ; ed7a7

 Music_LookLass_Ch1: ; ed7a7
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@ -1,8 +1,8 @@
 Music_LookMysticalMan: ; 17843b
-	dbw $c0, Music_LookMysticalMan_Ch1
-	dbw $01, Music_LookMysticalMan_Ch2
-	dbw $02, Music_LookMysticalMan_Ch3
-	dbw $03, Music_LookMysticalMan_Ch4
+	musicheader 4, 1, Music_LookMysticalMan_Ch1
+	musicheader 1, 2, Music_LookMysticalMan_Ch2
+	musicheader 1, 3, Music_LookMysticalMan_Ch3
+	musicheader 1, 4, Music_LookMysticalMan_Ch4
 ; 178447

 Music_LookMysticalMan_Ch1: ; 178447
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@ -1,7 +1,7 @@
 Music_LookOfficer: ; ed82d
-	dbw $80, Music_LookOfficer_Ch1
-	dbw $01, Music_LookOfficer_Ch2
-	dbw $02, Music_LookOfficer_Ch3
+	musicheader 3, 1, Music_LookOfficer_Ch1
+	musicheader 1, 2, Music_LookOfficer_Ch2
+	musicheader 1, 3, Music_LookOfficer_Ch3
 ; ed836

 Music_LookOfficer_Ch1: ; ed836
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@ -1,7 +1,7 @@
 Music_LookPokemaniac: ; ebde1
-	dbw $80, Music_LookPokemaniac_Ch1
-	dbw $01, Music_LookPokemaniac_Ch2
-	dbw $02, Music_LookPokemaniac_Ch3
+	musicheader 3, 1, Music_LookPokemaniac_Ch1
+	musicheader 1, 2, Music_LookPokemaniac_Ch2
+	musicheader 1, 3, Music_LookPokemaniac_Ch3
 ; ebdea

 Music_LookPokemaniac_Ch1: ; ebdea
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@ -1,8 +1,8 @@
 Music_LookRival: ; f4f79
-	dbw $c0, Music_LookRival_Ch1
-	dbw $01, Music_LookRival_Ch2
-	dbw $02, Music_LookRival_Ch3
-	dbw $03, Music_LookRival_Ch4
+	musicheader 4, 1, Music_LookRival_Ch1
+	musicheader 1, 2, Music_LookRival_Ch2
+	musicheader 1, 3, Music_LookRival_Ch3
+	musicheader 1, 4, Music_LookRival_Ch4
 ; f4f85

 Music_LookRival_Ch1: ; f4f85
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@ -1,8 +1,8 @@
 Music_LookRocket: ; f74a2
-	dbw $c0, Music_LookRocket_Ch1
-	dbw $01, Music_LookRocket_Ch2
-	dbw $02, Music_LookRocket_Ch3
-	dbw $03, Music_LookRocket_Ch4
+	musicheader 4, 1, Music_LookRocket_Ch1
+	musicheader 1, 2, Music_LookRocket_Ch2
+	musicheader 1, 3, Music_LookRocket_Ch3
+	musicheader 1, 4, Music_LookRocket_Ch4
 ; f74ae

 Music_LookRocket_Ch1: ; f74ae
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@ -1,6 +1,6 @@
 Music_LookSage: ; ee35e
-	dbw $40, Music_LookSage_Ch1
-	dbw $02, Music_LookSage_Ch3
+	musicheader 2, 1, Music_LookSage_Ch1
+	musicheader 1, 3, Music_LookSage_Ch3
 ; ee364

 Music_LookSage_Ch1: ; ee364
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@ -1,7 +1,7 @@
 Music_LookYoungster: ; f66c3
-	dbw $80, Music_LookYoungster_Ch1
-	dbw $01, Music_LookYoungster_Ch2
-	dbw $02, Music_LookYoungster_Ch3
+	musicheader 3, 1, Music_LookYoungster_Ch1
+	musicheader 1, 2, Music_LookYoungster_Ch2
+	musicheader 1, 3, Music_LookYoungster_Ch3
 ; f66cc

 Music_LookYoungster_Ch1: ; f66cc
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@ -1,8 +1,8 @@
 Music_MagnetTrain: ; ef5f0
-	dbw $c0, Music_MagnetTrain_Ch1
-	dbw $01, Music_MagnetTrain_Ch2
-	dbw $02, Music_MagnetTrain_Ch3
-	dbw $03, Music_MagnetTrain_Ch4
+	musicheader 4, 1, Music_MagnetTrain_Ch1
+	musicheader 1, 2, Music_MagnetTrain_Ch2
+	musicheader 1, 3, Music_MagnetTrain_Ch3
+	musicheader 1, 4, Music_MagnetTrain_Ch4
 ; ef5fc

 Music_MagnetTrain_Ch1: ; ef5fc
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@ -1,8 +1,8 @@
 Music_MainMenu: ; f78fd
-	dbw $c0, Music_MainMenu_Ch1
-	dbw $01, Music_MainMenu_Ch2
-	dbw $02, Music_MainMenu_Ch3
-	dbw $03, Music_MainMenu_Ch4
+	musicheader 4, 1, Music_MainMenu_Ch1
+	musicheader 1, 2, Music_MainMenu_Ch2
+	musicheader 1, 3, Music_MainMenu_Ch3
+	musicheader 1, 4, Music_MainMenu_Ch4
 ; f7909

 Music_MainMenu_Ch1: ; f7909
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@ -1,8 +1,8 @@
 Music_MobileAdapter: ; 1fc87
-	dbw $c0, Music_MobileAdapter_Ch1
-	dbw $01, Music_MobileAdapter_Ch2
-	dbw $02, Music_MobileAdapter_Ch3
-	dbw $03, Music_MobileAdapter_Ch4
+	musicheader 4, 1, Music_MobileAdapter_Ch1
+	musicheader 1, 2, Music_MobileAdapter_Ch2
+	musicheader 1, 3, Music_MobileAdapter_Ch3
+	musicheader 1, 4, Music_MobileAdapter_Ch4
 ; 1fc93

 Music_MobileAdapter_Ch1: ; 1fc93
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@ -1,7 +1,7 @@
 Music_MobileAdapterMenu: ; 17801f
-	dbw $80, Music_MobileAdapterMenu_Ch1
-	dbw $01, Music_MobileAdapterMenu_Ch2
-	dbw $02, Music_MobileAdapterMenu_Ch3
+	musicheader 3, 1, Music_MobileAdapterMenu_Ch1
+	musicheader 1, 2, Music_MobileAdapterMenu_Ch2
+	musicheader 1, 3, Music_MobileAdapterMenu_Ch3
 ; 178028

 Music_MobileAdapterMenu_Ch1: ; 178028
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@ -1,8 +1,8 @@
 Music_MobileCenter: ; 17961d
-	dbw $c0, Music_MobileCenter_Ch1
-	dbw $01, Music_MobileCenter_Ch2
-	dbw $02, Music_MobileCenter_Ch3
-	dbw $03, Music_MobileCenter_Ch4
+	musicheader 4, 1, Music_MobileCenter_Ch1
+	musicheader 1, 2, Music_MobileCenter_Ch2
+	musicheader 1, 3, Music_MobileCenter_Ch3
+	musicheader 1, 4, Music_MobileCenter_Ch4
 ; 179629

 Music_MobileCenter_Ch1: ; 179629
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@ -1,7 +1,7 @@
 Music_Mom: ; f6bf2
-	dbw $81, Music_Mom_Ch2
-	dbw $02, Music_Mom_Ch3
-	dbw $03, Music_Mom_Ch4
+	musicheader 3, 2, Music_Mom_Ch2
+	musicheader 1, 3, Music_Mom_Ch3
+	musicheader 1, 4, Music_Mom_Ch4
 ; f6bfb

 Music_Mom_Ch2: ; f6bfb
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@ -1,8 +1,8 @@
 Music_MtMoon: ; edb29
-	dbw $c0, Music_MtMoon_Ch1
-	dbw $01, Music_MtMoon_Ch2
-	dbw $02, Music_MtMoon_Ch3
-	dbw $03, Music_MtMoon_Ch4
+	musicheader 4, 1, Music_MtMoon_Ch1
+	musicheader 1, 2, Music_MtMoon_Ch2
+	musicheader 1, 3, Music_MtMoon_Ch3
+	musicheader 1, 4, Music_MtMoon_Ch4
 ; edb35

 Music_MtMoon_Ch1: ; edb35
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@ -1,6 +1,6 @@
 Music_MtMoonSquare: ; f4815
-	dbw $40, Music_MtMoonSquare_Ch1
-	dbw $01, Music_MtMoonSquare_Ch2
+	musicheader 2, 1, Music_MtMoonSquare_Ch1
+	musicheader 1, 2, Music_MtMoonSquare_Ch2
 ; f481b

 Music_MtMoonSquare_Ch1: ; f481b
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@ -1,8 +1,8 @@
 Music_NationalPark: ; f54e8
-	dbw $c0, Music_NationalPark_Ch1
-	dbw $01, Music_NationalPark_Ch2
-	dbw $02, Music_NationalPark_Ch3
-	dbw $03, Music_NationalPark_Ch4
+	musicheader 4, 1, Music_NationalPark_Ch1
+	musicheader 1, 2, Music_NationalPark_Ch2
+	musicheader 1, 3, Music_NationalPark_Ch3
+	musicheader 1, 4, Music_NationalPark_Ch4
 ; f54f4

 Music_NationalPark_Ch1: ; f54f4
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@ -1,7 +1,7 @@
 Music_NewBarkTown: ; eb2d3
-	dbw $80, Music_NewBarkTown_Ch1
-	dbw $01, Music_NewBarkTown_Ch2
-	dbw $02, Music_NewBarkTown_Ch3
+	musicheader 3, 1, Music_NewBarkTown_Ch1
+	musicheader 1, 2, Music_NewBarkTown_Ch2
+	musicheader 1, 3, Music_NewBarkTown_Ch3
 ; eb2dc

 	db $3
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@ -1,8 +1,8 @@
 Music_Nothing: ; e91a3
-	dbw $c0, Music_Nothing_Ch1
-	dbw $01, Music_Nothing_Ch2
-	dbw $02, Music_Nothing_Ch3
-	dbw $03, Music_Nothing_Ch4
+	musicheader 4, 1, Music_Nothing_Ch1
+	musicheader 1, 2, Music_Nothing_Ch2
+	musicheader 1, 3, Music_Nothing_Ch3
+	musicheader 1, 4, Music_Nothing_Ch4
 ; e91af

 Music_Nothing_Ch1: ; e91af
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@ -1,7 +1,7 @@
 Music_PalletTown: ; f4b0c
-	dbw $80, Music_PalletTown_Ch1
-	dbw $01, Music_PalletTown_Ch2
-	dbw $02, Music_PalletTown_Ch3
+	musicheader 3, 1, Music_PalletTown_Ch1
+	musicheader 1, 2, Music_PalletTown_Ch2
+	musicheader 1, 3, Music_PalletTown_Ch3
 ; f4b15

 Music_PalletTown_Ch1: ; f4b15
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@ -1,7 +1,7 @@
 Music_PokeFluteChannel: ; f7b13
-	dbw $80, Music_PokeFluteChannel_Ch1
-	dbw $01, Music_PokeFluteChannel_Ch2
-	dbw $02, Music_PokeFluteChannel_Ch3
+	musicheader 3, 1, Music_PokeFluteChannel_Ch1
+	musicheader 1, 2, Music_PokeFluteChannel_Ch2
+	musicheader 1, 3, Music_PokeFluteChannel_Ch3
 ; f7b1c

 Music_PokeFluteChannel_Ch1: ; f7b1c
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@ -1,8 +1,8 @@
 Music_PokemonCenter: ; ed5c6
-	dbw $c0, Music_PokemonCenter_Ch1
-	dbw $01, Music_PokemonCenter_Ch2
-	dbw $02, Music_PokemonCenter_Ch3
-	dbw $03, Music_PokemonCenter_Ch4
+	musicheader 4, 1, Music_PokemonCenter_Ch1
+	musicheader 1, 2, Music_PokemonCenter_Ch2
+	musicheader 1, 3, Music_PokemonCenter_Ch3
+	musicheader 1, 4, Music_PokemonCenter_Ch4
 ; ed5d2

 Music_PokemonCenter_Ch1: ; ed5d2
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@ -1,8 +1,8 @@
 Music_PokemonChannel: ; ee45f
-	dbw $c0, Music_PokemonChannel_Ch1
-	dbw $01, Music_PokemonChannel_Ch2
-	dbw $02, Music_PokemonChannel_Ch3
-	dbw $03, Music_PokemonChannel_Ch4
+	musicheader 4, 1, Music_PokemonChannel_Ch1
+	musicheader 1, 2, Music_PokemonChannel_Ch2
+	musicheader 1, 3, Music_PokemonChannel_Ch3
+	musicheader 1, 4, Music_PokemonChannel_Ch4
 ; ee46b

 Music_PokemonChannel_Ch1: ; ee46b
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@ -1,7 +1,7 @@
 Music_PokemonLullaby: ; f6d79
-	dbw $80, Music_PokemonLullaby_Ch1
-	dbw $01, Music_PokemonLullaby_Ch2
-	dbw $02, Music_PokemonLullaby_Ch3
+	musicheader 3, 1, Music_PokemonLullaby_Ch1
+	musicheader 1, 2, Music_PokemonLullaby_Ch2
+	musicheader 1, 3, Music_PokemonLullaby_Ch3
 ; f6d82

 Music_PokemonLullaby_Ch1: ; f6d82
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@ -1,8 +1,8 @@
 Music_PokemonMarch: ; f6e23
-	dbw $c0, Music_PokemonMarch_Ch1
-	dbw $01, Music_PokemonMarch_Ch2
-	dbw $02, Music_PokemonMarch_Ch3
-	dbw $03, Music_PokemonMarch_Ch4
+	musicheader 4, 1, Music_PokemonMarch_Ch1
+	musicheader 1, 2, Music_PokemonMarch_Ch2
+	musicheader 1, 3, Music_PokemonMarch_Ch3
+	musicheader 1, 4, Music_PokemonMarch_Ch4
 ; f6e2f

 Music_PokemonMarch_Ch1: ; f6e2f
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@ -1,6 +1,6 @@
 Music_PostCredits: ; cfd9e
-	dbw $40, Music_PostCredits_Ch1
-	dbw $01, Music_PostCredits_Ch2
+	musicheader 2, 1, Music_PostCredits_Ch1
+	musicheader 1, 2, Music_PostCredits_Ch2
 ; cfda4

 	db $2
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@ -1,5 +1,5 @@
 Music_Printer: ; f07fd
-	dbw $02, Music_Printer_Ch3
+	musicheader 1, 3, Music_Printer_Ch3
 ; f0800

 Music_Printer_Ch3: ; f0800
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@ -1,7 +1,7 @@
 Music_ProfOak: ; f4dea
-	dbw $80, Music_ProfOak_Ch1
-	dbw $01, Music_ProfOak_Ch2
-	dbw $02, Music_ProfOak_Ch3
+	musicheader 3, 1, Music_ProfOak_Ch1
+	musicheader 1, 2, Music_ProfOak_Ch2
+	musicheader 1, 3, Music_ProfOak_Ch3
 ; f4df3

 Music_ProfOak_Ch1: ; f4df3
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@ -1,7 +1,7 @@
 Music_ProfOaksPokemonTalk: ; f4c9f
-	dbw $80, Music_ProfOaksPokemonTalk_Ch1
-	dbw $01, Music_ProfOaksPokemonTalk_Ch2
-	dbw $02, Music_ProfOaksPokemonTalk_Ch3
+	musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1
+	musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2
+	musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3
 ; f4ca8

 	db $3
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@ -1,7 +1,7 @@
 Music_RivalBattle: ; e974f
-	dbw $80, Music_RivalBattle_Ch1
-	dbw $01, Music_RivalBattle_Ch2
-	dbw $02, Music_RivalBattle_Ch3
+	musicheader 3, 1, Music_RivalBattle_Ch1
+	musicheader 1, 2, Music_RivalBattle_Ch2
+	musicheader 1, 3, Music_RivalBattle_Ch3
 ; e9758

 Music_RivalBattle_Ch1: ; e9758
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@ -1,7 +1,7 @@
 Music_RocketBattle: ; e9b6f
-	dbw $80, Music_RocketBattle_Ch1
-	dbw $01, Music_RocketBattle_Ch2
-	dbw $02, Music_RocketBattle_Ch3
+	musicheader 3, 1, Music_RocketBattle_Ch1
+	musicheader 1, 2, Music_RocketBattle_Ch2
+	musicheader 1, 3, Music_RocketBattle_Ch3
 ; e9b78

 Music_RocketBattle_Ch1: ; e9b78
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@ -1,8 +1,8 @@
 Music_RocketHideout: ; eeb75
-	dbw $c0, Music_RocketHideout_Ch1
-	dbw $01, Music_RocketHideout_Ch2
-	dbw $02, Music_RocketHideout_Ch3
-	dbw $03, Music_RocketHideout_Ch4
+	musicheader 4, 1, Music_RocketHideout_Ch1
+	musicheader 1, 2, Music_RocketHideout_Ch2
+	musicheader 1, 3, Music_RocketHideout_Ch3
+	musicheader 1, 4, Music_RocketHideout_Ch4
 ; eeb81

 Music_RocketHideout_Ch1: ; eeb81
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@ -1,8 +1,8 @@
 Music_RocketTheme: ; f766d
-	dbw $c0, Music_RocketTheme_Ch1
-	dbw $01, Music_RocketTheme_Ch2
-	dbw $02, Music_RocketTheme_Ch3
-	dbw $03, Music_RocketTheme_Ch4
+	musicheader 4, 1, Music_RocketTheme_Ch1
+	musicheader 1, 2, Music_RocketTheme_Ch2
+	musicheader 1, 3, Music_RocketTheme_Ch3
+	musicheader 1, 4, Music_RocketTheme_Ch4
 ; f7679

 Music_RocketTheme_Ch1: ; f7679
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@ -1,7 +1,7 @@
 Music_Route1: ; ec000
-	dbw $80, Music_Route1_Ch1
-	dbw $01, Music_Route1_Ch2
-	dbw $02, Music_Route1_Ch3
+	musicheader 3, 1, Music_Route1_Ch1
+	musicheader 1, 2, Music_Route1_Ch2
+	musicheader 1, 3, Music_Route1_Ch3
 ; ec009

 	db $3
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@ -1,8 +1,8 @@
 Music_Route12: ; ec506
-	dbw $c0, Music_Route12_Ch1
-	dbw $01, Music_Route12_Ch2
-	dbw $02, Music_Route12_Ch3
-	dbw $03, Music_Route12_Ch4
+	musicheader 4, 1, Music_Route12_Ch1
+	musicheader 1, 2, Music_Route12_Ch2
+	musicheader 1, 3, Music_Route12_Ch3
+	musicheader 1, 4, Music_Route12_Ch4
 ; ec512

 Music_Route12_Ch1: ; ec512
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@ -1,8 +1,8 @@
 Music_Route2: ; ed8dd
-	dbw $c0, Music_Route2_Ch1
-	dbw $01, Music_Route2_Ch2
-	dbw $02, Music_Route2_Ch3
-	dbw $03, Music_Route2_Ch4
+	musicheader 4, 1, Music_Route2_Ch1
+	musicheader 1, 2, Music_Route2_Ch2
+	musicheader 1, 3, Music_Route2_Ch3
+	musicheader 1, 4, Music_Route2_Ch4
 ; ed8e9

 Music_Route2_Ch1: ; ed8e9
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@ -1,8 +1,8 @@
 Music_Route26: ; eefb2
-	dbw $c0, Music_Route26_Ch1
-	dbw $01, Music_Route26_Ch2
-	dbw $02, Music_Route26_Ch3
-	dbw $03, Music_Route26_Ch4
+	musicheader 4, 1, Music_Route26_Ch1
+	musicheader 1, 2, Music_Route26_Ch2
+	musicheader 1, 3, Music_Route26_Ch3
+	musicheader 1, 4, Music_Route26_Ch4
 ; eefbe

 Music_Route26_Ch1: ; eefbe
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@ -1,8 +1,8 @@
 Music_Route29: ; f0386
-	dbw $c0, Music_Route29_Ch1
-	dbw $01, Music_Route29_Ch2
-	dbw $02, Music_Route29_Ch3
-	dbw $03, Music_Route29_Ch4
+	musicheader 4, 1, Music_Route29_Ch1
+	musicheader 1, 2, Music_Route29_Ch2
+	musicheader 1, 3, Music_Route29_Ch3
+	musicheader 1, 4, Music_Route29_Ch4
 ; f0392

 Music_Route29_Ch1: ; f0392
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@ -1,8 +1,8 @@
 Music_Route3: ; ec2ca
-	dbw $c0, Music_Route3_Ch1
-	dbw $01, Music_Route3_Ch2
-	dbw $02, Music_Route3_Ch3
-	dbw $03, Music_Route3_Ch4
+	musicheader 4, 1, Music_Route3_Ch1
+	musicheader 1, 2, Music_Route3_Ch2
+	musicheader 1, 3, Music_Route3_Ch3
+	musicheader 1, 4, Music_Route3_Ch4
 ; ec2d6

 Music_Route3_Ch1: ; ec2d6
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@ -1,8 +1,8 @@
 Music_Route30: ; efc01
-	dbw $c0, Music_Route30_Ch1
-	dbw $01, Music_Route30_Ch2
-	dbw $02, Music_Route30_Ch3
-	dbw $03, Music_Route30_Ch4
+	musicheader 4, 1, Music_Route30_Ch1
+	musicheader 1, 2, Music_Route30_Ch2
+	musicheader 1, 3, Music_Route30_Ch3
+	musicheader 1, 4, Music_Route30_Ch4
 ; efc0d

 Music_Route30_Ch1: ; efc0d
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@ -1,8 +1,8 @@
 Music_Route36: ; e94e9
-	dbw $c0, Music_Route36_Ch1
-	dbw $01, Music_Route36_Ch2
-	dbw $02, Music_Route36_Ch3
-	dbw $03, Music_Route36_Ch4
+	musicheader 4, 1, Music_Route36_Ch1
+	musicheader 1, 2, Music_Route36_Ch2
+	musicheader 1, 3, Music_Route36_Ch3
+	musicheader 1, 4, Music_Route36_Ch4
 ; e94f5

 Music_Route36_Ch1: ; e94f5
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@ -1,8 +1,8 @@
 Music_Route37: ; ee94b
-	dbw $c0, Music_Route37_Ch1
-	dbw $01, Music_Route37_Ch2
-	dbw $02, Music_Route37_Ch3
-	dbw $03, Music_Route37_Ch4
+	musicheader 4, 1, Music_Route37_Ch1
+	musicheader 1, 2, Music_Route37_Ch2
+	musicheader 1, 3, Music_Route37_Ch3
+	musicheader 1, 4, Music_Route37_Ch4
 ; ee957

 Music_Route37_Ch1: ; ee957
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@ -1,7 +1,7 @@
 Music_RuinsOfAlphInterior: ; ebd9e
-	dbw $80, Music_RuinsOfAlphInterior_Ch1
-	dbw $01, Music_RuinsOfAlphInterior_Ch2
-	dbw $02, Music_RuinsOfAlphInterior_Ch3
+	musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1
+	musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2
+	musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3
 ; ebda7

 Music_RuinsOfAlphInterior_Ch1: ; ebda7
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@ -1,7 +1,7 @@
 Music_RuinsOfAlphRadio: ; eedcb
-	dbw $80, Music_RuinsOfAlphRadio_Ch1
-	dbw $01, Music_RuinsOfAlphRadio_Ch2
-	dbw $02, Music_RuinsOfAlphRadio_Ch3
+	musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1
+	musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2
+	musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3
 ; eedd4

 Music_RuinsOfAlphRadio_Ch1: ; eedd4
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@ -1,8 +1,8 @@
 Music_ShowMeAround: ; edbd8
-	dbw $c0, Music_ShowMeAround_Ch1
-	dbw $01, Music_ShowMeAround_Ch2
-	dbw $02, Music_ShowMeAround_Ch3
-	dbw $03, Music_ShowMeAround_Ch4
+	musicheader 4, 1, Music_ShowMeAround_Ch1
+	musicheader 1, 2, Music_ShowMeAround_Ch2
+	musicheader 1, 3, Music_ShowMeAround_Ch3
+	musicheader 1, 4, Music_ShowMeAround_Ch4
 ; edbe4

 Music_ShowMeAround_Ch1: ; edbe4
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@ -1,8 +1,8 @@
 Music_SproutTower: ; f6974
-	dbw $c0, Music_SproutTower_Ch1
-	dbw $01, Music_SproutTower_Ch2
-	dbw $02, Music_SproutTower_Ch3
-	dbw $03, Music_SproutTower_Ch4
+	musicheader 4, 1, Music_SproutTower_Ch1
+	musicheader 1, 2, Music_SproutTower_Ch2
+	musicheader 1, 3, Music_SproutTower_Ch3
+	musicheader 1, 4, Music_SproutTower_Ch4
 ; f6980

 Music_SproutTower_Ch1: ; f6980
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@ -1,8 +1,8 @@
 Music_SSAqua: ; ead99
-	dbw $c0, Music_SSAqua_Ch1
-	dbw $01, Music_SSAqua_Ch2
-	dbw $02, Music_SSAqua_Ch3
-	dbw $03, Music_SSAqua_Ch4
+	musicheader 4, 1, Music_SSAqua_Ch1
+	musicheader 1, 2, Music_SSAqua_Ch2
+	musicheader 1, 3, Music_SSAqua_Ch3
+	musicheader 1, 4, Music_SSAqua_Ch4
 ; eada5

 Music_SSAqua_Ch1: ; eada5
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@ -1,7 +1,7 @@
 Music_SuccessfulCapture: ; f4602
-	dbw $80, Music_SuccessfulCapture_Ch1
-	dbw $01, Music_SuccessfulCapture_Ch2
-	dbw $02, Music_SuccessfulCapture_Ch3
+	musicheader 3, 1, Music_SuccessfulCapture_Ch1
+	musicheader 1, 2, Music_SuccessfulCapture_Ch2
+	musicheader 1, 3, Music_SuccessfulCapture_Ch3
 ; f460b

 Music_SuccessfulCapture_Ch1: ; f460b
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@ -1,7 +1,7 @@
 Music_SuicuneBattle: ; 178b81
-	dbw $80, Music_SuicuneBattle_Ch1
-	dbw $01, Music_SuicuneBattle_Ch2
-	dbw $02, Music_SuicuneBattle_Ch3
+	musicheader 3, 1, Music_SuicuneBattle_Ch1
+	musicheader 1, 2, Music_SuicuneBattle_Ch2
+	musicheader 1, 3, Music_SuicuneBattle_Ch3
 ; 178b8a

 Music_SuicuneBattle_Ch1: ; 178b8a
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@ -1,7 +1,7 @@
 Music_Surf: ; f518a
-	dbw $80, Music_Surf_Ch1
-	dbw $01, Music_Surf_Ch2
-	dbw $02, Music_Surf_Ch3
+	musicheader 3, 1, Music_Surf_Ch1
+	musicheader 1, 2, Music_Surf_Ch2
+	musicheader 1, 3, Music_Surf_Ch3
 ; f5193

 	db $3
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@ -1,8 +1,8 @@
 Music_TinTower: ; f6811
-	dbw $c0, Music_TinTower_Ch1
-	dbw $01, Music_TinTower_Ch2
-	dbw $02, Music_TinTower_Ch3
-	dbw $03, Music_TinTower_Ch4
+	musicheader 4, 1, Music_TinTower_Ch1
+	musicheader 1, 2, Music_TinTower_Ch2
+	musicheader 1, 3, Music_TinTower_Ch3
+	musicheader 1, 4, Music_TinTower_Ch4
 ; f681d

 Music_TinTower_Ch1: ; f681d
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@ -1,8 +1,8 @@
 Music_TitleScreen: ; eb808
-	dbw $c0, Music_TitleScreen_Ch1
-	dbw $01, Music_TitleScreen_Ch2
-	dbw $02, Music_TitleScreen_Ch3
-	dbw $03, Music_TitleScreen_Ch4
+	musicheader 4, 1, Music_TitleScreen_Ch1
+	musicheader 1, 2, Music_TitleScreen_Ch2
+	musicheader 1, 3, Music_TitleScreen_Ch3
+	musicheader 1, 4, Music_TitleScreen_Ch4
 ; eb814

 Music_TitleScreen_Ch1: ; eb814
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@ -1,7 +1,7 @@
 Music_TrainerVictory: ; ebeab
-	dbw $80, Music_TrainerVictory_Ch1
-	dbw $01, Music_TrainerVictory_Ch2
-	dbw $02, Music_TrainerVictory_Ch3
+	musicheader 3, 1, Music_TrainerVictory_Ch1
+	musicheader 1, 2, Music_TrainerVictory_Ch2
+	musicheader 1, 3, Music_TrainerVictory_Ch3
 ; ebeb4

 Music_TrainerVictory_Ch1: ; ebeb4
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@ -1,8 +1,8 @@
 Music_UnionCave: ; f5c60
-	dbw $c0, Music_UnionCave_Ch1
-	dbw $01, Music_UnionCave_Ch2
-	dbw $02, Music_UnionCave_Ch3
-	dbw $03, Music_UnionCave_Ch4
+	musicheader 4, 1, Music_UnionCave_Ch1
+	musicheader 1, 2, Music_UnionCave_Ch2
+	musicheader 1, 3, Music_UnionCave_Ch3
+	musicheader 1, 4, Music_UnionCave_Ch4
 ; f5c6c

 Music_UnionCave_Ch1: ; f5c6c
--- a/Show More
+++ b/Show More