diff options
Diffstat (limited to 'battle/moves/moves.asm')
| -rw-r--r-- | battle/moves/moves.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index ac9f49300..43ba6f10d 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -28,9 +28,9 @@ ENDM move CUT, EFFECT_NORMAL_HIT, 50, NORMAL, 95, 30, 0 move GUST, EFFECT_GUST, 40, FLYING, 100, 35, 0 move WING_ATTACK, EFFECT_NORMAL_HIT, 60, FLYING, 100, 35, 0 - move WHIRLWIND, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0 + move WHIRLWIND, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move FLY, EFFECT_FLY, 70, FLYING, 95, 15, 0 - move BIND, EFFECT_BIND, 15, NORMAL, 75, 20, 0 + move BIND, EFFECT_TRAP_TARGET, 15, NORMAL, 75, 20, 0 move SLAM, EFFECT_NORMAL_HIT, 80, NORMAL, 75, 20, 0 move VINE_WHIP, EFFECT_NORMAL_HIT, 35, GRASS, 100, 10, 0 move STOMP, EFFECT_STOMP, 65, NORMAL, 100, 20, 30 @@ -45,18 +45,18 @@ ENDM move HORN_DRILL, EFFECT_OHKO, 1, NORMAL, 30, 5, 0 move TACKLE, EFFECT_NORMAL_HIT, 35, NORMAL, 95, 35, 0 move BODY_SLAM, EFFECT_PARALYZE_HIT, 85, NORMAL, 100, 15, 30 - move WRAP, EFFECT_BIND, 15, NORMAL, 85, 20, 0 + move WRAP, EFFECT_TRAP_TARGET, 15, NORMAL, 85, 20, 0 move TAKE_DOWN, EFFECT_RECOIL_HIT, 90, NORMAL, 85, 20, 0 move THRASH, EFFECT_RAMPAGE, 90, NORMAL, 100, 20, 0 move DOUBLE_EDGE, EFFECT_RECOIL_HIT, 120, NORMAL, 100, 15, 0 move TAIL_WHIP, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move POISON_STING, EFFECT_POISON_HIT, 15, POISON, 100, 35, 30 - move TWINEEDLE, EFFECT_TWINEEDLE, 25, BUG, 100, 20, 20 + move TWINEEDLE, EFFECT_POISON_MULTI_HIT, 25, BUG, 100, 20, 20 move PIN_MISSILE, EFFECT_MULTI_HIT, 14, BUG, 85, 20, 0 move LEER, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move BITE, EFFECT_FLINCH_HIT, 60, DARK, 100, 25, 30 move GROWL, EFFECT_ATTACK_DOWN, 0, NORMAL, 100, 40, 0 - move ROAR, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0 + move ROAR, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move SING, EFFECT_SLEEP, 0, NORMAL, 55, 15, 0 move SUPERSONIC, EFFECT_CONFUSE, 0, NORMAL, 55, 20, 0 move SONICBOOM, EFFECT_STATIC_DAMAGE, 20, NORMAL, 90, 20, 0 @@ -93,7 +93,7 @@ ENDM move PETAL_DANCE, EFFECT_RAMPAGE, 70, GRASS, 100, 20, 0 move STRING_SHOT, EFFECT_SPEED_DOWN, 0, BUG, 95, 40, 0 move DRAGON_RAGE, EFFECT_STATIC_DAMAGE, 40, DRAGON, 100, 10, 0 - move FIRE_SPIN, EFFECT_BIND, 15, FIRE, 70, 15, 0 + move FIRE_SPIN, EFFECT_TRAP_TARGET, 15, FIRE, 70, 15, 0 move THUNDERSHOCK, EFFECT_PARALYZE_HIT, 40, ELECTRIC, 100, 30, 10 move THUNDERBOLT, EFFECT_PARALYZE_HIT, 95, ELECTRIC, 100, 15, 10 move THUNDER_WAVE, EFFECT_PARALYZE, 0, ELECTRIC, 100, 20, 0 @@ -124,13 +124,13 @@ ENDM move DEFENSE_CURL, EFFECT_DEFENSE_CURL, 0, NORMAL, 100, 40, 0 move BARRIER, EFFECT_DEFENSE_UP_2, 0, PSYCHIC, 100, 30, 0 move LIGHT_SCREEN, EFFECT_LIGHT_SCREEN, 0, PSYCHIC, 100, 30, 0 - move HAZE, EFFECT_HAZE, 0, ICE, 100, 30, 0 + move HAZE, EFFECT_RESET_STATS, 0, ICE, 100, 30, 0 move REFLECT, EFFECT_REFLECT, 0, PSYCHIC, 100, 20, 0 move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY, 0, NORMAL, 100, 30, 0 move BIDE, EFFECT_BIDE, 0, NORMAL, 100, 10, 0 move METRONOME, EFFECT_METRONOME, 0, NORMAL, 100, 10, 0 move MIRROR_MOVE, EFFECT_MIRROR_MOVE, 0, FLYING, 100, 20, 0 - move SELFDESTRUCT, EFFECT_EXPLOSION, 200, NORMAL, 100, 5, 0 + move SELFDESTRUCT, EFFECT_SELFDESTRUCT, 200, NORMAL, 100, 5, 0 move EGG_BOMB, EFFECT_NORMAL_HIT, 100, NORMAL, 75, 10, 0 move LICK, EFFECT_PARALYZE_HIT, 20, GHOST, 100, 30, 30 move SMOG, EFFECT_POISON_HIT, 20, POISON, 70, 20, 40 @@ -138,7 +138,7 @@ ENDM move BONE_CLUB, EFFECT_FLINCH_HIT, 65, GROUND, 85, 20, 10 move FIRE_BLAST, EFFECT_BURN_HIT, 120, FIRE, 85, 5, 10 move WATERFALL, EFFECT_NORMAL_HIT, 80, WATER, 100, 15, 0 - move CLAMP, EFFECT_BIND, 35, WATER, 75, 10, 0 + move CLAMP, EFFECT_TRAP_TARGET, 35, WATER, 75, 10, 0 move SWIFT, EFFECT_ALWAYS_HIT, 60, NORMAL, 100, 20, 0 move SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, 100, 15, 0 move SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, 100, 15, 0 @@ -163,7 +163,7 @@ ENDM move SPLASH, EFFECT_SPLASH, 0, NORMAL, 100, 40, 0 move ACID_ARMOR, EFFECT_DEFENSE_UP_2, 0, POISON, 100, 40, 0 move CRABHAMMER, EFFECT_NORMAL_HIT, 90, WATER, 85, 10, 0 - move EXPLOSION, EFFECT_EXPLOSION, 250, NORMAL, 100, 5, 0 + move EXPLOSION, EFFECT_SELFDESTRUCT, 250, NORMAL, 100, 5, 0 move FURY_SWIPES, EFFECT_MULTI_HIT, 18, NORMAL, 80, 15, 0 move BONEMERANG, EFFECT_DOUBLE_HIT, 50, GROUND, 90, 10, 0 move REST, EFFECT_HEAL, 0, PSYCHIC, 100, 10, 0 @@ -221,7 +221,7 @@ ENDM move MILK_DRINK, EFFECT_HEAL, 0, NORMAL, 100, 10, 0 move SPARK, EFFECT_PARALYZE_HIT, 65, ELECTRIC, 100, 20, 30 move FURY_CUTTER, EFFECT_FURY_CUTTER, 10, BUG, 95, 20, 0 - move STEEL_WING, EFFECT_STEEL_WING, 70, STEEL, 90, 25, 10 + move STEEL_WING, EFFECT_DEFENSE_UP_HIT, 70, STEEL, 90, 25, 10 move MEAN_LOOK, EFFECT_MEAN_LOOK, 0, NORMAL, 100, 5, 0 move ATTRACT, EFFECT_ATTRACT, 0, NORMAL, 100, 15, 0 move SLEEP_TALK, EFFECT_SLEEP_TALK, 0, NORMAL, 100, 10, 0 @@ -242,7 +242,7 @@ ENDM move RAPID_SPIN, EFFECT_RAPID_SPIN, 20, NORMAL, 100, 40, 0 move SWEET_SCENT, EFFECT_EVASION_DOWN, 0, NORMAL, 100, 20, 0 move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 75, 15, 30 - move METAL_CLAW, EFFECT_METAL_CLAW, 50, STEEL, 95, 35, 10 + move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 50, STEEL, 95, 35, 10 move VITAL_THROW, EFFECT_ALWAYS_HIT, 70, FIGHTING, 100, 10, 0 move MORNING_SUN, EFFECT_MORNING_SUN, 0, NORMAL, 100, 5, 0 move SYNTHESIS, EFFECT_SYNTHESIS, 0, GRASS, 100, 5, 0 @@ -256,9 +256,9 @@ ENDM move MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC, 100, 20, 0 move PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, 100, 10, 0 move EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, 100, 5, 0 - move ANCIENTPOWER, EFFECT_ANCIENTPOWER, 60, ROCK, 100, 5, 10 + move ANCIENTPOWER, EFFECT_ALL_UP_HIT, 60, ROCK, 100, 5, 10 move SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20 move FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC, 90, 15, 0 move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 - move WHIRLPOOL, EFFECT_BIND, 15, WATER, 70, 15, 0 + move WHIRLPOOL, EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 |