From 10f9559eab8c93b94abb8ae8d1083704ad4e169a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 20 May 2020 19:40:33 -0500
Subject: Sync with pokered

---
 audio/headers/musicheaders2.asm | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'audio/headers/musicheaders2.asm')

diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 7df3f8bf..d6cca9a9 100644
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,34 +1,20 @@
 Music_GymLeaderBattle::
-	dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1
-	dbw CH1, Music_GymLeaderBattle_Ch2
-	dbw CH2, Music_GymLeaderBattle_Ch3
+	audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3
 
 Music_TrainerBattle::
-	dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1
-	dbw CH1, Music_TrainerBattle_Ch2
-	dbw CH2, Music_TrainerBattle_Ch3
+	audio_header Music_TrainerBattle, Ch1, Ch2, Ch3
 
 Music_WildBattle::
-	dbw ( $80 | CH0 ), Music_WildBattle_Ch1
-	dbw CH1, Music_WildBattle_Ch2
-	dbw CH2, Music_WildBattle_Ch3
+	audio_header Music_WildBattle, Ch1, Ch2, Ch3
 
 Music_FinalBattle::
-	dbw ( $80 | CH0 ), Music_FinalBattle_Ch1
-	dbw CH1, Music_FinalBattle_Ch2
-	dbw CH2, Music_FinalBattle_Ch3
+	audio_header Music_FinalBattle, Ch1, Ch2, Ch3
 
 Music_DefeatedTrainer::
-	dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1
-	dbw CH1, Music_DefeatedTrainer_Ch2
-	dbw CH2, Music_DefeatedTrainer_Ch3
+	audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3
 
 Music_DefeatedWildMon::
-	dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1
-	dbw CH1, Music_DefeatedWildMon_Ch2
-	dbw CH2, Music_DefeatedWildMon_Ch3
+	audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3
 
 Music_DefeatedGymLeader::
-	dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1
-	dbw CH1, Music_DefeatedGymLeader_Ch2
-	dbw CH2, Music_DefeatedGymLeader_Ch3
+	audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3
-- 
cgit v1.3.1-sl0p