diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 8 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/battle/core.asm b/battle/core.asm index 09ebefee9..dcc4fe31d 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2932,7 +2932,7 @@ ForcePlayerMonChoice: ; 3d227 call ClearPalettes call DelayFrame call _LoadHPBar - call WriteBackup + call CloseWindow call GetMemSGBLayout call SetPalettes call SendOutPkmnText @@ -5368,7 +5368,7 @@ BattleMenuPKMN_Loop: call ClearPalettes call DelayFrame call _LoadHPBar - call WriteBackup + call CloseWindow call LoadTileMapToTempTileMap call GetMemSGBLayout call SetPalettes @@ -5451,7 +5451,7 @@ TryPlayerSwitch: ; 3e358 call DelayFrame call ClearSprites call _LoadHPBar - call WriteBackup + call CloseWindow call GetMemSGBLayout call SetPalettes ld a, [CurPartyMon] @@ -5464,7 +5464,7 @@ PlayerSwitch: ; 3e3ad jr z, .not_linked call LoadStandardMenuDataHeader call LinkBattleSendReceiveAction - call WriteBackup + call CloseWindow .not_linked call ParseEnemyAction diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index e7d4878bc..a52fb46db 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -8961,7 +8961,7 @@ BattleCommand_BatonPass: ; 379c9 ; Return to battle scene call ClearPalettes callba _LoadBattleFontsHPBar - call WriteBackup + call CloseWindow call ClearSprites hlcoord 1, 0 lb bc, 4, 10 @@ -9030,7 +9030,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 call LoadStandardMenuDataHeader ld hl, LinkBattleSendReceiveAction call CallBattleCore - call WriteBackup + call CloseWindow xor a ld [wPlayerAction], a @@ -9061,7 +9061,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 add BATTLEACTION_SWITCH1 ld [wBattleAction], a .switch - jp WriteBackup + jp CloseWindow ; 37aab |