diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-11 15:47:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 15:47:19 -0400 |
| commit | aa97e196dd5b37e89db5ddf154dc7aea9b02a045 (patch) | |
| tree | c994a1ca8f587d674e680ec808e7fcbaab4d053d /constants/move_effect_constants.asm | |
| parent | 54d76dec388a70260aad6ef6acb94a5b9f95fd6d (diff) | |
| parent | 3e572b6f48b81e5340980c13b1b37b2907942713 (diff) | |
Merge pull request #269 from Rangi42/master
Remove enum; add const_skip and const_next
Diffstat (limited to 'constants/move_effect_constants.asm')
| -rw-r--r-- | constants/move_effect_constants.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 36a60a41..54fc4896 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -5,7 +5,7 @@ const_def const NO_ADDITIONAL_EFFECT ; $00 - const UNUSED_EFFECT_01 ; $01 + const_skip ; $01 const POISON_SIDE_EFFECT1 ; $02 const DRAIN_HP_EFFECT ; $03 const BURN_SIDE_EFFECT1 ; $04 @@ -34,12 +34,12 @@ const THRASH_PETAL_DANCE_EFFECT ; $1B const SWITCH_AND_TELEPORT_EFFECT ; $1C const TWO_TO_FIVE_ATTACKS_EFFECT ; $1D - const UNUSED_EFFECT_1E ; $1E + const_skip ; $1E const FLINCH_SIDE_EFFECT1 ; $1F const SLEEP_EFFECT ; $20 const POISON_SIDE_EFFECT2 ; $21 const BURN_SIDE_EFFECT2 ; $22 - const UNUSED_EFFECT_23 ; $23 + const_skip ; $23 const PARALYZE_SIDE_EFFECT2 ; $24 const FLINCH_SIDE_EFFECT2 ; $25 const OHKO_EFFECT ; $26 moves like Horn Drill @@ -76,13 +76,13 @@ const DEFENSE_DOWN_SIDE_EFFECT ; $45 const SPEED_DOWN_SIDE_EFFECT ; $46 const SPECIAL_DOWN_SIDE_EFFECT ; $47 - const UNUSED_EFFECT_48 ; $48 - const UNUSED_EFFECT_49 ; $49 - const UNUSED_EFFECT_4A ; $4A - const UNUSED_EFFECT_4B ; $4B + const_skip ; $48 + const_skip ; $49 + const_skip ; $4A + const_skip ; $4B const CONFUSION_SIDE_EFFECT ; $4C const TWINEEDLE_EFFECT ; $4D - const UNUSED_EFFECT_4E ; $4E + const_skip ; $4E const SUBSTITUTE_EFFECT ; $4F const HYPER_BEAM_EFFECT ; $50 const RAGE_EFFECT ; $51 |