summaryrefslogtreecommitdiff
path: root/battle/core.asm
diff options
context:
space:
mode:
Diffstat (limited to 'battle/core.asm')
-rw-r--r--battle/core.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/battle/core.asm b/battle/core.asm
index cb709e08d..9b644ca5b 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -903,7 +903,7 @@ MoveEffectPriorities: ; 3c5df
db EFFECT_PROTECT, 3
db EFFECT_ENDURE, 3
db EFFECT_PRIORITY_HIT, 2
- db EFFECT_WHIRLWIND, 0
+ db EFFECT_FORCE_SWITCH, 0
db EFFECT_COUNTER, 0
db EFFECT_MIRROR_COAT, 0
db -1
@@ -8640,7 +8640,7 @@ ExitBattle: ; 3f69e
call ShowLinkBattleParticipantsAfterEnd
ld c, 150
call DelayFrames
- call DetermineMobileBattleResult
+ call DisplayLinkBattleResult
ret
.not_linked
@@ -8737,7 +8737,7 @@ ShowLinkBattleParticipantsAfterEnd: ; 3f759
ret
; 3f77c
-DetermineMobileBattleResult: ; 3f77c
+DisplayLinkBattleResult: ; 3f77c
callba CheckMobileBattleError
jp c, .Mobile_InvalidBattle
call IsMobileBattle2