diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 15:12:49 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 15:12:49 -0500 |
| commit | 5a73a62d9bdaa42aa3b94064a0ddba63a8e34ad2 (patch) | |
| tree | 710bacb3bd6d11d6f6d16639e99b5c95424261c4 /engine/battle/start_battle.asm | |
| parent | 2f741dfa03204d4a98988ee76b241edc90f5ffc4 (diff) | |
Move battle engine data into data/
IsJohtoGymLeader → IsGymLeader
Diffstat (limited to 'engine/battle/start_battle.asm')
| -rw-r--r-- | engine/battle/start_battle.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 7f0bff96b..253169a27 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -93,7 +93,7 @@ PlayBattleMusic: ; 2ee6c cp RED jr z, .done - ; really, they should have included admins and scientists here too... + ; They should have included EXECUTIVEM, EXECUTIVEF, and SCIENTIST too... ld de, MUSIC_ROCKET_BATTLE cp GRUNTM jr z, .done @@ -104,8 +104,10 @@ PlayBattleMusic: ; 2ee6c farcall IsKantoGymLeader jr c, .done + ; IsGymLeader also counts CHAMPION, RED, and the Kanto gym leaders + ; but they have been taken care of before this ld de, MUSIC_JOHTO_GYM_LEADER_BATTLE - farcall IsJohtoGymLeader + farcall IsGymLeader jr c, .done ld de, MUSIC_RIVAL_BATTLE |