aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/effects.asm
diff options
context:
space:
mode:
authorBlueZangoose <113498143+BlueZangoose@users.noreply.github.com>2023-11-22 00:52:53 +0000
committerGitHub <noreply@github.com>2023-11-21 19:52:53 -0500
commit9827190aea7ce6a6f30d6a0c04eda34934cbd35e (patch)
treed0350957af625443210c33ea3bf5beb5236a94ee /engine/battle/effects.asm
parentUpdate install instructions for Arch Linux (diff)
downloadpokeyellow-9827190aea7ce6a6f30d6a0c04eda34934cbd35e.tar.gz
pokeyellow-9827190aea7ce6a6f30d6a0c04eda34934cbd35e.tar.xz
pokeyellow-9827190aea7ce6a6f30d6a0c04eda34934cbd35e.zip
Use MEGA_PUNCH constant in explosion animation routine (#434)
* Use MEGA_PUNCH constant in explosion animation routine * Add AnimationType constants and assert --------- Co-authored-by: vulcandth <vulcandth@gmail.com>
Diffstat (limited to 'engine/battle/effects.asm')
-rw-r--r--engine/battle/effects.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index e89d19f3..b94b12d2 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -1460,9 +1460,9 @@ PlayBattleAnimation2:
ld [wAnimationID], a
ldh a, [hWhoseTurn]
and a
- ld a, $6
+ ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2
jr z, .storeAnimationType
- ld a, $3
+ ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW
.storeAnimationType
ld [wAnimationType], a
jp PlayBattleAnimationGotID