diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 5 | ||||
| -rw-r--r-- | engine/battle/menu.asm | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 892ecd990..902846bdc 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2577,11 +2577,11 @@ PlayVictoryMusic: pop de ret -IsKantoGymLeader: ; 0x3d123 +IsKantoGymLeader: ld hl, KantoGymLeaders jr IsGymLeaderCommon -IsGymLeader: ; 0x3d128 +IsGymLeader: ld hl, GymLeaders IsGymLeaderCommon: push de @@ -2590,7 +2590,6 @@ IsGymLeaderCommon: call IsInArray pop de ret -; 0x3d137 INCLUDE "data/trainers/leaders.asm" diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 8f06b99f2..147430030 100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -34,15 +34,14 @@ BattleMenuHeader: dw MenuData_0x24f34 db 1 ; default option -MenuData_0x24f34: ; 0x24f34 +MenuData_0x24f34: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags dn 2, 2 ; rows, columns db 6 ; spacing dba Strings24f3d dbw BANK(MenuData_0x24f34), 0 -; 0x24f3d -Strings24f3d: ; 0x24f3d +Strings24f3d: db "FIGHT@" db "<PKMN>@" db "PACK@" |