summaryrefslogtreecommitdiff
path: root/engine/battle/animations.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-11-28 17:09:19 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-11-28 17:09:19 -0500
commit90c7b976dca2467f47c4916b3835414bb07cc4d1 (patch)
treef2acf7019573d3b708339c704c51b8ecca77b6ea /engine/battle/animations.asm
parent4cb785e0db4adb727ac1b92115ad3f74e414867f (diff)
engine/battle/moveEffects/substitute_effect.asm and ActivatePC
Also no more W_PLAYER/ENEMYBATTSTATUS
Diffstat (limited to 'engine/battle/animations.asm')
-rwxr-xr-xengine/battle/animations.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index ab518c77..c0d0e000 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2088,10 +2088,10 @@ HideSubstituteShowMonAnim: ; 79747 (1e:5747)
ld a, [H_WHOSETURN]
and a
ld hl, wPlayerMonMinimized
- ld a, [W_PLAYERBATTSTATUS2]
+ ld a, [wPlayerBattleStatus2]
jr z, .next1
ld hl, wEnemyMonMinimized
- ld a, [W_ENEMYBATTSTATUS2]
+ ld a, [wEnemyBattleStatus2]
.next1
push hl
; if the substitute broke, slide it down, else slide it offscreen horizontally