diff --git a/src/data/abilities.h b/src/data/abilities.h index 9e60122d2c..f9a3adc96c 100644 --- a/src/data/abilities.h +++ b/src/data/abilities.h @@ -194,7 +194,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] = [ABILITY_WONDER_GUARD] = { .name = _("Wonder Guard"), - .description = COMPOUND_STRING("“Supereffective” hits."), + .description = COMPOUND_STRING("Only “Supereffective” hits."), .aiRating = 10, .cantBeCopied = TRUE, .cantBeSwapped = TRUE, @@ -2176,7 +2176,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] = [ABILITY_GOOD_AS_GOLD] = { .name = _("Good as Gold"), - .description = COMPOUND_STRING("Avoids status problems."), + .description = COMPOUND_STRING("Avoids status moves."), .aiRating = 8, .breakable = TRUE, }, diff --git a/src/data/moves_info.h b/src/data/moves_info.h index 45d7607023..3ed1de6df2 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -40,8 +40,8 @@ static const u8 sHyperBeamDescription[] = _( #endif static const u8 sRevengeDescription[] = _( - "An attack that gains power\n" - "if injured by the foe."); + "An attack that moves last\n" + "and gains power if hit."); static const u8 sPluckDescription[] = _( "Eats the foe's held Berry\n" @@ -64,8 +64,8 @@ static const u8 sStormThrowDescription[] = _( "in a critical hit."); static const u8 sCircleThrowDescription[] = _( - "Knocks the foe away to end\n" - "the battle."); + "Knocks foe away to switch\n" + "it out or end wild battle."); static const u8 sChipAwayDescription[] = _( "Strikes through the foe's\n" @@ -418,7 +418,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Guillotine"), .description = COMPOUND_STRING( "A powerful pincer attack\n" - "that may cause fainting."), + "that KOs if it hits."), .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -440,8 +440,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Razor Wind"), .description = COMPOUND_STRING( - "A 2-turn move that strikes\n" - "the foe on the 2nd turn."), + "A 2-turn move with a high\n" + "critical-hit ratio."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -560,8 +560,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Whirlwind"), .description = COMPOUND_STRING( - "Blows away the foe with\n" - "wind and ends the battle."), + "Blows away the foe, switches\n" + "it out or ends wild battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -803,7 +803,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Rolling Kick"), .description = COMPOUND_STRING( "A fast kick delivered from\n" - "a rapid spin."), + "a rapid spin. May flinch."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -1155,8 +1155,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Twineedle"), .description = COMPOUND_STRING( - "Stingers on the forelegs\n" - "jab the foe twice."), + "Foreleg stingers jab foe\n" + "twice. May poison."), .effect = EFFECT_HIT, .power = 25, .type = TYPE_BUG, @@ -1204,7 +1204,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Leer"), .description = COMPOUND_STRING( - "Frightens the foe with a\n" + "Frightens the foes with a\n" "leer to lower Defense."), .effect = EFFECT_DEFENSE_DOWN, .power = 0, @@ -1280,8 +1280,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Roar"), .description = COMPOUND_STRING( - "Makes the foe flee to end\n" - "the battle."), + "Switches the foe out\n" + "or ends wild battle."), .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -1385,8 +1385,14 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Disable"), .description = COMPOUND_STRING( - "Psychically disables one of\n" - "the foe's moves."), + #if B_DISABLE_TURNS >= GEN_5 + "For 4 turns, prevents foe\n" + #elif B_DISABLE_TURNS == GEN_4 + "For 4-7 turns, prevents foe\n" + #else + "For 2-5 turns, prevents foe\n" + #endif + "from using last used move."), #if B_UPDATED_MOVE_DATA >= GEN_5 .accuracy = 100, #elif B_UPDATED_MOVE_DATA == GEN_4 @@ -1497,7 +1503,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Mist"), .description = COMPOUND_STRING( "Creates a mist that stops\n" - "reduction of abilities."), + "reduction of stats."), .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -1566,7 +1572,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Surf"), .description = COMPOUND_STRING( "Creates a huge wave, then\n" - "crashes it down on the foe."), + #if B_UPDATED_MOVE_DATA >= GEN_4 + "crashes it down on the field."), + #else + "crashes it down on the foes."), + #endif .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 90 : 95, .type = TYPE_WATER, @@ -1621,7 +1631,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Blizzard"), .description = COMPOUND_STRING( - "Hits the foe with an icy\n" + "Hits the foes with an icy\n" #if B_USE_FROSTBITE == TRUE "storm. May cause frostbite."), #else @@ -2023,7 +2033,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Razor Leaf"), .description = COMPOUND_STRING( - "Cuts the enemy with leaves.\n" + "Cuts enemies with leaves.\n" "High critical-hit ratio."), .effect = EFFECT_HIT, .power = 55, @@ -2384,8 +2394,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Earthquake"), .description = COMPOUND_STRING( - "A powerful quake, but has\n" - "no effect on flying foes."), + "A powerful quake that\n" + "hits all other POKéMON."), .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -2658,9 +2668,15 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = [MOVE_TELEPORT] = { .name = COMPOUND_STRING("Teleport"), + #if B_TELEPORT_BEHAVIOUR >= GEN_8 + .description = COMPOUND_STRING( + "Switches the user out last.\n" + "Flees when used by wild {PKMN}.") + #else .description = COMPOUND_STRING( "A psychic move for fleeing\n" "from battle instantly."), + #endif .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -2705,7 +2721,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Mimic"), .description = COMPOUND_STRING( - "Copies a move used by the\n" + "Copies last move used by the\n" "foe during one battle."), .effect = EFFECT_MIMIC, .power = 0, @@ -2847,8 +2863,12 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Minimize"), .description = COMPOUND_STRING( - "Minimizes the user's size\n" - "to raise evasiveness."), + "Minimizes the user's size to\n" + #if B_MINIMIZE_EVASION >= GEN_5 + "sharply raise evasiveness."), + #else + "raise evasiveness."), + #endif .effect = EFFECT_MINIMIZE, .power = 0, .type = TYPE_NORMAL, @@ -2999,8 +3019,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Light Screen"), .description = COMPOUND_STRING( - "Creates a wall of light that\n" - "lowers Sp. Atk damage."), + "Wall of light cuts special\n" + "damage for 5 turns."), .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -3051,8 +3071,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Reflect"), .description = COMPOUND_STRING( - "Creates a wall of light that\n" - "weakens physical attacks."), + "Wall of light cuts physical\n" + "damage for 5 turns."), .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -3364,8 +3384,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Waterfall"), .description = COMPOUND_STRING( - "Charges the foe with speed\n" - "to climb waterfalls."), + "Charges with speed to climb\n" + "waterfalls. May flinch."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -3682,7 +3702,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Poison Gas"), .description = COMPOUND_STRING( + #if B_UPDATED_MOVE_DATA >= GEN_5 + "Envelops the foes in a toxic\n" + #else "Envelops the foe in a toxic\n" + #endif "gas that may poison."), #if B_UPDATED_MOVE_DATA >= GEN_6 .accuracy = 90, @@ -3784,8 +3808,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Sky Attack"), .description = COMPOUND_STRING( - "Searches out weak spots,\n" - "then strikes the next turn."), + "2-turn attack. High critical\n" + "hit ratio, and may flinch."), .effect = EFFECT_TWO_TURNS_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -4223,7 +4247,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Conversion"), .description = COMPOUND_STRING( "Changes the user's type\n" + #if B_UPDATED_CONVERSION >= GEN_6 + "into first known move's type."), + #else "into a known move's type."), + #endif .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -4248,8 +4276,12 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Tri Attack"), .description = COMPOUND_STRING( - "Fires three types of beams\n" - "at the same time."), + "Fires three types of beams.\n" + #if B_USE_FROSTBITE == TRUE + "May burn/para/frostbite."), + #else + "May burn/paralyze/freeze."), + #endif .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -4577,8 +4609,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Snore"), .description = COMPOUND_STRING( - "A loud attack that can be\n" - "used only while asleep."), + "A loud attack that can only\n" + "be used asleep. May flinch."), .effect = EFFECT_SNORE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 40, .type = TYPE_NORMAL, @@ -4705,7 +4737,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Cotton Spore"), .description = COMPOUND_STRING( + #if B_UPDATED_MOVE_DATA >= GEN_6 + "Spores cling to the foes,\n" + #else "Spores cling to the foe,\n" + #endif "sharply reducing Speed."), .effect = EFFECT_SPEED_DOWN_2, .power = 0, @@ -4754,7 +4790,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Spite"), .description = COMPOUND_STRING( "Spitefully cuts the PP\n" - "of the foe's last move."), + #if B_PP_REDUCED_BY_SPITE >= GEN_4 + "of the foe's last move by 4."), + #else + "of foe's last move by 2-5."), + #endif .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -4778,7 +4818,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Powder Snow"), .description = COMPOUND_STRING( - "Blasts the foe with a snowy\n" + "Blasts the foes with a snowy\n" #if B_USE_FROSTBITE == TRUE "gust. May cause frostbite."), #else @@ -4928,7 +4968,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Belly Drum"), .description = COMPOUND_STRING( "Maximizes Attack while\n" - "sacrificing HP."), + "sacrificing half of max HP."), .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -5445,7 +5485,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Swagger"), .description = COMPOUND_STRING( "Confuses the foe, but also\n" - "sharply raises Attack."), + "sharply raises its Attack."), .effect = EFFECT_SWAGGER, .power = 0, .type = TYPE_NORMAL, @@ -5758,8 +5798,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Safeguard"), .description = COMPOUND_STRING( - "A mystical force prevents\n" - "all status problems."), + "Protects allies from status\n" + "problems for 5 turns."), .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -5908,8 +5948,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Dragon Breath"), .description = COMPOUND_STRING( - "Strikes the foe with an\n" - "incredible blast of breath."), + "Strikes the foe with a blast\n" + "of breath. May paralyze."), .effect = EFFECT_HIT, .power = 60, .type = TYPE_DRAGON, @@ -5961,7 +6001,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Encore"), .description = COMPOUND_STRING( "Makes the foe repeat its\n" - "last move over 2 to 6 turns."), + "last move over 3 turns."), .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -6010,8 +6050,12 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Rapid Spin"), .description = COMPOUND_STRING( - "Spins the body at high\n" - "speed to strike the foe."), + "Spins attack that removes\n" + #if B_SPEED_BUFFING_RAPID_SPIN >= GEN_8 + "some effects and ups speed."), + #else + "certain effects."), + #endif .effect = EFFECT_RAPID_SPIN, .power = B_UPDATED_MOVE_DATA >= GEN_8 ? 50 : 20, .type = TYPE_NORMAL, @@ -6042,8 +6086,13 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Sweet Scent"), .description = COMPOUND_STRING( - "Allures the foe to reduce\n" + #if B_UPDATED_MOVE_DATA >= GEN_6 + "Allures the foes to harshly\n" + "reduce evasiveness."), + #else + "Allures the foes to reduce\n" "evasiveness."), + #endif .effect = B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -6225,8 +6274,13 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Hidden Power"), .description = COMPOUND_STRING( - "The effectiveness varies\n" + #if B_HIDDEN_POWER_DMG >= GEN_6 + "The type varies\n" "with the user."), + #else + "The type and effectiveness\n" + "vary with the user."), + #endif .power = B_HIDDEN_POWER_DMG >= GEN_6 ? 60 : 1, .effect = EFFECT_HIDDEN_POWER, .type = TYPE_NORMAL, @@ -6272,7 +6326,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Twister"), .description = COMPOUND_STRING( "Whips up a vicious twister\n" - "to tear at the foe."), + "to tear at foes. May flinch."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_DRAGON, @@ -6410,7 +6464,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Psych Up"), .description = COMPOUND_STRING( - "Copies the foe's effect(s)\n" + "Copies foe's stat changes\n" "and gives to the user."), .effect = EFFECT_PSYCH_UP, .power = 0, @@ -6620,8 +6674,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Fake Out"), .description = COMPOUND_STRING( - "A 1st-turn, 1st-strike move\n" - "that causes flinching."), + "Moves 1st and flinches. Only\n" + "works on user's 1st turn."), .priority = B_UPDATED_MOVE_DATA >= GEN_5 ? 3 : 1, .makesContact = B_UPDATED_MOVE_DATA >= GEN_4, .effect = EFFECT_FIRST_TURN_ONLY, @@ -6758,7 +6812,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Heat Wave"), .description = COMPOUND_STRING( "Exhales a hot breath on the\n" - "foe. May inflict a burn."), + "foes. May inflict a burn."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 95 : 100, .type = TYPE_FIRE, @@ -6889,8 +6943,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Memento"), .description = COMPOUND_STRING( - "The user faints and lowers\n" - "the foe's abilities."), + "The user faints and harshly\n" + "lowers foes Atk and Sp.Atk."), .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -6912,7 +6966,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Facade"), .description = COMPOUND_STRING( - "Boosts Attack when burned,\n" + "Boosts power when burned,\n" "paralyzed, or poisoned."), .effect = EFFECT_FACADE, .power = 70, @@ -6935,7 +6989,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Focus Punch"), .description = COMPOUND_STRING( - "A powerful loyalty attack.\n" + "Powerful attack, moves last.\n" "The user flinches if hit."), .effect = EFFECT_FOCUS_PUNCH, .power = 150, @@ -7051,7 +7105,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Charge"), .description = COMPOUND_STRING( "Charges power to boost the\n" - "electric move used next."), + "Electric move used next."), .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -7101,7 +7155,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Helping Hand"), .description = COMPOUND_STRING( - "Boosts the power of the\n" + "Boosts the power of ally\n" "recipient's moves."), .effect = EFFECT_HELPING_HAND, .power = 0, @@ -7157,7 +7211,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Role Play"), .description = COMPOUND_STRING( "Mimics the target and\n" - "copies its special ability."), + "copies its Ability."), .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -7437,8 +7491,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Endeavor"), .description = COMPOUND_STRING( - "Gains power if the user's HP\n" - "is lower than the foe's HP."), + "Cuts foe's HP to equal\n" + "user's HP."), .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -7717,7 +7771,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Tail Glow"), .description = COMPOUND_STRING( + #if B_UPDATED_MOVE_DATA >= GEN_5 + "Flash light that drastically\n" + #else "Flashes a light that sharply\n" + #endif "raises Sp. Atk."), .effect = B_UPDATED_MOVE_DATA >= GEN_5 ? EFFECT_SPECIAL_ATTACK_UP_3 : EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, @@ -7875,7 +7933,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Mud Sport"), .description = COMPOUND_STRING( "Covers the user in mud to\n" - "raise electrical resistance."), + "weaken all Electric moves."), + // in theory this should mention 5 turns (gen 6+) .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -8293,8 +8352,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Odor Sleuth"), .description = COMPOUND_STRING( - "Negates the foe's efforts\n" - "to heighten evasiveness."), + "Negate evasiveness and\n" + "Ghost type's immunities."), .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -8766,8 +8825,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Block"), .description = COMPOUND_STRING( - "Blocks the foe's way to\n" - "prevent escape."), + "Blocks the foe's way and\n" + "prevents escape."), .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -9008,9 +9067,15 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = [MOVE_VOLT_TACKLE] = { .name = COMPOUND_STRING("Volt Tackle"), + #if B_UPDATED_MOVE_DATA >= GEN_4 + .description = COMPOUND_STRING( + "A life-risking tackle that\n" + "hurts the user. May paralyze."), + #else .description = COMPOUND_STRING( "A life-risking tackle that\n" "slightly hurts the user."), + #endif .effect = EFFECT_HIT, .power = 120, .type = TYPE_ELECTRIC, @@ -9062,7 +9127,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Water Sport"), .description = COMPOUND_STRING( "The user becomes soaked to\n" - "raise resistance to fire."), + "weaken all Fire moves."), + // in theory this should mention 5 turns (gen6+) .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -9236,7 +9302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Doom Desire"), .description = COMPOUND_STRING( - "Summons strong sunlight to\n" + "Summons strong light to\n" "attack 2 turns later."), .effect = EFFECT_FUTURE_SIGHT, .power = B_UPDATED_MOVE_DATA >= GEN_5 ? 140 : 120, @@ -9338,7 +9404,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Miracle Eye"), .description = COMPOUND_STRING( "Negate evasiveness and\n" - "Dark-type's immunities."), + "Dark type's immunities."), .effect = EFFECT_MIRACLE_EYE, .power = 0, .type = TYPE_PSYCHIC, @@ -9362,7 +9428,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Wake-Up Slap"), .description = COMPOUND_STRING( "Powerful against sleeping\n" - "foes, but also heals them."), + "foes, but also wakes them."), .effect = EFFECT_DOUBLE_POWER_ON_ARG_STATUS, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 70 : 60, .type = TYPE_FIGHTING, @@ -9461,7 +9527,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Brine"), .description = COMPOUND_STRING( "Does double damage to foes\n" - "with half HP."), + "with half HP or less."), .effect = EFFECT_BRINE, .power = 65, .type = TYPE_WATER, @@ -9552,8 +9618,12 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Tailwind"), .description = COMPOUND_STRING( - "Whips up a turbulent breeze\n" - "that raises Speed."), + "Whips up a breeze, doubling\n" + #if B_TAILWIND_TURNS >= GEN_5 + "ally Speed for 4 turns."), + #else + "ally Speed for 3 turns."), + #endif .effect = EFFECT_TAILWIND, .power = 0, .type = TYPE_FLYING, @@ -9802,8 +9872,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Heal Block"), .description = COMPOUND_STRING( - "Prevents the foe from\n" - "recovering any HP."), + "Prevents the foes from\n" + "recovering HP for 5 turns."), .effect = EFFECT_HEAL_BLOCK, .power = 0, .type = TYPE_PSYCHIC, @@ -9871,7 +9941,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Gastro Acid"), .description = COMPOUND_STRING( "Stomach acid suppresses\n" - "the foe's ability."), + "the foe's Ability."), .effect = EFFECT_GASTRO_ACID, .power = 0, .type = TYPE_POISON, @@ -10027,8 +10097,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Punishment"), .description = COMPOUND_STRING( - "Does more damage if the\n" - "foe has powered up."), + "Does more damage the more\n" + "the foe has powered up."), .effect = EFFECT_PUNISHMENT, .power = 60, .type = TYPE_DARK, @@ -10846,7 +10916,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Ice Shard"), .description = COMPOUND_STRING( "Hurls a chunk of ice that\n" - "always strike first."), + "always strikes first."), .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -11231,8 +11301,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Discharge"), .description = COMPOUND_STRING( - "Zaps the foes with electri-\n" - "city. May paralyze them."), + "Zaps all other {PKMN} with\n" + "electricity. May paralyze."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_ELECTRIC, @@ -11935,7 +12005,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Dark Void"), .description = COMPOUND_STRING( - "Drags the foe into total\n" + "Drags the foes into total\n" "darkness, inducing Sleep."), .effect = EFFECT_DARK_VOID, .power = 0, @@ -12372,7 +12442,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Sludge Wave"), .description = COMPOUND_STRING( - "Swamps the foe with a wave\n" + "Swamps all others with a wave\n" "of sludge. May also poison."), .effect = EFFECT_HIT, .power = 95, @@ -12446,7 +12516,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Synchronoise"), .description = COMPOUND_STRING( "An odd shock wave that only\n" - "damages same-type foes."), + "damages same-type {PKMN}."), .effect = EFFECT_SYNCHRONOISE, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 120 : 70, .type = TYPE_PSYCHIC, @@ -12488,8 +12558,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Soak"), .description = COMPOUND_STRING( - "Sprays water at the foe\n" - "making it Water-type."), + "Sprays water at the foe,\n" + "changing it to Water type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_WATER, @@ -12638,7 +12708,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Simple Beam"), .description = COMPOUND_STRING( "A beam that changes the\n" - "foe's ability to Simple."), + "foe's Ability to Simple."), .effect = EFFECT_SIMPLE_BEAM, .power = 0, .type = TYPE_NORMAL, @@ -12661,7 +12731,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Entrainment"), .description = COMPOUND_STRING( "Makes the foe mimic the\n" - "user, gaining its ability."), + "user, gaining its Ability."), .effect = EFFECT_ENTRAINMENT, .power = 0, .type = TYPE_NORMAL, @@ -12683,7 +12753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("After You"), .description = COMPOUND_STRING( - "Helps out the foe, letting\n" + "Helps out the target, letting\n" "it move next."), .effect = EFFECT_AFTER_YOU, .power = 0, @@ -12901,8 +12971,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Shell Smash"), .description = COMPOUND_STRING( - "Raises offensive stats, but\n" - "lowers defensive stats."), + "Sharply raises Atk/Sp.Atk/\n" + "Speed, but drops Def/Sp.Def."), .effect = EFFECT_SHELL_SMASH, .power = 0, .type = TYPE_NORMAL, @@ -13325,7 +13395,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Struggle Bug"), .description = COMPOUND_STRING( "Resisting, the user attacks\n" - "the foe. Lowers Sp. Atk."), + "the foes. Lowers Sp. Atk."), .effect = EFFECT_HIT, .power = B_UPDATED_MOVE_DATA >= GEN_6 ? 50 : 30, .type = TYPE_BUG, @@ -13350,7 +13420,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Bulldoze"), .description = COMPOUND_STRING( "Stomps down on the ground.\n" - "Lowers Speed."), + "Hits all and lowers Speed."), .effect = EFFECT_EARTHQUAKE, .power = 60, .type = TYPE_GROUND, @@ -13442,7 +13512,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Electroweb"), .description = COMPOUND_STRING( - "Snares the foe with an\n" + "Snares the foes with an\n" "electric net. Lowers Speed."), .effect = EFFECT_HIT, .power = 55, @@ -13973,7 +14043,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Glaciate"), .description = COMPOUND_STRING( "Blows very cold air at the\n" - "foe. It lowers their Speed."), + "foes. It lowers their Speed."), .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -14284,8 +14354,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Mat Block"), .description = COMPOUND_STRING( - "Evades damaging moves\n" - "for one turn."), + "Evades damaging moves.\n" + "Only works on 1st turn."), .effect = EFFECT_MAT_BLOCK, .power = 0, .type = TYPE_FIGHTING, @@ -14445,8 +14515,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Trick-or-Treat"), .description = COMPOUND_STRING( - "Goes trick-or-treating\n" - "making the foe Ghost-type."), + "Goes trick-or-treating,\n" + "adding Ghost type to foe."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GHOST, @@ -14541,8 +14611,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Forest's Curse"), .description = COMPOUND_STRING( - "Puts a curse on the foe\n" - "making the foe Grass-type."), + "Puts a curse on the foe,\n" + "adding the Grass type."), .effect = EFFECT_THIRD_TYPE, .power = 0, .type = TYPE_GRASS, @@ -14566,7 +14636,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Petal Blizzard"), .description = COMPOUND_STRING( "Stirs up a violent storm\n" - "of petals to attack."), + "of petals to attack all."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_GRASS, @@ -15234,7 +15304,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Venom Drench"), .description = COMPOUND_STRING( "Lowers the Attack, Sp. Atk\n" - "and Speed of a poisoned foe."), + "and Speed of poisoned foes."), .effect = EFFECT_VENOM_DRENCH, .power = 0, .type = TYPE_POISON, @@ -16196,7 +16266,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Throat Chop"), .description = COMPOUND_STRING( "Chops the throat to disable\n" - "sound moves for a while."), + "sound moves for 2 turns."), .effect = EFFECT_HIT, .power = 80, .type = TYPE_DARK, @@ -16487,7 +16557,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Core Enforcer"), .description = COMPOUND_STRING( "Hits with a ray that\n" - "nullifies the foe's ability."), + "nullifies the foe's Ability."), .effect = EFFECT_HIT, .power = 100, .type = TYPE_DRAGON, @@ -16563,7 +16633,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Beak Blast"), .description = COMPOUND_STRING( - "Heats up beak to attack.\n" + "Heats beak to attack last.\n" "Burns foe on contact."), .effect = EFFECT_BEAK_BLAST, .power = 100, @@ -17165,7 +17235,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Splishy Splash"), .description = COMPOUND_STRING( "A huge electrified wave that\n" - "may paralyze the foe."), + "may paralyze the foes."), .effect = EFFECT_HIT, .power = 90, .type = TYPE_WATER, @@ -17627,7 +17697,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Magic Powder"), .description = COMPOUND_STRING( "Magic powder changes the\n" - "target into a Psychic-type."), + "target into a Psychic type."), .effect = EFFECT_SOAK, .power = 0, .type = TYPE_PSYCHIC, @@ -19597,7 +19667,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = .name = COMPOUND_STRING("Tera Blast"), .description = COMPOUND_STRING( "If the user's Terastallized,\n" - "it hits with its Tera-type."), + "it hits with its Tera type."), .effect = EFFECT_TERA_BLAST, .power = 80, .type = TYPE_NORMAL, @@ -21006,8 +21076,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] = { .name = COMPOUND_STRING("Psychic Noise"), .description = COMPOUND_STRING( - "Unpleasant sound waves that\n" - "damage and prevent healing."), + "Sound waves that damage and\n" + "prevent healing for 2 turns."), .effect = EFFECT_HIT, .power = 75, .type = TYPE_PSYCHIC,