diff options
| author | BlueZangoose <113498143+BlueZangoose@users.noreply.github.com> | 2023-11-22 00:52:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 19:52:53 -0500 |
| commit | 9827190aea7ce6a6f30d6a0c04eda34934cbd35e (patch) | |
| tree | d0350957af625443210c33ea3bf5beb5236a94ee | |
| parent | Update install instructions for Arch Linux (diff) | |
| download | pokeyellow-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>
| -rw-r--r-- | constants/battle_anim_constants.asm | 8 | ||||
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 4 | ||||
| -rw-r--r-- | includes.asm | 1 |
4 files changed, 19 insertions, 8 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm new file mode 100644 index 00000000..db57d6c4 --- /dev/null +++ b/constants/battle_anim_constants.asm @@ -0,0 +1,8 @@ +; AnimationTypePointerTable indexes (see engine/battle/animations.asm) + const_def 1 + const ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY ; 1 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY ; 2 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW ; 3 + const ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE ; 4 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ; 5 + const ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_SLOW_2 ; 6 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f976674a..19ebdfcf 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3154,9 +3154,9 @@ handleIfPlayerMoveMissed: getPlayerAnimationType: ld a, [wPlayerMoveEffect] and a - ld a, 4 ; move has no effect other than dealing damage + ld a, ANIMATIONTYPE_BLINK_ENEMY_MON_SPRITE ; move has no effect other than dealing damage jr z, playPlayerMoveAnimation - ld a, 5 ; move has effect + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ; move has effect playPlayerMoveAnimation: push af ld a, [wPlayerBattleStatus2] @@ -5681,9 +5681,9 @@ handleIfEnemyMoveMissed: GetEnemyAnimationType: ld a, [wEnemyMoveEffect] and a - ld a, $1 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_VERTICALLY jr z, playEnemyMoveAnimation - ld a, $2 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_HEAVY jr playEnemyMoveAnimation handleExplosionMiss: call SwapPlayerAndEnemyLevels @@ -6752,9 +6752,11 @@ HandleExplodingAnimation: ld a, [wMoveMissed] and a ret nz - ld a, 5 + ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ld [wAnimationType], a - + assert ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH + ; ld a, MEGA_PUNCH +; fallthrough PlayMoveAnimation: ld [wAnimationID], a vc_hook_red Reduce_move_anim_flashing_Confusion 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 diff --git a/includes.asm b/includes.asm index 271828b9..6253859b 100644 --- a/includes.asm +++ b/includes.asm @@ -23,6 +23,7 @@ INCLUDE "constants/serial_constants.asm" INCLUDE "constants/script_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_anim_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/move_animation_constants.asm" INCLUDE "constants/move_effect_constants.asm" |