diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /audio/headers/musicheaders2.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'audio/headers/musicheaders2.asm')
| -rw-r--r-- | audio/headers/musicheaders2.asm | 28 |
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 |