diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-21 17:15:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:15:25 -0800 |
| commit | b97287be2923a037cd9aa5f3b35887feb31b0c03 (patch) | |
| tree | 87932039e558304c5c832d2146517d8be4010fe9 /battle/core.asm | |
| parent | 88f1b8165b4e0ce0e416e26d7cb7b3105b8f8c31 (diff) | |
| parent | e5f9fddb86cd005d0dbcbb0fd1d4a04d3e6fee45 (diff) | |
Merge pull request #397 from mid-kid/master
A few more labels and comments
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 6 |
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 |