diff options
author | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
commit | eb47bda8ee5c1f002236200df36012de9e243a97 (patch) | |
tree | fc69fc5435582efebd36fc54414673dd8ac7f646 /constants/move_constants.asm | |
parent | d07a66662728225c1422fed1072281dee71a2c9e (diff) | |
parent | 95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1 (diff) |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants/move_constants.asm')
-rw-r--r-- | constants/move_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/move_constants.asm b/constants/move_constants.asm index ecc28078..52c44210 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -170,10 +170,8 @@ const SUPER_FANG ; a2 const SLASH ; a3 const SUBSTITUTE ; a4 - -NUM_ATTACKS EQU const_value - 1 - const STRUGGLE ; a5 +NUM_ATTACKS EQU const_value - 1 ; Moves do double duty as animation identifiers. @@ -214,3 +212,5 @@ NUM_ATTACKS EQU const_value - 1 const HIDEPIC_ANIM ; monster disappears const ROCK_ANIM ; throw rock const BAIT_ANIM ; throw bait + +NUM_ATTACK_ANIMS EQU const_value - 1 |