aboutsummaryrefslogtreecommitdiffstats
path: root/audio/headers/musicheaders2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /audio/headers/musicheaders2.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to 'audio/headers/musicheaders2.asm')
-rw-r--r--audio/headers/musicheaders2.asm28
1 files changed, 7 insertions, 21 deletions
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