diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
| commit | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch) | |
| tree | 9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /include/battle_move_effects.h | |
| parent | 9840be1f0041e697f1aefbdc839a5227b7100112 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into clock
Diffstat (limited to 'include/battle_move_effects.h')
| -rw-r--r-- | include/battle_move_effects.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_move_effects.h b/include/battle_move_effects.h index 4a9415379..23c19ded7 100644 --- a/include/battle_move_effects.h +++ b/include/battle_move_effects.h @@ -153,12 +153,12 @@ enum EFFECT_EARTHQUAKE, EFFECT_FUTURE_SIGHT, EFFECT_GUST, - EFFECT_FLINCH_HIT_2, // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM + EFFECT_STOMP, // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM EFFECT_SOLARBEAM, EFFECT_THUNDER, EFFECT_TELEPORT, EFFECT_BEAT_UP, - EFFECT_FLY, + EFFECT_SEMI_INVULNERABLE, EFFECT_DEFENSE_CURL, EFFECT_SOFTBOILED, EFFECT_FAKE_OUT, |