diff --git a/include/pokemon.h b/include/pokemon.h index 526103e58a..a81f112e23 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -333,6 +333,7 @@ struct SpeciesInfo /*0x24*/ /* 0x1F */ u8 bodyColor : 7; u8 noFlip : 1; /* 0x20 */ u16 flags; + /* 0x22 */ u8 gigantamax:1; }; struct BattleMove diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 94713af15d..ee602a04e8 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -150,8 +150,7 @@ bool32 CanDynamax(u16 battlerId) // Returns whether a battler is transformed into a Gigantamax form. bool32 IsGigantamaxed(u16 battlerId) { // TODO: Incorporate Gigantamax factor. - if (gBattleMons[battlerId].species >= (SPECIES_VENUSAUR_GMAX) - && gBattleMons[battlerId].species <= (SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX)) + if ((gSpeciesInfo[gBattleMons[battlerId].species].gigantamax)) return TRUE; return FALSE; } diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index d5e3fde0e5..4dc49fda85 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -32,99 +32,90 @@ .abilities = {ABILITY_LEVITATE, ABILITY_NONE}, #endif -#define VENUSAUR_SPECIES_INFO \ - { \ - .baseHP = 80, \ - .baseAttack = 82, \ - .baseDefense = 83, \ - .baseSpeed = 80, \ - .baseSpAttack = 100, \ - .baseSpDefense = 100, \ - .types = {TYPE_GRASS, TYPE_POISON}, \ - .catchRate = 45, \ - .expYield = 236, \ - .evYield_SpAttack = 2, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_GRASS},\ +#define VENUSAUR_MISC_INFO \ + .baseHP = 80, \ + .baseAttack = 82, \ + .baseDefense = 83, \ + .baseSpeed = 80, \ + .baseSpAttack = 100, \ + .baseSpDefense = 100, \ + .types = {TYPE_GRASS, TYPE_POISON}, \ + .catchRate = 45, \ + .expYield = 236, \ + .evYield_SpAttack = 2, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_GRASS}, \ .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define CHARIZARD_SPECIES_INFO \ - { \ - .baseHP = 78, \ - .baseAttack = 84, \ - .baseDefense = 78, \ - .baseSpeed = 100, \ - .baseSpAttack = 109, \ - .baseSpDefense = 85, \ - .types = {TYPE_FIRE, TYPE_FLYING}, \ - .catchRate = 45, \ - .expYield = 240, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_DRAGON},\ - .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER}, \ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = FALSE, \ - } +#define CHARIZARD_MISC_INFO \ + .baseHP = 78, \ + .baseAttack = 84, \ + .baseDefense = 78, \ + .baseSpeed = 100, \ + .baseSpAttack = 109, \ + .baseSpDefense = 85, \ + .types = {TYPE_FIRE, TYPE_FLYING}, \ + .catchRate = 45, \ + .expYield = 240, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_DRAGON}, \ + .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER},\ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE -#define BLASTOISE_SPECIES_INFO \ - { \ - .baseHP = 79, \ - .baseAttack = 83, \ - .baseDefense = 100, \ - .baseSpeed = 78, \ - .baseSpAttack = 85, \ - .baseSpDefense = 105, \ - .types = {TYPE_WATER, TYPE_WATER}, \ - .catchRate = 45, \ - .expYield = 239, \ - .evYield_SpDefense = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1},\ - .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH}, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = FALSE, \ - } +#define BLASTOISE_MISC_INFO \ + .baseHP = 79, \ + .baseAttack = 83, \ + .baseDefense = 100, \ + .baseSpeed = 78, \ + .baseSpAttack = 85, \ + .baseSpDefense = 105, \ + .types = {TYPE_WATER, TYPE_WATER}, \ + .catchRate = 45, \ + .expYield = 239, \ + .evYield_SpDefense = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, \ + .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH},\ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE -#define BUTTERFREE_SPECIES_INFO \ - { \ - .baseHP = 60, \ - .baseAttack = 45, \ - .baseDefense = 50, \ - .baseSpeed = 70, \ - .baseSpDefense = 80, \ - BUTTERFREE_SP_ATK \ - .types = {TYPE_BUG, TYPE_FLYING}, \ - .catchRate = 45, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .evYield_SpDefense = 1, \ - .itemRare = ITEM_SILVER_POWDER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ - .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS}, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } +#define BUTTERFREE_MISC_INFO \ + .baseHP = 60, \ + .baseAttack = 45, \ + .baseDefense = 50, \ + .baseSpeed = 70, \ + .baseSpDefense = 80, \ + BUTTERFREE_SP_ATK \ + .types = {TYPE_BUG, TYPE_FLYING}, \ + .catchRate = 45, \ + .expYield = 178, \ + .evYield_SpAttack = 2, \ + .evYield_SpDefense = 1, \ + .itemRare = ITEM_SILVER_POWDER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ + .abilities = {ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS},\ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE -#define PIKACHU_SPECIES_INFO(gender, flip) \ - { \ +#define PIKACHU_MISC_INFO(gender, flip) \ .baseHP = 35, \ .baseAttack = 55, \ .baseSpeed = 90, \ @@ -142,171 +133,156 @@ .eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FAIRY}, \ .abilities = {ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD},\ .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = flip, \ - } + .noFlip = flip -#define MEOWTH_SPECIES_INFO \ - { \ - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 35, \ - .baseSpeed = 90, \ - .baseSpAttack = 40, \ - .baseSpDefense = 40, \ - .types = {TYPE_NORMAL, TYPE_NORMAL}, \ - .catchRate = 255, \ - .expYield = 58, \ - .evYield_Speed = 1, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \ - .abilities = {ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE},\ - .bodyColor = BODY_COLOR_YELLOW, \ - .noFlip = FALSE, \ - } +#define MEOWTH_MISC_INFO \ + .baseHP = 40, \ + .baseAttack = 45, \ + .baseDefense = 35, \ + .baseSpeed = 90, \ + .baseSpAttack = 40, \ + .baseSpDefense = 40, \ + .types = {TYPE_NORMAL, TYPE_NORMAL}, \ + .catchRate = 255, \ + .expYield = 58, \ + .evYield_Speed = 1, \ + .itemRare = ITEM_QUICK_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \ + .abilities = {ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE}, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .noFlip = FALSE -#define MACHAMP_SPECIES_INFO \ - { \ - .baseHP = 90, \ - .baseAttack = 130, \ - .baseDefense = 80, \ - .baseSpeed = 55, \ - .baseSpAttack = 65, \ - .baseSpDefense = 85, \ - .types = {TYPE_FIGHTING, TYPE_FIGHTING}, \ - .catchRate = 45, \ - .expYield = 227, \ - .evYield_Attack = 3, \ - .itemRare = ITEM_FOCUS_BAND, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE},\ - .abilities = {ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST}, \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = FALSE, \ - } +#define MACHAMP_MISC_INFO \ + .baseHP = 90, \ + .baseAttack = 130, \ + .baseDefense = 80, \ + .baseSpeed = 55, \ + .baseSpAttack = 65, \ + .baseSpDefense = 85, \ + .types = {TYPE_FIGHTING, TYPE_FIGHTING}, \ + .catchRate = 45, \ + .expYield = 227, \ + .evYield_Attack = 3, \ + .itemRare = ITEM_FOCUS_BAND, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, \ + .abilities = {ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE -#define GENGAR_SPECIES_INFO \ - { \ - .baseHP = 60, \ - .baseAttack = 65, \ - .baseDefense = 60, \ - .baseSpeed = 110, \ - .baseSpAttack = 130, \ - .baseSpDefense = 75, \ - .types = {TYPE_GHOST, TYPE_POISON}, \ - .catchRate = 45, \ - .expYield = 225, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ +#define GENGAR_MISC_INFO \ + .baseHP = 60, \ + .baseAttack = 65, \ + .baseDefense = 60, \ + .baseSpeed = 110, \ + .baseSpAttack = 130, \ + .baseSpDefense = 75, \ + .types = {TYPE_GHOST, TYPE_POISON}, \ + .catchRate = 45, \ + .expYield = 225, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ .eggGroups = {EGG_GROUP_AMORPHOUS, EGG_GROUP_AMORPHOUS},\ - GENGAR_ABILITIES \ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } + GENGAR_ABILITIES \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE -#define KINGLER_SPECIES_INFO \ - { \ - .baseHP = 55, \ - .baseAttack = 130, \ - .baseDefense = 115, \ - .baseSpeed = 75, \ - .baseSpAttack = 50, \ - .baseSpDefense = 50, \ - .types = {TYPE_WATER, TYPE_WATER}, \ - .catchRate = 60, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_WATER_3, EGG_GROUP_WATER_3},\ - .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE}, \ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = TRUE, \ - } +#define KINGLER_MISC_INFO \ + .baseHP = 55, \ + .baseAttack = 130, \ + .baseDefense = 115, \ + .baseSpeed = 75, \ + .baseSpAttack = 50, \ + .baseSpDefense = 50, \ + .types = {TYPE_WATER, TYPE_WATER}, \ + .catchRate = 60, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_WATER_3, EGG_GROUP_WATER_3}, \ + .abilities = {ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE}, \ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = TRUE -#define LAPRAS_SPECIES_INFO \ - { \ - .baseHP = 130, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 60, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = {TYPE_WATER, TYPE_ICE}, \ - .catchRate = 45, \ - .expYield = 187, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 70, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1},\ - .abilities = {ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION}, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = FALSE, \ - } +#define LAPRAS_MISC_INFO \ + .baseHP = 130, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 60, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .types = {TYPE_WATER, TYPE_ICE}, \ + .catchRate = 45, \ + .expYield = 187, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, \ + .abilities = {ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION},\ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE -#define EEVEE_SPECIES_INFO \ - { \ - .baseHP = 55, \ - .baseAttack = 55, \ - .baseDefense = 50, \ - .baseSpeed = 55, \ - .baseSpAttack = 45, \ - .baseSpDefense = 65, \ - .types = {TYPE_NORMAL, TYPE_NORMAL}, \ - .catchRate = 45, \ - .expYield = 65, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \ - .abilities = {ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION}, \ - .bodyColor = BODY_COLOR_BROWN, \ - .noFlip = FALSE, \ - } +#define EEVEE_MISC_INFO \ + .baseHP = 55, \ + .baseAttack = 55, \ + .baseDefense = 50, \ + .baseSpeed = 55, \ + .baseSpAttack = 45, \ + .baseSpDefense = 65, \ + .types = {TYPE_NORMAL, TYPE_NORMAL}, \ + .catchRate = 45, \ + .expYield = 65, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 35, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_FIELD}, \ + .abilities = {ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION},\ + .bodyColor = BODY_COLOR_BROWN, \ + .noFlip = FALSE -#define SNORLAX_SPECIES_INFO \ - { \ - .baseHP = 160, \ - .baseAttack = 110, \ - .baseDefense = 65, \ - .baseSpeed = 30, \ - .baseSpAttack = 65, \ - .baseSpDefense = 110, \ - .types = {TYPE_NORMAL, TYPE_NORMAL}, \ - .catchRate = 25, \ - .expYield = 189, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_LEFTOVERS, \ - .itemRare = ITEM_LEFTOVERS, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 40, \ - .friendship = 70, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_MONSTER},\ - .abilities = {ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY}, \ - .bodyColor = BODY_COLOR_BLACK, \ - .noFlip = FALSE, \ - } +#define SNORLAX_MISC_INFO \ + .baseHP = 160, \ + .baseAttack = 110, \ + .baseDefense = 65, \ + .baseSpeed = 30, \ + .baseSpAttack = 65, \ + .baseSpDefense = 110, \ + .types = {TYPE_NORMAL, TYPE_NORMAL}, \ + .catchRate = 25, \ + .expYield = 189, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_LEFTOVERS, \ + .itemRare = ITEM_LEFTOVERS, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_MONSTER}, \ + .abilities = {ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY}, \ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = FALSE -#define COSPLAY_PIKACHU_SPECIES_INFO(flip) PIKACHU_SPECIES_INFO(MON_FEMALE, flip) -#define CAP_PIKACHU_SPECIES_INFO(flip) PIKACHU_SPECIES_INFO(MON_MALE, flip) +#define COSPLAY_PIKACHU_SPECIES_INFO(flip) { PIKACHU_MISC_INFO(MON_FEMALE, flip) } +#define CAP_PIKACHU_SPECIES_INFO(flip) { PIKACHU_MISC_INFO(MON_MALE, flip) } #define PICHU_SPECIES_INFO(flip) \ { \ @@ -512,29 +488,27 @@ .flags = SPECIES_FLAG_MYTHICAL, \ } -#define GARBODOR_SPECIES_INFO \ - { \ - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 82, \ - .baseSpeed = 75, \ - .baseSpAttack = 60, \ - .baseSpDefense = 82, \ - .types = {TYPE_POISON, TYPE_POISON}, \ - .catchRate = 60, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .itemCommon = ITEM_SILK_SCARF, \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL},\ - .abilities = {ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - } +#define GARBODOR_MISC_INFO \ + .baseHP = 80, \ + .baseAttack = 95, \ + .baseDefense = 82, \ + .baseSpeed = 75, \ + .baseSpAttack = 60, \ + .baseSpDefense = 82, \ + .types = {TYPE_POISON, TYPE_POISON}, \ + .catchRate = 60, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .itemCommon = ITEM_SILK_SCARF, \ + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, \ + .abilities = {ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = TRUE #define DEERLING_SPECIES_INFO(color) \ { \ @@ -973,249 +947,227 @@ .flags = SPECIES_FLAG_MYTHICAL, \ } -#define MELMETAL_SPECIES_INFO \ - { \ - .baseHP = 135, \ - .baseAttack = 143, \ - .baseDefense = 143, \ - .baseSpeed = 34, \ - .baseSpAttack = 80, \ - .baseSpDefense = 65, \ - .types = {TYPE_STEEL, TYPE_STEEL}, \ - .catchRate = 3, \ - .expYield = 270, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},\ - .abilities = {ABILITY_IRON_FIST, ABILITY_NONE}, \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = FALSE, \ - .flags = SPECIES_FLAG_MYTHICAL, \ - } +#define MELMETAL_MISC_INFO \ + .baseHP = 135, \ + .baseAttack = 143, \ + .baseDefense = 143, \ + .baseSpeed = 34, \ + .baseSpAttack = 80, \ + .baseSpDefense = 65, \ + .types = {TYPE_STEEL, TYPE_STEEL}, \ + .catchRate = 3, \ + .expYield = 270, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, \ + .abilities = {ABILITY_IRON_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_MYTHICAL -#define RILLABOOM_SPECIES_INFO \ - { \ - .baseHP = 100, \ - .baseAttack = 125, \ - .baseDefense = 90, \ - .baseSpeed = 85, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = {TYPE_GRASS, TYPE_GRASS}, \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_GRASS}, \ - .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } +#define RILLABOOM_MISC_INFO \ + .baseHP = 100, \ + .baseAttack = 125, \ + .baseDefense = 90, \ + .baseSpeed = 85, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .types = {TYPE_GRASS, TYPE_GRASS}, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_GRASS}, \ + .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE},\ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define CINDERACE_SPECIES_INFO \ - { \ - .baseHP = 80, \ - .baseAttack = 116, \ - .baseDefense = 75, \ - .baseSpeed = 119, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = {TYPE_FIRE, TYPE_FIRE}, \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE},\ +#define CINDERACE_MISC_INFO \ + .baseHP = 80, \ + .baseAttack = 116, \ + .baseDefense = 75, \ + .baseSpeed = 119, \ + .baseSpAttack = 65, \ + .baseSpDefense = 75, \ + .types = {TYPE_FIRE, TYPE_FIRE}, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE}, \ .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO}, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE -#define INTELEON_SPECIES_INFO \ - { \ - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 65, \ - .baseSpeed = 120, \ - .baseSpAttack = 125, \ - .baseSpDefense = 65, \ - .types = {TYPE_WATER, TYPE_WATER}, \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_FIELD},\ - .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER}, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = FALSE, \ - } +#define INTELEON_MISC_INFO \ + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 65, \ + .baseSpeed = 120, \ + .baseSpAttack = 125, \ + .baseSpDefense = 65, \ + .types = {TYPE_WATER, TYPE_WATER}, \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_WATER_1, EGG_GROUP_FIELD}, \ + .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER}, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = FALSE -#define CORVIKNIGHT_SPECIES_INFO \ - { \ - .baseHP = 98, \ - .baseAttack = 87, \ - .baseDefense = 105, \ - .baseSpeed = 67, \ - .baseSpAttack = 53, \ - .baseSpDefense = 85, \ - .types = {TYPE_FLYING, TYPE_STEEL}, \ - .catchRate = 45, \ - .expYield = 248, \ - .evYield_Defense = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING},\ +#define CORVIKNIGHT_MISC_INFO \ + .baseHP = 98, \ + .baseAttack = 87, \ + .baseDefense = 105, \ + .baseSpeed = 67, \ + .baseSpAttack = 53, \ + .baseSpDefense = 85, \ + .types = {TYPE_FLYING, TYPE_STEEL}, \ + .catchRate = 45, \ + .expYield = 248, \ + .evYield_Defense = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_FLYING, EGG_GROUP_FLYING}, \ .abilities = {ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR}, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE -#define ORBEETLE_SPECIES_INFO \ - { \ - .baseHP = 60, \ - .baseAttack = 45, \ - .baseDefense = 110, \ - .baseSpeed = 90, \ - .baseSpAttack = 80, \ - .baseSpDefense = 120, \ - .types = {TYPE_BUG, TYPE_PSYCHIC}, \ - .catchRate = 45, \ - .expYield = 253, \ - .evYield_SpDefense = 3, \ - .itemRare = ITEM_PSYCHIC_SEED, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ +#define ORBEETLE_MISC_INFO \ + .baseHP = 60, \ + .baseAttack = 45, \ + .baseDefense = 110, \ + .baseSpeed = 90, \ + .baseSpAttack = 80, \ + .baseSpDefense = 120, \ + .types = {TYPE_BUG, TYPE_PSYCHIC}, \ + .catchRate = 45, \ + .expYield = 253, \ + .evYield_SpDefense = 3, \ + .itemRare = ITEM_PSYCHIC_SEED, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ .abilities = {ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY}, \ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE -#define DREDNAW_SPECIES_INFO \ - { \ - .baseHP = 90, \ - .baseAttack = 115, \ - .baseDefense = 90, \ - .baseSpeed = 74, \ - .baseSpAttack = 48, \ - .baseSpDefense = 68, \ - .types = {TYPE_WATER, TYPE_ROCK}, \ - .catchRate = 75, \ - .expYield = 170, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1},\ +#define DREDNAW_MISC_INFO \ + .baseHP = 90, \ + .baseAttack = 115, \ + .baseDefense = 90, \ + .baseSpeed = 74, \ + .baseSpAttack = 48, \ + .baseSpDefense = 68, \ + .types = {TYPE_WATER, TYPE_ROCK}, \ + .catchRate = 75, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_MONSTER, EGG_GROUP_WATER_1}, \ .abilities = {ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define COALOSSAL_SPECIES_INFO \ - { \ - .baseHP = 110, \ - .baseAttack = 80, \ - .baseDefense = 120, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 90, \ - .types = {TYPE_ROCK, TYPE_FIRE}, \ - .catchRate = 45, \ - .expYield = 255, \ - .evYield_Defense = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL},\ - .abilities = {ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE}, \ - .bodyColor = BODY_COLOR_BLACK, \ - .noFlip = FALSE, \ - } +#define COALOSSAL_MISC_INFO \ + .baseHP = 110, \ + .baseAttack = 80, \ + .baseDefense = 120, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 90, \ + .types = {TYPE_ROCK, TYPE_FIRE}, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_Defense = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_MINERAL}, \ + .abilities = {ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE},\ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = FALSE -#define FLAPPLE_SPECIES_INFO \ - { \ - .baseHP = 70, \ - .baseAttack = 110, \ - .baseDefense = 80, \ - .baseSpeed = 70, \ - .baseSpAttack = 95, \ - .baseSpDefense = 60, \ - .types = {TYPE_GRASS, TYPE_DRAGON}, \ - .catchRate = 45, \ - .expYield = 170, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_DRAGON},\ +#define FLAPPLE_MISC_INFO \ + .baseHP = 70, \ + .baseAttack = 110, \ + .baseDefense = 80, \ + .baseSpeed = 70, \ + .baseSpAttack = 95, \ + .baseSpDefense = 60, \ + .types = {TYPE_GRASS, TYPE_DRAGON}, \ + .catchRate = 45, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_DRAGON}, \ .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define APPLETUN_SPECIES_INFO \ - { \ - .baseHP = 110, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 30, \ - .baseSpAttack = 100, \ - .baseSpDefense = 80, \ - .types = {TYPE_GRASS, TYPE_DRAGON}, \ - .catchRate = 45, \ - .expYield = 170, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_DRAGON},\ - .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } +#define APPLETUN_MISC_INFO \ + .baseHP = 110, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 30, \ + .baseSpAttack = 100, \ + .baseSpDefense = 80, \ + .types = {TYPE_GRASS, TYPE_DRAGON}, \ + .catchRate = 45, \ + .expYield = 170, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = {EGG_GROUP_GRASS, EGG_GROUP_DRAGON}, \ + .abilities = {ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define SANDACONDA_SPECIES_INFO \ - { \ - .baseHP = 72, \ - .baseAttack = 107, \ - .baseDefense = 125, \ - .baseSpeed = 71, \ - .baseSpAttack = 65, \ - .baseSpDefense = 70, \ - .types = {TYPE_GROUND, TYPE_GROUND}, \ - .catchRate = 120, \ - .expYield = 179, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_DRAGON},\ +#define SANDACONDA_MISC_INFO \ + .baseHP = 72, \ + .baseAttack = 107, \ + .baseDefense = 125, \ + .baseSpeed = 71, \ + .baseSpAttack = 65, \ + .baseSpDefense = 70, \ + .types = {TYPE_GROUND, TYPE_GROUND}, \ + .catchRate = 120, \ + .expYield = 179, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_DRAGON}, \ .abilities = {ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE #define CRAMORANT_SPECIES_INFO \ { \ @@ -1239,49 +1191,45 @@ .noFlip = FALSE, \ } -#define TOXTRICITY_SPECIES_INFO(ability2) \ - { \ - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .types = { TYPE_ELECTRIC, TYPE_POISON}, \ - .catchRate = 45, \ - .expYield = 176, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = { EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, \ - .abilities = {ABILITY_PUNK_ROCK, ability2, ABILITY_TECHNICIAN},\ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } +#define TOXTRICITY_MISC_INFO(ability2) \ + .baseHP = 75, \ + .baseAttack = 98, \ + .baseDefense = 70, \ + .baseSpeed = 75, \ + .baseSpAttack = 114, \ + .baseSpDefense = 70, \ + .types = { TYPE_ELECTRIC, TYPE_POISON}, \ + .catchRate = 45, \ + .expYield = 176, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = { EGG_GROUP_HUMAN_LIKE, EGG_GROUP_HUMAN_LIKE}, \ + .abilities = {ABILITY_PUNK_ROCK, ability2, ABILITY_TECHNICIAN}, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE -#define CENTISKORCH_SPECIES_INFO \ - { \ - .baseHP = 100, \ - .baseAttack = 115, \ - .baseDefense = 65, \ - .baseSpeed = 65, \ - .baseSpAttack = 90, \ - .baseSpDefense = 90, \ - .types = {TYPE_FIRE, TYPE_BUG}, \ - .catchRate = 75, \ - .expYield = 184, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ +#define CENTISKORCH_MISC_INFO \ + .baseHP = 100, \ + .baseAttack = 115, \ + .baseDefense = 65, \ + .baseSpeed = 65, \ + .baseSpAttack = 90, \ + .baseSpDefense = 90, \ + .types = {TYPE_FIRE, TYPE_BUG}, \ + .catchRate = 75, \ + .expYield = 184, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_BUG, EGG_GROUP_BUG}, \ .abilities = {ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY}, \ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = FALSE, \ - } + .bodyColor = BODY_COLOR_RED, \ + .noFlip = FALSE #define SINISTEA_SPECIES_INFO \ { \ @@ -1327,52 +1275,47 @@ .noFlip = FALSE, \ } -#define HATTERENE_SPECIES_INFO \ - { \ - .baseHP = 57, \ - .baseAttack = 90, \ - .baseDefense = 95, \ - .baseSpeed = 29, \ - .baseSpAttack = 136, \ - .baseSpDefense = 103, \ - .types = {TYPE_PSYCHIC, TYPE_FAIRY}, \ - .catchRate = 45, \ - .expYield = 255, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_FAIRY},\ - .abilities = {ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE}, \ - .bodyColor = BODY_COLOR_PINK, \ - .noFlip = FALSE, \ - } +#define HATTERENE_MISC_INFO \ + .baseHP = 57, \ + .baseAttack = 90, \ + .baseDefense = 95, \ + .baseSpeed = 29, \ + .baseSpAttack = 136, \ + .baseSpDefense = 103, \ + .types = {TYPE_PSYCHIC, TYPE_FAIRY}, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_FAIRY}, \ + .abilities = {ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE}, \ + .bodyColor = BODY_COLOR_PINK, \ + .noFlip = FALSE -#define GRIMMSNARL_SPECIES_INFO \ - { \ - .baseHP = 95, \ - .baseAttack = 120, \ - .baseDefense = 65, \ - .baseSpeed = 60, \ - .baseSpAttack = 95, \ - .baseSpDefense = 75, \ - .types = {TYPE_DARK, TYPE_FAIRY}, \ - .catchRate = 45, \ - .expYield = 255, \ - .evYield_Attack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE},\ - .abilities = {ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET}, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .noFlip = FALSE, \ - } +#define GRIMMSNARL_MISC_INFO \ + .baseHP = 95, \ + .baseAttack = 120, \ + .baseDefense = 65, \ + .baseSpeed = 60, \ + .baseSpAttack = 95, \ + .baseSpDefense = 75, \ + .types = {TYPE_DARK, TYPE_FAIRY}, \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_Attack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE}, \ + .abilities = {ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET},\ + .bodyColor = BODY_COLOR_PURPLE, \ + .noFlip = FALSE -#define ALCREMIE_SPECIES_INFO(color) \ - { \ +#define ALCREMIE_MISC_INFO(color) \ .baseHP = 65, \ .baseAttack = 60, \ .baseDefense = 75, \ @@ -1385,13 +1328,12 @@ .evYield_SpDefense = 2, \ .genderRatio = MON_FEMALE, \ .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ + .friendship = STANDARD_FRIENDSHIP, \ .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = { EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS}, \ + .eggGroups = { EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS}, \ .abilities = {ABILITY_SWEET_VEIL, ABILITY_NONE, ABILITY_AROMA_VEIL},\ .bodyColor = color, \ - .noFlip = FALSE, \ - } + .noFlip = FALSE #define MORPEKO_SPECIES_INFO \ { \ @@ -1415,96 +1357,88 @@ .noFlip = FALSE, \ } -#define COPPERAJAH_SPECIES_INFO \ - { \ - .baseHP = 122, \ - .baseAttack = 130, \ - .baseDefense = 69, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 69, \ - .types = {TYPE_STEEL, TYPE_STEEL}, \ - .catchRate = 90, \ - .expYield = 175, \ - .evYield_Attack = 2, \ - .itemRare = ITEM_LAGGING_TAIL, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_MINERAL},\ - .abilities = {ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL}, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = FALSE, \ - } +#define COPPERAJAH_MISC_INFO \ + .baseHP = 122, \ + .baseAttack = 130, \ + .baseDefense = 69, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 69, \ + .types = {TYPE_STEEL, TYPE_STEEL}, \ + .catchRate = 90, \ + .expYield = 175, \ + .evYield_Attack = 2, \ + .itemRare = ITEM_LAGGING_TAIL, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_FIELD, EGG_GROUP_MINERAL}, \ + .abilities = {ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL}, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = FALSE -#define DURALUDON_SPECIES_INFO \ - { \ - .baseHP = 70, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 85, \ - .baseSpAttack = 120, \ - .baseSpDefense = 50, \ - .types = {TYPE_STEEL, TYPE_DRAGON}, \ - .catchRate = 45, \ - .expYield = 187, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 30, \ - .friendship = 70, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_DRAGON},\ - .abilities = {ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART}, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = FALSE, \ - } +#define DURALUDON_MISC_INFO \ + .baseHP = 70, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 85, \ + .baseSpAttack = 120, \ + .baseSpDefense = 50, \ + .types = {TYPE_STEEL, TYPE_DRAGON}, \ + .catchRate = 45, \ + .expYield = 187, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 30, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = {EGG_GROUP_MINERAL, EGG_GROUP_DRAGON}, \ + .abilities = {ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART}, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = FALSE -#define URSHIFU_SPECIES_INFO \ - { \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .types = {TYPE_FIGHTING, TYPE_DARK}, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = 70, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},\ - .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = FALSE, \ - .flags = SPECIES_FLAG_LEGENDARY, \ - } +#define URSHIFU_MISC_INFO \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .types = {TYPE_FIGHTING, TYPE_DARK}, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, \ + .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_LEGENDARY -#define URSHIFU_RAPID_STRIKE_STYLE_SPECIES_INFO \ - { \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .types = {TYPE_FIGHTING, TYPE_WATER}, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = 70, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},\ - .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = FALSE, \ - .flags = SPECIES_FLAG_LEGENDARY, \ - } +#define URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .types = {TYPE_FIGHTING, TYPE_WATER}, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = {EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, \ + .abilities = {ABILITY_UNSEEN_FIST, ABILITY_NONE}, \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = FALSE, \ + .flags = SPECIES_FLAG_LEGENDARY #define ZARUDE_SPECIES_INFO \ { \ @@ -1578,7 +1512,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_VENUSAUR] = VENUSAUR_SPECIES_INFO, + [SPECIES_VENUSAUR] = { VENUSAUR_MISC_INFO, }, [SPECIES_CHARMANDER] = { @@ -1625,7 +1559,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CHARIZARD] = CHARIZARD_SPECIES_INFO, + [SPECIES_CHARIZARD] = + { + CHARIZARD_MISC_INFO, + }, [SPECIES_SQUIRTLE] = { @@ -1672,7 +1609,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_BLASTOISE] = BLASTOISE_SPECIES_INFO, + [SPECIES_BLASTOISE] = + { + BLASTOISE_MISC_INFO, + }, [SPECIES_CATERPIE] = { @@ -1718,7 +1658,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_BUTTERFREE] = BUTTERFREE_SPECIES_INFO, + [SPECIES_BUTTERFREE] = { BUTTERFREE_MISC_INFO, }, [SPECIES_WEEDLE] = { @@ -2000,7 +1940,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_PIKACHU] = PIKACHU_SPECIES_INFO(PERCENT_FEMALE(50), FLIP), + [SPECIES_PIKACHU] = { PIKACHU_MISC_INFO(PERCENT_FEMALE(50), FLIP) }, [SPECIES_RAICHU] = { @@ -2639,7 +2579,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_MEOWTH] = MEOWTH_SPECIES_INFO, + [SPECIES_MEOWTH] = + { + MEOWTH_MISC_INFO + }, [SPECIES_PERSIAN] = { @@ -2987,7 +2930,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = TRUE, }, - [SPECIES_MACHAMP] = MACHAMP_SPECIES_INFO, + [SPECIES_MACHAMP] = + { + MACHAMP_MISC_INFO + }, [SPECIES_BELLSPROUT] = { @@ -3574,7 +3520,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_GENGAR] = GENGAR_SPECIES_INFO, + [SPECIES_GENGAR] = + { + GENGAR_MISC_INFO + }, [SPECIES_ONIX] = { @@ -3664,7 +3613,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_KINGLER] = KINGLER_SPECIES_INFO, + [SPECIES_KINGLER] = + { + KINGLER_MISC_INFO, + }, [SPECIES_VOLTORB] = { @@ -4387,7 +4339,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_LAPRAS] = LAPRAS_SPECIES_INFO, + [SPECIES_LAPRAS] = + { + LAPRAS_MISC_INFO, + }, [SPECIES_DITTO] = { @@ -4413,7 +4368,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_EEVEE] = EEVEE_SPECIES_INFO, + [SPECIES_EEVEE] = + { + EEVEE_MISC_INFO, + }, [SPECIES_VAPOREON] = { @@ -4613,7 +4571,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_SNORLAX] = SNORLAX_SPECIES_INFO, + [SPECIES_SNORLAX] = + { + SNORLAX_MISC_INFO, + }, [SPECIES_ARTICUNO] = { @@ -14371,7 +14332,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_GARBODOR] = GARBODOR_SPECIES_INFO, + [SPECIES_GARBODOR] = + { + GARBODOR_MISC_INFO, + }, [SPECIES_ZORUA] = { @@ -19452,7 +19416,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_MYTHICAL, }, - [SPECIES_MELMETAL] = MELMETAL_SPECIES_INFO, + [SPECIES_MELMETAL] = + { + MELMETAL_MISC_INFO, + }, #endif #if P_GEN_8_POKEMON == TRUE @@ -19500,7 +19467,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_RILLABOOM] = RILLABOOM_SPECIES_INFO, + [SPECIES_RILLABOOM] = + { + RILLABOOM_MISC_INFO, + }, [SPECIES_SCORBUNNY] = { @@ -19546,7 +19516,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CINDERACE] = CINDERACE_SPECIES_INFO, + [SPECIES_CINDERACE] = + { + CINDERACE_MISC_INFO, + }, [SPECIES_SOBBLE] = { @@ -19593,7 +19566,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_INTELEON] = INTELEON_SPECIES_INFO, + [SPECIES_INTELEON] = + { + INTELEON_MISC_INFO, + }, [SPECIES_SKWOVET] = { @@ -19685,7 +19661,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CORVIKNIGHT] = CORVIKNIGHT_SPECIES_INFO, + [SPECIES_CORVIKNIGHT] = + { + CORVIKNIGHT_MISC_INFO, + }, [SPECIES_BLIPBUG] = { @@ -19732,7 +19711,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ORBEETLE] = ORBEETLE_SPECIES_INFO, + [SPECIES_ORBEETLE] = + { + ORBEETLE_MISC_INFO, + }, [SPECIES_NICKIT] = { @@ -19888,7 +19870,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_DREDNAW] = DREDNAW_SPECIES_INFO, + [SPECIES_DREDNAW] = + { + DREDNAW_MISC_INFO, + }, [SPECIES_YAMPER] = { @@ -19978,7 +19963,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_COALOSSAL] = COALOSSAL_SPECIES_INFO, + [SPECIES_COALOSSAL] = + { + COALOSSAL_MISC_INFO, + }, [SPECIES_APPLIN] = { @@ -20002,9 +19990,15 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_FLAPPLE] = FLAPPLE_SPECIES_INFO, + [SPECIES_FLAPPLE] = + { + FLAPPLE_MISC_INFO, + }, - [SPECIES_APPLETUN] = APPLETUN_SPECIES_INFO, + [SPECIES_APPLETUN] = + { + APPLETUN_MISC_INFO, + }, [SPECIES_SILICOBRA] = { @@ -20028,7 +20022,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_SANDACONDA] = SANDACONDA_SPECIES_INFO, + [SPECIES_SANDACONDA] = + { + SANDACONDA_MISC_INFO, + }, [SPECIES_CRAMORANT] = CRAMORANT_SPECIES_INFO, @@ -20098,7 +20095,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_TOXTRICITY] = TOXTRICITY_SPECIES_INFO(ABILITY_PLUS), + [SPECIES_TOXTRICITY] = + { + TOXTRICITY_MISC_INFO(ABILITY_PLUS), + }, [SPECIES_SIZZLIPEDE] = { @@ -20122,7 +20122,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_CENTISKORCH] = CENTISKORCH_SPECIES_INFO, + [SPECIES_CENTISKORCH] = + { + CENTISKORCH_MISC_INFO, + }, [SPECIES_CLOBBOPUS] = { @@ -20216,7 +20219,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_HATTERENE] = HATTERENE_SPECIES_INFO, + [SPECIES_HATTERENE] = + { + HATTERENE_MISC_INFO, + }, [SPECIES_IMPIDIMP] = { @@ -20262,7 +20268,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_GRIMMSNARL] = GRIMMSNARL_SPECIES_INFO, + [SPECIES_GRIMMSNARL] = + { + GRIMMSNARL_MISC_INFO, + }, [SPECIES_OBSTAGOON] = { @@ -20419,7 +20428,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_ALCREMIE] = ALCREMIE_SPECIES_INFO(BODY_COLOR_WHITE), + [SPECIES_ALCREMIE] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, [SPECIES_FALINKS] = { @@ -20602,7 +20611,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_COPPERAJAH] = COPPERAJAH_SPECIES_INFO, + [SPECIES_COPPERAJAH] = + { + COPPERAJAH_MISC_INFO, + }, [SPECIES_DRACOZOLT] = { @@ -20692,7 +20704,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, - [SPECIES_DURALUDON] = DURALUDON_SPECIES_INFO, + [SPECIES_DURALUDON] = + { + DURALUDON_MISC_INFO, + }, [SPECIES_DREEPY] = { @@ -20852,7 +20867,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_URSHIFU] = URSHIFU_SPECIES_INFO, + [SPECIES_URSHIFU] = { URSHIFU_MISC_INFO, }, [SPECIES_ZARUDE] = ZARUDE_SPECIES_INFO, @@ -24611,20 +24626,23 @@ const struct SpeciesInfo gSpeciesInfo[] = [SPECIES_CRAMORANT_GULPING] = CRAMORANT_SPECIES_INFO, [SPECIES_CRAMORANT_GORGING] = CRAMORANT_SPECIES_INFO, - [SPECIES_TOXTRICITY_LOW_KEY] = TOXTRICITY_SPECIES_INFO(ABILITY_MINUS), + [SPECIES_TOXTRICITY_LOW_KEY] = + { + TOXTRICITY_MISC_INFO(ABILITY_MINUS), + }, [SPECIES_SINISTEA_ANTIQUE] = SINISTEA_SPECIES_INFO, [SPECIES_POLTEAGEIST_ANTIQUE] = POLTEAGEIST_SPECIES_INFO, - [SPECIES_ALCREMIE_RUBY_CREAM] = ALCREMIE_SPECIES_INFO(BODY_COLOR_PINK), - [SPECIES_ALCREMIE_MATCHA_CREAM] = ALCREMIE_SPECIES_INFO(BODY_COLOR_GREEN), - [SPECIES_ALCREMIE_MINT_CREAM] = ALCREMIE_SPECIES_INFO(BODY_COLOR_BLUE), - [SPECIES_ALCREMIE_LEMON_CREAM] = ALCREMIE_SPECIES_INFO(BODY_COLOR_YELLOW), - [SPECIES_ALCREMIE_SALTED_CREAM] = ALCREMIE_SPECIES_INFO(BODY_COLOR_WHITE), - [SPECIES_ALCREMIE_RUBY_SWIRL] = ALCREMIE_SPECIES_INFO(BODY_COLOR_YELLOW), - [SPECIES_ALCREMIE_CARAMEL_SWIRL] = ALCREMIE_SPECIES_INFO(BODY_COLOR_BROWN), - [SPECIES_ALCREMIE_RAINBOW_SWIRL] = ALCREMIE_SPECIES_INFO(BODY_COLOR_YELLOW), + [SPECIES_ALCREMIE_RUBY_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_PINK) }, + [SPECIES_ALCREMIE_MATCHA_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_GREEN) }, + [SPECIES_ALCREMIE_MINT_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_BLUE) }, + [SPECIES_ALCREMIE_LEMON_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, + [SPECIES_ALCREMIE_SALTED_CREAM] = { ALCREMIE_MISC_INFO(BODY_COLOR_WHITE) }, + [SPECIES_ALCREMIE_RUBY_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_BROWN) }, + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW) }, [SPECIES_EISCUE_NOICE_FACE] = { @@ -24741,7 +24759,10 @@ const struct SpeciesInfo gSpeciesInfo[] = .flags = SPECIES_FLAG_LEGENDARY, }, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = URSHIFU_RAPID_STRIKE_STYLE_SPECIES_INFO, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = + { + URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO, + }, [SPECIES_ZARUDE_DADA] = ZARUDE_SPECIES_INFO, @@ -24815,39 +24836,171 @@ const struct SpeciesInfo gSpeciesInfo[] = }, // Gigantamax Forms - [SPECIES_VENUSAUR_GMAX] = VENUSAUR_SPECIES_INFO, - [SPECIES_CHARIZARD_GMAX] = CHARIZARD_SPECIES_INFO, - [SPECIES_BLASTOISE_GMAX] = BLASTOISE_SPECIES_INFO, - [SPECIES_BUTTERFREE_GMAX] = BUTTERFREE_SPECIES_INFO, - [SPECIES_PIKACHU_GMAX] = PIKACHU_SPECIES_INFO(PERCENT_FEMALE(50), FLIP), - [SPECIES_MEOWTH_GMAX] = MEOWTH_SPECIES_INFO, - [SPECIES_MACHAMP_GMAX] = MACHAMP_SPECIES_INFO, - [SPECIES_GENGAR_GMAX] = GENGAR_SPECIES_INFO, - [SPECIES_KINGLER_GMAX] = KINGLER_SPECIES_INFO, - [SPECIES_LAPRAS_GMAX] = LAPRAS_SPECIES_INFO, - [SPECIES_EEVEE_GMAX] = EEVEE_SPECIES_INFO, - [SPECIES_SNORLAX_GMAX] = SNORLAX_SPECIES_INFO, - [SPECIES_GARBODOR_GMAX] = GARBODOR_SPECIES_INFO, - [SPECIES_MELMETAL_GMAX] = MELMETAL_SPECIES_INFO, - [SPECIES_RILLABOOM_GMAX] = RILLABOOM_SPECIES_INFO, - [SPECIES_CINDERACE_GMAX] = CINDERACE_SPECIES_INFO, - [SPECIES_INTELEON_GMAX] = INTELEON_SPECIES_INFO, - [SPECIES_CORVIKNIGHT_GMAX] = CORVIKNIGHT_SPECIES_INFO, - [SPECIES_ORBEETLE_GMAX] = ORBEETLE_SPECIES_INFO, - [SPECIES_DREDNAW_GMAX] = DREDNAW_SPECIES_INFO, - [SPECIES_COALOSSAL_GMAX] = COALOSSAL_SPECIES_INFO, - [SPECIES_FLAPPLE_GMAX] = FLAPPLE_SPECIES_INFO, - [SPECIES_APPLETUN_GMAX] = APPLETUN_SPECIES_INFO, - [SPECIES_SANDACONDA_GMAX] = SANDACONDA_SPECIES_INFO, - [SPECIES_TOXTRICITY_GMAX] = TOXTRICITY_SPECIES_INFO(ABILITY_PLUS), - [SPECIES_CENTISKORCH_GMAX] = CENTISKORCH_SPECIES_INFO, - [SPECIES_HATTERENE_GMAX] = HATTERENE_SPECIES_INFO, - [SPECIES_GRIMMSNARL_GMAX] = GRIMMSNARL_SPECIES_INFO, - [SPECIES_ALCREMIE_GMAX] = ALCREMIE_SPECIES_INFO(BODY_COLOR_PINK), - [SPECIES_COPPERAJAH_GMAX] = COPPERAJAH_SPECIES_INFO, - [SPECIES_DURALUDON_GMAX] = DURALUDON_SPECIES_INFO, - [SPECIES_URSHIFU_GMAX] = URSHIFU_SPECIES_INFO, - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = URSHIFU_RAPID_STRIKE_STYLE_SPECIES_INFO, + [SPECIES_VENUSAUR_GMAX] = + { + VENUSAUR_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_CHARIZARD_GMAX] = + { + CHARIZARD_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_BLASTOISE_GMAX] = + { + BLASTOISE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_BUTTERFREE_GMAX] = + { + BUTTERFREE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_PIKACHU_GMAX] = + { + PIKACHU_MISC_INFO(PERCENT_FEMALE(50), FLIP), + .gigantamax = TRUE, + }, + [SPECIES_MEOWTH_GMAX] = + { + MEOWTH_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_MACHAMP_GMAX] = + { + MACHAMP_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_GENGAR_GMAX] = + { + GENGAR_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_KINGLER_GMAX] = + { + KINGLER_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_LAPRAS_GMAX] = + { + LAPRAS_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_EEVEE_GMAX] = + { + EEVEE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_SNORLAX_GMAX] = + { + SNORLAX_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_GARBODOR_GMAX] = + { + GARBODOR_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_MELMETAL_GMAX] = + { + MELMETAL_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_RILLABOOM_GMAX] = + { + RILLABOOM_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_CINDERACE_GMAX] = + { + CINDERACE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_INTELEON_GMAX] = + { + INTELEON_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_CORVIKNIGHT_GMAX] = + { + CORVIKNIGHT_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_ORBEETLE_GMAX] = + { + ORBEETLE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_DREDNAW_GMAX] = + { + DREDNAW_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_COALOSSAL_GMAX] = + { + COALOSSAL_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_FLAPPLE_GMAX] = + { + FLAPPLE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_APPLETUN_GMAX] = + { + APPLETUN_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_SANDACONDA_GMAX] = + { + SANDACONDA_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_TOXTRICITY_GMAX] = + { + TOXTRICITY_MISC_INFO(ABILITY_PLUS), + .gigantamax = TRUE, + }, + [SPECIES_CENTISKORCH_GMAX] = + { + CENTISKORCH_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_HATTERENE_GMAX] = + { + HATTERENE_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_GRIMMSNARL_GMAX] = + { + GRIMMSNARL_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_ALCREMIE_GMAX] = + { + ALCREMIE_MISC_INFO(BODY_COLOR_PINK), + .gigantamax = TRUE, + }, + [SPECIES_COPPERAJAH_GMAX] = + { + COPPERAJAH_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_DURALUDON_GMAX] = + { + DURALUDON_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_URSHIFU_GMAX] = + { + URSHIFU_MISC_INFO, + .gigantamax = TRUE, + }, + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GMAX] = + { + URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO, + .gigantamax = TRUE, + }, #endif };