diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 14 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/battle/core.asm b/battle/core.asm index ab7e31f08..0a6e9e0f5 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2889,7 +2889,7 @@ AskUseNextPokemon: ; 3d1f8 ForcePlayerMonChoice: ; 3d227 call EmptyBattleTextBox - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader call Function3d2f7 call ForcePickPartyMonInBattle ld a, [wLinkMode] @@ -2996,7 +2996,7 @@ IsMobileBattle: ; 3d2f1 Function3d2f7: ; 3d2f7 call WhiteBGMap -Function3d2fa: ; 3d2fa +Function3d2fa: ; switch to fullscreen menu? callba Function5004f callba Function50405 callba Function8e85 @@ -3415,7 +3415,7 @@ ResetEnemyBattleVars: ; 3d557 ld a, $8 call Function3d490 call EmptyBattleTextBox - jp LoadPartyMenuDataHeader + jp LoadStandardMenuDataHeader ; 3d57a ResetBattleParticipants: ; 3d57a @@ -5233,7 +5233,7 @@ BattleMenu_Pack: ; 3e1c7 and a jp nz, ItemsCantBeUsed - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader ld a, [BattleType] cp BATTLETYPE_TUTORIAL @@ -5328,10 +5328,10 @@ Function3e234: ; 3e234 ; 3e28d BattleMenu_PKMN: ; 3e28d - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader Function3e290: call ExitMenu - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader call WhiteBGMap Function3e299: call Function3d2fa @@ -5467,7 +5467,7 @@ PlayerSwitch: ; 3e3ad ld a, [wLinkMode] and a jr z, .not_linked - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader call Function3e8e4 call WriteBackup diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 5bfb92712..38a00bb73 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -8953,7 +8953,7 @@ BattleCommand_BatonPass: ; 379c9 call DelayFrames ; Transition into switchmon menu - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader callba Function3d2f7 callba ForcePickSwitchMonInBattle @@ -9027,7 +9027,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 ld a, 1 ld [wd0ec], a - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader ld hl, Function3e8e4 call CallBattleCore call WriteBackup @@ -9043,7 +9043,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 and a ret z - call LoadPartyMenuDataHeader + call LoadStandardMenuDataHeader ld hl, Function3e8e4 call CallBattleCore |