Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move battle engine data into data/

Browse Source 
IsJohtoGymLeader → IsGymLeader
This commit is contained in:
Remy Oukaour
2018-01-09 15:12:49 -05:00
parent 2f741dfa03
commit 5a73a62d9b
5 changed files with 92 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle/start_battle.asm
View File

@@ -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