From 5a73a62d9bdaa42aa3b94064a0ddba63a8e34ad2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 15:12:49 -0500 Subject: =?UTF-8?q?Move=20battle=20engine=20data=20into=20data/=20IsJohtoG?= =?UTF-8?q?ymLeader=20=E2=86=92=20IsGymLeader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/battle/start_battle.asm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engine/battle/start_battle.asm') 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 -- cgit v1.2.3