From b0f1ed73f60cbcc00f79754f5b5beb5f931ee9b5 Mon Sep 17 00:00:00 2001 From: TheFakeMateo Date: Mon, 3 Dec 2018 20:55:58 -0600 Subject: [PATCH] A few missed move changes --- data/moves.asm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/moves.asm b/data/moves.asm index e06066188..a11ac1a00 100755 --- a/data/moves.asm +++ b/data/moves.asm @@ -28,7 +28,7 @@ MoveEnd: move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 move GUST, NO_ADDITIONAL_EFFECT, 40, FLYING, 100, 35 move WING_ATTACK, NO_ADDITIONAL_EFFECT, 60, FLYING, 100, 35 - move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 + move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 move FLY, FLY_EFFECT, 90, FLYING, 95, 15 move BIND, TRAPPING_EFFECT, 15, NORMAL, 85, 20 move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 @@ -60,7 +60,7 @@ MoveEnd: move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 - move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 + move DISABLE, DISABLE_EFFECT, 0, NORMAL, 100, 20 move ACID, SPECIAL_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 move FLAMETHROWER, BURN_SIDE_EFFECT1, 90, FIRE, 100, 15 @@ -81,12 +81,12 @@ MoveEnd: move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20 move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15 - move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 25 - move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 15 + move ABSORB, DRAIN_HP_EFFECT, 40, GRASS, 100, 15 + move MEGA_DRAIN, DRAIN_HP_EFFECT, 75, GRASS, 100, 10 move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 move GROWTH, GROWTH_EFFECT, 0, NORMAL, 100, 20 move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 - move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 + move SOLARBEAM, CHARGE_EFFECT, 200, GRASS, 100, 10 move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 @@ -96,13 +96,13 @@ MoveEnd: move FIRE_SPIN, TRAPPING_EFFECT, 35, FIRE, 85, 15 move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 90, ELECTRIC, 100, 15 - move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 + move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 90, 20 move THUNDER, PARALYZE_SIDE_EFFECT1, 110, ELECTRIC, 70, 10 move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 90, 15 move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 move DIG, CHARGE_EFFECT, 80, GROUND, 100, 10 - move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 + move TOXIC, POISON_EFFECT, 0, POISON, 90, 10 move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25 move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10 move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC, 60, 20 @@ -115,14 +115,14 @@ MoveEnd: move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 - move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 + move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 10 move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 - move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 + move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 10 move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 - move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 30 + move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 20 move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC, 100, 30 move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 move REFLECT, REFLECT_EFFECT, 0, PSYCHIC, 100, 20 @@ -147,21 +147,21 @@ MoveEnd: move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15 move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 move HI_JUMP_KICK, JUMP_KICK_EFFECT, 130, FIGHTING, 90, 10 - move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 + move GLARE, PARALYZE_EFFECT, 0, NORMAL, 100, 30 move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15 move POISON_GAS, POISON_EFFECT, 0, POISON, 90, 40 move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 - move LEECH_LIFE, DRAIN_HP_EFFECT, 80, BUG, 100, 15 + move LEECH_LIFE, DRAIN_HP_EFFECT, 80, BUG, 100, 10 move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 - move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 + move SKY_ATTACK, CHARGE_EFFECT, 200, FLYING, 90, 5 move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 40, WATER, 100, 30 move DIZZY_PUNCH, CONFUSION_SIDE_EFFECT, 70, NORMAL, 100, 10 move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 - move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 + move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 100, 15 move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 - move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 + move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 20 move CRABHAMMER, NO_ADDITIONAL_EFFECT, 100, WATER, 90, 10 move EXPLOSION, EXPLODE_EFFECT, 250, NORMAL, 100, 5 move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 @@ -208,7 +208,7 @@ MoveEnd: move SURF, NO_ADDITIONAL_EFFECT, 90, WATER, 100, 10 ; Aqua Tail move AURORA_BEAM, HYPER_BEAM_EFFECT, 150, WATER, 90, 5 ; Hydro Cannon move VINE_WHIP, HYPER_BEAM_EFFECT, 150, GRASS, 90, 5 ; Frenzy Plant - move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, DARK, 100, 5 ; Sucker Punch + move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 70, DARK, 100, 5 ; Sucker Punch move BARRAGE, SPECIAL_DOWN_SIDE_EFFECT, 80, GHOST, 100, 15 ; Shadow Ball move EMBER, BURN_SIDE_EFFECT1, 60, FIRE, 100, 25 ; Flame Wheel move FOCUS_ENERGY, HEAL_EFFECT, 0, FAIRY, 100, 20 ; Moonlight