From 604ddc7148482ba38229b0d7bb203e01817dfd1e Mon Sep 17 00:00:00 2001 From: Prof-Holon Date: Thu, 2 Apr 2026 15:50:44 +0100 Subject: [PATCH] Distribution updates Also adding Cacophony and Snow Warning --- data/battle_scripts_1.s | 8 + include/constants/abilities.h | 4 +- include/constants/battle.h | 3 +- include/constants/battle_string_ids.h | 3 +- src/battle_message.c | 2 + src/battle_script_commands.c | 16 +- src/battle_util.c | 12 +- src/data/pokemon/species_info.h | 204 +++++++++++++------------- src/data/text/abilities.h | 6 +- 9 files changed, 150 insertions(+), 108 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1895bde37..d0249ebdf 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -4019,6 +4019,14 @@ BattleScript_DroughtActivates:: call BattleScript_WeatherFormChanges end3 +BattleScript_SnowWarningActivates:: + pause B_WAIT_TIME_SHORT + printstring STRINGID_PKMNSXSUMMONEDHAIL + waitstate + playanimation BS_BATTLER_0, B_ANIM_HAIL_CONTINUES + call BattleScript_WeatherFormChanges + end3 + BattleScript_TookAttack:: attackstring pause B_WAIT_TIME_SHORT diff --git a/include/constants/abilities.h b/include/constants/abilities.h index 4ad54c86f..02d473cc5 100644 --- a/include/constants/abilities.h +++ b/include/constants/abilities.h @@ -80,6 +80,8 @@ #define ABILITY_CACOPHONY 76 #define ABILITY_AIR_LOCK 77 -#define ABILITIES_COUNT 78 +#define ability_snow_warning 78 + +#define ABILITIES_COUNT 79 #endif // GUARD_CONSTANTS_ABILITIES_H diff --git a/include/constants/battle.h b/include/constants/battle.h index d46776ab9..c227dd7a4 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -214,7 +214,8 @@ #define B_WEATHER_SUN_PERMANENT (1 << 6) #define B_WEATHER_SUN (B_WEATHER_SUN_TEMPORARY | B_WEATHER_SUN_PERMANENT) #define B_WEATHER_HAIL_TEMPORARY (1 << 7) -#define B_WEATHER_HAIL (B_WEATHER_HAIL_TEMPORARY) +#define B_WEATHER_HAIL_PERMANENT (1 << 8) +#define B_WEATHER_HAIL (B_WEATHER_HAIL_TEMPORARY | B_WEATHER_HAIL_PERMANENT) #define B_WEATHER_ANY (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_SUN | B_WEATHER_HAIL) // Move Effects diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 9591c644f..c086632df 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -387,8 +387,9 @@ #define STRINGID_PKMNCHANGEDTOBOTHTYPE 386 //add to redefine conversion #define STRINGID_PKMNCOPIEDSECONDARYTYPE 387 //add to redefine conversion2 +#define STRINGID_PKMNSXSUMMONEDHAIL 388 //ADD snow warning -#define BATTLESTRINGS_COUNT 388 +#define BATTLESTRINGS_COUNT 389 // This is the string id that gBattleStringsTable starts with. // String ids before this (e.g. STRINGID_INTROMSG) are not in the table, diff --git a/src/battle_message.c b/src/battle_message.c index 81ea6d8b1..a272b2a41 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -352,6 +352,7 @@ static const u8 sText_SunlightFaded[] = _("The sunlight faded."); static const u8 sText_StartedHail[] = _("It started to hail!"); static const u8 sText_HailContinues[] = _("Hail continues to fall."); static const u8 sText_HailStopped[] = _("The hail stopped."); +static const u8 sText_HailSummon[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} summoned a hailstorm!"); static const u8 sText_FailedToSpitUp[] = _("But it failed to SPIT UP\na thing!"); static const u8 sText_FailedToSwallow[] = _("But it failed to SWALLOW\na thing!"); static const u8 sText_WindBecameHeatWave[] = _("The wind turned into a\nHEAT WAVE!"); @@ -837,6 +838,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT - BATTLESTRINGS_TABLE_ST [STRINGID_EMPTYSTRING4 - BATTLESTRINGS_TABLE_START] = sText_EmptyString4, [STRINGID_ABOOSTED - BATTLESTRINGS_TABLE_START] = sText_ABoosted, [STRINGID_PKMNSXINTENSIFIEDSUN - BATTLESTRINGS_TABLE_START] = sText_PkmnsXIntensifiedSun, + [STRINGID_PKMNSXSUMMONEDHAIL - BATTLESTRINGS_TABLE_START] = sText_HailSummon, [STRINGID_PKMNMAKESGROUNDMISS - BATTLESTRINGS_TABLE_START] = sText_PkmnMakesGroundMiss, [STRINGID_YOUTHROWABALLNOWRIGHT - BATTLESTRINGS_TABLE_START] = sText_YouThrowABallNowRight, [STRINGID_PKMNSXTOOKATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnsXTookAttack, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9a75651cf..abf68d766 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -962,7 +962,21 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } - + // ADD: Cacophony — sound moves always hit + if (gBattleMons[gBattlerAttacker].ability == ABILITY_CACOPHONY) + { + extern const u16 sSoundMovesTable[]; // defined in battle_util.c + s32 i; + for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++) + { + if (sSoundMovesTable[i] == move) + { + JumpIfMoveFailed(7, move); + return TRUE; + } + } + } + // END ADD if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattlerTarget] & STATUS3_ON_AIR) { gMoveResultFlags |= MOVE_RESULT_MISSED; diff --git a/src/battle_util.c b/src/battle_util.c index 73e2c151a..c908f054d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -692,7 +692,8 @@ u8 DoFieldEndTurnEffects(void) case ENDTURN_HAIL: if (gBattleWeather & B_WEATHER_HAIL) { - if (--gWishFutureKnock.weatherDuration == 0) + if (!(gBattleWeather & B_WEATHER_HAIL_PERMANENT) // ADD this guard + && if (--gWishFutureKnock.weatherDuration == 0) { gBattleWeather &= ~B_WEATHER_HAIL_TEMPORARY; gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; @@ -1787,6 +1788,15 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; + case ABILITY_SNOW_WARNING: + if (!(gBattleWeather & B_WEATHER_HAIL_PERMANENT)) + { + gBattleWeather = (B_WEATHER_HAIL_PERMANENT | B_WEATHER_HAIL_TEMPORARY); + BattleScriptPushCursorAndCallback(BattleScript_SnowWarningActivates); + gBattleScripting.battler = battler; + effect++; + } + break; case ABILITY_INTIMIDATE: if (!(gSpecialStatuses[battler].intimidatedMon)) { diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 74522ea55..86fd412f1 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -59,7 +59,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_GRASS}, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE}, + .abilities = {ABILITY_OVERGROW, ABILITY_CHLOROPHYLL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -88,7 +88,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_GRASS}, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE}, + .abilities = {ABILITY_OVERGROW, ABILITY_CHLOROPHYLL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -117,7 +117,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_GRASS}, - .abilities = {ABILITY_OVERGROW, ABILITY_NONE}, + .abilities = {ABILITY_OVERGROW, ABILITY_CHLOROPHYLL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -146,7 +146,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_BLAZE, ABILITY_NONE}, + .abilities = {ABILITY_BLAZE, ABILITY_FLAME_BODY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -175,7 +175,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_BLAZE, ABILITY_NONE}, + .abilities = {ABILITY_BLAZE, ABILITY_FLAME_BODY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -204,7 +204,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_BLAZE, ABILITY_NONE}, + .abilities = {ABILITY_BLAZE, ABILITY_FLAME_BODY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -233,7 +233,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, - .abilities = {ABILITY_TORRENT, ABILITY_NONE}, + .abilities = {ABILITY_TORRENT, ABILITY_RAIN_DISH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -262,7 +262,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, - .abilities = {ABILITY_TORRENT, ABILITY_NONE}, + .abilities = {ABILITY_TORRENT, ABILITY_RAIN_DISH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -291,7 +291,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, - .abilities = {ABILITY_TORRENT, ABILITY_NONE}, + .abilities = {ABILITY_TORRENT, ABILITY_RAIN_DISH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -320,7 +320,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SHIELD_DUST, ABILITY_NONE}, + .abilities = {ABILITY_SHIELD_DUST, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -349,7 +349,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, + .abilities = {ABILITY_SHIELD_DUST, ABILITY_SHED_SKIN}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -378,7 +378,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE}, + .abilities = {ABILITY_SHIELD_DUST, ABILITY_COMPOUND_EYES}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_WHITE, .noFlip = FALSE, @@ -407,7 +407,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SHIELD_DUST, ABILITY_NONE}, + .abilities = {ABILITY_POISON_POINT, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -436,7 +436,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, + .abilities = {ABILITY_POISON_POINT, ABILITY_SHED_SKIN}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -465,7 +465,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SWARM, ABILITY_NONE}, + .abilities = {ABILITY_POISON_POINT, ABILITY_SWARM}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -494,7 +494,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_EARLY_BIRD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -523,7 +523,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_EARLY_BIRD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -552,7 +552,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_SPEED_BOOST}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -581,7 +581,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_RUN_AWAY, ABILITY_GUTS}, + .abilities = {ABILITY_RUN_AWAY, ABILITY_HUSTLE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -610,7 +610,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_RUN_AWAY, ABILITY_GUTS}, + .abilities = {ABILITY_GUTS, ABILITY_HUSTLE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -639,7 +639,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_EARLY_BIRD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -668,7 +668,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_INTIMIDATE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -755,7 +755,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, - .abilities = {ABILITY_STATIC, ABILITY_NONE}, + .abilities = {ABILITY_STATIC, ABILITY_LIGHTNING_ROD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -784,7 +784,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, - .abilities = {ABILITY_STATIC, ABILITY_NONE}, + .abilities = {ABILITY_STATIC, ABILITY_LIGHTNING_ROD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -813,7 +813,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE}, + .abilities = {ABILITY_SAND_VEIL, ABILITY_ARENA_TRAP}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -842,7 +842,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_SAND_VEIL, ABILITY_NONE}, + .abilities = {ABILITY_ROUGH_SKIN, ABILITY_HYPER_CUTTER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -929,7 +929,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_POISON_POINT, ABILITY_NONE}, + .abilities = {ABILITY_BATTLE_ARMOR, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -1016,7 +1016,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_FIELD}, - .abilities = {ABILITY_POISON_POINT, ABILITY_NONE}, + .abilities = {ABILITY_ROUGH_SKIN, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -1103,7 +1103,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_FLASH_FIRE, ABILITY_NONE}, + .abilities = {ABILITY_FLASH_FIRE, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -1132,7 +1132,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_FLASH_FIRE, ABILITY_NONE}, + .abilities = {ABILITY_FLASH_FIRE, ABILITY_SHADOW_TAG}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -1161,7 +1161,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_FAST, .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_FAIRY}, - .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, + .abilities = {ABILITY_CUTE_CHARM, ABILITY_CACOPHONY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -1190,7 +1190,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_FAST, .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_FAIRY}, - .abilities = {ABILITY_CUTE_CHARM, ABILITY_NONE}, + .abilities = {ABILITY_CUTE_CHARM, ABILITY_PURE_POWER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -1219,7 +1219,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE}, + .abilities = {ABILITY_INNER_FOCUS, ABILITY_CACOPHONY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -1248,7 +1248,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE}, + .abilities = {ABILITY_INNER_FOCUS, ABILITY_CACOPHONY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -1277,7 +1277,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -1306,7 +1306,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_STENCH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -1335,7 +1335,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_EFFECT_SPORE, ABILITY_STENCH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -1364,7 +1364,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_GRASS}, - .abilities = {ABILITY_EFFECT_SPORE, ABILITY_NONE}, + .abilities = {ABILITY_EFFECT_SPORE, ABILITY_DAMP}, .safariZoneFleeRate = 50, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -1393,7 +1393,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_GRASS}, - .abilities = {ABILITY_EFFECT_SPORE, ABILITY_NONE}, + .abilities = {ABILITY_EFFECT_SPORE, ABILITY_DAMP}, .safariZoneFleeRate = 75, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -1422,7 +1422,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE}, + .abilities = {ABILITY_COMPOUND_EYES, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 50, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -1451,7 +1451,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SHIELD_DUST, ABILITY_NONE}, + .abilities = {ABILITY_KEEN_EYE, ABILITY_SHIELD_DUST}, .safariZoneFleeRate = 75, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -1538,7 +1538,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_PICKUP, ABILITY_NONE}, + .abilities = {ABILITY_PICKUP, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -1567,7 +1567,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_LIMBER, ABILITY_NONE}, + .abilities = {ABILITY_SERENE_GRACE, ABILITY_LIMBER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -1654,7 +1654,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_VITAL_SPIRIT, ABILITY_NONE}, + .abilities = {ABILITY_VITAL_SPIRIT, ABILITY_GUTS}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -1683,7 +1683,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_VITAL_SPIRIT, ABILITY_NONE}, + .abilities = {ABILITY_VITAL_SPIRIT, ABILITY_GUTS}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -1828,7 +1828,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_WATER_1}, - .abilities = {ABILITY_WATER_ABSORB, ABILITY_DAMP}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_DAMP}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = TRUE, @@ -1915,7 +1915,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS}, + .abilities = {ABILITY_TRACE, ABILITY_INNER_FOCUS}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -2031,7 +2031,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_SUCTION_CUPS, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -2060,7 +2060,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_SUCTION_CUPS, ABILITY_CHLOROPHYLL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -2089,7 +2089,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_SUCTION_CUPS, ABILITY_ARENA_TRAP}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -2379,7 +2379,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, - .abilities = {ABILITY_MAGNET_PULL, ABILITY_STURDY}, + .abilities = {ABILITY_PLUS, ABILITY_MINUS}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, @@ -2437,7 +2437,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FIELD}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_INNER_FOCUS}, + .abilities = {ABILITY_GUTS, ABILITY_STICKY_HOLD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -2466,7 +2466,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_RUN_AWAY, ABILITY_EARLY_BIRD}, + .abilities = {ABILITY_RUN_AWAY, ABILITY_LIMBER}, .safariZoneFleeRate = 50, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -2495,7 +2495,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_RUN_AWAY, ABILITY_EARLY_BIRD}, + .abilities = {ABILITY_RUN_AWAY, ABILITY_LIMBER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -2582,7 +2582,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, - .abilities = {ABILITY_STENCH, ABILITY_STICKY_HOLD}, + .abilities = {ABILITY_LIQUID_OOZE, ABILITY_STICKY_HOLD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -2611,7 +2611,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, - .abilities = {ABILITY_STENCH, ABILITY_STICKY_HOLD}, + .abilities = {ABILITY_LIQUID_OOZE, ABILITY_STICKY_HOLD}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -2640,7 +2640,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_WATER_3, EGG_GROUP_WATER_3}, - .abilities = {ABILITY_SHELL_ARMOR, ABILITY_NONE}, + .abilities = {ABILITY_SHELL_ARMOR, ABILITY_RAIN_DISH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -2669,7 +2669,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_WATER_3, EGG_GROUP_WATER_3}, - .abilities = {ABILITY_SHELL_ARMOR, ABILITY_NONE}, + .abilities = {ABILITY_SHELL_ARMOR, ABILITY_RAIN_DISH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -2756,7 +2756,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + .abilities = {ABILITY_SHADOW_TAG, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -2785,7 +2785,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, - .abilities = {ABILITY_ROCK_HEAD, ABILITY_STURDY}, + .abilities = {ABILITY_ROUGH_SKIN, ABILITY_STURDY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, @@ -2988,7 +2988,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_HUSTLE}, .safariZoneFleeRate = 75, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -3017,7 +3017,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_OWN_TEMPO}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -3104,7 +3104,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_LIMBER, ABILITY_NONE}, + .abilities = {ABILITY_LIMBER, ABILITY_VITAL_SPIRIT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -3133,7 +3133,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_KEEN_EYE, ABILITY_NONE}, + .abilities = {ABILITY_PURE_POWER, ABILITY_GUTS}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -3162,7 +3162,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_MONSTER}, - .abilities = {ABILITY_OWN_TEMPO, ABILITY_OBLIVIOUS}, + .abilities = {ABILITY_THICK_FAT, ABILITY_HUGE_POWER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -3191,7 +3191,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + .abilities = {ABILITY_LEVITATE, ABILITY_STENCH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -3220,7 +3220,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS}, - .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, + .abilities = {ABILITY_LEVITATE, ABILITY_STENCH}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -3336,7 +3336,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_GRASS}, - .abilities = {ABILITY_CHLOROPHYLL, ABILITY_NONE}, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -3365,7 +3365,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_MONSTER}, - .abilities = {ABILITY_EARLY_BIRD, ABILITY_NONE}, + .abilities = {ABILITY_INSOMNIA, ABILITY_NONE}, .safariZoneFleeRate = 125, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -3394,7 +3394,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_NONE}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -3423,7 +3423,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_POISON_POINT, ABILITY_NONE}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_POISON_POINT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -3452,7 +3452,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_2, EGG_GROUP_WATER_2}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_LIGHTNING_ROD}, .safariZoneFleeRate = 50, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -3481,7 +3481,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_2, EGG_GROUP_WATER_2}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_LIGHTNING_ROD}, .safariZoneFleeRate = 75, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -3597,7 +3597,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SWARM, ABILITY_NONE}, + .abilities = {ABILITY_SWARM, ABILITY_HYPER_CUTTER}, .safariZoneFleeRate = 125, .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, @@ -3655,7 +3655,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_STATIC, ABILITY_NONE}, + .abilities = {ABILITY_STATIC, ABILITY_VITAL_SPIRIT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = TRUE, @@ -3684,7 +3684,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_FLAME_BODY, ABILITY_NONE}, + .abilities = {ABILITY_FLAME_BODY, ABILITY_WHITE_SMOKE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -3829,7 +3829,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, - .abilities = {ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR}, + .abilities = {ABILITY_WATER_VEIL, ABILITY_SHELL_ARMOR}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -3858,7 +3858,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_DITTO, EGG_GROUP_DITTO}, - .abilities = {ABILITY_LIMBER, ABILITY_NONE}, + .abilities = {ABILITY_WONDER_GUARD, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -3887,7 +3887,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, - .abilities = {ABILITY_RUN_AWAY, ABILITY_NONE}, + .abilities = {ABILITY_COLOR_CHANGE, ABILITY_RUN_AWAY}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -4003,7 +4003,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, - .abilities = {ABILITY_TRACE, ABILITY_NONE}, + .abilities = {ABILITY_COLOR_CHANGE, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -4032,7 +4032,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_WATER_3}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_SHELL_ARMOR}, + .abilities = {ABILITY_SUCTION_CUPS, ABILITY_SHELL_ARMOR}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -4061,7 +4061,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_WATER_3}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_SHELL_ARMOR}, + .abilities = {ABILITY_SUCTION_CUPS, ABILITY_SHELL_ARMOR}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -4119,7 +4119,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_WATER_3}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_BATTLE_ARMOR}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_HYPER_CUTTER}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -4148,7 +4148,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_ROCK_HEAD, ABILITY_PRESSURE}, + .abilities = {ABILITY_SAND_STREAM, ABILITY_PRESSURE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -4177,7 +4177,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_MONSTER}, - .abilities = {ABILITY_IMMUNITY, ABILITY_THICK_FAT}, + .abilities = {ABILITY_TRUANT, ABILITY_THICK_FAT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, @@ -4206,7 +4206,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .abilities = {ABILITY_PRESSURE, ability_snow_warning}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -4235,7 +4235,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .abilities = {ABILITY_PRESSURE, ABILITY_DRIZZLE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -4264,7 +4264,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .abilities = {ABILITY_PRESSURE, ABILITY_DROUGHT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -4293,7 +4293,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, + .abilities = {ABILITY_SHED_SKIN, ABILITY_MARVEL_SCALE}, .safariZoneFleeRate = 100, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -4322,7 +4322,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_SHED_SKIN, ABILITY_NONE}, + .abilities = {ABILITY_SHED_SKIN, ABILITY_MARVEL_SCALE}, .safariZoneFleeRate = 125, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -4351,7 +4351,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE}, + .abilities = {ABILITY_INNER_FOCUS, ABILITY_AIR_LOCK}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -4409,7 +4409,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 100, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_SYNCHRONIZE, ABILITY_NONE}, + .abilities = {ABILITY_TRACE, ABILITY_NONE}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -4931,7 +4931,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, - .abilities = {ABILITY_INNER_FOCUS, ABILITY_NONE}, + .abilities = {ABILITY_INNER_FOCUS, ABILITY_INSOMNIA}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -5018,7 +5018,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_STATIC, ABILITY_NONE}, + .abilities = {ABILITY_CUTE_CHARM, ABILITY_STATIC}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = FALSE, @@ -6062,7 +6062,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, - .abilities = {ABILITY_ROCK_HEAD, ABILITY_STURDY}, + .abilities = {ABILITY_BATTLE_ARMOR, ABILITY_MAGMA_ARMOR}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_GRAY, .noFlip = FALSE, @@ -6178,7 +6178,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, - .abilities = {ABILITY_SWARM, ABILITY_NONE}, + .abilities = {ABILITY_IMMUNITY, ABILITY_BATTLE_ARMOR}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, @@ -6700,7 +6700,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_DRAGON}, - .abilities = {ABILITY_SWIFT_SWIM, ABILITY_NONE}, + .abilities = {ABILITY_SWIFT_SWIM, ABILITY_WATER_VEIL}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BLUE, .noFlip = FALSE, @@ -6874,7 +6874,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_GUTS, ABILITY_NONE}, + .abilities = {ABILITY_HUSTLE, ABILITY_CUTE_CHARM}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PURPLE, .noFlip = FALSE, @@ -6903,7 +6903,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, - .abilities = {ABILITY_INTIMIDATE, ABILITY_NONE}, + .abilities = {ABILITY_INTIMIDATE, ABILITY_OWN_TEMPO}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, @@ -6932,7 +6932,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_OBLIVIOUS, ABILITY_NONE}, + .abilities = {ABILITY_OBLIVIOUS, ABILITY_CUTE_CHARM}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_PINK, .noFlip = FALSE, @@ -6961,7 +6961,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_STATIC, ABILITY_NONE}, + .abilities = {ABILITY_CUTE_CHARM, ABILITY_VITAL_SPIRIT}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_YELLOW, .noFlip = TRUE, @@ -6990,7 +6990,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, - .abilities = {ABILITY_FLAME_BODY, ABILITY_NONE}, + .abilities = {ABILITY_FLAME_BODY, ABILITY_CUTE_CHARM}, .safariZoneFleeRate = 0, .bodyColor = BODY_COLOR_RED, .noFlip = FALSE, diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index c2002bed7..dd8c2aa72 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -74,9 +74,11 @@ static const u8 sVitalSpiritDescription[] = _("Prevents sleep."); static const u8 sWhiteSmokeDescription[] = _("Prevents ability reduction."); static const u8 sPurePowerDescription[] = _("Raises ATTACK."); static const u8 sShellArmorDescription[] = _("Blocks critical hits."); -static const u8 sCacophonyDescription[] = _("Avoids sound-based moves."); +static const u8 sCacophonyDescription[] = _("Ensures sound-based moves do not miss."); static const u8 sAirLockDescription[] = _("Negates weather effects."); +static const u8 sSnowWarningDescription[] = _("Summons a hailstorm."); //added + const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = { [ABILITY_NONE] = sNoneDescription, @@ -157,6 +159,7 @@ const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = [ABILITY_SHELL_ARMOR] = sShellArmorDescription, [ABILITY_CACOPHONY] = sCacophonyDescription, [ABILITY_AIR_LOCK] = sAirLockDescription, + [ABILITY_SNOW_WARNING] = sSnowWarningDescription, }; const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = @@ -239,4 +242,5 @@ const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = [ABILITY_SHELL_ARMOR] = _("SHELL ARMOR"), [ABILITY_CACOPHONY] = _("CACOPHONY"), [ABILITY_AIR_LOCK] = _("AIR LOCK"), + [ABILITY_SNOW_WARNING] = _("SNOW WARNING"), };