1 files changed, 18 insertions, 120 deletions

diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 1c54b266..90798882 100755
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,158 +1,56 @@
 Music_TitleScreen::
-	db ( $C0 | CH0 )
-	dw Music_TitleScreen_Ch1
-	db CH1
-	dw Music_TitleScreen_Ch2
-	db CH2
-	dw Music_TitleScreen_Ch3
-	db CH3
-	dw Music_TitleScreen_Ch4
+	audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3
 
 Music_Credits::
-	db ( $80 | CH0 )
-	dw Music_Credits_Ch1
-	db CH1
-	dw Music_Credits_Ch2
-	db CH2
-	dw Music_Credits_Ch3
+	audio Music_Credits, Ch0, Ch1, Ch2
 
 Music_HallOfFame::
-	db ( $80 | CH0 )
-	dw Music_HallOfFame_Ch1
-	db CH1
-	dw Music_HallOfFame_Ch2
-	db CH2
-	dw Music_HallOfFame_Ch3
+	audio Music_HallOfFame, Ch0, Ch1, Ch2
 
 Music_OaksLab::
-	db ( $80 | CH0 )
-	dw Music_OaksLab_Ch1
-	db CH1
-	dw Music_OaksLab_Ch2
-	db CH2
-	dw Music_OaksLab_Ch3
+	audio Music_OaksLab, Ch0, Ch1, Ch2
 
 Music_JigglypuffSong::
-	db $40
-	dw Music_JigglypuffSong_Ch1
-	db CH1
-	dw Music_JigglypuffSong_Ch2
+	audio Music_JigglypuffSong, Ch0, Ch1
 
 Music_BikeRiding::
-	db ( $C0 | CH0 )
-	dw Music_BikeRiding_Ch1
-	db CH1
-	dw Music_BikeRiding_Ch2
-	db CH2
-	dw Music_BikeRiding_Ch3
-	db CH3
-	dw Music_BikeRiding_Ch4
+	audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3
 
 Music_Surfing::
-	db ( $80 | CH0 )
-	dw Music_Surfing_Ch1
-	db CH1
-	dw Music_Surfing_Ch2
-	db CH2
-	dw Music_Surfing_Ch3
+	audio Music_Surfing, Ch0, Ch1, Ch2
 
 Music_GameCorner::
-	db ( $80 | CH0 )
-	dw Music_GameCorner_Ch1
-	db CH1
-	dw Music_GameCorner_Ch2
-	db CH2
-	dw Music_GameCorner_Ch3
+	audio Music_GameCorner, Ch0, Ch1, Ch2
 
 Music_IntroBattle::
-	db ( $C0 | CH0 )
-	dw Music_IntroBattle_Ch1
-	db CH1
-	dw Music_IntroBattle_Ch2
-	db CH2
-	dw Music_IntroBattle_Ch3
-	db CH3
-	dw Music_IntroBattle_Ch4
+	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
 Music_Dungeon1::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon1_Ch1
-	db CH1
-	dw Music_Dungeon1_Ch2
-	db CH2
-	dw Music_Dungeon1_Ch3
-	db CH3
-	dw Music_Dungeon1_Ch4
+	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon2_Ch1
-	db CH1
-	dw Music_Dungeon2_Ch2
-	db CH2
-	dw Music_Dungeon2_Ch3
-	db CH3
-	dw Music_Dungeon2_Ch4
+	audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon3_Ch1
-	db CH1
-	dw Music_Dungeon3_Ch2
-	db CH2
-	dw Music_Dungeon3_Ch3
-	db CH3
-	dw Music_Dungeon3_Ch4
+	audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3
 
 Music_CinnabarMansion::
-	db ( $C0 | CH0 )
-	dw Music_CinnabarMansion_Ch1
-	db CH1
-	dw Music_CinnabarMansion_Ch2
-	db CH2
-	dw Music_CinnabarMansion_Ch3
-	db CH3
-	dw Music_CinnabarMansion_Ch4
+	audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3
 
 Music_PokemonTower::
-	db ( $80 | CH0 )
-	dw Music_PokemonTower_Ch1
-	db CH1
-	dw Music_PokemonTower_Ch2
-	db CH2
-	dw Music_PokemonTower_Ch3
+	audio Music_PokemonTower, Ch0, Ch1, Ch2
 
 Music_SilphCo::
-	db ( $80 | CH0 )
-	dw Music_SilphCo_Ch1
-	db CH1
-	dw Music_SilphCo_Ch2
-	db CH2
-	dw Music_SilphCo_Ch3
+	audio Music_SilphCo, Ch0, Ch1, Ch2
 
 Music_MeetEvilTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetEvilTrainer_Ch1
-	db CH1
-	dw Music_MeetEvilTrainer_Ch2
-	db CH2
-	dw Music_MeetEvilTrainer_Ch3
+	audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2
 
 Music_MeetFemaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetFemaleTrainer_Ch1
-	db CH1
-	dw Music_MeetFemaleTrainer_Ch2
-	db CH2
-	dw Music_MeetFemaleTrainer_Ch3
+	audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2
 
 Music_MeetMaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetMaleTrainer_Ch1
-	db CH1
-	dw Music_MeetMaleTrainer_Ch2
-	db CH2
-	dw Music_MeetMaleTrainer_Ch3
+	audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2