From db6d2bfd1228947c632b63a25c28ec9a49cfaaa2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 27 Feb 2024 13:18:34 -0300 Subject: [PATCH 01/23] Venusaur, Charizard, Blastoise --- src/data/pokemon/species_info/gen_1.h | 218 ++++++++++++++++++-------- 1 file changed, 155 insertions(+), 63 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index 8605182e583c..9ccb9a4d7f6f 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -101,34 +101,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_VENUSAUR}), }, -#define VENUSAUR_MISC_INFO \ - .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), \ - .catchRate = 45, \ - .evYield_SpAttack = 2, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Venusaur"), \ - .natDexNum = NATIONAL_DEX_VENUSAUR, \ - .categoryName = _("Seed"), \ - FOOTPRINT(Venusaur) \ - LEARNSETS(Venusaur), \ - .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, \ - .formChangeTable = sVenusaurFormChangeTable - [SPECIES_VENUSAUR] = { - VENUSAUR_MISC_INFO, .baseHP = 80, .baseAttack = 82, .baseDefense = 83, .baseSpeed = 80, .baseSpAttack = 100, .baseSpDefense = 100, + .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), + .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 263, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -136,8 +118,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #else .expYield = 208, #endif + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Venusaur"), .cryId = CRY_VENUSAUR, + .natDexNum = NATIONAL_DEX_VENUSAUR, + .categoryName = _("Seed"), .height = 20, .weight = 1000, .description = COMPOUND_STRING( @@ -160,21 +153,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_SHAKE, PALETTES(Venusaur), ICON(Venusaur, 4), + FOOTPRINT(Venusaur) + LEARNSETS(Venusaur), + .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, + .formChangeTable = sVenusaurFormChangeTable, }, #if P_MEGA_EVOLUTIONS [SPECIES_VENUSAUR_MEGA] = { - VENUSAUR_MISC_INFO, .baseHP = 80, .baseAttack = 100, .baseDefense = 123, .baseSpeed = 80, .baseSpAttack = 122, .baseSpDefense = 120, + .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 313 : 281, + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), .abilities = { ABILITY_THICK_FAT, ABILITY_THICK_FAT, ABILITY_THICK_FAT }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Venusaur"), .cryId = CRY_VENUSAUR_MEGA, + .natDexNum = NATIONAL_DEX_VENUSAUR, + .categoryName = _("Seed"), .height = 24, .weight = 1555, .description = COMPOUND_STRING( @@ -194,6 +203,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, PALETTES(VenusaurMega), ICON(VenusaurMega, 4), + FOOTPRINT(Venusaur) + LEARNSETS(Venusaur), + .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, + .formChangeTable = sVenusaurFormChangeTable, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -201,16 +214,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_VENUSAUR_GIGANTAMAX] = { - VENUSAUR_MISC_INFO, .baseHP = 80, .baseAttack = 82, .baseDefense = 83, .baseSpeed = 80, .baseSpAttack = 100, .baseSpDefense = 100, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_CHLOROPHYLL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Venusaur"), .cryId = CRY_VENUSAUR, + .natDexNum = NATIONAL_DEX_VENUSAUR, + .categoryName = _("Seed"), .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -231,6 +256,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(VenusaurGigantamax), ICON(VenusaurGigantamax, 0), + FOOTPRINT(Venusaur) + LEARNSETS(Venusaur), + .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, + .formChangeTable = sVenusaurFormChangeTable, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -334,25 +363,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHARIZARD}), }, -#define CHARIZARD_MISC_INFO \ - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ - .speciesName = _("Charizard"), \ - .natDexNum = NATIONAL_DEX_CHARIZARD, \ - .categoryName = _("Flame"), \ - FOOTPRINT(Charizard) \ - LEARNSETS(Charizard), \ - .formSpeciesIdTable = sCharizardFormSpeciesIdTable, \ - .formChangeTable = sCharizardFormChangeTable - [SPECIES_CHARIZARD] = { - CHARIZARD_MISC_INFO, .baseHP = 78, .baseAttack = 84, .baseDefense = 78, @@ -360,6 +372,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 109, .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), + .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 267, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -367,9 +380,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #else .expYield = 209, #endif + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Charizard"), .cryId = CRY_CHARIZARD, + .natDexNum = NATIONAL_DEX_CHARIZARD, + .categoryName = _("Flame"), .height = 17, .weight = 905, .description = COMPOUND_STRING( @@ -390,12 +412,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(Charizard), ICON(Charizard, 0), + FOOTPRINT(Charizard) + LEARNSETS(Charizard), + .formSpeciesIdTable = sCharizardFormSpeciesIdTable, + .formChangeTable = sCharizardFormChangeTable, }, #if P_MEGA_EVOLUTIONS [SPECIES_CHARIZARD_MEGA_X] = { - CHARIZARD_MISC_INFO, .baseHP = 78, .baseAttack = 130, .baseDefense = 111, @@ -403,10 +428,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 130, .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE, TYPE_DRAGON), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 317 : 285, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS }, .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Charizard"), .cryId = CRY_CHARIZARD_MEGA_X, + .natDexNum = NATIONAL_DEX_CHARIZARD, + .categoryName = _("Flame"), .height = 17, .weight = 1105, .description = COMPOUND_STRING( @@ -426,12 +461,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(CharizardMegaX), ICON(CharizardMegaX, 0), + FOOTPRINT(Charizard) + LEARNSETS(Charizard), + .formSpeciesIdTable = sCharizardFormSpeciesIdTable, + .formChangeTable = sCharizardFormChangeTable, .isMegaEvolution = TRUE, }, [SPECIES_CHARIZARD_MEGA_Y] = { - CHARIZARD_MISC_INFO, .baseHP = 78, .baseAttack = 104, .baseDefense = 78, @@ -439,10 +477,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 159, .baseSpDefense = 115, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 317 : 285, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), .abilities = { ABILITY_DROUGHT, ABILITY_DROUGHT, ABILITY_DROUGHT }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Charizard"), .cryId = CRY_CHARIZARD_MEGA_Y, + .natDexNum = NATIONAL_DEX_CHARIZARD, + .categoryName = _("Flame"), .height = 17, .weight = 1005, .description = COMPOUND_STRING( @@ -463,6 +511,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, PALETTES(CharizardMegaY), ICON(CharizardMegaY, 0), + FOOTPRINT(Charizard) + LEARNSETS(Charizard), + .formSpeciesIdTable = sCharizardFormSpeciesIdTable, + .formChangeTable = sCharizardFormChangeTable, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -470,7 +522,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_CHARIZARD_GIGANTAMAX] = { - CHARIZARD_MISC_INFO, .baseHP = 78, .baseAttack = 84, .baseDefense = 78, @@ -478,10 +529,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 109, .baseSpDefense = 85, .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_SOLAR_POWER }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Charizard"), .cryId = CRY_CHARIZARD, + .natDexNum = NATIONAL_DEX_CHARIZARD, + .categoryName = _("Flame"), .height = 280, .weight = 0, .description = COMPOUND_STRING( @@ -502,6 +563,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(CharizardGigantamax), ICON(CharizardGigantamax, 0), + FOOTPRINT(Charizard) + LEARNSETS(Charizard), + .formSpeciesIdTable = sCharizardFormSpeciesIdTable, + .formChangeTable = sCharizardFormChangeTable, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -605,33 +670,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLASTOISE}), }, -#define BLASTOISE_MISC_INFO \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 45, \ - .evYield_SpDefense = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Blastoise"), \ - .natDexNum = NATIONAL_DEX_BLASTOISE, \ - .categoryName = _("Shellfish"), \ - FOOTPRINT(Blastoise) \ - LEARNSETS(Blastoise), \ - .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, \ - .formChangeTable = sBlastoiseFormChangeTable - [SPECIES_BLASTOISE] = { - BLASTOISE_MISC_INFO, .baseHP = 79, .baseAttack = 83, .baseDefense = 100, .baseSpeed = 78, .baseSpAttack = 85, .baseSpDefense = 105, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 265, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -639,8 +687,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #else .expYield = 210, #endif + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Blastoise"), .cryId = CRY_BLASTOISE, + .natDexNum = NATIONAL_DEX_BLASTOISE, + .categoryName = _("Shellfish"), .height = 16, .weight = 855, .description = COMPOUND_STRING( @@ -662,21 +720,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(Blastoise), ICON(Blastoise, 2), + FOOTPRINT(Blastoise) + LEARNSETS(Blastoise), + .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, + .formChangeTable = sBlastoiseFormChangeTable, }, #if P_MEGA_EVOLUTIONS [SPECIES_BLASTOISE_MEGA] = { - BLASTOISE_MISC_INFO, .baseHP = 79, .baseAttack = 103, .baseDefense = 120, .baseSpeed = 78, .baseSpAttack = 135, .baseSpDefense = 115, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), .abilities = { ABILITY_MEGA_LAUNCHER, ABILITY_MEGA_LAUNCHER, ABILITY_MEGA_LAUNCHER }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Blastoise"), .cryId = CRY_BLASTOISE_MEGA, + .natDexNum = NATIONAL_DEX_BLASTOISE, + .categoryName = _("Shellfish"), .height = 16, .weight = 1011, .description = COMPOUND_STRING( @@ -697,6 +770,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, PALETTES(BlastoiseMega), ICON(BlastoiseMega, 2), + FOOTPRINT(Blastoise) + LEARNSETS(Blastoise), + .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, + .formChangeTable = sBlastoiseFormChangeTable, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -704,16 +781,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_BLASTOISE_GIGANTAMAX] = { - BLASTOISE_MISC_INFO, .baseHP = 79, .baseAttack = 83, .baseDefense = 100, .baseSpeed = 78, .baseSpAttack = 85, .baseSpDefense = 105, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, .expYield = 239, + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_RAIN_DISH }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Blastoise"), .cryId = CRY_BLASTOISE, + .natDexNum = NATIONAL_DEX_BLASTOISE, + .categoryName = _("Shellfish"), .height = 250, .weight = 0, .description = COMPOUND_STRING( @@ -734,6 +822,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(BlastoiseGigantamax), ICON(BlastoiseGigantamax, 0), + FOOTPRINT(Blastoise) + LEARNSETS(Blastoise), + .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, + .formChangeTable = sBlastoiseFormChangeTable, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS From 6456e92fff39ae92d621fd564159554bb186a375 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 27 Feb 2024 17:02:36 -0300 Subject: [PATCH 02/23] Butterfree, Beedrill, Pidgeot --- src/data/pokemon/species_info/gen_1.h | 199 ++++++++++++++++---------- 1 file changed, 124 insertions(+), 75 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index 9ccb9a4d7f6f..bc4eaefff162 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -940,38 +940,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define BUTTERFREE_EXP_YIELD 160 #endif -#define BUTTERFREE_MISC_INFO \ - .baseHP = 60, \ - .baseAttack = 45, \ - .baseDefense = 50, \ - .baseSpeed = 70, \ - .baseSpDefense = 80, \ - .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 90 : 80, \ - .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), \ - .catchRate = 45, \ - .expYield = BUTTERFREE_EXP_YIELD, \ - .evYield_SpAttack = 2, \ - .evYield_SpDefense = 1, \ - .itemRare = ITEM_SILVER_POWDER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Butterfree"), \ - .cryId = CRY_BUTTERFREE, \ - .natDexNum = NATIONAL_DEX_BUTTERFREE, \ - .categoryName = _("Butterfly"), \ - FOOTPRINT(Butterfree) \ - LEARNSETS(Butterfree), \ - .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, \ - .formChangeTable = sButterfreeFormChangeTable - [SPECIES_BUTTERFREE] = { - BUTTERFREE_MISC_INFO, + .baseHP = 60, + .baseAttack = 45, + .baseDefense = 50, + .baseSpeed = 70, + .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 90 : 80, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), + .catchRate = 45, + .expYield = BUTTERFREE_EXP_YIELD, + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .itemRare = ITEM_SILVER_POWDER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Butterfree"), + .cryId = CRY_BUTTERFREE, + .natDexNum = NATIONAL_DEX_BUTTERFREE, + .categoryName = _("Butterfly"), .height = 11, .weight = 320, .description = COMPOUND_STRING( @@ -995,12 +988,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, PALETTES(Butterfree), ICON(Butterfree, 0), + FOOTPRINT(Butterfree) + LEARNSETS(Butterfree), + .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, + .formChangeTable = sButterfreeFormChangeTable, }, #if P_GIGANTAMAX_FORMS [SPECIES_BUTTERFREE_GIGANTAMAX] = { - BUTTERFREE_MISC_INFO, + .baseHP = 60, + .baseAttack = 45, + .baseDefense = 50, + .baseSpeed = 70, + .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 90 : 80, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), + .catchRate = 45, + .expYield = BUTTERFREE_EXP_YIELD, + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .itemRare = ITEM_SILVER_POWDER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_COMPOUND_EYES, ABILITY_NONE, ABILITY_TINTED_LENS }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Butterfree"), + .cryId = CRY_BUTTERFREE, + .natDexNum = NATIONAL_DEX_BUTTERFREE, + .categoryName = _("Butterfly"), .height = 170, .weight = 0, .description = COMPOUND_STRING( @@ -1022,6 +1041,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(ButterfreeGigantamax), ICON(ButterfreeGigantamax, 0), + FOOTPRINT(Butterfree) + LEARNSETS(Butterfree), + .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, + .formChangeTable = sButterfreeFormChangeTable, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -1130,35 +1153,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define BEEDRILL_ATTACK (P_UPDATED_STATS >= GEN_6 ? 90 : 80) -#define BEEDRILL_MISC_INFO \ - .types = MON_TYPES(TYPE_BUG, TYPE_POISON), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .evYield_SpDefense = 1, \ - .itemRare = ITEM_POISON_BARB, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Beedrill"), \ - .natDexNum = NATIONAL_DEX_BEEDRILL, \ - .categoryName = _("Poison Bee"), \ - FOOTPRINT(Beedrill) \ - LEARNSETS(Beedrill), \ - .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, \ - .formChangeTable = sBeedrillFormChangeTable - [SPECIES_BEEDRILL] = { - BEEDRILL_MISC_INFO, .baseHP = 65, + .baseAttack = BEEDRILL_ATTACK, .baseDefense = 40, .baseSpeed = 75, .baseSpAttack = 45, .baseSpDefense = 80, - .baseAttack = BEEDRILL_ATTACK, + .types = MON_TYPES(TYPE_BUG, TYPE_POISON), + .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 198, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -1168,8 +1172,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #else .expYield = 159, #endif + .evYield_Attack = 2, + .evYield_SpDefense = 1, + .itemRare = ITEM_POISON_BARB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_SWARM, ABILITY_NONE, ABILITY_SNIPER }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Beedrill"), .cryId = CRY_BEEDRILL, + .natDexNum = NATIONAL_DEX_BEEDRILL, + .categoryName = _("Poison Bee"), .height = 10, .weight = 295, .description = COMPOUND_STRING( @@ -1191,21 +1207,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(Beedrill), ICON(Beedrill, 2), + FOOTPRINT(Beedrill) + LEARNSETS(Beedrill), + .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, + .formChangeTable = sBeedrillFormChangeTable, }, #if P_MEGA_EVOLUTIONS [SPECIES_BEEDRILL_MEGA] = { - BEEDRILL_MISC_INFO, .baseHP = 65, .baseAttack = BEEDRILL_ATTACK + 60, .baseDefense = 40, .baseSpeed = 145, .baseSpAttack = 15, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_BUG, TYPE_POISON), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 248 : 223, + .evYield_Attack = 2, + .evYield_SpDefense = 1, + .itemRare = ITEM_POISON_BARB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Beedrill"), .cryId = CRY_BEEDRILL_MEGA, + .natDexNum = NATIONAL_DEX_BEEDRILL, + .categoryName = _("Poison Bee"), .height = 14, .weight = 405, .description = COMPOUND_STRING( @@ -1227,6 +1260,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_H_VIBRATE, PALETTES(BeedrillMega), ICON(BeedrillMega, 2), + FOOTPRINT(Beedrill) + LEARNSETS(Beedrill), + .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, + .formChangeTable = sBeedrillFormChangeTable, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -1332,33 +1369,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define PIDGEOT_SPEED (P_UPDATED_STATS >= GEN_6 ? 101 : 91) -#define PIDGEOT_MISC_INFO \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pidgeot"), \ - .natDexNum = NATIONAL_DEX_PIDGEOT, \ - .categoryName = _("Bird"), \ - FOOTPRINT(Pidgeot) \ - LEARNSETS(Pidgeot), \ - .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, \ - .formChangeTable = sPidgeotFormChangeTable - [SPECIES_PIDGEOT] = { - PIDGEOT_MISC_INFO, .baseHP = 83, .baseAttack = 80, .baseDefense = 75, + .baseSpeed = PIDGEOT_SPEED, .baseSpAttack = 70, .baseSpDefense = 70, - .baseSpeed = PIDGEOT_SPEED, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 240, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -1368,8 +1388,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #else .expYield = 172, #endif + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_KEEN_EYE, ABILITY_TANGLED_FEET, ABILITY_BIG_PECKS }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pidgeot"), .cryId = CRY_PIDGEOT, + .natDexNum = NATIONAL_DEX_PIDGEOT, + .categoryName = _("Bird"), .height = 15, .weight = 395, .description = COMPOUND_STRING( @@ -1391,21 +1421,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(Pidgeot), ICON(Pidgeot, 0), + FOOTPRINT(Pidgeot) + LEARNSETS(Pidgeot), + .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, + .formChangeTable = sPidgeotFormChangeTable, }, #if P_MEGA_EVOLUTIONS [SPECIES_PIDGEOT_MEGA] = { - PIDGEOT_MISC_INFO, .baseHP = 83, .baseAttack = 80, .baseDefense = 80, .baseSpeed = PIDGEOT_SPEED + 20, .baseSpAttack = 135, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_NO_GUARD, ABILITY_NO_GUARD, ABILITY_NO_GUARD }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pidgeot"), .cryId = CRY_PIDGEOT_MEGA, + .natDexNum = NATIONAL_DEX_PIDGEOT, + .categoryName = _("Bird"), .height = 22, .weight = 505, .description = COMPOUND_STRING( @@ -1426,6 +1471,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_TRIANGLE_DOWN, PALETTES(PidgeotMega), ICON(PidgeotMega, 0), + FOOTPRINT(Pidgeot) + LEARNSETS(Pidgeot), + .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, + .formChangeTable = sPidgeotFormChangeTable, .isMegaEvolution = TRUE, }, #endif From 0bd3c9c22642936b33ca29fdb62f2009f4c35ea0 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 27 Feb 2024 18:05:55 -0300 Subject: [PATCH 03/23] Rattata, Raticate --- src/data/pokemon/species_info/gen_1.h | 114 ++++++++++++++++---------- 1 file changed, 70 insertions(+), 44 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index bc4eaefff162..8828076c4cd2 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -1481,49 +1481,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_PIDGEY #if P_FAMILY_RATTATA -#define RATTATA_FAMILY_MISC_INFO \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD) - -#define RATTATA_MISC_INFO \ - .baseHP = 30, \ - .baseAttack = 56, \ - .baseDefense = 35, \ - .baseSpeed = 72, \ - .baseSpAttack = 25, \ - .baseSpDefense = 35, \ - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 51 : 57, \ - .evYield_Speed = 1, \ - .speciesName = _("Rattata"), \ - .cryId = CRY_RATTATA, \ - .natDexNum = NATIONAL_DEX_RATTATA, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Rattata) \ - .formSpeciesIdTable = sRattataFormSpeciesIdTable - -#define RATICATE_MISC_INFO \ - .catchRate = 127, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 145 : 116, \ - .evYield_Speed = 2, \ - .speciesName = _("Raticate"), \ - .cryId = CRY_RATICATE, \ - .natDexNum = NATIONAL_DEX_RATICATE, \ - .categoryName = _("Mouse"), \ - .height = 7, \ - FOOTPRINT(Raticate) \ - .formSpeciesIdTable = sRaticateFormSpeciesIdTable - [SPECIES_RATTATA] = { - RATTATA_FAMILY_MISC_INFO, - RATTATA_MISC_INFO, + .baseHP = 30, + .baseAttack = 56, + .baseDefense = 35, + .baseSpeed = 72, + .baseSpAttack = 25, + .baseSpDefense = 35, .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 51 : 57, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_RUN_AWAY, ABILITY_GUTS, ABILITY_HUSTLE }, .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Rattata"), + .cryId = CRY_RATTATA, + .natDexNum = NATIONAL_DEX_RATTATA, + .categoryName = _("Mouse"), .height = 3, .weight = 35, .description = COMPOUND_STRING( @@ -1546,14 +1526,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Rattata), ICON(Rattata, 2), + FOOTPRINT(Rattata) LEARNSETS(Rattata), + .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_RATICATE}), }, [SPECIES_RATICATE] = { - RATTATA_FAMILY_MISC_INFO, - RATICATE_MISC_INFO, .baseHP = 55, .baseAttack = 81, .baseDefense = 60, @@ -1561,8 +1541,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 50, .baseSpDefense = 70, .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 127, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 145 : 116, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_RUN_AWAY, ABILITY_GUTS, ABILITY_HUSTLE }, .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Raticate"), + .cryId = CRY_RATICATE, + .natDexNum = NATIONAL_DEX_RATICATE, + .categoryName = _("Mouse"), + .height = 7, .weight = 185, .description = COMPOUND_STRING( "A Raticate's sturdy fangs grow steadily.\n" @@ -1584,18 +1577,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, PALETTES(Raticate), ICON(Raticate, 2), + FOOTPRINT(Raticate) LEARNSETS(Raticate), + .formSpeciesIdTable = sRaticateFormSpeciesIdTable, }, #if P_ALOLAN_FORMS [SPECIES_RATTATA_ALOLAN] = { - RATTATA_FAMILY_MISC_INFO, - RATTATA_MISC_INFO, + .baseHP = 30, + .baseAttack = 56, + .baseDefense = 35, + .baseSpeed = 72, + .baseSpAttack = 25, + .baseSpDefense = 35, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 51 : 57, + .evYield_Speed = 1, .itemRare = ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT }, .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Rattata"), + .cryId = CRY_RATTATA, + .natDexNum = NATIONAL_DEX_RATTATA, + .categoryName = _("Mouse"), .height = 3, .weight = 38, .description = COMPOUND_STRING( @@ -1616,15 +1627,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(RattataAlolan), ICON(RattataAlolan, 2), + FOOTPRINT(Rattata) LEARNSETS(RattataAlolan), .isAlolanForm = TRUE, + .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}), }, [SPECIES_RATICATE_ALOLAN] = { - RATTATA_FAMILY_MISC_INFO, - RATICATE_MISC_INFO, .baseHP = 75, .baseAttack = 71, .baseDefense = 70, @@ -1632,9 +1643,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 40, .baseSpDefense = 80, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), + .catchRate = 127, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 145 : 116, + .evYield_Speed = 2, .itemRare = ITEM_PECHA_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_GLUTTONY, ABILITY_HUSTLE, ABILITY_THICK_FAT }, .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Raticate"), + .cryId = CRY_RATICATE, + .natDexNum = NATIONAL_DEX_RATICATE, + .categoryName = _("Mouse"), + .height = 7, .weight = 255, .description = COMPOUND_STRING( "It forms a group of Rattata, which it \n" @@ -1654,7 +1678,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = //.backAnimId = BACK_ANIM_NONE, PALETTES(RaticateAlolan), ICON(RaticateAlolan, 2), + FOOTPRINT(Raticate) LEARNSETS(RaticateAlolan), + .formSpeciesIdTable = sRaticateFormSpeciesIdTable, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS From 0ad3e6354ddd9c3b733b0eb53fed6907bc45e658 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 17:16:47 -0300 Subject: [PATCH 04/23] Expanded the rest of Gen 1 macros --- src/data/pokemon/species_info/gen_1.h | 2686 ++++++++++++++++++------- 1 file changed, 1999 insertions(+), 687 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index 1317b890ce0d..277dd9e72e13 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -1893,7 +1893,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_PIKACHU #if P_GEN_2_CROSS_EVOS -#define PICHU_MISC_INFO \ + + [SPECIES_PICHU] = + { .baseHP = 20, \ .baseAttack = 40, \ .baseDefense = 15, \ @@ -1924,11 +1926,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, \ FOOTPRINT(Pichu) \ LEARNSETS(Pichu), \ - .formSpeciesIdTable = sPichuFormSpeciesIdTable - - [SPECIES_PICHU] = - { - PICHU_MISC_INFO, + .formSpeciesIdTable = sPichuFormSpeciesIdTable, FRONT_PIC(Pichu, 32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Pichu, @@ -1943,7 +1941,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PICHU_SPIKY_EARED] = { - PICHU_MISC_INFO, + .baseHP = 20, \ + .baseAttack = 40, \ + .baseDefense = 15, \ + .baseSpeed = 60, \ + .baseSpAttack = 35, \ + .baseSpDefense = 35, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 41 : 42, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pichu"), \ + .cryId = CRY_PICHU, \ + .natDexNum = NATIONAL_DEX_PICHU, \ + .categoryName = _("Tiny Mouse"), \ + .height = 3, \ + .weight = 20, \ + .description = gPichuPokedexText, \ + .pokemonScale = 508, \ + .pokemonOffset = 20, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Pichu) \ + LEARNSETS(Pichu), \ + .formSpeciesIdTable = sPichuFormSpeciesIdTable, .noFlip = TRUE, FRONT_PIC(PichuSpikyEared, 32, 40), .frontPicYOffset = 13, @@ -1965,7 +1993,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define PIKACHU_EXP_YIELD 82 #endif -#define PIKACHU_MISC_INFO \ + [SPECIES_PIKACHU] = + { .baseHP = 35, \ .baseAttack = 55, \ .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ @@ -1988,20 +2017,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), \ FOOTPRINT(Pikachu) \ LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable - -#define PIKACHU_REGULAR_SIZE_INFO \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, \ .weight = 60, \ .pokemonScale = 479, \ .pokemonOffset = 19, \ .trainerScale = 256, \ - .trainerOffset = 0 - - [SPECIES_PIKACHU] = - { - PIKACHU_MISC_INFO, - PIKACHU_REGULAR_SIZE_INFO, + .trainerOffset = 0, .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .description = gPikachuPokedexText, @@ -2026,16 +2048,40 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_COSPLAY_PIKACHU_FORMS -#define PIKACHU_COSPLAY_MISC_INFO \ - PIKACHU_MISC_INFO, \ - PIKACHU_REGULAR_SIZE_INFO, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText - [SPECIES_PIKACHU_COSPLAY] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, FRONT_PIC(PikachuCosplay, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuCosplay, @@ -2049,7 +2095,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_ROCK_STAR] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, FRONT_PIC(PikachuRockStar, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuRockStar, @@ -2063,7 +2140,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_BELLE] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, .noFlip = TRUE, FRONT_PIC(PikachuBelle, 48, 48), .frontPicYOffset = 9, @@ -2078,7 +2186,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_POP_STAR] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, .noFlip = TRUE, FRONT_PIC(PikachuPopStar, 48, 48), .frontPicYOffset = 9, @@ -2093,7 +2232,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_PH_D] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, FRONT_PIC(PikachuPhD, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuPhD, @@ -2107,7 +2277,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_LIBRE] = { - PIKACHU_COSPLAY_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_FEMALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .description = gPikachuPokedexText, FRONT_PIC(PikachuLibre, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuLibre, @@ -2122,16 +2323,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS - -#define PIKACHU_CAP_MISC_INFO \ - PIKACHU_MISC_INFO, \ - PIKACHU_REGULAR_SIZE_INFO, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED) - [SPECIES_PIKACHU_ORIGINAL_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" @@ -2151,26 +2375,86 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_HOENN_CAP] = { - PIKACHU_CAP_MISC_INFO, - .description = COMPOUND_STRING( - "This Pikachu wears its partner's cap, which\n" - "is proof of the strong bond Pikachu and\n" - "its partner formed during adventures\n" - "across the Hoenn region together."), - FRONT_PIC(PikachuHoennCap, 48, 48), - .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuHoennCap, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuHoennCap, 64, 56), - .backPicYOffset = 4, - //.backAnimId = BACK_ANIM_NONE, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = COMPOUND_STRING( + "This Pikachu wears its partner's cap, which\n" + "is proof of the strong bond Pikachu and\n" + "its partner formed during adventures\n" + "across the Hoenn region together."), + FRONT_PIC(PikachuHoennCap, 48, 48), + .frontPicYOffset = 9, + .frontAnimFrames = sAnims_PikachuHoennCap, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(PikachuHoennCap, 64, 56), + .backPicYOffset = 4, + //.backAnimId = BACK_ANIM_NONE, PALETTES(PikachuHoennCap), ICON(PikachuHoennCap, 0), }, [SPECIES_PIKACHU_SINNOH_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2189,7 +2473,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_UNOVA_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2208,7 +2522,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_KALOS_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2227,7 +2571,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_ALOLA_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2246,7 +2620,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_PARTNER_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" @@ -2266,7 +2670,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_WORLD_CAP] = { - PIKACHU_CAP_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ + .height = 4, \ + .weight = 60, \ + .pokemonScale = 479, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .genderRatio = MON_MALE, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2288,7 +2722,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_PIKACHU_GIGANTAMAX] = { - PIKACHU_MISC_INFO, + .baseHP = 35, \ + .baseAttack = 55, \ + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ + .baseSpeed = 90, \ + .baseSpAttack = 50, \ + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 190, \ + .expYield = PIKACHU_EXP_YIELD, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_LIGHT_BALL, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Pikachu"), \ + .cryId = CRY_PIKACHU, \ + .natDexNum = NATIONAL_DEX_PIKACHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Pikachu) \ + LEARNSETS(Pikachu), \ + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .height = 210, @@ -2328,7 +2784,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define RAICHU_EXP_YIELD 122 #endif -#define RAICHU_MISC_INFO \ + [SPECIES_RAICHU] = + { .catchRate = 75, \ .expYield = RAICHU_EXP_YIELD, \ .evYield_Speed = 3, \ @@ -2342,11 +2799,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_RAICHU, \ .categoryName = _("Mouse"), \ FOOTPRINT(Raichu) \ - .formSpeciesIdTable = sRaichuFormSpeciesIdTable - - [SPECIES_RAICHU] = - { - RAICHU_MISC_INFO, + .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .baseHP = 60, .baseAttack = 90, .baseDefense = 55, @@ -2383,7 +2836,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_RAICHU_ALOLAN] = { - RAICHU_MISC_INFO, + .catchRate = 75, \ + .expYield = RAICHU_EXP_YIELD, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ + .speciesName = _("Raichu"), \ + .cryId = CRY_RAICHU, \ + .natDexNum = NATIONAL_DEX_RAICHU, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Raichu) \ + .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .baseHP = 60, .baseAttack = 85, .baseDefense = 50, @@ -2421,15 +2887,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_PIKACHU #if P_FAMILY_SANDSHREW -#define SANDSHREW_FAMILY_MISC_INFO \ - .itemRare = ITEM_GRIP_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD) - -#define SANDSHREW_MISC_INFO \ + [SPECIES_SANDSHREW] = + { .catchRate = 255, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, \ .evYield_Defense = 1, \ @@ -2439,23 +2898,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), \ FOOTPRINT(Sandshrew) \ .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ - SANDSHREW_FAMILY_MISC_INFO - -#define SANDSLASH_MISC_INFO \ - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, \ - .evYield_Defense = 2, \ - .speciesName = _("Sandslash"), \ - .cryId = CRY_SANDSLASH, \ - .natDexNum = NATIONAL_DEX_SANDSLASH, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Sandslash) \ - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ - SANDSHREW_FAMILY_MISC_INFO - - [SPECIES_SANDSHREW] = - { - SANDSHREW_MISC_INFO, + .itemRare = ITEM_GRIP_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 50, .baseAttack = 75, .baseDefense = 85, @@ -2491,7 +2939,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH] = { - SANDSLASH_MISC_INFO, + .catchRate = 90, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, \ + .evYield_Defense = 2, \ + .speciesName = _("Sandslash"), \ + .cryId = CRY_SANDSLASH, \ + .natDexNum = NATIONAL_DEX_SANDSLASH, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Sandslash) \ + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ + .itemRare = ITEM_GRIP_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 75, .baseAttack = 100, .baseDefense = 110, @@ -2527,7 +2989,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_SANDSHREW_ALOLAN] = { - SANDSHREW_MISC_INFO, + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, \ + .evYield_Defense = 1, \ + .speciesName = _("Sandshrew"), \ + .cryId = CRY_SANDSHREW, \ + .natDexNum = NATIONAL_DEX_SANDSHREW, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Sandshrew) \ + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ + .itemRare = ITEM_GRIP_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 50, .baseAttack = 75, .baseDefense = 90, @@ -2564,7 +3040,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH_ALOLAN] = { - SANDSLASH_MISC_INFO, + .catchRate = 90, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, \ + .evYield_Defense = 2, \ + .speciesName = _("Sandslash"), \ + .cryId = CRY_SANDSLASH, \ + .natDexNum = NATIONAL_DEX_SANDSLASH, \ + .categoryName = _("Mouse"), \ + FOOTPRINT(Sandslash) \ + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ + .itemRare = ITEM_GRIP_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 75, .baseAttack = 100, .baseDefense = 120, @@ -3074,14 +3564,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_CLEFAIRY #if P_FAMILY_VULPIX -#define VULPIX_FAMILY_MISC_INFO \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD) - -#define VULPIX_MISC_INFO \ + [SPECIES_VULPIX] = + { .baseHP = 38, \ .baseAttack = 41, \ .baseDefense = 40, \ @@ -3103,30 +3587,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, \ FOOTPRINT(Vulpix) \ .formSpeciesIdTable = sVulpixFormSpeciesIdTable, \ - VULPIX_FAMILY_MISC_INFO - -#define NINETALES_MISC_INFO \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, \ - .evYield_Speed = 1, \ - .evYield_SpDefense = 1, \ - .speciesName = _("Ninetales"), \ - .cryId = CRY_NINETALES, \ - .natDexNum = NATIONAL_DEX_NINETALES, \ - .categoryName = _("Fox"), \ - .height = 11, \ - .weight = 199, \ - .pokemonScale = 339, \ - .pokemonOffset = 10, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Ninetales) \ - .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ - VULPIX_FAMILY_MISC_INFO - - [SPECIES_VULPIX] = - { - VULPIX_MISC_INFO, + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_FIRE), .itemRare = ITEM_CHARCOAL, .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_DROUGHT }, @@ -3151,7 +3616,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES] = { - NINETALES_MISC_INFO, + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, \ + .evYield_Speed = 1, \ + .evYield_SpDefense = 1, \ + .speciesName = _("Ninetales"), \ + .cryId = CRY_NINETALES, \ + .natDexNum = NATIONAL_DEX_NINETALES, \ + .categoryName = _("Fox"), \ + .height = 11, \ + .weight = 199, \ + .pokemonScale = 339, \ + .pokemonOffset = 10, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Ninetales) \ + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 73, .baseAttack = 76, .baseDefense = 75, @@ -3182,7 +3667,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_VULPIX_ALOLAN] = { - VULPIX_MISC_INFO, + .baseHP = 38, \ + .baseAttack = 41, \ + .baseDefense = 40, \ + .baseSpeed = 65, \ + .baseSpAttack = 50, \ + .baseSpDefense = 65, \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, \ + .evYield_Speed = 1, \ + .speciesName = _("Vulpix"), \ + .cryId = CRY_VULPIX, \ + .natDexNum = NATIONAL_DEX_VULPIX, \ + .categoryName = _("Fox"), \ + .height = 6, \ + .weight = 99, \ + .pokemonScale = 542, \ + .pokemonOffset = 19, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Vulpix) \ + .formSpeciesIdTable = sVulpixFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_ICE), .itemRare = ITEM_SNOWBALL, .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SNOW_WARNING }, @@ -3208,7 +3718,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES_ALOLAN] = { - NINETALES_MISC_INFO, + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, \ + .evYield_Speed = 1, \ + .evYield_SpDefense = 1, \ + .speciesName = _("Ninetales"), \ + .cryId = CRY_NINETALES, \ + .natDexNum = NATIONAL_DEX_NINETALES, \ + .categoryName = _("Fox"), \ + .height = 11, \ + .weight = 199, \ + .pokemonScale = 339, \ + .pokemonOffset = 10, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Ninetales) \ + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 73, .baseAttack = 67, .baseDefense = 75, @@ -3990,16 +4520,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_VENONAT #if P_FAMILY_DIGLETT -#define DIGLETT_FAMILY_MISC_INFO \ - .itemRare = ITEM_SOFT_SAND, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN -#define DIGLETT_MISC_INFO \ +#if P_UPDATED_EXP_YIELDS >= GEN_7 + #define DUGTRIO_EXP_YIELD 149 +#elif P_UPDATED_EXP_YIELDS >= GEN_5 + #define DUGTRIO_EXP_YIELD 142 +#else + #define DUGTRIO_EXP_YIELD 153 +#endif + +#define DUGTRIO_ATTACK (P_UPDATED_STATS >= GEN_7 ? 100 : 80) + + [SPECIES_DIGLETT] = + { .catchRate = 255, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, \ .evYield_Speed = 1, \ @@ -4014,38 +4547,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, \ FOOTPRINT(Diglett) \ .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ - DIGLETT_FAMILY_MISC_INFO - -#if P_UPDATED_EXP_YIELDS >= GEN_7 - #define DUGTRIO_EXP_YIELD 149 -#elif P_UPDATED_EXP_YIELDS >= GEN_5 - #define DUGTRIO_EXP_YIELD 142 -#else - #define DUGTRIO_EXP_YIELD 153 -#endif - -#define DUGTRIO_MISC_INFO \ - .catchRate = 50, \ - .expYield = DUGTRIO_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Dugtrio"), \ - .cryId = CRY_DUGTRIO, \ - .natDexNum = NATIONAL_DEX_DUGTRIO, \ - .categoryName = _("Mole"), \ - .height = 7, \ - .pokemonScale = 406, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Dugtrio) \ - .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ - DIGLETT_FAMILY_MISC_INFO - -#define DUGTRIO_ATTACK (P_UPDATED_STATS >= GEN_7 ? 100 : 80) - - [SPECIES_DIGLETT] = - { - DIGLETT_MISC_INFO, + .itemRare = ITEM_SOFT_SAND, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 10, .baseAttack = 55, .baseDefense = 25, @@ -4076,7 +4584,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO] = { - DUGTRIO_MISC_INFO, + .catchRate = 50, \ + .expYield = DUGTRIO_EXP_YIELD, \ + .evYield_Speed = 2, \ + .speciesName = _("Dugtrio"), \ + .cryId = CRY_DUGTRIO, \ + .natDexNum = NATIONAL_DEX_DUGTRIO, \ + .categoryName = _("Mole"), \ + .height = 7, \ + .pokemonScale = 406, \ + .pokemonOffset = 18, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Dugtrio) \ + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ + .itemRare = ITEM_SOFT_SAND, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 35, .baseAttack = DUGTRIO_ATTACK, .baseDefense = 50, @@ -4107,7 +4635,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_DIGLETT_ALOLAN] = { - DIGLETT_MISC_INFO, + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, \ + .evYield_Speed = 1, \ + .speciesName = _("Diglett"), \ + .cryId = CRY_DIGLETT, \ + .natDexNum = NATIONAL_DEX_DIGLETT, \ + .categoryName = _("Mole"), \ + .height = 2, \ + .pokemonScale = 833, \ + .pokemonOffset = 25, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Diglett) \ + .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ + .itemRare = ITEM_SOFT_SAND, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 10, .baseAttack = 55, .baseDefense = 30, @@ -4138,11 +4686,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO_ALOLAN] = { - DUGTRIO_MISC_INFO, - .baseHP = 35, - .baseAttack = DUGTRIO_ATTACK, - .baseDefense = 60, - .baseSpeed = 110, + .catchRate = 50, \ + .expYield = DUGTRIO_EXP_YIELD, \ + .evYield_Speed = 2, \ + .speciesName = _("Dugtrio"), \ + .cryId = CRY_DUGTRIO, \ + .natDexNum = NATIONAL_DEX_DUGTRIO, \ + .categoryName = _("Mole"), \ + .height = 7, \ + .pokemonScale = 406, \ + .pokemonOffset = 18, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Dugtrio) \ + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ + .itemRare = ITEM_SOFT_SAND, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, + .baseHP = 35, + .baseAttack = DUGTRIO_ATTACK, + .baseDefense = 60, + .baseSpeed = 110, .baseSpAttack = 50, .baseSpDefense = 70, .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), @@ -4170,7 +4738,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_DIGLETT #if P_FAMILY_MEOWTH -#define MEOWTH_MISC_INFO \ + [SPECIES_MEOWTH] = + { .catchRate = 255, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -4183,28 +4752,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MEOWTH, \ .categoryName = _("Scratch Cat"), \ FOOTPRINT(Meowth) \ - .formSpeciesIdTable = sMeowthFormSpeciesIdTable - -#define PERSIAN_MISC_INFO \ - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Persian"), \ - .cryId = CRY_PERSIAN, \ - .natDexNum = NATIONAL_DEX_PERSIAN, \ - .categoryName = _("Classy Cat"), \ - FOOTPRINT(Persian) \ - .formSpeciesIdTable = sPersianFormSpeciesIdTable - - [SPECIES_MEOWTH] = - { - MEOWTH_MISC_INFO, + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, .baseDefense = 35, @@ -4244,7 +4792,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN] = { - PERSIAN_MISC_INFO, + .catchRate = 90, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_QUICK_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Persian"), \ + .cryId = CRY_PERSIAN, \ + .natDexNum = NATIONAL_DEX_PERSIAN, \ + .categoryName = _("Classy Cat"), \ + FOOTPRINT(Persian) \ + .formSpeciesIdTable = sPersianFormSpeciesIdTable, .baseHP = 65, .baseAttack = 70, .baseDefense = 60, @@ -4281,7 +4843,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_MEOWTH_ALOLAN] = { - MEOWTH_MISC_INFO, + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Meowth"), \ + .cryId = CRY_MEOWTH, \ + .natDexNum = NATIONAL_DEX_MEOWTH, \ + .categoryName = _("Scratch Cat"), \ + FOOTPRINT(Meowth) \ + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 35, .baseDefense = 35, @@ -4320,7 +4894,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN_ALOLAN] = { - PERSIAN_MISC_INFO, + .catchRate = 90, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, \ + .evYield_Speed = 2, \ + .itemRare = ITEM_QUICK_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Persian"), \ + .cryId = CRY_PERSIAN, \ + .natDexNum = NATIONAL_DEX_PERSIAN, \ + .categoryName = _("Classy Cat"), \ + FOOTPRINT(Persian) \ + .formSpeciesIdTable = sPersianFormSpeciesIdTable, .baseHP = 65, .baseAttack = 60, .baseDefense = 60, @@ -4358,7 +4946,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MEOWTH_GALARIAN] = { - MEOWTH_MISC_INFO, + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Meowth"), \ + .cryId = CRY_MEOWTH, \ + .natDexNum = NATIONAL_DEX_MEOWTH, \ + .categoryName = _("Scratch Cat"), \ + FOOTPRINT(Meowth) \ + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 50, .baseAttack = 65, .baseDefense = 55, @@ -4444,7 +5044,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_MEOWTH_GIGANTAMAX] = { - MEOWTH_MISC_INFO, + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Meowth"), \ + .cryId = CRY_MEOWTH, \ + .natDexNum = NATIONAL_DEX_MEOWTH, \ + .categoryName = _("Scratch Cat"), \ + FOOTPRINT(Meowth) \ + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, .baseDefense = 35, @@ -4729,15 +5341,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_MANKEY #if P_FAMILY_GROWLITHE -#define GROWLITHE_FAMILY_MISC_INFO \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN - -#define GROWLITHE_MISC_INFO \ + [SPECIES_GROWLITHE] = + { .catchRate = 190, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, \ .evYield_Attack = 1, \ @@ -4746,23 +5351,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_GROWLITHE, \ FOOTPRINT(Growlithe) \ .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ - GROWLITHE_FAMILY_MISC_INFO - -#define ARCANINE_MISC_INFO \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, \ - .evYield_Attack = 2, \ - .speciesName = _("Arcanine"), \ - .cryId = CRY_ARCANINE, \ - .natDexNum = NATIONAL_DEX_ARCANINE, \ - .categoryName = _("Legendary"), \ - FOOTPRINT(Arcanine) \ - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ - GROWLITHE_FAMILY_MISC_INFO - - [SPECIES_GROWLITHE] = - { - GROWLITHE_MISC_INFO, + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 55, .baseAttack = 70, .baseDefense = 45, @@ -4799,7 +5393,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE] = { - ARCANINE_MISC_INFO, + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, \ + .evYield_Attack = 2, \ + .speciesName = _("Arcanine"), \ + .cryId = CRY_ARCANINE, \ + .natDexNum = NATIONAL_DEX_ARCANINE, \ + .categoryName = _("Legendary"), \ + FOOTPRINT(Arcanine) \ + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 90, .baseAttack = 110, .baseDefense = 80, @@ -4835,7 +5443,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_HISUIAN_FORMS [SPECIES_GROWLITHE_HISUIAN] = { - GROWLITHE_MISC_INFO, + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, \ + .evYield_Attack = 1, \ + .speciesName = _("Growlithe"), \ + .cryId = CRY_GROWLITHE, \ + .natDexNum = NATIONAL_DEX_GROWLITHE, \ + FOOTPRINT(Growlithe) \ + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 60, .baseAttack = 75, .baseDefense = 45, @@ -4872,7 +5493,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE_HISUIAN] = { - ARCANINE_MISC_INFO, + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, \ + .evYield_Attack = 2, \ + .speciesName = _("Arcanine"), \ + .cryId = CRY_ARCANINE, \ + .natDexNum = NATIONAL_DEX_ARCANINE, \ + .categoryName = _("Legendary"), \ + FOOTPRINT(Arcanine) \ + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, .baseHP = 95, .baseAttack = 115, .baseDefense = 80, @@ -5239,7 +5874,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define ALAKAZAM_SP_DEF (P_UPDATED_STATS >= GEN_6 ? 95 : 85) -#define ALAKAZAM_MISC_INFO \ + [SPECIES_ALAKAZAM] = + { .types = MON_TYPES(TYPE_PSYCHIC), \ .catchRate = 50, \ .evYield_SpAttack = 3, \ @@ -5256,11 +5892,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Alakazam) \ LEARNSETS(Alakazam), \ .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ - .formChangeTable = sAlakazamFormChangeTable - - [SPECIES_ALAKAZAM] = - { - ALAKAZAM_MISC_INFO, + .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, .baseAttack = 50, .baseDefense = 45, @@ -5305,7 +5937,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALAKAZAM_MEGA] = { - ALAKAZAM_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 50, \ + .evYield_SpAttack = 3, \ + .itemRare = ITEM_TWISTED_SPOON, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Alakazam"), \ + .natDexNum = NATIONAL_DEX_ALAKAZAM, \ + .categoryName = _("Psi"), \ + FOOTPRINT(Alakazam) \ + LEARNSETS(Alakazam), \ + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ + .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, .baseAttack = 50, .baseDefense = 65, @@ -5455,7 +6103,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define MACHAMP_EXP_YIELD 193 #endif -#define MACHAMP_MISC_INFO \ + [SPECIES_MACHAMP] = + { .baseHP = 90, \ .baseAttack = 130, \ .baseDefense = 80, \ @@ -5481,11 +6130,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Machamp) \ LEARNSETS(Machamp), \ .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ - .formChangeTable = sMachampFormChangeTable - - [SPECIES_MACHAMP] = - { - MACHAMP_MISC_INFO, + .formChangeTable = sMachampFormChangeTable, .height = 16, .weight = 1300, .description = COMPOUND_STRING( @@ -5511,7 +6156,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_MACHAMP_GIGANTAMAX] = { - MACHAMP_MISC_INFO, + .baseHP = 90, \ + .baseAttack = 130, \ + .baseDefense = 80, \ + .baseSpeed = 55, \ + .baseSpAttack = 65, \ + .baseSpDefense = 85, \ + .types = MON_TYPES(TYPE_FIGHTING), \ + .catchRate = 45, \ + .expYield = MACHAMP_EXP_YIELD, \ + .evYield_Attack = 3, \ + .itemRare = ITEM_FOCUS_BAND, \ + .genderRatio = PERCENT_FEMALE(25), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .abilities = { ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Machamp"), \ + .cryId = CRY_MACHAMP, \ + .natDexNum = NATIONAL_DEX_MACHAMP, \ + .categoryName = _("Superpower"), \ + FOOTPRINT(Machamp) \ + LEARNSETS(Machamp), \ + .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ + .formChangeTable = sMachampFormChangeTable, .height = 250, .weight = 0, .description = COMPOUND_STRING( @@ -5791,18 +6461,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_TENTACOOL #if P_FAMILY_GEODUDE -#define KANTONIAN_GEODUDE_FAMILY_INFO \ - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ - .itemRare = ITEM_EVERSTONE, \ - .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL } - -#define GEODUDE_FAMILY_MISC_INFO \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .bodyColor = BODY_COLOR_BROWN #if P_UPDATED_EXP_YIELDS >= GEN_5 #define GEODUDE_EXP_YIELD 60 @@ -5812,7 +6470,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define GEODUDE_EXP_YIELD 86 #endif -#define GEODUDE_MISC_INFO \ +#define GOLEM_ATTACK (P_UPDATED_STATS >= GEN_6 ? 120 : 110) + +#if P_UPDATED_EXP_YIELDS >= GEN_8 + #define GOLEM_EXP_YIELD 248 +#elif P_UPDATED_EXP_YIELDS >= GEN_7 + #define GOLEM_EXP_YIELD 223 +#elif P_UPDATED_EXP_YIELDS >= GEN_5 + #define GOLEM_EXP_YIELD 218 +#else + #define GOLEM_EXP_YIELD 177 +#endif + + [SPECIES_GEODUDE] = + { + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ + .itemRare = ITEM_EVERSTONE, \ + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, .baseHP = 40, \ .baseAttack = 80, \ .baseDefense = 100, \ @@ -5833,65 +6507,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, \ FOOTPRINT(Geodude) \ .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ - GEODUDE_FAMILY_MISC_INFO - -#define GRAVELER_MISC_INFO \ - .baseHP = 55, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 35, \ - .baseSpAttack = 45, \ - .baseSpDefense = 45, \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, \ - .evYield_Defense = 2, \ - .speciesName = _("Graveler"), \ - .cryId = CRY_GRAVELER, \ - .natDexNum = NATIONAL_DEX_GRAVELER, \ - .categoryName = _("Rock"), \ - .height = 10, \ - .pokemonScale = 256, \ - .pokemonOffset = 2, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Graveler) \ - .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ - GEODUDE_FAMILY_MISC_INFO - -#define GOLEM_ATTACK (P_UPDATED_STATS >= GEN_6 ? 120 : 110) - -#if P_UPDATED_EXP_YIELDS >= GEN_8 - #define GOLEM_EXP_YIELD 248 -#elif P_UPDATED_EXP_YIELDS >= GEN_7 - #define GOLEM_EXP_YIELD 223 -#elif P_UPDATED_EXP_YIELDS >= GEN_5 - #define GOLEM_EXP_YIELD 218 -#else - #define GOLEM_EXP_YIELD 177 -#endif - -#define GOLEM_MISC_INFO \ - .baseHP = 80, \ - .baseAttack = GOLEM_ATTACK, \ - .baseDefense = 130, \ - .baseSpeed = 45, \ - .baseSpAttack = 55, \ - .baseSpDefense = 65, \ - .catchRate = 45, \ - .expYield = GOLEM_EXP_YIELD, \ - .evYield_Defense = 3, \ - .speciesName = _("Golem"), \ - .cryId = CRY_GOLEM, \ - .natDexNum = NATIONAL_DEX_GOLEM, \ - .categoryName = _("Megaton"), \ - FOOTPRINT(Golem) \ - .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ - GEODUDE_FAMILY_MISC_INFO - - [SPECIES_GEODUDE] = - { - KANTONIAN_GEODUDE_FAMILY_INFO, - GEODUDE_MISC_INFO, + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .weight = 200, .description = COMPOUND_STRING( "It climbs mountain paths using only the\n" @@ -5914,8 +6535,35 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER] = { - KANTONIAN_GEODUDE_FAMILY_INFO, - GRAVELER_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ + .itemRare = ITEM_EVERSTONE, \ + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, + .baseHP = 55, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 35, \ + .baseSpAttack = 45, \ + .baseSpDefense = 45, \ + .catchRate = 120, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, \ + .evYield_Defense = 2, \ + .speciesName = _("Graveler"), \ + .cryId = CRY_GRAVELER, \ + .natDexNum = NATIONAL_DEX_GRAVELER, \ + .categoryName = _("Rock"), \ + .height = 10, \ + .pokemonScale = 256, \ + .pokemonOffset = 2, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Graveler) \ + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .weight = 1050, .description = COMPOUND_STRING( "They descend from mountains by tumbling\n" @@ -5938,8 +6586,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM] = { - KANTONIAN_GEODUDE_FAMILY_INFO, - GOLEM_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ + .itemRare = ITEM_EVERSTONE, \ + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, + .baseHP = 80, \ + .baseAttack = GOLEM_ATTACK, \ + .baseDefense = 130, \ + .baseSpeed = 45, \ + .baseSpAttack = 55, \ + .baseSpDefense = 65, \ + .catchRate = 45, \ + .expYield = GOLEM_EXP_YIELD, \ + .evYield_Defense = 3, \ + .speciesName = _("Golem"), \ + .cryId = CRY_GOLEM, \ + .natDexNum = NATIONAL_DEX_GOLEM, \ + .categoryName = _("Megaton"), \ + FOOTPRINT(Golem) \ + .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .height = 14, .weight = 3000, .description = COMPOUND_STRING( @@ -5964,15 +6634,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_ALOLAN_FORMS -#define ALOLAN_GEODUDE_FAMILY_INFO \ - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ - .isAlolanForm = TRUE - [SPECIES_GEODUDE_ALOLAN] = { - ALOLAN_GEODUDE_FAMILY_INFO, - GEODUDE_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .isAlolanForm = TRUE, + .baseHP = 40, \ + .baseAttack = 80, \ + .baseDefense = 100, \ + .baseSpeed = 20, \ + .baseSpAttack = 30, \ + .baseSpDefense = 30, \ + .catchRate = 255, \ + .expYield = GEODUDE_EXP_YIELD, \ + .evYield_Defense = 1, \ + .speciesName = _("Geodude"), \ + .cryId = CRY_GEODUDE, \ + .natDexNum = NATIONAL_DEX_GEODUDE, \ + .categoryName = _("Rock"), \ + .height = 4, \ + .pokemonScale = 347, \ + .pokemonOffset = 18, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Geodude) \ + .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .itemRare = ITEM_CELL_BATTERY, .weight = 203, .description = COMPOUND_STRING( @@ -5996,8 +6688,35 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER_ALOLAN] = { - ALOLAN_GEODUDE_FAMILY_INFO, - GRAVELER_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .isAlolanForm = TRUE, + .baseHP = 55, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 35, \ + .baseSpAttack = 45, \ + .baseSpDefense = 45, \ + .catchRate = 120, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, \ + .evYield_Defense = 2, \ + .speciesName = _("Graveler"), \ + .cryId = CRY_GRAVELER, \ + .natDexNum = NATIONAL_DEX_GRAVELER, \ + .categoryName = _("Rock"), \ + .height = 10, \ + .pokemonScale = 256, \ + .pokemonOffset = 2, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Graveler) \ + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .itemRare = ITEM_CELL_BATTERY, .weight = 1100, .description = COMPOUND_STRING( @@ -6021,8 +6740,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM_ALOLAN] = { - ALOLAN_GEODUDE_FAMILY_INFO, - GOLEM_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .isAlolanForm = TRUE, + .baseHP = 80, \ + .baseAttack = GOLEM_ATTACK, \ + .baseDefense = 130, \ + .baseSpeed = 45, \ + .baseSpAttack = 55, \ + .baseSpDefense = 65, \ + .catchRate = 45, \ + .expYield = GOLEM_EXP_YIELD, \ + .evYield_Defense = 3, \ + .speciesName = _("Golem"), \ + .cryId = CRY_GOLEM, \ + .natDexNum = NATIONAL_DEX_GOLEM, \ + .categoryName = _("Megaton"), \ + FOOTPRINT(Golem) \ + .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BROWN, .itemCommon = ITEM_CELL_BATTERY, .height = 17, .weight = 3160, @@ -6050,19 +6791,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_GEODUDE #if P_FAMILY_PONYTA -#define KANTONIAN_PONYTA_FAMILY_INFO \ + [SPECIES_PONYTA] = + { .types = MON_TYPES(TYPE_FIRE), \ .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, \ - .bodyColor = BODY_COLOR_YELLOW - -#define PONYTA_FAMILY_MISC_INFO \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD) - -#define PONYTA_MISC_INFO \ + .bodyColor = BODY_COLOR_YELLOW, .baseHP = 50, \ .baseAttack = 85, \ .baseDefense = 55, \ @@ -6077,34 +6810,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PONYTA, \ FOOTPRINT(Ponyta) \ .formSpeciesIdTable = sPonytaFormSpeciesIdTable, \ - PONYTA_FAMILY_MISC_INFO - -#define RAPIDASH_MISC_INFO \ - .baseHP = 65, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 105, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, \ - .evYield_Speed = 2, \ - .speciesName = _("Rapidash"), \ - .cryId = CRY_RAPIDASH, \ - .natDexNum = NATIONAL_DEX_RAPIDASH, \ - .height = 17, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 289, \ - .trainerOffset = 1, \ - FOOTPRINT(Rapidash) \ - .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ - PONYTA_FAMILY_MISC_INFO - - [SPECIES_PONYTA] = - { - KANTONIAN_PONYTA_FAMILY_INFO, - PONYTA_MISC_INFO, + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .categoryName = _("Fire Horse"), .height = 10, .weight = 300, @@ -6133,8 +6843,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH] = { - KANTONIAN_PONYTA_FAMILY_INFO, - RAPIDASH_MISC_INFO, + .types = MON_TYPES(TYPE_FIRE), \ + .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, \ + .bodyColor = BODY_COLOR_YELLOW, + .baseHP = 65, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 105, \ + .baseSpAttack = 80, \ + .baseSpDefense = 80, \ + .catchRate = 60, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, \ + .evYield_Speed = 2, \ + .speciesName = _("Rapidash"), \ + .cryId = CRY_RAPIDASH, \ + .natDexNum = NATIONAL_DEX_RAPIDASH, \ + .height = 17, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 289, \ + .trainerOffset = 1, \ + FOOTPRINT(Rapidash) \ + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .categoryName = _("Fire Horse"), .weight = 950, .description = COMPOUND_STRING( @@ -6154,16 +6889,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = LEARNSETS(Rapidash), }, -#define GALARIAN_PONYTA_FAMILY_INFO \ - .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION },\ - .bodyColor = BODY_COLOR_WHITE, \ - .isGalarianForm = TRUE - #if P_GALARIAN_FORMS [SPECIES_PONYTA_GALARIAN] = { - GALARIAN_PONYTA_FAMILY_INFO, - PONYTA_MISC_INFO, + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION },\ + .bodyColor = BODY_COLOR_WHITE, \ + .isGalarianForm = TRUE, + .baseHP = 50, \ + .baseAttack = 85, \ + .baseDefense = 55, \ + .baseSpeed = 90, \ + .baseSpAttack = 65, \ + .baseSpDefense = 65, \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, \ + .evYield_Speed = 1, \ + .speciesName = _("Ponyta"), \ + .cryId = CRY_PONYTA, \ + .natDexNum = NATIONAL_DEX_PONYTA, \ + FOOTPRINT(Ponyta) \ + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_PSYCHIC), .categoryName = _("Unique Horn"), .height = 8, @@ -6192,8 +6942,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH_GALARIAN] = { - GALARIAN_PONYTA_FAMILY_INFO, - RAPIDASH_MISC_INFO, + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION },\ + .bodyColor = BODY_COLOR_WHITE, \ + .isGalarianForm = TRUE, + .baseHP = 65, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 105, \ + .baseSpAttack = 80, \ + .baseSpDefense = 80, \ + .catchRate = 60, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, \ + .evYield_Speed = 2, \ + .speciesName = _("Rapidash"), \ + .cryId = CRY_RAPIDASH, \ + .natDexNum = NATIONAL_DEX_RAPIDASH, \ + .height = 17, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 289, \ + .trainerOffset = 1, \ + FOOTPRINT(Rapidash) \ + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), .categoryName = _("Unique Horn"), .weight = 800, @@ -6217,7 +6992,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_PONYTA #if P_FAMILY_SLOWPOKE -#define SLOWPOKE_MISC_INFO \ + [SPECIES_SLOWPOKE] = + { .baseHP = 90, \ .baseAttack = 65, \ .baseDefense = 65, \ @@ -6243,43 +7019,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Slowpoke) \ - .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable - -#define SLOWBRO_MISC_INFO \ - .catchRate = 75, \ - .itemRare = ITEM_KINGS_ROCK, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowbro"), \ - .cryId = CRY_SLOWBRO, \ - .natDexNum = NATIONAL_DEX_SLOWBRO, \ - .categoryName = _("Hermit Crab"), \ - FOOTPRINT(Slowbro) \ - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable - -#define SLOWKING_MISC_INFO \ - .catchRate = 70, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowking"), \ - .cryId = CRY_SLOWKING, \ - .natDexNum = NATIONAL_DEX_SLOWKING, \ - .weight = 795, \ - FOOTPRINT(Slowking) \ - .formSpeciesIdTable = sSlowkingFormSpeciesIdTable - - [SPECIES_SLOWPOKE] = - { - SLOWPOKE_MISC_INFO, + .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .itemRare = ITEM_LAGGING_TAIL, .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, @@ -6306,7 +7046,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO] = { - SLOWBRO_MISC_INFO, + .catchRate = 75, \ + .itemRare = ITEM_KINGS_ROCK, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowbro"), \ + .cryId = CRY_SLOWBRO, \ + .natDexNum = NATIONAL_DEX_SLOWBRO, \ + .categoryName = _("Hermit Crab"), \ + FOOTPRINT(Slowbro) \ + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, .baseDefense = 110, @@ -6344,7 +7097,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING] = { - SLOWKING_MISC_INFO, + .catchRate = 70, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowking"), \ + .cryId = CRY_SLOWKING, \ + .natDexNum = NATIONAL_DEX_SLOWKING, \ + .weight = 795, \ + FOOTPRINT(Slowking) \ + .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, .baseDefense = 80, @@ -6382,7 +7148,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SLOWBRO_MEGA] = { - SLOWBRO_MISC_INFO, + .catchRate = 75, \ + .itemRare = ITEM_KINGS_ROCK, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowbro"), \ + .cryId = CRY_SLOWBRO, \ + .natDexNum = NATIONAL_DEX_SLOWBRO, \ + .categoryName = _("Hermit Crab"), \ + FOOTPRINT(Slowbro) \ + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, .baseDefense = 180, @@ -6422,7 +7201,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_SLOWPOKE_GALARIAN] = { - SLOWPOKE_MISC_INFO, + .baseHP = 90, \ + .baseAttack = 65, \ + .baseDefense = 65, \ + .baseSpeed = 15, \ + .baseSpAttack = 40, \ + .baseSpDefense = 40, \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowpoke"), \ + .natDexNum = NATIONAL_DEX_SLOWPOKE, \ + .categoryName = _("Dopey"), \ + .height = 12, \ + .weight = 360, \ + .pokemonScale = 256, \ + .pokemonOffset = 10, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Slowpoke) \ + .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .types = MON_TYPES(TYPE_PSYCHIC), .abilities = { ABILITY_GLUTTONY, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .cryId = CRY_SLOWPOKE_GALARIAN, @@ -6448,7 +7252,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO_GALARIAN] = { - SLOWBRO_MISC_INFO, + .catchRate = 75, \ + .itemRare = ITEM_KINGS_ROCK, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowbro"), \ + .cryId = CRY_SLOWBRO, \ + .natDexNum = NATIONAL_DEX_SLOWBRO, \ + .categoryName = _("Hermit Crab"), \ + FOOTPRINT(Slowbro) \ + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 100, .baseDefense = 95, @@ -6486,7 +7303,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING_GALARIAN] = { - SLOWKING_MISC_INFO, + .catchRate = 70, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Slowking"), \ + .cryId = CRY_SLOWKING, \ + .natDexNum = NATIONAL_DEX_SLOWKING, \ + .weight = 795, \ + FOOTPRINT(Slowking) \ + .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .baseHP = 95, .baseAttack = 65, .baseDefense = 80, @@ -6694,7 +7524,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define FARFETCHD_EXP_YIELD 94 #endif -#define FARFETCHD_MISC_INFO \ + [SPECIES_FARFETCHD] = + { .catchRate = 45, \ .expYield = FARFETCHD_EXP_YIELD, \ .evYield_Attack = 1, \ @@ -6709,11 +7540,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_FARFETCHD, \ .categoryName = _("Wild Duck"), \ FOOTPRINT(Farfetchd) \ - .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable - - [SPECIES_FARFETCHD] = - { - FARFETCHD_MISC_INFO, + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .baseHP = 52, .baseDefense = 55, .baseSpeed = 60, @@ -6749,7 +7576,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_FARFETCHD_GALARIAN] = { - FARFETCHD_MISC_INFO, + .catchRate = 45, \ + .expYield = FARFETCHD_EXP_YIELD, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD),\ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Farfetch'd"), \ + .cryId = CRY_FARFETCHD, \ + .natDexNum = NATIONAL_DEX_FARFETCHD, \ + .categoryName = _("Wild Duck"), \ + FOOTPRINT(Farfetchd) \ + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .baseHP = 52, .baseAttack = FARFETCHD_ATTACK + 5, .baseDefense = 55, @@ -7041,15 +7882,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_SEEL #if P_FAMILY_GRIMER -#define GRIMER_FAMILY_MISC_INFO \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS) - -#define GRIMER_MISC_INFO \ + [SPECIES_GRIMER] = + { + .types = MON_TYPES(TYPE_POISON), \ + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, \ + .bodyColor = BODY_COLOR_PURPLE, .baseHP = 80, \ .baseAttack = 80, \ .baseDefense = 50, \ @@ -7065,36 +7902,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sludge"), \ FOOTPRINT(Grimer) \ .formSpeciesIdTable = sGrimerFormSpeciesIdTable, \ - GRIMER_FAMILY_MISC_INFO - -#define MUK_MISC_INFO \ - .baseHP = 105, \ - .baseAttack = 105, \ - .baseDefense = 75, \ - .baseSpeed = 50, \ - .baseSpAttack = 65, \ - .baseSpDefense = 100, \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157,\ - .evYield_HP = 1, \ - .evYield_Attack = 1, \ - .speciesName = _("Muk"), \ - .cryId = CRY_MUK, \ - .natDexNum = NATIONAL_DEX_MUK, \ - .categoryName = _("Sludge"), \ - FOOTPRINT(Muk) \ - .formSpeciesIdTable = sMukFormSpeciesIdTable, \ - GRIMER_FAMILY_MISC_INFO - -#define KANTONIAN_GRIMER_FAMILY_INFO \ - .types = MON_TYPES(TYPE_POISON), \ - .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, \ - .bodyColor = BODY_COLOR_PURPLE - - [SPECIES_GRIMER] = - { - KANTONIAN_GRIMER_FAMILY_INFO, - GRIMER_MISC_INFO, + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 9, .weight = 300, .description = COMPOUND_STRING( @@ -7121,8 +7934,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MUK] = { - KANTONIAN_GRIMER_FAMILY_INFO, - MUK_MISC_INFO, + .types = MON_TYPES(TYPE_POISON), \ + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, \ + .bodyColor = BODY_COLOR_PURPLE, + .baseHP = 105, \ + .baseAttack = 105, \ + .baseDefense = 75, \ + .baseSpeed = 50, \ + .baseSpAttack = 65, \ + .baseSpDefense = 100, \ + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157,\ + .evYield_HP = 1, \ + .evYield_Attack = 1, \ + .speciesName = _("Muk"), \ + .cryId = CRY_MUK, \ + .natDexNum = NATIONAL_DEX_MUK, \ + .categoryName = _("Sludge"), \ + FOOTPRINT(Muk) \ + .formSpeciesIdTable = sMukFormSpeciesIdTable, \ + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 12, .weight = 300, .description = COMPOUND_STRING( @@ -7148,16 +7984,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_ALOLAN_FORMS -#define ALOLAN_GRIMER_FAMILY_INFO \ + [SPECIES_GRIMER_ALOLAN] = + { .types = MON_TYPES(TYPE_POISON, TYPE_DARK), \ .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, \ .bodyColor = BODY_COLOR_GREEN, \ - .isAlolanForm = TRUE - - [SPECIES_GRIMER_ALOLAN] = - { - ALOLAN_GRIMER_FAMILY_INFO, - GRIMER_MISC_INFO, + .isAlolanForm = TRUE, + .baseHP = 80, \ + .baseAttack = 80, \ + .baseDefense = 50, \ + .baseSpeed = 25, \ + .baseSpAttack = 40, \ + .baseSpDefense = 50, \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, \ + .evYield_HP = 1, \ + .speciesName = _("Grimer"), \ + .cryId = CRY_GRIMER, \ + .natDexNum = NATIONAL_DEX_GRIMER, \ + .categoryName = _("Sludge"), \ + FOOTPRINT(Grimer) \ + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, \ + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 7, .weight = 420, .description = COMPOUND_STRING( @@ -7184,8 +8037,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MUK_ALOLAN] = { - MUK_MISC_INFO, - ALOLAN_GRIMER_FAMILY_INFO, + .baseHP = 105, \ + .baseAttack = 105, \ + .baseDefense = 75, \ + .baseSpeed = 50, \ + .baseSpAttack = 65, \ + .baseSpDefense = 100, \ + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157,\ + .evYield_HP = 1, \ + .evYield_Attack = 1, \ + .speciesName = _("Muk"), \ + .cryId = CRY_MUK, \ + .natDexNum = NATIONAL_DEX_MUK, \ + .categoryName = _("Sludge"), \ + FOOTPRINT(Muk) \ + .formSpeciesIdTable = sMukFormSpeciesIdTable, \ + .itemRare = ITEM_BLACK_SLUDGE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .types = MON_TYPES(TYPE_POISON, TYPE_DARK), \ + .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .isAlolanForm = TRUE, .noFlip = TRUE, .height = 10, .weight = 520, @@ -7421,7 +8298,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define GENGAR_ABILITIES {ABILITY_LEVITATE, ABILITY_NONE} #endif -#define GENGAR_MISC_INFO \ + [SPECIES_GENGAR] = + { .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ .catchRate = 45, \ .evYield_SpAttack = 3, \ @@ -7437,11 +8315,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Gengar) \ LEARNSETS(Gengar), \ .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ - .formChangeTable = sGengarFormChangeTable - - [SPECIES_GENGAR] = - { - GENGAR_MISC_INFO, + .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, .baseDefense = 60, @@ -7481,7 +8355,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GENGAR_MEGA] = { - GENGAR_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ + .catchRate = 45, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),\ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Gengar"), \ + .natDexNum = NATIONAL_DEX_GENGAR, \ + .categoryName = _("Shadow"), \ + FOOTPRINT(Gengar) \ + LEARNSETS(Gengar), \ + .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ + .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, .baseDefense = 80, @@ -7517,7 +8406,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_GENGAR_GIGANTAMAX] = { - GENGAR_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ + .catchRate = 45, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),\ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Gengar"), \ + .natDexNum = NATIONAL_DEX_GENGAR, \ + .categoryName = _("Shadow"), \ + FOOTPRINT(Gengar) \ + LEARNSETS(Gengar), \ + .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ + .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, .baseDefense = 60, @@ -7602,7 +8506,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_GEN_2_CROSS_EVOS -#define STEELIX_MISC_INFO \ + [SPECIES_STEELIX] = + { .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), \ .catchRate = 25, \ .evYield_Defense = 2, \ @@ -7619,11 +8524,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Steelix) \ LEARNSETS(Steelix), \ .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ - .formChangeTable = sSteelixFormChangeTable - - [SPECIES_STEELIX] = - { - STEELIX_MISC_INFO, + .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, .baseAttack = 85, .baseDefense = 200, @@ -7661,7 +8562,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_STEELIX_MEGA] = { - STEELIX_MISC_INFO, + .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), \ + .catchRate = 25, \ + .evYield_Defense = 2, \ + .itemRare = ITEM_METAL_COAT, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Steelix"), \ + .natDexNum = NATIONAL_DEX_STEELIX, \ + .categoryName = _("Iron Snake"), \ + FOOTPRINT(Steelix) \ + LEARNSETS(Steelix), \ + .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ + .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, .baseAttack = 125, .baseDefense = 230, @@ -7847,7 +8764,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}), }, -#define KINGLER_MISC_INFO \ + [SPECIES_KINGLER] = + { .baseHP = 55, \ .baseAttack = 130, \ .baseDefense = 115, \ @@ -7873,11 +8791,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Kingler) \ LEARNSETS(Kingler), \ .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ - .formChangeTable = sKinglerFormChangeTable - - [SPECIES_KINGLER] = - { - KINGLER_MISC_INFO, + .formChangeTable = sKinglerFormChangeTable, .height = 13, .weight = 600, .description = COMPOUND_STRING( @@ -7904,7 +8818,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_KINGLER_GIGANTAMAX] = { - KINGLER_MISC_INFO, + .baseHP = 55, \ + .baseAttack = 130, \ + .baseDefense = 115, \ + .baseSpeed = 75, \ + .baseSpAttack = 50, \ + .baseSpDefense = 50, \ + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 60, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 206, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3), \ + .abilities = { ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE },\ + .bodyColor = BODY_COLOR_RED, \ + .noFlip = TRUE, \ + .speciesName = _("Kingler"), \ + .cryId = CRY_KINGLER, \ + .natDexNum = NATIONAL_DEX_KINGLER, \ + .categoryName = _("Pincer"), \ + FOOTPRINT(Kingler) \ + LEARNSETS(Kingler), \ + .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ + .formChangeTable = sKinglerFormChangeTable, .height = 190, .weight = 0, .description = COMPOUND_STRING( @@ -7931,16 +8870,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_KRABBY #if P_FAMILY_VOLTORB -#define VOLTORB_FAMILY_MISC_INFO \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ - .bodyColor = BODY_COLOR_RED +#if P_UPDATED_EXP_YIELDS >= GEN_7 + #define ELECTRODE_EXP_YIELD 172 +#elif P_UPDATED_EXP_YIELDS >= GEN_5 + #define ELECTRODE_EXP_YIELD 168 +#else + #define ELECTRODE_EXP_YIELD 150 +#endif -#define VOLTORB_MISC_INFO \ + [SPECIES_VOLTORB] = + { .baseHP = 40, \ .baseAttack = 30, \ .baseDefense = 50, \ @@ -7960,41 +8899,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, \ FOOTPRINT(Voltorb) \ .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ - VOLTORB_FAMILY_MISC_INFO - -#if P_UPDATED_EXP_YIELDS >= GEN_7 - #define ELECTRODE_EXP_YIELD 172 -#elif P_UPDATED_EXP_YIELDS >= GEN_5 - #define ELECTRODE_EXP_YIELD 168 -#else - #define ELECTRODE_EXP_YIELD 150 -#endif - -#define ELECTRODE_MISC_INFO \ - .baseHP = 60, \ - .baseAttack = 50, \ - .baseDefense = 70, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ - .catchRate = 60, \ - .expYield = ELECTRODE_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Electrode"), \ - .cryId = CRY_ELECTRODE, \ - .natDexNum = NATIONAL_DEX_ELECTRODE, \ - .height = 12, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Electrode) \ - .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ - VOLTORB_FAMILY_MISC_INFO - - [SPECIES_VOLTORB] = - { - VOLTORB_MISC_INFO, + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC), .categoryName = _("Ball"), .weight = 104, @@ -8018,7 +8929,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ELECTRODE] = { - ELECTRODE_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 50, \ + .baseDefense = 70, \ + .baseSpAttack = 80, \ + .baseSpDefense = 80, \ + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ + .catchRate = 60, \ + .expYield = ELECTRODE_EXP_YIELD, \ + .evYield_Speed = 2, \ + .speciesName = _("Electrode"), \ + .cryId = CRY_ELECTRODE, \ + .natDexNum = NATIONAL_DEX_ELECTRODE, \ + .height = 12, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Electrode) \ + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC), .categoryName = _("Ball"), .weight = 666, @@ -8042,7 +8978,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_HISUIAN_FORMS [SPECIES_VOLTORB_HISUIAN] = { - VOLTORB_MISC_INFO, + .baseHP = 40, \ + .baseAttack = 30, \ + .baseDefense = 50, \ + .baseSpeed = 100, \ + .baseSpAttack = 55, \ + .baseSpDefense = 55, \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, \ + .evYield_Speed = 1, \ + .speciesName = _("Voltorb"), \ + .cryId = CRY_VOLTORB, \ + .natDexNum = NATIONAL_DEX_VOLTORB, \ + .height = 5, \ + .pokemonScale = 364, \ + .pokemonOffset = -8, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Voltorb) \ + .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .categoryName = _("Sphere"), .weight = 130, @@ -8067,7 +9028,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ELECTRODE_HISUIAN] = { - ELECTRODE_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 50, \ + .baseDefense = 70, \ + .baseSpAttack = 80, \ + .baseSpDefense = 80, \ + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ + .catchRate = 60, \ + .expYield = ELECTRODE_EXP_YIELD, \ + .evYield_Speed = 2, \ + .speciesName = _("Electrode"), \ + .cryId = CRY_ELECTRODE, \ + .natDexNum = NATIONAL_DEX_ELECTRODE, \ + .height = 12, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Electrode) \ + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .categoryName = _("Sphere"), .weight = 710, @@ -8150,7 +9136,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define EXEGGUTOR_EXP_YIELD 212 #endif -#define EXEGGUTOR_MISC_INFO \ +#define EXEGGUTOR_SP_DEF (P_UPDATED_STATS >= GEN_7 ? 75 : 65) + + [SPECIES_EXEGGUTOR] = + { .catchRate = 45, \ .expYield = EXEGGUTOR_EXP_YIELD, \ .evYield_SpAttack = 2, \ @@ -8165,13 +9154,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ .categoryName = _("Coconut"), \ FOOTPRINT(Exeggutor) \ - .formSpeciesIdTable = sExeggutorFormSpeciesIdTable - -#define EXEGGUTOR_SP_DEF (P_UPDATED_STATS >= GEN_7 ? 75 : 65) - - [SPECIES_EXEGGUTOR] = - { - EXEGGUTOR_MISC_INFO, + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .baseHP = 95, .baseAttack = 95, .baseDefense = 85, @@ -8206,7 +9189,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_EXEGGUTOR_ALOLAN] = { - EXEGGUTOR_MISC_INFO, + .catchRate = 45, \ + .expYield = EXEGGUTOR_EXP_YIELD, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Exeggutor"), \ + .cryId = CRY_EXEGGUTOR, \ + .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ + .categoryName = _("Coconut"), \ + FOOTPRINT(Exeggutor) \ + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .baseHP = 95, .baseAttack = 105, .baseDefense = 85, @@ -8293,7 +9290,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN}), }, -#define MAROWAK_MISC_INFO \ + [SPECIES_MAROWAK] = + { .baseHP = 60, \ .baseAttack = 80, \ .baseDefense = 110, \ @@ -8319,11 +9317,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Marowak) \ - .formSpeciesIdTable = sMarowakFormSpeciesIdTable - - [SPECIES_MAROWAK] = - { - MAROWAK_MISC_INFO, + .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .types = MON_TYPES(TYPE_GROUND), .abilities = { ABILITY_ROCK_HEAD, ABILITY_LIGHTNING_ROD, ABILITY_BATTLE_ARMOR }, .bodyColor = BODY_COLOR_BROWN, @@ -8348,7 +9342,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_MAROWAK_ALOLAN] = { - MAROWAK_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 80, \ + .baseDefense = 110, \ + .baseSpeed = 45, \ + .baseSpAttack = 50, \ + .baseSpDefense = 80, \ + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124,\ + .evYield_Defense = 2, \ + .itemRare = ITEM_THICK_CLUB, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ + .speciesName = _("Marowak"), \ + .cryId = CRY_MAROWAK, \ + .natDexNum = NATIONAL_DEX_MAROWAK, \ + .categoryName = _("Bone Keeper"), \ + .height = 10, \ + .pokemonScale = 293, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Marowak) \ + .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), .abilities = { ABILITY_CURSED_BODY, ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD }, .bodyColor = BODY_COLOR_PURPLE, @@ -8727,7 +9746,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = {EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}), }, -#define WEEZING_MISC_INFO \ + [SPECIES_WEEZING] = + { .baseHP = 65, \ .baseAttack = 90, \ .baseDefense = 120, \ @@ -8748,11 +9768,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_WEEZING, \ .categoryName = _("Poison Gas"), \ FOOTPRINT(Weezing) \ - .formSpeciesIdTable = sWeezingFormSpeciesIdTable - - [SPECIES_WEEZING] = - { - WEEZING_MISC_INFO, + .formSpeciesIdTable = sWeezingFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON), .itemRare = ITEM_SMOKE_BALL, #if P_UPDATED_ABILITIES >= GEN_8 @@ -8788,7 +9804,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_WEEZING_GALARIAN] = { - WEEZING_MISC_INFO, + .baseHP = 65, \ + .baseAttack = 90, \ + .baseDefense = 120, \ + .baseSpeed = 60, \ + .baseSpAttack = 85, \ + .baseSpDefense = 70, \ + .catchRate = 60, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .noFlip = TRUE, \ + .speciesName = _("Weezing"), \ + .cryId = CRY_WEEZING, \ + .natDexNum = NATIONAL_DEX_WEEZING, \ + .categoryName = _("Poison Gas"), \ + FOOTPRINT(Weezing) \ + .formSpeciesIdTable = sWeezingFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON, TYPE_FAIRY), .itemRare = ITEM_MISTY_SEED, .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_MISTY_SURGE }, @@ -9234,7 +10270,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_TANGELA #if P_FAMILY_KANGASKHAN -#define KANGASKHAN_MISC_INFO \ + [SPECIES_KANGASKHAN] = + { .types = MON_TYPES(TYPE_NORMAL), \ .catchRate = 45, \ .evYield_HP = 2, \ @@ -9255,11 +10292,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Kangaskhan) \ LEARNSETS(Kangaskhan), \ .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ - .formChangeTable = sKangaskhanFormChangeTable - - [SPECIES_KANGASKHAN] = - { - KANGASKHAN_MISC_INFO, + .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, .baseAttack = 95, .baseDefense = 80, @@ -9289,7 +10322,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_KANGASKHAN_MEGA] = { - KANGASKHAN_MISC_INFO, + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 45, \ + .evYield_HP = 2, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Kangaskhan"), \ + .natDexNum = NATIONAL_DEX_KANGASKHAN, \ + .categoryName = _("Parent"), \ + .height = 22, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 387, \ + .trainerOffset = 8, \ + FOOTPRINT(Kangaskhan) \ + LEARNSETS(Kangaskhan), \ + .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ + .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, .baseAttack = 125, .baseDefense = 100, @@ -9740,7 +10793,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #endif //P_GEN_4_CROSS_EVOS -#define MR_MIME_MISC_INFO \ + [SPECIES_MR_MIME] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -9752,11 +10806,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MR_MIME, \ .natDexNum = NATIONAL_DEX_MR_MIME, \ FOOTPRINT(MrMime) \ - .formSpeciesIdTable = sMrMimeFormSpeciesIdTable - - [SPECIES_MR_MIME] = - { - MR_MIME_MISC_INFO, + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, .baseDefense = 65, @@ -9798,7 +10848,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MR_MIME_GALARIAN] = { - MR_MIME_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .speciesName = _("Mr. Mime"), \ + .cryId = CRY_MR_MIME, \ + .natDexNum = NATIONAL_DEX_MR_MIME, \ + FOOTPRINT(MrMime) \ + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .baseHP = 50, .baseAttack = 65, .baseDefense = 65, @@ -9937,7 +10998,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_GEN_2_CROSS_EVOS -#define SCIZOR_MISC_INFO \ + [SPECIES_SCIZOR] = + { .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), \ .catchRate = 25, \ .evYield_Attack = 2, \ @@ -9953,11 +11015,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Scizor) \ LEARNSETS(Scizor), \ .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ - .formChangeTable = sScizorFormChangeTable - - [SPECIES_SCIZOR] = - { - SCIZOR_MISC_INFO, + .formChangeTable = sScizorFormChangeTable, .baseHP = 70, .baseAttack = 130, .baseDefense = 100, @@ -9994,7 +11052,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCIZOR_MEGA] = { - SCIZOR_MISC_INFO, + .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), \ + .catchRate = 25, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Scizor"), \ + .natDexNum = NATIONAL_DEX_SCIZOR, \ + .categoryName = _("Pincer"), \ + FOOTPRINT(Scizor) \ + LEARNSETS(Scizor), \ + .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ + .formChangeTable = sScizorFormChangeTable, .baseHP = 70, .baseAttack = 150, .baseDefense = 140, @@ -10502,7 +11575,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_MAGMAR #if P_FAMILY_PINSIR -#define PINSIR_MISC_INFO \ + [SPECIES_PINSIR] = + { .catchRate = 45, \ .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -10517,11 +11591,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Pinsir) \ LEARNSETS(Pinsir), \ .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ - .formChangeTable = sPinsirFormChangeTable - - [SPECIES_PINSIR] = - { - PINSIR_MISC_INFO, + .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, .baseAttack = 125, .baseDefense = 100, @@ -10557,7 +11627,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_PINSIR_MEGA] = { - PINSIR_MISC_INFO, + .catchRate = 45, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Pinsir"), \ + .natDexNum = NATIONAL_DEX_PINSIR, \ + .categoryName = _("Stag Beetle"), \ + FOOTPRINT(Pinsir) \ + LEARNSETS(Pinsir), \ + .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ + .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, .baseAttack = 155, .baseDefense = 120, @@ -10595,7 +11679,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_PINSIR #if P_FAMILY_TAUROS -#define TAUROS_MISC_INFO \ + [SPECIES_TAUROS] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ .genderRatio = MON_MALE, \ @@ -10613,11 +11698,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Tauros) \ - .formSpeciesIdTable = sTaurosFormSpeciesIdTable - - [SPECIES_TAUROS] = - { - TAUROS_MISC_INFO, + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, .baseHP = 75, .baseAttack = 100, .baseDefense = 95, @@ -10649,7 +11730,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #if P_PALDEAN_FORMS -#define TAUROS_PALDEAN_MISC_INFO \ + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = + { + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Tauros"), \ + .cryId = CRY_TAUROS, \ + .natDexNum = NATIONAL_DEX_TAUROS, \ + .categoryName = _("Wild Bull"), \ + .height = 14, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Tauros) \ + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, .baseHP = 75, \ .baseAttack = 110, \ .baseDefense = 105, \ @@ -10662,12 +11762,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontAnimFrames = sAnims_TaurosPaldean, \ /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ - .isPaldeanForm = TRUE - - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = - { - TAUROS_MISC_INFO, - TAUROS_PALDEAN_MISC_INFO, + .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING), .weight = 1150, .description = COMPOUND_STRING( @@ -10686,8 +11781,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { - TAUROS_MISC_INFO, - TAUROS_PALDEAN_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Tauros"), \ + .cryId = CRY_TAUROS, \ + .natDexNum = NATIONAL_DEX_TAUROS, \ + .categoryName = _("Wild Bull"), \ + .height = 14, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Tauros) \ + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, + .baseHP = 75, \ + .baseAttack = 110, \ + .baseDefense = 105, \ + .baseSpeed = 100, \ + .baseSpAttack = 30, \ + .baseSpDefense = 70, \ + .evYield_Attack = 2, \ + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \ + .bodyColor = BODY_COLOR_BLACK, \ + .frontAnimFrames = sAnims_TaurosPaldean, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ + .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING, TYPE_FIRE), .weight = 850, .description = COMPOUND_STRING( @@ -10706,8 +11830,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { - TAUROS_MISC_INFO, - TAUROS_PALDEAN_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Tauros"), \ + .cryId = CRY_TAUROS, \ + .natDexNum = NATIONAL_DEX_TAUROS, \ + .categoryName = _("Wild Bull"), \ + .height = 14, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Tauros) \ + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, + .baseHP = 75, \ + .baseAttack = 110, \ + .baseDefense = 105, \ + .baseSpeed = 100, \ + .baseSpAttack = 30, \ + .baseSpDefense = 70, \ + .evYield_Attack = 2, \ + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \ + .bodyColor = BODY_COLOR_BLACK, \ + .frontAnimFrames = sAnims_TaurosPaldean, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ + .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .weight = 1100, .description = COMPOUND_STRING( @@ -10778,7 +11931,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_GYARADOS}), }, -#define GYARADOS_MISC_INFO \ + [SPECIES_GYARADOS] = + { .catchRate = 45, \ .evYield_Attack = 2, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -10798,11 +11952,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Gyarados) \ LEARNSETS(Gyarados), \ .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ - .formChangeTable = sGyaradosFormChangeTable - - [SPECIES_GYARADOS] = - { - GYARADOS_MISC_INFO, + .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, .baseAttack = 125, .baseDefense = 79, @@ -10835,7 +11985,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GYARADOS_MEGA] = { - GYARADOS_MISC_INFO, + .catchRate = 45, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 5, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON),\ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Gyarados"), \ + .natDexNum = NATIONAL_DEX_GYARADOS, \ + .categoryName = _("Atrocious"), \ + .height = 65, \ + .pokemonScale = 256, \ + .pokemonOffset = 6, \ + .trainerScale = 481, \ + .trainerOffset = 13, \ + FOOTPRINT(Gyarados) \ + LEARNSETS(Gyarados), \ + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ + .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, .baseAttack = 155, .baseDefense = 109, @@ -10868,7 +12037,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_MAGIKARP #if P_FAMILY_LAPRAS -#define LAPRAS_MISC_INFO \ + [SPECIES_LAPRAS] = + { .baseHP = 130, \ .baseAttack = 85, \ .baseDefense = 80, \ @@ -10895,11 +12065,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Lapras) \ LEARNSETS(Lapras), \ .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ - .formChangeTable = sLaprasFormChangeTable - - [SPECIES_LAPRAS] = - { - LAPRAS_MISC_INFO, + .formChangeTable = sLaprasFormChangeTable, .height = 25, .weight = 2200, .description = COMPOUND_STRING( @@ -10925,7 +12091,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_LAPRAS_GIGANTAMAX] = { - LAPRAS_MISC_INFO, + .baseHP = 130, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 60, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_WATER, TYPE_ICE), \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 187 : 219, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .abilities = { ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Lapras"), \ + .cryId = CRY_LAPRAS, \ + .natDexNum = NATIONAL_DEX_LAPRAS, \ + .categoryName = _("Transport"), \ + FOOTPRINT(Lapras) \ + LEARNSETS(Lapras), \ + .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ + .formChangeTable = sLaprasFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -11004,7 +12196,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_DITTO #if P_FAMILY_EEVEE -#define EEVEE_MISC_INFO \ + [SPECIES_EEVEE] = + { .baseHP = 55, \ .baseAttack = 55, \ .baseDefense = 50, \ @@ -11029,11 +12222,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Eevee) \ LEARNSETS(Eevee), \ .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ - .formChangeTable = sEeveeFormChangeTable - - [SPECIES_EEVEE] = - { - EEVEE_MISC_INFO, + .formChangeTable = sEeveeFormChangeTable, .height = 3, .weight = 65, .description = COMPOUND_STRING( @@ -11071,7 +12260,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_EEVEE_GIGANTAMAX] = { - EEVEE_MISC_INFO, + .baseHP = 55, \ + .baseAttack = 55, \ + .baseDefense = 50, \ + .baseSpeed = 55, \ + .baseSpAttack = 45, \ + .baseSpDefense = 65, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 92, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 35, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Eevee"), \ + .cryId = CRY_EEVEE, \ + .natDexNum = NATIONAL_DEX_EEVEE, \ + .categoryName = _("Evolution"), \ + FOOTPRINT(Eevee) \ + LEARNSETS(Eevee), \ + .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ + .formChangeTable = sEeveeFormChangeTable, .height = 180, .weight = 0, .description = COMPOUND_STRING( @@ -11852,7 +13065,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_KABUTO #if P_FAMILY_AERODACTYL -#define AERODACTYL_MISC_INFO \ + [SPECIES_AERODACTYL] = + { .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), \ .catchRate = 45, \ .evYield_Speed = 2, \ @@ -11868,11 +13082,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Aerodactyl) \ LEARNSETS(Aerodactyl), \ .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ - .formChangeTable = sAerodactylFormChangeTable - - [SPECIES_AERODACTYL] = - { - AERODACTYL_MISC_INFO, + .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, .baseAttack = 105, .baseDefense = 65, @@ -11908,7 +13118,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_AERODACTYL_MEGA] = { - AERODACTYL_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), \ + .catchRate = 45, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 35, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Aerodactyl"), \ + .natDexNum = NATIONAL_DEX_AERODACTYL, \ + .categoryName = _("Fossil"), \ + FOOTPRINT(Aerodactyl) \ + LEARNSETS(Aerodactyl), \ + .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ + .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, .baseAttack = 135, .baseDefense = 85, @@ -11996,7 +13221,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = }, #endif //P_GEN_4_CROSS_EVOS -#define SNORLAX_MISC_INFO \ + [SPECIES_SNORLAX] = + { .baseHP = 160, \ .baseAttack = 110, \ .baseDefense = 65, \ @@ -12023,11 +13249,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Snorlax) \ LEARNSETS(Snorlax), \ .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ - .formChangeTable = sSnorlaxFormChangeTable - - [SPECIES_SNORLAX] = - { - SNORLAX_MISC_INFO, + .formChangeTable = sSnorlaxFormChangeTable, .height = 21, .weight = 4600, .description = COMPOUND_STRING( @@ -12053,7 +13275,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_SNORLAX_GIGANTAMAX] = { - SNORLAX_MISC_INFO, + .baseHP = 160, \ + .baseAttack = 110, \ + .baseDefense = 65, \ + .baseSpeed = 30, \ + .baseSpAttack = 65, \ + .baseSpDefense = 110, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 25, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_LEFTOVERS, \ + .itemRare = ITEM_LEFTOVERS, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ + .abilities = { ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY }, \ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Snorlax"), \ + .cryId = CRY_SNORLAX, \ + .natDexNum = NATIONAL_DEX_SNORLAX, \ + .categoryName = _("Sleeping"), \ + FOOTPRINT(Snorlax) \ + LEARNSETS(Snorlax), \ + .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ + .formChangeTable = sSnorlaxFormChangeTable, .height = 350, .weight = 0, .description = COMPOUND_STRING( @@ -12080,7 +13328,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_SNORLAX #if P_FAMILY_ARTICUNO -#define ARTICUNO_MISC_INFO \ + [SPECIES_ARTICUNO] = + { .catchRate = 3, \ .genderRatio = MON_GENDERLESS, \ .friendship = 35, \ @@ -12096,11 +13345,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 2, \ FOOTPRINT(Articuno) \ .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ - .isLegendary = TRUE - - [SPECIES_ARTICUNO] = - { - ARTICUNO_MISC_INFO, + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, .baseDefense = 100, @@ -12141,7 +13386,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ARTICUNO_GALARIAN] = { - ARTICUNO_MISC_INFO, + .catchRate = 3, \ + .genderRatio = MON_GENDERLESS, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .speciesName = _("Articuno"), \ + .cryId = CRY_ARTICUNO, \ + .natDexNum = NATIONAL_DEX_ARTICUNO, \ + .height = 17, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 309, \ + .trainerOffset = 2, \ + FOOTPRINT(Articuno) \ + .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, .baseDefense = 85, @@ -12178,7 +13438,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_ARTICUNO #if P_FAMILY_ZAPDOS -#define ZAPDOS_MISC_INFO \ + [SPECIES_ZAPDOS] = + { .catchRate = 3, \ .genderRatio = MON_GENDERLESS, \ .friendship = 35, \ @@ -12195,11 +13456,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 3, \ FOOTPRINT(Zapdos) \ .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ - .isLegendary = TRUE - - [SPECIES_ZAPDOS] = - { - ZAPDOS_MISC_INFO, + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 90, .baseDefense = 85, @@ -12244,7 +13501,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ZAPDOS_GALARIAN] = { - ZAPDOS_MISC_INFO, + .catchRate = 3, \ + .genderRatio = MON_GENDERLESS, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Zapdos"), \ + .cryId = CRY_ZAPDOS, \ + .natDexNum = NATIONAL_DEX_ZAPDOS, \ + .height = 16, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 318, \ + .trainerOffset = 3, \ + FOOTPRINT(Zapdos) \ + .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 125, .baseDefense = 90, @@ -12279,7 +13552,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_ZAPDOS #if P_FAMILY_MOLTRES -#define MOLTRES_MISC_INFO \ + [SPECIES_MOLTRES] = + { .catchRate = 3, \ .genderRatio = MON_GENDERLESS, \ .friendship = 35, \ @@ -12295,11 +13569,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 8, \ FOOTPRINT(Moltres) \ .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ - .isLegendary = TRUE - - [SPECIES_MOLTRES] = - { - MOLTRES_MISC_INFO, + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 100, .baseDefense = 90, @@ -12340,7 +13610,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MOLTRES_GALARIAN] = { - MOLTRES_MISC_INFO, + .catchRate = 3, \ + .genderRatio = MON_GENDERLESS, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .speciesName = _("Moltres"), \ + .cryId = CRY_MOLTRES, \ + .natDexNum = NATIONAL_DEX_MOLTRES, \ + .height = 20, \ + .pokemonScale = 270, \ + .pokemonOffset = 0, \ + .trainerScale = 387, \ + .trainerOffset = 8, \ + FOOTPRINT(Moltres) \ + .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, .baseDefense = 90, @@ -12530,7 +13815,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #endif //P_FAMILY_DRATINI #if P_FAMILY_MEWTWO -#define SPECIES_MEWTWO_MISC_INFO \ + [SPECIES_MEWTWO] = + { .catchRate = 3, \ .evYield_SpAttack = 3, \ .genderRatio = MON_GENDERLESS, \ @@ -12546,11 +13832,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = LEARNSETS(Mewtwo), \ .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ .formChangeTable = sMewtwoFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_MEWTWO] = - { - SPECIES_MEWTWO_MISC_INFO, + .isLegendary = TRUE, .baseHP = 106, .baseAttack = 110, .baseDefense = 90, @@ -12592,7 +13874,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEWTWO_MEGA_X] = { - SPECIES_MEWTWO_MISC_INFO, + .catchRate = 3, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Mewtwo"), \ + .natDexNum = NATIONAL_DEX_MEWTWO, \ + .categoryName = _("Genetic"), \ + FOOTPRINT(Mewtwo) \ + LEARNSETS(Mewtwo), \ + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ + .formChangeTable = sMewtwoFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 106, .baseAttack = 190, .baseDefense = 100, @@ -12628,7 +13925,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MEWTWO_MEGA_Y] = { - SPECIES_MEWTWO_MISC_INFO, + .catchRate = 3, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Mewtwo"), \ + .natDexNum = NATIONAL_DEX_MEWTWO, \ + .categoryName = _("Genetic"), \ + FOOTPRINT(Mewtwo) \ + LEARNSETS(Mewtwo), \ + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ + .formChangeTable = sMewtwoFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 106, .baseAttack = 150, .baseDefense = 70, From b262cdd63c6680cba6b783c30e61a4af87b18a75 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 17:44:11 -0300 Subject: [PATCH 05/23] Expanded Gen 2 macros --- src/data/pokemon/species_info/gen_2.h | 656 ++++++++++++-------------- 1 file changed, 301 insertions(+), 355 deletions(-) diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index 531feab24cb0..c9ecec507db0 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -265,7 +265,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #define TYPHLOSION_EXP_YIELD 209 #endif -#define TYPHLOSION_MISC_INFO \ + [SPECIES_TYPHLOSION] = + { .catchRate = 45, \ .expYield = TYPHLOSION_EXP_YIELD, \ .evYield_SpAttack = 3, \ @@ -279,11 +280,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .cryId = CRY_TYPHLOSION, \ .natDexNum = NATIONAL_DEX_TYPHLOSION, \ FOOTPRINT(Typhlosion) \ - .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable - - [SPECIES_TYPHLOSION] = - { - TYPHLOSION_MISC_INFO, + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .baseHP = 78, .baseAttack = 84, .baseDefense = 78, @@ -320,7 +317,20 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_TYPHLOSION_HISUIAN] = { - TYPHLOSION_MISC_INFO, + .catchRate = 45, \ + .expYield = TYPHLOSION_EXP_YIELD, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Typhlosion"), \ + .cryId = CRY_TYPHLOSION, \ + .natDexNum = NATIONAL_DEX_TYPHLOSION, \ + FOOTPRINT(Typhlosion) \ + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .baseHP = 73, .baseAttack = 84, .baseDefense = 78, @@ -1375,7 +1385,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_AMPHAROS}), }, -#define AMPHAROS_MISC_INFO \ +#define AMPHAROS_DEFENSE (P_UPDATED_STATS >= GEN_6 ? 85 : 75) + + [SPECIES_AMPHAROS] = + { .catchRate = 45, \ .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -1396,13 +1409,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = FOOTPRINT(Ampharos) \ LEARNSETS(Ampharos), \ .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ - .formChangeTable = sAmpharosFormChangeTable - -#define AMPHAROS_DEFENSE (P_UPDATED_STATS >= GEN_6 ? 85 : 75) - - [SPECIES_AMPHAROS] = - { - AMPHAROS_MISC_INFO, + .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, .baseAttack = 75, .baseDefense = AMPHAROS_DEFENSE, @@ -1441,7 +1448,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_AMPHAROS_MEGA] = { - AMPHAROS_MISC_INFO, + .catchRate = 45, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD),\ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Ampharos"), \ + .natDexNum = NATIONAL_DEX_AMPHAROS, \ + .categoryName = _("Light"), \ + .height = 14, \ + .weight = 615, \ + .pokemonScale = 256, \ + .pokemonOffset = 4, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Ampharos) \ + LEARNSETS(Ampharos), \ + .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ + .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, .baseAttack = 95, .baseDefense = AMPHAROS_DEFENSE + 20, @@ -2199,7 +2226,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #endif //P_FAMILY_YANMA #if P_FAMILY_WOOPER -#define WOOPER_MISC_INFO \ + [SPECIES_WOOPER] = + { .baseHP = 55, \ .baseAttack = 45, \ .baseDefense = 45, \ @@ -2223,11 +2251,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Wooper) \ - .formSpeciesIdTable = sWooperFormSpeciesIdTable - - [SPECIES_WOOPER] = - { - WOOPER_MISC_INFO, + .formSpeciesIdTable = sWooperFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .abilities = { ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, .bodyColor = BODY_COLOR_BLUE, @@ -2305,7 +2329,30 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_PALDEAN_FORMS [SPECIES_WOOPER_PALDEAN] = { - WOOPER_MISC_INFO, + .baseHP = 55, \ + .baseAttack = 45, \ + .baseDefense = 45, \ + .baseSpeed = 15, \ + .baseSpAttack = 25, \ + .baseSpDefense = 25, \ + .catchRate = 255, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), \ + .speciesName = _("Wooper"), \ + .cryId = CRY_WOOPER, \ + .natDexNum = NATIONAL_DEX_WOOPER, \ + .height = 4, \ + .pokemonScale = 479, \ + .pokemonOffset = 21, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Wooper) \ + .formSpeciesIdTable = sWooperFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), .abilities = { ABILITY_POISON_POINT, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, .bodyColor = BODY_COLOR_BROWN, @@ -2585,289 +2632,82 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #endif //P_FAMILY_MISDREAVUS #if P_FAMILY_UNOWN -#define UNOWN_MISC_INFO(letter) \ - .baseHP = 48, \ - .baseAttack = 72, \ - .baseDefense = 48, \ - .baseSpeed = 48, \ - .baseSpAttack = 72, \ - .baseSpDefense = 48, \ - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 225, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 118 : 61, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Unown"), \ - .cryId = CRY_UNOWN, \ - .natDexNum = NATIONAL_DEX_UNOWN, \ - .categoryName = _("Symbol"), \ - .height = 5, \ - .weight = 50, \ - .description = gUnownPokedexText, \ - .pokemonScale = 411, \ - .pokemonOffset = 2, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 16, \ - .frontAnimFrames = sAnims_Unown, \ - .frontAnimId = ANIM_ZIGZAG_FAST, \ - .enemyMonElevation = 8, \ - .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - PALETTES(Unown), \ - ICON(Unown ##letter, 0), \ - FOOTPRINT(Unown) \ - LEARNSETS(Unown), \ - .tmIlliterate = TRUE, \ - .formSpeciesIdTable = sUnownFormSpeciesIdTable - - [SPECIES_UNOWN] = - { - UNOWN_MISC_INFO(A), - FRONT_PIC(UnownA, 24, 40), - BACK_PIC(UnownA, 24, 48), - .backPicYOffset = 8, - }, - - [SPECIES_UNOWN_B] = - { - UNOWN_MISC_INFO(B), - .noFlip = TRUE, - FRONT_PIC(UnownB, 24, 32), - BACK_PIC(UnownB, 40, 48), - .backPicYOffset = 9, - }, - - [SPECIES_UNOWN_C] = - { - UNOWN_MISC_INFO(C), - .noFlip = TRUE, - FRONT_PIC(UnownC, 32, 32), - BACK_PIC(UnownC, 48, 56), - .backPicYOffset = 6, - }, - - [SPECIES_UNOWN_D] = - { - UNOWN_MISC_INFO(D), - .noFlip = TRUE, - FRONT_PIC(UnownD, 32, 32), - BACK_PIC(UnownD, 40, 48), - .backPicYOffset = 8, - }, - - [SPECIES_UNOWN_E] = - { - UNOWN_MISC_INFO(E), - .noFlip = TRUE, - FRONT_PIC(UnownE, 32, 32), - BACK_PIC(UnownE, 40, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_F] = - { - UNOWN_MISC_INFO(F), - .noFlip = TRUE, - FRONT_PIC(UnownF, 32, 32), - BACK_PIC(UnownF, 48, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_G] = - { - UNOWN_MISC_INFO(G), - .noFlip = TRUE, - FRONT_PIC(UnownG, 24, 40), - BACK_PIC(UnownG, 40, 56), - .backPicYOffset = 5, - }, - - [SPECIES_UNOWN_H] = - { - UNOWN_MISC_INFO(H), - .noFlip = TRUE, - FRONT_PIC(UnownH, 32, 32), - BACK_PIC(UnownH, 48, 48), - .backPicYOffset = 8, - }, - - [SPECIES_UNOWN_I] = - { - UNOWN_MISC_INFO(I), - FRONT_PIC(UnownI, 24, 32), - BACK_PIC(UnownI, 24, 56), - .backPicYOffset = 7, - }, - - [SPECIES_UNOWN_J] = - { - UNOWN_MISC_INFO(J), - .noFlip = TRUE, - FRONT_PIC(UnownJ, 24, 32), - BACK_PIC(UnownJ, 32, 48), - .backPicYOffset = 9, - }, - - [SPECIES_UNOWN_K] = - { - UNOWN_MISC_INFO(K), - .noFlip = TRUE, - FRONT_PIC(UnownK, 32, 32), - BACK_PIC(UnownK, 40, 56), - .backPicYOffset = 7, - }, - - [SPECIES_UNOWN_L] = - { - UNOWN_MISC_INFO(L), - .noFlip = TRUE, - FRONT_PIC(UnownL, 24, 32), - BACK_PIC(UnownL, 32, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_M] = - { - UNOWN_MISC_INFO(M), - FRONT_PIC(UnownM, 32, 32), - BACK_PIC(UnownM, 48, 40), - .backPicYOffset = 13, - }, - - [SPECIES_UNOWN_N] = - { - UNOWN_MISC_INFO(N), - .noFlip = TRUE, - FRONT_PIC(UnownN, 32, 24), - BACK_PIC(UnownN, 48, 40), - .backPicYOffset = 13, - }, - - [SPECIES_UNOWN_O] = - { - UNOWN_MISC_INFO(O), - FRONT_PIC(UnownO, 32, 32), - BACK_PIC(UnownO, 48, 48), - .backPicYOffset = 8, - }, - - [SPECIES_UNOWN_P] = - { - UNOWN_MISC_INFO(P), - .noFlip = TRUE, - FRONT_PIC(UnownP, 24, 32), - BACK_PIC(UnownP, 32, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_Q] = - { - UNOWN_MISC_INFO(Q), - .noFlip = TRUE, - FRONT_PIC(UnownQ, 32, 24), - BACK_PIC(UnownQ, 40, 40), - .backPicYOffset = 15, - }, - - [SPECIES_UNOWN_R] = - { - UNOWN_MISC_INFO(R), - .noFlip = TRUE, - FRONT_PIC(UnownR, 24, 32), - BACK_PIC(UnownR, 32, 40), - .backPicYOffset = 12, - }, - - [SPECIES_UNOWN_S] = - { - UNOWN_MISC_INFO(S), - .noFlip = TRUE, - FRONT_PIC(UnownS, 32, 40), - BACK_PIC(UnownS, 40, 56), - .backPicYOffset = 4, - }, - - [SPECIES_UNOWN_T] = - { - UNOWN_MISC_INFO(T), - FRONT_PIC(UnownT, 24, 32), - BACK_PIC(UnownT, 32, 40), - .backPicYOffset = 13, - }, - - [SPECIES_UNOWN_U] = - { - UNOWN_MISC_INFO(U), - FRONT_PIC(UnownU, 32, 32), - BACK_PIC(UnownU, 48, 40), - .backPicYOffset = 13, - }, - - [SPECIES_UNOWN_V] = - { - UNOWN_MISC_INFO(V), - .noFlip = TRUE, - FRONT_PIC(UnownV, 32, 32), - BACK_PIC(UnownV, 40, 48), - .backPicYOffset = 11, - }, - - [SPECIES_UNOWN_W] = - { - UNOWN_MISC_INFO(W), - FRONT_PIC(UnownW, 32, 32), - BACK_PIC(UnownW, 40, 40), - .backPicYOffset = 13, - }, - - [SPECIES_UNOWN_X] = - { - UNOWN_MISC_INFO(X), - FRONT_PIC(UnownX, 24, 24), - BACK_PIC(UnownX, 40, 40), - .backPicYOffset = 15, - }, - - [SPECIES_UNOWN_Y] = - { - UNOWN_MISC_INFO(Y), - FRONT_PIC(UnownY, 24, 32), - BACK_PIC(UnownY, 32, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_Z] = - { - UNOWN_MISC_INFO(Z), - .noFlip = TRUE, - FRONT_PIC(UnownZ, 24, 32), - BACK_PIC(UnownZ, 32, 48), - .backPicYOffset = 10, - }, - - [SPECIES_UNOWN_EMARK] = - { - UNOWN_MISC_INFO(ExclamationMark), - FRONT_PIC(UnownExclamationMark, 24, 40), - BACK_PIC(UnownExclamationMark, 24, 56), - .backPicYOffset = 6, - }, - - [SPECIES_UNOWN_QMARK] = - { - UNOWN_MISC_INFO(QuestionMark), - .noFlip = TRUE, - FRONT_PIC(UnownQuestionMark, 24, 40), - BACK_PIC(UnownQuestionMark, 32, 56), - .backPicYOffset = 6, - }, +#define UNOWN_MISC_INFO(letter, _noFlip, frontWidth, frontHeight, backWidth, backHeight, backYOffset) \ + { \ + .baseHP = 48, \ + .baseAttack = 72, \ + .baseDefense = 48, \ + .baseSpeed = 48, \ + .baseSpAttack = 72, \ + .baseSpDefense = 48, \ + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 225, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 118 : 61, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLACK, \ + .noFlip = _noFlip, \ + .speciesName = _("Unown"), \ + .cryId = CRY_UNOWN, \ + .natDexNum = NATIONAL_DEX_UNOWN, \ + .categoryName = _("Symbol"), \ + .height = 5, \ + .weight = 50, \ + .description = gUnownPokedexText, \ + .pokemonScale = 411, \ + .pokemonOffset = 2, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Unown ##letter, frontWidth, frontHeight), \ + .frontPicYOffset = 16, \ + .frontAnimFrames = sAnims_Unown, \ + .frontAnimId = ANIM_ZIGZAG_FAST, \ + .enemyMonElevation = 8, \ + BACK_PIC(Unown ##letter, backWidth, backHeight), \ + .backPicYOffset = backYOffset, \ + .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ + PALETTES(Unown), \ + ICON(Unown ##letter, 0), \ + FOOTPRINT(Unown) \ + LEARNSETS(Unown), \ + .tmIlliterate = TRUE, \ + .formSpeciesIdTable = sUnownFormSpeciesIdTable, \ + } + + [SPECIES_UNOWN] = UNOWN_MISC_INFO(A, FALSE, 24, 40, 24, 48, 8 ), + [SPECIES_UNOWN_B] = UNOWN_MISC_INFO(B, TRUE, 24, 32, 40, 48, 9 ), + [SPECIES_UNOWN_C] = UNOWN_MISC_INFO(C, TRUE, 32, 32, 48, 56, 6 ), + [SPECIES_UNOWN_D] = UNOWN_MISC_INFO(D, TRUE, 32, 32, 40, 48, 8 ), + [SPECIES_UNOWN_E] = UNOWN_MISC_INFO(E, TRUE, 32, 32, 40, 48, 10 ), + [SPECIES_UNOWN_F] = UNOWN_MISC_INFO(F, TRUE, 32, 32, 48, 48, 10 ), + [SPECIES_UNOWN_G] = UNOWN_MISC_INFO(G, TRUE, 24, 40, 40, 56, 5 ), + [SPECIES_UNOWN_H] = UNOWN_MISC_INFO(H, TRUE, 32, 32, 48, 48, 8 ), + [SPECIES_UNOWN_I] = UNOWN_MISC_INFO(I, FALSE, 24, 32, 24, 56, 7 ), + [SPECIES_UNOWN_J] = UNOWN_MISC_INFO(J, TRUE, 24, 32, 32, 48, 9 ), + [SPECIES_UNOWN_K] = UNOWN_MISC_INFO(K, TRUE, 32, 32, 40, 56, 7 ), + [SPECIES_UNOWN_L] = UNOWN_MISC_INFO(L, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_M] = UNOWN_MISC_INFO(M, FALSE, 32, 32, 48, 40, 13 ), + [SPECIES_UNOWN_N] = UNOWN_MISC_INFO(N, TRUE, 32, 24, 48, 40, 13 ), + [SPECIES_UNOWN_O] = UNOWN_MISC_INFO(O, FALSE, 32, 32, 48, 48, 8 ), + [SPECIES_UNOWN_P] = UNOWN_MISC_INFO(P, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_Q] = UNOWN_MISC_INFO(Q, TRUE, 32, 24, 40, 40, 15 ), + [SPECIES_UNOWN_R] = UNOWN_MISC_INFO(R, TRUE, 24, 32, 32, 40, 12 ), + [SPECIES_UNOWN_S] = UNOWN_MISC_INFO(S, TRUE, 32, 40, 40, 56, 4 ), + [SPECIES_UNOWN_T] = UNOWN_MISC_INFO(T, FALSE, 24, 32, 32, 40, 13 ), + [SPECIES_UNOWN_U] = UNOWN_MISC_INFO(U, FALSE, 32, 32, 48, 40, 13 ), + [SPECIES_UNOWN_V] = UNOWN_MISC_INFO(V, TRUE, 32, 32, 40, 48, 11 ), + [SPECIES_UNOWN_W] = UNOWN_MISC_INFO(W, FALSE, 32, 32, 40, 40, 13 ), + [SPECIES_UNOWN_X] = UNOWN_MISC_INFO(X, FALSE, 24, 24, 40, 40, 15 ), + [SPECIES_UNOWN_Y] = UNOWN_MISC_INFO(Y, FALSE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_Z] = UNOWN_MISC_INFO(Z, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_EMARK] = UNOWN_MISC_INFO(ExclamationMark, FALSE, 24, 40, 24, 56, 6 ), + [SPECIES_UNOWN_QMARK] = UNOWN_MISC_INFO(QuestionMark, TRUE, 24, 40, 32, 56, 6 ), #endif //P_FAMILY_UNOWN #if P_FAMILY_WOBBUFFET @@ -3517,7 +3357,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #define QWILFISH_EXP_YIELD 100 #endif -#define QWILFISH_MISC_INFO \ + [SPECIES_QWILFISH] = + { .baseHP = 65, \ .baseAttack = 95, \ .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, \ @@ -3545,11 +3386,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Qwilfish) \ - .formSpeciesIdTable = sQwilfishFormSpeciesIdTable - - [SPECIES_QWILFISH] = - { - QWILFISH_MISC_INFO, + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_POISON), .bodyColor = BODY_COLOR_GRAY, .description = COMPOUND_STRING( @@ -3573,7 +3410,34 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_QWILFISH_HISUIAN] = { - QWILFISH_MISC_INFO, + .baseHP = 65, \ + .baseAttack = 95, \ + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, \ + .baseSpeed = 85, \ + .baseSpAttack = 55, \ + .baseSpDefense = 55, \ + .catchRate = 45, \ + .expYield = QWILFISH_EXP_YIELD, \ + .evYield_Attack = 1, \ + .itemRare = ITEM_POISON_BARB, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, \ + .speciesName = _("Qwilfish"), \ + .cryId = CRY_QWILFISH, \ + .natDexNum = NATIONAL_DEX_QWILFISH, \ + .categoryName = _("Balloon"), \ + .height = 5, \ + .weight = 39, \ + .pokemonScale = 430, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Qwilfish) \ + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_POISON), .bodyColor = BODY_COLOR_BLACK, .description = COMPOUND_STRING( @@ -3698,7 +3562,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #endif //P_FAMILY_SHUCKLE #if P_FAMILY_HERACROSS -#define HERACROSS_MISC_INFO \ + [SPECIES_HERACROSS] = + { .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), \ .catchRate = 45, \ .evYield_Attack = 2, \ @@ -3714,11 +3579,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = FOOTPRINT(Heracross) \ LEARNSETS(Heracross), \ .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ - .formChangeTable = sHeracrossFormChangeTable - - [SPECIES_HERACROSS] = - { - HERACROSS_MISC_INFO, + .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, .baseAttack = 125, .baseDefense = 75, @@ -3755,7 +3616,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HERACROSS_MEGA] = { - HERACROSS_MISC_INFO, + .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), \ + .catchRate = 45, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Heracross"), \ + .natDexNum = NATIONAL_DEX_HERACROSS, \ + .categoryName = _("Single Horn"), \ + FOOTPRINT(Heracross) \ + LEARNSETS(Heracross), \ + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ + .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, .baseAttack = 185, .baseDefense = 115, @@ -3791,7 +3667,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #endif //P_FAMILY_HERACROSS #if P_FAMILY_SNEASEL -#define SNEASEL_MISC_INFO \ + [SPECIES_SNEASEL] = + { .baseHP = 55, \ .baseAttack = 95, \ .baseDefense = 55, \ @@ -3818,11 +3695,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Sneasel) \ - .formSpeciesIdTable = sSneaselFormSpeciesIdTable - - [SPECIES_SNEASEL] = - { - SNEASEL_MISC_INFO, + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_ICE), .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, .bodyColor = BODY_COLOR_BLACK, @@ -3904,7 +3777,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_SNEASEL_HISUIAN] = { - SNEASEL_MISC_INFO, + .baseHP = 55, \ + .baseAttack = 95, \ + .baseDefense = 55, \ + .baseSpeed = 115, \ + .baseSpAttack = 35, \ + .baseSpDefense = 75, \ + .catchRate = 60, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, \ + .evYield_Speed = 1, \ + .itemRare = ITEM_QUICK_CLAW, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 35, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .noFlip = TRUE, \ + .speciesName = _("Sneasel"), \ + .cryId = CRY_SNEASEL, \ + .natDexNum = NATIONAL_DEX_SNEASEL, \ + .categoryName = _("Sharp Claw"), \ + .height = 9, \ + .pokemonScale = 413, \ + .pokemonOffset = -3, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Sneasel) \ + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIGHTING, TYPE_POISON), .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, .bodyColor = BODY_COLOR_GRAY, @@ -4082,7 +3981,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = }, #if P_GEN_8_CROSS_EVOS -#define URSALUNA_MISC_INFO \ + [SPECIES_URSALUNA] = + { .expYield = 275, \ .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), \ .eggCycles = 20, \ @@ -4094,11 +3994,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .cryId = CRY_URSALUNA, \ .natDexNum = NATIONAL_DEX_URSALUNA, \ .categoryName = _("Peat"), \ - .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable - - [SPECIES_URSALUNA] = - { - URSALUNA_MISC_INFO, + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 130, .baseAttack = 140, .baseDefense = 105, @@ -4134,7 +4030,18 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_URSALUNA_BLOODMOON] = { - URSALUNA_MISC_INFO, + .expYield = 275, \ + .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Ursaluna"), \ + .cryId = CRY_URSALUNA, \ + .natDexNum = NATIONAL_DEX_URSALUNA, \ + .categoryName = _("Peat"), \ + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 113, .baseAttack = 70, .baseDefense = 120, @@ -4443,7 +4350,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #define CORSOLA_HP (P_UPDATED_STATS >= GEN_7 ? 65 : 55) #define CORSOLA_DEFENSES (P_UPDATED_STATS >= GEN_7 ? 95 : 85) -#define CORSOLA_MISC_INFO \ + [SPECIES_CORSOLA] = + { .catchRate = 60, \ .expYield = CORSOLA_EXP_YIELD, \ .evYield_SpDefense = 1, \ @@ -4462,11 +4370,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Corsola) \ - .formSpeciesIdTable = sCorsolaFormSpeciesIdTable - - [SPECIES_CORSOLA] = - { - CORSOLA_MISC_INFO, + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .baseHP = CORSOLA_HP, .baseAttack = 55, .baseDefense = CORSOLA_DEFENSES, @@ -4499,7 +4403,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GALARIAN_FORMS [SPECIES_CORSOLA_GALARIAN] = { - CORSOLA_MISC_INFO, + .catchRate = 60, \ + .expYield = CORSOLA_EXP_YIELD, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3),\ + .speciesName = _("Corsola"), \ + .cryId = CRY_CORSOLA, \ + .natDexNum = NATIONAL_DEX_CORSOLA, \ + .categoryName = _("Coral"), \ + .height = 6, \ + .pokemonScale = 410, \ + .pokemonOffset = 15, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Corsola) \ + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .baseHP = CORSOLA_HP - 5, .baseAttack = 55, .baseDefense = CORSOLA_DEFENSES + 5, @@ -4933,7 +4855,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}), }, -#define HOUNDOOM_MISC_INFO \ + [SPECIES_HOUNDOOM] = + { .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), \ .catchRate = 45, \ .evYield_SpAttack = 2, \ @@ -4949,11 +4872,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = FOOTPRINT(Houndoom) \ LEARNSETS(Houndoom), \ .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ - .formChangeTable = sHoundoomFormChangeTable - - [SPECIES_HOUNDOOM] = - { - HOUNDOOM_MISC_INFO, + .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, .baseAttack = 90, .baseDefense = 50, @@ -4990,7 +4909,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HOUNDOOM_MEGA] = { - HOUNDOOM_MISC_INFO, + .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), \ + .catchRate = 45, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Houndoom"), \ + .natDexNum = NATIONAL_DEX_HOUNDOOM, \ + .categoryName = _("Dark"), \ + FOOTPRINT(Houndoom) \ + LEARNSETS(Houndoom), \ + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ + .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, .baseAttack = 90, .baseDefense = 90, @@ -5605,7 +5539,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_TYRANITAR}), }, -#define TYRANITAR_MISC_INFO \ + [SPECIES_TYRANITAR] = + { .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -5621,11 +5556,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = FOOTPRINT(Tyranitar) \ LEARNSETS(Tyranitar), \ .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ - .formChangeTable = sTyranitarFormChangeTable - - [SPECIES_TYRANITAR] = - { - TYRANITAR_MISC_INFO, + .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, .baseAttack = 134, .baseDefense = 110, @@ -5667,7 +5598,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_TYRANITAR_MEGA] = { - TYRANITAR_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Tyranitar"), \ + .natDexNum = NATIONAL_DEX_TYRANITAR, \ + .categoryName = _("Armor"), \ + FOOTPRINT(Tyranitar) \ + LEARNSETS(Tyranitar), \ + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ + .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, .baseAttack = 164, .baseDefense = 150, From 12a8e5c5aff97dbfacc1ef0b3d5618a902c0ad36 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 17:56:19 -0300 Subject: [PATCH 06/23] Expanded Gen 3 macros --- src/data/pokemon/species_info/gen_3.h | 970 ++++++++++++++++++++------ 1 file changed, 743 insertions(+), 227 deletions(-) diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 94daa4b55fb3..6336ce3378ff 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -100,7 +100,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SCEPTILE}), }, -#define SCEPTILE_MISC_INFO \ + [SPECIES_SCEPTILE] = + { .catchRate = 45, \ .evYield_Speed = 3, \ .genderRatio = PERCENT_FEMALE(12.5), \ @@ -115,11 +116,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Sceptile) \ LEARNSETS(Sceptile), \ .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ - .formChangeTable = sSceptileFormChangeTable - - [SPECIES_SCEPTILE] = - { - SCEPTILE_MISC_INFO, + .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, .baseAttack = 85, .baseDefense = 65, @@ -161,7 +158,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCEPTILE_MEGA] = { - SCEPTILE_MISC_INFO, + .catchRate = 45, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Sceptile"), \ + .natDexNum = NATIONAL_DEX_SCEPTILE, \ + .categoryName = _("Forest"), \ + FOOTPRINT(Sceptile) \ + LEARNSETS(Sceptile), \ + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ + .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, .baseAttack = 110, .baseDefense = 75, @@ -298,7 +309,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLAZIKEN}), }, -#define BLAZIKEN_MISC_INFO \ + [SPECIES_BLAZIKEN] = + { .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -320,11 +332,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Blaziken) \ LEARNSETS(Blaziken), \ .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ - .formChangeTable = sBlazikenFormChangeTable - - [SPECIES_BLAZIKEN] = - { - BLAZIKEN_MISC_INFO, + .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, .baseAttack = 120, .baseDefense = 70, @@ -361,7 +369,28 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BLAZIKEN_MEGA] = { - BLAZIKEN_MISC_INFO, + .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Blaziken"), \ + .natDexNum = NATIONAL_DEX_BLAZIKEN, \ + .categoryName = _("Blaze"), \ + .height = 19, \ + .weight = 520, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 301, \ + .trainerOffset = 4, \ + FOOTPRINT(Blaziken) \ + LEARNSETS(Blaziken), \ + .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ + .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, .baseAttack = 160, .baseDefense = 80, @@ -487,7 +516,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SWAMPERT}), }, -#define SWAMPERT_MISC_INFO \ + [SPECIES_SWAMPERT] = + { .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -503,11 +533,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Swampert) \ LEARNSETS(Swampert), \ .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ - .formChangeTable = sSwampertFormChangeTable - - [SPECIES_SWAMPERT] = - { - SWAMPERT_MISC_INFO, + .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, .baseAttack = 110, .baseDefense = 90, @@ -548,7 +574,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SWAMPERT_MEGA] = { - SWAMPERT_MISC_INFO, + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1),\ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Swampert"), \ + .natDexNum = NATIONAL_DEX_SWAMPERT, \ + .categoryName = _("Mud Fish"), \ + FOOTPRINT(Swampert) \ + LEARNSETS(Swampert), \ + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ + .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, .baseAttack = 150, .baseDefense = 110, @@ -695,7 +736,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #define ZIGZAGOON_EXP_YIELD 60 #endif -#define ZIGZAGOON_MISC_INFO \ + [SPECIES_ZIGZAGOON] = + { .baseHP = 38, \ .baseAttack = 30, \ .baseDefense = 41, \ @@ -722,9 +764,31 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Zigzagoon) \ - .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, + .types = MON_TYPES(TYPE_NORMAL), + .itemCommon = ITEM_POTION, + .itemRare = ITEM_REVIVE, + .bodyColor = BODY_COLOR_BROWN, + .description = COMPOUND_STRING( + "Rubbing its nose against the ground, it\n" + "always wanders about back and forth in\n" + "search of something. It is distinguished\n" + "by the zigzag footprints it leaves."), + FRONT_PIC(Zigzagoon, 56, 40), + .frontPicYOffset = 12, + .frontAnimFrames = sAnims_Zigzagoon, + .frontAnimId = ANIM_H_SLIDE, + BACK_PIC(Zigzagoon, 56, 56), + .backPicYOffset = 6, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + PALETTES(Zigzagoon), + ICON(Zigzagoon, 2), + LEARNSETS(Zigzagoon), + .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}), + }, -#define LINOONE_MISC_INFO \ + [SPECIES_LINOONE] = + { .baseHP = 78, \ .baseAttack = 70, \ .baseDefense = 61, \ @@ -752,36 +816,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Linoone) \ - .formSpeciesIdTable = sLinooneFormSpeciesIdTable - - [SPECIES_ZIGZAGOON] = - { - ZIGZAGOON_MISC_INFO, - .types = MON_TYPES(TYPE_NORMAL), - .itemCommon = ITEM_POTION, - .itemRare = ITEM_REVIVE, - .bodyColor = BODY_COLOR_BROWN, - .description = COMPOUND_STRING( - "Rubbing its nose against the ground, it\n" - "always wanders about back and forth in\n" - "search of something. It is distinguished\n" - "by the zigzag footprints it leaves."), - FRONT_PIC(Zigzagoon, 56, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Zigzagoon, - .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Zigzagoon, 56, 56), - .backPicYOffset = 6, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Zigzagoon), - ICON(Zigzagoon, 2), - LEARNSETS(Zigzagoon), - .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}), - }, - - [SPECIES_LINOONE] = - { - LINOONE_MISC_INFO, + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .types = MON_TYPES(TYPE_NORMAL), .itemCommon = ITEM_POTION, .itemRare = ITEM_MAX_REVIVE, @@ -805,7 +840,33 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_GALARIAN_FORMS [SPECIES_ZIGZAGOON_GALARIAN] = { - ZIGZAGOON_MISC_INFO, + .baseHP = 38, \ + .baseAttack = 30, \ + .baseDefense = 41, \ + .baseSpeed = 60, \ + .baseSpAttack = 30, \ + .baseSpDefense = 41, \ + .catchRate = 255, \ + .expYield = ZIGZAGOON_EXP_YIELD, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ + .speciesName = _("Zigzagoon"), \ + .cryId = CRY_ZIGZAGOON, \ + .natDexNum = NATIONAL_DEX_ZIGZAGOON, \ + .categoryName = _("Tiny Raccoon"), \ + .height = 4, \ + .weight = 175, \ + .pokemonScale = 560, \ + .pokemonOffset = 22, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Zigzagoon) \ + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .bodyColor = BODY_COLOR_WHITE, .description = COMPOUND_STRING( @@ -829,7 +890,34 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_LINOONE_GALARIAN] = { - LINOONE_MISC_INFO, + .baseHP = 78, \ + .baseAttack = 70, \ + .baseDefense = 61, \ + .baseSpeed = 100, \ + .baseSpAttack = 50, \ + .baseSpDefense = 61, \ + .catchRate = 90, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Linoone"), \ + .cryId = CRY_LINOONE, \ + .natDexNum = NATIONAL_DEX_LINOONE, \ + .categoryName = _("Rushing"), \ + .height = 5, \ + .weight = 325, \ + .pokemonScale = 321, \ + .pokemonOffset = 7, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Linoone) \ + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .description = COMPOUND_STRING( "This very aggressive Pokémon will\n" @@ -1817,7 +1905,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE}), }, -#define GARDEVOIR_MISC_INFO \ + [SPECIES_GARDEVOIR] = + { .catchRate = 45, \ .evYield_SpAttack = 3, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -1839,11 +1928,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Gardevoir) \ LEARNSETS(Gardevoir), \ .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ - .formChangeTable = sGardevoirFormChangeTable - - [SPECIES_GARDEVOIR] = - { - GARDEVOIR_MISC_INFO, + .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, .baseAttack = 65, .baseDefense = 65, @@ -1878,7 +1963,28 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARDEVOIR_MEGA] = { - GARDEVOIR_MISC_INFO, + .catchRate = 45, \ + .evYield_SpAttack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ + .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2),\ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Gardevoir"), \ + .natDexNum = NATIONAL_DEX_GARDEVOIR, \ + .categoryName = _("Embrace"), \ + .height = 16, \ + .weight = 484, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Gardevoir) \ + LEARNSETS(Gardevoir), \ + .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ + .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, .baseAttack = 85, .baseDefense = 65, @@ -1907,7 +2013,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS -#define GALLADE_MISC_INFO \ + [SPECIES_GALLADE] = + { .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -1928,11 +2035,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Gallade) \ LEARNSETS(Gallade), \ .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ - .formChangeTable = sGalladeFormChangeTable - - [SPECIES_GALLADE] = - { - GALLADE_MISC_INFO, + .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, .baseAttack = 125, .baseDefense = 65, @@ -1972,7 +2075,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GALLADE_MEGA] = { - GALLADE_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Gallade"), \ + .natDexNum = NATIONAL_DEX_GALLADE, \ + .categoryName = _("Blade"), \ + .height = 16, \ + .pokemonScale = 259, \ + .pokemonOffset = 1, \ + .trainerScale = 296, \ + .trainerOffset = 1, \ + FOOTPRINT(Gallade) \ + LEARNSETS(Gallade), \ + .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ + .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, .baseAttack = 165, .baseDefense = 95, @@ -2976,7 +3099,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_SKITTY #if P_FAMILY_SABLEYE -#define SABLEYE_MISC_INFO \ + [SPECIES_SABLEYE] = + { .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), \ .catchRate = 45, \ .evYield_Attack = 1, \ @@ -2994,11 +3118,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Sableye) \ LEARNSETS(Sableye), \ .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ - .formChangeTable = sSableyeFormChangeTable - - [SPECIES_SABLEYE] = - { - SABLEYE_MISC_INFO, + .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, .baseAttack = 75, .baseDefense = 75, @@ -3033,7 +3153,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SABLEYE_MEGA] = { - SABLEYE_MISC_INFO, + .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), \ + .catchRate = 45, \ + .evYield_Attack = 1, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 35, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Sableye"), \ + .natDexNum = NATIONAL_DEX_SABLEYE, \ + .categoryName = _("Darkness"), \ + .height = 5, \ + FOOTPRINT(Sableye) \ + LEARNSETS(Sableye), \ + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ + .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, .baseAttack = 85, .baseDefense = 125, @@ -3073,7 +3210,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #define MAWILE_TYPES { TYPE_STEEL, TYPE_STEEL } #endif -#define MAWILE_MISC_INFO \ + [SPECIES_MAWILE] = + { .types = MAWILE_TYPES, \ .catchRate = 45, \ .evYield_Attack = 1, \ @@ -3090,11 +3228,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Mawile) \ LEARNSETS(Mawile), \ .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ - .formChangeTable = sMawileFormChangeTable - - [SPECIES_MAWILE] = - { - MAWILE_MISC_INFO, + .formChangeTable = sMawileFormChangeTable, .baseHP = 50, .baseAttack = 85, .baseDefense = 85, @@ -3130,15 +3264,31 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MAWILE_MEGA] = { - MAWILE_MISC_INFO, - .baseHP = 50, - .baseAttack = 105, - .baseDefense = 125, - .baseSpeed = 50, - .baseSpAttack = 55, - .baseSpDefense = 95, - .expYield = 168, - .abilities = { ABILITY_HUGE_POWER, ABILITY_HUGE_POWER, ABILITY_HUGE_POWER }, + .types = MAWILE_TYPES, \ + .catchRate = 45, \ + .evYield_Attack = 1, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Mawile"), \ + .natDexNum = NATIONAL_DEX_MAWILE, \ + .categoryName = _("Deceiver"), \ + FOOTPRINT(Mawile) \ + LEARNSETS(Mawile), \ + .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ + .formChangeTable = sMawileFormChangeTable, + .baseHP = 50, + .baseAttack = 105, + .baseDefense = 125, + .baseSpeed = 50, + .baseSpAttack = 55, + .baseSpDefense = 95, + .expYield = 168, + .abilities = { ABILITY_HUGE_POWER, ABILITY_HUGE_POWER, ABILITY_HUGE_POWER }, .cryId = CRY_MAWILE_MEGA, .height = 10, .weight = 235, @@ -3264,7 +3414,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_AGGRON}), }, -#define AGGRON_MISC_INFO \ + [SPECIES_AGGRON] = + { .catchRate = 45, \ .evYield_Defense = 3, \ .itemRare = ITEM_HARD_STONE, \ @@ -3280,11 +3431,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Aggron) \ LEARNSETS(Aggron), \ .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ - .formChangeTable = sAggronFormChangeTable - - [SPECIES_AGGRON] = - { - AGGRON_MISC_INFO, + .formChangeTable = sAggronFormChangeTable, .baseHP = 70, .baseAttack = 110, .baseDefense = 180, @@ -3326,7 +3473,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_AGGRON_MEGA] = { - AGGRON_MISC_INFO, + .catchRate = 45, \ + .evYield_Defense = 3, \ + .itemRare = ITEM_HARD_STONE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 35, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Aggron"), \ + .natDexNum = NATIONAL_DEX_AGGRON, \ + .categoryName = _("Iron Armor"), \ + FOOTPRINT(Aggron) \ + LEARNSETS(Aggron), \ + .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ + .formChangeTable = sAggronFormChangeTable, .baseHP = 70, .baseAttack = 140, .baseDefense = 230, @@ -3413,7 +3575,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}), }, -#define MEDICHAM_MISC_INFO \ + [SPECIES_MEDICHAM] = + { .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), \ .catchRate = 90, \ .evYield_Speed = 2, \ @@ -3435,11 +3598,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Medicham) \ LEARNSETS(Medicham), \ .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ - .formChangeTable = sMedichamFormChangeTable - - [SPECIES_MEDICHAM] = - { - MEDICHAM_MISC_INFO, + .formChangeTable = sMedichamFormChangeTable, .baseHP = 60, .baseAttack = 60, .baseDefense = 75, @@ -3470,7 +3629,28 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEDICHAM_MEGA] = { - MEDICHAM_MISC_INFO, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), \ + .catchRate = 90, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Medicham"), \ + .natDexNum = NATIONAL_DEX_MEDICHAM, \ + .categoryName = _("Meditate"), \ + .height = 13, \ + .weight = 315, \ + .pokemonScale = 298, \ + .pokemonOffset = 5, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Medicham) \ + LEARNSETS(Medicham), \ + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ + .formChangeTable = sMedichamFormChangeTable, .baseHP = 60, .baseAttack = 100, .baseDefense = 85, @@ -3548,7 +3728,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}), }, -#define MANECTRIC_MISC_INFO \ + [SPECIES_MANECTRIC] = + { .types = MON_TYPES(TYPE_ELECTRIC), \ .catchRate = 45, \ .evYield_Speed = 2, \ @@ -3564,11 +3745,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Manectric) \ LEARNSETS(Manectric), \ .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ - .formChangeTable = sManectricFormChangeTable - - [SPECIES_MANECTRIC] = - { - MANECTRIC_MISC_INFO, + .formChangeTable = sManectricFormChangeTable, .baseHP = 70, .baseAttack = 75, .baseDefense = 60, @@ -3603,7 +3780,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MANECTRIC_MEGA] = { - MANECTRIC_MISC_INFO, + .types = MON_TYPES(TYPE_ELECTRIC), \ + .catchRate = 45, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Manectric"), \ + .natDexNum = NATIONAL_DEX_MANECTRIC, \ + .categoryName = _("Discharge"), \ + FOOTPRINT(Manectric) \ + LEARNSETS(Manectric), \ + .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ + .formChangeTable = sManectricFormChangeTable, .baseHP = 70, .baseAttack = 75, .baseDefense = 80, @@ -4179,7 +4371,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}), }, -#define SHARPEDO_MISC_INFO \ + [SPECIES_SHARPEDO] = + { .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ .catchRate = 60, \ .evYield_Attack = 2, \ @@ -4196,11 +4389,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Sharpedo) \ LEARNSETS(Sharpedo), \ .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ - .formChangeTable = sSharpedoFormChangeTable - - [SPECIES_SHARPEDO] = - { - SHARPEDO_MISC_INFO, + .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, .baseAttack = 120, .baseDefense = 40, @@ -4235,7 +4424,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SHARPEDO_MEGA] = { - SHARPEDO_MISC_INFO, + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ + .catchRate = 60, \ + .evYield_Attack = 2, \ + .itemRare = ITEM_DEEP_SEA_TOOTH, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Sharpedo"), \ + .natDexNum = NATIONAL_DEX_SHARPEDO, \ + .categoryName = _("Brutal"), \ + FOOTPRINT(Sharpedo) \ + LEARNSETS(Sharpedo), \ + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ + .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, .baseAttack = 140, .baseDefense = 70, @@ -4420,7 +4625,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}), }, -#define CAMERUPT_MISC_INFO \ + [SPECIES_CAMERUPT] = + { .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), \ .catchRate = 150, \ .evYield_Attack = 1, \ @@ -4437,11 +4643,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Camerupt) \ LEARNSETS(Camerupt), \ .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ - .formChangeTable = sCameruptFormChangeTable - - [SPECIES_CAMERUPT] = - { - CAMERUPT_MISC_INFO, + .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, .baseAttack = 100, .baseDefense = 70, @@ -4478,7 +4680,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_CAMERUPT_MEGA] = { - CAMERUPT_MISC_INFO, + .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), \ + .catchRate = 150, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Camerupt"), \ + .natDexNum = NATIONAL_DEX_CAMERUPT, \ + .categoryName = _("Eruption"), \ + FOOTPRINT(Camerupt) \ + LEARNSETS(Camerupt), \ + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ + .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, .baseAttack = 120, .baseDefense = 100, @@ -5028,7 +5246,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}), }, -#define ALTARIA_MISC_INFO \ + [SPECIES_ALTARIA] = + { .catchRate = 45, \ .evYield_SpDefense = 2, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -5043,11 +5262,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Altaria) \ LEARNSETS(Altaria), \ .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ - .formChangeTable = sAltariaFormChangeTable - - [SPECIES_ALTARIA] = - { - ALTARIA_MISC_INFO, + .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, .baseAttack = 70, .baseDefense = 90, @@ -5083,7 +5298,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALTARIA_MEGA] = { - ALTARIA_MISC_INFO, + .catchRate = 45, \ + .evYield_SpDefense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON),\ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Altaria"), \ + .natDexNum = NATIONAL_DEX_ALTARIA, \ + .categoryName = _("Humming"), \ + FOOTPRINT(Altaria) \ + LEARNSETS(Altaria), \ + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ + .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, .baseAttack = 110, .baseDefense = 110, @@ -5958,7 +6187,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_FEEBAS #if P_FAMILY_CASTFORM -#define CASTFORM_MISC_INFO \ + [SPECIES_CASTFORM_NORMAL] = + { .baseHP = 70, \ .baseAttack = 70, \ .baseDefense = 70, \ @@ -5989,11 +6219,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Castform) \ LEARNSETS(Castform), \ .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ - .formChangeTable = sCastformFormChangeTable - - [SPECIES_CASTFORM_NORMAL] = - { - CASTFORM_MISC_INFO, + .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_NORMAL), .bodyColor = BODY_COLOR_GRAY, .description = COMPOUND_STRING( @@ -6015,7 +6241,37 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_SUNNY] = { - CASTFORM_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 70, \ + .baseSpAttack = 70, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ + .evYield_HP = 1, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ + .speciesName = _("Castform"), \ + .cryId = CRY_CASTFORM, \ + .natDexNum = NATIONAL_DEX_CASTFORM, \ + .categoryName = _("Weather"), \ + .height = 3, \ + .weight = 8, \ + .pokemonScale = 435, \ + .pokemonOffset = -5, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Castform) \ + LEARNSETS(Castform), \ + .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -6037,7 +6293,37 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_RAINY] = { - CASTFORM_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 70, \ + .baseSpAttack = 70, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ + .evYield_HP = 1, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ + .speciesName = _("Castform"), \ + .cryId = CRY_CASTFORM, \ + .natDexNum = NATIONAL_DEX_CASTFORM, \ + .categoryName = _("Weather"), \ + .height = 3, \ + .weight = 8, \ + .pokemonScale = 435, \ + .pokemonOffset = -5, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Castform) \ + LEARNSETS(Castform), \ + .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_WATER), .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -6059,7 +6345,37 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_SNOWY] = { - CASTFORM_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 70, \ + .baseSpAttack = 70, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ + .evYield_HP = 1, \ + .itemCommon = ITEM_MYSTIC_WATER, \ + .itemRare = ITEM_MYSTIC_WATER, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ + .speciesName = _("Castform"), \ + .cryId = CRY_CASTFORM, \ + .natDexNum = NATIONAL_DEX_CASTFORM, \ + .categoryName = _("Weather"), \ + .height = 3, \ + .weight = 8, \ + .pokemonScale = 435, \ + .pokemonOffset = -5, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Castform) \ + LEARNSETS(Castform), \ + .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_ICE), .bodyColor = BODY_COLOR_WHITE, .description = COMPOUND_STRING( @@ -6181,7 +6497,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}), }, -#define BANETTE_MISC_INFO \ + [SPECIES_BANETTE] = + { .types = MON_TYPES(TYPE_GHOST), \ .catchRate = 45, \ .evYield_Attack = 2, \ @@ -6198,11 +6515,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Banette) \ LEARNSETS(Banette), \ .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ - .formChangeTable = sBanetteFormChangeTable - - [SPECIES_BANETTE] = - { - BANETTE_MISC_INFO, + .formChangeTable = sBanetteFormChangeTable, .baseHP = 64, .baseAttack = 115, .baseDefense = 65, @@ -6237,12 +6550,28 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BANETTE_MEGA] = { - BANETTE_MISC_INFO, - .baseHP = 64, - .baseAttack = 165, - .baseDefense = 75, - .baseSpeed = 75, - .baseSpAttack = 93, + .types = MON_TYPES(TYPE_GHOST), \ + .catchRate = 45, \ + .evYield_Attack = 2, \ + .itemRare = ITEM_SPELL_TAG, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 35, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Banette"), \ + .natDexNum = NATIONAL_DEX_BANETTE, \ + .categoryName = _("Marionette"), \ + FOOTPRINT(Banette) \ + LEARNSETS(Banette), \ + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ + .formChangeTable = sBanetteFormChangeTable, + .baseHP = 64, + .baseAttack = 165, + .baseDefense = 75, + .baseSpeed = 75, + .baseSpAttack = 93, .baseSpDefense = 83, .expYield = 194, .abilities = { ABILITY_PRANKSTER, ABILITY_PRANKSTER, ABILITY_PRANKSTER }, @@ -6600,7 +6929,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_CHIMECHO #if P_FAMILY_ABSOL -#define ABSOL_MISC_INFO \ + [SPECIES_ABSOL] = + { .types = MON_TYPES(TYPE_DARK), \ .catchRate = 30, \ .evYield_Attack = 2, \ @@ -6622,11 +6952,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Absol) \ LEARNSETS(Absol), \ .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ - .formChangeTable = sAbsolFormChangeTable - - [SPECIES_ABSOL] = - { - ABSOL_MISC_INFO, + .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, .baseAttack = 130, .baseDefense = 60, @@ -6657,7 +6983,28 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABSOL_MEGA] = { - ABSOL_MISC_INFO, + .types = MON_TYPES(TYPE_DARK), \ + .catchRate = 30, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = 35, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = TRUE, \ + .speciesName = _("Absol"), \ + .natDexNum = NATIONAL_DEX_ABSOL, \ + .categoryName = _("Disaster"), \ + .height = 12, \ + .pokemonScale = 301, \ + .pokemonOffset = 3, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Absol) \ + LEARNSETS(Absol), \ + .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ + .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, .baseAttack = 150, .baseDefense = 60, @@ -6739,7 +7086,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}), }, -#define GLALIE_MISC_INFO \ + [SPECIES_GLALIE] = + { .types = MON_TYPES(TYPE_ICE), \ .catchRate = 75, \ .evYield_HP = 2, \ @@ -6755,11 +7103,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Glalie) \ LEARNSETS(Glalie), \ .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ - .formChangeTable = sGlalieFormChangeTable - - [SPECIES_GLALIE] = - { - GLALIE_MISC_INFO, + .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, .baseAttack = 80, .baseDefense = 80, @@ -6795,7 +7139,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GLALIE_MEGA] = { - GLALIE_MISC_INFO, + .types = MON_TYPES(TYPE_ICE), \ + .catchRate = 75, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL),\ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Glalie"), \ + .natDexNum = NATIONAL_DEX_GLALIE, \ + .categoryName = _("Face"), \ + FOOTPRINT(Glalie) \ + LEARNSETS(Glalie), \ + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ + .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, .baseAttack = 120, .baseDefense = 80, @@ -7386,7 +7745,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_SALAMENCE}), }, -#define SALAMENCE_MISC_INFO \ + [SPECIES_SALAMENCE] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -7403,11 +7763,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Salamence) \ LEARNSETS(Salamence), \ .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ - .formChangeTable = sSalamenceFormChangeTable - - [SPECIES_SALAMENCE] = - { - SALAMENCE_MISC_INFO, + .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, .baseAttack = 135, .baseDefense = 80, @@ -7449,7 +7805,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SALAMENCE_MEGA] = { - SALAMENCE_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .itemRare = ITEM_DRAGON_FANG, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Salamence"), \ + .natDexNum = NATIONAL_DEX_SALAMENCE, \ + .categoryName = _("Dragon"), \ + FOOTPRINT(Salamence) \ + LEARNSETS(Salamence), \ + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ + .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, .baseAttack = 145, .baseDefense = 130, @@ -7585,7 +7957,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_METAGROSS}), }, -#define METAGROSS_MISC_INFO \ + [SPECIES_METAGROSS] = + { .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), \ .catchRate = 3, \ .evYield_Defense = 3, \ @@ -7602,11 +7975,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Metagross) \ LEARNSETS(Metagross), \ .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ - .formChangeTable = sMetagrossFormChangeTable - - [SPECIES_METAGROSS] = - { - METAGROSS_MISC_INFO, + .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, .baseAttack = 135, .baseDefense = 130, @@ -7647,7 +8016,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_METAGROSS_MEGA] = { - METAGROSS_MISC_INFO, + .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), \ + .catchRate = 3, \ + .evYield_Defense = 3, \ + .itemRare = ITEM_METAL_COAT, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 40, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Metagross"), \ + .natDexNum = NATIONAL_DEX_METAGROSS, \ + .categoryName = _("Iron Leg"), \ + FOOTPRINT(Metagross) \ + LEARNSETS(Metagross), \ + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ + .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, .baseAttack = 145, .baseDefense = 150, @@ -7853,7 +8238,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_REGISTEEL #if P_FAMILY_LATIAS -#define LATIAS_MISC_INFO \ + [SPECIES_LATIAS] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ .catchRate = 3, \ .evYield_SpDefense = 3, \ @@ -7869,11 +8255,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = LEARNSETS(Latias), \ .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ .formChangeTable = sLatiasFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_LATIAS] = - { - LATIAS_MISC_INFO, + .isLegendary = TRUE, .baseHP = 80, .baseAttack = 80, .baseDefense = 90, @@ -7916,7 +8298,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIAS_MEGA] = { - LATIAS_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ + .catchRate = 3, \ + .evYield_SpDefense = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .speciesName = _("Latias"), \ + .natDexNum = NATIONAL_DEX_LATIAS, \ + .categoryName = _("Eon"), \ + FOOTPRINT(Latias) \ + LEARNSETS(Latias), \ + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ + .formChangeTable = sLatiasFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 80, .baseAttack = 100, .baseDefense = 120, @@ -7954,7 +8351,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_LATIAS #if P_FAMILY_LATIOS -#define LATIOS_MISC_INFO \ + [SPECIES_LATIOS] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ .catchRate = 3, \ .evYield_SpAttack = 3, \ @@ -7970,11 +8368,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Latios) \ LEARNSETS(Latios), \ .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ - .formChangeTable = sLatiosFormChangeTable - - [SPECIES_LATIOS] = - { - LATIOS_MISC_INFO, + .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, .baseAttack = 90, .baseDefense = 80, @@ -8017,7 +8411,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIOS_MEGA] = { - LATIOS_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ + .catchRate = 3, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .isLegendary = TRUE, \ + .speciesName = _("Latios"), \ + .natDexNum = NATIONAL_DEX_LATIOS, \ + .categoryName = _("Eon"), \ + FOOTPRINT(Latios) \ + LEARNSETS(Latios), \ + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ + .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, .baseAttack = 130, .baseDefense = 100, @@ -8055,7 +8464,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_LATIOS #if P_FAMILY_KYOGRE -#define KYOGRE_MISC_INFO \ + [SPECIES_KYOGRE] = + { .types = MON_TYPES(TYPE_WATER), \ .catchRate = 3, \ .evYield_SpAttack = 3, \ @@ -8072,11 +8482,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Kyogre) \ LEARNSETS(Kyogre), \ .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ - .formChangeTable = sKyogreFormChangeTable - - [SPECIES_KYOGRE] = - { - KYOGRE_MISC_INFO, + .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, .baseAttack = 100, .baseDefense = 90, @@ -8117,7 +8523,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_KYOGRE_PRIMAL] = { - KYOGRE_MISC_INFO, + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 3, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BLUE, \ + .isLegendary = TRUE, \ + .speciesName = _("Kyogre"), \ + .natDexNum = NATIONAL_DEX_KYOGRE, \ + .categoryName = _("Sea Basin"), \ + FOOTPRINT(Kyogre) \ + LEARNSETS(Kyogre), \ + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ + .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, .baseAttack = 150, .baseDefense = 90, @@ -8153,7 +8575,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_KYOGRE #if P_FAMILY_GROUDON -#define GROUDON_MISC_INFO \ + [SPECIES_GROUDON] = + { .catchRate = 3, \ .evYield_Attack = 3, \ .genderRatio = MON_GENDERLESS, \ @@ -8170,11 +8593,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = FOOTPRINT(Groudon) \ LEARNSETS(Groudon), \ .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ - .formChangeTable = sGroudonFormChangeTable - - [SPECIES_GROUDON] = - { - GROUDON_MISC_INFO, + .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, .baseAttack = 150, .baseDefense = 140, @@ -8215,7 +8634,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_GROUDON_PRIMAL] = { - GROUDON_MISC_INFO, + .catchRate = 3, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_RED, \ + .isLegendary = TRUE, \ + .speciesName = _("Groudon"), \ + .cryId = CRY_GROUDON, \ + .natDexNum = NATIONAL_DEX_GROUDON, \ + .categoryName = _("Continent"), \ + FOOTPRINT(Groudon) \ + LEARNSETS(Groudon), \ + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ + .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, .baseAttack = 180, .baseDefense = 160, @@ -8252,7 +8687,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #endif //P_FAMILY_GROUDON #if P_FAMILY_RAYQUAZA -#define RAYQUAZA_MISC_INFO \ + [SPECIES_RAYQUAZA] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ .catchRate = 45, \ .evYield_Attack = 2, \ @@ -8271,11 +8707,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = LEARNSETS(Rayquaza), \ .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ .formChangeTable = sRayquazaFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_RAYQUAZA] = - { - RAYQUAZA_MISC_INFO, + .isLegendary = TRUE, .baseHP = 105, .baseAttack = 150, .baseDefense = 90, @@ -8317,7 +8749,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_RAYQUAZA_MEGA] = { - RAYQUAZA_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ + .catchRate = 45, \ + .evYield_Attack = 2, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Rayquaza"), \ + .cryId = CRY_RAYQUAZA, \ + .natDexNum = NATIONAL_DEX_RAYQUAZA, \ + .categoryName = _("Sky High"), \ + FOOTPRINT(Rayquaza) \ + LEARNSETS(Rayquaza), \ + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ + .formChangeTable = sRayquazaFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 105, .baseAttack = 180, .baseDefense = 100, @@ -8420,7 +8870,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #define DEOXYS_EXP_YIELD 215 #endif -#define DEOXYS_MISC_INFO \ + [SPECIES_DEOXYS_NORMAL] = + { .types = MON_TYPES(TYPE_PSYCHIC), \ .catchRate = 3, \ .expYield = DEOXYS_EXP_YIELD, \ @@ -8444,11 +8895,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 290, \ .trainerOffset = 2, \ FOOTPRINT(Deoxys) \ - .formSpeciesIdTable = sDeoxysFormSpeciesIdTable - - [SPECIES_DEOXYS_NORMAL] = - { - DEOXYS_MISC_INFO, + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 150, .baseDefense = 50, @@ -8473,7 +8920,30 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_ATTACK] = { - DEOXYS_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 3, \ + .expYield = DEOXYS_EXP_YIELD, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .isMythical = TRUE, \ + .speciesName = _("Deoxys"), \ + .cryId = CRY_DEOXYS, \ + .natDexNum = NATIONAL_DEX_DEOXYS, \ + .categoryName = _("DNA"), \ + .height = 17, \ + .weight = 608, \ + .description = gDeoxysNormalPokedexText, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 290, \ + .trainerOffset = 2, \ + FOOTPRINT(Deoxys) \ + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 180, .baseDefense = 20, @@ -8497,7 +8967,30 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_DEFENSE] = { - DEOXYS_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 3, \ + .expYield = DEOXYS_EXP_YIELD, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .isMythical = TRUE, \ + .speciesName = _("Deoxys"), \ + .cryId = CRY_DEOXYS, \ + .natDexNum = NATIONAL_DEX_DEOXYS, \ + .categoryName = _("DNA"), \ + .height = 17, \ + .weight = 608, \ + .description = gDeoxysNormalPokedexText, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 290, \ + .trainerOffset = 2, \ + FOOTPRINT(Deoxys) \ + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 70, .baseDefense = 160, @@ -8521,7 +9014,30 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_SPEED] = { - DEOXYS_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 3, \ + .expYield = DEOXYS_EXP_YIELD, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .isMythical = TRUE, \ + .speciesName = _("Deoxys"), \ + .cryId = CRY_DEOXYS, \ + .natDexNum = NATIONAL_DEX_DEOXYS, \ + .categoryName = _("DNA"), \ + .height = 17, \ + .weight = 608, \ + .description = gDeoxysNormalPokedexText, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 290, \ + .trainerOffset = 2, \ + FOOTPRINT(Deoxys) \ + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 95, .baseDefense = 90, From 9868885c23db7b07ecec2f95100c6b3e63a00f67 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 18:10:59 -0300 Subject: [PATCH 07/23] Expanded Gen 4 macros --- src/data/pokemon/species_info/gen_2.h | 53 +- src/data/pokemon/species_info/gen_4.h | 711 +++++++++++++++++++++----- 2 files changed, 623 insertions(+), 141 deletions(-) diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index c9ecec507db0..28acd952f201 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -3073,7 +3073,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = }, #if P_GEN_9_CROSS_EVOS -#define DUDUNSPARCE_MISC_INFO(segments) \ + [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = + { .baseHP = 125, \ .baseAttack = 100, \ .baseDefense = 80, \ @@ -3099,22 +3100,18 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Dudunsparce ##segments##Segment, 64, 64), \ + FRONT_PIC(DudunsparceTwoSegment, 64, 64), \ .frontPicYOffset = 10, \ .frontAnimFrames = sAnims_Dudunsparce, \ - BACK_PIC(Dudunsparce ##segments##Segment, 64, 64), \ + BACK_PIC(DudunsparceTwoSegment, 64, 64), \ .backPicYOffset = 11, \ PALETTES(Dudunsparce), \ ICON(Dudunsparce, 0), \ LEARNSETS(Dudunsparce), \ - .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable + .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Dudunsparce) - - [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = - { - DUDUNSPARCE_MISC_INFO(Two), + //FOOTPRINT(Dudunsparce), .height = 36, .weight = 392, .description = COMPOUND_STRING( @@ -3126,7 +3123,43 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { - DUDUNSPARCE_MISC_INFO(Three), + .baseHP = 125, \ + .baseAttack = 100, \ + .baseDefense = 80, \ + .baseSpeed = 55, \ + .baseSpAttack = 85, \ + .baseSpDefense = 75, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 45, \ + .expYield = 182, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Dudunsprce"), \ + .cryId = CRY_DUDUNSPARCE, \ + .natDexNum = NATIONAL_DEX_DUDUNSPARCE, \ + .categoryName = _("Land Snake"), \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(DudunsparceThreeSegment, 64, 64), \ + .frontPicYOffset = 10, \ + .frontAnimFrames = sAnims_Dudunsparce, \ + BACK_PIC(DudunsparceThreeSegment, 64, 64), \ + .backPicYOffset = 11, \ + PALETTES(Dudunsparce), \ + ICON(Dudunsparce, 0), \ + LEARNSETS(Dudunsparce), \ + .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backAnimId = BACK_ANIM_NONE, + //FOOTPRINT(Dudunsparce), .height = 45, .weight = 474, .description = COMPOUND_STRING( diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index 17bf0c66776f..d06840d16e25 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -1190,7 +1190,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #endif //P_FAMILY_SHIELDON #if P_FAMILY_BURMY -#define BURMY_MISC_INFO \ + [SPECIES_BURMY_PLANT_CLOAK] = + { .baseHP = 40, \ .baseAttack = 29, \ .baseDefense = 45, \ @@ -1225,11 +1226,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = LEARNSETS(Burmy), \ .tmIlliterate = TRUE, \ .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ - .formChangeTable = sBurmyFormChangeTable - - [SPECIES_BURMY_PLANT_CLOAK] = - { - BURMY_MISC_INFO, + .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( "If its cloak is even slightly damaged, it\n" @@ -1248,7 +1245,41 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_BURMY_SANDY_CLOAK] = { - BURMY_MISC_INFO, + .baseHP = 40, \ + .baseAttack = 29, \ + .baseDefense = 45, \ + .baseSpeed = 36, \ + .baseSpAttack = 29, \ + .baseSpDefense = 45, \ + .types = MON_TYPES(TYPE_BUG), \ + .catchRate = 120, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, \ + .speciesName = _("Burmy"), \ + .cryId = CRY_BURMY, \ + .natDexNum = NATIONAL_DEX_BURMY, \ + .categoryName = _("Bagworm"), \ + .height = 2, \ + .weight = 34, \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Burmy, \ + .frontAnimId = ANIM_V_STRETCH, \ + .enemyMonElevation = 10, \ + .backAnimId = BACK_ANIM_H_SHAKE, \ + FOOTPRINT(Burmy) \ + LEARNSETS(Burmy), \ + .tmIlliterate = TRUE, \ + .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ + .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( "It weaves a cloak together with sand, mud,\n" @@ -1267,7 +1298,41 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_BURMY_TRASH_CLOAK] = { - BURMY_MISC_INFO, + .baseHP = 40, \ + .baseAttack = 29, \ + .baseDefense = 45, \ + .baseSpeed = 36, \ + .baseSpAttack = 29, \ + .baseSpDefense = 45, \ + .types = MON_TYPES(TYPE_BUG), \ + .catchRate = 120, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, \ + .evYield_SpDefense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, \ + .speciesName = _("Burmy"), \ + .cryId = CRY_BURMY, \ + .natDexNum = NATIONAL_DEX_BURMY, \ + .categoryName = _("Bagworm"), \ + .height = 2, \ + .weight = 34, \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Burmy, \ + .frontAnimId = ANIM_V_STRETCH, \ + .enemyMonElevation = 10, \ + .backAnimId = BACK_ANIM_H_SHAKE, \ + FOOTPRINT(Burmy) \ + LEARNSETS(Burmy), \ + .tmIlliterate = TRUE, \ + .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ + .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( "When confronted by a lack of other\n" @@ -1284,7 +1349,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, -#define WORMADAM_MISC_INFO \ + [SPECIES_WORMADAM_PLANT_CLOAK] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ .itemRare = ITEM_SILVER_POWDER, \ @@ -1311,11 +1377,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 2, \ .backAnimId = BACK_ANIM_V_SHAKE, \ FOOTPRINT(Wormadam) \ - .formSpeciesIdTable = sWormadamFormSpeciesIdTable - - [SPECIES_WORMADAM_PLANT_CLOAK] = - { - WORMADAM_MISC_INFO, + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 59, .baseDefense = 85, @@ -1339,7 +1401,33 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_SANDY_CLOAK] = { - WORMADAM_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ + .itemRare = ITEM_SILVER_POWDER, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, \ + .speciesName = _("Wormadam"), \ + .cryId = CRY_WORMADAM, \ + .natDexNum = NATIONAL_DEX_WORMADAM, \ + .categoryName = _("Bagworm"), \ + .height = 5, \ + .weight = 65, \ + .pokemonScale = 432, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 10, \ + .frontAnimFrames = sAnims_Wormadam, \ + .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, \ + .enemyMonElevation = 8, \ + .backPicYOffset = 2, \ + .backAnimId = BACK_ANIM_V_SHAKE, \ + FOOTPRINT(Wormadam) \ + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 79, .baseDefense = 105, @@ -1363,7 +1451,33 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_TRASH_CLOAK] = { - WORMADAM_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ + .itemRare = ITEM_SILVER_POWDER, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, \ + .speciesName = _("Wormadam"), \ + .cryId = CRY_WORMADAM, \ + .natDexNum = NATIONAL_DEX_WORMADAM, \ + .categoryName = _("Bagworm"), \ + .height = 5, \ + .weight = 65, \ + .pokemonScale = 432, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 10, \ + .frontAnimFrames = sAnims_Wormadam, \ + .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, \ + .enemyMonElevation = 8, \ + .backPicYOffset = 2, \ + .backAnimId = BACK_ANIM_V_SHAKE, \ + FOOTPRINT(Wormadam) \ + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 69, .baseDefense = 95, @@ -1740,7 +1854,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}), }, -#define CHERRIM_MISC_INFO \ + [SPECIES_CHERRIM_OVERCAST] = + { .baseHP = 70, \ .baseAttack = 60, \ .baseDefense = 70, \ @@ -1771,11 +1886,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Cherrim) \ LEARNSETS(Cherrim), \ .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ - .formChangeTable = sCherrimFormChangeTable - - [SPECIES_CHERRIM_OVERCAST] = - { - CHERRIM_MISC_INFO, + .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( "It's motionless, save for the occasional\n" @@ -1795,7 +1906,37 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_CHERRIM_SUNSHINE] = { - CHERRIM_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 60, \ + .baseDefense = 70, \ + .baseSpeed = 85, \ + .baseSpAttack = 87, \ + .baseSpDefense = 78, \ + .types = MON_TYPES(TYPE_GRASS), \ + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 133, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_MIRACLE_SEED, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS),\ + .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, \ + .speciesName = _("Cherrim"), \ + .cryId = CRY_CHERRIM, \ + .natDexNum = NATIONAL_DEX_CHERRIM, \ + .categoryName = _("Blossom"), \ + .height = 5, \ + .weight = 93, \ + .pokemonScale = 432, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Cherrim) \ + LEARNSETS(Cherrim), \ + .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ + .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PINK, .description = COMPOUND_STRING( "Cherrim takes this form on sunny days.\n" @@ -1815,7 +1956,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #endif //P_FAMILY_CHERUBI #if P_FAMILY_SHELLOS -#define SHELLOS_MISC_INFO \ + [SPECIES_SHELLOS_WEST_SEA] = + { .baseHP = 76, \ .baseAttack = 48, \ .baseDefense = 48, \ @@ -1848,11 +1990,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_H_SPRING, \ FOOTPRINT(Shellos) \ LEARNSETS(Shellos), \ - .formSpeciesIdTable = sShellosFormSpeciesIdTable - - [SPECIES_SHELLOS_WEST_SEA] = - { - SHELLOS_MISC_INFO, + .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( "It oozes a purple fluid to deter enemies.\n" @@ -1869,7 +2007,39 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHELLOS_EAST_SEA] = { - SHELLOS_MISC_INFO, + .baseHP = 76, \ + .baseAttack = 48, \ + .baseDefense = 48, \ + .baseSpeed = 34, \ + .baseSpAttack = 57, \ + .baseSpDefense = 62, \ + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 190, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 73, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ + .speciesName = _("Shellos"), \ + .cryId = CRY_SHELLOS, \ + .natDexNum = NATIONAL_DEX_SHELLOS, \ + .categoryName = _("Sea Slug"), \ + .height = 3, \ + .weight = 63, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Shellos, \ + .frontAnimId = ANIM_V_STRETCH, \ + .backPicYOffset = 8, \ + .backAnimId = BACK_ANIM_H_SPRING, \ + FOOTPRINT(Shellos) \ + LEARNSETS(Shellos), \ + .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( "It's capable of spending a limited amount\n" @@ -1884,7 +2054,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}), }, -#define GASTRODON_MISC_INFO \ + [SPECIES_GASTRODON_WEST_SEA] = + { .baseHP = 111, \ .baseAttack = 83, \ .baseDefense = 68, \ @@ -1918,11 +2089,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ FOOTPRINT(Gastrodon) \ LEARNSETS(Gastrodon), \ - .formSpeciesIdTable = sGastrodonFormSpeciesIdTable - - [SPECIES_GASTRODON_WEST_SEA] = - { - GASTRODON_MISC_INFO, + .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( "It appears on shallow-water beaches to\n" @@ -1937,7 +2104,40 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GASTRODON_EAST_SEA] = { - GASTRODON_MISC_INFO, + .baseHP = 111, \ + .baseAttack = 83, \ + .baseDefense = 68, \ + .baseSpeed = 39, \ + .baseSpAttack = 92, \ + .baseSpDefense = 82, \ + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ + .catchRate = 75, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 176, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ + .speciesName = _("Gastrodon"), \ + .cryId = CRY_GASTRODON, \ + .natDexNum = NATIONAL_DEX_GASTRODON, \ + .categoryName = _("Sea Slug"), \ + .height = 9, \ + .weight = 299, \ + .pokemonScale = 338, \ + .pokemonOffset = 8, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 8, \ + .frontAnimFrames = sAnims_Gastrodon, \ + .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, \ + .backPicYOffset = 3, \ + .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ + FOOTPRINT(Gastrodon) \ + LEARNSETS(Gastrodon), \ + .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( "Found more often on land than in the sea.\n" @@ -2099,7 +2299,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}), }, -#define LOPUNNY_MISC_INFO \ + [SPECIES_LOPUNNY] = + { .catchRate = 60, \ .evYield_Speed = 2, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -2114,11 +2315,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Lopunny) \ LEARNSETS(Lopunny), \ .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ - .formChangeTable = sLopunnyFormChangeTable - - [SPECIES_LOPUNNY] = - { - LOPUNNY_MISC_INFO, + .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, .baseAttack = 76, .baseDefense = 84, @@ -2154,7 +2351,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LOPUNNY_MEGA] = { - LOPUNNY_MISC_INFO, + .catchRate = 60, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = 140, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Lopunny"), \ + .natDexNum = NATIONAL_DEX_LOPUNNY, \ + .categoryName = _("Rabbit"), \ + FOOTPRINT(Lopunny) \ + LEARNSETS(Lopunny), \ + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ + .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, .baseAttack = 136, .baseDefense = 94, @@ -2687,7 +2898,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_GARCHOMP}), }, -#define GARCHOMP_MISC_INFO \ + [SPECIES_GARCHOMP] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ .catchRate = 45, \ .evYield_Attack = 3, \ @@ -2709,11 +2921,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Garchomp) \ LEARNSETS(Garchomp), \ .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ - .formChangeTable = sGarchompFormChangeTable - - [SPECIES_GARCHOMP] = - { - GARCHOMP_MISC_INFO, + .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, .baseAttack = 130, .baseDefense = 95, @@ -2749,7 +2957,28 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARCHOMP_MEGA] = { - GARCHOMP_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ + .catchRate = 45, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Garchomp"), \ + .natDexNum = NATIONAL_DEX_GARCHOMP, \ + .categoryName = _("Mach"), \ + .height = 19, \ + .weight = 950, \ + .pokemonScale = 256, \ + .pokemonOffset = 1, \ + .trainerScale = 326, \ + .trainerOffset = 4, \ + FOOTPRINT(Garchomp) \ + LEARNSETS(Garchomp), \ + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ + .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, .baseAttack = 170, .baseDefense = 115, @@ -2827,7 +3056,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}), }, -#define LUCARIO_MISC_INFO \ + [SPECIES_LUCARIO] = + { .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), \ .catchRate = 45, \ .evYield_Attack = 1, \ @@ -2844,11 +3074,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Lucario) \ LEARNSETS(Lucario), \ .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ - .formChangeTable = sLucarioFormChangeTable - - [SPECIES_LUCARIO] = - { - LUCARIO_MISC_INFO, + .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, .baseAttack = 110, .baseDefense = 70, @@ -2883,7 +3109,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LUCARIO_MEGA] = { - LUCARIO_MISC_INFO, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), \ + .catchRate = 45, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Lucario"), \ + .natDexNum = NATIONAL_DEX_LUCARIO, \ + .categoryName = _("Aura"), \ + FOOTPRINT(Lucario) \ + LEARNSETS(Lucario), \ + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ + .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, .baseAttack = 145, .baseDefense = 88, @@ -3428,7 +3670,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}), }, -#define ABOMASNOW_MISC_INFO \ + [SPECIES_ABOMASNOW] = + { .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), \ .catchRate = 60, \ .evYield_Attack = 1, \ @@ -3446,11 +3689,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Abomasnow) \ LEARNSETS(Abomasnow), \ .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ - .formChangeTable = sAbomasnowFormChangeTable - - [SPECIES_ABOMASNOW] = - { - ABOMASNOW_MISC_INFO, + .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, .baseAttack = 92, .baseDefense = 75, @@ -3486,7 +3725,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABOMASNOW_MEGA] = { - ABOMASNOW_MISC_INFO, + .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), \ + .catchRate = 60, \ + .evYield_Attack = 1, \ + .evYield_SpAttack = 1, \ + .itemRare = ITEM_NEVER_MELT_ICE, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS),\ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Abomasnow"), \ + .natDexNum = NATIONAL_DEX_ABOMASNOW, \ + .categoryName = _("Frost Tree"), \ + FOOTPRINT(Abomasnow) \ + LEARNSETS(Abomasnow), \ + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ + .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, .baseAttack = 132, .baseDefense = 105, @@ -3522,7 +3778,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #endif //P_FAMILY_SNOVER #if P_FAMILY_ROTOM -#define ROTOM_MISC_INFO \ + [SPECIES_ROTOM] = + { .catchRate = 45, \ .evYield_Speed = 1, \ .evYield_SpAttack = 1, \ @@ -3546,11 +3803,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Rotom) \ LEARNSETS(Rotom), \ .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ - .formChangeTable = sRotomFormChangeTable - - [SPECIES_ROTOM] = - { - ROTOM_MISC_INFO, + .formChangeTable = sRotomFormChangeTable, .baseHP = 50, .baseAttack = 50, .baseDefense = 77, @@ -3584,20 +3837,40 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define ROTOM_APPLIANCE_EXP_YIELD 132 #endif -#define ROTOM_APPLIANCE_INFO(form) \ + [SPECIES_ROTOM_HEAT] = + { + .catchRate = 45, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Rotom"), \ + .cryId = CRY_ROTOM, \ + .natDexNum = NATIONAL_DEX_ROTOM, \ + .categoryName = _("Plasma"), \ + .height = 3, \ + .weight = 3, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Rotom) \ + LEARNSETS(Rotom), \ + .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .formChangeTable = sRotomFormChangeTable, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), .baseHP = 50, \ .baseAttack = 65, \ .baseDefense = 107, \ .baseSpeed = 86, \ .baseSpAttack = 105, \ .baseSpDefense = 107, \ - .expYield = ROTOM_APPLIANCE_EXP_YIELD - - [SPECIES_ROTOM_HEAT] = - { - ROTOM_MISC_INFO, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), - ROTOM_APPLIANCE_INFO(Heat), + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "If the convection microwave oven is not\n" "working properly, then the Rotom inhabiting\n" @@ -3617,10 +3890,39 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_WASH] = { - ROTOM_MISC_INFO, + .catchRate = 45, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Rotom"), \ + .cryId = CRY_ROTOM, \ + .natDexNum = NATIONAL_DEX_ROTOM, \ + .categoryName = _("Plasma"), \ + .height = 3, \ + .weight = 3, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Rotom) \ + LEARNSETS(Rotom), \ + .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER), .noFlip = TRUE, - ROTOM_APPLIANCE_INFO(Wash), + .baseHP = 50, \ + .baseAttack = 65, \ + .baseDefense = 107, \ + .baseSpeed = 86, \ + .baseSpAttack = 105, \ + .baseSpDefense = 107, \ + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "It enjoys coming up with water-based\n" "pranks. The model of washing machine that\n" @@ -3640,9 +3942,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FROST] = { - ROTOM_MISC_INFO, + .catchRate = 45, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Rotom"), \ + .cryId = CRY_ROTOM, \ + .natDexNum = NATIONAL_DEX_ROTOM, \ + .categoryName = _("Plasma"), \ + .height = 3, \ + .weight = 3, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Rotom) \ + LEARNSETS(Rotom), \ + .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE), - ROTOM_APPLIANCE_INFO(Frost), + .baseHP = 50, \ + .baseAttack = 65, \ + .baseDefense = 107, \ + .baseSpeed = 86, \ + .baseSpAttack = 105, \ + .baseSpDefense = 107, \ + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "In this form, Rotom likes to play freezing\n" "cold pranks. You may find it's turned the\n" @@ -3662,9 +3993,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FAN] = { - ROTOM_MISC_INFO, + .catchRate = 45, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Rotom"), \ + .cryId = CRY_ROTOM, \ + .natDexNum = NATIONAL_DEX_ROTOM, \ + .categoryName = _("Plasma"), \ + .height = 3, \ + .weight = 3, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Rotom) \ + LEARNSETS(Rotom), \ + .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), - ROTOM_APPLIANCE_INFO(Fan), + .baseHP = 50, \ + .baseAttack = 65, \ + .baseDefense = 107, \ + .baseSpeed = 86, \ + .baseSpAttack = 105, \ + .baseSpDefense = 107, \ + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "The first appliance developed that Rotom\n" "coud inspirit was the electric fan. It uses\n" @@ -3685,9 +4045,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_MOW] = { - ROTOM_MISC_INFO, + .catchRate = 45, \ + .evYield_Speed = 1, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Rotom"), \ + .cryId = CRY_ROTOM, \ + .natDexNum = NATIONAL_DEX_ROTOM, \ + .categoryName = _("Plasma"), \ + .height = 3, \ + .weight = 3, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Rotom) \ + LEARNSETS(Rotom), \ + .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), - ROTOM_APPLIANCE_INFO(Mow), + .baseHP = 50, \ + .baseAttack = 65, \ + .baseDefense = 107, \ + .baseSpeed = 86, \ + .baseSpAttack = 105, \ + .baseSpDefense = 107, \ + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "The lawn mower is an appliance that led to\n" "the development of the Rotom Dex. It will\n" @@ -3890,7 +4279,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define DIALGA_EXP_YIELD 220 #endif -#define DIALGA_MISC_INFO \ + [SPECIES_DIALGA] = + { .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), \ .catchRate = 3, \ .expYield = DIALGA_EXP_YIELD, \ @@ -3910,11 +4300,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = LEARNSETS(Dialga), \ .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ .formChangeTable = sDialgaFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_DIALGA] = - { - DIALGA_MISC_INFO, + .isLegendary = TRUE, .baseHP = 100, .baseAttack = 120, .baseDefense = 120, @@ -3945,7 +4331,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_DIALGA_ORIGIN] = { - DIALGA_MISC_INFO, + .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), \ + .catchRate = 3, \ + .expYield = DIALGA_EXP_YIELD, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Dialga"), \ + .cryId = CRY_DIALGA, \ + .natDexNum = NATIONAL_DEX_DIALGA, \ + .categoryName = _("Temporal"), \ + FOOTPRINT(Dialga) \ + LEARNSETS(Dialga), \ + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ + .formChangeTable = sDialgaFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 100, .baseAttack = 100, .baseDefense = 120, @@ -3984,7 +4389,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define PALKIA_EXP_YIELD 220 #endif -#define PALKIA_MISC_INFO \ + [SPECIES_PALKIA] = + { .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), \ .catchRate = 3, \ .expYield = PALKIA_EXP_YIELD, \ @@ -4004,11 +4410,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = LEARNSETS(Palkia), \ .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ .formChangeTable = sPalkiaFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_PALKIA] = - { - PALKIA_MISC_INFO, + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 120, .baseDefense = 100, @@ -4039,7 +4441,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_PALKIA_ORIGIN] = { - PALKIA_MISC_INFO, + .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), \ + .catchRate = 3, \ + .expYield = PALKIA_EXP_YIELD, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Palkia"), \ + .cryId = CRY_PALKIA, \ + .natDexNum = NATIONAL_DEX_PALKIA, \ + .categoryName = _("Spatial"), \ + FOOTPRINT(Palkia) \ + LEARNSETS(Palkia), \ + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ + .formChangeTable = sPalkiaFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 100, .baseDefense = 100, @@ -4190,7 +4611,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define GIRATINA_EXP_YIELD 220 #endif -#define GIRATINA_MISC_INFO \ + [SPECIES_GIRATINA_ALTERED] = + { .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), \ .catchRate = 3, \ .expYield = GIRATINA_EXP_YIELD, \ @@ -4209,11 +4631,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = LEARNSETS(Giratina), \ .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ .formChangeTable = sGiratinaFormChangeTable, \ - .isLegendary = TRUE - - [SPECIES_GIRATINA_ALTERED] = - { - GIRATINA_MISC_INFO, + .isLegendary = TRUE, .baseHP = 150, .baseAttack = 100, .baseDefense = 120, @@ -4245,7 +4663,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GIRATINA_ORIGIN] = { - GIRATINA_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), \ + .catchRate = 3, \ + .expYield = GIRATINA_EXP_YIELD, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Giratina"), \ + .cryId = CRY_GIRATINA, \ + .natDexNum = NATIONAL_DEX_GIRATINA, \ + .categoryName = _("Renegade"), \ + FOOTPRINT(Giratina) \ + LEARNSETS(Giratina), \ + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ + .formChangeTable = sGiratinaFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 150, .baseAttack = 120, .baseDefense = 100, @@ -4513,7 +4949,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #define SHAYMIN_EXP_YIELD 64 #endif -#define SHAYMIN_MISC_INFO \ + [SPECIES_SHAYMIN_LAND] = + { .catchRate = 45, \ .expYield = SHAYMIN_EXP_YIELD, \ .itemCommon = ITEM_LUM_BERRY, \ @@ -4530,11 +4967,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = FOOTPRINT(Shaymin) \ .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ .formChangeTable = sShayminFormChangeTable, \ - .isMythical = TRUE - - [SPECIES_SHAYMIN_LAND] = - { - SHAYMIN_MISC_INFO, + .isMythical = TRUE, .baseHP = 100, .baseAttack = 100, .baseDefense = 100, @@ -4570,7 +5003,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHAYMIN_SKY] = { - SHAYMIN_MISC_INFO, + .catchRate = 45, \ + .expYield = SHAYMIN_EXP_YIELD, \ + .itemCommon = ITEM_LUM_BERRY, \ + .itemRare = ITEM_LUM_BERRY, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 100, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Shaymin"), \ + .natDexNum = NATIONAL_DEX_SHAYMIN, \ + .categoryName = _("Gratitude"), \ + FOOTPRINT(Shaymin) \ + .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ + .formChangeTable = sShayminFormChangeTable, \ + .isMythical = TRUE, .baseHP = 100, .baseAttack = 103, .baseDefense = 75, @@ -4665,24 +5114,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .isMythical = TRUE, \ } - [SPECIES_ARCEUS_NORMAL] = ARCEUS_SPECIES_INFO(TYPE_NORMAL, Normal), + [SPECIES_ARCEUS_NORMAL] = ARCEUS_SPECIES_INFO(TYPE_NORMAL, Normal), [SPECIES_ARCEUS_FIGHTING] = ARCEUS_SPECIES_INFO(TYPE_FIGHTING, Fighting), - [SPECIES_ARCEUS_FLYING] = ARCEUS_SPECIES_INFO(TYPE_FLYING, Flying), - [SPECIES_ARCEUS_POISON] = ARCEUS_SPECIES_INFO(TYPE_POISON, Poison), - [SPECIES_ARCEUS_GROUND] = ARCEUS_SPECIES_INFO(TYPE_GROUND, Ground), - [SPECIES_ARCEUS_ROCK] = ARCEUS_SPECIES_INFO(TYPE_ROCK, Rock), - [SPECIES_ARCEUS_BUG] = ARCEUS_SPECIES_INFO(TYPE_BUG, Bug), - [SPECIES_ARCEUS_GHOST] = ARCEUS_SPECIES_INFO(TYPE_GHOST, Ghost), - [SPECIES_ARCEUS_STEEL] = ARCEUS_SPECIES_INFO(TYPE_STEEL, Steel), - [SPECIES_ARCEUS_FIRE] = ARCEUS_SPECIES_INFO(TYPE_FIRE, Fire), - [SPECIES_ARCEUS_WATER] = ARCEUS_SPECIES_INFO(TYPE_WATER, Water), - [SPECIES_ARCEUS_GRASS] = ARCEUS_SPECIES_INFO(TYPE_GRASS, Grass), + [SPECIES_ARCEUS_FLYING] = ARCEUS_SPECIES_INFO(TYPE_FLYING, Flying), + [SPECIES_ARCEUS_POISON] = ARCEUS_SPECIES_INFO(TYPE_POISON, Poison), + [SPECIES_ARCEUS_GROUND] = ARCEUS_SPECIES_INFO(TYPE_GROUND, Ground), + [SPECIES_ARCEUS_ROCK] = ARCEUS_SPECIES_INFO(TYPE_ROCK, Rock), + [SPECIES_ARCEUS_BUG] = ARCEUS_SPECIES_INFO(TYPE_BUG, Bug), + [SPECIES_ARCEUS_GHOST] = ARCEUS_SPECIES_INFO(TYPE_GHOST, Ghost), + [SPECIES_ARCEUS_STEEL] = ARCEUS_SPECIES_INFO(TYPE_STEEL, Steel), + [SPECIES_ARCEUS_FIRE] = ARCEUS_SPECIES_INFO(TYPE_FIRE, Fire), + [SPECIES_ARCEUS_WATER] = ARCEUS_SPECIES_INFO(TYPE_WATER, Water), + [SPECIES_ARCEUS_GRASS] = ARCEUS_SPECIES_INFO(TYPE_GRASS, Grass), [SPECIES_ARCEUS_ELECTRIC] = ARCEUS_SPECIES_INFO(TYPE_ELECTRIC, Electric), - [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_SPECIES_INFO(TYPE_PSYCHIC, Psychic), - [SPECIES_ARCEUS_ICE] = ARCEUS_SPECIES_INFO(TYPE_ICE, Ice), - [SPECIES_ARCEUS_DRAGON] = ARCEUS_SPECIES_INFO(TYPE_DRAGON, Dragon), - [SPECIES_ARCEUS_DARK] = ARCEUS_SPECIES_INFO(TYPE_DARK, Dark), - [SPECIES_ARCEUS_FAIRY] = ARCEUS_SPECIES_INFO(TYPE_FAIRY, Fairy), + [SPECIES_ARCEUS_PSYCHIC] = ARCEUS_SPECIES_INFO(TYPE_PSYCHIC, Psychic), + [SPECIES_ARCEUS_ICE] = ARCEUS_SPECIES_INFO(TYPE_ICE, Ice), + [SPECIES_ARCEUS_DRAGON] = ARCEUS_SPECIES_INFO(TYPE_DRAGON, Dragon), + [SPECIES_ARCEUS_DARK] = ARCEUS_SPECIES_INFO(TYPE_DARK, Dark), + [SPECIES_ARCEUS_FAIRY] = ARCEUS_SPECIES_INFO(TYPE_FAIRY, Fairy), #endif //P_FAMILY_ARCEUS #ifdef __INTELLISENSE__ From 22906207d3ba60ec2e90c1619442612a4c31a58d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 18:22:33 -0300 Subject: [PATCH 08/23] Expanded Gen 5 macros --- src/data/pokemon/species_info/gen_5.h | 1089 +++++++++++++++++++------ 1 file changed, 843 insertions(+), 246 deletions(-) diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index e5270c288030..e90218943198 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -442,7 +442,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = {EVO_NONE, 0, SPECIES_SAMUROTT_HISUIAN}), }, -#define SAMUROTT_MISC_INFO \ + [SPECIES_SAMUROTT] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, \ .genderRatio = PERCENT_FEMALE(12.5), \ @@ -461,11 +462,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 271, \ .trainerOffset = 0, \ FOOTPRINT(Samurott) \ - .formSpeciesIdTable = sSamurottFormSpeciesIdTable - - [SPECIES_SAMUROTT] = - { - SAMUROTT_MISC_INFO, + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .baseHP = 95, .baseAttack = 100, .baseDefense = 85, @@ -496,7 +493,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_SAMUROTT_HISUIAN] = { - SAMUROTT_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Samurott"), \ + .cryId = CRY_SAMUROTT, \ + .natDexNum = NATIONAL_DEX_SAMUROTT, \ + .categoryName = _("Formidable"), \ + .height = 15, \ + .pokemonScale = 268, \ + .pokemonOffset = 2, \ + .trainerScale = 271, \ + .trainerOffset = 0, \ + FOOTPRINT(Samurott) \ + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .baseHP = 90, .baseAttack = 108, .baseDefense = 80, @@ -1873,7 +1888,9 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = }, #endif //P_FAMILY_DRILBUR -#define AUDINO_MISC_INFO \ +#if P_FAMILY_AUDINO + [SPECIES_AUDINO] = + { .catchRate = 255, \ .evYield_HP = 2, \ .itemCommon = ITEM_ORAN_BERRY, \ @@ -1889,12 +1906,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Audino) \ LEARNSETS(Audino), \ .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ - .formChangeTable = sAudinoFormChangeTable - -#if P_FAMILY_AUDINO - [SPECIES_AUDINO] = - { - AUDINO_MISC_INFO, + .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, .baseAttack = 60, .baseDefense = 86, @@ -1931,7 +1943,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_MEGA_EVOLUTIONS [SPECIES_AUDINO_MEGA] = { - AUDINO_MISC_INFO, + .catchRate = 255, \ + .evYield_HP = 2, \ + .itemCommon = ITEM_ORAN_BERRY, \ + .itemRare = ITEM_SITRUS_BERRY, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ + .speciesName = _("Audino"), \ + .natDexNum = NATIONAL_DEX_AUDINO, \ + .categoryName = _("Hearing"), \ + FOOTPRINT(Audino) \ + LEARNSETS(Audino), \ + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ + .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, .baseAttack = 60, .baseDefense = 126, @@ -2843,7 +2870,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}), }, -#define LILLIGANT_MISC_INFO \ + [SPECIES_LILLIGANT] = + { .catchRate = 75, \ .expYield = 168, \ .itemRare = ITEM_ABSORB_BULB, \ @@ -2858,11 +2886,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_LILLIGANT, \ .natDexNum = NATIONAL_DEX_LILLIGANT, \ FOOTPRINT(Lilligant) \ - .formSpeciesIdTable = sLilligantFormSpeciesIdTable - - [SPECIES_LILLIGANT] = - { - LILLIGANT_MISC_INFO, + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .baseHP = 70, .baseAttack = 60, .baseDefense = 75, @@ -2899,7 +2923,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_LILLIGANT_HISUIAN] = { - LILLIGANT_MISC_INFO, + .catchRate = 75, \ + .expYield = 168, \ + .itemRare = ITEM_ABSORB_BULB, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = TRUE, \ + .speciesName = _("Lilligant"), \ + .cryId = CRY_LILLIGANT, \ + .natDexNum = NATIONAL_DEX_LILLIGANT, \ + FOOTPRINT(Lilligant) \ + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .baseHP = 70, .baseAttack = 105, .baseDefense = 75, @@ -2938,7 +2976,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_PETILIL #if P_FAMILY_BASCULIN -#define BASCULIN_MISC_INFO \ + [SPECIES_BASCULIN_RED_STRIPED] = + { .baseHP = 70, \ .baseAttack = 92, \ .baseDefense = 65, \ @@ -2966,11 +3005,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, \ .enemyMonElevation = 6, \ FOOTPRINT(Basculin) \ - .formSpeciesIdTable = sBasculinFormSpeciesIdTable - - [SPECIES_BASCULIN_RED_STRIPED] = - { - BASCULIN_MISC_INFO, + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_TOOTH, .abilities = { ABILITY_RECKLESS, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .categoryName = _("Hostile"), @@ -2993,7 +3028,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULIN_BLUE_STRIPED] = { - BASCULIN_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 92, \ + .baseDefense = 65, \ + .baseSpeed = 98, \ + .baseSpAttack = 80, \ + .baseSpDefense = 55, \ + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 190, \ + .expYield = 161, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Basculin"), \ + .cryId = CRY_BASCULIN, \ + .natDexNum = NATIONAL_DEX_BASCULIN, \ + .height = 10, \ + .weight = 180, \ + .pokemonScale = 316, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + .enemyMonElevation = 6, \ + FOOTPRINT(Basculin) \ + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_SCALE, .abilities = { ABILITY_ROCK_HEAD, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .categoryName = _("Hostile"), @@ -3017,7 +3079,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_BASCULIN_WHITE_STRIPED] = { - BASCULIN_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 92, \ + .baseDefense = 65, \ + .baseSpeed = 98, \ + .baseSpAttack = 80, \ + .baseSpDefense = 55, \ + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 190, \ + .expYield = 161, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Basculin"), \ + .cryId = CRY_BASCULIN, \ + .natDexNum = NATIONAL_DEX_BASCULIN, \ + .height = 10, \ + .weight = 180, \ + .pokemonScale = 316, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + .enemyMonElevation = 6, \ + FOOTPRINT(Basculin) \ + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_SCALE, .abilities = { ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .categoryName = _("Mellow"), @@ -3040,7 +3129,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = {EVO_LEVEL_RECOIL_DAMAGE_FEMALE, 294, SPECIES_BASCULEGION_FEMALE}), }, -#define BASCULEGION_MISC_INFO \ + [SPECIES_BASCULEGION_MALE] = + { .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), \ .catchRate = 45, \ .expYield = 265, \ @@ -3066,14 +3156,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 5, \ .backPicYOffset = 8, \ LEARNSETS(Basculegion), \ - .formSpeciesIdTable = sBasculegionFormSpeciesIdTable + .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Basculegion) - - [SPECIES_BASCULEGION_MALE] = - { - BASCULEGION_MISC_INFO, + //FOOTPRINT(Basculegion), .baseHP = 120, .baseAttack = 112, .baseDefense = 65, @@ -3094,7 +3180,35 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULEGION_FEMALE] = { - BASCULEGION_MISC_INFO, + .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_HP = 3, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Bsculegion"), \ + .cryId = CRY_BASCULEGION, \ + .natDexNum = NATIONAL_DEX_BASCULEGION, \ + .categoryName = _("Big Fish"), \ + .height = 30, \ + .weight = 1100, \ + .pokemonScale = 275, \ + .pokemonOffset = 7, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Basculegion, \ + .frontPicYOffset = 0, \ + .enemyMonElevation = 5, \ + .backPicYOffset = 8, \ + LEARNSETS(Basculegion), \ + .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backAnimId = BACK_ANIM_NONE, + //FOOTPRINT(Basculegion), .baseHP = 120, .baseAttack = 92, .baseDefense = 65, @@ -3269,7 +3383,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_SANDILE #if P_FAMILY_DARUMAKA -#define DARUMAKA_MISC_INFO \ + [SPECIES_DARUMAKA] = + { .baseHP = 70, \ .baseAttack = 90, \ .baseDefense = 45, \ @@ -3290,11 +3405,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_DARUMAKA, \ .categoryName = _("Zen Charm"), \ FOOTPRINT(Darumaka) \ - .formSpeciesIdTable = sDarumakaFormSpeciesIdTable - - [SPECIES_DARUMAKA] = - { - DARUMAKA_MISC_INFO, + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, .height = 6, @@ -3321,7 +3432,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}), }, -#define DARMANITAN_MISC_INFO \ + [SPECIES_DARMANITAN_STANDARD_MODE] = + { + .baseHP = 105, \ + .baseAttack = 140, \ + .baseDefense = 55, \ + .baseSpeed = 95, \ + .baseSpAttack = 30, \ + .baseSpDefense = 55, \ + .expYield = 168, \ + .evYield_Attack = 2, \ .catchRate = 60, \ .genderRatio = PERCENT_FEMALE(50), \ .eggCycles = 20, \ @@ -3332,26 +3452,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_DARMANITAN, \ .natDexNum = NATIONAL_DEX_DARMANITAN, \ FOOTPRINT(Darmanitan) \ - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable - -#define DARMANITAN_STANDARD_MISC_INFO \ - .baseHP = 105, \ - .baseAttack = 140, \ - .baseDefense = 55, \ - .baseSpeed = 95, \ - .baseSpAttack = 30, \ - .baseSpDefense = 55, \ - .expYield = 168, \ - .evYield_Attack = 2, \ - DARMANITAN_MISC_INFO - -#define DARMANITAN_ZEN_MODE_MISC_INFO \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,\ - .evYield_SpAttack = 2, \ - .categoryName = _("Blazing"), \ - DARMANITAN_MISC_INFO - -#define DARMANITAN_UNOVAN_MISC_INFO \ + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE },\ .height = 13, \ .weight = 929, \ @@ -3360,12 +3461,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, \ .trainerOffset = 0, \ LEARNSETS(Darmanitan), \ - .formChangeTable = sDarmanitanFormChangeTable - - [SPECIES_DARMANITAN_STANDARD_MODE] = - { - DARMANITAN_STANDARD_MISC_INFO, - DARMANITAN_UNOVAN_MISC_INFO, + .formChangeTable = sDarmanitanFormChangeTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, .categoryName = _("Blazing"), @@ -3387,8 +3483,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_ZEN_MODE] = { - DARMANITAN_ZEN_MODE_MISC_INFO, - DARMANITAN_UNOVAN_MISC_INFO, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,\ + .evYield_SpAttack = 2, \ + .categoryName = _("Blazing"), \ + .catchRate = 60, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Darmanitan"), \ + .cryId = CRY_DARMANITAN, \ + .natDexNum = NATIONAL_DEX_DARMANITAN, \ + FOOTPRINT(Darmanitan) \ + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE },\ + .height = 13, \ + .weight = 929, \ + .pokemonScale = 272, \ + .pokemonOffset = 3, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + LEARNSETS(Darmanitan), \ + .formChangeTable = sDarmanitanFormChangeTable, .baseHP = 105, .baseAttack = 30, .baseDefense = 105, @@ -3415,7 +3532,27 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_DARUMAKA_GALARIAN] = { - DARUMAKA_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 90, \ + .baseDefense = 45, \ + .baseSpeed = 50, \ + .baseSpAttack = 15, \ + .baseSpDefense = 45, \ + .catchRate = 120, \ + .expYield = 63, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, \ + .speciesName = _("Darumaka"), \ + .cryId = CRY_DARUMAKA, \ + .natDexNum = NATIONAL_DEX_DARUMAKA, \ + .categoryName = _("Zen Charm"), \ + FOOTPRINT(Darumaka) \ + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .types = MON_TYPES(TYPE_ICE), .bodyColor = BODY_COLOR_WHITE, .height = 7, @@ -3443,7 +3580,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}), }, -#define DARMANITAN_GALARIAN_MISC_INFO \ + [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = + { .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE },\ .bodyColor = BODY_COLOR_WHITE, \ .height = 17, \ @@ -3454,12 +3592,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, \ LEARNSETS(DarmanitanGalarian), \ .formChangeTable = sDarmanitanGalarianFormChangeTable, \ - .isGalarianForm = TRUE - - [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = - { - DARMANITAN_GALARIAN_MISC_INFO, - DARMANITAN_STANDARD_MISC_INFO, + .isGalarianForm = TRUE, + .baseHP = 105, \ + .baseAttack = 140, \ + .baseDefense = 55, \ + .baseSpeed = 95, \ + .baseSpAttack = 30, \ + .baseSpDefense = 55, \ + .expYield = 168, \ + .evYield_Attack = 2, \ + .catchRate = 60, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Darmanitan"), \ + .cryId = CRY_DARMANITAN, \ + .natDexNum = NATIONAL_DEX_DARMANITAN, \ + FOOTPRINT(Darmanitan) \ + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .types = MON_TYPES(TYPE_ICE), .categoryName = _("Zen Charm"), .description = COMPOUND_STRING( @@ -3480,12 +3632,35 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { - DARMANITAN_GALARIAN_MISC_INFO, - DARMANITAN_ZEN_MODE_MISC_INFO, - .baseHP = 105, - .baseAttack = 160, - .baseDefense = 55, - .baseSpeed = 135, + .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE },\ + .bodyColor = BODY_COLOR_WHITE, \ + .height = 17, \ + .weight = 1200, \ + .pokemonScale = 272, \ + .pokemonOffset = 3, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + LEARNSETS(DarmanitanGalarian), \ + .formChangeTable = sDarmanitanGalarianFormChangeTable, \ + .isGalarianForm = TRUE, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,\ + .evYield_SpAttack = 2, \ + .categoryName = _("Blazing"), \ + .catchRate = 60, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Darmanitan"), \ + .cryId = CRY_DARMANITAN, \ + .natDexNum = NATIONAL_DEX_DARMANITAN, \ + FOOTPRINT(Darmanitan) \ + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .baseHP = 105, + .baseAttack = 160, + .baseDefense = 55, + .baseSpeed = 135, .baseSpAttack = 30, .baseSpDefense = 55, .types = MON_TYPES(TYPE_ICE, TYPE_FIRE), @@ -3807,7 +3982,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_SIGILYPH #if P_FAMILY_YAMASK -#define YAMASK_MISC_INFO \ + [SPECIES_YAMASK] = + { .catchRate = 190, \ .expYield = 61, \ .evYield_Defense = 1, \ @@ -3828,11 +4004,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Yamask) \ - .formSpeciesIdTable = sYamaskFormSpeciesIdTable - - [SPECIES_YAMASK] = - { - YAMASK_MISC_INFO, + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .baseHP = 38, .baseAttack = 30, .baseDefense = 85, @@ -3912,7 +4084,27 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_YAMASK_GALARIAN] = { - YAMASK_MISC_INFO, + .catchRate = 190, \ + .expYield = 61, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),\ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Yamask"), \ + .cryId = CRY_YAMASK, \ + .natDexNum = NATIONAL_DEX_YAMASK, \ + .categoryName = _("Spirit"), \ + .height = 5, \ + .weight = 15, \ + .pokemonScale = 432, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Yamask) \ + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .baseHP = 38, .baseAttack = 55, .baseDefense = 85, @@ -4235,7 +4427,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}), }, -#define GARBODOR_MISC_INFO \ + [SPECIES_GARBODOR] = + { .baseHP = 80, \ .baseAttack = 95, \ .baseDefense = 82, \ @@ -4263,11 +4456,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Garbodor) \ LEARNSETS(Garbodor), \ .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ - .formChangeTable = sGarbodorFormChangeTable - - [SPECIES_GARBODOR] = - { - GARBODOR_MISC_INFO, + .formChangeTable = sGarbodorFormChangeTable, .height = 19, .weight = 1073, .description = COMPOUND_STRING( @@ -4293,7 +4482,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GIGANTAMAX_FORMS [SPECIES_GARBODOR_GIGANTAMAX] = { - GARBODOR_MISC_INFO, + .baseHP = 80, \ + .baseAttack = 95, \ + .baseDefense = 82, \ + .baseSpeed = 75, \ + .baseSpAttack = 60, \ + .baseSpDefense = 82, \ + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .noFlip = TRUE, \ + .speciesName = _("Garbodor"), \ + .cryId = CRY_GARBODOR, \ + .natDexNum = NATIONAL_DEX_GARBODOR, \ + .categoryName = _("Trash Heap"), \ + FOOTPRINT(Garbodor) \ + LEARNSETS(Garbodor), \ + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ + .formChangeTable = sGarbodorFormChangeTable, .height = 210, .weight = 0, .description = COMPOUND_STRING( @@ -4320,7 +4536,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_TRUBBISH #if P_FAMILY_ZORUA -#define ZORUA_MISC_INFO \ + [SPECIES_ZORUA] = + { .catchRate = 75, \ .expYield = 66, \ .evYield_SpAttack = 1, \ @@ -4341,33 +4558,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Zorua) \ - .formSpeciesIdTable = sZoruaFormSpeciesIdTable - -#define ZOROARK_MISC_INFO \ - .catchRate = 45, \ - .expYield = 179, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Zoroark"), \ - .cryId = CRY_ZOROARK, \ - .natDexNum = NATIONAL_DEX_ZOROARK, \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Zoroark) \ - .formSpeciesIdTable = sZoroarkFormSpeciesIdTable - - [SPECIES_ZORUA] = - { - ZORUA_MISC_INFO, + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .baseHP = 40, .baseAttack = 65, .baseDefense = 40, @@ -4396,7 +4587,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK] = { - ZOROARK_MISC_INFO, + .catchRate = 45, \ + .expYield = 179, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Zoroark"), \ + .cryId = CRY_ZOROARK, \ + .natDexNum = NATIONAL_DEX_ZOROARK, \ + .height = 16, \ + .pokemonScale = 259, \ + .pokemonOffset = 1, \ + .trainerScale = 296, \ + .trainerOffset = 1, \ + FOOTPRINT(Zoroark) \ + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .baseHP = 60, .baseAttack = 105, .baseDefense = 60, @@ -4426,7 +4636,27 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_ZORUA_HISUIAN] = { - ZORUA_MISC_INFO, + .catchRate = 75, \ + .expYield = 66, \ + .evYield_SpAttack = 1, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Zorua"), \ + .cryId = CRY_ZORUA, \ + .natDexNum = NATIONAL_DEX_ZORUA, \ + .height = 7, \ + .weight = 125, \ + .pokemonScale = 365, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Zorua) \ + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .baseHP = 35, .baseAttack = 60, .baseDefense = 40, @@ -4456,7 +4686,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK_HISUIAN] = { - ZOROARK_MISC_INFO, + .catchRate = 45, \ + .expYield = 179, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Zoroark"), \ + .cryId = CRY_ZOROARK, \ + .natDexNum = NATIONAL_DEX_ZOROARK, \ + .height = 16, \ + .pokemonScale = 259, \ + .pokemonOffset = 1, \ + .trainerScale = 296, \ + .trainerOffset = 1, \ + FOOTPRINT(Zoroark) \ + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .baseHP = 55, .baseAttack = 100, .baseDefense = 60, @@ -5124,7 +5373,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_VANILLITE #if P_FAMILY_DEERLING -#define DEERLING_MISC_INFO \ + [SPECIES_DEERLING_SPRING] = + { .baseHP = 60, \ .baseAttack = 60, \ .baseDefense = 50, \ @@ -5160,11 +5410,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_H_SLIDE, \ FOOTPRINT(Deerling) \ LEARNSETS(Deerling), \ - .formSpeciesIdTable = sDeerlingFormSpeciesIdTable - - [SPECIES_DEERLING_SPRING] = - { - DEERLING_MISC_INFO, + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .description = COMPOUND_STRING( "Deerling have different scents\n" @@ -5175,9 +5421,45 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingSpring, 1), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}), }, + [SPECIES_DEERLING_SUMMER] = { - DEERLING_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 60, \ + .baseDefense = 50, \ + .baseSpeed = 75, \ + .baseSpAttack = 40, \ + .baseSpDefense = 50, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 190, \ + .expYield = 67, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .speciesName = _("Deerling"), \ + .cryId = CRY_DEERLING, \ + .natDexNum = NATIONAL_DEX_DEERLING, \ + .categoryName = _("Season"), \ + .height = 6, \ + .weight = 195, \ + .pokemonScale = 422, \ + .pokemonOffset = 14, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Deerling, 32, 48), \ + .frontPicYOffset = 11, \ + .frontAnimFrames = sAnims_Deerling, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + BACK_PIC(Deerling, 48, 56), \ + .backPicYOffset = 9, \ + .backAnimId = BACK_ANIM_H_SLIDE, \ + FOOTPRINT(Deerling) \ + LEARNSETS(Deerling), \ + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( "To prevent Deerling from entering\n" @@ -5188,9 +5470,45 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingSummer, 1), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}), }, + [SPECIES_DEERLING_AUTUMN] = { - DEERLING_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 60, \ + .baseDefense = 50, \ + .baseSpeed = 75, \ + .baseSpAttack = 40, \ + .baseSpDefense = 50, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 190, \ + .expYield = 67, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .speciesName = _("Deerling"), \ + .cryId = CRY_DEERLING, \ + .natDexNum = NATIONAL_DEX_DEERLING, \ + .categoryName = _("Season"), \ + .height = 6, \ + .weight = 195, \ + .pokemonScale = 422, \ + .pokemonOffset = 14, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Deerling, 32, 48), \ + .frontPicYOffset = 11, \ + .frontAnimFrames = sAnims_Deerling, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + BACK_PIC(Deerling, 48, 56), \ + .backPicYOffset = 9, \ + .backAnimId = BACK_ANIM_H_SLIDE, \ + FOOTPRINT(Deerling) \ + LEARNSETS(Deerling), \ + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( "Deerling have different scents\n" @@ -5201,9 +5519,45 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingAutumn, 0), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}), }, + [SPECIES_DEERLING_WINTER] = { - DEERLING_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 60, \ + .baseDefense = 50, \ + .baseSpeed = 75, \ + .baseSpAttack = 40, \ + .baseSpDefense = 50, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 190, \ + .expYield = 67, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .speciesName = _("Deerling"), \ + .cryId = CRY_DEERLING, \ + .natDexNum = NATIONAL_DEX_DEERLING, \ + .categoryName = _("Season"), \ + .height = 6, \ + .weight = 195, \ + .pokemonScale = 422, \ + .pokemonOffset = 14, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Deerling, 32, 48), \ + .frontPicYOffset = 11, \ + .frontAnimFrames = sAnims_Deerling, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + BACK_PIC(Deerling, 48, 56), \ + .backPicYOffset = 9, \ + .backAnimId = BACK_ANIM_H_SLIDE, \ + FOOTPRINT(Deerling) \ + LEARNSETS(Deerling), \ + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( "Deerling's scent changes with the\n" @@ -5215,7 +5569,152 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}), }, -#define SAWSBUCK_MISC_INFO \ + [SPECIES_SAWSBUCK_SPRING] = + { + .baseHP = 80, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 95, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 75, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Sawsbuck"), \ + .cryId = CRY_SAWSBUCK, \ + .natDexNum = NATIONAL_DEX_SAWSBUCK, \ + .categoryName = _("Season"), \ + .height = 19, \ + .weight = 925, \ + .pokemonScale = 256, \ + .pokemonOffset = 1, \ + .trainerScale = 326, \ + .trainerOffset = 4, \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Sawsbuck, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + .backPicYOffset = 5, \ + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ + FOOTPRINT(Sawsbuck) \ + LEARNSETS(Sawsbuck), \ + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, + .description = COMPOUND_STRING( + "Some people call Sawsbuck the harbingers\n" + "of spring because the plants growing on\n" + "its horns change according to the season.\n" + "The leader possesses magnificent horns."), + FRONT_PIC(SawsbuckSpring, 56, 64), + BACK_PIC(SawsbuckSpring, 48, 64), + PALETTES(SawsbuckSpring), + ICON(SawsbuckSpring, 1), + }, + + [SPECIES_SAWSBUCK_SUMMER] = + { + .baseHP = 80, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 95, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 75, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Sawsbuck"), \ + .cryId = CRY_SAWSBUCK, \ + .natDexNum = NATIONAL_DEX_SAWSBUCK, \ + .categoryName = _("Season"), \ + .height = 19, \ + .weight = 925, \ + .pokemonScale = 256, \ + .pokemonOffset = 1, \ + .trainerScale = 326, \ + .trainerOffset = 4, \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Sawsbuck, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + .backPicYOffset = 5, \ + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ + FOOTPRINT(Sawsbuck) \ + LEARNSETS(Sawsbuck), \ + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, + .description = COMPOUND_STRING( + "The thicker and larger the\n" + "branches and leaves on its antlers, the\n" + "more majestic the Sawsbuck is thought\n" + "to be."), + FRONT_PIC(SawsbuckSummer, 64, 64), + BACK_PIC(SawsbuckSummer, 64, 64), + PALETTES(SawsbuckSummer), + ICON(SawsbuckSummer, 1), + }, + + [SPECIES_SAWSBUCK_AUTUMN] = + { + .baseHP = 80, \ + .baseAttack = 100, \ + .baseDefense = 70, \ + .baseSpeed = 95, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ + .catchRate = 75, \ + .expYield = 166, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Sawsbuck"), \ + .cryId = CRY_SAWSBUCK, \ + .natDexNum = NATIONAL_DEX_SAWSBUCK, \ + .categoryName = _("Season"), \ + .height = 19, \ + .weight = 925, \ + .pokemonScale = 256, \ + .pokemonOffset = 1, \ + .trainerScale = 326, \ + .trainerOffset = 4, \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Sawsbuck, \ + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ + .backPicYOffset = 5, \ + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ + FOOTPRINT(Sawsbuck) \ + LEARNSETS(Sawsbuck), \ + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, + .description = COMPOUND_STRING( + "Sawsbuck in their Autumn Form are\n" + "known for having very short\n" + "tempers. The males fight each other\n" + "incessantly."), + FRONT_PIC(SawsbuckAutumn, 64, 64), + BACK_PIC(SawsbuckAutumn, 64, 64), + PALETTES(SawsbuckAutumn), + ICON(SawsbuckAutumn, 1), + }, + + [SPECIES_SAWSBUCK_WINTER] = + { .baseHP = 80, \ .baseAttack = 100, \ .baseDefense = 70, \ @@ -5250,53 +5749,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ FOOTPRINT(Sawsbuck) \ LEARNSETS(Sawsbuck), \ - .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable - - [SPECIES_SAWSBUCK_SPRING] = - { - SAWSBUCK_MISC_INFO, - .description = COMPOUND_STRING( - "Some people call Sawsbuck the harbingers\n" - "of spring because the plants growing on\n" - "its horns change according to the season.\n" - "The leader possesses magnificent horns."), - FRONT_PIC(SawsbuckSpring, 56, 64), - BACK_PIC(SawsbuckSpring, 48, 64), - PALETTES(SawsbuckSpring), - ICON(SawsbuckSpring, 1), - }, - - [SPECIES_SAWSBUCK_SUMMER] = - { - SAWSBUCK_MISC_INFO, - .description = COMPOUND_STRING( - "The thicker and larger the\n" - "branches and leaves on its antlers, the\n" - "more majestic the Sawsbuck is thought\n" - "to be."), - FRONT_PIC(SawsbuckSummer, 64, 64), - BACK_PIC(SawsbuckSummer, 64, 64), - PALETTES(SawsbuckSummer), - ICON(SawsbuckSummer, 1), - }, - - [SPECIES_SAWSBUCK_AUTUMN] = - { - SAWSBUCK_MISC_INFO, - .description = COMPOUND_STRING( - "Sawsbuck in their Autumn Form are\n" - "known for having very short\n" - "tempers. The males fight each other\n" - "incessantly."), - FRONT_PIC(SawsbuckAutumn, 64, 64), - BACK_PIC(SawsbuckAutumn, 64, 64), - PALETTES(SawsbuckAutumn), - ICON(SawsbuckAutumn, 1), - }, - - [SPECIES_SAWSBUCK_WINTER] = - { - SAWSBUCK_MISC_INFO, + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Though there are many enthusiasts\n" "for Sawsbuck as a species, this\n" @@ -6863,7 +7316,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_SHELMET #if P_FAMILY_STUNFISK -#define STUNFISK_MISC_INFO \ + [SPECIES_STUNFISK] = + { .catchRate = 75, \ .expYield = 165, \ .evYield_HP = 2, \ @@ -6881,11 +7335,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Stunfisk) \ - .formSpeciesIdTable = sStunfiskFormSpeciesIdTable - - [SPECIES_STUNFISK] = - { - STUNFISK_MISC_INFO, + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .baseHP = 109, .baseAttack = 66, .baseDefense = 84, @@ -6918,7 +7368,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_STUNFISK_GALARIAN] = { - STUNFISK_MISC_INFO, + .catchRate = 75, \ + .expYield = 165, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS),\ + .speciesName = _("Stunfisk"), \ + .cryId = CRY_STUNFISK, \ + .natDexNum = NATIONAL_DEX_STUNFISK, \ + .categoryName = _("Trap"), \ + .height = 7, \ + .pokemonScale = 365, \ + .pokemonOffset = 14, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Stunfisk) \ + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .baseHP = 109, .baseAttack = 81, .baseDefense = 99, @@ -7444,7 +7911,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = {EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}), }, -#define BRAVIARY_MISC_INFO \ + [SPECIES_BRAVIARY] = + { .catchRate = 60, \ .expYield = 179, \ .genderRatio = MON_MALE, \ @@ -7456,11 +7924,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_BRAVIARY, \ .natDexNum = NATIONAL_DEX_BRAVIARY, \ FOOTPRINT(Braviary) \ - .formSpeciesIdTable = sBraviaryFormSpeciesIdTable - - [SPECIES_BRAVIARY] = - { - BRAVIARY_MISC_INFO, + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 100, .baseAttack = 123, .baseDefense = 75, @@ -7499,7 +7963,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_BRAVIARY_HISUIAN] = { - BRAVIARY_MISC_INFO, + .catchRate = 60, \ + .expYield = 179, \ + .genderRatio = MON_MALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .speciesName = _("Braviary"), \ + .cryId = CRY_BRAVIARY, \ + .natDexNum = NATIONAL_DEX_BRAVIARY, \ + FOOTPRINT(Braviary) \ + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 110, .baseAttack = 83, .baseDefense = 70, @@ -8129,7 +8604,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_VIRIZION #if P_FAMILY_TORNADUS -#define TORNADUS_MISC_INFO \ + [SPECIES_TORNADUS_INCARNATE] = + { .types = MON_TYPES(TYPE_FLYING), \ .catchRate = 3, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ @@ -8148,11 +8624,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Tornadus) \ LEARNSETS(Tornadus), \ .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ - .formChangeTable = sTornadusFormChangeTable - - [SPECIES_TORNADUS_INCARNATE] = - { - TORNADUS_MISC_INFO, + .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, .baseAttack = 115, .baseDefense = 70, @@ -8185,7 +8657,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_TORNADUS_THERIAN] = { - TORNADUS_MISC_INFO, + .types = MON_TYPES(TYPE_FLYING), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ + .evYield_Attack = 3, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_GREEN, \ + .isLegendary = TRUE, \ + .speciesName = _("Tornadus"), \ + .natDexNum = NATIONAL_DEX_TORNADUS, \ + .categoryName = _("Cyclone"), \ + .weight = 630, \ + FOOTPRINT(Tornadus) \ + LEARNSETS(Tornadus), \ + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ + .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, .baseAttack = 100, .baseDefense = 80, @@ -8217,7 +8707,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_TORNADUS #if P_FAMILY_THUNDURUS -#define THUNDURUS_MISC_INFO \ + [SPECIES_THUNDURUS_INCARNATE] = + { .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), \ .catchRate = 3, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ @@ -8235,11 +8726,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Thundurus) \ LEARNSETS(Thundurus), \ .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ - .formChangeTable = sThundurusFormChangeTable - - [SPECIES_THUNDURUS_INCARNATE] = - { - THUNDURUS_MISC_INFO, + .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, .baseAttack = 115, .baseDefense = 70, @@ -8273,7 +8760,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_THUNDURUS_THERIAN] = { - THUNDURUS_MISC_INFO, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BLUE, \ + .isLegendary = TRUE, \ + .speciesName = _("Thundurus"), \ + .natDexNum = NATIONAL_DEX_THUNDURUS, \ + .categoryName = _("Bolt Strike"), \ + .weight = 610, \ + FOOTPRINT(Thundurus) \ + LEARNSETS(Thundurus), \ + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ + .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, .baseAttack = 105, .baseDefense = 70, @@ -8407,7 +8911,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_ZEKROM #if P_FAMILY_LANDORUS -#define LANDORUS_MISC_INFO \ + [SPECIES_LANDORUS_INCARNATE] = + { .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), \ .catchRate = 3, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ @@ -8425,11 +8930,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Landorus) \ LEARNSETS(Landorus), \ .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ - .formChangeTable = sLandorusFormChangeTable - - [SPECIES_LANDORUS_INCARNATE] = - { - LANDORUS_MISC_INFO, + .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, .baseAttack = 125, .baseDefense = 90, @@ -8463,7 +8964,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_LANDORUS_THERIAN] = { - LANDORUS_MISC_INFO, + .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ + .genderRatio = MON_MALE, \ + .eggCycles = 120, \ + .friendship = 90, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BROWN, \ + .isLegendary = TRUE, \ + .speciesName = _("Landorus"), \ + .natDexNum = NATIONAL_DEX_LANDORUS, \ + .categoryName = _("Abundance"), \ + .weight = 680, \ + FOOTPRINT(Landorus) \ + LEARNSETS(Landorus), \ + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ + .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, .baseAttack = 145, .baseDefense = 90, @@ -8496,7 +9014,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_LANDORUS #if P_FAMILY_KYUREM -#define KYUREM_MISC_INFO \ + [SPECIES_KYUREM] = + { .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ .catchRate = 3, \ .genderRatio = MON_GENDERLESS, \ @@ -8512,11 +9031,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .weight = 3250, \ FOOTPRINT(Kyurem) \ .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ - .isLegendary = TRUE - - [SPECIES_KYUREM] = - { - KYUREM_MISC_INFO, + .isLegendary = TRUE, .baseHP = 125, .baseAttack = 130, .baseDefense = 90, @@ -8554,7 +9069,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FUSION_FORMS [SPECIES_KYUREM_WHITE] = { - KYUREM_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ + .catchRate = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = TRUE, \ + .speciesName = _("Kyurem"), \ + .natDexNum = NATIONAL_DEX_KYUREM, \ + .categoryName = _("Boundary"), \ + .weight = 3250, \ + FOOTPRINT(Kyurem) \ + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 125, .baseAttack = 120, .baseDefense = 90, @@ -8597,7 +9127,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_KYUREM_BLACK] = { - KYUREM_MISC_INFO, + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ + .catchRate = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_GRAY, \ + .noFlip = TRUE, \ + .speciesName = _("Kyurem"), \ + .natDexNum = NATIONAL_DEX_KYUREM, \ + .categoryName = _("Boundary"), \ + .weight = 3250, \ + FOOTPRINT(Kyurem) \ + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 125, .baseAttack = 170, .baseDefense = 100, @@ -8641,7 +9186,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_KYUREM #if P_FAMILY_KELDEO -#define KELDEO_MISC_INFO \ + [SPECIES_KELDEO_ORDINARY] = + { .baseHP = 91, \ .baseAttack = 72, \ .baseDefense = 90, \ @@ -8673,11 +9219,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Keldeo) \ LEARNSETS(Keldeo), \ .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ - .formChangeTable = sKeldeoFormChangeTable - - [SPECIES_KELDEO_ORDINARY] = - { - KELDEO_MISC_INFO, + .formChangeTable = sKeldeoFormChangeTable, .description = COMPOUND_STRING( "When it is resolute, its body fills with\n" "power and it becomes swifter. It crosses\n" @@ -8696,7 +9238,38 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_KELDEO_RESOLUTE] = { - KELDEO_MISC_INFO, + .baseHP = 91, \ + .baseAttack = 72, \ + .baseDefense = 90, \ + .baseSpeed = 108, \ + .baseSpAttack = 129, \ + .baseSpDefense = 90, \ + .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 80, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .isMythical = TRUE, \ + .speciesName = _("Keldeo"), \ + .cryId = CRY_KELDEO, \ + .natDexNum = NATIONAL_DEX_KELDEO, \ + .categoryName = _("Colt"), \ + .height = 14, \ + .weight = 485, \ + .pokemonScale = 265, \ + .pokemonOffset = 2, \ + .trainerScale = 262, \ + .trainerOffset = 0, \ + FOOTPRINT(Keldeo) \ + LEARNSETS(Keldeo), \ + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ + .formChangeTable = sKeldeoFormChangeTable, .noFlip = TRUE, .description = COMPOUND_STRING( "The power that lay hidden in its\n" @@ -8716,7 +9289,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #endif //P_FAMILY_KELDEO #if P_FAMILY_MELOETTA -#define MELOETTA_MISC_INFO \ + [SPECIES_MELOETTA_ARIA] = + { .catchRate = 3, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ .evYield_Speed = 1, \ @@ -8744,11 +9318,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Meloetta) \ LEARNSETS(Meloetta), \ .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ - .formChangeTable = sMeloettaFormChangeTable - - [SPECIES_MELOETTA_ARIA] = - { - MELOETTA_MISC_INFO, + .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, .baseAttack = 77, .baseDefense = 77, @@ -8777,7 +9347,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_MELOETTA_PIROUETTE] = { - MELOETTA_MISC_INFO, + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ + .evYield_Speed = 1, \ + .itemCommon = ITEM_STAR_PIECE, \ + .itemRare = ITEM_STAR_PIECE, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 100, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = TRUE, \ + .isMythical = TRUE, \ + .speciesName = _("Meloetta"), \ + .cryId = CRY_MELOETTA, \ + .natDexNum = NATIONAL_DEX_MELOETTA, \ + .categoryName = _("Melody"), \ + .height = 6, \ + .weight = 65, \ + .pokemonScale = 422, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Meloetta) \ + LEARNSETS(Meloetta), \ + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ + .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, .baseAttack = 128, .baseDefense = 90, From f194acb8eceb65b71a3b8fe46286b6e909b5de00 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 18:51:14 -0300 Subject: [PATCH 09/23] Expanded Gen 6 macros --- src/data/pokemon/species_info/gen_6.h | 871 ++++++++++++++++++-------- 1 file changed, 614 insertions(+), 257 deletions(-) diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index 246a5d06fd19..d34d25907230 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -390,7 +390,29 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GRENINJA}), }, -#define GRENINJA_NORMAL_MISC_INFO \ + [SPECIES_GRENINJA] = + { + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ + .catchRate = 45, \ + .evYield_Speed = 3, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = TRUE, \ + .speciesName = _("Greninja"), \ + .cryId = CRY_GRENINJA, \ + .natDexNum = NATIONAL_DEX_GRENINJA, \ + .categoryName = _("Ninja"), \ + .height = 15, \ + .weight = 400, \ + .pokemonScale = 268, \ + .pokemonOffset = 2, \ + .trainerScale = 271, \ + .trainerOffset = 0, \ + FOOTPRINT(Greninja) \ + LEARNSETS(Greninja), \ + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, \ .baseAttack = 95, \ .baseDefense = 67, \ @@ -405,9 +427,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = BACK_PIC(Greninja, 64, 48), \ .backPicYOffset = 11, \ PALETTES(Greninja), \ - ICON(Greninja, 0) + ICON(Greninja, 0), + .genderRatio = PERCENT_FEMALE(12.5), + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN }, + .frontAnimId = ANIM_V_STRETCH, + .backAnimId = BACK_ANIM_JOLT_RIGHT, + }, -#define GRENINJA_MISC_INFO \ + [SPECIES_GRENINJA_BATTLE_BOND] = + { .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ .catchRate = 45, \ .evYield_Speed = 3, \ @@ -428,23 +457,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, \ FOOTPRINT(Greninja) \ LEARNSETS(Greninja), \ - .formSpeciesIdTable = sGreninjaFormSpeciesIdTable - - [SPECIES_GRENINJA] = - { - GRENINJA_MISC_INFO, - GRENINJA_NORMAL_MISC_INFO, - .genderRatio = PERCENT_FEMALE(12.5), - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN }, - .frontAnimId = ANIM_V_STRETCH, - .backAnimId = BACK_ANIM_JOLT_RIGHT, - }, - - [SPECIES_GRENINJA_BATTLE_BOND] = - { - GRENINJA_MISC_INFO, - GRENINJA_NORMAL_MISC_INFO, + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, + .baseHP = 72, \ + .baseAttack = 95, \ + .baseDefense = 67, \ + .baseSpeed = 122, \ + .baseSpAttack = 103, \ + .baseSpDefense = 71, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ + .description = gGreninjaPokedexText, \ + FRONT_PIC(Greninja, 64, 56), \ + .frontPicYOffset = 7, \ + .frontAnimFrames = sAnims_Greninja, \ + BACK_PIC(Greninja, 64, 48), \ + .backPicYOffset = 11, \ + PALETTES(Greninja), \ + ICON(Greninja, 0), .genderRatio = MON_MALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, @@ -455,7 +483,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA_ASH] = { - GRENINJA_MISC_INFO, + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ + .catchRate = 45, \ + .evYield_Speed = 3, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .bodyColor = BODY_COLOR_BLUE, \ + .noFlip = TRUE, \ + .speciesName = _("Greninja"), \ + .cryId = CRY_GRENINJA, \ + .natDexNum = NATIONAL_DEX_GRENINJA, \ + .categoryName = _("Ninja"), \ + .height = 15, \ + .weight = 400, \ + .pokemonScale = 268, \ + .pokemonOffset = 2, \ + .trainerScale = 271, \ + .trainerOffset = 0, \ + FOOTPRINT(Greninja) \ + LEARNSETS(Greninja), \ + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, .baseAttack = 145, .baseDefense = 67, @@ -1643,143 +1691,61 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_PANCHAM #if P_FAMILY_FURFROU -#define FURFROU_MISC_INFO \ - .baseHP = 75, \ - .baseAttack = 80, \ - .baseDefense = 60, \ - .baseSpeed = 102, \ - .baseSpAttack = 65, \ - .baseSpDefense = 90, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 160, \ - .expYield = 165, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_FUR_COAT, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Furfrou"), \ - .cryId = CRY_FURFROU, \ - .natDexNum = NATIONAL_DEX_FURFROU, \ - .categoryName = _("Poodle"), \ - .height = 12, \ - .weight = 280, \ - .description = gFurfrouPokedexText, \ - .pokemonScale = 282, \ - .pokemonOffset = 4, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Furfrou, \ - .frontAnimId = ANIM_H_SLIDE, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - FOOTPRINT(Furfrou) \ - LEARNSETS(Furfrou), \ - .formSpeciesIdTable = sFurfrouFormSpeciesIdTable +#define FURFROU_MISC_INFO(_form, _noFlip, frontWidth, frontYOffset, backWidth, backYOffset, _iconIdx) \ + { \ + .baseHP = 75, \ + .baseAttack = 80, \ + .baseDefense = 60, \ + .baseSpeed = 102, \ + .baseSpAttack = 65, \ + .baseSpDefense = 90, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 160, \ + .expYield = 165, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_FUR_COAT, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = _noFlip, \ + .speciesName = _("Furfrou"), \ + .cryId = CRY_FURFROU, \ + .natDexNum = NATIONAL_DEX_FURFROU, \ + .categoryName = _("Poodle"), \ + .height = 12, \ + .weight = 280, \ + .description = gFurfrouPokedexText, \ + .pokemonScale = 282, \ + .pokemonOffset = 4, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Furfrou##_form, frontWidth, 64), \ + .frontPicYOffset = frontYOffset, \ + .frontAnimFrames = sAnims_Furfrou, \ + .frontAnimId = ANIM_H_SLIDE, \ + BACK_PIC(Furfrou##_form, backWidth, 64), \ + .backPicYOffset = backYOffset, \ + .backAnimId = BACK_ANIM_V_STRETCH, \ + PALETTES(Furfrou##_form), \ + ICON(Furfrou##_form, _iconIdx), \ + FOOTPRINT(Furfrou) \ + LEARNSETS(Furfrou), \ + .formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \ + } - [SPECIES_FURFROU_NATURAL] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouNatural, 48, 64), - .frontPicYOffset = 3, - BACK_PIC(FurfrouNatural, 56, 64), - .backPicYOffset = 0, - PALETTES(FurfrouNatural), - ICON(FurfrouNatural, 0), - }, - [SPECIES_FURFROU_HEART_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouHeartTrim, 56, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouHeartTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouHeartTrim), - ICON(FurfrouHeartTrim, 0), - }, - [SPECIES_FURFROU_STAR_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouStarTrim, 56, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouStarTrim, 64, 64), - .backPicYOffset = 1, - PALETTES(FurfrouStarTrim), - ICON(FurfrouStarTrim, 0), - }, - [SPECIES_FURFROU_DIAMOND_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouDiamondTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouDiamondTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouDiamondTrim), - ICON(FurfrouDiamondTrim, 0), - }, - [SPECIES_FURFROU_DEBUTANTE_TRIM] = - { - FURFROU_MISC_INFO, - .noFlip = TRUE, - FRONT_PIC(FurfrouDebutanteTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouDebutanteTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouDebutanteTrim), - ICON(FurfrouDebutanteTrim, 2), - }, - [SPECIES_FURFROU_MATRON_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouMatronTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouMatronTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouMatronTrim), - ICON(FurfrouMatronTrim, 2), - }, - [SPECIES_FURFROU_DANDY_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouDandyTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouDandyTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouDandyTrim), - ICON(FurfrouDandyTrim, 1), - }, - [SPECIES_FURFROU_LA_REINE_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouLaReineTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouLaReineTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouLaReineTrim), - ICON(FurfrouLaReineTrim, 0), - }, - [SPECIES_FURFROU_KABUKI_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouKabukiTrim, 56, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouKabukiTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouKabukiTrim), - ICON(FurfrouKabukiTrim, 0), - }, - [SPECIES_FURFROU_PHARAOH_TRIM] = - { - FURFROU_MISC_INFO, - FRONT_PIC(FurfrouPharaohTrim, 48, 64), - .frontPicYOffset = 2, - BACK_PIC(FurfrouPharaohTrim, 56, 64), - .backPicYOffset = 1, - PALETTES(FurfrouPharaohTrim), - ICON(FurfrouPharaohTrim, 0), - }, + [SPECIES_FURFROU_NATURAL] = FURFROU_MISC_INFO(Natural, FALSE, 48, 3, 56, 0, 0), + [SPECIES_FURFROU_HEART_TRIM] = FURFROU_MISC_INFO(HeartTrim, FALSE, 56, 2, 56, 1, 0), + [SPECIES_FURFROU_STAR_TRIM] = FURFROU_MISC_INFO(StarTrim, FALSE, 56, 2, 64, 1, 0), + [SPECIES_FURFROU_DIAMOND_TRIM] = FURFROU_MISC_INFO(DiamondTrim, FALSE, 48, 2, 56, 1, 0), + [SPECIES_FURFROU_DEBUTANTE_TRIM] = FURFROU_MISC_INFO(DebutanteTrim, TRUE, 48, 2, 56, 1, 2), + [SPECIES_FURFROU_MATRON_TRIM] = FURFROU_MISC_INFO(MatronTrim, FALSE, 48, 2, 56, 1, 2), + [SPECIES_FURFROU_DANDY_TRIM] = FURFROU_MISC_INFO(DandyTrim, FALSE, 48, 2, 56, 1, 1), + [SPECIES_FURFROU_LA_REINE_TRIM] = FURFROU_MISC_INFO(LaReineTrim, FALSE, 48, 2, 56, 1, 0), + [SPECIES_FURFROU_KABUKI_TRIM] = FURFROU_MISC_INFO(KabukiTrim, FALSE, 56, 2, 56, 1, 0), + [SPECIES_FURFROU_PHARAOH_TRIM] = FURFROU_MISC_INFO(PharaohTrim, FALSE, 48, 2, 56, 1, 0), #endif //P_FAMILY_FURFROU #if P_FAMILY_ESPURR @@ -1832,7 +1798,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}), }, -#define MEOWSTIC_MISC_INFO \ + [SPECIES_MEOWSTIC_MALE] = + { .baseHP = 74, \ .baseAttack = 48, \ .baseDefense = 76, \ @@ -1862,11 +1829,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ FOOTPRINT(Meowstic) \ - .formSpeciesIdTable = sMeowsticFormSpeciesIdTable - - [SPECIES_MEOWSTIC_MALE] = - { - MEOWSTIC_MISC_INFO, + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .genderRatio = MON_MALE, .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_PRANKSTER }, .bodyColor = BODY_COLOR_BLUE, @@ -1885,7 +1848,36 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_MEOWSTIC_FEMALE] = { - MEOWSTIC_MISC_INFO, + .baseHP = 74, \ + .baseAttack = 48, \ + .baseDefense = 76, \ + .baseSpeed = 104, \ + .baseSpAttack = 83, \ + .baseSpDefense = 81, \ + .types = MON_TYPES(TYPE_PSYCHIC), \ + .catchRate = 75, \ + .expYield = 163, \ + .evYield_Speed = 2, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Meowstic"), \ + .cryId = CRY_MEOWSTIC, \ + .natDexNum = NATIONAL_DEX_MEOWSTIC, \ + .categoryName = _("Constraint"), \ + .height = 6, \ + .weight = 85, \ + .pokemonScale = 422, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Meowstic, \ + .frontAnimId = ANIM_GROW_VIBRATE, \ + .backPicYOffset = 9, \ + .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ + FOOTPRINT(Meowstic) \ + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .genderRatio = MON_FEMALE, .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_COMPETITIVE }, .bodyColor = BODY_COLOR_WHITE, @@ -2002,7 +1994,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH_SHIELD}), }, -#define AEGISLASH_MISC_INFO \ +#define AEGISLASH_MAIN_STAT (P_UPDATED_STATS >= GEN_8 ? 140 : 150) + + [SPECIES_AEGISLASH_SHIELD] = + { .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), \ .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234,\ @@ -2026,13 +2021,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = FOOTPRINT(Aegislash) \ LEARNSETS(Aegislash), \ .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ - .formChangeTable = sAegislashFormChangeTable - -#define AEGISLASH_MAIN_STAT (P_UPDATED_STATS >= GEN_8 ? 140 : 150) - - [SPECIES_AEGISLASH_SHIELD] = - { - AEGISLASH_MISC_INFO, + .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, .baseAttack = 50, .baseDefense = AEGISLASH_MAIN_STAT, @@ -2060,7 +2049,30 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AEGISLASH_BLADE] = { - AEGISLASH_MISC_INFO, + .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234,\ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_STANCE_CHANGE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Aegislash"), \ + .cryId = CRY_AEGISLASH, \ + .natDexNum = NATIONAL_DEX_AEGISLASH, \ + .categoryName = _("Royal Sword"), \ + .height = 17, \ + .weight = 530, \ + .pokemonScale = 259, \ + .pokemonOffset = 0, \ + .trainerScale = 290, \ + .trainerOffset = 1, \ + FOOTPRINT(Aegislash) \ + LEARNSETS(Aegislash), \ + .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ + .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, .baseAttack = AEGISLASH_MAIN_STAT, .baseDefense = 50, @@ -3178,7 +3190,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = {EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}), }, -#define SLIGGOO_MISC_INFO \ + [SPECIES_SLIGGOO] = + { .catchRate = 45, \ .expYield = 158, \ .evYield_SpDefense = 2, \ @@ -3193,11 +3206,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .cryId = CRY_SLIGGOO, \ .natDexNum = NATIONAL_DEX_SLIGGOO, \ FOOTPRINT(Sliggoo) \ - .formSpeciesIdTable = sSliggooFormSpeciesIdTable - - [SPECIES_SLIGGOO] = - { - SLIGGOO_MISC_INFO, + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .baseHP = 68, .baseAttack = 75, .baseDefense = 53, @@ -3232,7 +3241,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = {EVO_LEVEL_FOG, 50, SPECIES_GOODRA}), }, -#define GOODRA_MISC_INFO \ + [SPECIES_GOODRA] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ .evYield_SpDefense = 3, \ @@ -3246,11 +3256,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .cryId = CRY_GOODRA, \ .natDexNum = NATIONAL_DEX_GOODRA, \ FOOTPRINT(Goodra) \ - .formSpeciesIdTable = sGoodraFormSpeciesIdTable - - [SPECIES_GOODRA] = - { - GOODRA_MISC_INFO, + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .baseHP = 90, .baseAttack = 100, .baseDefense = 70, @@ -3286,7 +3292,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_SLIGGOO_HISUIAN] = { - SLIGGOO_MISC_INFO, + .catchRate = 45, \ + .expYield = 158, \ + .evYield_SpDefense = 2, \ + .itemRare = ITEM_SHED_SHELL, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Sliggoo"), \ + .cryId = CRY_SLIGGOO, \ + .natDexNum = NATIONAL_DEX_SLIGGOO, \ + FOOTPRINT(Sliggoo) \ + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .baseHP = 58, .baseAttack = 75, .baseDefense = 83, @@ -3324,7 +3344,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOODRA_HISUIAN] = { - GOODRA_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ + .evYield_SpDefense = 3, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = 35, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Goodra"), \ + .cryId = CRY_GOODRA, \ + .natDexNum = NATIONAL_DEX_GOODRA, \ + FOOTPRINT(Goodra) \ + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .baseHP = 80, .baseAttack = 100, .baseDefense = 100, @@ -3511,7 +3544,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_PHANTUMP #if P_FAMILY_PUMPKABOO -#define PUMPKABOO_MISC_INFO \ + [SPECIES_PUMPKABOO_AVERAGE] = + { .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ .catchRate = 120, \ .expYield = 67, \ @@ -3533,11 +3567,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = ICON(Pumpkaboo, 2), \ FOOTPRINT(Pumpkaboo) \ LEARNSETS(Pumpkaboo), \ - .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable - - [SPECIES_PUMPKABOO_AVERAGE] = - { - PUMPKABOO_MISC_INFO, + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 49, .baseAttack = 66, .baseDefense = 70, @@ -3566,7 +3596,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_SMALL] = { - PUMPKABOO_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 120, \ + .expYield = 67, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Pumpkaboo"), \ + .natDexNum = NATIONAL_DEX_PUMPKABOO, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Pumpkaboo, \ + .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ + PALETTES(Pumpkaboo), \ + ICON(Pumpkaboo, 2), \ + FOOTPRINT(Pumpkaboo) \ + LEARNSETS(Pumpkaboo), \ + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 44, .baseAttack = 66, .baseDefense = 70, @@ -3594,10 +3645,31 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_LARGE] = { - PUMPKABOO_MISC_INFO, - .baseHP = 54, - .baseAttack = 66, - .baseDefense = 70, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 120, \ + .expYield = 67, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Pumpkaboo"), \ + .natDexNum = NATIONAL_DEX_PUMPKABOO, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Pumpkaboo, \ + .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ + PALETTES(Pumpkaboo), \ + ICON(Pumpkaboo, 2), \ + FOOTPRINT(Pumpkaboo) \ + LEARNSETS(Pumpkaboo), \ + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, + .baseHP = 54, + .baseAttack = 66, + .baseDefense = 70, .baseSpeed = 46, .baseSpAttack = 44, .baseSpDefense = 55, @@ -3622,7 +3694,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_SUPER] = { - PUMPKABOO_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 120, \ + .expYield = 67, \ + .evYield_Defense = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Pumpkaboo"), \ + .natDexNum = NATIONAL_DEX_PUMPKABOO, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Pumpkaboo, \ + .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ + PALETTES(Pumpkaboo), \ + ICON(Pumpkaboo, 2), \ + FOOTPRINT(Pumpkaboo) \ + LEARNSETS(Pumpkaboo), \ + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 59, .baseAttack = 66, .baseDefense = 70, @@ -3650,7 +3743,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SUPER}), }, -#define GOURGEIST_MISC_INFO \ + [SPECIES_GOURGEIST_AVERAGE] = + { .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ .catchRate = 60, \ .expYield = 173, \ @@ -3672,11 +3766,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = ICON(Gourgeist, 2), \ FOOTPRINT(Gourgeist) \ LEARNSETS(Gourgeist), \ - .formSpeciesIdTable = sGourgeistFormSpeciesIdTable - - [SPECIES_GOURGEIST_AVERAGE] = - { - GOURGEIST_MISC_INFO, + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 65, .baseAttack = 90, .baseDefense = 122, @@ -3703,7 +3793,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_SMALL] = { - GOURGEIST_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 60, \ + .expYield = 173, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Gourgeist"), \ + .natDexNum = NATIONAL_DEX_GOURGEIST, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Gourgeist, \ + .frontAnimId = ANIM_SHRINK_GROW, \ + .backAnimId = BACK_ANIM_V_STRETCH, \ + PALETTES(Gourgeist), \ + ICON(Gourgeist, 2), \ + FOOTPRINT(Gourgeist) \ + LEARNSETS(Gourgeist), \ + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 55, .baseAttack = 85, .baseDefense = 122, @@ -3730,7 +3841,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_LARGE] = { - GOURGEIST_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 60, \ + .expYield = 173, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Gourgeist"), \ + .natDexNum = NATIONAL_DEX_GOURGEIST, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Gourgeist, \ + .frontAnimId = ANIM_SHRINK_GROW, \ + .backAnimId = BACK_ANIM_V_STRETCH, \ + PALETTES(Gourgeist), \ + ICON(Gourgeist, 2), \ + FOOTPRINT(Gourgeist) \ + LEARNSETS(Gourgeist), \ + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 75, .baseAttack = 95, .baseDefense = 122, @@ -3757,7 +3889,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_SUPER] = { - GOURGEIST_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ + .catchRate = 60, \ + .expYield = 173, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Gourgeist"), \ + .natDexNum = NATIONAL_DEX_GOURGEIST, \ + .categoryName = _("Pumpkin"), \ + .frontAnimFrames = sAnims_Gourgeist, \ + .frontAnimId = ANIM_SHRINK_GROW, \ + .backAnimId = BACK_ANIM_V_STRETCH, \ + PALETTES(Gourgeist), \ + ICON(Gourgeist, 2), \ + FOOTPRINT(Gourgeist) \ + LEARNSETS(Gourgeist), \ + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 85, .baseAttack = 100, .baseDefense = 122, @@ -3841,7 +3994,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}), }, -#define AVALUGG_MISC_INFO \ + [SPECIES_AVALUGG] = + { .catchRate = 55, \ .expYield = 180, \ .evYield_Defense = 2, \ @@ -3856,11 +4010,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_AVALUGG, \ .categoryName = _("Iceberg"), \ FOOTPRINT(Avalugg) \ - .formSpeciesIdTable = sAvaluggFormSpeciesIdTable - - [SPECIES_AVALUGG] = - { - AVALUGG_MISC_INFO, + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .baseHP = 95, .baseAttack = 117, .baseDefense = 184, @@ -3896,7 +4046,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_AVALUGG_HISUIAN] = { - AVALUGG_MISC_INFO, + .catchRate = 55, \ + .expYield = 180, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = BERGMITE_EGG_GROUPS, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Avalugg"), \ + .cryId = CRY_AVALUGG, \ + .natDexNum = NATIONAL_DEX_AVALUGG, \ + .categoryName = _("Iceberg"), \ + FOOTPRINT(Avalugg) \ + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .baseHP = 95, .baseAttack = 127, .baseDefense = 184, @@ -4037,7 +4201,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_NOIBAT #if P_FAMILY_XERNEAS -#define XERNEAS_MISC_INFO(Form) \ + [SPECIES_XERNEAS_NEUTRAL] = { \ .baseHP = 126, \ .baseAttack = 131, \ @@ -4067,24 +4231,67 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Xerneas##Form, 64, 64), \ + FRONT_PIC(XerneasNeutral, 64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Xerneas, \ .frontAnimId = ANIM_GROW_VIBRATE, \ - BACK_PIC(Xerneas##Form, 64, 64), \ + BACK_PIC(XerneasNeutral, 64, 64), \ .backPicYOffset = 0, \ .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ - PALETTES(Xerneas##Form), \ - ICON(Xerneas##Form, 0), \ + PALETTES(XerneasNeutral), \ + ICON(XerneasNeutral, 0), \ FOOTPRINT(Xerneas) \ LEARNSETS(Xerneas), \ .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ .formChangeTable = sXerneasFormChangeTable, \ .isLegendary = TRUE, \ - } + }, - [SPECIES_XERNEAS_NEUTRAL] = XERNEAS_MISC_INFO(Neutral), - [SPECIES_XERNEAS_ACTIVE] = XERNEAS_MISC_INFO(Active), + [SPECIES_XERNEAS_ACTIVE] = + { \ + .baseHP = 126, \ + .baseAttack = 131, \ + .baseDefense = 95, \ + .baseSpeed = 99, \ + .baseSpAttack = 131, \ + .baseSpDefense = 98, \ + .types = MON_TYPES(TYPE_FAIRY), \ + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_FAIRY_AURA, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Xerneas"), \ + .cryId = CRY_XERNEAS, \ + .natDexNum = NATIONAL_DEX_XERNEAS, \ + .categoryName = _("Life"), \ + .height = 30, \ + .weight = 2150, \ + .description = gXerneasPokedexText, \ + .pokemonScale = 275, \ + .pokemonOffset = 7, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(XerneasActive, 64, 64), \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Xerneas, \ + .frontAnimId = ANIM_GROW_VIBRATE, \ + BACK_PIC(XerneasActive, 64, 64), \ + .backPicYOffset = 0, \ + .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ + PALETTES(XerneasActive), \ + ICON(XerneasActive, 0), \ + FOOTPRINT(Xerneas) \ + LEARNSETS(Xerneas), \ + .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ + .formChangeTable = sXerneasFormChangeTable, \ + .isLegendary = TRUE, \ + }, #endif //P_FAMILY_XERNEAS #if P_FAMILY_YVELTAL @@ -4139,7 +4346,38 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_YVELTAL #if P_FAMILY_ZYGARDE -#define ZYGARDE_MISC_INFO(ability) \ + [SPECIES_ZYGARDE_50_AURA_BREAK] = + { \ + .baseHP = 108, \ + .baseAttack = 100, \ + .baseDefense = 121, \ + .baseSpeed = 95, \ + .baseSpAttack = 81, \ + .baseSpDefense = 95, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ + .bodyColor = BODY_COLOR_GREEN, \ + .cryId = CRY_ZYGARDE_50, \ + .height = 50, \ + .weight = 3050, \ + .description = gZygarde50PokedexText, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 721, \ + .trainerOffset = 19, \ + FRONT_PIC(Zygarde50, 64, 64), \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Zygarde50, \ + .frontAnimId = ANIM_TIP_MOVE_FORWARD, \ + BACK_PIC(Zygarde50, 64, 64), \ + .backPicYOffset = 4, \ + .backAnimId = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ + ? BACK_ANIM_SHAKE_GLOW_GREEN \ + : BACK_ANIM_V_STRETCH), \ + PALETTES(Zygarde50), \ + ICON(Zygarde50, 1), \ + .formChangeTable = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ + ? sZygarde50PowerConstructFormChangeTable \ + : sZygarde50AuraBreakFormChangeTable), \ .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ .catchRate = 3, \ .evYield_HP = 3, \ @@ -4148,7 +4386,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = 0, \ .growthRate = GROWTH_SLOW, \ .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ability, ABILITY_NONE }, \ + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, \ .noFlip = TRUE, \ .speciesName = _("Zygarde"), \ .natDexNum = NATIONAL_DEX_ZYGARDE, \ @@ -4156,9 +4394,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = FOOTPRINT(Zygarde) \ LEARNSETS(Zygarde), \ .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ - .isLegendary = TRUE - -#define ZYGARDE_50_SPECIES_INFO(ability) \ + .isLegendary = TRUE, \ + }, + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { \ .baseHP = 108, \ .baseAttack = 100, \ @@ -4182,18 +4420,84 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_TIP_MOVE_FORWARD, \ BACK_PIC(Zygarde50, 64, 64), \ .backPicYOffset = 4, \ - .backAnimId = (ability == ABILITY_POWER_CONSTRUCT \ + .backAnimId = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ ? BACK_ANIM_SHAKE_GLOW_GREEN \ : BACK_ANIM_V_STRETCH), \ PALETTES(Zygarde50), \ ICON(Zygarde50, 1), \ - .formChangeTable = (ability == ABILITY_POWER_CONSTRUCT \ + .formChangeTable = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ ? sZygarde50PowerConstructFormChangeTable \ : sZygarde50AuraBreakFormChangeTable), \ - ZYGARDE_MISC_INFO(ability), \ - } + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ + .catchRate = 3, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ + .noFlip = TRUE, \ + .speciesName = _("Zygarde"), \ + .natDexNum = NATIONAL_DEX_ZYGARDE, \ + .categoryName = _("Order"), \ + FOOTPRINT(Zygarde) \ + LEARNSETS(Zygarde), \ + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ + .isLegendary = TRUE, \ + }, + [SPECIES_ZYGARDE_10_AURA_BREAK] = + { \ + .baseHP = 54, \ + .baseAttack = 100, \ + .baseDefense = 71, \ + .baseSpeed = 115, \ + .baseSpAttack = 61, \ + .baseSpDefense = 85, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219,\ + .bodyColor = BODY_COLOR_BLACK, \ + .cryId = CRY_ZYGARDE_10, \ + .height = 12, \ + .weight = 335, \ + .description = gZygarde10PokedexText, \ + .pokemonScale = 256, \ + .pokemonOffset = 0, \ + .trainerScale = 721, \ + .trainerOffset = 19, \ + FRONT_PIC(Zygarde10, 56, 64), \ + .frontPicYOffset = 2, \ + .frontAnimFrames = sAnims_Zygarde10, \ + BACK_PIC(Zygarde10, 64, 56), \ + .backPicYOffset = 8, \ + .backAnimId = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ + ? BACK_ANIM_SHAKE_GLOW_GREEN \ + : BACK_ANIM_JOLT_RIGHT), \ + PALETTES(Zygarde10), \ + ICON(Zygarde10, 1), \ + .formChangeTable = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ + ? sZygarde10PowerConstructFormChangeTable \ + : sZygarde10AuraBreakFormChangeTable), \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ + .catchRate = 3, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, \ + .noFlip = TRUE, \ + .speciesName = _("Zygarde"), \ + .natDexNum = NATIONAL_DEX_ZYGARDE, \ + .categoryName = _("Order"), \ + FOOTPRINT(Zygarde) \ + LEARNSETS(Zygarde), \ + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ + .isLegendary = TRUE, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, + }, -#define ZYGARDE_10_SPECIES_INFO(ability) \ + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = { \ .baseHP = 54, \ .baseAttack = 100, \ @@ -4216,25 +4520,53 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Zygarde10, \ BACK_PIC(Zygarde10, 64, 56), \ .backPicYOffset = 8, \ - .backAnimId = (ability == ABILITY_POWER_CONSTRUCT \ + .backAnimId = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ ? BACK_ANIM_SHAKE_GLOW_GREEN \ : BACK_ANIM_JOLT_RIGHT), \ PALETTES(Zygarde10), \ ICON(Zygarde10, 1), \ - .formChangeTable = (ability == ABILITY_POWER_CONSTRUCT \ + .formChangeTable = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ ? sZygarde10PowerConstructFormChangeTable \ : sZygarde10AuraBreakFormChangeTable), \ - ZYGARDE_MISC_INFO(ability), \ - } - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ + .catchRate = 3, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ + .noFlip = TRUE, \ + .speciesName = _("Zygarde"), \ + .natDexNum = NATIONAL_DEX_ZYGARDE, \ + .categoryName = _("Order"), \ + FOOTPRINT(Zygarde) \ + LEARNSETS(Zygarde), \ + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ + .isLegendary = TRUE, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, + }, - [SPECIES_ZYGARDE_50_AURA_BREAK] = ZYGARDE_50_SPECIES_INFO(ABILITY_AURA_BREAK), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = ZYGARDE_50_SPECIES_INFO(ABILITY_POWER_CONSTRUCT), - [SPECIES_ZYGARDE_10_AURA_BREAK] = ZYGARDE_10_SPECIES_INFO(ABILITY_AURA_BREAK), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = ZYGARDE_10_SPECIES_INFO(ABILITY_POWER_CONSTRUCT), [SPECIES_ZYGARDE_COMPLETE] = { - ZYGARDE_MISC_INFO(ABILITY_POWER_CONSTRUCT), + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ + .catchRate = 3, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ + .noFlip = TRUE, \ + .speciesName = _("Zygarde"), \ + .natDexNum = NATIONAL_DEX_ZYGARDE, \ + .categoryName = _("Order"), \ + FOOTPRINT(Zygarde) \ + LEARNSETS(Zygarde), \ + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 216, .baseAttack = 100, .baseDefense = 121, @@ -4269,7 +4601,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_ZYGARDE #if P_FAMILY_DIANCIE -#define DIANCE_MISC_INFO \ + [SPECIES_DIANCIE] = + { .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), \ .catchRate = 3, \ .evYield_Defense = 1, \ @@ -4287,11 +4620,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = LEARNSETS(Diancie), \ .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ .formChangeTable = sDiancieFormChangeTable, \ - .isMythical = TRUE - - [SPECIES_DIANCIE] = - { - DIANCE_MISC_INFO, + .isMythical = TRUE, .baseHP = 50, .baseAttack = 100, .baseDefense = 150, @@ -4326,7 +4655,24 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_MEGA_EVOLUTIONS [SPECIES_DIANCIE_MEGA] = { - DIANCE_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), \ + .catchRate = 3, \ + .evYield_Defense = 1, \ + .evYield_SpDefense = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Diancie"), \ + .natDexNum = NATIONAL_DEX_DIANCIE, \ + .categoryName = _("Jewel"), \ + FOOTPRINT(Diancie) \ + LEARNSETS(Diancie), \ + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ + .formChangeTable = sDiancieFormChangeTable, \ + .isMythical = TRUE, .baseHP = 50, .baseAttack = 160, .baseDefense = 110, @@ -4362,7 +4708,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_DIANCIE #if P_FAMILY_HOOPA -#define HOOPA_MISC_INFO \ + [SPECIES_HOOPA_CONFINED] = + { .catchRate = 3, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ .evYield_SpAttack = 3, \ @@ -4377,11 +4724,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = FOOTPRINT(Hoopa) \ .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ .formChangeTable = sHoopaFormChangeTable, \ - .isMythical = TRUE - - [SPECIES_HOOPA_CONFINED] = - { - HOOPA_MISC_INFO, + .isMythical = TRUE, .baseHP = 80, .baseAttack = 110, .baseDefense = 60, @@ -4418,7 +4761,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_HOOPA_UNBOUND] = { - HOOPA_MISC_INFO, + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Hoopa"), \ + .natDexNum = NATIONAL_DEX_HOOPA, \ + FOOTPRINT(Hoopa) \ + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ + .formChangeTable = sHoopaFormChangeTable, \ + .isMythical = TRUE, .baseHP = 80, .baseAttack = 160, .baseDefense = 60, From b61b442e1a01c92704e925c01e1e8e61f0a75c76 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 19:01:55 -0300 Subject: [PATCH 10/23] Expanded Gen 7 macros --- src/data/pokemon/species_info/gen_7.h | 516 +++++++++++++++++++++----- 1 file changed, 420 insertions(+), 96 deletions(-) diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index 0cd8db377005..01a8a9627114 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -102,7 +102,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = {EVO_NONE, 0, SPECIES_DECIDUEYE_HISUIAN}), }, -#define DECIDUEYE_MISC_INFO \ + [SPECIES_DECIDUEYE] = + { .catchRate = 45, \ .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ .evYield_Attack = 3, \ @@ -122,11 +123,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 296, \ .trainerOffset = 1, \ FOOTPRINT(Decidueye) \ - .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable - - [SPECIES_DECIDUEYE] = - { - DECIDUEYE_MISC_INFO, + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .baseHP = 78, .baseAttack = 107, .baseDefense = 75, @@ -156,7 +153,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_HISUIAN_FORMS [SPECIES_DECIDUEYE_HISUIAN] = { - DECIDUEYE_MISC_INFO, + .catchRate = 45, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Decidueye"), \ + .cryId = CRY_DECIDUEYE, \ + .natDexNum = NATIONAL_DEX_DECIDUEYE, \ + .categoryName = _("Arrow Quill"), \ + .height = 16, \ + .pokemonScale = 259, \ + .pokemonOffset = 1, \ + .trainerScale = 296, \ + .trainerOffset = 1, \ + FOOTPRINT(Decidueye) \ + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .baseHP = 88, .baseAttack = 112, .baseDefense = 80, @@ -972,7 +988,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_CRABRAWLER #if P_FAMILY_ORICORIO -#define ORICORIO_MISC_INFO \ + [SPECIES_ORICORIO_BAILE] = + { .baseHP = 75, \ .baseAttack = 70, \ .baseDefense = 70, \ @@ -1003,12 +1020,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = FOOTPRINT(Oricorio) \ LEARNSETS(Oricorio), \ .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ - .formChangeTable = sOricorioFormChangeTable - //.backAnimId = BACK_ANIM_NONE, \ - - [SPECIES_ORICORIO_BAILE] = - { - ORICORIO_MISC_INFO, + .formChangeTable = sOricorioFormChangeTable, + //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .bodyColor = BODY_COLOR_RED, .cryId = CRY_ORICORIO_BAILE, @@ -1028,7 +1041,38 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_POM_POM] = { - ORICORIO_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 93, \ + .baseSpAttack = 98, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_HONEY, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ + .speciesName = _("Oricorio"), \ + .natDexNum = NATIONAL_DEX_ORICORIO, \ + .categoryName = _("Dancing"), \ + .height = 6, \ + .weight = 34, \ + .pokemonScale = 422, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Oricorio, \ + .backPicYOffset = 0, \ + FOOTPRINT(Oricorio) \ + LEARNSETS(Oricorio), \ + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .formChangeTable = sOricorioFormChangeTable, + //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_ORICORIO_POM_POM, @@ -1048,7 +1092,38 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_PAU] = { - ORICORIO_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 93, \ + .baseSpAttack = 98, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_HONEY, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ + .speciesName = _("Oricorio"), \ + .natDexNum = NATIONAL_DEX_ORICORIO, \ + .categoryName = _("Dancing"), \ + .height = 6, \ + .weight = 34, \ + .pokemonScale = 422, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Oricorio, \ + .backPicYOffset = 0, \ + FOOTPRINT(Oricorio) \ + LEARNSETS(Oricorio), \ + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .formChangeTable = sOricorioFormChangeTable, + //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), .bodyColor = BODY_COLOR_PINK, .cryId = CRY_ORICORIO_PAU, @@ -1068,7 +1143,38 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_SENSU] = { - ORICORIO_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 70, \ + .baseDefense = 70, \ + .baseSpeed = 93, \ + .baseSpAttack = 98, \ + .baseSpDefense = 70, \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpAttack = 2, \ + .itemRare = ITEM_HONEY, \ + .genderRatio = PERCENT_FEMALE(75), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ + .speciesName = _("Oricorio"), \ + .natDexNum = NATIONAL_DEX_ORICORIO, \ + .categoryName = _("Dancing"), \ + .height = 6, \ + .weight = 34, \ + .pokemonScale = 422, \ + .pokemonOffset = 12, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Oricorio, \ + .backPicYOffset = 0, \ + FOOTPRINT(Oricorio) \ + LEARNSETS(Oricorio), \ + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .formChangeTable = sOricorioFormChangeTable, + //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_GHOST, TYPE_FLYING), .bodyColor = BODY_COLOR_PURPLE, .cryId = CRY_ORICORIO_SENSU, @@ -1189,7 +1295,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_CUTIEFLY #if P_FAMILY_ROCKRUFF -#define ROCKRUFF_MISC_INFO \ + [SPECIES_ROCKRUFF] = + { .baseHP = 45, \ .baseAttack = 65, \ .baseDefense = 40, \ @@ -1225,11 +1332,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = ICON(Rockruff, 2), \ FOOTPRINT(Rockruff) \ LEARNSETS(Rockruff), \ - .formSpeciesIdTable = sRockruffFormSpeciesIdTable - - [SPECIES_ROCKRUFF] = - { - ROCKRUFF_MISC_INFO, + .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST }, FRONT_PIC(Rockruff, 37, 39), BACK_PIC(Rockruff, 64, 56), @@ -1240,7 +1343,42 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ROCKRUFF_OWN_TEMPO] = { - ROCKRUFF_MISC_INFO, + .baseHP = 45, \ + .baseAttack = 65, \ + .baseDefense = 40, \ + .baseSpeed = 60, \ + .baseSpAttack = 30, \ + .baseSpDefense = 40, \ + .types = MON_TYPES(TYPE_ROCK), \ + .catchRate = 190, \ + .expYield = 56, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_BROWN, \ + .speciesName = _("Rockruff"), \ + .cryId = CRY_ROCKRUFF, \ + .natDexNum = NATIONAL_DEX_ROCKRUFF, \ + .categoryName = _("Puppy"), \ + .height = 5, \ + .weight = 92, \ + .description = gRockruffPokedexText, \ + .pokemonScale = 432, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 11, \ + .frontAnimFrames = sAnims_Rockruff, \ + .frontAnimId = ANIM_V_STRETCH, \ + .backPicYOffset = 7, \ + PALETTES(Rockruff), \ + ICON(Rockruff, 2), \ + FOOTPRINT(Rockruff) \ + LEARNSETS(Rockruff), \ + .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE }, FRONT_PIC(Rockruff, 40, 48), BACK_PIC(Rockruff, 64, 56), @@ -1248,7 +1386,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .evolutions = EVOLUTION({EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}), }, -#define LYCANROC_MISC_INFO \ + [SPECIES_LYCANROC_MIDDAY] = + { .types = MON_TYPES(TYPE_ROCK), \ .catchRate = 90, \ .expYield = 170, \ @@ -1268,11 +1407,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, \ BACK_PIC(LycanrocMidday, 64, 56), \ FOOTPRINT(Lycanroc) \ - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable - - [SPECIES_LYCANROC_MIDDAY] = - { - LYCANROC_MISC_INFO, + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, .baseAttack = 115, .baseDefense = 65, @@ -1301,7 +1436,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_MIDNIGHT] = { - LYCANROC_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK), \ + .catchRate = 90, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Lycanroc"), \ + .natDexNum = NATIONAL_DEX_LYCANROC, \ + .categoryName = _("Wolf"), \ + .weight = 250, \ + .pokemonScale = 366, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + BACK_PIC(LycanrocMidday, 64, 56), \ + FOOTPRINT(Lycanroc) \ + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 85, .baseAttack = 115, .baseDefense = 75, @@ -1330,7 +1484,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_DUSK] = { - LYCANROC_MISC_INFO, + .types = MON_TYPES(TYPE_ROCK), \ + .catchRate = 90, \ + .expYield = 170, \ + .evYield_Attack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .speciesName = _("Lycanroc"), \ + .natDexNum = NATIONAL_DEX_LYCANROC, \ + .categoryName = _("Wolf"), \ + .weight = 250, \ + .pokemonScale = 366, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + BACK_PIC(LycanrocMidday, 64, 56), \ + FOOTPRINT(Lycanroc) \ + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, .baseAttack = 117, .baseDefense = 65, @@ -1359,7 +1532,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_ROCKRUFF #if P_FAMILY_WISHIWASHI -#define WISHIWASHI_MISC_INFO \ + [SPECIES_WISHIWASHI_SOLO] = + { .types = MON_TYPES(TYPE_WATER), \ .catchRate = 60, \ .evYield_HP = 1, \ @@ -1380,11 +1554,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = FOOTPRINT(Wishiwashi) \ LEARNSETS(Wishiwashi), \ .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ - .formChangeTable = sWishiwashiFormChangeTable - - [SPECIES_WISHIWASHI_SOLO] = - { - WISHIWASHI_MISC_INFO, + .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, .baseAttack = 20, .baseDefense = 20, @@ -1414,7 +1584,27 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_WISHIWASHI_SCHOOL] = { - WISHIWASHI_MISC_INFO, + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 60, \ + .evYield_HP = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Wishiwashi"), \ + .natDexNum = NATIONAL_DEX_WISHIWASHI, \ + .categoryName = _("Small Fry"), \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Wishiwashi) \ + LEARNSETS(Wishiwashi), \ + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ + .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, .baseAttack = 140, .baseDefense = 130, @@ -2769,33 +2959,33 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_V_SHAKE, \ BACK_PIC(Silvally, 56, 64), \ .backPicYOffset = 0, \ - PALETTES(palette), \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + PALETTES(Silvally##palette), \ ICON(Silvally, 0), \ FOOTPRINT(Silvally) \ LEARNSETS(Silvally), \ .formSpeciesIdTable = sSilvallyFormSpeciesIdTable, \ .formChangeTable = sSilvallyFormChangeTable, \ } - //.backAnimId = BACK_ANIM_NONE, - [SPECIES_SILVALLY_NORMAL] = SILVALLY_SPECIES_INFO(TYPE_NORMAL, SilvallyNormal), - [SPECIES_SILVALLY_FIGHTING] = SILVALLY_SPECIES_INFO(TYPE_FIGHTING, SilvallyFighting), - [SPECIES_SILVALLY_FLYING] = SILVALLY_SPECIES_INFO(TYPE_FLYING, SilvallyFlying), - [SPECIES_SILVALLY_POISON] = SILVALLY_SPECIES_INFO(TYPE_POISON, SilvallyPoison), - [SPECIES_SILVALLY_GROUND] = SILVALLY_SPECIES_INFO(TYPE_GROUND, SilvallyGround), - [SPECIES_SILVALLY_ROCK] = SILVALLY_SPECIES_INFO(TYPE_ROCK, SilvallyRock), - [SPECIES_SILVALLY_BUG] = SILVALLY_SPECIES_INFO(TYPE_BUG, SilvallyBug), - [SPECIES_SILVALLY_GHOST] = SILVALLY_SPECIES_INFO(TYPE_GHOST, SilvallyGhost), - [SPECIES_SILVALLY_STEEL] = SILVALLY_SPECIES_INFO(TYPE_STEEL, SilvallySteel), - [SPECIES_SILVALLY_FIRE] = SILVALLY_SPECIES_INFO(TYPE_FIRE, SilvallyFire), - [SPECIES_SILVALLY_WATER] = SILVALLY_SPECIES_INFO(TYPE_WATER, SilvallyWater), - [SPECIES_SILVALLY_GRASS] = SILVALLY_SPECIES_INFO(TYPE_GRASS, SilvallyGrass), - [SPECIES_SILVALLY_ELECTRIC] = SILVALLY_SPECIES_INFO(TYPE_ELECTRIC, SilvallyElectric), - [SPECIES_SILVALLY_PSYCHIC] = SILVALLY_SPECIES_INFO(TYPE_PSYCHIC, SilvallyPsychic), - [SPECIES_SILVALLY_ICE] = SILVALLY_SPECIES_INFO(TYPE_ICE, SilvallyIce), - [SPECIES_SILVALLY_DRAGON] = SILVALLY_SPECIES_INFO(TYPE_DRAGON, SilvallyDragon), - [SPECIES_SILVALLY_DARK] = SILVALLY_SPECIES_INFO(TYPE_DARK, SilvallyDark), - [SPECIES_SILVALLY_FAIRY] = SILVALLY_SPECIES_INFO(TYPE_FAIRY, SilvallyFairy), + [SPECIES_SILVALLY_NORMAL] = SILVALLY_SPECIES_INFO(TYPE_NORMAL, Normal), + [SPECIES_SILVALLY_FIGHTING] = SILVALLY_SPECIES_INFO(TYPE_FIGHTING, Fighting), + [SPECIES_SILVALLY_FLYING] = SILVALLY_SPECIES_INFO(TYPE_FLYING, Flying), + [SPECIES_SILVALLY_POISON] = SILVALLY_SPECIES_INFO(TYPE_POISON, Poison), + [SPECIES_SILVALLY_GROUND] = SILVALLY_SPECIES_INFO(TYPE_GROUND, Ground), + [SPECIES_SILVALLY_ROCK] = SILVALLY_SPECIES_INFO(TYPE_ROCK, Rock), + [SPECIES_SILVALLY_BUG] = SILVALLY_SPECIES_INFO(TYPE_BUG, Bug), + [SPECIES_SILVALLY_GHOST] = SILVALLY_SPECIES_INFO(TYPE_GHOST, Ghost), + [SPECIES_SILVALLY_STEEL] = SILVALLY_SPECIES_INFO(TYPE_STEEL, Steel), + [SPECIES_SILVALLY_FIRE] = SILVALLY_SPECIES_INFO(TYPE_FIRE, Fire), + [SPECIES_SILVALLY_WATER] = SILVALLY_SPECIES_INFO(TYPE_WATER, Water), + [SPECIES_SILVALLY_GRASS] = SILVALLY_SPECIES_INFO(TYPE_GRASS, Grass), + [SPECIES_SILVALLY_ELECTRIC] = SILVALLY_SPECIES_INFO(TYPE_ELECTRIC, Electric), + [SPECIES_SILVALLY_PSYCHIC] = SILVALLY_SPECIES_INFO(TYPE_PSYCHIC, Psychic), + [SPECIES_SILVALLY_ICE] = SILVALLY_SPECIES_INFO(TYPE_ICE, Ice), + [SPECIES_SILVALLY_DRAGON] = SILVALLY_SPECIES_INFO(TYPE_DRAGON, Dragon), + [SPECIES_SILVALLY_DARK] = SILVALLY_SPECIES_INFO(TYPE_DARK, Dark), + [SPECIES_SILVALLY_FAIRY] = SILVALLY_SPECIES_INFO(TYPE_FAIRY, Fairy), #endif //P_FAMILY_TYPE_NULL #if P_FAMILY_MINIOR @@ -2843,12 +3033,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 17, \ BACK_PIC(MiniorMeteor, 56, 40), \ .backPicYOffset = 14, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ PALETTES(MiniorMeteor), \ ICON(MiniorMeteor, 0), \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(BODY_COLOR_BROWN), \ } - //.backAnimId = BACK_ANIM_NONE, #define MINIOR_CORE_SPECIES_INFO(Form, color, iconPal) \ { \ @@ -2867,13 +3057,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 17, \ BACK_PIC(MiniorCore, 56, 40), \ .backPicYOffset = 15, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_MiniorCore##Form, \ .shinyPalette = gMonShinyPalette_MiniorCore, \ ICON(MiniorCore##Form, iconPal), \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(color), \ } - //.backAnimId = BACK_ANIM_NONE, [SPECIES_MINIOR_METEOR_RED] = MINIOR_METEOR_SPECIES_INFO(Red), [SPECIES_MINIOR_METEOR_ORANGE] = MINIOR_METEOR_SPECIES_INFO(Orange), @@ -3041,7 +3231,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_TOGEDEMARU #if P_FAMILY_MIMIKYU -#define MIMIKYU_MISC_INFO \ + [SPECIES_MIMIKYU_DISGUISED] = + { .baseHP = 55, \ .baseAttack = 90, \ .baseDefense = 80, \ @@ -3073,11 +3264,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = FOOTPRINT(Mimikyu) \ LEARNSETS(Mimikyu), \ .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ - .formChangeTable = sMimikyuFormChangeTable - - [SPECIES_MIMIKYU_DISGUISED] = - { - MIMIKYU_MISC_INFO, + .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( "A lonely Pokémon, it hides its terrifying\n" "appearance beneath an old rag so it can\n" @@ -3096,7 +3283,38 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_MIMIKYU_BUSTED] = { - MIMIKYU_MISC_INFO, + .baseHP = 55, \ + .baseAttack = 90, \ + .baseDefense = 80, \ + .baseSpeed = 96, \ + .baseSpAttack = 50, \ + .baseSpDefense = 105, \ + .types = MON_TYPES(TYPE_GHOST, TYPE_FAIRY), \ + .catchRate = 45, \ + .expYield = 167, \ + .evYield_SpDefense = 2, \ + .itemRare = ITEM_CHESTO_BERRY, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_DISGUISE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Mimikyu"), \ + .cryId = CRY_MIMIKYU, \ + .natDexNum = NATIONAL_DEX_MIMIKYU, \ + .categoryName = _("Disguise"), \ + .height = 2, \ + .weight = 7, \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Mimikyu) \ + LEARNSETS(Mimikyu), \ + .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ + .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( "After going to all the effort of\n" "disguising itself, its neck was\n" @@ -4177,7 +4395,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_GUZZLORD #if P_FAMILY_NECROZMA -#define NECROZMA_MISC_INFO \ + [SPECIES_NECROZMA] = + { .genderRatio = MON_GENDERLESS, \ .eggCycles = 120, \ .friendship = 0, \ @@ -4194,11 +4413,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = FOOTPRINT(Necrozma) \ LEARNSETS(Necrozma), \ .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ - .isLegendary = TRUE - - [SPECIES_NECROZMA] = - { - NECROZMA_MISC_INFO, + .isLegendary = TRUE, .baseHP = 97, .baseAttack = 107, .baseDefense = 101, @@ -4235,7 +4450,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FUSION_FORMS [SPECIES_NECROZMA_DUSK_MANE] = { - NECROZMA_MISC_INFO, + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .noFlip = TRUE, \ + .speciesName = _("Necrozma"), \ + .natDexNum = NATIONAL_DEX_NECROZMA, \ + .categoryName = _("Prism"), \ + .pokemonScale = 256, \ + .pokemonOffset = 3, \ + .trainerScale = 369, \ + .trainerOffset = 7, \ + FOOTPRINT(Necrozma) \ + LEARNSETS(Necrozma), \ + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 97, .baseAttack = 157, .baseDefense = 127, @@ -4271,7 +4502,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_NECROZMA_DAWN_WINGS] = { - NECROZMA_MISC_INFO, + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .noFlip = TRUE, \ + .speciesName = _("Necrozma"), \ + .natDexNum = NATIONAL_DEX_NECROZMA, \ + .categoryName = _("Prism"), \ + .pokemonScale = 256, \ + .pokemonOffset = 3, \ + .trainerScale = 369, \ + .trainerOffset = 7, \ + FOOTPRINT(Necrozma) \ + LEARNSETS(Necrozma), \ + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 97, .baseAttack = 113, .baseDefense = 109, @@ -4309,7 +4556,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_ULTRA_BURST_FORMS [SPECIES_NECROZMA_ULTRA] = { - NECROZMA_MISC_INFO, + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .noFlip = TRUE, \ + .speciesName = _("Necrozma"), \ + .natDexNum = NATIONAL_DEX_NECROZMA, \ + .categoryName = _("Prism"), \ + .pokemonScale = 256, \ + .pokemonOffset = 3, \ + .trainerScale = 369, \ + .trainerOffset = 7, \ + FOOTPRINT(Necrozma) \ + LEARNSETS(Necrozma), \ + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 97, .baseAttack = 167, .baseDefense = 97, @@ -4350,7 +4613,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #endif //P_FAMILY_NECROZMA #if P_FAMILY_MAGEARNA -#define MAGEARNA_MISC_INFO(Form) \ + [SPECIES_MAGEARNA] = + { .baseHP = 80, \ .baseAttack = 95, \ .baseDefense = 115, \ @@ -4377,23 +4641,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, \ .trainerScale = 257, \ .trainerOffset = 0, \ - FRONT_PIC(Form, 56, 64), \ + FRONT_PIC(Magearna, 56, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Magearna, \ .frontAnimId = ANIM_H_SLIDE_SLOW, \ - BACK_PIC(Form, 64, 56), \ + BACK_PIC(Magearna, 64, 56), \ .backPicYOffset = 4, \ - PALETTES(Form), \ - ICON(Form, 0), \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + PALETTES(Magearna), \ + ICON(Magearna, 0), \ FOOTPRINT(Magearna) \ LEARNSETS(Magearna), \ .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ - .isMythical = TRUE - //.backAnimId = BACK_ANIM_NONE, - - [SPECIES_MAGEARNA] = - { - MAGEARNA_MISC_INFO(Magearna), + .isMythical = TRUE, .bodyColor = BODY_COLOR_GRAY, .description = COMPOUND_STRING( "This artificial Pokémon, constructed more\n" @@ -4403,7 +4663,45 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { - MAGEARNA_MISC_INFO(MagearnaOriginalColor), + .baseHP = 80, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 65, \ + .baseSpAttack = 130, \ + .baseSpDefense = 115, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, \ + .speciesName = _("Magearna"), \ + .cryId = CRY_MAGEARNA, \ + .natDexNum = NATIONAL_DEX_MAGEARNA, \ + .categoryName = _("Artificial"), \ + .height = 10, \ + .weight = 805, \ + .pokemonScale = 305, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + FRONT_PIC(MagearnaOriginalColor, 56, 64), \ + .frontPicYOffset = 0, \ + .frontAnimFrames = sAnims_Magearna, \ + .frontAnimId = ANIM_H_SLIDE_SLOW, \ + BACK_PIC(MagearnaOriginalColor, 64, 56), \ + .backPicYOffset = 4, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + PALETTES(MagearnaOriginalColor), \ + ICON(MagearnaOriginalColor, 0), \ + FOOTPRINT(Magearna) \ + LEARNSETS(Magearna), \ + .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ + .isMythical = TRUE, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( "This is its form from almost 500\n" @@ -4761,7 +5059,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = LEARNSETS(Meltan), }, -#define MELMETAL_MISC_INFO \ + [SPECIES_MELMETAL] = + { .baseHP = 135, \ .baseAttack = 143, \ .baseDefense = 143, \ @@ -4791,11 +5090,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = LEARNSETS(Melmetal), \ .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ .formChangeTable = sMelmetalFormChangeTable, \ - .isMythical = TRUE - - [SPECIES_MELMETAL] = - { - MELMETAL_MISC_INFO, + .isMythical = TRUE, .height = 25, .weight = 800, .description = COMPOUND_STRING( @@ -4816,7 +5111,36 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_GIGANTAMAX_FORMS [SPECIES_MELMETAL_GIGANTAMAX] = { - MELMETAL_MISC_INFO, + .baseHP = 135, \ + .baseAttack = 143, \ + .baseDefense = 143, \ + .baseSpeed = 34, \ + .baseSpAttack = 80, \ + .baseSpDefense = 65, \ + .types = MON_TYPES(TYPE_STEEL), \ + .catchRate = 3, \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_IRON_FIST, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Melmetal"), \ + .cryId = CRY_MELMETAL, \ + .natDexNum = NATIONAL_DEX_MELMETAL, \ + .categoryName = _("Hex Nut"), \ + .pokemonScale = 257, \ + .pokemonOffset = 10, \ + .trainerScale = 423, \ + .trainerOffset = 8, \ + FOOTPRINT(Melmetal) \ + LEARNSETS(Melmetal), \ + .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ + .formChangeTable = sMelmetalFormChangeTable, \ + .isMythical = TRUE, .isGigantamax = TRUE, .height = 250, .weight = 0, From 08dad134ba4679a3a7dc38a8f50a7f6485e12dfe Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 20:59:11 -0300 Subject: [PATCH 11/23] Expanded Gen 8&9 macros --- src/data/pokemon/species_info/gen_8.h | 1215 ++++++++++++++++++++----- src/data/pokemon/species_info/gen_9.h | 508 +++++++++-- 2 files changed, 1391 insertions(+), 332 deletions(-) diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index efd5077297cb..3e431b46e23f 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -99,7 +99,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_RILLABOOM}), }, -#define RILLABOOM_MISC_INFO \ + [SPECIES_RILLABOOM] = + { .baseHP = 100, \ .baseAttack = 125, \ .baseDefense = 90, \ @@ -124,11 +125,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Rillaboom) \ LEARNSETS(Rillaboom), \ .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ - .formChangeTable = sRillaboomFormChangeTable - - [SPECIES_RILLABOOM] = - { - RILLABOOM_MISC_INFO, + .formChangeTable = sRillaboomFormChangeTable, .height = 21, .weight = 900, .pokemonScale = 256, @@ -153,7 +150,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_RILLABOOM_GIGANTAMAX] = { - RILLABOOM_MISC_INFO, + .baseHP = 100, \ + .baseAttack = 125, \ + .baseDefense = 90, \ + .baseSpeed = 85, \ + .baseSpAttack = 60, \ + .baseSpDefense = 70, \ + .types = MON_TYPES(TYPE_GRASS), \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), \ + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Rillaboom"), \ + .cryId = CRY_RILLABOOM, \ + .natDexNum = NATIONAL_DEX_RILLABOOM, \ + .categoryName = _("Drummer"), \ + FOOTPRINT(Rillaboom) \ + LEARNSETS(Rillaboom), \ + .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ + .formChangeTable = sRillaboomFormChangeTable, .height = 280, .weight = 0, .pokemonScale = 256, @@ -274,7 +295,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_CINDERACE}), }, -#define CINDERACE_MISC_INFO \ + [SPECIES_CINDERACE] = + { .baseHP = 80, \ .baseAttack = 116, \ .baseDefense = 75, \ @@ -299,11 +321,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Cinderace) \ LEARNSETS(Cinderace), \ .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ - .formChangeTable = sCinderaceFormChangeTable - - [SPECIES_CINDERACE] = - { - CINDERACE_MISC_INFO, + .formChangeTable = sCinderaceFormChangeTable, .height = 14, .weight = 330, .description = COMPOUND_STRING( @@ -329,7 +347,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CINDERACE_GIGANTAMAX] = { - CINDERACE_MISC_INFO, + .baseHP = 80, \ + .baseAttack = 116, \ + .baseDefense = 75, \ + .baseSpeed = 119, \ + .baseSpAttack = 65, \ + .baseSpDefense = 75, \ + .types = MON_TYPES(TYPE_FIRE), \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Cinderace"), \ + .cryId = CRY_CINDERACE, \ + .natDexNum = NATIONAL_DEX_CINDERACE, \ + .categoryName = _("Striker"), \ + FOOTPRINT(Cinderace) \ + LEARNSETS(Cinderace), \ + .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ + .formChangeTable = sCinderaceFormChangeTable, .height = 270, .weight = 0, .description = COMPOUND_STRING( @@ -452,7 +494,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_INTELEON}), }, -#define INTELEON_MISC_INFO \ + [SPECIES_INTELEON] = + { .baseHP = 70, \ .baseAttack = 85, \ .baseDefense = 65, \ @@ -477,11 +520,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Inteleon) \ LEARNSETS(Inteleon), \ .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ - .formChangeTable = sInteleonFormChangeTable - - [SPECIES_INTELEON] = - { - INTELEON_MISC_INFO, + .formChangeTable = sInteleonFormChangeTable, .height = 19, .weight = 452, .description = COMPOUND_STRING( @@ -507,7 +546,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_INTELEON_GIGANTAMAX] = { - INTELEON_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 65, \ + .baseSpeed = 120, \ + .baseSpAttack = 125, \ + .baseSpDefense = 65, \ + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 45, \ + .expYield = 265, \ + .evYield_Speed = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Inteleon"), \ + .cryId = CRY_INTELEON, \ + .natDexNum = NATIONAL_DEX_INTELEON, \ + .categoryName = _("Secret Agent"), \ + FOOTPRINT(Inteleon) \ + LEARNSETS(Inteleon), \ + .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ + .formChangeTable = sInteleonFormChangeTable, .height = 400, .weight = 0, .description = COMPOUND_STRING( @@ -729,7 +792,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CORVIKNIGHT}), }, -#define CORVIKNIGHT_MISC_INFO \ + [SPECIES_CORVIKNIGHT] = + { .baseHP = 98, \ .baseAttack = 87, \ .baseDefense = 105, \ @@ -754,11 +818,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Corviknight) \ LEARNSETS(Corviknight), \ .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ - .formChangeTable = sCorviknightFormChangeTable - - [SPECIES_CORVIKNIGHT] = - { - CORVIKNIGHT_MISC_INFO, + .formChangeTable = sCorviknightFormChangeTable, .height = 22, .weight = 750, .description = COMPOUND_STRING( @@ -784,7 +844,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { - CORVIKNIGHT_MISC_INFO, + .baseHP = 98, \ + .baseAttack = 87, \ + .baseDefense = 105, \ + .baseSpeed = 67, \ + .baseSpAttack = 53, \ + .baseSpDefense = 85, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Corviknigh"), \ + .cryId = CRY_CORVIKNIGHT, \ + .natDexNum = NATIONAL_DEX_CORVIKNIGHT, \ + .categoryName = _("Raven"), \ + FOOTPRINT(Corviknight) \ + LEARNSETS(Corviknight), \ + .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ + .formChangeTable = sCorviknightFormChangeTable, .height = 140, .weight = 0, .description = COMPOUND_STRING( @@ -908,7 +992,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ORBEETLE}), }, -#define ORBEETLE_MISC_INFO \ + [SPECIES_ORBEETLE] = + { .baseHP = 60, \ .baseAttack = 45, \ .baseDefense = 110, \ @@ -934,11 +1019,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Orbeetle) \ LEARNSETS(Orbeetle), \ .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ - .formChangeTable = sOrbeetleFormChangeTable - - [SPECIES_ORBEETLE] = - { - ORBEETLE_MISC_INFO, + .formChangeTable = sOrbeetleFormChangeTable, .height = 4, .weight = 408, .description = COMPOUND_STRING( @@ -965,7 +1046,32 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_ORBEETLE_GIGANTAMAX] = { - ORBEETLE_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 45, \ + .baseDefense = 110, \ + .baseSpeed = 90, \ + .baseSpAttack = 80, \ + .baseSpDefense = 120, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Orbeetle"), \ + .cryId = CRY_ORBEETLE, \ + .natDexNum = NATIONAL_DEX_ORBEETLE, \ + .categoryName = _("Seven Spot"), \ + FOOTPRINT(Orbeetle) \ + LEARNSETS(Orbeetle), \ + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ + .formChangeTable = sOrbeetleFormChangeTable, .height = 140, .weight = 0, .description = COMPOUND_STRING( @@ -1330,7 +1436,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}), }, -#define DREDNAW_MISC_INFO \ + [SPECIES_DREDNAW] = + { .baseHP = 90, \ .baseAttack = 115, \ .baseDefense = 90, \ @@ -1355,11 +1462,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Drednaw) \ LEARNSETS(Drednaw), \ .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ - .formChangeTable = sDrednawFormChangeTable - - [SPECIES_DREDNAW] = - { - DREDNAW_MISC_INFO, + .formChangeTable = sDrednawFormChangeTable, .height = 10, .weight = 1155, .description = COMPOUND_STRING( @@ -1384,7 +1487,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_DREDNAW_GIGANTAMAX] = { - DREDNAW_MISC_INFO, + .baseHP = 90, \ + .baseAttack = 115, \ + .baseDefense = 90, \ + .baseSpeed = 74, \ + .baseSpAttack = 48, \ + .baseSpDefense = 68, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ + .abilities = { ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Drednaw"), \ + .cryId = CRY_DREDNAW, \ + .natDexNum = NATIONAL_DEX_DREDNAW, \ + .categoryName = _("Bite"), \ + FOOTPRINT(Drednaw) \ + LEARNSETS(Drednaw), \ + .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ + .formChangeTable = sDrednawFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -1603,7 +1730,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COALOSSAL}), }, -#define COALOSSAL_MISC_INFO \ + [SPECIES_COALOSSAL] = + { .baseHP = 110, \ .baseAttack = 80, \ .baseDefense = 120, \ @@ -1628,11 +1756,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Coalossal) \ LEARNSETS(Coalossal), \ .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ - .formChangeTable = sCoalossalFormChangeTable - - [SPECIES_COALOSSAL] = - { - COALOSSAL_MISC_INFO, + .formChangeTable = sCoalossalFormChangeTable, .height = 28, .weight = 3105, .description = COMPOUND_STRING( @@ -1658,7 +1782,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_COALOSSAL_GIGANTAMAX] = { - COALOSSAL_MISC_INFO, + .baseHP = 110, \ + .baseAttack = 80, \ + .baseDefense = 120, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 90, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE }, \ + .bodyColor = BODY_COLOR_BLACK, \ + .speciesName = _("Coalossal"), \ + .cryId = CRY_COALOSSAL, \ + .natDexNum = NATIONAL_DEX_COALOSSAL, \ + .categoryName = _("Coal"), \ + FOOTPRINT(Coalossal) \ + LEARNSETS(Coalossal), \ + .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ + .formChangeTable = sCoalossalFormChangeTable, .height = 420, .weight = 0, .description = COMPOUND_STRING( @@ -1736,7 +1884,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = {EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}), }, -#define FLAPPLE_MISC_INFO \ + [SPECIES_FLAPPLE] = + { .baseHP = 70, \ .baseAttack = 110, \ .baseDefense = 80, \ @@ -1761,11 +1910,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Flapple) \ LEARNSETS(Flapple), \ .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ - .formChangeTable = sFlappleFormChangeTable - - [SPECIES_FLAPPLE] = - { - FLAPPLE_MISC_INFO, + .formChangeTable = sFlappleFormChangeTable, .height = 3, .weight = 10, .description = COMPOUND_STRING( @@ -1791,7 +1936,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_FLAPPLE_GIGANTAMAX] = { - FLAPPLE_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 110, \ + .baseDefense = 80, \ + .baseSpeed = 70, \ + .baseSpAttack = 95, \ + .baseSpDefense = 60, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Flapple"), \ + .cryId = CRY_FLAPPLE, \ + .natDexNum = NATIONAL_DEX_FLAPPLE, \ + .categoryName = _("Apple Wing"), \ + FOOTPRINT(Flapple) \ + LEARNSETS(Flapple), \ + .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ + .formChangeTable = sFlappleFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -1816,7 +1985,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = }, #endif //P_GIGANTAMAX_FORMS -#define APPLETUN_MISC_INFO \ + [SPECIES_APPLETUN] = + { .baseHP = 110, \ .baseAttack = 85, \ .baseDefense = 80, \ @@ -1841,11 +2011,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Appletun) \ LEARNSETS(Appletun), \ .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ - .formChangeTable = sAppletunFormChangeTable - - [SPECIES_APPLETUN] = - { - APPLETUN_MISC_INFO, + .formChangeTable = sAppletunFormChangeTable, .height = 4, .weight = 130, .description = COMPOUND_STRING( @@ -1870,25 +2036,49 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_APPLETUN_GIGANTAMAX] = { - APPLETUN_MISC_INFO, - .height = 240, - .weight = 0, - .description = COMPOUND_STRING( - "Due to Gigantamax energy, this\n" - "Pokémon's nectar has thickened. The\n" - "increased viscosity lets the nectar\n" - "absorb more damage than before."), - .pokemonScale = 491, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FRONT_PIC(AppletunGigantamax, 64, 64), - .frontPicYOffset = 3, - .frontAnimFrames = sAnims_AppletunGigantamax, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AppletunGigantamax, 64, 64), - .backPicYOffset = 2, - //.backAnimId = BACK_ANIM_NONE, + .baseHP = 110, \ + .baseAttack = 85, \ + .baseDefense = 80, \ + .baseSpeed = 30, \ + .baseSpAttack = 100, \ + .baseSpDefense = 80, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Appletun"), \ + .cryId = CRY_APPLETUN, \ + .natDexNum = NATIONAL_DEX_APPLETUN, \ + .categoryName = _("Apple Nectar"), \ + FOOTPRINT(Appletun) \ + LEARNSETS(Appletun), \ + .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ + .formChangeTable = sAppletunFormChangeTable, + .height = 240, + .weight = 0, + .description = COMPOUND_STRING( + "Due to Gigantamax energy, this\n" + "Pokémon's nectar has thickened. The\n" + "increased viscosity lets the nectar\n" + "absorb more damage than before."), + .pokemonScale = 491, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(AppletunGigantamax, 64, 64), + .frontPicYOffset = 3, + .frontAnimFrames = sAnims_AppletunGigantamax, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(AppletunGigantamax, 64, 64), + .backPicYOffset = 2, + //.backAnimId = BACK_ANIM_NONE, PALETTES(AppletunGigantamax), ICON(AppletunGigantamax, 1), .isGigantamax = TRUE, @@ -2040,7 +2230,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}), }, -#define SANDACONDA_MISC_INFO \ + [SPECIES_SANDACONDA] = + { .baseHP = 72, \ .baseAttack = 107, \ .baseDefense = 125, \ @@ -2065,11 +2256,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Sandaconda) \ LEARNSETS(Sandaconda), \ .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ - .formChangeTable = sSandacondaFormChangeTable - - [SPECIES_SANDACONDA] = - { - SANDACONDA_MISC_INFO, + .formChangeTable = sSandacondaFormChangeTable, .height = 38, .weight = 655, .description = COMPOUND_STRING( @@ -2095,7 +2282,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_SANDACONDA_GIGANTAMAX] = { - SANDACONDA_MISC_INFO, + .baseHP = 72, \ + .baseAttack = 107, \ + .baseDefense = 125, \ + .baseSpeed = 71, \ + .baseSpAttack = 65, \ + .baseSpDefense = 70, \ + .types = MON_TYPES(TYPE_GROUND), \ + .catchRate = 120, \ + .expYield = 179, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), \ + .abilities = { ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Sandaconda"), \ + .cryId = CRY_SANDACONDA, \ + .natDexNum = NATIONAL_DEX_SANDACONDA, \ + .categoryName = _("Sand Snake"), \ + FOOTPRINT(Sandaconda) \ + LEARNSETS(Sandaconda), \ + .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ + .formChangeTable = sSandacondaFormChangeTable, .height = 220, .weight = 0, .description = COMPOUND_STRING( @@ -2122,7 +2333,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_SILICOBRA #if P_FAMILY_CRAMORANT -#define CRAMORANT_MISC_INFO \ + [SPECIES_CRAMORANT] = + { .baseHP = 70, \ .baseAttack = 85, \ .baseDefense = 55, \ @@ -2153,11 +2365,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Cramorant) \ LEARNSETS(Cramorant), \ .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ - .formChangeTable = sCramorantFormChangeTable - - [SPECIES_CRAMORANT] = - { - CRAMORANT_MISC_INFO, + .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "It's so strong that it can knock out some\n" "opponents in a single hit, but it also may\n" @@ -2175,7 +2383,37 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CRAMORANT_GULPING] = { - CRAMORANT_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 55, \ + .baseSpeed = 85, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), \ + .catchRate = 45, \ + .expYield = 166, \ + .evYield_SpDefense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),\ + .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Cramorant"), \ + .cryId = CRY_CRAMORANT, \ + .natDexNum = NATIONAL_DEX_CRAMORANT, \ + .categoryName = _("Gulp"), \ + .height = 8, \ + .weight = 180, \ + .pokemonScale = 366, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + FOOTPRINT(Cramorant) \ + LEARNSETS(Cramorant), \ + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ + .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "Cramorant's gluttony led it to try\n" "to swallow an Arrokuda whole, which\n" @@ -2194,7 +2432,37 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CRAMORANT_GORGING] = { - CRAMORANT_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 85, \ + .baseDefense = 55, \ + .baseSpeed = 85, \ + .baseSpAttack = 85, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), \ + .catchRate = 45, \ + .expYield = 166, \ + .evYield_SpDefense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),\ + .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Cramorant"), \ + .cryId = CRY_CRAMORANT, \ + .natDexNum = NATIONAL_DEX_CRAMORANT, \ + .categoryName = _("Gulp"), \ + .height = 8, \ + .weight = 180, \ + .pokemonScale = 366, \ + .pokemonOffset = 7, \ + .trainerScale = 257, \ + .trainerOffset = 0, \ + FOOTPRINT(Cramorant) \ + LEARNSETS(Cramorant), \ + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ + .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "This Cramorant has accidentally\n" "gotten a Pikachu lodged in its gullet.\n" @@ -2359,7 +2627,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}), }, -#define TOXTRICITY_MISC_INFO \ + [SPECIES_TOXTRICITY_AMPED] = + { .baseHP = 75, \ .baseAttack = 98, \ .baseDefense = 70, \ @@ -2380,11 +2649,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_TOXTRICITY, \ .categoryName = _("Punk"), \ .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ - .formChangeTable = sToxtricityAmpedFormChangeTable - - [SPECIES_TOXTRICITY_AMPED] = - { - TOXTRICITY_MISC_INFO, + .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_AMPED, .height = 16, @@ -2415,7 +2680,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { - TOXTRICITY_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 98, \ + .baseDefense = 70, \ + .baseSpeed = 75, \ + .baseSpAttack = 114, \ + .baseSpDefense = 70, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Toxtricity"), \ + .natDexNum = NATIONAL_DEX_TOXTRICITY, \ + .categoryName = _("Punk"), \ + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_AMPED, .height = 240, @@ -2442,7 +2727,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_TOXTRICITY_LOW_KEY] = { - TOXTRICITY_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 98, \ + .baseDefense = 70, \ + .baseSpeed = 75, \ + .baseSpAttack = 114, \ + .baseSpDefense = 70, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Toxtricity"), \ + .natDexNum = NATIONAL_DEX_TOXTRICITY, \ + .categoryName = _("Punk"), \ + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_LOW_KEY, .height = 16, @@ -2471,7 +2776,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { - TOXTRICITY_MISC_INFO, + .baseHP = 75, \ + .baseAttack = 98, \ + .baseDefense = 70, \ + .baseSpeed = 75, \ + .baseSpAttack = 114, \ + .baseSpDefense = 70, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Toxtricity"), \ + .natDexNum = NATIONAL_DEX_TOXTRICITY, \ + .categoryName = _("Punk"), \ + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_LOW_KEY, .height = 240, @@ -2545,7 +2870,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}), }, -#define CENTISKORCH_MISC_INFO \ + [SPECIES_CENTISKORCH] = + { .baseHP = 100, \ .baseAttack = 115, \ .baseDefense = 65, \ @@ -2570,11 +2896,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Centiskorch) \ LEARNSETS(Centiskorch), \ .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ - .formChangeTable = sCentiskorchFormChangeTable - - [SPECIES_CENTISKORCH] = - { - CENTISKORCH_MISC_INFO, + .formChangeTable = sCentiskorchFormChangeTable, .height = 30, .weight = 1200, .description = COMPOUND_STRING( @@ -2600,7 +2922,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CENTISKORCH_GIGANTAMAX] = { - CENTISKORCH_MISC_INFO, + .baseHP = 100, \ + .baseAttack = 115, \ + .baseDefense = 65, \ + .baseSpeed = 65, \ + .baseSpAttack = 90, \ + .baseSpDefense = 90, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ + .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY }, \ + .bodyColor = BODY_COLOR_RED, \ + .speciesName = _("Centiskorc"), \ + .cryId = CRY_CENTISKORCH, \ + .natDexNum = NATIONAL_DEX_CENTISKORCH, \ + .categoryName = _("Radiator"), \ + FOOTPRINT(Centiskorch) \ + LEARNSETS(Centiskorch), \ + .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ + .formChangeTable = sCentiskorchFormChangeTable, .height = 750, .weight = 0, .description = COMPOUND_STRING( @@ -2723,7 +3069,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_CLOBBOPUS #if P_FAMILY_SINISTEA -#define SINISTEA_MISC_INFO \ + [SPECIES_SINISTEA_PHONY] = + { .baseHP = 40, \ .baseAttack = 45, \ .baseDefense = 45, \ @@ -2754,19 +3101,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FRONT_PIC(Sinistea, 40, 32), \ .frontPicYOffset = 17, \ .frontAnimFrames = sAnims_Sinistea, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(Sinistea, 48, 32), \ .backPicYOffset = 16, \ + //.backAnimId = BACK_ANIM_NONE, PALETTES(Sinistea), \ ICON(Sinistea, 2), \ FOOTPRINT(Sinistea) \ LEARNSETS(Sinistea), \ - .formSpeciesIdTable = sSinisteaFormSpeciesIdTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - - [SPECIES_SINISTEA_PHONY] = - { - SINISTEA_MISC_INFO, + .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "This Pokémon is said to have been born\n" "when a lonely spirit possessed a cold,\n" @@ -2777,7 +3120,45 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_SINISTEA_ANTIQUE] = { - SINISTEA_MISC_INFO, + .baseHP = 40, \ + .baseAttack = 45, \ + .baseDefense = 45, \ + .baseSpeed = 50, \ + .baseSpAttack = 74, \ + .baseSpDefense = 54, \ + .types = MON_TYPES(TYPE_GHOST), \ + .catchRate = 120, \ + .expYield = 62, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Sinistea"), \ + .cryId = CRY_SINISTEA, \ + .natDexNum = NATIONAL_DEX_SINISTEA, \ + .categoryName = _("Black Tea"), \ + .height = 1, \ + .weight = 2, \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Sinistea, 40, 32), \ + .frontPicYOffset = 17, \ + .frontAnimFrames = sAnims_Sinistea, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Sinistea, 48, 32), \ + .backPicYOffset = 16, \ + //.backAnimId = BACK_ANIM_NONE, + PALETTES(Sinistea), \ + ICON(Sinistea, 2), \ + FOOTPRINT(Sinistea) \ + LEARNSETS(Sinistea), \ + .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "The swirl pattern in this Pokémon's\n" "body is its weakness. If it gets\n" @@ -2787,7 +3168,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}), }, -#define POLTEAGEIST_MISC_INFO \ + [SPECIES_POLTEAGEIST_PHONY] = + { .baseHP = 60, \ .baseAttack = 65, \ .baseDefense = 65, \ @@ -2818,19 +3200,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FRONT_PIC(Polteageist, 48, 48), \ .frontPicYOffset = 11, \ .frontAnimFrames = sAnims_Polteageist, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, BACK_PIC(Polteageist, 64, 40), \ .backPicYOffset = 13, \ + //.backAnimId = BACK_ANIM_NONE, PALETTES(Polteageist), \ ICON(Polteageist, 2), \ FOOTPRINT(Polteageist) \ LEARNSETS(Polteageist), \ - .formSpeciesIdTable = sPolteageistFormSpeciesIdTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - - [SPECIES_POLTEAGEIST_PHONY] = - { - POLTEAGEIST_MISC_INFO, + .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "This species lives in antique teapots.\n" "Most pots are forgeries, but on rare\n" @@ -2840,7 +3218,45 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_POLTEAGEIST_ANTIQUE] = { - POLTEAGEIST_MISC_INFO, + .baseHP = 60, \ + .baseAttack = 65, \ + .baseDefense = 65, \ + .baseSpeed = 70, \ + .baseSpAttack = 134, \ + .baseSpDefense = 114, \ + .types = MON_TYPES(TYPE_GHOST), \ + .catchRate = 60, \ + .expYield = 178, \ + .evYield_SpAttack = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Polteageis"), \ + .cryId = CRY_POLTEAGEIST, \ + .natDexNum = NATIONAL_DEX_POLTEAGEIST, \ + .categoryName = _("Black Tea"), \ + .height = 2, \ + .weight = 4, \ + .pokemonScale = 682, \ + .pokemonOffset = 24, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Polteageist, 48, 48), \ + .frontPicYOffset = 11, \ + .frontAnimFrames = sAnims_Polteageist, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Polteageist, 64, 40), \ + .backPicYOffset = 13, \ + //.backAnimId = BACK_ANIM_NONE, + PALETTES(Polteageist), \ + ICON(Polteageist, 2), \ + FOOTPRINT(Polteageist) \ + LEARNSETS(Polteageist), \ + .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "Trainers Polteageist trusts will be\n" "allowed to experience its\n" @@ -2946,7 +3362,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_HATTERENE}), }, -#define HATTERENE_MISC_INFO \ + [SPECIES_HATTERENE] = + { .baseHP = 57, \ .baseAttack = 90, \ .baseDefense = 95, \ @@ -2971,11 +3388,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Hatterene) \ LEARNSETS(Hatterene), \ .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ - .formChangeTable = sHattereneFormChangeTable - - [SPECIES_HATTERENE] = - { - HATTERENE_MISC_INFO, + .formChangeTable = sHattereneFormChangeTable, .height = 21, .weight = 51, .description = COMPOUND_STRING( @@ -3000,7 +3413,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_HATTERENE_GIGANTAMAX] = { - HATTERENE_MISC_INFO, + .baseHP = 57, \ + .baseAttack = 90, \ + .baseDefense = 95, \ + .baseSpeed = 29, \ + .baseSpAttack = 136, \ + .baseSpDefense = 103, \ + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), \ + .catchRate = 45, \ + .expYield = 255, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ + .abilities = { ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE }, \ + .bodyColor = BODY_COLOR_PINK, \ + .speciesName = _("Hatterene"), \ + .cryId = CRY_HATTERENE, \ + .natDexNum = NATIONAL_DEX_HATTERENE, \ + .categoryName = _("Silent"), \ + FOOTPRINT(Hatterene) \ + LEARNSETS(Hatterene), \ + .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ + .formChangeTable = sHattereneFormChangeTable, .height = 260, .weight = 0, .description = COMPOUND_STRING( @@ -3123,7 +3560,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GRIMMSNARL}), }, -#define GRIMMSNARL_MISC_INFO \ + + [SPECIES_GRIMMSNARL] = + { .baseHP = 95, \ .baseAttack = 120, \ .baseDefense = 65, \ @@ -3148,11 +3587,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Grimmsnarl) \ LEARNSETS(Grimmsnarl), \ .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ - .formChangeTable = sGrimmsnarlFormChangeTable - - [SPECIES_GRIMMSNARL] = - { - GRIMMSNARL_MISC_INFO, + .formChangeTable = sGrimmsnarlFormChangeTable, .height = 15, .weight = 610, .description = COMPOUND_STRING( @@ -3177,7 +3612,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_GRIMMSNARL_GIGANTAMAX] = { - GRIMMSNARL_MISC_INFO, + .baseHP = 95, \ + .baseAttack = 120, \ + .baseDefense = 65, \ + .baseSpeed = 60, \ + .baseSpAttack = 95, \ + .baseSpDefense = 75, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE), \ + .abilities = { ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Grimmsnarl"), \ + .cryId = CRY_GRIMMSNARL, \ + .natDexNum = NATIONAL_DEX_GRIMMSNARL, \ + .categoryName = _("Bulk Up"), \ + FOOTPRINT(Grimmsnarl) \ + LEARNSETS(Grimmsnarl), \ + .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ + .formChangeTable = sGrimmsnarlFormChangeTable, .height = 320, .weight = 0, .description = COMPOUND_STRING( @@ -3296,19 +3755,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FRONT_PIC(Alcremie ##sweet, 40, 56), \ .frontPicYOffset = 7, \ .frontAnimFrames = sAnims_Alcremie, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ BACK_PIC(Alcremie ##sweet, 48, 56), \ .backPicYOffset = 9, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_Alcremie ##sweet##cream, \ .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ - ICON(AlcremieStrawberryVanillaCream, 1), \ + ICON(AlcremieStrawberryVanillaCream, 1),/*AlcremieStrawberry##cream##*/ \ FOOTPRINT(Alcremie) \ LEARNSETS(Alcremie), \ .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, \ .formChangeTable = sAlcremieFormChangeTable, \ } - //ICON(AlcremieStrawberry##cream##, 1), - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = ALCREMIE_REGULAR_SPECIES_INFO(Strawberry, VanillaCream, BODY_COLOR_WHITE), [SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = ALCREMIE_REGULAR_SPECIES_INFO(Strawberry, RubyCream, BODY_COLOR_PINK), @@ -3655,7 +4113,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE -#define EISCUE_MISC_INFO \ + [SPECIES_EISCUE_ICE_FACE] = + { .types = MON_TYPES(TYPE_ICE), \ .catchRate = 60, \ .expYield = 165, \ @@ -3679,11 +4138,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Eiscue) \ LEARNSETS(Eiscue), \ .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ - .formChangeTable = sEiscueFormChangeTable - - [SPECIES_EISCUE_ICE_FACE] = - { - EISCUE_MISC_INFO, + .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, .baseAttack = 80, .baseDefense = 110, @@ -3709,7 +4164,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_EISCUE_NOICE_FACE] = { - EISCUE_MISC_INFO, + .types = MON_TYPES(TYPE_ICE), \ + .catchRate = 60, \ + .expYield = 165, \ + .evYield_Defense = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 25, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ + .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Eiscue"), \ + .natDexNum = NATIONAL_DEX_EISCUE, \ + .categoryName = _("Penguin"), \ + .height = 14, \ + .weight = 890, \ + .pokemonScale = 265, \ + .pokemonOffset = 2, \ + .trainerScale = 262, \ + .trainerOffset = 0, \ + FOOTPRINT(Eiscue) \ + LEARNSETS(Eiscue), \ + .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ + .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, .baseAttack = 80, .baseDefense = 70, @@ -3735,7 +4213,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -#define INDEEDEE_MISC_INFO \ + [SPECIES_INDEEDEE_MALE] = + { .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), \ .catchRate = 30, \ .expYield = 166, \ @@ -3754,11 +4233,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Indeedee) \ - .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable - - [SPECIES_INDEEDEE_MALE] = - { - INDEEDEE_MISC_INFO, + .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, .baseHP = 60, .baseAttack = 65, .baseDefense = 55, @@ -3788,7 +4263,25 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_INDEEDEE_FEMALE] = { - INDEEDEE_MISC_INFO, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), \ + .catchRate = 30, \ + .expYield = 166, \ + .eggCycles = 40, \ + .friendship = 140, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ + .bodyColor = BODY_COLOR_PURPLE, \ + .speciesName = _("Indeedee"), \ + .natDexNum = NATIONAL_DEX_INDEEDEE, \ + .categoryName = _("Emotion"), \ + .height = 9, \ + .weight = 280, \ + .pokemonScale = 338, \ + .pokemonOffset = 8, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Indeedee) \ + .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, .baseHP = 70, .baseAttack = 55, .baseDefense = 65, @@ -3818,7 +4311,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_INDEEDEE #if P_FAMILY_MORPEKO -#define MORPEKO_MISC_INFO \ + [SPECIES_MORPEKO_FULL_BELLY] = + { .baseHP = 58, \ .baseAttack = 95, \ .baseDefense = 58, \ @@ -3848,11 +4342,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Morpeko) \ LEARNSETS(Morpeko), \ .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ - .formChangeTable = sMorpekoFormChangeTable - - [SPECIES_MORPEKO_FULL_BELLY] = - { - MORPEKO_MISC_INFO, + .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_FULL_BELLY, .description = COMPOUND_STRING( "As it eats the seeds stored up in its\n" @@ -3872,7 +4362,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_MORPEKO_HANGRY] = { - MORPEKO_MISC_INFO, + .baseHP = 58, \ + .baseAttack = 95, \ + .baseDefense = 58, \ + .baseSpeed = 97, \ + .baseSpAttack = 70, \ + .baseSpDefense = 58, \ + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DARK), \ + .catchRate = 180, \ + .expYield = 153, \ + .evYield_Speed = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ + .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_YELLOW, \ + .speciesName = _("Morpeko"), \ + .natDexNum = NATIONAL_DEX_MORPEKO, \ + .categoryName = _("Two-Sided"), \ + .height = 3, \ + .weight = 30, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Morpeko) \ + LEARNSETS(Morpeko), \ + .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ + .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_HANGRY, .description = COMPOUND_STRING( "Intense hunger drives it to\n" @@ -3941,7 +4460,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}), }, -#define COPPERAJAH_MISC_INFO \ + [SPECIES_COPPERAJAH] = + { .baseHP = 122, \ .baseAttack = 130, \ .baseDefense = 69, \ @@ -3967,11 +4487,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Copperajah) \ LEARNSETS(Copperajah), \ .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ - .formChangeTable = sCopperajahFormChangeTable - - [SPECIES_COPPERAJAH] = - { - COPPERAJAH_MISC_INFO, + .formChangeTable = sCopperajahFormChangeTable, .height = 30, .weight = 6500, .description = COMPOUND_STRING( @@ -3996,7 +4512,32 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_COPPERAJAH_GIGANTAMAX] = { - COPPERAJAH_MISC_INFO, + .baseHP = 122, \ + .baseAttack = 130, \ + .baseDefense = 69, \ + .baseSpeed = 30, \ + .baseSpAttack = 80, \ + .baseSpDefense = 69, \ + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_MINERAL), \ + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Copperajah"), \ + .cryId = CRY_COPPERAJAH, \ + .natDexNum = NATIONAL_DEX_COPPERAJAH, \ + .categoryName = _("Copperderm"), \ + FOOTPRINT(Copperajah) \ + LEARNSETS(Copperajah), \ + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ + .formChangeTable = sCopperajahFormChangeTable, .height = 230, .weight = 0, .description = COMPOUND_STRING( @@ -4218,7 +4759,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON -#define DURALUDON_MISC_INFO \ + [SPECIES_DURALUDON] = + { .baseHP = 70, \ .baseAttack = 95, \ .baseDefense = 115, \ @@ -4243,11 +4785,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Duraludon) \ LEARNSETS(Duraludon), \ .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ - .formChangeTable = sDuraludonFormChangeTable - - [SPECIES_DURALUDON] = - { - DURALUDON_MISC_INFO, + .formChangeTable = sDuraludonFormChangeTable, .height = 18, .weight = 400, .description = COMPOUND_STRING( @@ -4273,7 +4811,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_DURALUDON_GIGANTAMAX] = { - DURALUDON_MISC_INFO, + .baseHP = 70, \ + .baseAttack = 95, \ + .baseDefense = 115, \ + .baseSpeed = 85, \ + .baseSpAttack = 120, \ + .baseSpDefense = 50, \ + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_DRAGON), \ + .abilities = { ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Duraludon"), \ + .cryId = CRY_DURALUDON, \ + .natDexNum = NATIONAL_DEX_DURALUDON, \ + .categoryName = _("Alloy"), \ + FOOTPRINT(Duraludon) \ + LEARNSETS(Duraludon), \ + .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ + .formChangeTable = sDuraludonFormChangeTable, .height = 430, .weight = 0, .description = COMPOUND_STRING( @@ -4496,7 +5058,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN -#define ZACIAN_MISC_INFO \ + [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = + { .catchRate = 10, \ .evYield_Speed = 3, \ .genderRatio = MON_GENDERLESS, \ @@ -4518,11 +5081,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Zacian) \ LEARNSETS(Zacian), \ .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ - .formChangeTable = sZacianFormChangeTable - - [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = - { - ZACIAN_MISC_INFO, + .formChangeTable = sZacianFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, .baseDefense = 115, @@ -4550,7 +5109,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZACIAN_CROWNED_SWORD] = { - ZACIAN_MISC_INFO, + .catchRate = 10, \ + .evYield_Speed = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .isLegendary = TRUE, \ + .speciesName = _("Zacian"), \ + .natDexNum = NATIONAL_DEX_ZACIAN, \ + .categoryName = _("Warrior"), \ + .height = 28, \ + .pokemonScale = 275, \ + .pokemonOffset = 7, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Zacian) \ + LEARNSETS(Zacian), \ + .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ + .formChangeTable = sZacianFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 150 : 170, .baseDefense = 115, @@ -4579,7 +5159,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA -#define ZAMAZENTA_MISC_INFO \ + [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = + { .catchRate = 10, \ .evYield_Speed = 3, \ .genderRatio = MON_GENDERLESS, \ @@ -4601,11 +5182,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Zamazenta) \ LEARNSETS(Zamazenta), \ .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ - .formChangeTable = sZamazentaFormChangeTable - - [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = - { - ZAMAZENTA_MISC_INFO, + .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, .baseDefense = 115, @@ -4634,7 +5211,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { - ZAMAZENTA_MISC_INFO, + .catchRate = 10, \ + .evYield_Speed = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_RED, \ + .isLegendary = TRUE, \ + .speciesName = _("Zamazenta"), \ + .natDexNum = NATIONAL_DEX_ZAMAZENTA, \ + .categoryName = _("Warrior"), \ + .height = 29, \ + .pokemonScale = 275, \ + .pokemonOffset = 7, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FOOTPRINT(Zamazenta) \ + LEARNSETS(Zamazenta), \ + .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ + .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, .baseDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145, @@ -4663,7 +5261,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_ZAMAZENTA #if P_FAMILY_ETERNATUS -#define ETERNATUS_MISC_INFO \ + [SPECIES_ETERNATUS] = + { .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), \ .catchRate = 255, \ .evYield_HP = 3, \ @@ -4680,11 +5279,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Gigantic"), \ FOOTPRINT(Eternatus) \ LEARNSETS(Eternatus), \ - .formSpeciesIdTable = sEternatusFormSpeciesIdTable - - [SPECIES_ETERNATUS] = - { - ETERNATUS_MISC_INFO, + .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 140, .baseAttack = 85, .baseDefense = 95, @@ -4718,7 +5313,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ETERNATUS_ETERNAMAX] = { - ETERNATUS_MISC_INFO, + .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), \ + .catchRate = 255, \ + .evYield_HP = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_PURPLE, \ + .isLegendary = TRUE, \ + .speciesName = _("Eternatus"), \ + .natDexNum = NATIONAL_DEX_ETERNATUS, \ + .categoryName = _("Gigantic"), \ + FOOTPRINT(Eternatus) \ + LEARNSETS(Eternatus), \ + .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 255, .baseAttack = 115, .baseDefense = 250, @@ -4803,7 +5414,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = {EVO_ITEM, ITEM_SCROLL_OF_WATERS, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}), }, -#define URSHIFU_MISC_INFO(style) \ + [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = + { + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK),\ + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, \ + LEARNSETS(UrshifuSingleStrikeStyle), \ .baseHP = 100, \ .baseAttack = 130, \ .baseDefense = 100, \ @@ -4825,17 +5440,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_URSHIFU, \ .categoryName = _("Wushu"), \ FOOTPRINT(Urshifu) \ - .formSpeciesIdTable = sUrshifuFormSpeciesIdTable - -#define URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO \ - .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK),\ - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, \ - LEARNSETS(UrshifuSingleStrikeStyle), \ - URSHIFU_MISC_INFO(SingleStrike) - - [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = - { - URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO, + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, .pokemonScale = 256, @@ -4862,7 +5467,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { - URSHIFU_SINGLE_STRIKE_STYLE_MISC_INFO, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK),\ + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, \ + LEARNSETS(UrshifuSingleStrikeStyle), \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .isLegendary = TRUE, \ + .speciesName = _("Urshifu"), \ + .natDexNum = NATIONAL_DEX_URSHIFU, \ + .categoryName = _("Wushu"), \ + FOOTPRINT(Urshifu) \ + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 290, .weight = 0, .pokemonScale = 256, @@ -4887,15 +5516,33 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = }, #endif //P_GIGANTAMAX_FORMS -#define URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO \ + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = + { .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), \ .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, \ LEARNSETS(UrshifuRapidStrikeStyle), \ - URSHIFU_MISC_INFO(RapidStrike) - - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = - { - URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO, + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .isLegendary = TRUE, \ + .speciesName = _("Urshifu"), \ + .natDexNum = NATIONAL_DEX_URSHIFU, \ + .categoryName = _("Wushu"), \ + FOOTPRINT(Urshifu) \ + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, .pokemonScale = 256, @@ -4922,7 +5569,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { - URSHIFU_RAPID_STRIKE_STYLE_MISC_INFO, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), \ + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, \ + LEARNSETS(UrshifuRapidStrikeStyle), \ + .baseHP = 100, \ + .baseAttack = 130, \ + .baseDefense = 100, \ + .baseSpeed = 97, \ + .baseSpAttack = 63, \ + .baseSpDefense = 60, \ + .catchRate = 3, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = PERCENT_FEMALE(12.5), \ + .eggCycles = 120, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GRAY, \ + .isLegendary = TRUE, \ + .speciesName = _("Urshifu"), \ + .natDexNum = NATIONAL_DEX_URSHIFU, \ + .categoryName = _("Wushu"), \ + FOOTPRINT(Urshifu) \ + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 260, .weight = 0, .pokemonScale = 256, @@ -4950,7 +5621,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZARUDE -#define ZARUDE_MISC_INFO \ + [SPECIES_ZARUDE] = + { .baseHP = 105, \ .baseAttack = 120, \ .baseDefense = 105, \ @@ -4981,11 +5653,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 1, \ FOOTPRINT(Zarude) \ LEARNSETS(Zarude), \ - .formSpeciesIdTable = sZarudeFormSpeciesIdTable - - [SPECIES_ZARUDE] = - { - ZARUDE_MISC_INFO, + .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "Within dense forests, this Pokémon lives\n" "in a pack with others of its kind. It's\n" @@ -5003,7 +5671,37 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = }, [SPECIES_ZARUDE_DADA] = { - ZARUDE_MISC_INFO, + .baseHP = 105, \ + .baseAttack = 120, \ + .baseDefense = 105, \ + .baseSpeed = 105, \ + .baseSpAttack = 70, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_DARK, TYPE_GRASS), \ + .catchRate = 3, \ + .expYield = 300, \ + .evYield_Attack = 3, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 120, \ + .friendship = 0, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .isMythical = TRUE, \ + .speciesName = _("Zarude"), \ + .cryId = CRY_ZARUDE, \ + .natDexNum = NATIONAL_DEX_ZARUDE, \ + .categoryName = _("Rogue Monkey"), \ + .height = 18, \ + .weight = 700, \ + .pokemonScale = 267, \ + .pokemonOffset = 2, \ + .trainerScale = 286, \ + .trainerOffset = 1, \ + FOOTPRINT(Zarude) \ + LEARNSETS(Zarude), \ + .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "This Zarude's special strength\n" "stems from its love and care for an\n" @@ -5222,17 +5920,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = }, #endif //P_FAMILY_SPECTRIER -#define CALYREX_MISC_INFO \ +#if P_FAMILY_CALYREX + [SPECIES_CALYREX] = + { .speciesName = _("Calyrex"), \ .natDexNum = NATIONAL_DEX_CALYREX, \ FOOTPRINT(Calyrex) \ .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ - .isLegendary = TRUE - -#if P_FAMILY_CALYREX - [SPECIES_CALYREX] = - { - CALYREX_MISC_INFO, + .isLegendary = TRUE, .baseHP = 100, .baseAttack = 80, .baseDefense = 80, @@ -5278,7 +5973,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FUSION_FORMS [SPECIES_CALYREX_ICE_RIDER] = { - CALYREX_MISC_INFO, + .speciesName = _("Calyrex"), \ + .natDexNum = NATIONAL_DEX_CALYREX, \ + FOOTPRINT(Calyrex) \ + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 100, .baseAttack = 165, .baseDefense = 150, @@ -5324,7 +6023,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CALYREX_SHADOW_RIDER] = { - CALYREX_MISC_INFO, + .speciesName = _("Calyrex"), \ + .natDexNum = NATIONAL_DEX_CALYREX, \ + FOOTPRINT(Calyrex) \ + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ + .isLegendary = TRUE, .baseHP = 100, .baseAttack = 85, .baseDefense = 80, @@ -5371,7 +6074,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #endif //P_FAMILY_CALYREX #if P_FAMILY_ENAMORUS -#define ENAMORUS_MISC_INFO \ + [SPECIES_ENAMORUS_INCARNATE] = + { .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), \ .catchRate = 3, \ .expYield = 116, \ @@ -5393,11 +6097,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 296, \ .trainerOffset = 1, \ LEARNSETS(Enamorus), \ - .formSpeciesIdTable = sEnamorusFormSpeciesIdTable - - [SPECIES_ENAMORUS_INCARNATE] = - { - ENAMORUS_MISC_INFO, + .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, .baseDefense = 70, @@ -5426,7 +6126,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ENAMORUS_THERIAN] = { - ENAMORUS_MISC_INFO, + .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), \ + .catchRate = 3, \ + .expYield = 116, \ + .evYield_SpAttack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_PINK, \ + .isLegendary = TRUE, \ + .speciesName = _("Enamorus"), \ + .natDexNum = NATIONAL_DEX_ENAMORUS, \ + .categoryName = _("Love-Hate"), \ + .height = 16, \ + .weight = 480, \ + .pokemonScale = 259, \ + .pokemonOffset = 1, \ + .trainerScale = 296, \ + .trainerOffset = 1, \ + LEARNSETS(Enamorus), \ + .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, .baseDefense = 110, diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index dd97bebcfe37..e909de42852d 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -488,7 +488,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = {EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}), }, -#define OINKOLOGNE_MISC_INFO \ + [SPECIES_OINKOLOGNE_MALE] = + { .types = MON_TYPES(TYPE_NORMAL), \ .catchRate = 100, \ .expYield = 171, \ @@ -508,11 +509,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, \ .trainerOffset = 0, \ .teachableLearnset = sOinkologneTeachableLearnset, \ - .formSpeciesIdTable = sOinkologneFormSpeciesIdTable - - [SPECIES_OINKOLOGNE_MALE] = - { - OINKOLOGNE_MISC_INFO, + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, .baseHP = 110, .baseAttack = 100, .baseDefense = 75, @@ -541,7 +538,26 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_OINKOLOGNE_FEMALE] = { - OINKOLOGNE_MISC_INFO, + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 100, \ + .expYield = 171, \ + .evYield_HP = 2, \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .bodyColor = BODY_COLOR_GRAY, \ + .speciesName = _("Oinkologne"), \ + .natDexNum = NATIONAL_DEX_OINKOLOGNE, \ + .categoryName = _("Hog"), \ + .height = 10, \ + .weight = 1200, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .teachableLearnset = sOinkologneTeachableLearnset, \ + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, .baseHP = 115, .baseAttack = 90, .baseDefense = 70, @@ -959,7 +975,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = {EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}), }, -#define MAUSHOLD_SPECIES_INFO \ + [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = + { .baseHP = 74, \ .baseAttack = 75, \ .baseDefense = 70, \ @@ -987,17 +1004,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, \ .frontPicYOffset = 15, \ .frontAnimFrames = sAnims_Maushold, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ .backPicYOffset = 15, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ PALETTES(Maushold), \ + /*FOOTPRINT(Maushold)*/ \ LEARNSETS(Maushold), \ - .formSpeciesIdTable = sMausholdFormSpeciesIdTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Maushold) - - [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = - { - MAUSHOLD_SPECIES_INFO, + .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, .weight = 23, .description = COMPOUND_STRING( @@ -1011,7 +1024,40 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { - MAUSHOLD_SPECIES_INFO, + .baseHP = 74, \ + .baseAttack = 75, \ + .baseDefense = 70, \ + .baseSpeed = 111, \ + .baseSpAttack = 65, \ + .baseSpDefense = 75, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 75, \ + .expYield = 165, \ + .evYield_Speed = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ + .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .speciesName = _("Maushold"), \ + .natDexNum = NATIONAL_DEX_MAUSHOLD, \ + .categoryName = _("Family"), \ + .height = 3, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 15, \ + .frontAnimFrames = sAnims_Maushold, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backPicYOffset = 15, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + PALETTES(Maushold), \ + /*FOOTPRINT(Maushold)*/ \ + LEARNSETS(Maushold), \ + .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, .weight = 28, .description = COMPOUND_STRING( @@ -1268,7 +1314,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_SMOLIV #if P_FAMILY_SQUAWKABILLY -#define SQUAWKABILLY_MISC_INFO \ + [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = + { .baseHP = 82, \ .baseAttack = 96, \ .baseDefense = 51, \ @@ -1297,17 +1344,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = FRONT_PIC(Squawkabilly, 64, 64), \ .frontPicYOffset = 4, \ .frontAnimFrames = sAnims_Squawkabilly, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ BACK_PIC(Squawkabilly, 64, 64), \ .backPicYOffset = 4, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Squawkabilly)*/ LEARNSETS(Squawkabilly), \ - .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Squawkabilly) - - [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = - { - SQUAWKABILLY_MISC_INFO, + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( @@ -1321,7 +1364,41 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { - SQUAWKABILLY_MISC_INFO, + .baseHP = 82, \ + .baseAttack = 96, \ + .baseDefense = 51, \ + .baseSpeed = 92, \ + .baseSpAttack = 45, \ + .baseSpDefense = 51, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ + .catchRate = 190, \ + .expYield = 146, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .speciesName = _("Sqawkabily"), \ + .cryId = CRY_SQUAWKABILLY, \ + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ + .categoryName = _("Parrot"), \ + .height = 6, \ + .weight = 24, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Squawkabilly, 64, 64), \ + .frontPicYOffset = 4, \ + .frontAnimFrames = sAnims_Squawkabilly, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + BACK_PIC(Squawkabilly, 64, 64), \ + .backPicYOffset = 4, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Squawkabilly)*/ + LEARNSETS(Squawkabilly), \ + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -1335,7 +1412,41 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { - SQUAWKABILLY_MISC_INFO, + .baseHP = 82, \ + .baseAttack = 96, \ + .baseDefense = 51, \ + .baseSpeed = 92, \ + .baseSpAttack = 45, \ + .baseSpDefense = 51, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ + .catchRate = 190, \ + .expYield = 146, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .speciesName = _("Sqawkabily"), \ + .cryId = CRY_SQUAWKABILLY, \ + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ + .categoryName = _("Parrot"), \ + .height = 6, \ + .weight = 24, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Squawkabilly, 64, 64), \ + .frontPicYOffset = 4, \ + .frontAnimFrames = sAnims_Squawkabilly, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + BACK_PIC(Squawkabilly, 64, 64), \ + .backPicYOffset = 4, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Squawkabilly)*/ + LEARNSETS(Squawkabilly), \ + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_YELLOW, .description = COMPOUND_STRING( @@ -1349,7 +1460,41 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { - SQUAWKABILLY_MISC_INFO, + .baseHP = 82, \ + .baseAttack = 96, \ + .baseDefense = 51, \ + .baseSpeed = 92, \ + .baseSpAttack = 45, \ + .baseSpDefense = 51, \ + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ + .catchRate = 190, \ + .expYield = 146, \ + .evYield_Attack = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 15, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_ERRATIC, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ + .speciesName = _("Sqawkabily"), \ + .cryId = CRY_SQUAWKABILLY, \ + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ + .categoryName = _("Parrot"), \ + .height = 6, \ + .weight = 24, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Squawkabilly, 64, 64), \ + .frontPicYOffset = 4, \ + .frontAnimFrames = sAnims_Squawkabilly, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + BACK_PIC(Squawkabilly, 64, 64), \ + .backPicYOffset = 4, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Squawkabilly)*/ + LEARNSETS(Squawkabilly), \ + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_WHITE, .description = COMPOUND_STRING( @@ -2913,7 +3058,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}), }, -#define PALAFIN_MISC_INFO \ + [SPECIES_PALAFIN_ZERO] = + { .types = MON_TYPES(TYPE_WATER), \ .catchRate = 45, \ .evYield_HP = 2, \ @@ -2931,15 +3077,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerScale = 256, \ .trainerOffset = 0, \ .frontAnimFrames = sAnims_Palafin, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + /*FOOTPRINT(Palafin)*/ LEARNSETS(Palafin), \ .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ - .formChangeTable = sPalafinZeroFormChangeTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //FOOTPRINT(Palafin) - - [SPECIES_PALAFIN_ZERO] = - { - PALAFIN_MISC_INFO, + .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, .baseAttack = 70, .baseDefense = 72, @@ -2967,7 +3109,28 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_PALAFIN_HERO] = { - PALAFIN_MISC_INFO, + .types = MON_TYPES(TYPE_WATER), \ + .catchRate = 45, \ + .evYield_HP = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 40, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_WATER_2),\ + .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Palafin"), \ + .natDexNum = NATIONAL_DEX_PALAFIN, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontAnimFrames = sAnims_Palafin, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + /*FOOTPRINT(Palafin)*/ + LEARNSETS(Palafin), \ + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ + .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, .baseAttack = 160, .baseDefense = 97, @@ -3632,7 +3795,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_DONDOZO #if P_FAMILY_TATSUGIRI -#define TATSUGIRI_MISC_INFO \ + [SPECIES_TATSUGIRI_CURLY] = + { .baseHP = 68, \ .baseAttack = 50, \ .baseDefense = 60, \ @@ -3660,16 +3824,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .trainerOffset = 0, \ .frontPicYOffset = 14, \ .frontAnimFrames = sAnims_Tatsugiri, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPicYOffset = 17, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Tatsugiri)*/ LEARNSETS(Tatsugiri), \ - .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Tatsugiri) - - [SPECIES_TATSUGIRI_CURLY] = - { - TATSUGIRI_MISC_INFO, + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .cryId = CRY_TATSUGIRI_CURLY, .description = COMPOUND_STRING( @@ -3685,7 +3845,39 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TATSUGIRI_DROOPY] = { - TATSUGIRI_MISC_INFO, + .baseHP = 68, \ + .baseAttack = 50, \ + .baseDefense = 60, \ + .baseSpeed = 82, \ + .baseSpAttack = 120, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), \ + .catchRate = 100, \ + .expYield = 166, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 35, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, \ + .speciesName = _("Tatsugiri"), \ + .natDexNum = NATIONAL_DEX_TATSUGIRI, \ + .categoryName = _("Mimicry"), \ + .height = 3, \ + .weight = 80, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 14, \ + .frontAnimFrames = sAnims_Tatsugiri, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPicYOffset = 17, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Tatsugiri)*/ + LEARNSETS(Tatsugiri), \ + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .cryId = CRY_TATSUGIRI_DROOPY, .description = COMPOUND_STRING( @@ -3700,7 +3892,39 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TATSUGIRI_STRETCHY] = { - TATSUGIRI_MISC_INFO, + .baseHP = 68, \ + .baseAttack = 50, \ + .baseDefense = 60, \ + .baseSpeed = 82, \ + .baseSpAttack = 120, \ + .baseSpDefense = 95, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), \ + .catchRate = 100, \ + .expYield = 166, \ + .evYield_SpAttack = 2, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 35, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ + .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, \ + .speciesName = _("Tatsugiri"), \ + .natDexNum = NATIONAL_DEX_TATSUGIRI, \ + .categoryName = _("Mimicry"), \ + .height = 3, \ + .weight = 80, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPicYOffset = 14, \ + .frontAnimFrames = sAnims_Tatsugiri, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPicYOffset = 17, \ + /*.backAnimId = BACK_ANIM_NONE,*/ + /*FOOTPRINT(Tatsugiri)*/ + LEARNSETS(Tatsugiri), \ + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_TATSUGIRI_STRETCHY, .description = COMPOUND_STRING( @@ -4464,7 +4688,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_FRIGIBAX #if P_FAMILY_GIMMIGHOUL -#define GIMMIGHOUL_MISC_INFO \ + [SPECIES_GIMMIGHOUL_CHEST] = + { .types = MON_TYPES(TYPE_GHOST), \ .catchRate = 45, \ .expYield = 60, \ @@ -4478,16 +4703,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .cryId = CRY_GIMMIGHOUL, \ .natDexNum = NATIONAL_DEX_GIMMIGHOUL, \ .frontAnimFrames = sAnims_Gimmighoul, \ - LEARNSETS(Gimmighoul), \ - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, \ - .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}) //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Gimmighoul) - - [SPECIES_GIMMIGHOUL_CHEST] = - { - GIMMIGHOUL_MISC_INFO, + LEARNSETS(Gimmighoul), \ + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, \ + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, .baseAttack = 30, .baseDefense = 70, @@ -4518,7 +4739,25 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_GIMMIGHOUL_ROAMING] = { - GIMMIGHOUL_MISC_INFO, + .types = MON_TYPES(TYPE_GHOST), \ + .catchRate = 45, \ + .expYield = 60, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 50, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .speciesName = _("Gimmighoul"), \ + .cryId = CRY_GIMMIGHOUL, \ + .natDexNum = NATIONAL_DEX_GIMMIGHOUL, \ + .frontAnimFrames = sAnims_Gimmighoul, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backAnimId = BACK_ANIM_NONE, + //FOOTPRINT(Gimmighoul) + LEARNSETS(Gimmighoul), \ + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, \ + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, .baseAttack = 30, .baseDefense = 25, @@ -5097,7 +5336,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_IRON_LEAVES #if P_FAMILY_POLTCHAGEIST -#define POLTCHAGEIST_MISC_INFO \ + [SPECIES_POLTCHAGEIST_COUNTERFEIT] = + { .baseHP = 40, \ .baseAttack = 45, \ .baseDefense = 45, \ @@ -5128,19 +5368,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = FRONT_PIC(Poltchageist, 64, 64), \ .frontPicYOffset = 7, \ .frontAnimFrames = sAnims_Poltchageist, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, \ BACK_PIC(Poltchageist, 64, 64), \ .backPicYOffset = 5, \ + //.backAnimId = BACK_ANIM_NONE, PALETTES(Poltchageist), \ ICON(Poltchageist, 4), \ - LEARNSETS(Poltchageist) - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Poltchageist) - - [SPECIES_POLTCHAGEIST_COUNTERFEIT] = - { - POLTCHAGEIST_MISC_INFO, + LEARNSETS(Poltchageist), .description = COMPOUND_STRING( "Supposedly, the regrets of a tea\n" "ceremony master who died before\n" @@ -5150,7 +5386,45 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_POLTCHAGEIST_ARTISAN] = { - POLTCHAGEIST_MISC_INFO, + .baseHP = 40, \ + .baseAttack = 45, \ + .baseDefense = 45, \ + .baseSpeed = 50, \ + .baseSpAttack = 74, \ + .baseSpDefense = 54, \ + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ + .catchRate = 120, \ + .expYield = 62, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Ptchageist"), \ + .cryId = CRY_POLTCHAGEIST, \ + .natDexNum = NATIONAL_DEX_POLTCHAGEIST, \ + .categoryName = _("Matcha"), \ + .height = 1, \ + .weight = 11, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Poltchageist, 64, 64), \ + .frontPicYOffset = 7, \ + .frontAnimFrames = sAnims_Poltchageist, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 10, \ + BACK_PIC(Poltchageist, 64, 64), \ + .backPicYOffset = 5, \ + //.backAnimId = BACK_ANIM_NONE, + PALETTES(Poltchageist), \ + ICON(Poltchageist, 4), \ + //FOOTPRINT(Poltchageist) + LEARNSETS(Poltchageist), .description = COMPOUND_STRING( "It has taken up residence in a very\n" "expensive tea caddy. It takes an\n" @@ -5159,7 +5433,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}), }, -#define SINISTCHA_MISC_INFO \ + [SPECIES_SINISTCHA_UNREMARKABLE] = + { .baseHP = 71, \ .baseAttack = 60, \ .baseDefense = 106, \ @@ -5190,19 +5465,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = FRONT_PIC(Sinistcha, 64, 64), \ .frontPicYOffset = 10, \ .frontAnimFrames = sAnims_Sinistcha, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, \ BACK_PIC(Sinistcha, 64, 64), \ .backPicYOffset = 13, \ + //.backAnimId = BACK_ANIM_NONE, PALETTES(Sinistcha), \ ICON(Sinistcha, 1), \ - LEARNSETS(Sinistcha) - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Sinistcha) - - [SPECIES_SINISTCHA_UNREMARKABLE] = - { - SINISTCHA_MISC_INFO, + LEARNSETS(Sinistcha), .description = COMPOUND_STRING( "It pretends to be tea, trying to fool\n" "people into drinking it so it can\n" @@ -5211,7 +5482,45 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_SINISTCHA_MASTERPIECE] = { - SINISTCHA_MISC_INFO, + .baseHP = 71, \ + .baseAttack = 60, \ + .baseDefense = 106, \ + .baseSpeed = 70, \ + .baseSpAttack = 121, \ + .baseSpDefense = 80, \ + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ + .catchRate = 60, \ + .expYield = 178, \ + .evYield_SpAttack = 2, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ + .bodyColor = BODY_COLOR_GREEN, \ + .speciesName = _("Sinistcha"), \ + .cryId = CRY_SINISTCHA, \ + .natDexNum = NATIONAL_DEX_SINISTCHA, \ + .categoryName = _("Matcha"), \ + .height = 2, \ + .weight = 22, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Sinistcha, 64, 64), \ + .frontPicYOffset = 10, \ + .frontAnimFrames = sAnims_Sinistcha, \ + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 10, \ + BACK_PIC(Sinistcha, 64, 64), \ + .backPicYOffset = 13, \ + //.backAnimId = BACK_ANIM_NONE, + PALETTES(Sinistcha), \ + ICON(Sinistcha, 1), \ + //FOOTPRINT(Sinistcha) + LEARNSETS(Sinistcha), .description = COMPOUND_STRING( "The more stirring it does with the\n" "tea whisk on its head, the more\n" @@ -5631,7 +5940,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS -#define TERAPAGOS_MISC_INFO \ + [SPECIES_TERAPAGOS_NORMAL] = + { .types = MON_TYPES(TYPE_NORMAL), \ .catchRate = 255, \ .genderRatio = PERCENT_FEMALE(50), \ @@ -5645,14 +5955,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .natDexNum = NATIONAL_DEX_TERAPAGOS, \ .categoryName = _("Tera"), \ LEARNSETS(Terapagos), \ + //FOOTPRINT(Terapagos) .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ .formChangeTable = sTerapagosFormChangeTable, \ - .isLegendary = TRUE - //FOOTPRINT(Terapagos) - - [SPECIES_TERAPAGOS_NORMAL] = - { - TERAPAGOS_MISC_INFO, + .isLegendary = TRUE, .baseHP = 90, .baseAttack = 65, .baseDefense = 85, @@ -5686,7 +5992,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_TERASTAL] = { - TERAPAGOS_MISC_INFO, + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 255, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 5, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Terapagos"), \ + .cryId = CRY_TERAPAGOS, \ + .natDexNum = NATIONAL_DEX_TERAPAGOS, \ + .categoryName = _("Tera"), \ + LEARNSETS(Terapagos), \ + //FOOTPRINT(Terapagos) + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ + .formChangeTable = sTerapagosFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 95, .baseAttack = 95, .baseDefense = 110, @@ -5721,7 +6043,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_STELLAR] = { - TERAPAGOS_MISC_INFO, + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 255, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 5, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .bodyColor = BODY_COLOR_BLUE, \ + .speciesName = _("Terapagos"), \ + .cryId = CRY_TERAPAGOS, \ + .natDexNum = NATIONAL_DEX_TERAPAGOS, \ + .categoryName = _("Tera"), \ + LEARNSETS(Terapagos), \ + //FOOTPRINT(Terapagos) + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ + .formChangeTable = sTerapagosFormChangeTable, \ + .isLegendary = TRUE, .baseHP = 160, .baseAttack = 105, .baseDefense = 110, From 7cf4f78b0920877beb33f5e4f6c48535e2898852 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 10 Mar 2024 21:33:11 -0300 Subject: [PATCH 12/23] Removed trailing macro slashes --- src/data/pokemon/species_info/gen_1.h | 4832 ++++++++++++------------- src/data/pokemon/species_info/gen_2.h | 864 ++--- src/data/pokemon/species_info/gen_3.h | 2200 +++++------ src/data/pokemon/species_info/gen_4.h | 1636 ++++----- src/data/pokemon/species_info/gen_5.h | 2284 ++++++------ src/data/pokemon/species_info/gen_6.h | 1674 +++++---- src/data/pokemon/species_info/gen_7.h | 1172 +++--- src/data/pokemon/species_info/gen_8.h | 3018 +++++++-------- src/data/pokemon/species_info/gen_9.h | 1136 +++--- 9 files changed, 9400 insertions(+), 9416 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index 277dd9e72e13..bcc868950d82 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -1896,36 +1896,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PICHU] = { - .baseHP = 20, \ - .baseAttack = 40, \ - .baseDefense = 15, \ - .baseSpeed = 60, \ - .baseSpAttack = 35, \ - .baseSpDefense = 35, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 41 : 42, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pichu"), \ - .cryId = CRY_PICHU, \ - .natDexNum = NATIONAL_DEX_PICHU, \ - .categoryName = _("Tiny Mouse"), \ - .height = 3, \ - .weight = 20, \ - .description = gPichuPokedexText, \ - .pokemonScale = 508, \ - .pokemonOffset = 20, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Pichu) \ - LEARNSETS(Pichu), \ + .baseHP = 20, + .baseAttack = 40, + .baseDefense = 15, + .baseSpeed = 60, + .baseSpAttack = 35, + .baseSpDefense = 35, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 41 : 42, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pichu"), + .cryId = CRY_PICHU, + .natDexNum = NATIONAL_DEX_PICHU, + .categoryName = _("Tiny Mouse"), + .height = 3, + .weight = 20, + .description = gPichuPokedexText, + .pokemonScale = 508, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Pichu) + LEARNSETS(Pichu), .formSpeciesIdTable = sPichuFormSpeciesIdTable, FRONT_PIC(Pichu, 32, 40), .frontPicYOffset = 14, @@ -1941,36 +1941,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PICHU_SPIKY_EARED] = { - .baseHP = 20, \ - .baseAttack = 40, \ - .baseDefense = 15, \ - .baseSpeed = 60, \ - .baseSpAttack = 35, \ - .baseSpDefense = 35, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 41 : 42, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pichu"), \ - .cryId = CRY_PICHU, \ - .natDexNum = NATIONAL_DEX_PICHU, \ - .categoryName = _("Tiny Mouse"), \ - .height = 3, \ - .weight = 20, \ - .description = gPichuPokedexText, \ - .pokemonScale = 508, \ - .pokemonOffset = 20, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Pichu) \ - LEARNSETS(Pichu), \ + .baseHP = 20, + .baseAttack = 40, + .baseDefense = 15, + .baseSpeed = 60, + .baseSpAttack = 35, + .baseSpDefense = 35, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 41 : 42, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pichu"), + .cryId = CRY_PICHU, + .natDexNum = NATIONAL_DEX_PICHU, + .categoryName = _("Tiny Mouse"), + .height = 3, + .weight = 20, + .description = gPichuPokedexText, + .pokemonScale = 508, + .pokemonOffset = 20, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Pichu) + LEARNSETS(Pichu), .formSpeciesIdTable = sPichuFormSpeciesIdTable, .noFlip = TRUE, FRONT_PIC(PichuSpikyEared, 32, 40), @@ -1995,34 +1995,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, .trainerOffset = 0, .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), @@ -2050,38 +2050,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_COSPLAY_PIKACHU_FORMS [SPECIES_PIKACHU_COSPLAY] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, FRONT_PIC(PikachuCosplay, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuCosplay, @@ -2095,38 +2095,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_ROCK_STAR] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, FRONT_PIC(PikachuRockStar, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuRockStar, @@ -2140,38 +2140,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_BELLE] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, .noFlip = TRUE, FRONT_PIC(PikachuBelle, 48, 48), .frontPicYOffset = 9, @@ -2186,38 +2186,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_POP_STAR] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, .noFlip = TRUE, FRONT_PIC(PikachuPopStar, 48, 48), .frontPicYOffset = 9, @@ -2232,38 +2232,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_PH_D] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, FRONT_PIC(PikachuPhD, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuPhD, @@ -2277,38 +2277,38 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_LIBRE] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_FEMALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .description = gPikachuPokedexText, + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_FEMALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .description = gPikachuPokedexText, FRONT_PIC(PikachuLibre, 48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuLibre, @@ -2325,37 +2325,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_CAP_PIKACHU_FORMS [SPECIES_PIKACHU_ORIGINAL_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" @@ -2375,37 +2375,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_HOENN_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2424,37 +2424,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_SINNOH_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2473,37 +2473,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_UNOVA_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2522,37 +2522,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_KALOS_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2571,37 +2571,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_ALOLA_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2620,37 +2620,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_PARTNER_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" @@ -2670,37 +2670,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PIKACHU_WORLD_CAP] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, \ - .height = 4, \ - .weight = 60, \ - .pokemonScale = 479, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .genderRatio = MON_MALE, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .height = 4, + .weight = 60, + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + .genderRatio = MON_MALE, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2722,28 +2722,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_PIKACHU_GIGANTAMAX] = { - .baseHP = 35, \ - .baseAttack = 55, \ - .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, \ - .baseSpeed = 90, \ - .baseSpAttack = 50, \ - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, \ - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 190, \ - .expYield = PIKACHU_EXP_YIELD, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_LIGHT_BALL, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Pikachu"), \ - .cryId = CRY_PIKACHU, \ - .natDexNum = NATIONAL_DEX_PIKACHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Pikachu) \ - LEARNSETS(Pikachu), \ + .baseHP = 35, + .baseAttack = 55, + .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 190, + .expYield = PIKACHU_EXP_YIELD, + .evYield_Speed = 2, + .itemRare = ITEM_LIGHT_BALL, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Pikachu"), + .cryId = CRY_PIKACHU, + .natDexNum = NATIONAL_DEX_PIKACHU, + .categoryName = _("Mouse"), + FOOTPRINT(Pikachu) + LEARNSETS(Pikachu), .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), @@ -2786,19 +2786,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAICHU] = { - .catchRate = 75, \ - .expYield = RAICHU_EXP_YIELD, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ - .speciesName = _("Raichu"), \ - .cryId = CRY_RAICHU, \ - .natDexNum = NATIONAL_DEX_RAICHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Raichu) \ + .catchRate = 75, + .expYield = RAICHU_EXP_YIELD, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .speciesName = _("Raichu"), + .cryId = CRY_RAICHU, + .natDexNum = NATIONAL_DEX_RAICHU, + .categoryName = _("Mouse"), + FOOTPRINT(Raichu) .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .baseHP = 60, .baseAttack = 90, @@ -2836,19 +2836,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_RAICHU_ALOLAN] = { - .catchRate = 75, \ - .expYield = RAICHU_EXP_YIELD, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ - .speciesName = _("Raichu"), \ - .cryId = CRY_RAICHU, \ - .natDexNum = NATIONAL_DEX_RAICHU, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Raichu) \ + .catchRate = 75, + .expYield = RAICHU_EXP_YIELD, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .speciesName = _("Raichu"), + .cryId = CRY_RAICHU, + .natDexNum = NATIONAL_DEX_RAICHU, + .categoryName = _("Mouse"), + FOOTPRINT(Raichu) .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .baseHP = 60, .baseAttack = 85, @@ -2889,20 +2889,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_SANDSHREW [SPECIES_SANDSHREW] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, \ - .evYield_Defense = 1, \ - .speciesName = _("Sandshrew"), \ - .cryId = CRY_SANDSHREW, \ - .natDexNum = NATIONAL_DEX_SANDSHREW, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Sandshrew) \ - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ - .itemRare = ITEM_GRIP_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, + .evYield_Defense = 1, + .speciesName = _("Sandshrew"), + .cryId = CRY_SANDSHREW, + .natDexNum = NATIONAL_DEX_SANDSHREW, + .categoryName = _("Mouse"), + FOOTPRINT(Sandshrew) + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, + .itemRare = ITEM_GRIP_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 50, .baseAttack = 75, @@ -2939,20 +2939,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH] = { - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, \ - .evYield_Defense = 2, \ - .speciesName = _("Sandslash"), \ - .cryId = CRY_SANDSLASH, \ - .natDexNum = NATIONAL_DEX_SANDSLASH, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Sandslash) \ - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ - .itemRare = ITEM_GRIP_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, + .evYield_Defense = 2, + .speciesName = _("Sandslash"), + .cryId = CRY_SANDSLASH, + .natDexNum = NATIONAL_DEX_SANDSLASH, + .categoryName = _("Mouse"), + FOOTPRINT(Sandslash) + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, + .itemRare = ITEM_GRIP_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 75, .baseAttack = 100, @@ -2989,20 +2989,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_SANDSHREW_ALOLAN] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, \ - .evYield_Defense = 1, \ - .speciesName = _("Sandshrew"), \ - .cryId = CRY_SANDSHREW, \ - .natDexNum = NATIONAL_DEX_SANDSHREW, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Sandshrew) \ - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, \ - .itemRare = ITEM_GRIP_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, + .evYield_Defense = 1, + .speciesName = _("Sandshrew"), + .cryId = CRY_SANDSHREW, + .natDexNum = NATIONAL_DEX_SANDSHREW, + .categoryName = _("Mouse"), + FOOTPRINT(Sandshrew) + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, + .itemRare = ITEM_GRIP_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 50, .baseAttack = 75, @@ -3040,20 +3040,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH_ALOLAN] = { - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, \ - .evYield_Defense = 2, \ - .speciesName = _("Sandslash"), \ - .cryId = CRY_SANDSLASH, \ - .natDexNum = NATIONAL_DEX_SANDSLASH, \ - .categoryName = _("Mouse"), \ - FOOTPRINT(Sandslash) \ - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, \ - .itemRare = ITEM_GRIP_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, + .evYield_Defense = 2, + .speciesName = _("Sandslash"), + .cryId = CRY_SANDSLASH, + .natDexNum = NATIONAL_DEX_SANDSLASH, + .categoryName = _("Mouse"), + FOOTPRINT(Sandslash) + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, + .itemRare = ITEM_GRIP_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 75, .baseAttack = 100, @@ -3566,31 +3566,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_VULPIX [SPECIES_VULPIX] = { - .baseHP = 38, \ - .baseAttack = 41, \ - .baseDefense = 40, \ - .baseSpeed = 65, \ - .baseSpAttack = 50, \ - .baseSpDefense = 65, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, \ - .evYield_Speed = 1, \ - .speciesName = _("Vulpix"), \ - .cryId = CRY_VULPIX, \ - .natDexNum = NATIONAL_DEX_VULPIX, \ - .categoryName = _("Fox"), \ - .height = 6, \ - .weight = 99, \ - .pokemonScale = 542, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Vulpix) \ - .formSpeciesIdTable = sVulpixFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 38, + .baseAttack = 41, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 65, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, + .evYield_Speed = 1, + .speciesName = _("Vulpix"), + .cryId = CRY_VULPIX, + .natDexNum = NATIONAL_DEX_VULPIX, + .categoryName = _("Fox"), + .height = 6, + .weight = 99, + .pokemonScale = 542, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Vulpix) + .formSpeciesIdTable = sVulpixFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_FIRE), .itemRare = ITEM_CHARCOAL, @@ -3616,26 +3616,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES] = { - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, \ - .evYield_Speed = 1, \ - .evYield_SpDefense = 1, \ - .speciesName = _("Ninetales"), \ - .cryId = CRY_NINETALES, \ - .natDexNum = NATIONAL_DEX_NINETALES, \ - .categoryName = _("Fox"), \ - .height = 11, \ - .weight = 199, \ - .pokemonScale = 339, \ - .pokemonOffset = 10, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Ninetales) \ - .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, + .evYield_Speed = 1, + .evYield_SpDefense = 1, + .speciesName = _("Ninetales"), + .cryId = CRY_NINETALES, + .natDexNum = NATIONAL_DEX_NINETALES, + .categoryName = _("Fox"), + .height = 11, + .weight = 199, + .pokemonScale = 339, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Ninetales) + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 73, .baseAttack = 76, @@ -3667,31 +3667,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_VULPIX_ALOLAN] = { - .baseHP = 38, \ - .baseAttack = 41, \ - .baseDefense = 40, \ - .baseSpeed = 65, \ - .baseSpAttack = 50, \ - .baseSpDefense = 65, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, \ - .evYield_Speed = 1, \ - .speciesName = _("Vulpix"), \ - .cryId = CRY_VULPIX, \ - .natDexNum = NATIONAL_DEX_VULPIX, \ - .categoryName = _("Fox"), \ - .height = 6, \ - .weight = 99, \ - .pokemonScale = 542, \ - .pokemonOffset = 19, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Vulpix) \ - .formSpeciesIdTable = sVulpixFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 38, + .baseAttack = 41, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 65, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, + .evYield_Speed = 1, + .speciesName = _("Vulpix"), + .cryId = CRY_VULPIX, + .natDexNum = NATIONAL_DEX_VULPIX, + .categoryName = _("Fox"), + .height = 6, + .weight = 99, + .pokemonScale = 542, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Vulpix) + .formSpeciesIdTable = sVulpixFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_ICE), .itemRare = ITEM_SNOWBALL, @@ -3718,26 +3718,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES_ALOLAN] = { - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, \ - .evYield_Speed = 1, \ - .evYield_SpDefense = 1, \ - .speciesName = _("Ninetales"), \ - .cryId = CRY_NINETALES, \ - .natDexNum = NATIONAL_DEX_NINETALES, \ - .categoryName = _("Fox"), \ - .height = 11, \ - .weight = 199, \ - .pokemonScale = 339, \ - .pokemonOffset = 10, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Ninetales) \ - .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, + .evYield_Speed = 1, + .evYield_SpDefense = 1, + .speciesName = _("Ninetales"), + .cryId = CRY_NINETALES, + .natDexNum = NATIONAL_DEX_NINETALES, + .categoryName = _("Fox"), + .height = 11, + .weight = 199, + .pokemonScale = 339, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Ninetales) + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .baseHP = 73, .baseAttack = 67, @@ -4533,26 +4533,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DIGLETT] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, \ - .evYield_Speed = 1, \ - .speciesName = _("Diglett"), \ - .cryId = CRY_DIGLETT, \ - .natDexNum = NATIONAL_DEX_DIGLETT, \ - .categoryName = _("Mole"), \ - .height = 2, \ - .pokemonScale = 833, \ - .pokemonOffset = 25, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Diglett) \ - .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ - .itemRare = ITEM_SOFT_SAND, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, + .evYield_Speed = 1, + .speciesName = _("Diglett"), + .cryId = CRY_DIGLETT, + .natDexNum = NATIONAL_DEX_DIGLETT, + .categoryName = _("Mole"), + .height = 2, + .pokemonScale = 833, + .pokemonOffset = 25, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Diglett) + .formSpeciesIdTable = sDiglettFormSpeciesIdTable, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 10, .baseAttack = 55, @@ -4584,26 +4584,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO] = { - .catchRate = 50, \ - .expYield = DUGTRIO_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Dugtrio"), \ - .cryId = CRY_DUGTRIO, \ - .natDexNum = NATIONAL_DEX_DUGTRIO, \ - .categoryName = _("Mole"), \ - .height = 7, \ - .pokemonScale = 406, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Dugtrio) \ - .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ - .itemRare = ITEM_SOFT_SAND, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 50, + .expYield = DUGTRIO_EXP_YIELD, + .evYield_Speed = 2, + .speciesName = _("Dugtrio"), + .cryId = CRY_DUGTRIO, + .natDexNum = NATIONAL_DEX_DUGTRIO, + .categoryName = _("Mole"), + .height = 7, + .pokemonScale = 406, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Dugtrio) + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 35, .baseAttack = DUGTRIO_ATTACK, @@ -4635,26 +4635,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_DIGLETT_ALOLAN] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, \ - .evYield_Speed = 1, \ - .speciesName = _("Diglett"), \ - .cryId = CRY_DIGLETT, \ - .natDexNum = NATIONAL_DEX_DIGLETT, \ - .categoryName = _("Mole"), \ - .height = 2, \ - .pokemonScale = 833, \ - .pokemonOffset = 25, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Diglett) \ - .formSpeciesIdTable = sDiglettFormSpeciesIdTable, \ - .itemRare = ITEM_SOFT_SAND, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, + .evYield_Speed = 1, + .speciesName = _("Diglett"), + .cryId = CRY_DIGLETT, + .natDexNum = NATIONAL_DEX_DIGLETT, + .categoryName = _("Mole"), + .height = 2, + .pokemonScale = 833, + .pokemonOffset = 25, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Diglett) + .formSpeciesIdTable = sDiglettFormSpeciesIdTable, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 10, .baseAttack = 55, @@ -4686,26 +4686,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO_ALOLAN] = { - .catchRate = 50, \ - .expYield = DUGTRIO_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Dugtrio"), \ - .cryId = CRY_DUGTRIO, \ - .natDexNum = NATIONAL_DEX_DUGTRIO, \ - .categoryName = _("Mole"), \ - .height = 7, \ - .pokemonScale = 406, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Dugtrio) \ - .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, \ - .itemRare = ITEM_SOFT_SAND, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 50, + .expYield = DUGTRIO_EXP_YIELD, + .evYield_Speed = 2, + .speciesName = _("Dugtrio"), + .cryId = CRY_DUGTRIO, + .natDexNum = NATIONAL_DEX_DUGTRIO, + .categoryName = _("Mole"), + .height = 7, + .pokemonScale = 406, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Dugtrio) + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 35, .baseAttack = DUGTRIO_ATTACK, @@ -4740,18 +4740,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MEOWTH [SPECIES_MEOWTH] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowth"), \ - .cryId = CRY_MEOWTH, \ - .natDexNum = NATIONAL_DEX_MEOWTH, \ - .categoryName = _("Scratch Cat"), \ - FOOTPRINT(Meowth) \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowth"), + .cryId = CRY_MEOWTH, + .natDexNum = NATIONAL_DEX_MEOWTH, + .categoryName = _("Scratch Cat"), + FOOTPRINT(Meowth) .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, @@ -4792,20 +4792,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN] = { - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Persian"), \ - .cryId = CRY_PERSIAN, \ - .natDexNum = NATIONAL_DEX_PERSIAN, \ - .categoryName = _("Classy Cat"), \ - FOOTPRINT(Persian) \ + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, + .evYield_Speed = 2, + .itemRare = ITEM_QUICK_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Persian"), + .cryId = CRY_PERSIAN, + .natDexNum = NATIONAL_DEX_PERSIAN, + .categoryName = _("Classy Cat"), + FOOTPRINT(Persian) .formSpeciesIdTable = sPersianFormSpeciesIdTable, .baseHP = 65, .baseAttack = 70, @@ -4843,18 +4843,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_MEOWTH_ALOLAN] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowth"), \ - .cryId = CRY_MEOWTH, \ - .natDexNum = NATIONAL_DEX_MEOWTH, \ - .categoryName = _("Scratch Cat"), \ - FOOTPRINT(Meowth) \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowth"), + .cryId = CRY_MEOWTH, + .natDexNum = NATIONAL_DEX_MEOWTH, + .categoryName = _("Scratch Cat"), + FOOTPRINT(Meowth) .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 35, @@ -4894,20 +4894,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN_ALOLAN] = { - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, \ - .evYield_Speed = 2, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Persian"), \ - .cryId = CRY_PERSIAN, \ - .natDexNum = NATIONAL_DEX_PERSIAN, \ - .categoryName = _("Classy Cat"), \ - FOOTPRINT(Persian) \ + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, + .evYield_Speed = 2, + .itemRare = ITEM_QUICK_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Persian"), + .cryId = CRY_PERSIAN, + .natDexNum = NATIONAL_DEX_PERSIAN, + .categoryName = _("Classy Cat"), + FOOTPRINT(Persian) .formSpeciesIdTable = sPersianFormSpeciesIdTable, .baseHP = 65, .baseAttack = 60, @@ -4946,18 +4946,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MEOWTH_GALARIAN] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowth"), \ - .cryId = CRY_MEOWTH, \ - .natDexNum = NATIONAL_DEX_MEOWTH, \ - .categoryName = _("Scratch Cat"), \ - FOOTPRINT(Meowth) \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowth"), + .cryId = CRY_MEOWTH, + .natDexNum = NATIONAL_DEX_MEOWTH, + .categoryName = _("Scratch Cat"), + FOOTPRINT(Meowth) .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 50, .baseAttack = 65, @@ -5044,18 +5044,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_MEOWTH_GIGANTAMAX] = { - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowth"), \ - .cryId = CRY_MEOWTH, \ - .natDexNum = NATIONAL_DEX_MEOWTH, \ - .categoryName = _("Scratch Cat"), \ - FOOTPRINT(Meowth) \ + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowth"), + .cryId = CRY_MEOWTH, + .natDexNum = NATIONAL_DEX_MEOWTH, + .categoryName = _("Scratch Cat"), + FOOTPRINT(Meowth) .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, @@ -5343,19 +5343,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_GROWLITHE [SPECIES_GROWLITHE] = { - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, \ - .evYield_Attack = 1, \ - .speciesName = _("Growlithe"), \ - .cryId = CRY_GROWLITHE, \ - .natDexNum = NATIONAL_DEX_GROWLITHE, \ - FOOTPRINT(Growlithe) \ - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, + .evYield_Attack = 1, + .speciesName = _("Growlithe"), + .cryId = CRY_GROWLITHE, + .natDexNum = NATIONAL_DEX_GROWLITHE, + FOOTPRINT(Growlithe) + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 55, .baseAttack = 70, @@ -5393,20 +5393,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE] = { - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, \ - .evYield_Attack = 2, \ - .speciesName = _("Arcanine"), \ - .cryId = CRY_ARCANINE, \ - .natDexNum = NATIONAL_DEX_ARCANINE, \ - .categoryName = _("Legendary"), \ - FOOTPRINT(Arcanine) \ - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, + .evYield_Attack = 2, + .speciesName = _("Arcanine"), + .cryId = CRY_ARCANINE, + .natDexNum = NATIONAL_DEX_ARCANINE, + .categoryName = _("Legendary"), + FOOTPRINT(Arcanine) + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 90, .baseAttack = 110, @@ -5443,19 +5443,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_HISUIAN_FORMS [SPECIES_GROWLITHE_HISUIAN] = { - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, \ - .evYield_Attack = 1, \ - .speciesName = _("Growlithe"), \ - .cryId = CRY_GROWLITHE, \ - .natDexNum = NATIONAL_DEX_GROWLITHE, \ - FOOTPRINT(Growlithe) \ - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, + .evYield_Attack = 1, + .speciesName = _("Growlithe"), + .cryId = CRY_GROWLITHE, + .natDexNum = NATIONAL_DEX_GROWLITHE, + FOOTPRINT(Growlithe) + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 60, .baseAttack = 75, @@ -5493,20 +5493,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE_HISUIAN] = { - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, \ - .evYield_Attack = 2, \ - .speciesName = _("Arcanine"), \ - .cryId = CRY_ARCANINE, \ - .natDexNum = NATIONAL_DEX_ARCANINE, \ - .categoryName = _("Legendary"), \ - FOOTPRINT(Arcanine) \ - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, + .evYield_Attack = 2, + .speciesName = _("Arcanine"), + .cryId = CRY_ARCANINE, + .natDexNum = NATIONAL_DEX_ARCANINE, + .categoryName = _("Legendary"), + FOOTPRINT(Arcanine) + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .bodyColor = BODY_COLOR_BROWN, .baseHP = 95, .baseAttack = 115, @@ -5876,22 +5876,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ALAKAZAM] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 50, \ - .evYield_SpAttack = 3, \ - .itemRare = ITEM_TWISTED_SPOON, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Alakazam"), \ - .natDexNum = NATIONAL_DEX_ALAKAZAM, \ - .categoryName = _("Psi"), \ - FOOTPRINT(Alakazam) \ - LEARNSETS(Alakazam), \ - .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 50, + .evYield_SpAttack = 3, + .itemRare = ITEM_TWISTED_SPOON, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Alakazam"), + .natDexNum = NATIONAL_DEX_ALAKAZAM, + .categoryName = _("Psi"), + FOOTPRINT(Alakazam) + LEARNSETS(Alakazam), + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, .baseAttack = 50, @@ -5937,22 +5937,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALAKAZAM_MEGA] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 50, \ - .evYield_SpAttack = 3, \ - .itemRare = ITEM_TWISTED_SPOON, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Alakazam"), \ - .natDexNum = NATIONAL_DEX_ALAKAZAM, \ - .categoryName = _("Psi"), \ - FOOTPRINT(Alakazam) \ - LEARNSETS(Alakazam), \ - .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 50, + .evYield_SpAttack = 3, + .itemRare = ITEM_TWISTED_SPOON, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Alakazam"), + .natDexNum = NATIONAL_DEX_ALAKAZAM, + .categoryName = _("Psi"), + FOOTPRINT(Alakazam) + LEARNSETS(Alakazam), + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, .baseAttack = 50, @@ -6105,31 +6105,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MACHAMP] = { - .baseHP = 90, \ - .baseAttack = 130, \ - .baseDefense = 80, \ - .baseSpeed = 55, \ - .baseSpAttack = 65, \ - .baseSpDefense = 85, \ - .types = MON_TYPES(TYPE_FIGHTING), \ - .catchRate = 45, \ - .expYield = MACHAMP_EXP_YIELD, \ - .evYield_Attack = 3, \ - .itemRare = ITEM_FOCUS_BAND, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .abilities = { ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Machamp"), \ - .cryId = CRY_MACHAMP, \ - .natDexNum = NATIONAL_DEX_MACHAMP, \ - .categoryName = _("Superpower"), \ - FOOTPRINT(Machamp) \ - LEARNSETS(Machamp), \ - .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ + .baseHP = 90, + .baseAttack = 130, + .baseDefense = 80, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_FIGHTING), + .catchRate = 45, + .expYield = MACHAMP_EXP_YIELD, + .evYield_Attack = 3, + .itemRare = ITEM_FOCUS_BAND, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Machamp"), + .cryId = CRY_MACHAMP, + .natDexNum = NATIONAL_DEX_MACHAMP, + .categoryName = _("Superpower"), + FOOTPRINT(Machamp) + LEARNSETS(Machamp), + .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, .height = 16, .weight = 1300, @@ -6156,31 +6156,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_MACHAMP_GIGANTAMAX] = { - .baseHP = 90, \ - .baseAttack = 130, \ - .baseDefense = 80, \ - .baseSpeed = 55, \ - .baseSpAttack = 65, \ - .baseSpDefense = 85, \ - .types = MON_TYPES(TYPE_FIGHTING), \ - .catchRate = 45, \ - .expYield = MACHAMP_EXP_YIELD, \ - .evYield_Attack = 3, \ - .itemRare = ITEM_FOCUS_BAND, \ - .genderRatio = PERCENT_FEMALE(25), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .abilities = { ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Machamp"), \ - .cryId = CRY_MACHAMP, \ - .natDexNum = NATIONAL_DEX_MACHAMP, \ - .categoryName = _("Superpower"), \ - FOOTPRINT(Machamp) \ - LEARNSETS(Machamp), \ - .formSpeciesIdTable = sMachampFormSpeciesIdTable, \ + .baseHP = 90, + .baseAttack = 130, + .baseDefense = 80, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_FIGHTING), + .catchRate = 45, + .expYield = MACHAMP_EXP_YIELD, + .evYield_Attack = 3, + .itemRare = ITEM_FOCUS_BAND, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_GUTS, ABILITY_NO_GUARD, ABILITY_STEADFAST }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Machamp"), + .cryId = CRY_MACHAMP, + .natDexNum = NATIONAL_DEX_MACHAMP, + .categoryName = _("Superpower"), + FOOTPRINT(Machamp) + LEARNSETS(Machamp), + .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, .height = 250, .weight = 0, @@ -6484,34 +6484,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GEODUDE] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ - .itemRare = ITEM_EVERSTONE, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), + .itemRare = ITEM_EVERSTONE, .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, - .baseHP = 40, \ - .baseAttack = 80, \ - .baseDefense = 100, \ - .baseSpeed = 20, \ - .baseSpAttack = 30, \ - .baseSpDefense = 30, \ - .catchRate = 255, \ - .expYield = GEODUDE_EXP_YIELD, \ - .evYield_Defense = 1, \ - .speciesName = _("Geodude"), \ - .cryId = CRY_GEODUDE, \ - .natDexNum = NATIONAL_DEX_GEODUDE, \ - .categoryName = _("Rock"), \ - .height = 4, \ - .pokemonScale = 347, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Geodude) \ - .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 40, + .baseAttack = 80, + .baseDefense = 100, + .baseSpeed = 20, + .baseSpAttack = 30, + .baseSpDefense = 30, + .catchRate = 255, + .expYield = GEODUDE_EXP_YIELD, + .evYield_Defense = 1, + .speciesName = _("Geodude"), + .cryId = CRY_GEODUDE, + .natDexNum = NATIONAL_DEX_GEODUDE, + .categoryName = _("Rock"), + .height = 4, + .pokemonScale = 347, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Geodude) + .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .weight = 200, .description = COMPOUND_STRING( @@ -6535,34 +6535,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ - .itemRare = ITEM_EVERSTONE, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), + .itemRare = ITEM_EVERSTONE, .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, - .baseHP = 55, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 35, \ - .baseSpAttack = 45, \ - .baseSpDefense = 45, \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, \ - .evYield_Defense = 2, \ - .speciesName = _("Graveler"), \ - .cryId = CRY_GRAVELER, \ - .natDexNum = NATIONAL_DEX_GRAVELER, \ - .categoryName = _("Rock"), \ - .height = 10, \ - .pokemonScale = 256, \ - .pokemonOffset = 2, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Graveler) \ - .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 35, + .baseSpAttack = 45, + .baseSpDefense = 45, + .catchRate = 120, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, + .evYield_Defense = 2, + .speciesName = _("Graveler"), + .cryId = CRY_GRAVELER, + .natDexNum = NATIONAL_DEX_GRAVELER, + .categoryName = _("Rock"), + .height = 10, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Graveler) + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .weight = 1050, .description = COMPOUND_STRING( @@ -6586,29 +6586,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), \ - .itemRare = ITEM_EVERSTONE, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), + .itemRare = ITEM_EVERSTONE, .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, - .baseHP = 80, \ - .baseAttack = GOLEM_ATTACK, \ - .baseDefense = 130, \ - .baseSpeed = 45, \ - .baseSpAttack = 55, \ - .baseSpDefense = 65, \ - .catchRate = 45, \ - .expYield = GOLEM_EXP_YIELD, \ - .evYield_Defense = 3, \ - .speciesName = _("Golem"), \ - .cryId = CRY_GOLEM, \ - .natDexNum = NATIONAL_DEX_GOLEM, \ - .categoryName = _("Megaton"), \ - FOOTPRINT(Golem) \ - .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 80, + .baseAttack = GOLEM_ATTACK, + .baseDefense = 130, + .baseSpeed = 45, + .baseSpAttack = 55, + .baseSpDefense = 65, + .catchRate = 45, + .expYield = GOLEM_EXP_YIELD, + .evYield_Defense = 3, + .speciesName = _("Golem"), + .cryId = CRY_GOLEM, + .natDexNum = NATIONAL_DEX_GOLEM, + .categoryName = _("Megaton"), + FOOTPRINT(Golem) + .formSpeciesIdTable = sGolemFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .height = 14, .weight = 3000, @@ -6636,34 +6636,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_GEODUDE_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, .isAlolanForm = TRUE, - .baseHP = 40, \ - .baseAttack = 80, \ - .baseDefense = 100, \ - .baseSpeed = 20, \ - .baseSpAttack = 30, \ - .baseSpDefense = 30, \ - .catchRate = 255, \ - .expYield = GEODUDE_EXP_YIELD, \ - .evYield_Defense = 1, \ - .speciesName = _("Geodude"), \ - .cryId = CRY_GEODUDE, \ - .natDexNum = NATIONAL_DEX_GEODUDE, \ - .categoryName = _("Rock"), \ - .height = 4, \ - .pokemonScale = 347, \ - .pokemonOffset = 18, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Geodude) \ - .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 40, + .baseAttack = 80, + .baseDefense = 100, + .baseSpeed = 20, + .baseSpAttack = 30, + .baseSpDefense = 30, + .catchRate = 255, + .expYield = GEODUDE_EXP_YIELD, + .evYield_Defense = 1, + .speciesName = _("Geodude"), + .cryId = CRY_GEODUDE, + .natDexNum = NATIONAL_DEX_GEODUDE, + .categoryName = _("Rock"), + .height = 4, + .pokemonScale = 347, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Geodude) + .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .itemRare = ITEM_CELL_BATTERY, .weight = 203, @@ -6688,34 +6688,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, .isAlolanForm = TRUE, - .baseHP = 55, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 35, \ - .baseSpAttack = 45, \ - .baseSpDefense = 45, \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, \ - .evYield_Defense = 2, \ - .speciesName = _("Graveler"), \ - .cryId = CRY_GRAVELER, \ - .natDexNum = NATIONAL_DEX_GRAVELER, \ - .categoryName = _("Rock"), \ - .height = 10, \ - .pokemonScale = 256, \ - .pokemonOffset = 2, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Graveler) \ - .formSpeciesIdTable = sGravelerFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 35, + .baseSpAttack = 45, + .baseSpDefense = 45, + .catchRate = 120, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, + .evYield_Defense = 2, + .speciesName = _("Graveler"), + .cryId = CRY_GRAVELER, + .natDexNum = NATIONAL_DEX_GRAVELER, + .categoryName = _("Rock"), + .height = 10, + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Graveler) + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .itemRare = ITEM_CELL_BATTERY, .weight = 1100, @@ -6740,29 +6740,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), \ - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE },\ + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, .isAlolanForm = TRUE, - .baseHP = 80, \ - .baseAttack = GOLEM_ATTACK, \ - .baseDefense = 130, \ - .baseSpeed = 45, \ - .baseSpAttack = 55, \ - .baseSpDefense = 65, \ - .catchRate = 45, \ - .expYield = GOLEM_EXP_YIELD, \ - .evYield_Defense = 3, \ - .speciesName = _("Golem"), \ - .cryId = CRY_GOLEM, \ - .natDexNum = NATIONAL_DEX_GOLEM, \ - .categoryName = _("Megaton"), \ - FOOTPRINT(Golem) \ - .formSpeciesIdTable = sGolemFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ + .baseHP = 80, + .baseAttack = GOLEM_ATTACK, + .baseDefense = 130, + .baseSpeed = 45, + .baseSpAttack = 55, + .baseSpDefense = 65, + .catchRate = 45, + .expYield = GOLEM_EXP_YIELD, + .evYield_Defense = 3, + .speciesName = _("Golem"), + .cryId = CRY_GOLEM, + .natDexNum = NATIONAL_DEX_GOLEM, + .categoryName = _("Megaton"), + FOOTPRINT(Golem) + .formSpeciesIdTable = sGolemFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), .bodyColor = BODY_COLOR_BROWN, .itemCommon = ITEM_CELL_BATTERY, .height = 17, @@ -6793,27 +6793,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_PONYTA [SPECIES_PONYTA] = { - .types = MON_TYPES(TYPE_FIRE), \ - .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, \ + .types = MON_TYPES(TYPE_FIRE), + .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, .bodyColor = BODY_COLOR_YELLOW, - .baseHP = 50, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 90, \ - .baseSpAttack = 65, \ - .baseSpDefense = 65, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, \ - .evYield_Speed = 1, \ - .speciesName = _("Ponyta"), \ - .cryId = CRY_PONYTA, \ - .natDexNum = NATIONAL_DEX_PONYTA, \ - FOOTPRINT(Ponyta) \ - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 90, + .baseSpAttack = 65, + .baseSpDefense = 65, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, + .evYield_Speed = 1, + .speciesName = _("Ponyta"), + .cryId = CRY_PONYTA, + .natDexNum = NATIONAL_DEX_PONYTA, + FOOTPRINT(Ponyta) + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .categoryName = _("Fire Horse"), .height = 10, @@ -6843,32 +6843,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH] = { - .types = MON_TYPES(TYPE_FIRE), \ - .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, \ + .types = MON_TYPES(TYPE_FIRE), + .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, .bodyColor = BODY_COLOR_YELLOW, - .baseHP = 65, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 105, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, \ - .evYield_Speed = 2, \ - .speciesName = _("Rapidash"), \ - .cryId = CRY_RAPIDASH, \ - .natDexNum = NATIONAL_DEX_RAPIDASH, \ - .height = 17, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 289, \ - .trainerOffset = 1, \ - FOOTPRINT(Rapidash) \ - .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 65, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 105, + .baseSpAttack = 80, + .baseSpDefense = 80, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, + .evYield_Speed = 2, + .speciesName = _("Rapidash"), + .cryId = CRY_RAPIDASH, + .natDexNum = NATIONAL_DEX_RAPIDASH, + .height = 17, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 289, + .trainerOffset = 1, + FOOTPRINT(Rapidash) + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .categoryName = _("Fire Horse"), .weight = 950, @@ -6892,27 +6892,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_PONYTA_GALARIAN] = { - .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION },\ - .bodyColor = BODY_COLOR_WHITE, \ + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_WHITE, .isGalarianForm = TRUE, - .baseHP = 50, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 90, \ - .baseSpAttack = 65, \ - .baseSpDefense = 65, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, \ - .evYield_Speed = 1, \ - .speciesName = _("Ponyta"), \ - .cryId = CRY_PONYTA, \ - .natDexNum = NATIONAL_DEX_PONYTA, \ - FOOTPRINT(Ponyta) \ - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 90, + .baseSpAttack = 65, + .baseSpDefense = 65, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, + .evYield_Speed = 1, + .speciesName = _("Ponyta"), + .cryId = CRY_PONYTA, + .natDexNum = NATIONAL_DEX_PONYTA, + FOOTPRINT(Ponyta) + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_PSYCHIC), .categoryName = _("Unique Horn"), @@ -6942,32 +6942,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH_GALARIAN] = { - .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION },\ - .bodyColor = BODY_COLOR_WHITE, \ + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_WHITE, .isGalarianForm = TRUE, - .baseHP = 65, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 105, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, \ - .evYield_Speed = 2, \ - .speciesName = _("Rapidash"), \ - .cryId = CRY_RAPIDASH, \ - .natDexNum = NATIONAL_DEX_RAPIDASH, \ - .height = 17, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 289, \ - .trainerOffset = 1, \ - FOOTPRINT(Rapidash) \ - .formSpeciesIdTable = sRapidashFormSpeciesIdTable, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 65, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 105, + .baseSpAttack = 80, + .baseSpDefense = 80, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, + .evYield_Speed = 2, + .speciesName = _("Rapidash"), + .cryId = CRY_RAPIDASH, + .natDexNum = NATIONAL_DEX_RAPIDASH, + .height = 17, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 289, + .trainerOffset = 1, + FOOTPRINT(Rapidash) + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), .categoryName = _("Unique Horn"), @@ -6994,31 +6994,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_SLOWPOKE [SPECIES_SLOWPOKE] = { - .baseHP = 90, \ - .baseAttack = 65, \ - .baseDefense = 65, \ - .baseSpeed = 15, \ - .baseSpAttack = 40, \ - .baseSpDefense = 40, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowpoke"), \ - .natDexNum = NATIONAL_DEX_SLOWPOKE, \ - .categoryName = _("Dopey"), \ - .height = 12, \ - .weight = 360, \ - .pokemonScale = 256, \ - .pokemonOffset = 10, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Slowpoke) \ + .baseHP = 90, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 15, + .baseSpAttack = 40, + .baseSpDefense = 40, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowpoke"), + .natDexNum = NATIONAL_DEX_SLOWPOKE, + .categoryName = _("Dopey"), + .height = 12, + .weight = 360, + .pokemonScale = 256, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Slowpoke) .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .itemRare = ITEM_LAGGING_TAIL, @@ -7046,19 +7046,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO] = { - .catchRate = 75, \ - .itemRare = ITEM_KINGS_ROCK, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowbro"), \ - .cryId = CRY_SLOWBRO, \ - .natDexNum = NATIONAL_DEX_SLOWBRO, \ - .categoryName = _("Hermit Crab"), \ - FOOTPRINT(Slowbro) \ + .catchRate = 75, + .itemRare = ITEM_KINGS_ROCK, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowbro"), + .cryId = CRY_SLOWBRO, + .natDexNum = NATIONAL_DEX_SLOWBRO, + .categoryName = _("Hermit Crab"), + FOOTPRINT(Slowbro) .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, @@ -7097,19 +7097,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING] = { - .catchRate = 70, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowking"), \ - .cryId = CRY_SLOWKING, \ - .natDexNum = NATIONAL_DEX_SLOWKING, \ - .weight = 795, \ - FOOTPRINT(Slowking) \ + .catchRate = 70, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowking"), + .cryId = CRY_SLOWKING, + .natDexNum = NATIONAL_DEX_SLOWKING, + .weight = 795, + FOOTPRINT(Slowking) .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, @@ -7148,19 +7148,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SLOWBRO_MEGA] = { - .catchRate = 75, \ - .itemRare = ITEM_KINGS_ROCK, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowbro"), \ - .cryId = CRY_SLOWBRO, \ - .natDexNum = NATIONAL_DEX_SLOWBRO, \ - .categoryName = _("Hermit Crab"), \ - FOOTPRINT(Slowbro) \ + .catchRate = 75, + .itemRare = ITEM_KINGS_ROCK, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowbro"), + .cryId = CRY_SLOWBRO, + .natDexNum = NATIONAL_DEX_SLOWBRO, + .categoryName = _("Hermit Crab"), + FOOTPRINT(Slowbro) .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, @@ -7201,31 +7201,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_SLOWPOKE_GALARIAN] = { - .baseHP = 90, \ - .baseAttack = 65, \ - .baseDefense = 65, \ - .baseSpeed = 15, \ - .baseSpAttack = 40, \ - .baseSpDefense = 40, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowpoke"), \ - .natDexNum = NATIONAL_DEX_SLOWPOKE, \ - .categoryName = _("Dopey"), \ - .height = 12, \ - .weight = 360, \ - .pokemonScale = 256, \ - .pokemonOffset = 10, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Slowpoke) \ + .baseHP = 90, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 15, + .baseSpAttack = 40, + .baseSpDefense = 40, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowpoke"), + .natDexNum = NATIONAL_DEX_SLOWPOKE, + .categoryName = _("Dopey"), + .height = 12, + .weight = 360, + .pokemonScale = 256, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Slowpoke) .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .types = MON_TYPES(TYPE_PSYCHIC), .abilities = { ABILITY_GLUTTONY, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, @@ -7252,19 +7252,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO_GALARIAN] = { - .catchRate = 75, \ - .itemRare = ITEM_KINGS_ROCK, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowbro"), \ - .cryId = CRY_SLOWBRO, \ - .natDexNum = NATIONAL_DEX_SLOWBRO, \ - .categoryName = _("Hermit Crab"), \ - FOOTPRINT(Slowbro) \ + .catchRate = 75, + .itemRare = ITEM_KINGS_ROCK, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowbro"), + .cryId = CRY_SLOWBRO, + .natDexNum = NATIONAL_DEX_SLOWBRO, + .categoryName = _("Hermit Crab"), + FOOTPRINT(Slowbro) .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .baseHP = 95, .baseAttack = 100, @@ -7303,19 +7303,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING_GALARIAN] = { - .catchRate = 70, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Slowking"), \ - .cryId = CRY_SLOWKING, \ - .natDexNum = NATIONAL_DEX_SLOWKING, \ - .weight = 795, \ - FOOTPRINT(Slowking) \ + .catchRate = 70, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowking"), + .cryId = CRY_SLOWKING, + .natDexNum = NATIONAL_DEX_SLOWKING, + .weight = 795, + FOOTPRINT(Slowking) .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .baseHP = 95, .baseAttack = 65, @@ -7526,20 +7526,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_FARFETCHD] = { - .catchRate = 45, \ - .expYield = FARFETCHD_EXP_YIELD, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD),\ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Farfetch'd"), \ - .cryId = CRY_FARFETCHD, \ - .natDexNum = NATIONAL_DEX_FARFETCHD, \ - .categoryName = _("Wild Duck"), \ - FOOTPRINT(Farfetchd) \ + .catchRate = 45, + .expYield = FARFETCHD_EXP_YIELD, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Farfetch'd"), + .cryId = CRY_FARFETCHD, + .natDexNum = NATIONAL_DEX_FARFETCHD, + .categoryName = _("Wild Duck"), + FOOTPRINT(Farfetchd) .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .baseHP = 52, .baseDefense = 55, @@ -7576,20 +7576,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_FARFETCHD_GALARIAN] = { - .catchRate = 45, \ - .expYield = FARFETCHD_EXP_YIELD, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD),\ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Farfetch'd"), \ - .cryId = CRY_FARFETCHD, \ - .natDexNum = NATIONAL_DEX_FARFETCHD, \ - .categoryName = _("Wild Duck"), \ - FOOTPRINT(Farfetchd) \ + .catchRate = 45, + .expYield = FARFETCHD_EXP_YIELD, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Farfetch'd"), + .cryId = CRY_FARFETCHD, + .natDexNum = NATIONAL_DEX_FARFETCHD, + .categoryName = _("Wild Duck"), + FOOTPRINT(Farfetchd) .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .baseHP = 52, .baseAttack = FARFETCHD_ATTACK + 5, @@ -7884,29 +7884,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_GRIMER [SPECIES_GRIMER] = { - .types = MON_TYPES(TYPE_POISON), \ - .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, \ + .types = MON_TYPES(TYPE_POISON), + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, .bodyColor = BODY_COLOR_PURPLE, - .baseHP = 80, \ - .baseAttack = 80, \ - .baseDefense = 50, \ - .baseSpeed = 25, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, \ - .evYield_HP = 1, \ - .speciesName = _("Grimer"), \ - .cryId = CRY_GRIMER, \ - .natDexNum = NATIONAL_DEX_GRIMER, \ - .categoryName = _("Sludge"), \ - FOOTPRINT(Grimer) \ - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 25, + .baseSpAttack = 40, + .baseSpDefense = 50, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, + .evYield_HP = 1, + .speciesName = _("Grimer"), + .cryId = CRY_GRIMER, + .natDexNum = NATIONAL_DEX_GRIMER, + .categoryName = _("Sludge"), + FOOTPRINT(Grimer) + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, + .itemRare = ITEM_BLACK_SLUDGE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 9, .weight = 300, @@ -7934,30 +7934,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MUK] = { - .types = MON_TYPES(TYPE_POISON), \ - .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, \ + .types = MON_TYPES(TYPE_POISON), + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, .bodyColor = BODY_COLOR_PURPLE, - .baseHP = 105, \ - .baseAttack = 105, \ - .baseDefense = 75, \ - .baseSpeed = 50, \ - .baseSpAttack = 65, \ - .baseSpDefense = 100, \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157,\ - .evYield_HP = 1, \ - .evYield_Attack = 1, \ - .speciesName = _("Muk"), \ - .cryId = CRY_MUK, \ - .natDexNum = NATIONAL_DEX_MUK, \ - .categoryName = _("Sludge"), \ - FOOTPRINT(Muk) \ - .formSpeciesIdTable = sMukFormSpeciesIdTable, \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 105, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 100, + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157, + .evYield_HP = 1, + .evYield_Attack = 1, + .speciesName = _("Muk"), + .cryId = CRY_MUK, + .natDexNum = NATIONAL_DEX_MUK, + .categoryName = _("Sludge"), + FOOTPRINT(Muk) + .formSpeciesIdTable = sMukFormSpeciesIdTable, + .itemRare = ITEM_BLACK_SLUDGE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 12, .weight = 300, @@ -7986,30 +7986,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_GRIMER_ALOLAN] = { - .types = MON_TYPES(TYPE_POISON, TYPE_DARK), \ - .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, \ - .bodyColor = BODY_COLOR_GREEN, \ + .types = MON_TYPES(TYPE_POISON, TYPE_DARK), + .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, + .bodyColor = BODY_COLOR_GREEN, .isAlolanForm = TRUE, - .baseHP = 80, \ - .baseAttack = 80, \ - .baseDefense = 50, \ - .baseSpeed = 25, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, \ - .evYield_HP = 1, \ - .speciesName = _("Grimer"), \ - .cryId = CRY_GRIMER, \ - .natDexNum = NATIONAL_DEX_GRIMER, \ - .categoryName = _("Sludge"), \ - FOOTPRINT(Grimer) \ - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 25, + .baseSpAttack = 40, + .baseSpDefense = 50, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, + .evYield_HP = 1, + .speciesName = _("Grimer"), + .cryId = CRY_GRIMER, + .natDexNum = NATIONAL_DEX_GRIMER, + .categoryName = _("Sludge"), + FOOTPRINT(Grimer) + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, + .itemRare = ITEM_BLACK_SLUDGE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .height = 7, .weight = 420, @@ -8037,31 +8037,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MUK_ALOLAN] = { - .baseHP = 105, \ - .baseAttack = 105, \ - .baseDefense = 75, \ - .baseSpeed = 50, \ - .baseSpAttack = 65, \ - .baseSpDefense = 100, \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157,\ - .evYield_HP = 1, \ - .evYield_Attack = 1, \ - .speciesName = _("Muk"), \ - .cryId = CRY_MUK, \ - .natDexNum = NATIONAL_DEX_MUK, \ - .categoryName = _("Sludge"), \ - FOOTPRINT(Muk) \ - .formSpeciesIdTable = sMukFormSpeciesIdTable, \ - .itemRare = ITEM_BLACK_SLUDGE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ + .baseHP = 105, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 100, + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157, + .evYield_HP = 1, + .evYield_Attack = 1, + .speciesName = _("Muk"), + .cryId = CRY_MUK, + .natDexNum = NATIONAL_DEX_MUK, + .categoryName = _("Sludge"), + FOOTPRINT(Muk) + .formSpeciesIdTable = sMukFormSpeciesIdTable, + .itemRare = ITEM_BLACK_SLUDGE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - .types = MON_TYPES(TYPE_POISON, TYPE_DARK), \ - .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, \ - .bodyColor = BODY_COLOR_GREEN, \ + .types = MON_TYPES(TYPE_POISON, TYPE_DARK), + .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, + .bodyColor = BODY_COLOR_GREEN, .isAlolanForm = TRUE, .noFlip = TRUE, .height = 10, @@ -8300,21 +8300,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GENGAR] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),\ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Gengar"), \ - .natDexNum = NATIONAL_DEX_GENGAR, \ - .categoryName = _("Shadow"), \ - FOOTPRINT(Gengar) \ - LEARNSETS(Gengar), \ - .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Gengar"), + .natDexNum = NATIONAL_DEX_GENGAR, + .categoryName = _("Shadow"), + FOOTPRINT(Gengar) + LEARNSETS(Gengar), + .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, @@ -8355,21 +8355,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GENGAR_MEGA] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),\ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Gengar"), \ - .natDexNum = NATIONAL_DEX_GENGAR, \ - .categoryName = _("Shadow"), \ - FOOTPRINT(Gengar) \ - LEARNSETS(Gengar), \ - .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Gengar"), + .natDexNum = NATIONAL_DEX_GENGAR, + .categoryName = _("Shadow"), + FOOTPRINT(Gengar) + LEARNSETS(Gengar), + .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, @@ -8406,21 +8406,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_GENGAR_GIGANTAMAX] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), \ - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS),\ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Gengar"), \ - .natDexNum = NATIONAL_DEX_GENGAR, \ - .categoryName = _("Shadow"), \ - FOOTPRINT(Gengar) \ - LEARNSETS(Gengar), \ - .formSpeciesIdTable = sGengarFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Gengar"), + .natDexNum = NATIONAL_DEX_GENGAR, + .categoryName = _("Shadow"), + FOOTPRINT(Gengar) + LEARNSETS(Gengar), + .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, .baseAttack = 65, @@ -8508,22 +8508,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_STEELIX] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), \ - .catchRate = 25, \ - .evYield_Defense = 2, \ - .itemRare = ITEM_METAL_COAT, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Steelix"), \ - .natDexNum = NATIONAL_DEX_STEELIX, \ - .categoryName = _("Iron Snake"), \ - FOOTPRINT(Steelix) \ - LEARNSETS(Steelix), \ - .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), + .catchRate = 25, + .evYield_Defense = 2, + .itemRare = ITEM_METAL_COAT, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Steelix"), + .natDexNum = NATIONAL_DEX_STEELIX, + .categoryName = _("Iron Snake"), + FOOTPRINT(Steelix) + LEARNSETS(Steelix), + .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, .baseAttack = 85, @@ -8562,22 +8562,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_STEELIX_MEGA] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), \ - .catchRate = 25, \ - .evYield_Defense = 2, \ - .itemRare = ITEM_METAL_COAT, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Steelix"), \ - .natDexNum = NATIONAL_DEX_STEELIX, \ - .categoryName = _("Iron Snake"), \ - FOOTPRINT(Steelix) \ - LEARNSETS(Steelix), \ - .formSpeciesIdTable = sSteelixFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), + .catchRate = 25, + .evYield_Defense = 2, + .itemRare = ITEM_METAL_COAT, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Steelix"), + .natDexNum = NATIONAL_DEX_STEELIX, + .categoryName = _("Iron Snake"), + FOOTPRINT(Steelix) + LEARNSETS(Steelix), + .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, .baseAttack = 125, @@ -8766,31 +8766,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_KINGLER] = { - .baseHP = 55, \ - .baseAttack = 130, \ - .baseDefense = 115, \ - .baseSpeed = 75, \ - .baseSpAttack = 50, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 206, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3), \ - .abilities = { ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE },\ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = TRUE, \ - .speciesName = _("Kingler"), \ - .cryId = CRY_KINGLER, \ - .natDexNum = NATIONAL_DEX_KINGLER, \ - .categoryName = _("Pincer"), \ - FOOTPRINT(Kingler) \ - LEARNSETS(Kingler), \ - .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 130, + .baseDefense = 115, + .baseSpeed = 75, + .baseSpAttack = 50, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 206, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3), + .abilities = { ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE }, + .bodyColor = BODY_COLOR_RED, + .noFlip = TRUE, + .speciesName = _("Kingler"), + .cryId = CRY_KINGLER, + .natDexNum = NATIONAL_DEX_KINGLER, + .categoryName = _("Pincer"), + FOOTPRINT(Kingler) + LEARNSETS(Kingler), + .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, .height = 13, .weight = 600, @@ -8818,31 +8818,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_KINGLER_GIGANTAMAX] = { - .baseHP = 55, \ - .baseAttack = 130, \ - .baseDefense = 115, \ - .baseSpeed = 75, \ - .baseSpAttack = 50, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 206, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3), \ - .abilities = { ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE },\ - .bodyColor = BODY_COLOR_RED, \ - .noFlip = TRUE, \ - .speciesName = _("Kingler"), \ - .cryId = CRY_KINGLER, \ - .natDexNum = NATIONAL_DEX_KINGLER, \ - .categoryName = _("Pincer"), \ - FOOTPRINT(Kingler) \ - LEARNSETS(Kingler), \ - .formSpeciesIdTable = sKinglerFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 130, + .baseDefense = 115, + .baseSpeed = 75, + .baseSpAttack = 50, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 206, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_3), + .abilities = { ABILITY_HYPER_CUTTER, ABILITY_SHELL_ARMOR, ABILITY_SHEER_FORCE }, + .bodyColor = BODY_COLOR_RED, + .noFlip = TRUE, + .speciesName = _("Kingler"), + .cryId = CRY_KINGLER, + .natDexNum = NATIONAL_DEX_KINGLER, + .categoryName = _("Pincer"), + FOOTPRINT(Kingler) + LEARNSETS(Kingler), + .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, .height = 190, .weight = 0, @@ -8880,31 +8880,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_VOLTORB] = { - .baseHP = 40, \ - .baseAttack = 30, \ - .baseDefense = 50, \ - .baseSpeed = 100, \ - .baseSpAttack = 55, \ - .baseSpDefense = 55, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, \ - .evYield_Speed = 1, \ - .speciesName = _("Voltorb"), \ - .cryId = CRY_VOLTORB, \ - .natDexNum = NATIONAL_DEX_VOLTORB, \ - .height = 5, \ - .pokemonScale = 364, \ - .pokemonOffset = -8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Voltorb) \ - .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 50, + .baseSpeed = 100, + .baseSpAttack = 55, + .baseSpDefense = 55, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, + .evYield_Speed = 1, + .speciesName = _("Voltorb"), + .cryId = CRY_VOLTORB, + .natDexNum = NATIONAL_DEX_VOLTORB, + .height = 5, + .pokemonScale = 364, + .pokemonOffset = -8, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Voltorb) + .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC), .categoryName = _("Ball"), @@ -8929,31 +8929,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ELECTRODE] = { - .baseHP = 60, \ - .baseAttack = 50, \ - .baseDefense = 70, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ - .catchRate = 60, \ - .expYield = ELECTRODE_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Electrode"), \ - .cryId = CRY_ELECTRODE, \ - .natDexNum = NATIONAL_DEX_ELECTRODE, \ - .height = 12, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Electrode) \ - .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 70, + .baseSpAttack = 80, + .baseSpDefense = 80, + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, + .catchRate = 60, + .expYield = ELECTRODE_EXP_YIELD, + .evYield_Speed = 2, + .speciesName = _("Electrode"), + .cryId = CRY_ELECTRODE, + .natDexNum = NATIONAL_DEX_ELECTRODE, + .height = 12, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Electrode) + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC), .categoryName = _("Ball"), @@ -8978,31 +8978,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_HISUIAN_FORMS [SPECIES_VOLTORB_HISUIAN] = { - .baseHP = 40, \ - .baseAttack = 30, \ - .baseDefense = 50, \ - .baseSpeed = 100, \ - .baseSpAttack = 55, \ - .baseSpDefense = 55, \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, \ - .evYield_Speed = 1, \ - .speciesName = _("Voltorb"), \ - .cryId = CRY_VOLTORB, \ - .natDexNum = NATIONAL_DEX_VOLTORB, \ - .height = 5, \ - .pokemonScale = 364, \ - .pokemonOffset = -8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Voltorb) \ - .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 50, + .baseSpeed = 100, + .baseSpAttack = 55, + .baseSpDefense = 55, + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, + .evYield_Speed = 1, + .speciesName = _("Voltorb"), + .cryId = CRY_VOLTORB, + .natDexNum = NATIONAL_DEX_VOLTORB, + .height = 5, + .pokemonScale = 364, + .pokemonOffset = -8, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Voltorb) + .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .categoryName = _("Sphere"), @@ -9028,31 +9028,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ELECTRODE_HISUIAN] = { - .baseHP = 60, \ - .baseAttack = 50, \ - .baseDefense = 70, \ - .baseSpAttack = 80, \ - .baseSpDefense = 80, \ - .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, \ - .catchRate = 60, \ - .expYield = ELECTRODE_EXP_YIELD, \ - .evYield_Speed = 2, \ - .speciesName = _("Electrode"), \ - .cryId = CRY_ELECTRODE, \ - .natDexNum = NATIONAL_DEX_ELECTRODE, \ - .height = 12, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Electrode) \ - .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, \ + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 70, + .baseSpAttack = 80, + .baseSpDefense = 80, + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, + .catchRate = 60, + .expYield = ELECTRODE_EXP_YIELD, + .evYield_Speed = 2, + .speciesName = _("Electrode"), + .cryId = CRY_ELECTRODE, + .natDexNum = NATIONAL_DEX_ELECTRODE, + .height = 12, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Electrode) + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, .bodyColor = BODY_COLOR_RED, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .categoryName = _("Sphere"), @@ -9140,20 +9140,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_EXEGGUTOR] = { - .catchRate = 45, \ - .expYield = EXEGGUTOR_EXP_YIELD, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Exeggutor"), \ - .cryId = CRY_EXEGGUTOR, \ - .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ - .categoryName = _("Coconut"), \ - FOOTPRINT(Exeggutor) \ + .catchRate = 45, + .expYield = EXEGGUTOR_EXP_YIELD, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Exeggutor"), + .cryId = CRY_EXEGGUTOR, + .natDexNum = NATIONAL_DEX_EXEGGUTOR, + .categoryName = _("Coconut"), + FOOTPRINT(Exeggutor) .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .baseHP = 95, .baseAttack = 95, @@ -9189,20 +9189,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_EXEGGUTOR_ALOLAN] = { - .catchRate = 45, \ - .expYield = EXEGGUTOR_EXP_YIELD, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Exeggutor"), \ - .cryId = CRY_EXEGGUTOR, \ - .natDexNum = NATIONAL_DEX_EXEGGUTOR, \ - .categoryName = _("Coconut"), \ - FOOTPRINT(Exeggutor) \ + .catchRate = 45, + .expYield = EXEGGUTOR_EXP_YIELD, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Exeggutor"), + .cryId = CRY_EXEGGUTOR, + .natDexNum = NATIONAL_DEX_EXEGGUTOR, + .categoryName = _("Coconut"), + FOOTPRINT(Exeggutor) .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .baseHP = 95, .baseAttack = 105, @@ -9292,31 +9292,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MAROWAK] = { - .baseHP = 60, \ - .baseAttack = 80, \ - .baseDefense = 110, \ - .baseSpeed = 45, \ - .baseSpAttack = 50, \ - .baseSpDefense = 80, \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124,\ - .evYield_Defense = 2, \ - .itemRare = ITEM_THICK_CLUB, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .speciesName = _("Marowak"), \ - .cryId = CRY_MAROWAK, \ - .natDexNum = NATIONAL_DEX_MAROWAK, \ - .categoryName = _("Bone Keeper"), \ - .height = 10, \ - .pokemonScale = 293, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Marowak) \ + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 45, + .baseSpAttack = 50, + .baseSpDefense = 80, + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124, + .evYield_Defense = 2, + .itemRare = ITEM_THICK_CLUB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .speciesName = _("Marowak"), + .cryId = CRY_MAROWAK, + .natDexNum = NATIONAL_DEX_MAROWAK, + .categoryName = _("Bone Keeper"), + .height = 10, + .pokemonScale = 293, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Marowak) .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .types = MON_TYPES(TYPE_GROUND), .abilities = { ABILITY_ROCK_HEAD, ABILITY_LIGHTNING_ROD, ABILITY_BATTLE_ARMOR }, @@ -9342,31 +9342,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_MAROWAK_ALOLAN] = { - .baseHP = 60, \ - .baseAttack = 80, \ - .baseDefense = 110, \ - .baseSpeed = 45, \ - .baseSpAttack = 50, \ - .baseSpDefense = 80, \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124,\ - .evYield_Defense = 2, \ - .itemRare = ITEM_THICK_CLUB, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .speciesName = _("Marowak"), \ - .cryId = CRY_MAROWAK, \ - .natDexNum = NATIONAL_DEX_MAROWAK, \ - .categoryName = _("Bone Keeper"), \ - .height = 10, \ - .pokemonScale = 293, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Marowak) \ + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 45, + .baseSpAttack = 50, + .baseSpDefense = 80, + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124, + .evYield_Defense = 2, + .itemRare = ITEM_THICK_CLUB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .speciesName = _("Marowak"), + .cryId = CRY_MAROWAK, + .natDexNum = NATIONAL_DEX_MAROWAK, + .categoryName = _("Bone Keeper"), + .height = 10, + .pokemonScale = 293, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Marowak) .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), .abilities = { ABILITY_CURSED_BODY, ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD }, @@ -9748,26 +9748,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_WEEZING] = { - .baseHP = 65, \ - .baseAttack = 90, \ - .baseDefense = 120, \ - .baseSpeed = 60, \ - .baseSpAttack = 85, \ - .baseSpDefense = 70, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .noFlip = TRUE, \ - .speciesName = _("Weezing"), \ - .cryId = CRY_WEEZING, \ - .natDexNum = NATIONAL_DEX_WEEZING, \ - .categoryName = _("Poison Gas"), \ - FOOTPRINT(Weezing) \ + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 120, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 70, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .noFlip = TRUE, + .speciesName = _("Weezing"), + .cryId = CRY_WEEZING, + .natDexNum = NATIONAL_DEX_WEEZING, + .categoryName = _("Poison Gas"), + FOOTPRINT(Weezing) .formSpeciesIdTable = sWeezingFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON), .itemRare = ITEM_SMOKE_BALL, @@ -9804,26 +9804,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_WEEZING_GALARIAN] = { - .baseHP = 65, \ - .baseAttack = 90, \ - .baseDefense = 120, \ - .baseSpeed = 60, \ - .baseSpAttack = 85, \ - .baseSpDefense = 70, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .noFlip = TRUE, \ - .speciesName = _("Weezing"), \ - .cryId = CRY_WEEZING, \ - .natDexNum = NATIONAL_DEX_WEEZING, \ - .categoryName = _("Poison Gas"), \ - FOOTPRINT(Weezing) \ + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 120, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 70, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .noFlip = TRUE, + .speciesName = _("Weezing"), + .cryId = CRY_WEEZING, + .natDexNum = NATIONAL_DEX_WEEZING, + .categoryName = _("Poison Gas"), + FOOTPRINT(Weezing) .formSpeciesIdTable = sWeezingFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON, TYPE_FAIRY), .itemRare = ITEM_MISTY_SEED, @@ -10272,26 +10272,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_KANGASKHAN [SPECIES_KANGASKHAN] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .evYield_HP = 2, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Kangaskhan"), \ - .natDexNum = NATIONAL_DEX_KANGASKHAN, \ - .categoryName = _("Parent"), \ - .height = 22, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 387, \ - .trainerOffset = 8, \ - FOOTPRINT(Kangaskhan) \ - LEARNSETS(Kangaskhan), \ - .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .evYield_HP = 2, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Kangaskhan"), + .natDexNum = NATIONAL_DEX_KANGASKHAN, + .categoryName = _("Parent"), + .height = 22, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, + FOOTPRINT(Kangaskhan) + LEARNSETS(Kangaskhan), + .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, .baseAttack = 95, @@ -10322,26 +10322,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_KANGASKHAN_MEGA] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .evYield_HP = 2, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Kangaskhan"), \ - .natDexNum = NATIONAL_DEX_KANGASKHAN, \ - .categoryName = _("Parent"), \ - .height = 22, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 387, \ - .trainerOffset = 8, \ - FOOTPRINT(Kangaskhan) \ - LEARNSETS(Kangaskhan), \ - .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .evYield_HP = 2, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Kangaskhan"), + .natDexNum = NATIONAL_DEX_KANGASKHAN, + .categoryName = _("Parent"), + .height = 22, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, + FOOTPRINT(Kangaskhan) + LEARNSETS(Kangaskhan), + .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, .baseAttack = 125, @@ -10795,17 +10795,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MR_MIME] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .speciesName = _("Mr. Mime"), \ - .cryId = CRY_MR_MIME, \ - .natDexNum = NATIONAL_DEX_MR_MIME, \ - FOOTPRINT(MrMime) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .speciesName = _("Mr. Mime"), + .cryId = CRY_MR_MIME, + .natDexNum = NATIONAL_DEX_MR_MIME, + FOOTPRINT(MrMime) .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .baseHP = 40, .baseAttack = 45, @@ -10848,17 +10848,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MR_MIME_GALARIAN] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .speciesName = _("Mr. Mime"), \ - .cryId = CRY_MR_MIME, \ - .natDexNum = NATIONAL_DEX_MR_MIME, \ - FOOTPRINT(MrMime) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .speciesName = _("Mr. Mime"), + .cryId = CRY_MR_MIME, + .natDexNum = NATIONAL_DEX_MR_MIME, + FOOTPRINT(MrMime) .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .baseHP = 50, .baseAttack = 65, @@ -11000,21 +11000,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SCIZOR] = { - .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), \ - .catchRate = 25, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Scizor"), \ - .natDexNum = NATIONAL_DEX_SCIZOR, \ - .categoryName = _("Pincer"), \ - FOOTPRINT(Scizor) \ - LEARNSETS(Scizor), \ - .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), + .catchRate = 25, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Scizor"), + .natDexNum = NATIONAL_DEX_SCIZOR, + .categoryName = _("Pincer"), + FOOTPRINT(Scizor) + LEARNSETS(Scizor), + .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, .baseHP = 70, .baseAttack = 130, @@ -11052,21 +11052,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCIZOR_MEGA] = { - .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), \ - .catchRate = 25, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Scizor"), \ - .natDexNum = NATIONAL_DEX_SCIZOR, \ - .categoryName = _("Pincer"), \ - FOOTPRINT(Scizor) \ - LEARNSETS(Scizor), \ - .formSpeciesIdTable = sScizorFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), + .catchRate = 25, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Scizor"), + .natDexNum = NATIONAL_DEX_SCIZOR, + .categoryName = _("Pincer"), + FOOTPRINT(Scizor) + LEARNSETS(Scizor), + .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, .baseHP = 70, .baseAttack = 150, @@ -11577,20 +11577,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_PINSIR [SPECIES_PINSIR] = { - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pinsir"), \ - .natDexNum = NATIONAL_DEX_PINSIR, \ - .categoryName = _("Stag Beetle"), \ - FOOTPRINT(Pinsir) \ - LEARNSETS(Pinsir), \ - .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pinsir"), + .natDexNum = NATIONAL_DEX_PINSIR, + .categoryName = _("Stag Beetle"), + FOOTPRINT(Pinsir) + LEARNSETS(Pinsir), + .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, .baseAttack = 125, @@ -11627,20 +11627,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_PINSIR_MEGA] = { - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pinsir"), \ - .natDexNum = NATIONAL_DEX_PINSIR, \ - .categoryName = _("Stag Beetle"), \ - FOOTPRINT(Pinsir) \ - LEARNSETS(Pinsir), \ - .formSpeciesIdTable = sPinsirFormSpeciesIdTable,\ + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pinsir"), + .natDexNum = NATIONAL_DEX_PINSIR, + .categoryName = _("Stag Beetle"), + FOOTPRINT(Pinsir) + LEARNSETS(Pinsir), + .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, .baseAttack = 155, @@ -11681,23 +11681,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_TAUROS [SPECIES_TAUROS] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Tauros"), \ - .cryId = CRY_TAUROS, \ - .natDexNum = NATIONAL_DEX_TAUROS, \ - .categoryName = _("Wild Bull"), \ - .height = 14, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Tauros) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Tauros"), + .cryId = CRY_TAUROS, + .natDexNum = NATIONAL_DEX_TAUROS, + .categoryName = _("Wild Bull"), + .height = 14, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, .baseHP = 75, .baseAttack = 100, @@ -11732,36 +11732,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_PALDEAN_FORMS [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Tauros"), \ - .cryId = CRY_TAUROS, \ - .natDexNum = NATIONAL_DEX_TAUROS, \ - .categoryName = _("Wild Bull"), \ - .height = 14, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Tauros) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Tauros"), + .cryId = CRY_TAUROS, + .natDexNum = NATIONAL_DEX_TAUROS, + .categoryName = _("Wild Bull"), + .height = 14, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, \ - .baseAttack = 110, \ - .baseDefense = 105, \ - .baseSpeed = 100, \ - .baseSpAttack = 30, \ - .baseSpDefense = 70, \ - .evYield_Attack = 2, \ - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .frontAnimFrames = sAnims_TaurosPaldean, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .evYield_Attack = 2, + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING), .weight = 1150, @@ -11781,36 +11781,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Tauros"), \ - .cryId = CRY_TAUROS, \ - .natDexNum = NATIONAL_DEX_TAUROS, \ - .categoryName = _("Wild Bull"), \ - .height = 14, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Tauros) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Tauros"), + .cryId = CRY_TAUROS, + .natDexNum = NATIONAL_DEX_TAUROS, + .categoryName = _("Wild Bull"), + .height = 14, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, \ - .baseAttack = 110, \ - .baseDefense = 105, \ - .baseSpeed = 100, \ - .baseSpAttack = 30, \ - .baseSpDefense = 70, \ - .evYield_Attack = 2, \ - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .frontAnimFrames = sAnims_TaurosPaldean, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .evYield_Attack = 2, + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING, TYPE_FIRE), .weight = 850, @@ -11830,36 +11830,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211,\ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Tauros"), \ - .cryId = CRY_TAUROS, \ - .natDexNum = NATIONAL_DEX_TAUROS, \ - .categoryName = _("Wild Bull"), \ - .height = 14, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Tauros) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Tauros"), + .cryId = CRY_TAUROS, + .natDexNum = NATIONAL_DEX_TAUROS, + .categoryName = _("Wild Bull"), + .height = 14, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, \ - .baseAttack = 110, \ - .baseDefense = 105, \ - .baseSpeed = 100, \ - .baseSpAttack = 30, \ - .baseSpDefense = 70, \ - .evYield_Attack = 2, \ - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .frontAnimFrames = sAnims_TaurosPaldean, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, \ + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .evYield_Attack = 2, + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .weight = 1100, @@ -11933,25 +11933,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GYARADOS] = { - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 5, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Gyarados"), \ - .natDexNum = NATIONAL_DEX_GYARADOS, \ - .categoryName = _("Atrocious"), \ - .height = 65, \ - .pokemonScale = 256, \ - .pokemonOffset = 6, \ - .trainerScale = 481, \ - .trainerOffset = 13, \ - FOOTPRINT(Gyarados) \ - LEARNSETS(Gyarados), \ - .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 5, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Gyarados"), + .natDexNum = NATIONAL_DEX_GYARADOS, + .categoryName = _("Atrocious"), + .height = 65, + .pokemonScale = 256, + .pokemonOffset = 6, + .trainerScale = 481, + .trainerOffset = 13, + FOOTPRINT(Gyarados) + LEARNSETS(Gyarados), + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, .baseAttack = 125, @@ -11985,25 +11985,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GYARADOS_MEGA] = { - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 5, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Gyarados"), \ - .natDexNum = NATIONAL_DEX_GYARADOS, \ - .categoryName = _("Atrocious"), \ - .height = 65, \ - .pokemonScale = 256, \ - .pokemonOffset = 6, \ - .trainerScale = 481, \ - .trainerOffset = 13, \ - FOOTPRINT(Gyarados) \ - LEARNSETS(Gyarados), \ - .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 5, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Gyarados"), + .natDexNum = NATIONAL_DEX_GYARADOS, + .categoryName = _("Atrocious"), + .height = 65, + .pokemonScale = 256, + .pokemonOffset = 6, + .trainerScale = 481, + .trainerOffset = 13, + FOOTPRINT(Gyarados) + LEARNSETS(Gyarados), + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, .baseAttack = 155, @@ -12039,32 +12039,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_LAPRAS [SPECIES_LAPRAS] = { - .baseHP = 130, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 60, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_WATER, TYPE_ICE), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 187 : 219, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .abilities = { ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Lapras"), \ - .cryId = CRY_LAPRAS, \ - .natDexNum = NATIONAL_DEX_LAPRAS, \ - .categoryName = _("Transport"), \ - FOOTPRINT(Lapras) \ - LEARNSETS(Lapras), \ - .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ + .baseHP = 130, + .baseAttack = 85, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_WATER, TYPE_ICE), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 187 : 219, + .evYield_HP = 2, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Lapras"), + .cryId = CRY_LAPRAS, + .natDexNum = NATIONAL_DEX_LAPRAS, + .categoryName = _("Transport"), + FOOTPRINT(Lapras) + LEARNSETS(Lapras), + .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, .height = 25, .weight = 2200, @@ -12091,32 +12091,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_LAPRAS_GIGANTAMAX] = { - .baseHP = 130, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 60, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_WATER, TYPE_ICE), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 187 : 219, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .abilities = { ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Lapras"), \ - .cryId = CRY_LAPRAS, \ - .natDexNum = NATIONAL_DEX_LAPRAS, \ - .categoryName = _("Transport"), \ - FOOTPRINT(Lapras) \ - LEARNSETS(Lapras), \ - .formSpeciesIdTable = sLaprasFormSpeciesIdTable, \ + .baseHP = 130, + .baseAttack = 85, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_WATER, TYPE_ICE), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 187 : 219, + .evYield_HP = 2, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_WATER_ABSORB, ABILITY_SHELL_ARMOR, ABILITY_HYDRATION }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Lapras"), + .cryId = CRY_LAPRAS, + .natDexNum = NATIONAL_DEX_LAPRAS, + .categoryName = _("Transport"), + FOOTPRINT(Lapras) + LEARNSETS(Lapras), + .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, .height = 240, .weight = 0, @@ -12198,30 +12198,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_EEVEE [SPECIES_EEVEE] = { - .baseHP = 55, \ - .baseAttack = 55, \ - .baseDefense = 50, \ - .baseSpeed = 55, \ - .baseSpAttack = 45, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 92, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Eevee"), \ - .cryId = CRY_EEVEE, \ - .natDexNum = NATIONAL_DEX_EEVEE, \ - .categoryName = _("Evolution"), \ - FOOTPRINT(Eevee) \ - LEARNSETS(Eevee), \ - .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 55, + .baseDefense = 50, + .baseSpeed = 55, + .baseSpAttack = 45, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 92, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Eevee"), + .cryId = CRY_EEVEE, + .natDexNum = NATIONAL_DEX_EEVEE, + .categoryName = _("Evolution"), + FOOTPRINT(Eevee) + LEARNSETS(Eevee), + .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, .height = 3, .weight = 65, @@ -12260,30 +12260,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_EEVEE_GIGANTAMAX] = { - .baseHP = 55, \ - .baseAttack = 55, \ - .baseDefense = 50, \ - .baseSpeed = 55, \ - .baseSpAttack = 45, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 92, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Eevee"), \ - .cryId = CRY_EEVEE, \ - .natDexNum = NATIONAL_DEX_EEVEE, \ - .categoryName = _("Evolution"), \ - FOOTPRINT(Eevee) \ - LEARNSETS(Eevee), \ - .formSpeciesIdTable = sEeveeFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 55, + .baseDefense = 50, + .baseSpeed = 55, + .baseSpAttack = 45, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 92, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_RUN_AWAY, ABILITY_ADAPTABILITY, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Eevee"), + .cryId = CRY_EEVEE, + .natDexNum = NATIONAL_DEX_EEVEE, + .categoryName = _("Evolution"), + FOOTPRINT(Eevee) + LEARNSETS(Eevee), + .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, .height = 180, .weight = 0, @@ -13067,21 +13067,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_AERODACTYL [SPECIES_AERODACTYL] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Aerodactyl"), \ - .natDexNum = NATIONAL_DEX_AERODACTYL, \ - .categoryName = _("Fossil"), \ - FOOTPRINT(Aerodactyl) \ - LEARNSETS(Aerodactyl), \ - .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), + .catchRate = 45, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Aerodactyl"), + .natDexNum = NATIONAL_DEX_AERODACTYL, + .categoryName = _("Fossil"), + FOOTPRINT(Aerodactyl) + LEARNSETS(Aerodactyl), + .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, .baseAttack = 105, @@ -13118,21 +13118,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_AERODACTYL_MEGA] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Aerodactyl"), \ - .natDexNum = NATIONAL_DEX_AERODACTYL, \ - .categoryName = _("Fossil"), \ - FOOTPRINT(Aerodactyl) \ - LEARNSETS(Aerodactyl), \ - .formSpeciesIdTable = sAerodactylFormSpeciesIdTable,\ + .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), + .catchRate = 45, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Aerodactyl"), + .natDexNum = NATIONAL_DEX_AERODACTYL, + .categoryName = _("Fossil"), + FOOTPRINT(Aerodactyl) + LEARNSETS(Aerodactyl), + .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, .baseAttack = 135, @@ -13223,32 +13223,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SNORLAX] = { - .baseHP = 160, \ - .baseAttack = 110, \ - .baseDefense = 65, \ - .baseSpeed = 30, \ - .baseSpAttack = 65, \ - .baseSpDefense = 110, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 25, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_LEFTOVERS, \ - .itemRare = ITEM_LEFTOVERS, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .abilities = { ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Snorlax"), \ - .cryId = CRY_SNORLAX, \ - .natDexNum = NATIONAL_DEX_SNORLAX, \ - .categoryName = _("Sleeping"), \ - FOOTPRINT(Snorlax) \ - LEARNSETS(Snorlax), \ - .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ + .baseHP = 160, + .baseAttack = 110, + .baseDefense = 65, + .baseSpeed = 30, + .baseSpAttack = 65, + .baseSpDefense = 110, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 25, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, + .evYield_HP = 2, + .itemCommon = ITEM_LEFTOVERS, + .itemRare = ITEM_LEFTOVERS, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY }, + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Snorlax"), + .cryId = CRY_SNORLAX, + .natDexNum = NATIONAL_DEX_SNORLAX, + .categoryName = _("Sleeping"), + FOOTPRINT(Snorlax) + LEARNSETS(Snorlax), + .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, .height = 21, .weight = 4600, @@ -13275,32 +13275,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_SNORLAX_GIGANTAMAX] = { - .baseHP = 160, \ - .baseAttack = 110, \ - .baseDefense = 65, \ - .baseSpeed = 30, \ - .baseSpAttack = 65, \ - .baseSpDefense = 110, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 25, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_LEFTOVERS, \ - .itemRare = ITEM_LEFTOVERS, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .abilities = { ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Snorlax"), \ - .cryId = CRY_SNORLAX, \ - .natDexNum = NATIONAL_DEX_SNORLAX, \ - .categoryName = _("Sleeping"), \ - FOOTPRINT(Snorlax) \ - LEARNSETS(Snorlax), \ - .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, \ + .baseHP = 160, + .baseAttack = 110, + .baseDefense = 65, + .baseSpeed = 30, + .baseSpAttack = 65, + .baseSpDefense = 110, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 25, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, + .evYield_HP = 2, + .itemCommon = ITEM_LEFTOVERS, + .itemRare = ITEM_LEFTOVERS, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_IMMUNITY, ABILITY_THICK_FAT, ABILITY_GLUTTONY }, + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Snorlax"), + .cryId = CRY_SNORLAX, + .natDexNum = NATIONAL_DEX_SNORLAX, + .categoryName = _("Sleeping"), + FOOTPRINT(Snorlax) + LEARNSETS(Snorlax), + .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, .height = 350, .weight = 0, @@ -13330,21 +13330,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_ARTICUNO [SPECIES_ARTICUNO] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Articuno"), \ - .cryId = CRY_ARTICUNO, \ - .natDexNum = NATIONAL_DEX_ARTICUNO, \ - .height = 17, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 309, \ - .trainerOffset = 2, \ - FOOTPRINT(Articuno) \ - .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Articuno"), + .cryId = CRY_ARTICUNO, + .natDexNum = NATIONAL_DEX_ARTICUNO, + .height = 17, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 309, + .trainerOffset = 2, + FOOTPRINT(Articuno) + .formSpeciesIdTable = sArticunoFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, @@ -13386,21 +13386,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ARTICUNO_GALARIAN] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Articuno"), \ - .cryId = CRY_ARTICUNO, \ - .natDexNum = NATIONAL_DEX_ARTICUNO, \ - .height = 17, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 309, \ - .trainerOffset = 2, \ - FOOTPRINT(Articuno) \ - .formSpeciesIdTable = sArticunoFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Articuno"), + .cryId = CRY_ARTICUNO, + .natDexNum = NATIONAL_DEX_ARTICUNO, + .height = 17, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 309, + .trainerOffset = 2, + FOOTPRINT(Articuno) + .formSpeciesIdTable = sArticunoFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, @@ -13440,22 +13440,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_ZAPDOS [SPECIES_ZAPDOS] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Zapdos"), \ - .cryId = CRY_ZAPDOS, \ - .natDexNum = NATIONAL_DEX_ZAPDOS, \ - .height = 16, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 318, \ - .trainerOffset = 3, \ - FOOTPRINT(Zapdos) \ - .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Zapdos"), + .cryId = CRY_ZAPDOS, + .natDexNum = NATIONAL_DEX_ZAPDOS, + .height = 16, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 318, + .trainerOffset = 3, + FOOTPRINT(Zapdos) + .formSpeciesIdTable = sZapdosFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 90, @@ -13501,22 +13501,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ZAPDOS_GALARIAN] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Zapdos"), \ - .cryId = CRY_ZAPDOS, \ - .natDexNum = NATIONAL_DEX_ZAPDOS, \ - .height = 16, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 318, \ - .trainerOffset = 3, \ - FOOTPRINT(Zapdos) \ - .formSpeciesIdTable = sZapdosFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Zapdos"), + .cryId = CRY_ZAPDOS, + .natDexNum = NATIONAL_DEX_ZAPDOS, + .height = 16, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 318, + .trainerOffset = 3, + FOOTPRINT(Zapdos) + .formSpeciesIdTable = sZapdosFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 125, @@ -13554,21 +13554,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MOLTRES [SPECIES_MOLTRES] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Moltres"), \ - .cryId = CRY_MOLTRES, \ - .natDexNum = NATIONAL_DEX_MOLTRES, \ - .height = 20, \ - .pokemonScale = 270, \ - .pokemonOffset = 0, \ - .trainerScale = 387, \ - .trainerOffset = 8, \ - FOOTPRINT(Moltres) \ - .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Moltres"), + .cryId = CRY_MOLTRES, + .natDexNum = NATIONAL_DEX_MOLTRES, + .height = 20, + .pokemonScale = 270, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, + FOOTPRINT(Moltres) + .formSpeciesIdTable = sMoltresFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 100, @@ -13610,21 +13610,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MOLTRES_GALARIAN] = { - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Moltres"), \ - .cryId = CRY_MOLTRES, \ - .natDexNum = NATIONAL_DEX_MOLTRES, \ - .height = 20, \ - .pokemonScale = 270, \ - .pokemonOffset = 0, \ - .trainerScale = 387, \ - .trainerOffset = 8, \ - FOOTPRINT(Moltres) \ - .formSpeciesIdTable = sMoltresFormSpeciesIdTable, \ + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Moltres"), + .cryId = CRY_MOLTRES, + .natDexNum = NATIONAL_DEX_MOLTRES, + .height = 20, + .pokemonScale = 270, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, + FOOTPRINT(Moltres) + .formSpeciesIdTable = sMoltresFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 85, @@ -13817,21 +13817,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MEWTWO [SPECIES_MEWTWO] = { - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Mewtwo"), \ - .natDexNum = NATIONAL_DEX_MEWTWO, \ - .categoryName = _("Genetic"), \ - FOOTPRINT(Mewtwo) \ - LEARNSETS(Mewtwo), \ - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ - .formChangeTable = sMewtwoFormChangeTable, \ + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Mewtwo"), + .natDexNum = NATIONAL_DEX_MEWTWO, + .categoryName = _("Genetic"), + FOOTPRINT(Mewtwo) + LEARNSETS(Mewtwo), + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, .baseHP = 106, .baseAttack = 110, @@ -13874,21 +13874,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEWTWO_MEGA_X] = { - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Mewtwo"), \ - .natDexNum = NATIONAL_DEX_MEWTWO, \ - .categoryName = _("Genetic"), \ - FOOTPRINT(Mewtwo) \ - LEARNSETS(Mewtwo), \ - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ - .formChangeTable = sMewtwoFormChangeTable, \ + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Mewtwo"), + .natDexNum = NATIONAL_DEX_MEWTWO, + .categoryName = _("Genetic"), + FOOTPRINT(Mewtwo) + LEARNSETS(Mewtwo), + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, .baseHP = 106, .baseAttack = 190, @@ -13925,21 +13925,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MEWTWO_MEGA_Y] = { - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Mewtwo"), \ - .natDexNum = NATIONAL_DEX_MEWTWO, \ - .categoryName = _("Genetic"), \ - FOOTPRINT(Mewtwo) \ - LEARNSETS(Mewtwo), \ - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, \ - .formChangeTable = sMewtwoFormChangeTable, \ + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Mewtwo"), + .natDexNum = NATIONAL_DEX_MEWTWO, + .categoryName = _("Genetic"), + FOOTPRINT(Mewtwo) + LEARNSETS(Mewtwo), + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, .baseHP = 106, .baseAttack = 150, diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index 28acd952f201..f8d35e1d0869 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -267,19 +267,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_TYPHLOSION] = { - .catchRate = 45, \ - .expYield = TYPHLOSION_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Typhlosion"), \ - .cryId = CRY_TYPHLOSION, \ - .natDexNum = NATIONAL_DEX_TYPHLOSION, \ - FOOTPRINT(Typhlosion) \ + .catchRate = 45, + .expYield = TYPHLOSION_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Typhlosion"), + .cryId = CRY_TYPHLOSION, + .natDexNum = NATIONAL_DEX_TYPHLOSION, + FOOTPRINT(Typhlosion) .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .baseHP = 78, .baseAttack = 84, @@ -317,19 +317,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_TYPHLOSION_HISUIAN] = { - .catchRate = 45, \ - .expYield = TYPHLOSION_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Typhlosion"), \ - .cryId = CRY_TYPHLOSION, \ - .natDexNum = NATIONAL_DEX_TYPHLOSION, \ - FOOTPRINT(Typhlosion) \ + .catchRate = 45, + .expYield = TYPHLOSION_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Typhlosion"), + .cryId = CRY_TYPHLOSION, + .natDexNum = NATIONAL_DEX_TYPHLOSION, + FOOTPRINT(Typhlosion) .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .baseHP = 73, .baseAttack = 84, @@ -1389,26 +1389,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_AMPHAROS] = { - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD),\ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Ampharos"), \ - .natDexNum = NATIONAL_DEX_AMPHAROS, \ - .categoryName = _("Light"), \ - .height = 14, \ - .weight = 615, \ - .pokemonScale = 256, \ - .pokemonOffset = 4, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Ampharos) \ - LEARNSETS(Ampharos), \ - .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Ampharos"), + .natDexNum = NATIONAL_DEX_AMPHAROS, + .categoryName = _("Light"), + .height = 14, + .weight = 615, + .pokemonScale = 256, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Ampharos) + LEARNSETS(Ampharos), + .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, .baseAttack = 75, @@ -1448,26 +1448,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_AMPHAROS_MEGA] = { - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD),\ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Ampharos"), \ - .natDexNum = NATIONAL_DEX_AMPHAROS, \ - .categoryName = _("Light"), \ - .height = 14, \ - .weight = 615, \ - .pokemonScale = 256, \ - .pokemonOffset = 4, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Ampharos) \ - LEARNSETS(Ampharos), \ - .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Ampharos"), + .natDexNum = NATIONAL_DEX_AMPHAROS, + .categoryName = _("Light"), + .height = 14, + .weight = 615, + .pokemonScale = 256, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Ampharos) + LEARNSETS(Ampharos), + .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, .baseAttack = 95, @@ -2228,29 +2228,29 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_FAMILY_WOOPER [SPECIES_WOOPER] = { - .baseHP = 55, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 15, \ - .baseSpAttack = 25, \ - .baseSpDefense = 25, \ - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), \ - .speciesName = _("Wooper"), \ - .cryId = CRY_WOOPER, \ - .natDexNum = NATIONAL_DEX_WOOPER, \ - .height = 4, \ - .pokemonScale = 479, \ - .pokemonOffset = 21, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Wooper) \ + .baseHP = 55, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 15, + .baseSpAttack = 25, + .baseSpDefense = 25, + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .speciesName = _("Wooper"), + .cryId = CRY_WOOPER, + .natDexNum = NATIONAL_DEX_WOOPER, + .height = 4, + .pokemonScale = 479, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Wooper) .formSpeciesIdTable = sWooperFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .abilities = { ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, @@ -2329,29 +2329,29 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_PALDEAN_FORMS [SPECIES_WOOPER_PALDEAN] = { - .baseHP = 55, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 15, \ - .baseSpAttack = 25, \ - .baseSpDefense = 25, \ - .catchRate = 255, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), \ - .speciesName = _("Wooper"), \ - .cryId = CRY_WOOPER, \ - .natDexNum = NATIONAL_DEX_WOOPER, \ - .height = 4, \ - .pokemonScale = 479, \ - .pokemonOffset = 21, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Wooper) \ + .baseHP = 55, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 15, + .baseSpAttack = 25, + .baseSpDefense = 25, + .catchRate = 255, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .speciesName = _("Wooper"), + .cryId = CRY_WOOPER, + .natDexNum = NATIONAL_DEX_WOOPER, + .height = 4, + .pokemonScale = 479, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Wooper) .formSpeciesIdTable = sWooperFormSpeciesIdTable, .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), .abilities = { ABILITY_POISON_POINT, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, @@ -3075,39 +3075,39 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GEN_9_CROSS_EVOS [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = { - .baseHP = 125, \ - .baseAttack = 100, \ - .baseDefense = 80, \ - .baseSpeed = 55, \ - .baseSpAttack = 85, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .expYield = 182, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Dudunsprce"), \ - .cryId = CRY_DUDUNSPARCE, \ - .natDexNum = NATIONAL_DEX_DUDUNSPARCE, \ - .categoryName = _("Land Snake"), \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(DudunsparceTwoSegment, 64, 64), \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Dudunsparce, \ - BACK_PIC(DudunsparceTwoSegment, 64, 64), \ - .backPicYOffset = 11, \ - PALETTES(Dudunsparce), \ - ICON(Dudunsparce, 0), \ - LEARNSETS(Dudunsparce), \ + .baseHP = 125, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 55, + .baseSpAttack = 85, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .expYield = 182, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Dudunsprce"), + .cryId = CRY_DUDUNSPARCE, + .natDexNum = NATIONAL_DEX_DUDUNSPARCE, + .categoryName = _("Land Snake"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(DudunsparceTwoSegment, 64, 64), + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Dudunsparce, + BACK_PIC(DudunsparceTwoSegment, 64, 64), + .backPicYOffset = 11, + PALETTES(Dudunsparce), + ICON(Dudunsparce, 0), + LEARNSETS(Dudunsparce), .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3123,39 +3123,39 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = { - .baseHP = 125, \ - .baseAttack = 100, \ - .baseDefense = 80, \ - .baseSpeed = 55, \ - .baseSpAttack = 85, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 45, \ - .expYield = 182, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Dudunsprce"), \ - .cryId = CRY_DUDUNSPARCE, \ - .natDexNum = NATIONAL_DEX_DUDUNSPARCE, \ - .categoryName = _("Land Snake"), \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(DudunsparceThreeSegment, 64, 64), \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Dudunsparce, \ - BACK_PIC(DudunsparceThreeSegment, 64, 64), \ - .backPicYOffset = 11, \ - PALETTES(Dudunsparce), \ - ICON(Dudunsparce, 0), \ - LEARNSETS(Dudunsparce), \ + .baseHP = 125, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 55, + .baseSpAttack = 85, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 45, + .expYield = 182, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SERENE_GRACE, ABILITY_RUN_AWAY, ABILITY_RATTLED }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Dudunsprce"), + .cryId = CRY_DUDUNSPARCE, + .natDexNum = NATIONAL_DEX_DUDUNSPARCE, + .categoryName = _("Land Snake"), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(DudunsparceThreeSegment, 64, 64), + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Dudunsparce, + BACK_PIC(DudunsparceThreeSegment, 64, 64), + .backPicYOffset = 11, + PALETTES(Dudunsparce), + ICON(Dudunsparce, 0), + LEARNSETS(Dudunsparce), .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3392,33 +3392,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_QWILFISH] = { - .baseHP = 65, \ - .baseAttack = 95, \ - .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, \ - .baseSpeed = 85, \ - .baseSpAttack = 55, \ - .baseSpDefense = 55, \ - .catchRate = 45, \ - .expYield = QWILFISH_EXP_YIELD, \ - .evYield_Attack = 1, \ - .itemRare = ITEM_POISON_BARB, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, \ - .speciesName = _("Qwilfish"), \ - .cryId = CRY_QWILFISH, \ - .natDexNum = NATIONAL_DEX_QWILFISH, \ - .categoryName = _("Balloon"), \ - .height = 5, \ - .weight = 39, \ - .pokemonScale = 430, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Qwilfish) \ + .baseHP = 65, + .baseAttack = 95, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 55, + .catchRate = 45, + .expYield = QWILFISH_EXP_YIELD, + .evYield_Attack = 1, + .itemRare = ITEM_POISON_BARB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, + .speciesName = _("Qwilfish"), + .cryId = CRY_QWILFISH, + .natDexNum = NATIONAL_DEX_QWILFISH, + .categoryName = _("Balloon"), + .height = 5, + .weight = 39, + .pokemonScale = 430, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Qwilfish) .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .types = MON_TYPES(TYPE_WATER, TYPE_POISON), .bodyColor = BODY_COLOR_GRAY, @@ -3443,33 +3443,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_QWILFISH_HISUIAN] = { - .baseHP = 65, \ - .baseAttack = 95, \ - .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, \ - .baseSpeed = 85, \ - .baseSpAttack = 55, \ - .baseSpDefense = 55, \ - .catchRate = 45, \ - .expYield = QWILFISH_EXP_YIELD, \ - .evYield_Attack = 1, \ - .itemRare = ITEM_POISON_BARB, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, \ - .speciesName = _("Qwilfish"), \ - .cryId = CRY_QWILFISH, \ - .natDexNum = NATIONAL_DEX_QWILFISH, \ - .categoryName = _("Balloon"), \ - .height = 5, \ - .weight = 39, \ - .pokemonScale = 430, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Qwilfish) \ + .baseHP = 65, + .baseAttack = 95, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 55, + .catchRate = 45, + .expYield = QWILFISH_EXP_YIELD, + .evYield_Attack = 1, + .itemRare = ITEM_POISON_BARB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, + .speciesName = _("Qwilfish"), + .cryId = CRY_QWILFISH, + .natDexNum = NATIONAL_DEX_QWILFISH, + .categoryName = _("Balloon"), + .height = 5, + .weight = 39, + .pokemonScale = 430, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Qwilfish) .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_POISON), .bodyColor = BODY_COLOR_BLACK, @@ -3597,21 +3597,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_FAMILY_HERACROSS [SPECIES_HERACROSS] = { - .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Heracross"), \ - .natDexNum = NATIONAL_DEX_HERACROSS, \ - .categoryName = _("Single Horn"), \ - FOOTPRINT(Heracross) \ - LEARNSETS(Heracross), \ - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Heracross"), + .natDexNum = NATIONAL_DEX_HERACROSS, + .categoryName = _("Single Horn"), + FOOTPRINT(Heracross) + LEARNSETS(Heracross), + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, .baseAttack = 125, @@ -3649,21 +3649,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HERACROSS_MEGA] = { - .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Heracross"), \ - .natDexNum = NATIONAL_DEX_HERACROSS, \ - .categoryName = _("Single Horn"), \ - FOOTPRINT(Heracross) \ - LEARNSETS(Heracross), \ - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Heracross"), + .natDexNum = NATIONAL_DEX_HERACROSS, + .categoryName = _("Single Horn"), + FOOTPRINT(Heracross) + LEARNSETS(Heracross), + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, .baseAttack = 185, @@ -3702,32 +3702,32 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_FAMILY_SNEASEL [SPECIES_SNEASEL] = { - .baseHP = 55, \ - .baseAttack = 95, \ - .baseDefense = 55, \ - .baseSpeed = 115, \ - .baseSpAttack = 35, \ - .baseSpDefense = 75, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, \ - .evYield_Speed = 1, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .noFlip = TRUE, \ - .speciesName = _("Sneasel"), \ - .cryId = CRY_SNEASEL, \ - .natDexNum = NATIONAL_DEX_SNEASEL, \ - .categoryName = _("Sharp Claw"), \ - .height = 9, \ - .pokemonScale = 413, \ - .pokemonOffset = -3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Sneasel) \ + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 55, + .baseSpeed = 115, + .baseSpAttack = 35, + .baseSpDefense = 75, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, + .evYield_Speed = 1, + .itemRare = ITEM_QUICK_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .noFlip = TRUE, + .speciesName = _("Sneasel"), + .cryId = CRY_SNEASEL, + .natDexNum = NATIONAL_DEX_SNEASEL, + .categoryName = _("Sharp Claw"), + .height = 9, + .pokemonScale = 413, + .pokemonOffset = -3, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Sneasel) .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_ICE), .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, @@ -3810,32 +3810,32 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_SNEASEL_HISUIAN] = { - .baseHP = 55, \ - .baseAttack = 95, \ - .baseDefense = 55, \ - .baseSpeed = 115, \ - .baseSpAttack = 35, \ - .baseSpDefense = 75, \ - .catchRate = 60, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, \ - .evYield_Speed = 1, \ - .itemRare = ITEM_QUICK_CLAW, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .noFlip = TRUE, \ - .speciesName = _("Sneasel"), \ - .cryId = CRY_SNEASEL, \ - .natDexNum = NATIONAL_DEX_SNEASEL, \ - .categoryName = _("Sharp Claw"), \ - .height = 9, \ - .pokemonScale = 413, \ - .pokemonOffset = -3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Sneasel) \ + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 55, + .baseSpeed = 115, + .baseSpAttack = 35, + .baseSpDefense = 75, + .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, + .evYield_Speed = 1, + .itemRare = ITEM_QUICK_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .noFlip = TRUE, + .speciesName = _("Sneasel"), + .cryId = CRY_SNEASEL, + .natDexNum = NATIONAL_DEX_SNEASEL, + .categoryName = _("Sharp Claw"), + .height = 9, + .pokemonScale = 413, + .pokemonOffset = -3, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Sneasel) .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIGHTING, TYPE_POISON), .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, @@ -4016,17 +4016,17 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GEN_8_CROSS_EVOS [SPECIES_URSALUNA] = { - .expYield = 275, \ - .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Ursaluna"), \ - .cryId = CRY_URSALUNA, \ - .natDexNum = NATIONAL_DEX_URSALUNA, \ - .categoryName = _("Peat"), \ + .expYield = 275, + .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Ursaluna"), + .cryId = CRY_URSALUNA, + .natDexNum = NATIONAL_DEX_URSALUNA, + .categoryName = _("Peat"), .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 130, .baseAttack = 140, @@ -4063,17 +4063,17 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_URSALUNA_BLOODMOON] = { - .expYield = 275, \ - .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Ursaluna"), \ - .cryId = CRY_URSALUNA, \ - .natDexNum = NATIONAL_DEX_URSALUNA, \ - .categoryName = _("Peat"), \ + .expYield = 275, + .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Ursaluna"), + .cryId = CRY_URSALUNA, + .natDexNum = NATIONAL_DEX_URSALUNA, + .categoryName = _("Peat"), .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 113, .baseAttack = 70, @@ -4385,24 +4385,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_CORSOLA] = { - .catchRate = 60, \ - .expYield = CORSOLA_EXP_YIELD, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3),\ - .speciesName = _("Corsola"), \ - .cryId = CRY_CORSOLA, \ - .natDexNum = NATIONAL_DEX_CORSOLA, \ - .categoryName = _("Coral"), \ - .height = 6, \ - .pokemonScale = 410, \ - .pokemonOffset = 15, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Corsola) \ + .catchRate = 60, + .expYield = CORSOLA_EXP_YIELD, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3), + .speciesName = _("Corsola"), + .cryId = CRY_CORSOLA, + .natDexNum = NATIONAL_DEX_CORSOLA, + .categoryName = _("Coral"), + .height = 6, + .pokemonScale = 410, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Corsola) .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .baseHP = CORSOLA_HP, .baseAttack = 55, @@ -4436,24 +4436,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GALARIAN_FORMS [SPECIES_CORSOLA_GALARIAN] = { - .catchRate = 60, \ - .expYield = CORSOLA_EXP_YIELD, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3),\ - .speciesName = _("Corsola"), \ - .cryId = CRY_CORSOLA, \ - .natDexNum = NATIONAL_DEX_CORSOLA, \ - .categoryName = _("Coral"), \ - .height = 6, \ - .pokemonScale = 410, \ - .pokemonOffset = 15, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Corsola) \ + .catchRate = 60, + .expYield = CORSOLA_EXP_YIELD, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3), + .speciesName = _("Corsola"), + .cryId = CRY_CORSOLA, + .natDexNum = NATIONAL_DEX_CORSOLA, + .categoryName = _("Coral"), + .height = 6, + .pokemonScale = 410, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Corsola) .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .baseHP = CORSOLA_HP - 5, .baseAttack = 55, @@ -4890,21 +4890,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_HOUNDOOM] = { - .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), \ - .catchRate = 45, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Houndoom"), \ - .natDexNum = NATIONAL_DEX_HOUNDOOM, \ - .categoryName = _("Dark"), \ - FOOTPRINT(Houndoom) \ - LEARNSETS(Houndoom), \ - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), + .catchRate = 45, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Houndoom"), + .natDexNum = NATIONAL_DEX_HOUNDOOM, + .categoryName = _("Dark"), + FOOTPRINT(Houndoom) + LEARNSETS(Houndoom), + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, .baseAttack = 90, @@ -4942,21 +4942,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HOUNDOOM_MEGA] = { - .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), \ - .catchRate = 45, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Houndoom"), \ - .natDexNum = NATIONAL_DEX_HOUNDOOM, \ - .categoryName = _("Dark"), \ - FOOTPRINT(Houndoom) \ - LEARNSETS(Houndoom), \ - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), + .catchRate = 45, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Houndoom"), + .natDexNum = NATIONAL_DEX_HOUNDOOM, + .categoryName = _("Dark"), + FOOTPRINT(Houndoom) + LEARNSETS(Houndoom), + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, .baseAttack = 90, @@ -5574,21 +5574,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_TYRANITAR] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Tyranitar"), \ - .natDexNum = NATIONAL_DEX_TYRANITAR, \ - .categoryName = _("Armor"), \ - FOOTPRINT(Tyranitar) \ - LEARNSETS(Tyranitar), \ - .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Tyranitar"), + .natDexNum = NATIONAL_DEX_TYRANITAR, + .categoryName = _("Armor"), + FOOTPRINT(Tyranitar) + LEARNSETS(Tyranitar), + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, .baseAttack = 134, @@ -5631,21 +5631,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_TYRANITAR_MEGA] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Tyranitar"), \ - .natDexNum = NATIONAL_DEX_TYRANITAR, \ - .categoryName = _("Armor"), \ - FOOTPRINT(Tyranitar) \ - LEARNSETS(Tyranitar), \ - .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Tyranitar"), + .natDexNum = NATIONAL_DEX_TYRANITAR, + .categoryName = _("Armor"), + FOOTPRINT(Tyranitar) + LEARNSETS(Tyranitar), + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, .baseAttack = 164, diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 6336ce3378ff..1ce8df52fb90 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -102,20 +102,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SCEPTILE] = { - .catchRate = 45, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sceptile"), \ - .natDexNum = NATIONAL_DEX_SCEPTILE, \ - .categoryName = _("Forest"), \ - FOOTPRINT(Sceptile) \ - LEARNSETS(Sceptile), \ - .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sceptile"), + .natDexNum = NATIONAL_DEX_SCEPTILE, + .categoryName = _("Forest"), + FOOTPRINT(Sceptile) + LEARNSETS(Sceptile), + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, .baseAttack = 85, @@ -158,20 +158,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCEPTILE_MEGA] = { - .catchRate = 45, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sceptile"), \ - .natDexNum = NATIONAL_DEX_SCEPTILE, \ - .categoryName = _("Forest"), \ - FOOTPRINT(Sceptile) \ - LEARNSETS(Sceptile), \ - .formSpeciesIdTable = sSceptileFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sceptile"), + .natDexNum = NATIONAL_DEX_SCEPTILE, + .categoryName = _("Forest"), + FOOTPRINT(Sceptile) + LEARNSETS(Sceptile), + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, .baseAttack = 110, @@ -311,27 +311,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_BLAZIKEN] = { - .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Blaziken"), \ - .natDexNum = NATIONAL_DEX_BLAZIKEN, \ - .categoryName = _("Blaze"), \ - .height = 19, \ - .weight = 520, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 301, \ - .trainerOffset = 4, \ - FOOTPRINT(Blaziken) \ - LEARNSETS(Blaziken), \ - .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Blaziken"), + .natDexNum = NATIONAL_DEX_BLAZIKEN, + .categoryName = _("Blaze"), + .height = 19, + .weight = 520, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 301, + .trainerOffset = 4, + FOOTPRINT(Blaziken) + LEARNSETS(Blaziken), + .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, .baseAttack = 120, @@ -369,27 +369,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BLAZIKEN_MEGA] = { - .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Blaziken"), \ - .natDexNum = NATIONAL_DEX_BLAZIKEN, \ - .categoryName = _("Blaze"), \ - .height = 19, \ - .weight = 520, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 301, \ - .trainerOffset = 4, \ - FOOTPRINT(Blaziken) \ - LEARNSETS(Blaziken), \ - .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Blaziken"), + .natDexNum = NATIONAL_DEX_BLAZIKEN, + .categoryName = _("Blaze"), + .height = 19, + .weight = 520, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 301, + .trainerOffset = 4, + FOOTPRINT(Blaziken) + LEARNSETS(Blaziken), + .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, .baseAttack = 160, @@ -518,21 +518,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SWAMPERT] = { - .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Swampert"), \ - .natDexNum = NATIONAL_DEX_SWAMPERT, \ - .categoryName = _("Mud Fish"), \ - FOOTPRINT(Swampert) \ - LEARNSETS(Swampert), \ - .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Swampert"), + .natDexNum = NATIONAL_DEX_SWAMPERT, + .categoryName = _("Mud Fish"), + FOOTPRINT(Swampert) + LEARNSETS(Swampert), + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, .baseAttack = 110, @@ -574,21 +574,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SWAMPERT_MEGA] = { - .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Swampert"), \ - .natDexNum = NATIONAL_DEX_SWAMPERT, \ - .categoryName = _("Mud Fish"), \ - FOOTPRINT(Swampert) \ - LEARNSETS(Swampert), \ - .formSpeciesIdTable = sSwampertFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Swampert"), + .natDexNum = NATIONAL_DEX_SWAMPERT, + .categoryName = _("Mud Fish"), + FOOTPRINT(Swampert) + LEARNSETS(Swampert), + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, .baseAttack = 150, @@ -738,32 +738,32 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_ZIGZAGOON] = { - .baseHP = 38, \ - .baseAttack = 30, \ - .baseDefense = 41, \ - .baseSpeed = 60, \ - .baseSpAttack = 30, \ - .baseSpDefense = 41, \ - .catchRate = 255, \ - .expYield = ZIGZAGOON_EXP_YIELD, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ - .speciesName = _("Zigzagoon"), \ - .cryId = CRY_ZIGZAGOON, \ - .natDexNum = NATIONAL_DEX_ZIGZAGOON, \ - .categoryName = _("Tiny Raccoon"), \ - .height = 4, \ - .weight = 175, \ - .pokemonScale = 560, \ - .pokemonOffset = 22, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zigzagoon) \ + .baseHP = 38, + .baseAttack = 30, + .baseDefense = 41, + .baseSpeed = 60, + .baseSpAttack = 30, + .baseSpDefense = 41, + .catchRate = 255, + .expYield = ZIGZAGOON_EXP_YIELD, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .speciesName = _("Zigzagoon"), + .cryId = CRY_ZIGZAGOON, + .natDexNum = NATIONAL_DEX_ZIGZAGOON, + .categoryName = _("Tiny Raccoon"), + .height = 4, + .weight = 175, + .pokemonScale = 560, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zigzagoon) .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .types = MON_TYPES(TYPE_NORMAL), .itemCommon = ITEM_POTION, @@ -789,33 +789,33 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_LINOONE] = { - .baseHP = 78, \ - .baseAttack = 70, \ - .baseDefense = 61, \ - .baseSpeed = 100, \ - .baseSpAttack = 50, \ - .baseSpDefense = 61, \ - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Linoone"), \ - .cryId = CRY_LINOONE, \ - .natDexNum = NATIONAL_DEX_LINOONE, \ - .categoryName = _("Rushing"), \ - .height = 5, \ - .weight = 325, \ - .pokemonScale = 321, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Linoone) \ + .baseHP = 78, + .baseAttack = 70, + .baseDefense = 61, + .baseSpeed = 100, + .baseSpAttack = 50, + .baseSpDefense = 61, + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Linoone"), + .cryId = CRY_LINOONE, + .natDexNum = NATIONAL_DEX_LINOONE, + .categoryName = _("Rushing"), + .height = 5, + .weight = 325, + .pokemonScale = 321, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Linoone) .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .types = MON_TYPES(TYPE_NORMAL), .itemCommon = ITEM_POTION, @@ -840,32 +840,32 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_GALARIAN_FORMS [SPECIES_ZIGZAGOON_GALARIAN] = { - .baseHP = 38, \ - .baseAttack = 30, \ - .baseDefense = 41, \ - .baseSpeed = 60, \ - .baseSpAttack = 30, \ - .baseSpDefense = 41, \ - .catchRate = 255, \ - .expYield = ZIGZAGOON_EXP_YIELD, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ - .speciesName = _("Zigzagoon"), \ - .cryId = CRY_ZIGZAGOON, \ - .natDexNum = NATIONAL_DEX_ZIGZAGOON, \ - .categoryName = _("Tiny Raccoon"), \ - .height = 4, \ - .weight = 175, \ - .pokemonScale = 560, \ - .pokemonOffset = 22, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zigzagoon) \ + .baseHP = 38, + .baseAttack = 30, + .baseDefense = 41, + .baseSpeed = 60, + .baseSpAttack = 30, + .baseSpDefense = 41, + .catchRate = 255, + .expYield = ZIGZAGOON_EXP_YIELD, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .speciesName = _("Zigzagoon"), + .cryId = CRY_ZIGZAGOON, + .natDexNum = NATIONAL_DEX_ZIGZAGOON, + .categoryName = _("Tiny Raccoon"), + .height = 4, + .weight = 175, + .pokemonScale = 560, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zigzagoon) .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .bodyColor = BODY_COLOR_WHITE, @@ -890,33 +890,33 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_LINOONE_GALARIAN] = { - .baseHP = 78, \ - .baseAttack = 70, \ - .baseDefense = 61, \ - .baseSpeed = 100, \ - .baseSpAttack = 50, \ - .baseSpDefense = 61, \ - .catchRate = 90, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Linoone"), \ - .cryId = CRY_LINOONE, \ - .natDexNum = NATIONAL_DEX_LINOONE, \ - .categoryName = _("Rushing"), \ - .height = 5, \ - .weight = 325, \ - .pokemonScale = 321, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Linoone) \ + .baseHP = 78, + .baseAttack = 70, + .baseDefense = 61, + .baseSpeed = 100, + .baseSpAttack = 50, + .baseSpDefense = 61, + .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Linoone"), + .cryId = CRY_LINOONE, + .natDexNum = NATIONAL_DEX_LINOONE, + .categoryName = _("Rushing"), + .height = 5, + .weight = 325, + .pokemonScale = 321, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Linoone) .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .description = COMPOUND_STRING( @@ -1907,27 +1907,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_GARDEVOIR] = { - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ - .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2),\ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Gardevoir"), \ - .natDexNum = NATIONAL_DEX_GARDEVOIR, \ - .categoryName = _("Embrace"), \ - .height = 16, \ - .weight = 484, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Gardevoir) \ - LEARNSETS(Gardevoir), \ - .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Gardevoir"), + .natDexNum = NATIONAL_DEX_GARDEVOIR, + .categoryName = _("Embrace"), + .height = 16, + .weight = 484, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Gardevoir) + LEARNSETS(Gardevoir), + .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, .baseAttack = 65, @@ -1963,27 +1963,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARDEVOIR_MEGA] = { - .catchRate = 45, \ - .evYield_SpAttack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ - .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2),\ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Gardevoir"), \ - .natDexNum = NATIONAL_DEX_GARDEVOIR, \ - .categoryName = _("Embrace"), \ - .height = 16, \ - .weight = 484, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Gardevoir) \ - LEARNSETS(Gardevoir), \ - .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Gardevoir"), + .natDexNum = NATIONAL_DEX_GARDEVOIR, + .categoryName = _("Embrace"), + .height = 16, + .weight = 484, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Gardevoir) + LEARNSETS(Gardevoir), + .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, .baseAttack = 85, @@ -2015,26 +2015,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_GEN_4_CROSS_EVOS [SPECIES_GALLADE] = { - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Gallade"), \ - .natDexNum = NATIONAL_DEX_GALLADE, \ - .categoryName = _("Blade"), \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Gallade) \ - LEARNSETS(Gallade), \ - .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Gallade"), + .natDexNum = NATIONAL_DEX_GALLADE, + .categoryName = _("Blade"), + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Gallade) + LEARNSETS(Gallade), + .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, .baseAttack = 125, @@ -2075,26 +2075,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GALLADE_MEGA] = { - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = RALTS_FAMILY_EGG_GROUPS, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Gallade"), \ - .natDexNum = NATIONAL_DEX_GALLADE, \ - .categoryName = _("Blade"), \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Gallade) \ - LEARNSETS(Gallade), \ - .formSpeciesIdTable = sGalladeFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Gallade"), + .natDexNum = NATIONAL_DEX_GALLADE, + .categoryName = _("Blade"), + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Gallade) + LEARNSETS(Gallade), + .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, .baseAttack = 165, @@ -3101,23 +3101,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_SABLEYE [SPECIES_SABLEYE] = { - .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sableye"), \ - .natDexNum = NATIONAL_DEX_SABLEYE, \ - .categoryName = _("Darkness"), \ - .height = 5, \ - FOOTPRINT(Sableye) \ - LEARNSETS(Sableye), \ - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), + .catchRate = 45, + .evYield_Attack = 1, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sableye"), + .natDexNum = NATIONAL_DEX_SABLEYE, + .categoryName = _("Darkness"), + .height = 5, + FOOTPRINT(Sableye) + LEARNSETS(Sableye), + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, .baseAttack = 75, @@ -3153,23 +3153,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SABLEYE_MEGA] = { - .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sableye"), \ - .natDexNum = NATIONAL_DEX_SABLEYE, \ - .categoryName = _("Darkness"), \ - .height = 5, \ - FOOTPRINT(Sableye) \ - LEARNSETS(Sableye), \ - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), + .catchRate = 45, + .evYield_Attack = 1, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sableye"), + .natDexNum = NATIONAL_DEX_SABLEYE, + .categoryName = _("Darkness"), + .height = 5, + FOOTPRINT(Sableye) + LEARNSETS(Sableye), + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, .baseAttack = 85, @@ -3212,22 +3212,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MAWILE] = { - .types = MAWILE_TYPES, \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Mawile"), \ - .natDexNum = NATIONAL_DEX_MAWILE, \ - .categoryName = _("Deceiver"), \ - FOOTPRINT(Mawile) \ - LEARNSETS(Mawile), \ - .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ + .types = MAWILE_TYPES, + .catchRate = 45, + .evYield_Attack = 1, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Mawile"), + .natDexNum = NATIONAL_DEX_MAWILE, + .categoryName = _("Deceiver"), + FOOTPRINT(Mawile) + LEARNSETS(Mawile), + .formSpeciesIdTable = sMawileFormSpeciesIdTable, .formChangeTable = sMawileFormChangeTable, .baseHP = 50, .baseAttack = 85, @@ -3264,22 +3264,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MAWILE_MEGA] = { - .types = MAWILE_TYPES, \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Mawile"), \ - .natDexNum = NATIONAL_DEX_MAWILE, \ - .categoryName = _("Deceiver"), \ - FOOTPRINT(Mawile) \ - LEARNSETS(Mawile), \ - .formSpeciesIdTable = sMawileFormSpeciesIdTable, \ + .types = MAWILE_TYPES, + .catchRate = 45, + .evYield_Attack = 1, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Mawile"), + .natDexNum = NATIONAL_DEX_MAWILE, + .categoryName = _("Deceiver"), + FOOTPRINT(Mawile) + LEARNSETS(Mawile), + .formSpeciesIdTable = sMawileFormSpeciesIdTable, .formChangeTable = sMawileFormChangeTable, .baseHP = 50, .baseAttack = 105, @@ -3416,21 +3416,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_AGGRON] = { - .catchRate = 45, \ - .evYield_Defense = 3, \ - .itemRare = ITEM_HARD_STONE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Aggron"), \ - .natDexNum = NATIONAL_DEX_AGGRON, \ - .categoryName = _("Iron Armor"), \ - FOOTPRINT(Aggron) \ - LEARNSETS(Aggron), \ - .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Defense = 3, + .itemRare = ITEM_HARD_STONE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Aggron"), + .natDexNum = NATIONAL_DEX_AGGRON, + .categoryName = _("Iron Armor"), + FOOTPRINT(Aggron) + LEARNSETS(Aggron), + .formSpeciesIdTable = sAggronFormSpeciesIdTable, .formChangeTable = sAggronFormChangeTable, .baseHP = 70, .baseAttack = 110, @@ -3473,21 +3473,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_AGGRON_MEGA] = { - .catchRate = 45, \ - .evYield_Defense = 3, \ - .itemRare = ITEM_HARD_STONE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Aggron"), \ - .natDexNum = NATIONAL_DEX_AGGRON, \ - .categoryName = _("Iron Armor"), \ - FOOTPRINT(Aggron) \ - LEARNSETS(Aggron), \ - .formSpeciesIdTable = sAggronFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Defense = 3, + .itemRare = ITEM_HARD_STONE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Aggron"), + .natDexNum = NATIONAL_DEX_AGGRON, + .categoryName = _("Iron Armor"), + FOOTPRINT(Aggron) + LEARNSETS(Aggron), + .formSpeciesIdTable = sAggronFormSpeciesIdTable, .formChangeTable = sAggronFormChangeTable, .baseHP = 70, .baseAttack = 140, @@ -3577,39 +3577,39 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MEDICHAM] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), \ - .catchRate = 90, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Medicham"), \ - .natDexNum = NATIONAL_DEX_MEDICHAM, \ - .categoryName = _("Meditate"), \ - .height = 13, \ - .weight = 315, \ - .pokemonScale = 298, \ - .pokemonOffset = 5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Medicham) \ - LEARNSETS(Medicham), \ - .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ - .formChangeTable = sMedichamFormChangeTable, - .baseHP = 60, - .baseAttack = 60, - .baseDefense = 75, - .baseSpeed = 80, - .baseSpAttack = 60, - .baseSpDefense = 75, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 144 : 153, - .abilities = { ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY }, - .cryId = CRY_MEDICHAM, - .description = COMPOUND_STRING( - "Through crushingly harsh yoga training, it\n" + .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), + .catchRate = 90, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Medicham"), + .natDexNum = NATIONAL_DEX_MEDICHAM, + .categoryName = _("Meditate"), + .height = 13, + .weight = 315, + .pokemonScale = 298, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Medicham) + LEARNSETS(Medicham), + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, + .formChangeTable = sMedichamFormChangeTable, + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 75, + .baseSpeed = 80, + .baseSpAttack = 60, + .baseSpDefense = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 144 : 153, + .abilities = { ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY }, + .cryId = CRY_MEDICHAM, + .description = COMPOUND_STRING( + "Through crushingly harsh yoga training, it\n" "gained the power to foretell its foe's\n" "actions. It battles with elegant, dance-\n" "like movement."), @@ -3629,27 +3629,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEDICHAM_MEGA] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), \ - .catchRate = 90, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Medicham"), \ - .natDexNum = NATIONAL_DEX_MEDICHAM, \ - .categoryName = _("Meditate"), \ - .height = 13, \ - .weight = 315, \ - .pokemonScale = 298, \ - .pokemonOffset = 5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Medicham) \ - LEARNSETS(Medicham), \ - .formSpeciesIdTable = sMedichamFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), + .catchRate = 90, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Medicham"), + .natDexNum = NATIONAL_DEX_MEDICHAM, + .categoryName = _("Meditate"), + .height = 13, + .weight = 315, + .pokemonScale = 298, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Medicham) + LEARNSETS(Medicham), + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, .formChangeTable = sMedichamFormChangeTable, .baseHP = 60, .baseAttack = 100, @@ -3730,21 +3730,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MANECTRIC] = { - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 45, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Manectric"), \ - .natDexNum = NATIONAL_DEX_MANECTRIC, \ - .categoryName = _("Discharge"), \ - FOOTPRINT(Manectric) \ - LEARNSETS(Manectric), \ - .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 45, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Manectric"), + .natDexNum = NATIONAL_DEX_MANECTRIC, + .categoryName = _("Discharge"), + FOOTPRINT(Manectric) + LEARNSETS(Manectric), + .formSpeciesIdTable = sManectricFormSpeciesIdTable, .formChangeTable = sManectricFormChangeTable, .baseHP = 70, .baseAttack = 75, @@ -3780,21 +3780,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MANECTRIC_MEGA] = { - .types = MON_TYPES(TYPE_ELECTRIC), \ - .catchRate = 45, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Manectric"), \ - .natDexNum = NATIONAL_DEX_MANECTRIC, \ - .categoryName = _("Discharge"), \ - FOOTPRINT(Manectric) \ - LEARNSETS(Manectric), \ - .formSpeciesIdTable = sManectricFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ELECTRIC), + .catchRate = 45, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Manectric"), + .natDexNum = NATIONAL_DEX_MANECTRIC, + .categoryName = _("Discharge"), + FOOTPRINT(Manectric) + LEARNSETS(Manectric), + .formSpeciesIdTable = sManectricFormSpeciesIdTable, .formChangeTable = sManectricFormChangeTable, .baseHP = 70, .baseAttack = 75, @@ -4373,22 +4373,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SHARPEDO] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ - .catchRate = 60, \ - .evYield_Attack = 2, \ - .itemRare = ITEM_DEEP_SEA_TOOTH, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Sharpedo"), \ - .natDexNum = NATIONAL_DEX_SHARPEDO, \ - .categoryName = _("Brutal"), \ - FOOTPRINT(Sharpedo) \ - LEARNSETS(Sharpedo), \ - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), + .catchRate = 60, + .evYield_Attack = 2, + .itemRare = ITEM_DEEP_SEA_TOOTH, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Sharpedo"), + .natDexNum = NATIONAL_DEX_SHARPEDO, + .categoryName = _("Brutal"), + FOOTPRINT(Sharpedo) + LEARNSETS(Sharpedo), + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, .baseAttack = 120, @@ -4424,22 +4424,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SHARPEDO_MEGA] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ - .catchRate = 60, \ - .evYield_Attack = 2, \ - .itemRare = ITEM_DEEP_SEA_TOOTH, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Sharpedo"), \ - .natDexNum = NATIONAL_DEX_SHARPEDO, \ - .categoryName = _("Brutal"), \ - FOOTPRINT(Sharpedo) \ - LEARNSETS(Sharpedo), \ - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), + .catchRate = 60, + .evYield_Attack = 2, + .itemRare = ITEM_DEEP_SEA_TOOTH, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Sharpedo"), + .natDexNum = NATIONAL_DEX_SHARPEDO, + .categoryName = _("Brutal"), + FOOTPRINT(Sharpedo) + LEARNSETS(Sharpedo), + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, .baseAttack = 140, @@ -4627,22 +4627,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CAMERUPT] = { - .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), \ - .catchRate = 150, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Camerupt"), \ - .natDexNum = NATIONAL_DEX_CAMERUPT, \ - .categoryName = _("Eruption"), \ - FOOTPRINT(Camerupt) \ - LEARNSETS(Camerupt), \ - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), + .catchRate = 150, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Camerupt"), + .natDexNum = NATIONAL_DEX_CAMERUPT, + .categoryName = _("Eruption"), + FOOTPRINT(Camerupt) + LEARNSETS(Camerupt), + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, .baseAttack = 100, @@ -4680,22 +4680,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_CAMERUPT_MEGA] = { - .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), \ - .catchRate = 150, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Camerupt"), \ - .natDexNum = NATIONAL_DEX_CAMERUPT, \ - .categoryName = _("Eruption"), \ - FOOTPRINT(Camerupt) \ - LEARNSETS(Camerupt), \ - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), + .catchRate = 150, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Camerupt"), + .natDexNum = NATIONAL_DEX_CAMERUPT, + .categoryName = _("Eruption"), + FOOTPRINT(Camerupt) + LEARNSETS(Camerupt), + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, .baseAttack = 120, @@ -5248,20 +5248,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_ALTARIA] = { - .catchRate = 45, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Altaria"), \ - .natDexNum = NATIONAL_DEX_ALTARIA, \ - .categoryName = _("Humming"), \ - FOOTPRINT(Altaria) \ - LEARNSETS(Altaria), \ - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpDefense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Altaria"), + .natDexNum = NATIONAL_DEX_ALTARIA, + .categoryName = _("Humming"), + FOOTPRINT(Altaria) + LEARNSETS(Altaria), + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, .baseAttack = 70, @@ -5298,20 +5298,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALTARIA_MEGA] = { - .catchRate = 45, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Altaria"), \ - .natDexNum = NATIONAL_DEX_ALTARIA, \ - .categoryName = _("Humming"), \ - FOOTPRINT(Altaria) \ - LEARNSETS(Altaria), \ - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_SpDefense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Altaria"), + .natDexNum = NATIONAL_DEX_ALTARIA, + .categoryName = _("Humming"), + FOOTPRINT(Altaria) + LEARNSETS(Altaria), + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, .baseAttack = 110, @@ -6189,36 +6189,36 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_CASTFORM [SPECIES_CASTFORM_NORMAL] = { - .baseHP = 70, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 70, \ - .baseSpAttack = 70, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ - .evYield_HP = 1, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ - .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ - .speciesName = _("Castform"), \ - .cryId = CRY_CASTFORM, \ - .natDexNum = NATIONAL_DEX_CASTFORM, \ - .categoryName = _("Weather"), \ - .height = 3, \ - .weight = 8, \ - .pokemonScale = 435, \ - .pokemonOffset = -5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Castform) \ - LEARNSETS(Castform), \ - .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, + .evYield_HP = 1, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .speciesName = _("Castform"), + .cryId = CRY_CASTFORM, + .natDexNum = NATIONAL_DEX_CASTFORM, + .categoryName = _("Weather"), + .height = 3, + .weight = 8, + .pokemonScale = 435, + .pokemonOffset = -5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Castform) + LEARNSETS(Castform), + .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_NORMAL), .bodyColor = BODY_COLOR_GRAY, @@ -6241,36 +6241,36 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_SUNNY] = { - .baseHP = 70, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 70, \ - .baseSpAttack = 70, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ - .evYield_HP = 1, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ - .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ - .speciesName = _("Castform"), \ - .cryId = CRY_CASTFORM, \ - .natDexNum = NATIONAL_DEX_CASTFORM, \ - .categoryName = _("Weather"), \ - .height = 3, \ - .weight = 8, \ - .pokemonScale = 435, \ - .pokemonOffset = -5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Castform) \ - LEARNSETS(Castform), \ - .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, + .evYield_HP = 1, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .speciesName = _("Castform"), + .cryId = CRY_CASTFORM, + .natDexNum = NATIONAL_DEX_CASTFORM, + .categoryName = _("Weather"), + .height = 3, + .weight = 8, + .pokemonScale = 435, + .pokemonOffset = -5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Castform) + LEARNSETS(Castform), + .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, @@ -6293,36 +6293,36 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_RAINY] = { - .baseHP = 70, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 70, \ - .baseSpAttack = 70, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ - .evYield_HP = 1, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ - .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ - .speciesName = _("Castform"), \ - .cryId = CRY_CASTFORM, \ - .natDexNum = NATIONAL_DEX_CASTFORM, \ - .categoryName = _("Weather"), \ - .height = 3, \ - .weight = 8, \ - .pokemonScale = 435, \ - .pokemonOffset = -5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Castform) \ - LEARNSETS(Castform), \ - .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, + .evYield_HP = 1, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .speciesName = _("Castform"), + .cryId = CRY_CASTFORM, + .natDexNum = NATIONAL_DEX_CASTFORM, + .categoryName = _("Weather"), + .height = 3, + .weight = 8, + .pokemonScale = 435, + .pokemonOffset = -5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Castform) + LEARNSETS(Castform), + .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_WATER), .bodyColor = BODY_COLOR_BLUE, @@ -6345,36 +6345,36 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CASTFORM_SNOWY] = { - .baseHP = 70, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 70, \ - .baseSpAttack = 70, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, \ - .evYield_HP = 1, \ - .itemCommon = ITEM_MYSTIC_WATER, \ - .itemRare = ITEM_MYSTIC_WATER, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS),\ - .abilities = { ABILITY_FORECAST, ABILITY_NONE }, \ - .speciesName = _("Castform"), \ - .cryId = CRY_CASTFORM, \ - .natDexNum = NATIONAL_DEX_CASTFORM, \ - .categoryName = _("Weather"), \ - .height = 3, \ - .weight = 8, \ - .pokemonScale = 435, \ - .pokemonOffset = -5, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Castform) \ - LEARNSETS(Castform), \ - .formSpeciesIdTable = sCastformFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, + .evYield_HP = 1, + .itemCommon = ITEM_MYSTIC_WATER, + .itemRare = ITEM_MYSTIC_WATER, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .speciesName = _("Castform"), + .cryId = CRY_CASTFORM, + .natDexNum = NATIONAL_DEX_CASTFORM, + .categoryName = _("Weather"), + .height = 3, + .weight = 8, + .pokemonScale = 435, + .pokemonOffset = -5, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Castform) + LEARNSETS(Castform), + .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_ICE), .bodyColor = BODY_COLOR_WHITE, @@ -6499,22 +6499,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_BANETTE] = { - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .itemRare = ITEM_SPELL_TAG, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Banette"), \ - .natDexNum = NATIONAL_DEX_BANETTE, \ - .categoryName = _("Marionette"), \ - FOOTPRINT(Banette) \ - LEARNSETS(Banette), \ - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 45, + .evYield_Attack = 2, + .itemRare = ITEM_SPELL_TAG, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Banette"), + .natDexNum = NATIONAL_DEX_BANETTE, + .categoryName = _("Marionette"), + FOOTPRINT(Banette) + LEARNSETS(Banette), + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, .formChangeTable = sBanetteFormChangeTable, .baseHP = 64, .baseAttack = 115, @@ -6550,22 +6550,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BANETTE_MEGA] = { - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .itemRare = ITEM_SPELL_TAG, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Banette"), \ - .natDexNum = NATIONAL_DEX_BANETTE, \ - .categoryName = _("Marionette"), \ - FOOTPRINT(Banette) \ - LEARNSETS(Banette), \ - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 45, + .evYield_Attack = 2, + .itemRare = ITEM_SPELL_TAG, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Banette"), + .natDexNum = NATIONAL_DEX_BANETTE, + .categoryName = _("Marionette"), + FOOTPRINT(Banette) + LEARNSETS(Banette), + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, .formChangeTable = sBanetteFormChangeTable, .baseHP = 64, .baseAttack = 165, @@ -6931,27 +6931,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_ABSOL [SPECIES_ABSOL] = { - .types = MON_TYPES(TYPE_DARK), \ - .catchRate = 30, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = TRUE, \ - .speciesName = _("Absol"), \ - .natDexNum = NATIONAL_DEX_ABSOL, \ - .categoryName = _("Disaster"), \ - .height = 12, \ - .pokemonScale = 301, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Absol) \ - LEARNSETS(Absol), \ - .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK), + .catchRate = 30, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + .speciesName = _("Absol"), + .natDexNum = NATIONAL_DEX_ABSOL, + .categoryName = _("Disaster"), + .height = 12, + .pokemonScale = 301, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Absol) + LEARNSETS(Absol), + .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, .baseAttack = 130, @@ -6983,27 +6983,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABSOL_MEGA] = { - .types = MON_TYPES(TYPE_DARK), \ - .catchRate = 30, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = 35, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = TRUE, \ - .speciesName = _("Absol"), \ - .natDexNum = NATIONAL_DEX_ABSOL, \ - .categoryName = _("Disaster"), \ - .height = 12, \ - .pokemonScale = 301, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Absol) \ - LEARNSETS(Absol), \ - .formSpeciesIdTable = sAbsolFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DARK), + .catchRate = 30, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + .speciesName = _("Absol"), + .natDexNum = NATIONAL_DEX_ABSOL, + .categoryName = _("Disaster"), + .height = 12, + .pokemonScale = 301, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Absol) + LEARNSETS(Absol), + .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, .baseAttack = 150, @@ -7088,21 +7088,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_GLALIE] = { - .types = MON_TYPES(TYPE_ICE), \ - .catchRate = 75, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL),\ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Glalie"), \ - .natDexNum = NATIONAL_DEX_GLALIE, \ - .categoryName = _("Face"), \ - FOOTPRINT(Glalie) \ - LEARNSETS(Glalie), \ - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ICE), + .catchRate = 75, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Glalie"), + .natDexNum = NATIONAL_DEX_GLALIE, + .categoryName = _("Face"), + FOOTPRINT(Glalie) + LEARNSETS(Glalie), + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, .baseAttack = 80, @@ -7139,21 +7139,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GLALIE_MEGA] = { - .types = MON_TYPES(TYPE_ICE), \ - .catchRate = 75, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL),\ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Glalie"), \ - .natDexNum = NATIONAL_DEX_GLALIE, \ - .categoryName = _("Face"), \ - FOOTPRINT(Glalie) \ - LEARNSETS(Glalie), \ - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ICE), + .catchRate = 75, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Glalie"), + .natDexNum = NATIONAL_DEX_GLALIE, + .categoryName = _("Face"), + FOOTPRINT(Glalie) + LEARNSETS(Glalie), + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, .baseAttack = 120, @@ -7747,22 +7747,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SALAMENCE] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .itemRare = ITEM_DRAGON_FANG, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Salamence"), \ - .natDexNum = NATIONAL_DEX_SALAMENCE, \ - .categoryName = _("Dragon"), \ - FOOTPRINT(Salamence) \ - LEARNSETS(Salamence), \ - .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), + .catchRate = 45, + .evYield_Attack = 3, + .itemRare = ITEM_DRAGON_FANG, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Salamence"), + .natDexNum = NATIONAL_DEX_SALAMENCE, + .categoryName = _("Dragon"), + FOOTPRINT(Salamence) + LEARNSETS(Salamence), + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, .baseAttack = 135, @@ -7805,22 +7805,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SALAMENCE_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .itemRare = ITEM_DRAGON_FANG, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Salamence"), \ - .natDexNum = NATIONAL_DEX_SALAMENCE, \ - .categoryName = _("Dragon"), \ - FOOTPRINT(Salamence) \ - LEARNSETS(Salamence), \ - .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), + .catchRate = 45, + .evYield_Attack = 3, + .itemRare = ITEM_DRAGON_FANG, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Salamence"), + .natDexNum = NATIONAL_DEX_SALAMENCE, + .categoryName = _("Dragon"), + FOOTPRINT(Salamence) + LEARNSETS(Salamence), + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, .baseAttack = 145, @@ -7959,22 +7959,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_METAGROSS] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_Defense = 3, \ - .itemRare = ITEM_METAL_COAT, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Metagross"), \ - .natDexNum = NATIONAL_DEX_METAGROSS, \ - .categoryName = _("Iron Leg"), \ - FOOTPRINT(Metagross) \ - LEARNSETS(Metagross), \ - .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_Defense = 3, + .itemRare = ITEM_METAL_COAT, + .genderRatio = MON_GENDERLESS, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Metagross"), + .natDexNum = NATIONAL_DEX_METAGROSS, + .categoryName = _("Iron Leg"), + FOOTPRINT(Metagross) + LEARNSETS(Metagross), + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, .baseAttack = 135, @@ -8016,22 +8016,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_METAGROSS_MEGA] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_Defense = 3, \ - .itemRare = ITEM_METAL_COAT, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Metagross"), \ - .natDexNum = NATIONAL_DEX_METAGROSS, \ - .categoryName = _("Iron Leg"), \ - FOOTPRINT(Metagross) \ - LEARNSETS(Metagross), \ - .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_Defense = 3, + .itemRare = ITEM_METAL_COAT, + .genderRatio = MON_GENDERLESS, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Metagross"), + .natDexNum = NATIONAL_DEX_METAGROSS, + .categoryName = _("Iron Leg"), + FOOTPRINT(Metagross) + LEARNSETS(Metagross), + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, .baseAttack = 145, @@ -8240,21 +8240,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_LATIAS [SPECIES_LATIAS] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_SpDefense = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Latias"), \ - .natDexNum = NATIONAL_DEX_LATIAS, \ - .categoryName = _("Eon"), \ - FOOTPRINT(Latias) \ - LEARNSETS(Latias), \ - .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ - .formChangeTable = sLatiasFormChangeTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_SpDefense = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Latias"), + .natDexNum = NATIONAL_DEX_LATIAS, + .categoryName = _("Eon"), + FOOTPRINT(Latias) + LEARNSETS(Latias), + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, + .formChangeTable = sLatiasFormChangeTable, .isLegendary = TRUE, .baseHP = 80, .baseAttack = 80, @@ -8298,21 +8298,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIAS_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_SpDefense = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Latias"), \ - .natDexNum = NATIONAL_DEX_LATIAS, \ - .categoryName = _("Eon"), \ - FOOTPRINT(Latias) \ - LEARNSETS(Latias), \ - .formSpeciesIdTable = sLatiasFormSpeciesIdTable, \ - .formChangeTable = sLatiasFormChangeTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_SpDefense = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Latias"), + .natDexNum = NATIONAL_DEX_LATIAS, + .categoryName = _("Eon"), + FOOTPRINT(Latias) + LEARNSETS(Latias), + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, + .formChangeTable = sLatiasFormChangeTable, .isLegendary = TRUE, .baseHP = 80, .baseAttack = 100, @@ -8353,21 +8353,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_LATIOS [SPECIES_LATIOS] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .isLegendary = TRUE, \ - .speciesName = _("Latios"), \ - .natDexNum = NATIONAL_DEX_LATIOS, \ - .categoryName = _("Eon"), \ - FOOTPRINT(Latios) \ - LEARNSETS(Latios), \ - .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .isLegendary = TRUE, + .speciesName = _("Latios"), + .natDexNum = NATIONAL_DEX_LATIOS, + .categoryName = _("Eon"), + FOOTPRINT(Latios) + LEARNSETS(Latios), + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, .baseAttack = 90, @@ -8411,21 +8411,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIOS_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), \ - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .isLegendary = TRUE, \ - .speciesName = _("Latios"), \ - .natDexNum = NATIONAL_DEX_LATIOS, \ - .categoryName = _("Eon"), \ - FOOTPRINT(Latios) \ - LEARNSETS(Latios), \ - .formSpeciesIdTable = sLatiosFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .isLegendary = TRUE, + .speciesName = _("Latios"), + .natDexNum = NATIONAL_DEX_LATIOS, + .categoryName = _("Eon"), + FOOTPRINT(Latios) + LEARNSETS(Latios), + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, .baseAttack = 130, @@ -8466,22 +8466,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_KYOGRE [SPECIES_KYOGRE] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Kyogre"), \ - .natDexNum = NATIONAL_DEX_KYOGRE, \ - .categoryName = _("Sea Basin"), \ - FOOTPRINT(Kyogre) \ - LEARNSETS(Kyogre), \ - .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Kyogre"), + .natDexNum = NATIONAL_DEX_KYOGRE, + .categoryName = _("Sea Basin"), + FOOTPRINT(Kyogre) + LEARNSETS(Kyogre), + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, .baseAttack = 100, @@ -8523,22 +8523,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_KYOGRE_PRIMAL] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 3, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Kyogre"), \ - .natDexNum = NATIONAL_DEX_KYOGRE, \ - .categoryName = _("Sea Basin"), \ - FOOTPRINT(Kyogre) \ - LEARNSETS(Kyogre), \ - .formSpeciesIdTable = sKyogreFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 3, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Kyogre"), + .natDexNum = NATIONAL_DEX_KYOGRE, + .categoryName = _("Sea Basin"), + FOOTPRINT(Kyogre) + LEARNSETS(Kyogre), + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, .baseAttack = 150, @@ -8577,22 +8577,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_GROUDON [SPECIES_GROUDON] = { - .catchRate = 3, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_RED, \ - .isLegendary = TRUE, \ - .speciesName = _("Groudon"), \ - .cryId = CRY_GROUDON, \ - .natDexNum = NATIONAL_DEX_GROUDON, \ - .categoryName = _("Continent"), \ - FOOTPRINT(Groudon) \ - LEARNSETS(Groudon), \ - .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ + .catchRate = 3, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_RED, + .isLegendary = TRUE, + .speciesName = _("Groudon"), + .cryId = CRY_GROUDON, + .natDexNum = NATIONAL_DEX_GROUDON, + .categoryName = _("Continent"), + FOOTPRINT(Groudon) + LEARNSETS(Groudon), + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, .baseAttack = 150, @@ -8634,22 +8634,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_GROUDON_PRIMAL] = { - .catchRate = 3, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_RED, \ - .isLegendary = TRUE, \ - .speciesName = _("Groudon"), \ - .cryId = CRY_GROUDON, \ - .natDexNum = NATIONAL_DEX_GROUDON, \ - .categoryName = _("Continent"), \ - FOOTPRINT(Groudon) \ - LEARNSETS(Groudon), \ - .formSpeciesIdTable = sGroudonFormSpeciesIdTable, \ + .catchRate = 3, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_RED, + .isLegendary = TRUE, + .speciesName = _("Groudon"), + .cryId = CRY_GROUDON, + .natDexNum = NATIONAL_DEX_GROUDON, + .categoryName = _("Continent"), + FOOTPRINT(Groudon) + LEARNSETS(Groudon), + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, .baseAttack = 180, @@ -8689,24 +8689,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_RAYQUAZA [SPECIES_RAYQUAZA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Rayquaza"), \ - .cryId = CRY_RAYQUAZA, \ - .natDexNum = NATIONAL_DEX_RAYQUAZA, \ - .categoryName = _("Sky High"), \ - FOOTPRINT(Rayquaza) \ - LEARNSETS(Rayquaza), \ - .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ - .formChangeTable = sRayquazaFormChangeTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), + .catchRate = 45, + .evYield_Attack = 2, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Rayquaza"), + .cryId = CRY_RAYQUAZA, + .natDexNum = NATIONAL_DEX_RAYQUAZA, + .categoryName = _("Sky High"), + FOOTPRINT(Rayquaza) + LEARNSETS(Rayquaza), + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, + .formChangeTable = sRayquazaFormChangeTable, .isLegendary = TRUE, .baseHP = 105, .baseAttack = 150, @@ -8749,24 +8749,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_RAYQUAZA_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), \ - .catchRate = 45, \ - .evYield_Attack = 2, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Rayquaza"), \ - .cryId = CRY_RAYQUAZA, \ - .natDexNum = NATIONAL_DEX_RAYQUAZA, \ - .categoryName = _("Sky High"), \ - FOOTPRINT(Rayquaza) \ - LEARNSETS(Rayquaza), \ - .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, \ - .formChangeTable = sRayquazaFormChangeTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), + .catchRate = 45, + .evYield_Attack = 2, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Rayquaza"), + .cryId = CRY_RAYQUAZA, + .natDexNum = NATIONAL_DEX_RAYQUAZA, + .categoryName = _("Sky High"), + FOOTPRINT(Rayquaza) + LEARNSETS(Rayquaza), + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, + .formChangeTable = sRayquazaFormChangeTable, .isLegendary = TRUE, .baseHP = 105, .baseAttack = 180, @@ -8872,29 +8872,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_NORMAL] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 3, \ - .expYield = DEOXYS_EXP_YIELD, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isMythical = TRUE, \ - .speciesName = _("Deoxys"), \ - .cryId = CRY_DEOXYS, \ - .natDexNum = NATIONAL_DEX_DEOXYS, \ - .categoryName = _("DNA"), \ - .height = 17, \ - .weight = 608, \ - .description = gDeoxysNormalPokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 2, \ - FOOTPRINT(Deoxys) \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 3, + .expYield = DEOXYS_EXP_YIELD, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isMythical = TRUE, + .speciesName = _("Deoxys"), + .cryId = CRY_DEOXYS, + .natDexNum = NATIONAL_DEX_DEOXYS, + .categoryName = _("DNA"), + .height = 17, + .weight = 608, + .description = gDeoxysNormalPokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 2, + FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 150, @@ -8920,29 +8920,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_ATTACK] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 3, \ - .expYield = DEOXYS_EXP_YIELD, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isMythical = TRUE, \ - .speciesName = _("Deoxys"), \ - .cryId = CRY_DEOXYS, \ - .natDexNum = NATIONAL_DEX_DEOXYS, \ - .categoryName = _("DNA"), \ - .height = 17, \ - .weight = 608, \ - .description = gDeoxysNormalPokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 2, \ - FOOTPRINT(Deoxys) \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 3, + .expYield = DEOXYS_EXP_YIELD, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isMythical = TRUE, + .speciesName = _("Deoxys"), + .cryId = CRY_DEOXYS, + .natDexNum = NATIONAL_DEX_DEOXYS, + .categoryName = _("DNA"), + .height = 17, + .weight = 608, + .description = gDeoxysNormalPokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 2, + FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 180, @@ -8967,29 +8967,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_DEFENSE] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 3, \ - .expYield = DEOXYS_EXP_YIELD, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isMythical = TRUE, \ - .speciesName = _("Deoxys"), \ - .cryId = CRY_DEOXYS, \ - .natDexNum = NATIONAL_DEX_DEOXYS, \ - .categoryName = _("DNA"), \ - .height = 17, \ - .weight = 608, \ - .description = gDeoxysNormalPokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 2, \ - FOOTPRINT(Deoxys) \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 3, + .expYield = DEOXYS_EXP_YIELD, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isMythical = TRUE, + .speciesName = _("Deoxys"), + .cryId = CRY_DEOXYS, + .natDexNum = NATIONAL_DEX_DEOXYS, + .categoryName = _("DNA"), + .height = 17, + .weight = 608, + .description = gDeoxysNormalPokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 2, + FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 70, @@ -9014,29 +9014,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_SPEED] = { - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 3, \ - .expYield = DEOXYS_EXP_YIELD, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isMythical = TRUE, \ - .speciesName = _("Deoxys"), \ - .cryId = CRY_DEOXYS, \ - .natDexNum = NATIONAL_DEX_DEOXYS, \ - .categoryName = _("DNA"), \ - .height = 17, \ - .weight = 608, \ - .description = gDeoxysNormalPokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 2, \ - FOOTPRINT(Deoxys) \ + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 3, + .expYield = DEOXYS_EXP_YIELD, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isMythical = TRUE, + .speciesName = _("Deoxys"), + .cryId = CRY_DEOXYS, + .natDexNum = NATIONAL_DEX_DEOXYS, + .categoryName = _("DNA"), + .height = 17, + .weight = 608, + .description = gDeoxysNormalPokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 2, + FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .baseHP = 50, .baseAttack = 95, diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index d06840d16e25..4dcd5630f613 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -1192,40 +1192,40 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_FAMILY_BURMY [SPECIES_BURMY_PLANT_CLOAK] = { - .baseHP = 40, \ - .baseAttack = 29, \ - .baseDefense = 45, \ - .baseSpeed = 36, \ - .baseSpAttack = 29, \ - .baseSpDefense = 45, \ - .types = MON_TYPES(TYPE_BUG), \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Burmy"), \ - .cryId = CRY_BURMY, \ - .natDexNum = NATIONAL_DEX_BURMY, \ - .categoryName = _("Bagworm"), \ - .height = 2, \ - .weight = 34, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Burmy, \ - .frontAnimId = ANIM_V_STRETCH, \ - .enemyMonElevation = 10, \ - .backAnimId = BACK_ANIM_H_SHAKE, \ - FOOTPRINT(Burmy) \ - LEARNSETS(Burmy), \ - .tmIlliterate = TRUE, \ - .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ + .baseHP = 40, + .baseAttack = 29, + .baseDefense = 45, + .baseSpeed = 36, + .baseSpAttack = 29, + .baseSpDefense = 45, + .types = MON_TYPES(TYPE_BUG), + .catchRate = 120, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Burmy"), + .cryId = CRY_BURMY, + .natDexNum = NATIONAL_DEX_BURMY, + .categoryName = _("Bagworm"), + .height = 2, + .weight = 34, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Burmy, + .frontAnimId = ANIM_V_STRETCH, + .enemyMonElevation = 10, + .backAnimId = BACK_ANIM_H_SHAKE, + FOOTPRINT(Burmy) + LEARNSETS(Burmy), + .tmIlliterate = TRUE, + .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( @@ -1245,40 +1245,40 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_BURMY_SANDY_CLOAK] = { - .baseHP = 40, \ - .baseAttack = 29, \ - .baseDefense = 45, \ - .baseSpeed = 36, \ - .baseSpAttack = 29, \ - .baseSpDefense = 45, \ - .types = MON_TYPES(TYPE_BUG), \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Burmy"), \ - .cryId = CRY_BURMY, \ - .natDexNum = NATIONAL_DEX_BURMY, \ - .categoryName = _("Bagworm"), \ - .height = 2, \ - .weight = 34, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Burmy, \ - .frontAnimId = ANIM_V_STRETCH, \ - .enemyMonElevation = 10, \ - .backAnimId = BACK_ANIM_H_SHAKE, \ - FOOTPRINT(Burmy) \ - LEARNSETS(Burmy), \ - .tmIlliterate = TRUE, \ - .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ + .baseHP = 40, + .baseAttack = 29, + .baseDefense = 45, + .baseSpeed = 36, + .baseSpAttack = 29, + .baseSpDefense = 45, + .types = MON_TYPES(TYPE_BUG), + .catchRate = 120, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Burmy"), + .cryId = CRY_BURMY, + .natDexNum = NATIONAL_DEX_BURMY, + .categoryName = _("Bagworm"), + .height = 2, + .weight = 34, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Burmy, + .frontAnimId = ANIM_V_STRETCH, + .enemyMonElevation = 10, + .backAnimId = BACK_ANIM_H_SHAKE, + FOOTPRINT(Burmy) + LEARNSETS(Burmy), + .tmIlliterate = TRUE, + .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( @@ -1298,40 +1298,40 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_BURMY_TRASH_CLOAK] = { - .baseHP = 40, \ - .baseAttack = 29, \ - .baseDefense = 45, \ - .baseSpeed = 36, \ - .baseSpAttack = 29, \ - .baseSpDefense = 45, \ - .types = MON_TYPES(TYPE_BUG), \ - .catchRate = 120, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, \ - .evYield_SpDefense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Burmy"), \ - .cryId = CRY_BURMY, \ - .natDexNum = NATIONAL_DEX_BURMY, \ - .categoryName = _("Bagworm"), \ - .height = 2, \ - .weight = 34, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Burmy, \ - .frontAnimId = ANIM_V_STRETCH, \ - .enemyMonElevation = 10, \ - .backAnimId = BACK_ANIM_H_SHAKE, \ - FOOTPRINT(Burmy) \ - LEARNSETS(Burmy), \ - .tmIlliterate = TRUE, \ - .formSpeciesIdTable = sBurmyFormSpeciesIdTable, \ + .baseHP = 40, + .baseAttack = 29, + .baseDefense = 45, + .baseSpeed = 36, + .baseSpAttack = 29, + .baseSpDefense = 45, + .types = MON_TYPES(TYPE_BUG), + .catchRate = 120, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 45 : 61, + .evYield_SpDefense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Burmy"), + .cryId = CRY_BURMY, + .natDexNum = NATIONAL_DEX_BURMY, + .categoryName = _("Bagworm"), + .height = 2, + .weight = 34, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Burmy, + .frontAnimId = ANIM_V_STRETCH, + .enemyMonElevation = 10, + .backAnimId = BACK_ANIM_H_SHAKE, + FOOTPRINT(Burmy) + LEARNSETS(Burmy), + .tmIlliterate = TRUE, + .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -1351,32 +1351,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_PLANT_CLOAK] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ - .itemRare = ITEM_SILVER_POWDER, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Wormadam"), \ - .cryId = CRY_WORMADAM, \ - .natDexNum = NATIONAL_DEX_WORMADAM, \ - .categoryName = _("Bagworm"), \ - .height = 5, \ - .weight = 65, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Wormadam, \ - .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, \ - .enemyMonElevation = 8, \ - .backPicYOffset = 2, \ - .backAnimId = BACK_ANIM_V_SHAKE, \ - FOOTPRINT(Wormadam) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .itemRare = ITEM_SILVER_POWDER, + .genderRatio = MON_FEMALE, + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Wormadam"), + .cryId = CRY_WORMADAM, + .natDexNum = NATIONAL_DEX_WORMADAM, + .categoryName = _("Bagworm"), + .height = 5, + .weight = 65, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Wormadam, + .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, + .enemyMonElevation = 8, + .backPicYOffset = 2, + .backAnimId = BACK_ANIM_V_SHAKE, + FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 59, @@ -1401,32 +1401,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_SANDY_CLOAK] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ - .itemRare = ITEM_SILVER_POWDER, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Wormadam"), \ - .cryId = CRY_WORMADAM, \ - .natDexNum = NATIONAL_DEX_WORMADAM, \ - .categoryName = _("Bagworm"), \ - .height = 5, \ - .weight = 65, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Wormadam, \ - .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, \ - .enemyMonElevation = 8, \ - .backPicYOffset = 2, \ - .backAnimId = BACK_ANIM_V_SHAKE, \ - FOOTPRINT(Wormadam) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .itemRare = ITEM_SILVER_POWDER, + .genderRatio = MON_FEMALE, + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Wormadam"), + .cryId = CRY_WORMADAM, + .natDexNum = NATIONAL_DEX_WORMADAM, + .categoryName = _("Bagworm"), + .height = 5, + .weight = 65, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Wormadam, + .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, + .enemyMonElevation = 8, + .backPicYOffset = 2, + .backAnimId = BACK_ANIM_V_SHAKE, + FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 79, @@ -1451,32 +1451,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_TRASH_CLOAK] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, \ - .itemRare = ITEM_SILVER_POWDER, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, \ - .speciesName = _("Wormadam"), \ - .cryId = CRY_WORMADAM, \ - .natDexNum = NATIONAL_DEX_WORMADAM, \ - .categoryName = _("Bagworm"), \ - .height = 5, \ - .weight = 65, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Wormadam, \ - .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, \ - .enemyMonElevation = 8, \ - .backPicYOffset = 2, \ - .backAnimId = BACK_ANIM_V_SHAKE, \ - FOOTPRINT(Wormadam) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .itemRare = ITEM_SILVER_POWDER, + .genderRatio = MON_FEMALE, + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .speciesName = _("Wormadam"), + .cryId = CRY_WORMADAM, + .natDexNum = NATIONAL_DEX_WORMADAM, + .categoryName = _("Bagworm"), + .height = 5, + .weight = 65, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Wormadam, + .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, + .enemyMonElevation = 8, + .backPicYOffset = 2, + .backAnimId = BACK_ANIM_V_SHAKE, + FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .baseHP = 60, .baseAttack = 69, @@ -1856,36 +1856,36 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_CHERRIM_OVERCAST] = { - .baseHP = 70, \ - .baseAttack = 60, \ - .baseDefense = 70, \ - .baseSpeed = 85, \ - .baseSpAttack = 87, \ - .baseSpDefense = 78, \ - .types = MON_TYPES(TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 133, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_MIRACLE_SEED, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS),\ - .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, \ - .speciesName = _("Cherrim"), \ - .cryId = CRY_CHERRIM, \ - .natDexNum = NATIONAL_DEX_CHERRIM, \ - .categoryName = _("Blossom"), \ - .height = 5, \ - .weight = 93, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Cherrim) \ - LEARNSETS(Cherrim), \ - .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 60, + .baseDefense = 70, + .baseSpeed = 85, + .baseSpAttack = 87, + .baseSpDefense = 78, + .types = MON_TYPES(TYPE_GRASS), + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 133, + .evYield_SpAttack = 2, + .itemRare = ITEM_MIRACLE_SEED, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS), + .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, + .speciesName = _("Cherrim"), + .cryId = CRY_CHERRIM, + .natDexNum = NATIONAL_DEX_CHERRIM, + .categoryName = _("Blossom"), + .height = 5, + .weight = 93, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Cherrim) + LEARNSETS(Cherrim), + .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( @@ -1906,36 +1906,36 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_CHERRIM_SUNSHINE] = { - .baseHP = 70, \ - .baseAttack = 60, \ - .baseDefense = 70, \ - .baseSpeed = 85, \ - .baseSpAttack = 87, \ - .baseSpDefense = 78, \ - .types = MON_TYPES(TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 133, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_MIRACLE_SEED, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS),\ - .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, \ - .speciesName = _("Cherrim"), \ - .cryId = CRY_CHERRIM, \ - .natDexNum = NATIONAL_DEX_CHERRIM, \ - .categoryName = _("Blossom"), \ - .height = 5, \ - .weight = 93, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Cherrim) \ - LEARNSETS(Cherrim), \ - .formSpeciesIdTable = sCherrimFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 60, + .baseDefense = 70, + .baseSpeed = 85, + .baseSpAttack = 87, + .baseSpDefense = 78, + .types = MON_TYPES(TYPE_GRASS), + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 133, + .evYield_SpAttack = 2, + .itemRare = ITEM_MIRACLE_SEED, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS), + .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, + .speciesName = _("Cherrim"), + .cryId = CRY_CHERRIM, + .natDexNum = NATIONAL_DEX_CHERRIM, + .categoryName = _("Blossom"), + .height = 5, + .weight = 93, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Cherrim) + LEARNSETS(Cherrim), + .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PINK, .description = COMPOUND_STRING( @@ -1958,38 +1958,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_FAMILY_SHELLOS [SPECIES_SHELLOS_WEST_SEA] = { - .baseHP = 76, \ - .baseAttack = 48, \ - .baseDefense = 48, \ - .baseSpeed = 34, \ - .baseSpAttack = 57, \ - .baseSpDefense = 62, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 73, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ - .speciesName = _("Shellos"), \ - .cryId = CRY_SHELLOS, \ - .natDexNum = NATIONAL_DEX_SHELLOS, \ - .categoryName = _("Sea Slug"), \ - .height = 3, \ - .weight = 63, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Shellos, \ - .frontAnimId = ANIM_V_STRETCH, \ - .backPicYOffset = 8, \ - .backAnimId = BACK_ANIM_H_SPRING, \ - FOOTPRINT(Shellos) \ - LEARNSETS(Shellos), \ + .baseHP = 76, + .baseAttack = 48, + .baseDefense = 48, + .baseSpeed = 34, + .baseSpAttack = 57, + .baseSpDefense = 62, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 73, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .speciesName = _("Shellos"), + .cryId = CRY_SHELLOS, + .natDexNum = NATIONAL_DEX_SHELLOS, + .categoryName = _("Sea Slug"), + .height = 3, + .weight = 63, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Shellos, + .frontAnimId = ANIM_V_STRETCH, + .backPicYOffset = 8, + .backAnimId = BACK_ANIM_H_SPRING, + FOOTPRINT(Shellos) + LEARNSETS(Shellos), .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( @@ -2007,38 +2007,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHELLOS_EAST_SEA] = { - .baseHP = 76, \ - .baseAttack = 48, \ - .baseDefense = 48, \ - .baseSpeed = 34, \ - .baseSpAttack = 57, \ - .baseSpDefense = 62, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 190, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 73, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ - .speciesName = _("Shellos"), \ - .cryId = CRY_SHELLOS, \ - .natDexNum = NATIONAL_DEX_SHELLOS, \ - .categoryName = _("Sea Slug"), \ - .height = 3, \ - .weight = 63, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Shellos, \ - .frontAnimId = ANIM_V_STRETCH, \ - .backPicYOffset = 8, \ - .backAnimId = BACK_ANIM_H_SPRING, \ - FOOTPRINT(Shellos) \ - LEARNSETS(Shellos), \ + .baseHP = 76, + .baseAttack = 48, + .baseDefense = 48, + .baseSpeed = 34, + .baseSpAttack = 57, + .baseSpDefense = 62, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 190, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 73, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .speciesName = _("Shellos"), + .cryId = CRY_SHELLOS, + .natDexNum = NATIONAL_DEX_SHELLOS, + .categoryName = _("Sea Slug"), + .height = 3, + .weight = 63, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Shellos, + .frontAnimId = ANIM_V_STRETCH, + .backPicYOffset = 8, + .backAnimId = BACK_ANIM_H_SPRING, + FOOTPRINT(Shellos) + LEARNSETS(Shellos), .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -2056,39 +2056,39 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GASTRODON_WEST_SEA] = { - .baseHP = 111, \ - .baseAttack = 83, \ - .baseDefense = 68, \ - .baseSpeed = 39, \ - .baseSpAttack = 92, \ - .baseSpDefense = 82, \ - .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 176, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ - .speciesName = _("Gastrodon"), \ - .cryId = CRY_GASTRODON, \ - .natDexNum = NATIONAL_DEX_GASTRODON, \ - .categoryName = _("Sea Slug"), \ - .height = 9, \ - .weight = 299, \ - .pokemonScale = 338, \ - .pokemonOffset = 8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 8, \ - .frontAnimFrames = sAnims_Gastrodon, \ - .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, \ - .backPicYOffset = 3, \ - .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - FOOTPRINT(Gastrodon) \ - LEARNSETS(Gastrodon), \ + .baseHP = 111, + .baseAttack = 83, + .baseDefense = 68, + .baseSpeed = 39, + .baseSpAttack = 92, + .baseSpDefense = 82, + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 176, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .speciesName = _("Gastrodon"), + .cryId = CRY_GASTRODON, + .natDexNum = NATIONAL_DEX_GASTRODON, + .categoryName = _("Sea Slug"), + .height = 9, + .weight = 299, + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 8, + .frontAnimFrames = sAnims_Gastrodon, + .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, + .backPicYOffset = 3, + .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, + FOOTPRINT(Gastrodon) + LEARNSETS(Gastrodon), .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( @@ -2104,39 +2104,39 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GASTRODON_EAST_SEA] = { - .baseHP = 111, \ - .baseAttack = 83, \ - .baseDefense = 68, \ - .baseSpeed = 39, \ - .baseSpAttack = 92, \ - .baseSpDefense = 82, \ - .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), \ - .catchRate = 75, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 176, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, \ - .speciesName = _("Gastrodon"), \ - .cryId = CRY_GASTRODON, \ - .natDexNum = NATIONAL_DEX_GASTRODON, \ - .categoryName = _("Sea Slug"), \ - .height = 9, \ - .weight = 299, \ - .pokemonScale = 338, \ - .pokemonOffset = 8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 8, \ - .frontAnimFrames = sAnims_Gastrodon, \ - .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, \ - .backPicYOffset = 3, \ - .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - FOOTPRINT(Gastrodon) \ - LEARNSETS(Gastrodon), \ + .baseHP = 111, + .baseAttack = 83, + .baseDefense = 68, + .baseSpeed = 39, + .baseSpAttack = 92, + .baseSpDefense = 82, + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), + .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 176, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .speciesName = _("Gastrodon"), + .cryId = CRY_GASTRODON, + .natDexNum = NATIONAL_DEX_GASTRODON, + .categoryName = _("Sea Slug"), + .height = 9, + .weight = 299, + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 8, + .frontAnimFrames = sAnims_Gastrodon, + .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, + .backPicYOffset = 3, + .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, + FOOTPRINT(Gastrodon) + LEARNSETS(Gastrodon), .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -2301,20 +2301,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_LOPUNNY] = { - .catchRate = 60, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 140, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Lopunny"), \ - .natDexNum = NATIONAL_DEX_LOPUNNY, \ - .categoryName = _("Rabbit"), \ - FOOTPRINT(Lopunny) \ - LEARNSETS(Lopunny), \ - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ + .catchRate = 60, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 140, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Lopunny"), + .natDexNum = NATIONAL_DEX_LOPUNNY, + .categoryName = _("Rabbit"), + FOOTPRINT(Lopunny) + LEARNSETS(Lopunny), + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, .baseAttack = 76, @@ -2351,20 +2351,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LOPUNNY_MEGA] = { - .catchRate = 60, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = 140, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Lopunny"), \ - .natDexNum = NATIONAL_DEX_LOPUNNY, \ - .categoryName = _("Rabbit"), \ - FOOTPRINT(Lopunny) \ - LEARNSETS(Lopunny), \ - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, \ + .catchRate = 60, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 140, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Lopunny"), + .natDexNum = NATIONAL_DEX_LOPUNNY, + .categoryName = _("Rabbit"), + FOOTPRINT(Lopunny) + LEARNSETS(Lopunny), + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, .baseAttack = 136, @@ -2900,27 +2900,27 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GARCHOMP] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Garchomp"), \ - .natDexNum = NATIONAL_DEX_GARCHOMP, \ - .categoryName = _("Mach"), \ - .height = 19, \ - .weight = 950, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - FOOTPRINT(Garchomp) \ - LEARNSETS(Garchomp), \ - .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Garchomp"), + .natDexNum = NATIONAL_DEX_GARCHOMP, + .categoryName = _("Mach"), + .height = 19, + .weight = 950, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + FOOTPRINT(Garchomp) + LEARNSETS(Garchomp), + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, .baseAttack = 130, @@ -2957,27 +2957,27 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARCHOMP_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 45, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Garchomp"), \ - .natDexNum = NATIONAL_DEX_GARCHOMP, \ - .categoryName = _("Mach"), \ - .height = 19, \ - .weight = 950, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - FOOTPRINT(Garchomp) \ - LEARNSETS(Garchomp), \ - .formSpeciesIdTable = sGarchompFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 45, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Garchomp"), + .natDexNum = NATIONAL_DEX_GARCHOMP, + .categoryName = _("Mach"), + .height = 19, + .weight = 950, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + FOOTPRINT(Garchomp) + LEARNSETS(Garchomp), + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, .baseAttack = 170, @@ -3058,22 +3058,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_LUCARIO] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Lucario"), \ - .natDexNum = NATIONAL_DEX_LUCARIO, \ - .categoryName = _("Aura"), \ - FOOTPRINT(Lucario) \ - LEARNSETS(Lucario), \ - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), + .catchRate = 45, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Lucario"), + .natDexNum = NATIONAL_DEX_LUCARIO, + .categoryName = _("Aura"), + FOOTPRINT(Lucario) + LEARNSETS(Lucario), + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, .baseAttack = 110, @@ -3109,22 +3109,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LUCARIO_MEGA] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), \ - .catchRate = 45, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Lucario"), \ - .natDexNum = NATIONAL_DEX_LUCARIO, \ - .categoryName = _("Aura"), \ - FOOTPRINT(Lucario) \ - LEARNSETS(Lucario), \ - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), + .catchRate = 45, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Lucario"), + .natDexNum = NATIONAL_DEX_LUCARIO, + .categoryName = _("Aura"), + FOOTPRINT(Lucario) + LEARNSETS(Lucario), + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, .baseAttack = 145, @@ -3672,23 +3672,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ABOMASNOW] = { - .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), \ - .catchRate = 60, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .itemRare = ITEM_NEVER_MELT_ICE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS),\ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Abomasnow"), \ - .natDexNum = NATIONAL_DEX_ABOMASNOW, \ - .categoryName = _("Frost Tree"), \ - FOOTPRINT(Abomasnow) \ - LEARNSETS(Abomasnow), \ - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), + .catchRate = 60, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .itemRare = ITEM_NEVER_MELT_ICE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Abomasnow"), + .natDexNum = NATIONAL_DEX_ABOMASNOW, + .categoryName = _("Frost Tree"), + FOOTPRINT(Abomasnow) + LEARNSETS(Abomasnow), + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, .baseAttack = 92, @@ -3725,23 +3725,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABOMASNOW_MEGA] = { - .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), \ - .catchRate = 60, \ - .evYield_Attack = 1, \ - .evYield_SpAttack = 1, \ - .itemRare = ITEM_NEVER_MELT_ICE, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS),\ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Abomasnow"), \ - .natDexNum = NATIONAL_DEX_ABOMASNOW, \ - .categoryName = _("Frost Tree"), \ - FOOTPRINT(Abomasnow) \ - LEARNSETS(Abomasnow), \ - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), + .catchRate = 60, + .evYield_Attack = 1, + .evYield_SpAttack = 1, + .itemRare = ITEM_NEVER_MELT_ICE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Abomasnow"), + .natDexNum = NATIONAL_DEX_ABOMASNOW, + .categoryName = _("Frost Tree"), + FOOTPRINT(Abomasnow) + LEARNSETS(Abomasnow), + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, .baseAttack = 132, @@ -3780,29 +3780,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_FAMILY_ROTOM [SPECIES_ROTOM] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .baseHP = 50, .baseAttack = 50, @@ -3839,37 +3839,37 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_HEAT] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "If the convection microwave oven is not\n" @@ -3890,38 +3890,38 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_WASH] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER), .noFlip = TRUE, - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "It enjoys coming up with water-based\n" @@ -3942,37 +3942,37 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FROST] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE), - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "In this form, Rotom likes to play freezing\n" @@ -3993,37 +3993,37 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FAN] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "The first appliance developed that Rotom\n" @@ -4045,37 +4045,37 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_MOW] = { - .catchRate = 45, \ - .evYield_Speed = 1, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Rotom"), \ - .cryId = CRY_ROTOM, \ - .natDexNum = NATIONAL_DEX_ROTOM, \ - .categoryName = _("Plasma"), \ - .height = 3, \ - .weight = 3, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Rotom) \ - LEARNSETS(Rotom), \ - .formSpeciesIdTable = sRotomFormSpeciesIdTable, \ + .catchRate = 45, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Rotom"), + .cryId = CRY_ROTOM, + .natDexNum = NATIONAL_DEX_ROTOM, + .categoryName = _("Plasma"), + .height = 3, + .weight = 3, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Rotom) + LEARNSETS(Rotom), + .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), - .baseHP = 50, \ - .baseAttack = 65, \ - .baseDefense = 107, \ - .baseSpeed = 86, \ - .baseSpAttack = 105, \ - .baseSpDefense = 107, \ + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, .expYield = ROTOM_APPLIANCE_EXP_YIELD, .description = COMPOUND_STRING( "The lawn mower is an appliance that led to\n" @@ -4281,25 +4281,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_DIALGA] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = DIALGA_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Dialga"), \ - .cryId = CRY_DIALGA, \ - .natDexNum = NATIONAL_DEX_DIALGA, \ - .categoryName = _("Temporal"), \ - FOOTPRINT(Dialga) \ - LEARNSETS(Dialga), \ - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ - .formChangeTable = sDialgaFormChangeTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), + .catchRate = 3, + .expYield = DIALGA_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Dialga"), + .cryId = CRY_DIALGA, + .natDexNum = NATIONAL_DEX_DIALGA, + .categoryName = _("Temporal"), + FOOTPRINT(Dialga) + LEARNSETS(Dialga), + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, .isLegendary = TRUE, .baseHP = 100, .baseAttack = 120, @@ -4331,25 +4331,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_DIALGA_ORIGIN] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = DIALGA_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Dialga"), \ - .cryId = CRY_DIALGA, \ - .natDexNum = NATIONAL_DEX_DIALGA, \ - .categoryName = _("Temporal"), \ - FOOTPRINT(Dialga) \ - LEARNSETS(Dialga), \ - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, \ - .formChangeTable = sDialgaFormChangeTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), + .catchRate = 3, + .expYield = DIALGA_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Dialga"), + .cryId = CRY_DIALGA, + .natDexNum = NATIONAL_DEX_DIALGA, + .categoryName = _("Temporal"), + FOOTPRINT(Dialga) + LEARNSETS(Dialga), + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, .isLegendary = TRUE, .baseHP = 100, .baseAttack = 100, @@ -4391,25 +4391,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_PALKIA] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = PALKIA_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Palkia"), \ - .cryId = CRY_PALKIA, \ - .natDexNum = NATIONAL_DEX_PALKIA, \ - .categoryName = _("Spatial"), \ - FOOTPRINT(Palkia) \ - LEARNSETS(Palkia), \ - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ - .formChangeTable = sPalkiaFormChangeTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), + .catchRate = 3, + .expYield = PALKIA_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Palkia"), + .cryId = CRY_PALKIA, + .natDexNum = NATIONAL_DEX_PALKIA, + .categoryName = _("Spatial"), + FOOTPRINT(Palkia) + LEARNSETS(Palkia), + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 120, @@ -4441,25 +4441,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_PALKIA_ORIGIN] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = PALKIA_EXP_YIELD, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Palkia"), \ - .cryId = CRY_PALKIA, \ - .natDexNum = NATIONAL_DEX_PALKIA, \ - .categoryName = _("Spatial"), \ - FOOTPRINT(Palkia) \ - LEARNSETS(Palkia), \ - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, \ - .formChangeTable = sPalkiaFormChangeTable, \ + .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), + .catchRate = 3, + .expYield = PALKIA_EXP_YIELD, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Palkia"), + .cryId = CRY_PALKIA, + .natDexNum = NATIONAL_DEX_PALKIA, + .categoryName = _("Spatial"), + FOOTPRINT(Palkia) + LEARNSETS(Palkia), + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 100, @@ -4613,24 +4613,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GIRATINA_ALTERED] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = GIRATINA_EXP_YIELD, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Giratina"), \ - .cryId = CRY_GIRATINA, \ - .natDexNum = NATIONAL_DEX_GIRATINA, \ - .categoryName = _("Renegade"), \ - FOOTPRINT(Giratina) \ - LEARNSETS(Giratina), \ - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ - .formChangeTable = sGiratinaFormChangeTable, \ + .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), + .catchRate = 3, + .expYield = GIRATINA_EXP_YIELD, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Giratina"), + .cryId = CRY_GIRATINA, + .natDexNum = NATIONAL_DEX_GIRATINA, + .categoryName = _("Renegade"), + FOOTPRINT(Giratina) + LEARNSETS(Giratina), + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, .isLegendary = TRUE, .baseHP = 150, .baseAttack = 100, @@ -4663,24 +4663,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GIRATINA_ORIGIN] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), \ - .catchRate = 3, \ - .expYield = GIRATINA_EXP_YIELD, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Giratina"), \ - .cryId = CRY_GIRATINA, \ - .natDexNum = NATIONAL_DEX_GIRATINA, \ - .categoryName = _("Renegade"), \ - FOOTPRINT(Giratina) \ - LEARNSETS(Giratina), \ - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, \ - .formChangeTable = sGiratinaFormChangeTable, \ + .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), + .catchRate = 3, + .expYield = GIRATINA_EXP_YIELD, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Giratina"), + .cryId = CRY_GIRATINA, + .natDexNum = NATIONAL_DEX_GIRATINA, + .categoryName = _("Renegade"), + FOOTPRINT(Giratina) + LEARNSETS(Giratina), + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, .isLegendary = TRUE, .baseHP = 150, .baseAttack = 120, @@ -4951,22 +4951,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHAYMIN_LAND] = { - .catchRate = 45, \ - .expYield = SHAYMIN_EXP_YIELD, \ - .itemCommon = ITEM_LUM_BERRY, \ - .itemRare = ITEM_LUM_BERRY, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 100, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Shaymin"), \ - .natDexNum = NATIONAL_DEX_SHAYMIN, \ - .categoryName = _("Gratitude"), \ - FOOTPRINT(Shaymin) \ - .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ - .formChangeTable = sShayminFormChangeTable, \ + .catchRate = 45, + .expYield = SHAYMIN_EXP_YIELD, + .itemCommon = ITEM_LUM_BERRY, + .itemRare = ITEM_LUM_BERRY, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Shaymin"), + .natDexNum = NATIONAL_DEX_SHAYMIN, + .categoryName = _("Gratitude"), + FOOTPRINT(Shaymin) + .formSpeciesIdTable = sShayminFormSpeciesIdTable, + .formChangeTable = sShayminFormChangeTable, .isMythical = TRUE, .baseHP = 100, .baseAttack = 100, @@ -5003,22 +5003,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHAYMIN_SKY] = { - .catchRate = 45, \ - .expYield = SHAYMIN_EXP_YIELD, \ - .itemCommon = ITEM_LUM_BERRY, \ - .itemRare = ITEM_LUM_BERRY, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 100, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Shaymin"), \ - .natDexNum = NATIONAL_DEX_SHAYMIN, \ - .categoryName = _("Gratitude"), \ - FOOTPRINT(Shaymin) \ - .formSpeciesIdTable = sShayminFormSpeciesIdTable, \ - .formChangeTable = sShayminFormChangeTable, \ + .catchRate = 45, + .expYield = SHAYMIN_EXP_YIELD, + .itemCommon = ITEM_LUM_BERRY, + .itemRare = ITEM_LUM_BERRY, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Shaymin"), + .natDexNum = NATIONAL_DEX_SHAYMIN, + .categoryName = _("Gratitude"), + FOOTPRINT(Shaymin) + .formSpeciesIdTable = sShayminFormSpeciesIdTable, + .formChangeTable = sShayminFormChangeTable, .isMythical = TRUE, .baseHP = 100, .baseAttack = 103, diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index e90218943198..2bb1870c9ba3 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -444,24 +444,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAMUROTT] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Samurott"), \ - .cryId = CRY_SAMUROTT, \ - .natDexNum = NATIONAL_DEX_SAMUROTT, \ - .categoryName = _("Formidable"), \ - .height = 15, \ - .pokemonScale = 268, \ - .pokemonOffset = 2, \ - .trainerScale = 271, \ - .trainerOffset = 0, \ - FOOTPRINT(Samurott) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Samurott"), + .cryId = CRY_SAMUROTT, + .natDexNum = NATIONAL_DEX_SAMUROTT, + .categoryName = _("Formidable"), + .height = 15, + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, + FOOTPRINT(Samurott) .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .baseHP = 95, .baseAttack = 100, @@ -493,24 +493,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_SAMUROTT_HISUIAN] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Samurott"), \ - .cryId = CRY_SAMUROTT, \ - .natDexNum = NATIONAL_DEX_SAMUROTT, \ - .categoryName = _("Formidable"), \ - .height = 15, \ - .pokemonScale = 268, \ - .pokemonOffset = 2, \ - .trainerScale = 271, \ - .trainerOffset = 0, \ - FOOTPRINT(Samurott) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Samurott"), + .cryId = CRY_SAMUROTT, + .natDexNum = NATIONAL_DEX_SAMUROTT, + .categoryName = _("Formidable"), + .height = 15, + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, + FOOTPRINT(Samurott) .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .baseHP = 90, .baseAttack = 108, @@ -1891,21 +1891,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_AUDINO [SPECIES_AUDINO] = { - .catchRate = 255, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_ORAN_BERRY, \ - .itemRare = ITEM_SITRUS_BERRY, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .speciesName = _("Audino"), \ - .natDexNum = NATIONAL_DEX_AUDINO, \ - .categoryName = _("Hearing"), \ - FOOTPRINT(Audino) \ - LEARNSETS(Audino), \ - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ + .catchRate = 255, + .evYield_HP = 2, + .itemCommon = ITEM_ORAN_BERRY, + .itemRare = ITEM_SITRUS_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .speciesName = _("Audino"), + .natDexNum = NATIONAL_DEX_AUDINO, + .categoryName = _("Hearing"), + FOOTPRINT(Audino) + LEARNSETS(Audino), + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, .baseAttack = 60, @@ -1943,21 +1943,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_MEGA_EVOLUTIONS [SPECIES_AUDINO_MEGA] = { - .catchRate = 255, \ - .evYield_HP = 2, \ - .itemCommon = ITEM_ORAN_BERRY, \ - .itemRare = ITEM_SITRUS_BERRY, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .speciesName = _("Audino"), \ - .natDexNum = NATIONAL_DEX_AUDINO, \ - .categoryName = _("Hearing"), \ - FOOTPRINT(Audino) \ - LEARNSETS(Audino), \ - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, \ + .catchRate = 255, + .evYield_HP = 2, + .itemCommon = ITEM_ORAN_BERRY, + .itemRare = ITEM_SITRUS_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .speciesName = _("Audino"), + .natDexNum = NATIONAL_DEX_AUDINO, + .categoryName = _("Hearing"), + FOOTPRINT(Audino) + LEARNSETS(Audino), + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, .baseAttack = 60, @@ -2872,20 +2872,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_LILLIGANT] = { - .catchRate = 75, \ - .expYield = 168, \ - .itemRare = ITEM_ABSORB_BULB, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - .speciesName = _("Lilligant"), \ - .cryId = CRY_LILLIGANT, \ - .natDexNum = NATIONAL_DEX_LILLIGANT, \ - FOOTPRINT(Lilligant) \ + .catchRate = 75, + .expYield = 168, + .itemRare = ITEM_ABSORB_BULB, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Lilligant"), + .cryId = CRY_LILLIGANT, + .natDexNum = NATIONAL_DEX_LILLIGANT, + FOOTPRINT(Lilligant) .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .baseHP = 70, .baseAttack = 60, @@ -2923,20 +2923,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_LILLIGANT_HISUIAN] = { - .catchRate = 75, \ - .expYield = 168, \ - .itemRare = ITEM_ABSORB_BULB, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - .speciesName = _("Lilligant"), \ - .cryId = CRY_LILLIGANT, \ - .natDexNum = NATIONAL_DEX_LILLIGANT, \ - FOOTPRINT(Lilligant) \ + .catchRate = 75, + .expYield = 168, + .itemRare = ITEM_ABSORB_BULB, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Lilligant"), + .cryId = CRY_LILLIGANT, + .natDexNum = NATIONAL_DEX_LILLIGANT, + FOOTPRINT(Lilligant) .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .baseHP = 70, .baseAttack = 105, @@ -2978,33 +2978,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_BASCULIN [SPECIES_BASCULIN_RED_STRIPED] = { - .baseHP = 70, \ - .baseAttack = 92, \ - .baseDefense = 65, \ - .baseSpeed = 98, \ - .baseSpAttack = 80, \ - .baseSpDefense = 55, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 190, \ - .expYield = 161, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Basculin"), \ - .cryId = CRY_BASCULIN, \ - .natDexNum = NATIONAL_DEX_BASCULIN, \ - .height = 10, \ - .weight = 180, \ - .pokemonScale = 316, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - .enemyMonElevation = 6, \ - FOOTPRINT(Basculin) \ + .baseHP = 70, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 98, + .baseSpAttack = 80, + .baseSpDefense = 55, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 190, + .expYield = 161, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Basculin"), + .cryId = CRY_BASCULIN, + .natDexNum = NATIONAL_DEX_BASCULIN, + .height = 10, + .weight = 180, + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + .enemyMonElevation = 6, + FOOTPRINT(Basculin) .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_TOOTH, .abilities = { ABILITY_RECKLESS, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, @@ -3028,33 +3028,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULIN_BLUE_STRIPED] = { - .baseHP = 70, \ - .baseAttack = 92, \ - .baseDefense = 65, \ - .baseSpeed = 98, \ - .baseSpAttack = 80, \ - .baseSpDefense = 55, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 190, \ - .expYield = 161, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Basculin"), \ - .cryId = CRY_BASCULIN, \ - .natDexNum = NATIONAL_DEX_BASCULIN, \ - .height = 10, \ - .weight = 180, \ - .pokemonScale = 316, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - .enemyMonElevation = 6, \ - FOOTPRINT(Basculin) \ + .baseHP = 70, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 98, + .baseSpAttack = 80, + .baseSpDefense = 55, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 190, + .expYield = 161, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Basculin"), + .cryId = CRY_BASCULIN, + .natDexNum = NATIONAL_DEX_BASCULIN, + .height = 10, + .weight = 180, + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + .enemyMonElevation = 6, + FOOTPRINT(Basculin) .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_SCALE, .abilities = { ABILITY_ROCK_HEAD, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, @@ -3079,33 +3079,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_BASCULIN_WHITE_STRIPED] = { - .baseHP = 70, \ - .baseAttack = 92, \ - .baseDefense = 65, \ - .baseSpeed = 98, \ - .baseSpAttack = 80, \ - .baseSpDefense = 55, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 190, \ - .expYield = 161, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Basculin"), \ - .cryId = CRY_BASCULIN, \ - .natDexNum = NATIONAL_DEX_BASCULIN, \ - .height = 10, \ - .weight = 180, \ - .pokemonScale = 316, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - .enemyMonElevation = 6, \ - FOOTPRINT(Basculin) \ + .baseHP = 70, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 98, + .baseSpAttack = 80, + .baseSpDefense = 55, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 190, + .expYield = 161, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Basculin"), + .cryId = CRY_BASCULIN, + .natDexNum = NATIONAL_DEX_BASCULIN, + .height = 10, + .weight = 180, + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + .enemyMonElevation = 6, + FOOTPRINT(Basculin) .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .itemRare = ITEM_DEEP_SEA_SCALE, .abilities = { ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, @@ -3131,31 +3131,31 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULEGION_MALE] = { - .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_HP = 3, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Bsculegion"), \ - .cryId = CRY_BASCULEGION, \ - .natDexNum = NATIONAL_DEX_BASCULEGION, \ - .categoryName = _("Big Fish"), \ - .height = 30, \ - .weight = 1100, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Basculegion, \ - .frontPicYOffset = 0, \ - .enemyMonElevation = 5, \ - .backPicYOffset = 8, \ - LEARNSETS(Basculegion), \ + .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), + .catchRate = 45, + .expYield = 265, + .evYield_HP = 3, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Bsculegion"), + .cryId = CRY_BASCULEGION, + .natDexNum = NATIONAL_DEX_BASCULEGION, + .categoryName = _("Big Fish"), + .height = 30, + .weight = 1100, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Basculegion, + .frontPicYOffset = 0, + .enemyMonElevation = 5, + .backPicYOffset = 8, + LEARNSETS(Basculegion), .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3180,31 +3180,31 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULEGION_FEMALE] = { - .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_HP = 3, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Bsculegion"), \ - .cryId = CRY_BASCULEGION, \ - .natDexNum = NATIONAL_DEX_BASCULEGION, \ - .categoryName = _("Big Fish"), \ - .height = 30, \ - .weight = 1100, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Basculegion, \ - .frontPicYOffset = 0, \ - .enemyMonElevation = 5, \ - .backPicYOffset = 8, \ - LEARNSETS(Basculegion), \ + .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), + .catchRate = 45, + .expYield = 265, + .evYield_HP = 3, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_SWIFT_SWIM, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Bsculegion"), + .cryId = CRY_BASCULEGION, + .natDexNum = NATIONAL_DEX_BASCULEGION, + .categoryName = _("Big Fish"), + .height = 30, + .weight = 1100, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Basculegion, + .frontPicYOffset = 0, + .enemyMonElevation = 5, + .backPicYOffset = 8, + LEARNSETS(Basculegion), .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3385,26 +3385,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_DARUMAKA [SPECIES_DARUMAKA] = { - .baseHP = 70, \ - .baseAttack = 90, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 15, \ - .baseSpDefense = 45, \ - .catchRate = 120, \ - .expYield = 63, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, \ - .speciesName = _("Darumaka"), \ - .cryId = CRY_DARUMAKA, \ - .natDexNum = NATIONAL_DEX_DARUMAKA, \ - .categoryName = _("Zen Charm"), \ - FOOTPRINT(Darumaka) \ + .baseHP = 70, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 15, + .baseSpDefense = 45, + .catchRate = 120, + .expYield = 63, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + .speciesName = _("Darumaka"), + .cryId = CRY_DARUMAKA, + .natDexNum = NATIONAL_DEX_DARUMAKA, + .categoryName = _("Zen Charm"), + FOOTPRINT(Darumaka) .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, @@ -3434,33 +3434,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_STANDARD_MODE] = { - .baseHP = 105, \ - .baseAttack = 140, \ - .baseDefense = 55, \ - .baseSpeed = 95, \ - .baseSpAttack = 30, \ - .baseSpDefense = 55, \ - .expYield = 168, \ - .evYield_Attack = 2, \ - .catchRate = 60, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Darmanitan"), \ - .cryId = CRY_DARMANITAN, \ - .natDexNum = NATIONAL_DEX_DARMANITAN, \ - FOOTPRINT(Darmanitan) \ + .baseHP = 105, + .baseAttack = 140, + .baseDefense = 55, + .baseSpeed = 95, + .baseSpAttack = 30, + .baseSpDefense = 55, + .expYield = 168, + .evYield_Attack = 2, + .catchRate = 60, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Darmanitan"), + .cryId = CRY_DARMANITAN, + .natDexNum = NATIONAL_DEX_DARMANITAN, + FOOTPRINT(Darmanitan) .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE },\ - .height = 13, \ - .weight = 929, \ - .pokemonScale = 272, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - LEARNSETS(Darmanitan), \ + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .height = 13, + .weight = 929, + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + LEARNSETS(Darmanitan), .formChangeTable = sDarmanitanFormChangeTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, @@ -3483,28 +3483,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_ZEN_MODE] = { - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,\ - .evYield_SpAttack = 2, \ - .categoryName = _("Blazing"), \ - .catchRate = 60, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Darmanitan"), \ - .cryId = CRY_DARMANITAN, \ - .natDexNum = NATIONAL_DEX_DARMANITAN, \ - FOOTPRINT(Darmanitan) \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168, + .evYield_SpAttack = 2, + .categoryName = _("Blazing"), + .catchRate = 60, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Darmanitan"), + .cryId = CRY_DARMANITAN, + .natDexNum = NATIONAL_DEX_DARMANITAN, + FOOTPRINT(Darmanitan) .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE },\ - .height = 13, \ - .weight = 929, \ - .pokemonScale = 272, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - LEARNSETS(Darmanitan), \ + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .height = 13, + .weight = 929, + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + LEARNSETS(Darmanitan), .formChangeTable = sDarmanitanFormChangeTable, .baseHP = 105, .baseAttack = 30, @@ -3532,26 +3532,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_DARUMAKA_GALARIAN] = { - .baseHP = 70, \ - .baseAttack = 90, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 15, \ - .baseSpDefense = 45, \ - .catchRate = 120, \ - .expYield = 63, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, \ - .speciesName = _("Darumaka"), \ - .cryId = CRY_DARUMAKA, \ - .natDexNum = NATIONAL_DEX_DARUMAKA, \ - .categoryName = _("Zen Charm"), \ - FOOTPRINT(Darumaka) \ + .baseHP = 70, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 15, + .baseSpDefense = 45, + .catchRate = 120, + .expYield = 63, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + .speciesName = _("Darumaka"), + .cryId = CRY_DARUMAKA, + .natDexNum = NATIONAL_DEX_DARUMAKA, + .categoryName = _("Zen Charm"), + FOOTPRINT(Darumaka) .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .types = MON_TYPES(TYPE_ICE), .bodyColor = BODY_COLOR_WHITE, @@ -3582,35 +3582,35 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { - .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE },\ - .bodyColor = BODY_COLOR_WHITE, \ - .height = 17, \ - .weight = 1200, \ - .pokemonScale = 272, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - LEARNSETS(DarmanitanGalarian), \ - .formChangeTable = sDarmanitanGalarianFormChangeTable, \ + .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_WHITE, + .height = 17, + .weight = 1200, + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + LEARNSETS(DarmanitanGalarian), + .formChangeTable = sDarmanitanGalarianFormChangeTable, .isGalarianForm = TRUE, - .baseHP = 105, \ - .baseAttack = 140, \ - .baseDefense = 55, \ - .baseSpeed = 95, \ - .baseSpAttack = 30, \ - .baseSpDefense = 55, \ - .expYield = 168, \ - .evYield_Attack = 2, \ - .catchRate = 60, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Darmanitan"), \ - .cryId = CRY_DARMANITAN, \ - .natDexNum = NATIONAL_DEX_DARMANITAN, \ - FOOTPRINT(Darmanitan) \ + .baseHP = 105, + .baseAttack = 140, + .baseDefense = 55, + .baseSpeed = 95, + .baseSpAttack = 30, + .baseSpDefense = 55, + .expYield = 168, + .evYield_Attack = 2, + .catchRate = 60, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Darmanitan"), + .cryId = CRY_DARMANITAN, + .natDexNum = NATIONAL_DEX_DARMANITAN, + FOOTPRINT(Darmanitan) .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .types = MON_TYPES(TYPE_ICE), .categoryName = _("Zen Charm"), @@ -3632,30 +3632,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { - .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE },\ - .bodyColor = BODY_COLOR_WHITE, \ - .height = 17, \ - .weight = 1200, \ - .pokemonScale = 272, \ - .pokemonOffset = 3, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - LEARNSETS(DarmanitanGalarian), \ - .formChangeTable = sDarmanitanGalarianFormChangeTable, \ + .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_WHITE, + .height = 17, + .weight = 1200, + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, + LEARNSETS(DarmanitanGalarian), + .formChangeTable = sDarmanitanGalarianFormChangeTable, .isGalarianForm = TRUE, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168,\ - .evYield_SpAttack = 2, \ - .categoryName = _("Blazing"), \ - .catchRate = 60, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Darmanitan"), \ - .cryId = CRY_DARMANITAN, \ - .natDexNum = NATIONAL_DEX_DARMANITAN, \ - FOOTPRINT(Darmanitan) \ + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168, + .evYield_SpAttack = 2, + .categoryName = _("Blazing"), + .catchRate = 60, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Darmanitan"), + .cryId = CRY_DARMANITAN, + .natDexNum = NATIONAL_DEX_DARMANITAN, + FOOTPRINT(Darmanitan) .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .baseHP = 105, .baseAttack = 160, @@ -3984,33 +3984,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_YAMASK [SPECIES_YAMASK] = { - .catchRate = 190, \ - .expYield = 61, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),\ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Yamask"), \ - .cryId = CRY_YAMASK, \ - .natDexNum = NATIONAL_DEX_YAMASK, \ - .categoryName = _("Spirit"), \ - .height = 5, \ - .weight = 15, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Yamask) \ - .formSpeciesIdTable = sYamaskFormSpeciesIdTable, - .baseHP = 38, - .baseAttack = 30, - .baseDefense = 85, - .baseSpeed = 30, - .baseSpAttack = 55, - .baseSpDefense = 65, + .catchRate = 190, + .expYield = 61, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Yamask"), + .cryId = CRY_YAMASK, + .natDexNum = NATIONAL_DEX_YAMASK, + .categoryName = _("Spirit"), + .height = 5, + .weight = 15, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Yamask) + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, + .baseHP = 38, + .baseAttack = 30, + .baseDefense = 85, + .baseSpeed = 30, + .baseSpAttack = 55, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_GHOST), .itemRare = ITEM_SPELL_TAG, .abilities = { ABILITY_MUMMY, ABILITY_NONE }, @@ -4084,26 +4084,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_YAMASK_GALARIAN] = { - .catchRate = 190, \ - .expYield = 61, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS),\ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Yamask"), \ - .cryId = CRY_YAMASK, \ - .natDexNum = NATIONAL_DEX_YAMASK, \ - .categoryName = _("Spirit"), \ - .height = 5, \ - .weight = 15, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Yamask) \ + .catchRate = 190, + .expYield = 61, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Yamask"), + .cryId = CRY_YAMASK, + .natDexNum = NATIONAL_DEX_YAMASK, + .categoryName = _("Spirit"), + .height = 5, + .weight = 15, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Yamask) .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .baseHP = 38, .baseAttack = 55, @@ -4429,33 +4429,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_GARBODOR] = { - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 82, \ - .baseSpeed = 75, \ - .baseSpAttack = 60, \ - .baseSpDefense = 82, \ - .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - .speciesName = _("Garbodor"), \ - .cryId = CRY_GARBODOR, \ - .natDexNum = NATIONAL_DEX_GARBODOR, \ - .categoryName = _("Trash Heap"), \ - FOOTPRINT(Garbodor) \ - LEARNSETS(Garbodor), \ - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 95, + .baseDefense = 82, + .baseSpeed = 75, + .baseSpAttack = 60, + .baseSpDefense = 82, + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Garbodor"), + .cryId = CRY_GARBODOR, + .natDexNum = NATIONAL_DEX_GARBODOR, + .categoryName = _("Trash Heap"), + FOOTPRINT(Garbodor) + LEARNSETS(Garbodor), + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, .formChangeTable = sGarbodorFormChangeTable, .height = 19, .weight = 1073, @@ -4482,33 +4482,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GIGANTAMAX_FORMS [SPECIES_GARBODOR_GIGANTAMAX] = { - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 82, \ - .baseSpeed = 75, \ - .baseSpAttack = 60, \ - .baseSpDefense = 82, \ - .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .noFlip = TRUE, \ - .speciesName = _("Garbodor"), \ - .cryId = CRY_GARBODOR, \ - .natDexNum = NATIONAL_DEX_GARBODOR, \ - .categoryName = _("Trash Heap"), \ - FOOTPRINT(Garbodor) \ - LEARNSETS(Garbodor), \ - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 95, + .baseDefense = 82, + .baseSpeed = 75, + .baseSpAttack = 60, + .baseSpDefense = 82, + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STENCH, ABILITY_WEAK_ARMOR, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Garbodor"), + .cryId = CRY_GARBODOR, + .natDexNum = NATIONAL_DEX_GARBODOR, + .categoryName = _("Trash Heap"), + FOOTPRINT(Garbodor) + LEARNSETS(Garbodor), + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, .formChangeTable = sGarbodorFormChangeTable, .height = 210, .weight = 0, @@ -4538,26 +4538,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_ZORUA [SPECIES_ZORUA] = { - .catchRate = 75, \ - .expYield = 66, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Zorua"), \ - .cryId = CRY_ZORUA, \ - .natDexNum = NATIONAL_DEX_ZORUA, \ - .height = 7, \ - .weight = 125, \ - .pokemonScale = 365, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zorua) \ + .catchRate = 75, + .expYield = 66, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Zorua"), + .cryId = CRY_ZORUA, + .natDexNum = NATIONAL_DEX_ZORUA, + .height = 7, + .weight = 125, + .pokemonScale = 365, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zorua) .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .baseHP = 40, .baseAttack = 65, @@ -4587,25 +4587,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK] = { - .catchRate = 45, \ - .expYield = 179, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Zoroark"), \ - .cryId = CRY_ZOROARK, \ - .natDexNum = NATIONAL_DEX_ZOROARK, \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Zoroark) \ + .catchRate = 45, + .expYield = 179, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Zoroark"), + .cryId = CRY_ZOROARK, + .natDexNum = NATIONAL_DEX_ZOROARK, + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Zoroark) .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .baseHP = 60, .baseAttack = 105, @@ -4636,26 +4636,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_ZORUA_HISUIAN] = { - .catchRate = 75, \ - .expYield = 66, \ - .evYield_SpAttack = 1, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Zorua"), \ - .cryId = CRY_ZORUA, \ - .natDexNum = NATIONAL_DEX_ZORUA, \ - .height = 7, \ - .weight = 125, \ - .pokemonScale = 365, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zorua) \ + .catchRate = 75, + .expYield = 66, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Zorua"), + .cryId = CRY_ZORUA, + .natDexNum = NATIONAL_DEX_ZORUA, + .height = 7, + .weight = 125, + .pokemonScale = 365, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zorua) .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .baseHP = 35, .baseAttack = 60, @@ -4686,25 +4686,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK_HISUIAN] = { - .catchRate = 45, \ - .expYield = 179, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Zoroark"), \ - .cryId = CRY_ZOROARK, \ - .natDexNum = NATIONAL_DEX_ZOROARK, \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Zoroark) \ + .catchRate = 45, + .expYield = 179, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_ILLUSION, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Zoroark"), + .cryId = CRY_ZOROARK, + .natDexNum = NATIONAL_DEX_ZOROARK, + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Zoroark) .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .baseHP = 55, .baseAttack = 100, @@ -5375,41 +5375,41 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_DEERLING [SPECIES_DEERLING_SPRING] = { - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 50, \ - .baseSpeed = 75, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 190, \ - .expYield = 67, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .speciesName = _("Deerling"), \ - .cryId = CRY_DEERLING, \ - .natDexNum = NATIONAL_DEX_DEERLING, \ - .categoryName = _("Season"), \ - .height = 6, \ - .weight = 195, \ - .pokemonScale = 422, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Deerling, 32, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Deerling, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - BACK_PIC(Deerling, 48, 56), \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_H_SLIDE, \ - FOOTPRINT(Deerling) \ - LEARNSETS(Deerling), \ + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 50, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 190, + .expYield = 67, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .speciesName = _("Deerling"), + .cryId = CRY_DEERLING, + .natDexNum = NATIONAL_DEX_DEERLING, + .categoryName = _("Season"), + .height = 6, + .weight = 195, + .pokemonScale = 422, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Deerling, 32, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Deerling, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Deerling, 48, 56), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_H_SLIDE, + FOOTPRINT(Deerling) + LEARNSETS(Deerling), .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .description = COMPOUND_STRING( @@ -5421,44 +5421,44 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingSpring, 1), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}), }, - + [SPECIES_DEERLING_SUMMER] = { - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 50, \ - .baseSpeed = 75, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 190, \ - .expYield = 67, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .speciesName = _("Deerling"), \ - .cryId = CRY_DEERLING, \ - .natDexNum = NATIONAL_DEX_DEERLING, \ - .categoryName = _("Season"), \ - .height = 6, \ - .weight = 195, \ - .pokemonScale = 422, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Deerling, 32, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Deerling, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - BACK_PIC(Deerling, 48, 56), \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_H_SLIDE, \ - FOOTPRINT(Deerling) \ - LEARNSETS(Deerling), \ + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 50, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 190, + .expYield = 67, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .speciesName = _("Deerling"), + .cryId = CRY_DEERLING, + .natDexNum = NATIONAL_DEX_DEERLING, + .categoryName = _("Season"), + .height = 6, + .weight = 195, + .pokemonScale = 422, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Deerling, 32, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Deerling, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Deerling, 48, 56), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_H_SLIDE, + FOOTPRINT(Deerling) + LEARNSETS(Deerling), .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( @@ -5470,44 +5470,44 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingSummer, 1), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}), }, - + [SPECIES_DEERLING_AUTUMN] = { - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 50, \ - .baseSpeed = 75, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 190, \ - .expYield = 67, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .speciesName = _("Deerling"), \ - .cryId = CRY_DEERLING, \ - .natDexNum = NATIONAL_DEX_DEERLING, \ - .categoryName = _("Season"), \ - .height = 6, \ - .weight = 195, \ - .pokemonScale = 422, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Deerling, 32, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Deerling, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - BACK_PIC(Deerling, 48, 56), \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_H_SLIDE, \ - FOOTPRINT(Deerling) \ - LEARNSETS(Deerling), \ + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 50, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 190, + .expYield = 67, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .speciesName = _("Deerling"), + .cryId = CRY_DEERLING, + .natDexNum = NATIONAL_DEX_DEERLING, + .categoryName = _("Season"), + .height = 6, + .weight = 195, + .pokemonScale = 422, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Deerling, 32, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Deerling, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Deerling, 48, 56), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_H_SLIDE, + FOOTPRINT(Deerling) + LEARNSETS(Deerling), .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -5519,44 +5519,44 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = ICON(DeerlingAutumn, 0), .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}), }, - + [SPECIES_DEERLING_WINTER] = { - .baseHP = 60, \ - .baseAttack = 60, \ - .baseDefense = 50, \ - .baseSpeed = 75, \ - .baseSpAttack = 40, \ - .baseSpDefense = 50, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 190, \ - .expYield = 67, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .speciesName = _("Deerling"), \ - .cryId = CRY_DEERLING, \ - .natDexNum = NATIONAL_DEX_DEERLING, \ - .categoryName = _("Season"), \ - .height = 6, \ - .weight = 195, \ - .pokemonScale = 422, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Deerling, 32, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Deerling, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - BACK_PIC(Deerling, 48, 56), \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_H_SLIDE, \ - FOOTPRINT(Deerling) \ - LEARNSETS(Deerling), \ + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 50, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 190, + .expYield = 67, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .speciesName = _("Deerling"), + .cryId = CRY_DEERLING, + .natDexNum = NATIONAL_DEX_DEERLING, + .categoryName = _("Season"), + .height = 6, + .weight = 195, + .pokemonScale = 422, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Deerling, 32, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Deerling, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + BACK_PIC(Deerling, 48, 56), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_H_SLIDE, + FOOTPRINT(Deerling) + LEARNSETS(Deerling), .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( @@ -5571,40 +5571,40 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAWSBUCK_SPRING] = { - .baseHP = 80, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 95, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Sawsbuck"), \ - .cryId = CRY_SAWSBUCK, \ - .natDexNum = NATIONAL_DEX_SAWSBUCK, \ - .categoryName = _("Season"), \ - .height = 19, \ - .weight = 925, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Sawsbuck, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - .backPicYOffset = 5, \ - .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - FOOTPRINT(Sawsbuck) \ - LEARNSETS(Sawsbuck), \ + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 95, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 75, + .expYield = 166, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Sawsbuck"), + .cryId = CRY_SAWSBUCK, + .natDexNum = NATIONAL_DEX_SAWSBUCK, + .categoryName = _("Season"), + .height = 19, + .weight = 925, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Sawsbuck, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPicYOffset = 5, + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, + FOOTPRINT(Sawsbuck) + LEARNSETS(Sawsbuck), .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Some people call Sawsbuck the harbingers\n" @@ -5619,40 +5619,40 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAWSBUCK_SUMMER] = { - .baseHP = 80, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 95, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Sawsbuck"), \ - .cryId = CRY_SAWSBUCK, \ - .natDexNum = NATIONAL_DEX_SAWSBUCK, \ - .categoryName = _("Season"), \ - .height = 19, \ - .weight = 925, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Sawsbuck, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - .backPicYOffset = 5, \ - .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - FOOTPRINT(Sawsbuck) \ - LEARNSETS(Sawsbuck), \ + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 95, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 75, + .expYield = 166, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Sawsbuck"), + .cryId = CRY_SAWSBUCK, + .natDexNum = NATIONAL_DEX_SAWSBUCK, + .categoryName = _("Season"), + .height = 19, + .weight = 925, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Sawsbuck, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPicYOffset = 5, + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, + FOOTPRINT(Sawsbuck) + LEARNSETS(Sawsbuck), .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "The thicker and larger the\n" @@ -5667,40 +5667,40 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAWSBUCK_AUTUMN] = { - .baseHP = 80, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 95, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Sawsbuck"), \ - .cryId = CRY_SAWSBUCK, \ - .natDexNum = NATIONAL_DEX_SAWSBUCK, \ - .categoryName = _("Season"), \ - .height = 19, \ - .weight = 925, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Sawsbuck, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - .backPicYOffset = 5, \ - .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - FOOTPRINT(Sawsbuck) \ - LEARNSETS(Sawsbuck), \ + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 95, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 75, + .expYield = 166, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Sawsbuck"), + .cryId = CRY_SAWSBUCK, + .natDexNum = NATIONAL_DEX_SAWSBUCK, + .categoryName = _("Season"), + .height = 19, + .weight = 925, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Sawsbuck, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPicYOffset = 5, + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, + FOOTPRINT(Sawsbuck) + LEARNSETS(Sawsbuck), .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Sawsbuck in their Autumn Form are\n" @@ -5715,40 +5715,40 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAWSBUCK_WINTER] = { - .baseHP = 80, \ - .baseAttack = 100, \ - .baseDefense = 70, \ - .baseSpeed = 95, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), \ - .catchRate = 75, \ - .expYield = 166, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Sawsbuck"), \ - .cryId = CRY_SAWSBUCK, \ - .natDexNum = NATIONAL_DEX_SAWSBUCK, \ - .categoryName = _("Season"), \ - .height = 19, \ - .weight = 925, \ - .pokemonScale = 256, \ - .pokemonOffset = 1, \ - .trainerScale = 326, \ - .trainerOffset = 4, \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Sawsbuck, \ - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, \ - .backPicYOffset = 5, \ - .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, \ - FOOTPRINT(Sawsbuck) \ - LEARNSETS(Sawsbuck), \ + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 95, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GRASS), + .catchRate = 75, + .expYield = 166, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Sawsbuck"), + .cryId = CRY_SAWSBUCK, + .natDexNum = NATIONAL_DEX_SAWSBUCK, + .categoryName = _("Season"), + .height = 19, + .weight = 925, + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Sawsbuck, + .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPicYOffset = 5, + .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, + FOOTPRINT(Sawsbuck) + LEARNSETS(Sawsbuck), .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Though there are many enthusiasts\n" @@ -7318,23 +7318,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_STUNFISK [SPECIES_STUNFISK] = { - .catchRate = 75, \ - .expYield = 165, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS),\ - .speciesName = _("Stunfisk"), \ - .cryId = CRY_STUNFISK, \ - .natDexNum = NATIONAL_DEX_STUNFISK, \ - .categoryName = _("Trap"), \ - .height = 7, \ - .pokemonScale = 365, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Stunfisk) \ + .catchRate = 75, + .expYield = 165, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .speciesName = _("Stunfisk"), + .cryId = CRY_STUNFISK, + .natDexNum = NATIONAL_DEX_STUNFISK, + .categoryName = _("Trap"), + .height = 7, + .pokemonScale = 365, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Stunfisk) .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .baseHP = 109, .baseAttack = 66, @@ -7368,23 +7368,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_STUNFISK_GALARIAN] = { - .catchRate = 75, \ - .expYield = 165, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS),\ - .speciesName = _("Stunfisk"), \ - .cryId = CRY_STUNFISK, \ - .natDexNum = NATIONAL_DEX_STUNFISK, \ - .categoryName = _("Trap"), \ - .height = 7, \ - .pokemonScale = 365, \ - .pokemonOffset = 14, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Stunfisk) \ + .catchRate = 75, + .expYield = 165, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .speciesName = _("Stunfisk"), + .cryId = CRY_STUNFISK, + .natDexNum = NATIONAL_DEX_STUNFISK, + .categoryName = _("Trap"), + .height = 7, + .pokemonScale = 365, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Stunfisk) .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .baseHP = 109, .baseAttack = 81, @@ -7913,17 +7913,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BRAVIARY] = { - .catchRate = 60, \ - .expYield = 179, \ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Braviary"), \ - .cryId = CRY_BRAVIARY, \ - .natDexNum = NATIONAL_DEX_BRAVIARY, \ - FOOTPRINT(Braviary) \ + .catchRate = 60, + .expYield = 179, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Braviary"), + .cryId = CRY_BRAVIARY, + .natDexNum = NATIONAL_DEX_BRAVIARY, + FOOTPRINT(Braviary) .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 100, .baseAttack = 123, @@ -7963,17 +7963,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_BRAVIARY_HISUIAN] = { - .catchRate = 60, \ - .expYield = 179, \ - .genderRatio = MON_MALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Braviary"), \ - .cryId = CRY_BRAVIARY, \ - .natDexNum = NATIONAL_DEX_BRAVIARY, \ - FOOTPRINT(Braviary) \ + .catchRate = 60, + .expYield = 179, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Braviary"), + .cryId = CRY_BRAVIARY, + .natDexNum = NATIONAL_DEX_BRAVIARY, + FOOTPRINT(Braviary) .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 110, .baseAttack = 83, @@ -8606,24 +8606,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_TORNADUS [SPECIES_TORNADUS_INCARNATE] = { - .types = MON_TYPES(TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .evYield_Attack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .isLegendary = TRUE, \ - .speciesName = _("Tornadus"), \ - .natDexNum = NATIONAL_DEX_TORNADUS, \ - .categoryName = _("Cyclone"), \ - .weight = 630, \ - FOOTPRINT(Tornadus) \ - LEARNSETS(Tornadus), \ - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_Attack = 3, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .isLegendary = TRUE, + .speciesName = _("Tornadus"), + .natDexNum = NATIONAL_DEX_TORNADUS, + .categoryName = _("Cyclone"), + .weight = 630, + FOOTPRINT(Tornadus) + LEARNSETS(Tornadus), + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, .baseAttack = 115, @@ -8657,24 +8657,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_TORNADUS_THERIAN] = { - .types = MON_TYPES(TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .evYield_Attack = 3, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GREEN, \ - .isLegendary = TRUE, \ - .speciesName = _("Tornadus"), \ - .natDexNum = NATIONAL_DEX_TORNADUS, \ - .categoryName = _("Cyclone"), \ - .weight = 630, \ - FOOTPRINT(Tornadus) \ - LEARNSETS(Tornadus), \ - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_Attack = 3, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GREEN, + .isLegendary = TRUE, + .speciesName = _("Tornadus"), + .natDexNum = NATIONAL_DEX_TORNADUS, + .categoryName = _("Cyclone"), + .weight = 630, + FOOTPRINT(Tornadus) + LEARNSETS(Tornadus), + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, .baseAttack = 100, @@ -8709,23 +8709,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_THUNDURUS [SPECIES_THUNDURUS_INCARNATE] = { - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Thundurus"), \ - .natDexNum = NATIONAL_DEX_THUNDURUS, \ - .categoryName = _("Bolt Strike"), \ - .weight = 610, \ - FOOTPRINT(Thundurus) \ - LEARNSETS(Thundurus), \ - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Thundurus"), + .natDexNum = NATIONAL_DEX_THUNDURUS, + .categoryName = _("Bolt Strike"), + .weight = 610, + FOOTPRINT(Thundurus) + LEARNSETS(Thundurus), + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, .baseAttack = 115, @@ -8760,23 +8760,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_THUNDURUS_THERIAN] = { - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Thundurus"), \ - .natDexNum = NATIONAL_DEX_THUNDURUS, \ - .categoryName = _("Bolt Strike"), \ - .weight = 610, \ - FOOTPRINT(Thundurus) \ - LEARNSETS(Thundurus), \ - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Thundurus"), + .natDexNum = NATIONAL_DEX_THUNDURUS, + .categoryName = _("Bolt Strike"), + .weight = 610, + FOOTPRINT(Thundurus) + LEARNSETS(Thundurus), + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, .baseAttack = 105, @@ -8913,23 +8913,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_LANDORUS [SPECIES_LANDORUS_INCARNATE] = { - .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BROWN, \ - .isLegendary = TRUE, \ - .speciesName = _("Landorus"), \ - .natDexNum = NATIONAL_DEX_LANDORUS, \ - .categoryName = _("Abundance"), \ - .weight = 680, \ - FOOTPRINT(Landorus) \ - LEARNSETS(Landorus), \ - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BROWN, + .isLegendary = TRUE, + .speciesName = _("Landorus"), + .natDexNum = NATIONAL_DEX_LANDORUS, + .categoryName = _("Abundance"), + .weight = 680, + FOOTPRINT(Landorus) + LEARNSETS(Landorus), + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, .baseAttack = 125, @@ -8964,23 +8964,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_LANDORUS_THERIAN] = { - .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .genderRatio = MON_MALE, \ - .eggCycles = 120, \ - .friendship = 90, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BROWN, \ - .isLegendary = TRUE, \ - .speciesName = _("Landorus"), \ - .natDexNum = NATIONAL_DEX_LANDORUS, \ - .categoryName = _("Abundance"), \ - .weight = 680, \ - FOOTPRINT(Landorus) \ - LEARNSETS(Landorus), \ - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BROWN, + .isLegendary = TRUE, + .speciesName = _("Landorus"), + .natDexNum = NATIONAL_DEX_LANDORUS, + .categoryName = _("Abundance"), + .weight = 680, + FOOTPRINT(Landorus) + LEARNSETS(Landorus), + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, .baseAttack = 145, @@ -9016,21 +9016,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_KYUREM [SPECIES_KYUREM] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = TRUE, \ - .speciesName = _("Kyurem"), \ - .natDexNum = NATIONAL_DEX_KYUREM, \ - .categoryName = _("Boundary"), \ - .weight = 3250, \ - FOOTPRINT(Kyurem) \ - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), + .weight = 3250, + FOOTPRINT(Kyurem) + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 125, .baseAttack = 130, @@ -9069,21 +9069,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FUSION_FORMS [SPECIES_KYUREM_WHITE] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = TRUE, \ - .speciesName = _("Kyurem"), \ - .natDexNum = NATIONAL_DEX_KYUREM, \ - .categoryName = _("Boundary"), \ - .weight = 3250, \ - FOOTPRINT(Kyurem) \ - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), + .weight = 3250, + FOOTPRINT(Kyurem) + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 125, .baseAttack = 120, @@ -9127,21 +9127,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_KYUREM_BLACK] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), \ - .catchRate = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_GRAY, \ - .noFlip = TRUE, \ - .speciesName = _("Kyurem"), \ - .natDexNum = NATIONAL_DEX_KYUREM, \ - .categoryName = _("Boundary"), \ - .weight = 3250, \ - FOOTPRINT(Kyurem) \ - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), + .catchRate = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), + .weight = 3250, + FOOTPRINT(Kyurem) + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 125, .baseAttack = 170, @@ -9188,37 +9188,37 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_KELDEO [SPECIES_KELDEO_ORDINARY] = { - .baseHP = 91, \ - .baseAttack = 72, \ - .baseDefense = 90, \ - .baseSpeed = 108, \ - .baseSpAttack = 129, \ - .baseSpDefense = 90, \ - .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 80, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .isMythical = TRUE, \ - .speciesName = _("Keldeo"), \ - .cryId = CRY_KELDEO, \ - .natDexNum = NATIONAL_DEX_KELDEO, \ - .categoryName = _("Colt"), \ - .height = 14, \ - .weight = 485, \ - .pokemonScale = 265, \ - .pokemonOffset = 2, \ - .trainerScale = 262, \ - .trainerOffset = 0, \ - FOOTPRINT(Keldeo) \ - LEARNSETS(Keldeo), \ - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ + .baseHP = 91, + .baseAttack = 72, + .baseDefense = 90, + .baseSpeed = 108, + .baseSpAttack = 129, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .isMythical = TRUE, + .speciesName = _("Keldeo"), + .cryId = CRY_KELDEO, + .natDexNum = NATIONAL_DEX_KELDEO, + .categoryName = _("Colt"), + .height = 14, + .weight = 485, + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, + FOOTPRINT(Keldeo) + LEARNSETS(Keldeo), + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, .formChangeTable = sKeldeoFormChangeTable, .description = COMPOUND_STRING( "When it is resolute, its body fills with\n" @@ -9238,37 +9238,37 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_KELDEO_RESOLUTE] = { - .baseHP = 91, \ - .baseAttack = 72, \ - .baseDefense = 90, \ - .baseSpeed = 108, \ - .baseSpAttack = 129, \ - .baseSpDefense = 90, \ - .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 80, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .isMythical = TRUE, \ - .speciesName = _("Keldeo"), \ - .cryId = CRY_KELDEO, \ - .natDexNum = NATIONAL_DEX_KELDEO, \ - .categoryName = _("Colt"), \ - .height = 14, \ - .weight = 485, \ - .pokemonScale = 265, \ - .pokemonOffset = 2, \ - .trainerScale = 262, \ - .trainerOffset = 0, \ - FOOTPRINT(Keldeo) \ - LEARNSETS(Keldeo), \ - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, \ + .baseHP = 91, + .baseAttack = 72, + .baseDefense = 90, + .baseSpeed = 108, + .baseSpAttack = 129, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .isMythical = TRUE, + .speciesName = _("Keldeo"), + .cryId = CRY_KELDEO, + .natDexNum = NATIONAL_DEX_KELDEO, + .categoryName = _("Colt"), + .height = 14, + .weight = 485, + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, + FOOTPRINT(Keldeo) + LEARNSETS(Keldeo), + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, .formChangeTable = sKeldeoFormChangeTable, .noFlip = TRUE, .description = COMPOUND_STRING( @@ -9291,33 +9291,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_MELOETTA [SPECIES_MELOETTA_ARIA] = { - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_Speed = 1, \ - .itemCommon = ITEM_STAR_PIECE, \ - .itemRare = ITEM_STAR_PIECE, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 100, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = TRUE, \ - .isMythical = TRUE, \ - .speciesName = _("Meloetta"), \ - .cryId = CRY_MELOETTA, \ - .natDexNum = NATIONAL_DEX_MELOETTA, \ - .categoryName = _("Melody"), \ - .height = 6, \ - .weight = 65, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Meloetta) \ - LEARNSETS(Meloetta), \ - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Speed = 1, + .itemCommon = ITEM_STAR_PIECE, + .itemRare = ITEM_STAR_PIECE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + .isMythical = TRUE, + .speciesName = _("Meloetta"), + .cryId = CRY_MELOETTA, + .natDexNum = NATIONAL_DEX_MELOETTA, + .categoryName = _("Melody"), + .height = 6, + .weight = 65, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Meloetta) + LEARNSETS(Meloetta), + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, .baseAttack = 77, @@ -9347,33 +9347,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_MELOETTA_PIROUETTE] = { - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_Speed = 1, \ - .itemCommon = ITEM_STAR_PIECE, \ - .itemRare = ITEM_STAR_PIECE, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 100, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = TRUE, \ - .isMythical = TRUE, \ - .speciesName = _("Meloetta"), \ - .cryId = CRY_MELOETTA, \ - .natDexNum = NATIONAL_DEX_MELOETTA, \ - .categoryName = _("Melody"), \ - .height = 6, \ - .weight = 65, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Meloetta) \ - LEARNSETS(Meloetta), \ - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, \ + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Speed = 1, + .itemCommon = ITEM_STAR_PIECE, + .itemRare = ITEM_STAR_PIECE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + .isMythical = TRUE, + .speciesName = _("Meloetta"), + .cryId = CRY_MELOETTA, + .natDexNum = NATIONAL_DEX_MELOETTA, + .categoryName = _("Melody"), + .height = 6, + .weight = 65, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Meloetta) + LEARNSETS(Meloetta), + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, .baseAttack = 128, diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index d34d25907230..a2cb478099a4 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -392,41 +392,41 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ - .catchRate = 45, \ - .evYield_Speed = 3, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = TRUE, \ - .speciesName = _("Greninja"), \ - .cryId = CRY_GRENINJA, \ - .natDexNum = NATIONAL_DEX_GRENINJA, \ - .categoryName = _("Ninja"), \ - .height = 15, \ - .weight = 400, \ - .pokemonScale = 268, \ - .pokemonOffset = 2, \ - .trainerScale = 271, \ - .trainerOffset = 0, \ - FOOTPRINT(Greninja) \ - LEARNSETS(Greninja), \ + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), + .catchRate = 45, + .evYield_Speed = 3, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + .speciesName = _("Greninja"), + .cryId = CRY_GRENINJA, + .natDexNum = NATIONAL_DEX_GRENINJA, + .categoryName = _("Ninja"), + .height = 15, + .weight = 400, + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, + FOOTPRINT(Greninja) + LEARNSETS(Greninja), .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .baseHP = 72, \ - .baseAttack = 95, \ - .baseDefense = 67, \ - .baseSpeed = 122, \ - .baseSpAttack = 103, \ - .baseSpDefense = 71, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ - .description = gGreninjaPokedexText, \ - FRONT_PIC(Greninja, 64, 56), \ - .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Greninja, \ - BACK_PIC(Greninja, 64, 48), \ - .backPicYOffset = 11, \ - PALETTES(Greninja), \ + .baseHP = 72, + .baseAttack = 95, + .baseDefense = 67, + .baseSpeed = 122, + .baseSpAttack = 103, + .baseSpDefense = 71, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, + .description = gGreninjaPokedexText, + FRONT_PIC(Greninja, 64, 56), + .frontPicYOffset = 7, + .frontAnimFrames = sAnims_Greninja, + BACK_PIC(Greninja, 64, 48), + .backPicYOffset = 11, + PALETTES(Greninja), ICON(Greninja, 0), .genderRatio = PERCENT_FEMALE(12.5), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), @@ -437,41 +437,41 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA_BATTLE_BOND] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ - .catchRate = 45, \ - .evYield_Speed = 3, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = TRUE, \ - .speciesName = _("Greninja"), \ - .cryId = CRY_GRENINJA, \ - .natDexNum = NATIONAL_DEX_GRENINJA, \ - .categoryName = _("Ninja"), \ - .height = 15, \ - .weight = 400, \ - .pokemonScale = 268, \ - .pokemonOffset = 2, \ - .trainerScale = 271, \ - .trainerOffset = 0, \ - FOOTPRINT(Greninja) \ - LEARNSETS(Greninja), \ + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), + .catchRate = 45, + .evYield_Speed = 3, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + .speciesName = _("Greninja"), + .cryId = CRY_GRENINJA, + .natDexNum = NATIONAL_DEX_GRENINJA, + .categoryName = _("Ninja"), + .height = 15, + .weight = 400, + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, + FOOTPRINT(Greninja) + LEARNSETS(Greninja), .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .baseHP = 72, \ - .baseAttack = 95, \ - .baseDefense = 67, \ - .baseSpeed = 122, \ - .baseSpAttack = 103, \ - .baseSpDefense = 71, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ - .description = gGreninjaPokedexText, \ - FRONT_PIC(Greninja, 64, 56), \ - .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Greninja, \ - BACK_PIC(Greninja, 64, 48), \ - .backPicYOffset = 11, \ - PALETTES(Greninja), \ + .baseHP = 72, + .baseAttack = 95, + .baseDefense = 67, + .baseSpeed = 122, + .baseSpAttack = 103, + .baseSpDefense = 71, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, + .description = gGreninjaPokedexText, + FRONT_PIC(Greninja, 64, 56), + .frontPicYOffset = 7, + .frontAnimFrames = sAnims_Greninja, + BACK_PIC(Greninja, 64, 48), + .backPicYOffset = 11, + PALETTES(Greninja), ICON(Greninja, 0), .genderRatio = MON_MALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), @@ -483,26 +483,26 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA_ASH] = { - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), \ - .catchRate = 45, \ - .evYield_Speed = 3, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .bodyColor = BODY_COLOR_BLUE, \ - .noFlip = TRUE, \ - .speciesName = _("Greninja"), \ - .cryId = CRY_GRENINJA, \ - .natDexNum = NATIONAL_DEX_GRENINJA, \ - .categoryName = _("Ninja"), \ - .height = 15, \ - .weight = 400, \ - .pokemonScale = 268, \ - .pokemonOffset = 2, \ - .trainerScale = 271, \ - .trainerOffset = 0, \ - FOOTPRINT(Greninja) \ - LEARNSETS(Greninja), \ + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), + .catchRate = 45, + .evYield_Speed = 3, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + .speciesName = _("Greninja"), + .cryId = CRY_GRENINJA, + .natDexNum = NATIONAL_DEX_GRENINJA, + .categoryName = _("Ninja"), + .height = 15, + .weight = 400, + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, + FOOTPRINT(Greninja) + LEARNSETS(Greninja), .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, .baseAttack = 145, @@ -1691,49 +1691,49 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_PANCHAM #if P_FAMILY_FURFROU -#define FURFROU_MISC_INFO(_form, _noFlip, frontWidth, frontYOffset, backWidth, backYOffset, _iconIdx) \ - { \ - .baseHP = 75, \ - .baseAttack = 80, \ - .baseDefense = 60, \ - .baseSpeed = 102, \ - .baseSpAttack = 65, \ - .baseSpDefense = 90, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 160, \ - .expYield = 165, \ - .evYield_Speed = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .abilities = { ABILITY_FUR_COAT, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .noFlip = _noFlip, \ - .speciesName = _("Furfrou"), \ - .cryId = CRY_FURFROU, \ - .natDexNum = NATIONAL_DEX_FURFROU, \ - .categoryName = _("Poodle"), \ - .height = 12, \ - .weight = 280, \ - .description = gFurfrouPokedexText, \ - .pokemonScale = 282, \ - .pokemonOffset = 4, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Furfrou##_form, frontWidth, 64), \ - .frontPicYOffset = frontYOffset, \ - .frontAnimFrames = sAnims_Furfrou, \ - .frontAnimId = ANIM_H_SLIDE, \ - BACK_PIC(Furfrou##_form, backWidth, 64), \ - .backPicYOffset = backYOffset, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Furfrou##_form), \ - ICON(Furfrou##_form, _iconIdx), \ - FOOTPRINT(Furfrou) \ - LEARNSETS(Furfrou), \ - .formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \ +#define FURFROU_MISC_INFO(_form, _noFlip, frontWidth, frontYOffset, backWidth, backYOffset, _iconIdx) \ + { \ + .baseHP = 75, \ + .baseAttack = 80, \ + .baseDefense = 60, \ + .baseSpeed = 102, \ + .baseSpAttack = 65, \ + .baseSpDefense = 90, \ + .types = MON_TYPES(TYPE_NORMAL), \ + .catchRate = 160, \ + .expYield = 165, \ + .evYield_Speed = 1, \ + .genderRatio = PERCENT_FEMALE(50), \ + .eggCycles = 20, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_MEDIUM_FAST, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ + .abilities = { ABILITY_FUR_COAT, ABILITY_NONE }, \ + .bodyColor = BODY_COLOR_WHITE, \ + .noFlip = _noFlip, \ + .speciesName = _("Furfrou"), \ + .cryId = CRY_FURFROU, \ + .natDexNum = NATIONAL_DEX_FURFROU, \ + .categoryName = _("Poodle"), \ + .height = 12, \ + .weight = 280, \ + .description = gFurfrouPokedexText, \ + .pokemonScale = 282, \ + .pokemonOffset = 4, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + FRONT_PIC(Furfrou##_form, frontWidth, 64), \ + .frontPicYOffset = frontYOffset, \ + .frontAnimFrames = sAnims_Furfrou, \ + .frontAnimId = ANIM_H_SLIDE, \ + BACK_PIC(Furfrou##_form, backWidth, 64), \ + .backPicYOffset = backYOffset, \ + .backAnimId = BACK_ANIM_V_STRETCH, \ + PALETTES(Furfrou##_form), \ + ICON(Furfrou##_form, _iconIdx), \ + FOOTPRINT(Furfrou) \ + LEARNSETS(Furfrou), \ + .formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \ } [SPECIES_FURFROU_NATURAL] = FURFROU_MISC_INFO(Natural, FALSE, 48, 3, 56, 0, 0), @@ -1800,35 +1800,35 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_MEOWSTIC_MALE] = { - .baseHP = 74, \ - .baseAttack = 48, \ - .baseDefense = 76, \ - .baseSpeed = 104, \ - .baseSpAttack = 83, \ - .baseSpDefense = 81, \ - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 75, \ - .expYield = 163, \ - .evYield_Speed = 2, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowstic"), \ - .cryId = CRY_MEOWSTIC, \ - .natDexNum = NATIONAL_DEX_MEOWSTIC, \ - .categoryName = _("Constraint"), \ - .height = 6, \ - .weight = 85, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Meowstic, \ - .frontAnimId = ANIM_GROW_VIBRATE, \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ - FOOTPRINT(Meowstic) \ + .baseHP = 74, + .baseAttack = 48, + .baseDefense = 76, + .baseSpeed = 104, + .baseSpAttack = 83, + .baseSpDefense = 81, + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 75, + .expYield = 163, + .evYield_Speed = 2, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowstic"), + .cryId = CRY_MEOWSTIC, + .natDexNum = NATIONAL_DEX_MEOWSTIC, + .categoryName = _("Constraint"), + .height = 6, + .weight = 85, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Meowstic, + .frontAnimId = ANIM_GROW_VIBRATE, + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, + FOOTPRINT(Meowstic) .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .genderRatio = MON_MALE, .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_PRANKSTER }, @@ -1848,35 +1848,35 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_MEOWSTIC_FEMALE] = { - .baseHP = 74, \ - .baseAttack = 48, \ - .baseDefense = 76, \ - .baseSpeed = 104, \ - .baseSpAttack = 83, \ - .baseSpDefense = 81, \ - .types = MON_TYPES(TYPE_PSYCHIC), \ - .catchRate = 75, \ - .expYield = 163, \ - .evYield_Speed = 2, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Meowstic"), \ - .cryId = CRY_MEOWSTIC, \ - .natDexNum = NATIONAL_DEX_MEOWSTIC, \ - .categoryName = _("Constraint"), \ - .height = 6, \ - .weight = 85, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Meowstic, \ - .frontAnimId = ANIM_GROW_VIBRATE, \ - .backPicYOffset = 9, \ - .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, \ - FOOTPRINT(Meowstic) \ + .baseHP = 74, + .baseAttack = 48, + .baseDefense = 76, + .baseSpeed = 104, + .baseSpAttack = 83, + .baseSpDefense = 81, + .types = MON_TYPES(TYPE_PSYCHIC), + .catchRate = 75, + .expYield = 163, + .evYield_Speed = 2, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Meowstic"), + .cryId = CRY_MEOWSTIC, + .natDexNum = NATIONAL_DEX_MEOWSTIC, + .categoryName = _("Constraint"), + .height = 6, + .weight = 85, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Meowstic, + .frontAnimId = ANIM_GROW_VIBRATE, + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, + FOOTPRINT(Meowstic) .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .genderRatio = MON_FEMALE, .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_COMPETITIVE }, @@ -1998,29 +1998,29 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AEGISLASH_SHIELD] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234,\ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STANCE_CHANGE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Aegislash"), \ - .cryId = CRY_AEGISLASH, \ - .natDexNum = NATIONAL_DEX_AEGISLASH, \ - .categoryName = _("Royal Sword"), \ - .height = 17, \ - .weight = 530, \ - .pokemonScale = 259, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 1, \ - FOOTPRINT(Aegislash) \ - LEARNSETS(Aegislash), \ - .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STANCE_CHANGE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Aegislash"), + .cryId = CRY_AEGISLASH, + .natDexNum = NATIONAL_DEX_AEGISLASH, + .categoryName = _("Royal Sword"), + .height = 17, + .weight = 530, + .pokemonScale = 259, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 1, + FOOTPRINT(Aegislash) + LEARNSETS(Aegislash), + .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, .baseAttack = 50, @@ -2049,29 +2049,29 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AEGISLASH_BLADE] = { - .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234,\ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STANCE_CHANGE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Aegislash"), \ - .cryId = CRY_AEGISLASH, \ - .natDexNum = NATIONAL_DEX_AEGISLASH, \ - .categoryName = _("Royal Sword"), \ - .height = 17, \ - .weight = 530, \ - .pokemonScale = 259, \ - .pokemonOffset = 0, \ - .trainerScale = 290, \ - .trainerOffset = 1, \ - FOOTPRINT(Aegislash) \ - LEARNSETS(Aegislash), \ - .formSpeciesIdTable = sAegislashFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STANCE_CHANGE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Aegislash"), + .cryId = CRY_AEGISLASH, + .natDexNum = NATIONAL_DEX_AEGISLASH, + .categoryName = _("Royal Sword"), + .height = 17, + .weight = 530, + .pokemonScale = 259, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 1, + FOOTPRINT(Aegislash) + LEARNSETS(Aegislash), + .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, .baseAttack = AEGISLASH_MAIN_STAT, @@ -3192,20 +3192,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_SLIGGOO] = { - .catchRate = 45, \ - .expYield = 158, \ - .evYield_SpDefense = 2, \ - .itemRare = ITEM_SHED_SHELL, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sliggoo"), \ - .cryId = CRY_SLIGGOO, \ - .natDexNum = NATIONAL_DEX_SLIGGOO, \ - FOOTPRINT(Sliggoo) \ + .catchRate = 45, + .expYield = 158, + .evYield_SpDefense = 2, + .itemRare = ITEM_SHED_SHELL, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sliggoo"), + .cryId = CRY_SLIGGOO, + .natDexNum = NATIONAL_DEX_SLIGGOO, + FOOTPRINT(Sliggoo) .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .baseHP = 68, .baseAttack = 75, @@ -3243,19 +3243,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOODRA] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ - .evYield_SpDefense = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Goodra"), \ - .cryId = CRY_GOODRA, \ - .natDexNum = NATIONAL_DEX_GOODRA, \ - FOOTPRINT(Goodra) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Goodra"), + .cryId = CRY_GOODRA, + .natDexNum = NATIONAL_DEX_GOODRA, + FOOTPRINT(Goodra) .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .baseHP = 90, .baseAttack = 100, @@ -3292,20 +3292,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_SLIGGOO_HISUIAN] = { - .catchRate = 45, \ - .expYield = 158, \ - .evYield_SpDefense = 2, \ - .itemRare = ITEM_SHED_SHELL, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sliggoo"), \ - .cryId = CRY_SLIGGOO, \ - .natDexNum = NATIONAL_DEX_SLIGGOO, \ - FOOTPRINT(Sliggoo) \ + .catchRate = 45, + .expYield = 158, + .evYield_SpDefense = 2, + .itemRare = ITEM_SHED_SHELL, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sliggoo"), + .cryId = CRY_SLIGGOO, + .natDexNum = NATIONAL_DEX_SLIGGOO, + FOOTPRINT(Sliggoo) .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .baseHP = 58, .baseAttack = 75, @@ -3344,19 +3344,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOODRA_HISUIAN] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ - .evYield_SpDefense = 3, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = 35, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Goodra"), \ - .cryId = CRY_GOODRA, \ - .natDexNum = NATIONAL_DEX_GOODRA, \ - FOOTPRINT(Goodra) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Goodra"), + .cryId = CRY_GOODRA, + .natDexNum = NATIONAL_DEX_GOODRA, + FOOTPRINT(Goodra) .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .baseHP = 80, .baseAttack = 100, @@ -3546,27 +3546,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_PUMPKABOO [SPECIES_PUMPKABOO_AVERAGE] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 120, \ - .expYield = 67, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pumpkaboo"), \ - .natDexNum = NATIONAL_DEX_PUMPKABOO, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Pumpkaboo, \ - .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ - PALETTES(Pumpkaboo), \ - ICON(Pumpkaboo, 2), \ - FOOTPRINT(Pumpkaboo) \ - LEARNSETS(Pumpkaboo), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 120, + .expYield = 67, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pumpkaboo"), + .natDexNum = NATIONAL_DEX_PUMPKABOO, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + PALETTES(Pumpkaboo), + ICON(Pumpkaboo, 2), + FOOTPRINT(Pumpkaboo) + LEARNSETS(Pumpkaboo), .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 49, .baseAttack = 66, @@ -3596,27 +3596,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_SMALL] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 120, \ - .expYield = 67, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pumpkaboo"), \ - .natDexNum = NATIONAL_DEX_PUMPKABOO, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Pumpkaboo, \ - .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ - PALETTES(Pumpkaboo), \ - ICON(Pumpkaboo, 2), \ - FOOTPRINT(Pumpkaboo) \ - LEARNSETS(Pumpkaboo), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 120, + .expYield = 67, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pumpkaboo"), + .natDexNum = NATIONAL_DEX_PUMPKABOO, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + PALETTES(Pumpkaboo), + ICON(Pumpkaboo, 2), + FOOTPRINT(Pumpkaboo) + LEARNSETS(Pumpkaboo), .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 44, .baseAttack = 66, @@ -3645,27 +3645,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_LARGE] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 120, \ - .expYield = 67, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pumpkaboo"), \ - .natDexNum = NATIONAL_DEX_PUMPKABOO, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Pumpkaboo, \ - .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ - PALETTES(Pumpkaboo), \ - ICON(Pumpkaboo, 2), \ - FOOTPRINT(Pumpkaboo) \ - LEARNSETS(Pumpkaboo), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 120, + .expYield = 67, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pumpkaboo"), + .natDexNum = NATIONAL_DEX_PUMPKABOO, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + PALETTES(Pumpkaboo), + ICON(Pumpkaboo, 2), + FOOTPRINT(Pumpkaboo) + LEARNSETS(Pumpkaboo), .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 54, .baseAttack = 66, @@ -3694,27 +3694,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_PUMPKABOO_SUPER] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 120, \ - .expYield = 67, \ - .evYield_Defense = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Pumpkaboo"), \ - .natDexNum = NATIONAL_DEX_PUMPKABOO, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Pumpkaboo, \ - .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, \ - PALETTES(Pumpkaboo), \ - ICON(Pumpkaboo, 2), \ - FOOTPRINT(Pumpkaboo) \ - LEARNSETS(Pumpkaboo), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 120, + .expYield = 67, + .evYield_Defense = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Pumpkaboo"), + .natDexNum = NATIONAL_DEX_PUMPKABOO, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + PALETTES(Pumpkaboo), + ICON(Pumpkaboo, 2), + FOOTPRINT(Pumpkaboo) + LEARNSETS(Pumpkaboo), .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 59, .baseAttack = 66, @@ -3745,27 +3745,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_AVERAGE] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 60, \ - .expYield = 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Gourgeist"), \ - .natDexNum = NATIONAL_DEX_GOURGEIST, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Gourgeist, \ - .frontAnimId = ANIM_SHRINK_GROW, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Gourgeist), \ - ICON(Gourgeist, 2), \ - FOOTPRINT(Gourgeist) \ - LEARNSETS(Gourgeist), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 60, + .expYield = 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Gourgeist"), + .natDexNum = NATIONAL_DEX_GOURGEIST, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, + .backAnimId = BACK_ANIM_V_STRETCH, + PALETTES(Gourgeist), + ICON(Gourgeist, 2), + FOOTPRINT(Gourgeist) + LEARNSETS(Gourgeist), .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 65, .baseAttack = 90, @@ -3793,27 +3793,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_SMALL] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 60, \ - .expYield = 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Gourgeist"), \ - .natDexNum = NATIONAL_DEX_GOURGEIST, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Gourgeist, \ - .frontAnimId = ANIM_SHRINK_GROW, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Gourgeist), \ - ICON(Gourgeist, 2), \ - FOOTPRINT(Gourgeist) \ - LEARNSETS(Gourgeist), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 60, + .expYield = 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Gourgeist"), + .natDexNum = NATIONAL_DEX_GOURGEIST, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, + .backAnimId = BACK_ANIM_V_STRETCH, + PALETTES(Gourgeist), + ICON(Gourgeist, 2), + FOOTPRINT(Gourgeist) + LEARNSETS(Gourgeist), .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 55, .baseAttack = 85, @@ -3841,27 +3841,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_LARGE] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 60, \ - .expYield = 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Gourgeist"), \ - .natDexNum = NATIONAL_DEX_GOURGEIST, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Gourgeist, \ - .frontAnimId = ANIM_SHRINK_GROW, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Gourgeist), \ - ICON(Gourgeist, 2), \ - FOOTPRINT(Gourgeist) \ - LEARNSETS(Gourgeist), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 60, + .expYield = 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Gourgeist"), + .natDexNum = NATIONAL_DEX_GOURGEIST, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, + .backAnimId = BACK_ANIM_V_STRETCH, + PALETTES(Gourgeist), + ICON(Gourgeist, 2), + FOOTPRINT(Gourgeist) + LEARNSETS(Gourgeist), .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 75, .baseAttack = 95, @@ -3889,27 +3889,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOURGEIST_SUPER] = { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), \ - .catchRate = 60, \ - .expYield = 173, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Gourgeist"), \ - .natDexNum = NATIONAL_DEX_GOURGEIST, \ - .categoryName = _("Pumpkin"), \ - .frontAnimFrames = sAnims_Gourgeist, \ - .frontAnimId = ANIM_SHRINK_GROW, \ - .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Gourgeist), \ - ICON(Gourgeist, 2), \ - FOOTPRINT(Gourgeist) \ - LEARNSETS(Gourgeist), \ + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 60, + .expYield = 173, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Gourgeist"), + .natDexNum = NATIONAL_DEX_GOURGEIST, + .categoryName = _("Pumpkin"), + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, + .backAnimId = BACK_ANIM_V_STRETCH, + PALETTES(Gourgeist), + ICON(Gourgeist, 2), + FOOTPRINT(Gourgeist) + LEARNSETS(Gourgeist), .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 85, .baseAttack = 100, @@ -3996,20 +3996,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AVALUGG] = { - .catchRate = 55, \ - .expYield = 180, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = BERGMITE_EGG_GROUPS, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Avalugg"), \ - .cryId = CRY_AVALUGG, \ - .natDexNum = NATIONAL_DEX_AVALUGG, \ - .categoryName = _("Iceberg"), \ - FOOTPRINT(Avalugg) \ + .catchRate = 55, + .expYield = 180, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = BERGMITE_EGG_GROUPS, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Avalugg"), + .cryId = CRY_AVALUGG, + .natDexNum = NATIONAL_DEX_AVALUGG, + .categoryName = _("Iceberg"), + FOOTPRINT(Avalugg) .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .baseHP = 95, .baseAttack = 117, @@ -4046,20 +4046,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_AVALUGG_HISUIAN] = { - .catchRate = 55, \ - .expYield = 180, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = BERGMITE_EGG_GROUPS, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Avalugg"), \ - .cryId = CRY_AVALUGG, \ - .natDexNum = NATIONAL_DEX_AVALUGG, \ - .categoryName = _("Iceberg"), \ - FOOTPRINT(Avalugg) \ + .catchRate = 55, + .expYield = 180, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = BERGMITE_EGG_GROUPS, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Avalugg"), + .cryId = CRY_AVALUGG, + .natDexNum = NATIONAL_DEX_AVALUGG, + .categoryName = _("Iceberg"), + FOOTPRINT(Avalugg) .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .baseHP = 95, .baseAttack = 127, @@ -4201,96 +4201,96 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_NOIBAT #if P_FAMILY_XERNEAS - [SPECIES_XERNEAS_NEUTRAL] = - { \ - .baseHP = 126, \ - .baseAttack = 131, \ - .baseDefense = 95, \ - .baseSpeed = 99, \ - .baseSpAttack = 131, \ - .baseSpDefense = 98, \ - .types = MON_TYPES(TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_FAIRY_AURA, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Xerneas"), \ - .cryId = CRY_XERNEAS, \ - .natDexNum = NATIONAL_DEX_XERNEAS, \ - .categoryName = _("Life"), \ - .height = 30, \ - .weight = 2150, \ - .description = gXerneasPokedexText, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(XerneasNeutral, 64, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Xerneas, \ - .frontAnimId = ANIM_GROW_VIBRATE, \ - BACK_PIC(XerneasNeutral, 64, 64), \ - .backPicYOffset = 0, \ - .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ - PALETTES(XerneasNeutral), \ - ICON(XerneasNeutral, 0), \ - FOOTPRINT(Xerneas) \ - LEARNSETS(Xerneas), \ - .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ - .formChangeTable = sXerneasFormChangeTable, \ - .isLegendary = TRUE, \ + [SPECIES_XERNEAS_NEUTRAL] = + { + .baseHP = 126, + .baseAttack = 131, + .baseDefense = 95, + .baseSpeed = 99, + .baseSpAttack = 131, + .baseSpDefense = 98, + .types = MON_TYPES(TYPE_FAIRY), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_FAIRY_AURA, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Xerneas"), + .cryId = CRY_XERNEAS, + .natDexNum = NATIONAL_DEX_XERNEAS, + .categoryName = _("Life"), + .height = 30, + .weight = 2150, + .description = gXerneasPokedexText, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(XerneasNeutral, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Xerneas, + .frontAnimId = ANIM_GROW_VIBRATE, + BACK_PIC(XerneasNeutral, 64, 64), + .backPicYOffset = 0, + .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, + PALETTES(XerneasNeutral), + ICON(XerneasNeutral, 0), + FOOTPRINT(Xerneas) + LEARNSETS(Xerneas), + .formSpeciesIdTable = sXerneasFormSpeciesIdTable, + .formChangeTable = sXerneasFormChangeTable, + .isLegendary = TRUE, }, - [SPECIES_XERNEAS_ACTIVE] = - { \ - .baseHP = 126, \ - .baseAttack = 131, \ - .baseDefense = 95, \ - .baseSpeed = 99, \ - .baseSpAttack = 131, \ - .baseSpDefense = 98, \ - .types = MON_TYPES(TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_FAIRY_AURA, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Xerneas"), \ - .cryId = CRY_XERNEAS, \ - .natDexNum = NATIONAL_DEX_XERNEAS, \ - .categoryName = _("Life"), \ - .height = 30, \ - .weight = 2150, \ - .description = gXerneasPokedexText, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(XerneasActive, 64, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Xerneas, \ - .frontAnimId = ANIM_GROW_VIBRATE, \ - BACK_PIC(XerneasActive, 64, 64), \ - .backPicYOffset = 0, \ - .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, \ - PALETTES(XerneasActive), \ - ICON(XerneasActive, 0), \ - FOOTPRINT(Xerneas) \ - LEARNSETS(Xerneas), \ - .formSpeciesIdTable = sXerneasFormSpeciesIdTable, \ - .formChangeTable = sXerneasFormChangeTable, \ - .isLegendary = TRUE, \ + [SPECIES_XERNEAS_ACTIVE] = + { + .baseHP = 126, + .baseAttack = 131, + .baseDefense = 95, + .baseSpeed = 99, + .baseSpAttack = 131, + .baseSpDefense = 98, + .types = MON_TYPES(TYPE_FAIRY), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_FAIRY_AURA, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Xerneas"), + .cryId = CRY_XERNEAS, + .natDexNum = NATIONAL_DEX_XERNEAS, + .categoryName = _("Life"), + .height = 30, + .weight = 2150, + .description = gXerneasPokedexText, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(XerneasActive, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Xerneas, + .frontAnimId = ANIM_GROW_VIBRATE, + BACK_PIC(XerneasActive, 64, 64), + .backPicYOffset = 0, + .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, + PALETTES(XerneasActive), + ICON(XerneasActive, 0), + FOOTPRINT(Xerneas) + LEARNSETS(Xerneas), + .formSpeciesIdTable = sXerneasFormSpeciesIdTable, + .formChangeTable = sXerneasFormChangeTable, + .isLegendary = TRUE, }, #endif //P_FAMILY_XERNEAS @@ -4346,226 +4346,210 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #endif //P_FAMILY_YVELTAL #if P_FAMILY_ZYGARDE - [SPECIES_ZYGARDE_50_AURA_BREAK] = - { \ - .baseHP = 108, \ - .baseAttack = 100, \ - .baseDefense = 121, \ - .baseSpeed = 95, \ - .baseSpAttack = 81, \ - .baseSpDefense = 95, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ - .bodyColor = BODY_COLOR_GREEN, \ - .cryId = CRY_ZYGARDE_50, \ - .height = 50, \ - .weight = 3050, \ - .description = gZygarde50PokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 721, \ - .trainerOffset = 19, \ - FRONT_PIC(Zygarde50, 64, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Zygarde50, \ - .frontAnimId = ANIM_TIP_MOVE_FORWARD, \ - BACK_PIC(Zygarde50, 64, 64), \ - .backPicYOffset = 4, \ - .backAnimId = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ - ? BACK_ANIM_SHAKE_GLOW_GREEN \ - : BACK_ANIM_V_STRETCH), \ - PALETTES(Zygarde50), \ - ICON(Zygarde50, 1), \ - .formChangeTable = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ - ? sZygarde50PowerConstructFormChangeTable \ - : sZygarde50AuraBreakFormChangeTable), \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 3, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, \ - .noFlip = TRUE, \ - .speciesName = _("Zygarde"), \ - .natDexNum = NATIONAL_DEX_ZYGARDE, \ - .categoryName = _("Order"), \ - FOOTPRINT(Zygarde) \ - LEARNSETS(Zygarde), \ - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ - .isLegendary = TRUE, \ + [SPECIES_ZYGARDE_50_AURA_BREAK] = + { + .baseHP = 108, + .baseAttack = 100, + .baseDefense = 121, + .baseSpeed = 95, + .baseSpAttack = 81, + .baseSpDefense = 95, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .bodyColor = BODY_COLOR_GREEN, + .cryId = CRY_ZYGARDE_50, + .height = 50, + .weight = 3050, + .description = gZygarde50PokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 721, + .trainerOffset = 19, + FRONT_PIC(Zygarde50, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Zygarde50, + .frontAnimId = ANIM_TIP_MOVE_FORWARD, + BACK_PIC(Zygarde50, 64, 64), + .backPicYOffset = 4, + .backAnimId = BACK_ANIM_V_STRETCH, + PALETTES(Zygarde50), + ICON(Zygarde50, 1), + .formChangeTable = sZygarde50AuraBreakFormChangeTable, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, + .noFlip = TRUE, + .speciesName = _("Zygarde"), + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), + FOOTPRINT(Zygarde) + LEARNSETS(Zygarde), + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, + .isLegendary = TRUE, }, - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = - { \ - .baseHP = 108, \ - .baseAttack = 100, \ - .baseDefense = 121, \ - .baseSpeed = 95, \ - .baseSpAttack = 81, \ - .baseSpDefense = 95, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270,\ - .bodyColor = BODY_COLOR_GREEN, \ - .cryId = CRY_ZYGARDE_50, \ - .height = 50, \ - .weight = 3050, \ - .description = gZygarde50PokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 721, \ - .trainerOffset = 19, \ - FRONT_PIC(Zygarde50, 64, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Zygarde50, \ - .frontAnimId = ANIM_TIP_MOVE_FORWARD, \ - BACK_PIC(Zygarde50, 64, 64), \ - .backPicYOffset = 4, \ - .backAnimId = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ - ? BACK_ANIM_SHAKE_GLOW_GREEN \ - : BACK_ANIM_V_STRETCH), \ - PALETTES(Zygarde50), \ - ICON(Zygarde50, 1), \ - .formChangeTable = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ - ? sZygarde50PowerConstructFormChangeTable \ - : sZygarde50AuraBreakFormChangeTable), \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 3, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ - .noFlip = TRUE, \ - .speciesName = _("Zygarde"), \ - .natDexNum = NATIONAL_DEX_ZYGARDE, \ - .categoryName = _("Order"), \ - FOOTPRINT(Zygarde) \ - LEARNSETS(Zygarde), \ - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ - .isLegendary = TRUE, \ + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = + { + .baseHP = 108, + .baseAttack = 100, + .baseDefense = 121, + .baseSpeed = 95, + .baseSpAttack = 81, + .baseSpDefense = 95, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .bodyColor = BODY_COLOR_GREEN, + .cryId = CRY_ZYGARDE_50, + .height = 50, + .weight = 3050, + .description = gZygarde50PokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 721, + .trainerOffset = 19, + FRONT_PIC(Zygarde50, 64, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Zygarde50, + .frontAnimId = ANIM_TIP_MOVE_FORWARD, + BACK_PIC(Zygarde50, 64, 64), + .backPicYOffset = 4, + .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, + PALETTES(Zygarde50), + ICON(Zygarde50, 1), + .formChangeTable = sZygarde50PowerConstructFormChangeTable, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, + .noFlip = TRUE, + .speciesName = _("Zygarde"), + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), + FOOTPRINT(Zygarde) + LEARNSETS(Zygarde), + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, + .isLegendary = TRUE, }, - [SPECIES_ZYGARDE_10_AURA_BREAK] = - { \ - .baseHP = 54, \ - .baseAttack = 100, \ - .baseDefense = 71, \ - .baseSpeed = 115, \ - .baseSpAttack = 61, \ - .baseSpDefense = 85, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219,\ - .bodyColor = BODY_COLOR_BLACK, \ - .cryId = CRY_ZYGARDE_10, \ - .height = 12, \ - .weight = 335, \ - .description = gZygarde10PokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 721, \ - .trainerOffset = 19, \ - FRONT_PIC(Zygarde10, 56, 64), \ - .frontPicYOffset = 2, \ - .frontAnimFrames = sAnims_Zygarde10, \ - BACK_PIC(Zygarde10, 64, 56), \ - .backPicYOffset = 8, \ - .backAnimId = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ - ? BACK_ANIM_SHAKE_GLOW_GREEN \ - : BACK_ANIM_JOLT_RIGHT), \ - PALETTES(Zygarde10), \ - ICON(Zygarde10, 1), \ - .formChangeTable = (ABILITY_AURA_BREAK == ABILITY_POWER_CONSTRUCT \ - ? sZygarde10PowerConstructFormChangeTable \ - : sZygarde10AuraBreakFormChangeTable), \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 3, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, \ - .noFlip = TRUE, \ - .speciesName = _("Zygarde"), \ - .natDexNum = NATIONAL_DEX_ZYGARDE, \ - .categoryName = _("Order"), \ - FOOTPRINT(Zygarde) \ - LEARNSETS(Zygarde), \ - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ - .isLegendary = TRUE, \ + [SPECIES_ZYGARDE_10_AURA_BREAK] = + { + .baseHP = 54, + .baseAttack = 100, + .baseDefense = 71, + .baseSpeed = 115, + .baseSpAttack = 61, + .baseSpDefense = 85, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219, + .bodyColor = BODY_COLOR_BLACK, + .cryId = CRY_ZYGARDE_10, + .height = 12, + .weight = 335, + .description = gZygarde10PokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 721, + .trainerOffset = 19, + FRONT_PIC(Zygarde10, 56, 64), + .frontPicYOffset = 2, + .frontAnimFrames = sAnims_Zygarde10, + BACK_PIC(Zygarde10, 64, 56), + .backPicYOffset = 8, + .backAnimId = BACK_ANIM_JOLT_RIGHT, + PALETTES(Zygarde10), + ICON(Zygarde10, 1), + .formChangeTable = sZygarde10AuraBreakFormChangeTable, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, + .noFlip = TRUE, + .speciesName = _("Zygarde"), + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), + FOOTPRINT(Zygarde) + LEARNSETS(Zygarde), + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, }, - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = - { \ - .baseHP = 54, \ - .baseAttack = 100, \ - .baseDefense = 71, \ - .baseSpeed = 115, \ - .baseSpAttack = 61, \ - .baseSpDefense = 85, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219,\ - .bodyColor = BODY_COLOR_BLACK, \ - .cryId = CRY_ZYGARDE_10, \ - .height = 12, \ - .weight = 335, \ - .description = gZygarde10PokedexText, \ - .pokemonScale = 256, \ - .pokemonOffset = 0, \ - .trainerScale = 721, \ - .trainerOffset = 19, \ - FRONT_PIC(Zygarde10, 56, 64), \ - .frontPicYOffset = 2, \ - .frontAnimFrames = sAnims_Zygarde10, \ - BACK_PIC(Zygarde10, 64, 56), \ - .backPicYOffset = 8, \ - .backAnimId = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ - ? BACK_ANIM_SHAKE_GLOW_GREEN \ - : BACK_ANIM_JOLT_RIGHT), \ - PALETTES(Zygarde10), \ - ICON(Zygarde10, 1), \ - .formChangeTable = (ABILITY_POWER_CONSTRUCT == ABILITY_POWER_CONSTRUCT \ - ? sZygarde10PowerConstructFormChangeTable \ - : sZygarde10AuraBreakFormChangeTable), \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 3, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ - .noFlip = TRUE, \ - .speciesName = _("Zygarde"), \ - .natDexNum = NATIONAL_DEX_ZYGARDE, \ - .categoryName = _("Order"), \ - FOOTPRINT(Zygarde) \ - LEARNSETS(Zygarde), \ - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ - .isLegendary = TRUE, \ + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = + { + .baseHP = 54, + .baseAttack = 100, + .baseDefense = 71, + .baseSpeed = 115, + .baseSpAttack = 61, + .baseSpDefense = 85, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219, + .bodyColor = BODY_COLOR_BLACK, + .cryId = CRY_ZYGARDE_10, + .height = 12, + .weight = 335, + .description = gZygarde10PokedexText, + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 721, + .trainerOffset = 19, + FRONT_PIC(Zygarde10, 56, 64), + .frontPicYOffset = 2, + .frontAnimFrames = sAnims_Zygarde10, + BACK_PIC(Zygarde10, 64, 56), + .backPicYOffset = 8, + .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, + PALETTES(Zygarde10), + ICON(Zygarde10, 1), + .formChangeTable = sZygarde10PowerConstructFormChangeTable, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, + .noFlip = TRUE, + .speciesName = _("Zygarde"), + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), + FOOTPRINT(Zygarde) + LEARNSETS(Zygarde), + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, }, [SPECIES_ZYGARDE_COMPLETE] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), \ - .catchRate = 3, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, \ - .noFlip = TRUE, \ - .speciesName = _("Zygarde"), \ - .natDexNum = NATIONAL_DEX_ZYGARDE, \ - .categoryName = _("Order"), \ - FOOTPRINT(Zygarde) \ - LEARNSETS(Zygarde), \ - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, + .noFlip = TRUE, + .speciesName = _("Zygarde"), + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), + FOOTPRINT(Zygarde) + LEARNSETS(Zygarde), + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 216, .baseAttack = 100, @@ -4603,23 +4587,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_DIANCIE [SPECIES_DIANCIE] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), \ - .catchRate = 3, \ - .evYield_Defense = 1, \ - .evYield_SpDefense = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Diancie"), \ - .natDexNum = NATIONAL_DEX_DIANCIE, \ - .categoryName = _("Jewel"), \ - FOOTPRINT(Diancie) \ - LEARNSETS(Diancie), \ - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ - .formChangeTable = sDiancieFormChangeTable, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), + .catchRate = 3, + .evYield_Defense = 1, + .evYield_SpDefense = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Diancie"), + .natDexNum = NATIONAL_DEX_DIANCIE, + .categoryName = _("Jewel"), + FOOTPRINT(Diancie) + LEARNSETS(Diancie), + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, .isMythical = TRUE, .baseHP = 50, .baseAttack = 100, @@ -4655,23 +4639,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_MEGA_EVOLUTIONS [SPECIES_DIANCIE_MEGA] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), \ - .catchRate = 3, \ - .evYield_Defense = 1, \ - .evYield_SpDefense = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Diancie"), \ - .natDexNum = NATIONAL_DEX_DIANCIE, \ - .categoryName = _("Jewel"), \ - FOOTPRINT(Diancie) \ - LEARNSETS(Diancie), \ - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, \ - .formChangeTable = sDiancieFormChangeTable, \ + .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), + .catchRate = 3, + .evYield_Defense = 1, + .evYield_SpDefense = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Diancie"), + .natDexNum = NATIONAL_DEX_DIANCIE, + .categoryName = _("Jewel"), + FOOTPRINT(Diancie) + LEARNSETS(Diancie), + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, .isMythical = TRUE, .baseHP = 50, .baseAttack = 160, @@ -4710,20 +4694,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_HOOPA [SPECIES_HOOPA_CONFINED] = { - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Hoopa"), \ - .natDexNum = NATIONAL_DEX_HOOPA, \ - FOOTPRINT(Hoopa) \ - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ - .formChangeTable = sHoopaFormChangeTable, \ + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Hoopa"), + .natDexNum = NATIONAL_DEX_HOOPA, + FOOTPRINT(Hoopa) + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, .isMythical = TRUE, .baseHP = 80, .baseAttack = 110, @@ -4761,20 +4745,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_HOOPA_UNBOUND] = { - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Hoopa"), \ - .natDexNum = NATIONAL_DEX_HOOPA, \ - FOOTPRINT(Hoopa) \ - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, \ - .formChangeTable = sHoopaFormChangeTable, \ + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Hoopa"), + .natDexNum = NATIONAL_DEX_HOOPA, + FOOTPRINT(Hoopa) + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, .isMythical = TRUE, .baseHP = 80, .baseAttack = 160, diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index 01a8a9627114..d929f7ecbba7 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -104,25 +104,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_DECIDUEYE] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Decidueye"), \ - .cryId = CRY_DECIDUEYE, \ - .natDexNum = NATIONAL_DEX_DECIDUEYE, \ - .categoryName = _("Arrow Quill"), \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Decidueye) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Decidueye"), + .cryId = CRY_DECIDUEYE, + .natDexNum = NATIONAL_DEX_DECIDUEYE, + .categoryName = _("Arrow Quill"), + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Decidueye) .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .baseHP = 78, .baseAttack = 107, @@ -153,25 +153,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_HISUIAN_FORMS [SPECIES_DECIDUEYE_HISUIAN] = { - .catchRate = 45, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239,\ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Decidueye"), \ - .cryId = CRY_DECIDUEYE, \ - .natDexNum = NATIONAL_DEX_DECIDUEYE, \ - .categoryName = _("Arrow Quill"), \ - .height = 16, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - FOOTPRINT(Decidueye) \ + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Decidueye"), + .cryId = CRY_DECIDUEYE, + .natDexNum = NATIONAL_DEX_DECIDUEYE, + .categoryName = _("Arrow Quill"), + .height = 16, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + FOOTPRINT(Decidueye) .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .baseHP = 88, .baseAttack = 112, @@ -990,36 +990,36 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_ORICORIO [SPECIES_ORICORIO_BAILE] = { - .baseHP = 75, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 93, \ - .baseSpAttack = 98, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_HONEY, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ - .speciesName = _("Oricorio"), \ - .natDexNum = NATIONAL_DEX_ORICORIO, \ - .categoryName = _("Dancing"), \ - .height = 6, \ - .weight = 34, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Oricorio, \ - .backPicYOffset = 0, \ - FOOTPRINT(Oricorio) \ - LEARNSETS(Oricorio), \ - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 93, + .baseSpAttack = 98, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = 167, + .evYield_SpAttack = 2, + .itemRare = ITEM_HONEY, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .speciesName = _("Oricorio"), + .natDexNum = NATIONAL_DEX_ORICORIO, + .categoryName = _("Dancing"), + .height = 6, + .weight = 34, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Oricorio, + .backPicYOffset = 0, + FOOTPRINT(Oricorio) + LEARNSETS(Oricorio), + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), @@ -1041,36 +1041,36 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_POM_POM] = { - .baseHP = 75, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 93, \ - .baseSpAttack = 98, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_HONEY, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ - .speciesName = _("Oricorio"), \ - .natDexNum = NATIONAL_DEX_ORICORIO, \ - .categoryName = _("Dancing"), \ - .height = 6, \ - .weight = 34, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Oricorio, \ - .backPicYOffset = 0, \ - FOOTPRINT(Oricorio) \ - LEARNSETS(Oricorio), \ - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 93, + .baseSpAttack = 98, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = 167, + .evYield_SpAttack = 2, + .itemRare = ITEM_HONEY, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .speciesName = _("Oricorio"), + .natDexNum = NATIONAL_DEX_ORICORIO, + .categoryName = _("Dancing"), + .height = 6, + .weight = 34, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Oricorio, + .backPicYOffset = 0, + FOOTPRINT(Oricorio) + LEARNSETS(Oricorio), + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), @@ -1092,36 +1092,36 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_PAU] = { - .baseHP = 75, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 93, \ - .baseSpAttack = 98, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_HONEY, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ - .speciesName = _("Oricorio"), \ - .natDexNum = NATIONAL_DEX_ORICORIO, \ - .categoryName = _("Dancing"), \ - .height = 6, \ - .weight = 34, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Oricorio, \ - .backPicYOffset = 0, \ - FOOTPRINT(Oricorio) \ - LEARNSETS(Oricorio), \ - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 93, + .baseSpAttack = 98, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = 167, + .evYield_SpAttack = 2, + .itemRare = ITEM_HONEY, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .speciesName = _("Oricorio"), + .natDexNum = NATIONAL_DEX_ORICORIO, + .categoryName = _("Dancing"), + .height = 6, + .weight = 34, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Oricorio, + .backPicYOffset = 0, + FOOTPRINT(Oricorio) + LEARNSETS(Oricorio), + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), @@ -1143,36 +1143,36 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ORICORIO_SENSU] = { - .baseHP = 75, \ - .baseAttack = 70, \ - .baseDefense = 70, \ - .baseSpeed = 93, \ - .baseSpAttack = 98, \ - .baseSpDefense = 70, \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpAttack = 2, \ - .itemRare = ITEM_HONEY, \ - .genderRatio = PERCENT_FEMALE(75), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_DANCER, ABILITY_NONE }, \ - .speciesName = _("Oricorio"), \ - .natDexNum = NATIONAL_DEX_ORICORIO, \ - .categoryName = _("Dancing"), \ - .height = 6, \ - .weight = 34, \ - .pokemonScale = 422, \ - .pokemonOffset = 12, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Oricorio, \ - .backPicYOffset = 0, \ - FOOTPRINT(Oricorio) \ - LEARNSETS(Oricorio), \ - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 93, + .baseSpAttack = 98, + .baseSpDefense = 70, + .catchRate = 45, + .expYield = 167, + .evYield_SpAttack = 2, + .itemRare = ITEM_HONEY, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .speciesName = _("Oricorio"), + .natDexNum = NATIONAL_DEX_ORICORIO, + .categoryName = _("Dancing"), + .height = 6, + .weight = 34, + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Oricorio, + .backPicYOffset = 0, + FOOTPRINT(Oricorio) + LEARNSETS(Oricorio), + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, .types = MON_TYPES(TYPE_GHOST, TYPE_FLYING), @@ -1297,41 +1297,41 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_ROCKRUFF [SPECIES_ROCKRUFF] = { - .baseHP = 45, \ - .baseAttack = 65, \ - .baseDefense = 40, \ - .baseSpeed = 60, \ - .baseSpAttack = 30, \ - .baseSpDefense = 40, \ - .types = MON_TYPES(TYPE_ROCK), \ - .catchRate = 190, \ - .expYield = 56, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Rockruff"), \ - .cryId = CRY_ROCKRUFF, \ - .natDexNum = NATIONAL_DEX_ROCKRUFF, \ - .categoryName = _("Puppy"), \ - .height = 5, \ - .weight = 92, \ - .description = gRockruffPokedexText, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Rockruff, \ - .frontAnimId = ANIM_V_STRETCH, \ - .backPicYOffset = 7, \ - PALETTES(Rockruff), \ - ICON(Rockruff, 2), \ - FOOTPRINT(Rockruff) \ - LEARNSETS(Rockruff), \ + .baseHP = 45, + .baseAttack = 65, + .baseDefense = 40, + .baseSpeed = 60, + .baseSpAttack = 30, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_ROCK), + .catchRate = 190, + .expYield = 56, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Rockruff"), + .cryId = CRY_ROCKRUFF, + .natDexNum = NATIONAL_DEX_ROCKRUFF, + .categoryName = _("Puppy"), + .height = 5, + .weight = 92, + .description = gRockruffPokedexText, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Rockruff, + .frontAnimId = ANIM_V_STRETCH, + .backPicYOffset = 7, + PALETTES(Rockruff), + ICON(Rockruff, 2), + FOOTPRINT(Rockruff) + LEARNSETS(Rockruff), .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST }, FRONT_PIC(Rockruff, 37, 39), @@ -1343,41 +1343,41 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_ROCKRUFF_OWN_TEMPO] = { - .baseHP = 45, \ - .baseAttack = 65, \ - .baseDefense = 40, \ - .baseSpeed = 60, \ - .baseSpAttack = 30, \ - .baseSpDefense = 40, \ - .types = MON_TYPES(TYPE_ROCK), \ - .catchRate = 190, \ - .expYield = 56, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_BROWN, \ - .speciesName = _("Rockruff"), \ - .cryId = CRY_ROCKRUFF, \ - .natDexNum = NATIONAL_DEX_ROCKRUFF, \ - .categoryName = _("Puppy"), \ - .height = 5, \ - .weight = 92, \ - .description = gRockruffPokedexText, \ - .pokemonScale = 432, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Rockruff, \ - .frontAnimId = ANIM_V_STRETCH, \ - .backPicYOffset = 7, \ - PALETTES(Rockruff), \ - ICON(Rockruff, 2), \ - FOOTPRINT(Rockruff) \ - LEARNSETS(Rockruff), \ + .baseHP = 45, + .baseAttack = 65, + .baseDefense = 40, + .baseSpeed = 60, + .baseSpAttack = 30, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_ROCK), + .catchRate = 190, + .expYield = 56, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Rockruff"), + .cryId = CRY_ROCKRUFF, + .natDexNum = NATIONAL_DEX_ROCKRUFF, + .categoryName = _("Puppy"), + .height = 5, + .weight = 92, + .description = gRockruffPokedexText, + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Rockruff, + .frontAnimId = ANIM_V_STRETCH, + .backPicYOffset = 7, + PALETTES(Rockruff), + ICON(Rockruff, 2), + FOOTPRINT(Rockruff) + LEARNSETS(Rockruff), .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE }, FRONT_PIC(Rockruff, 40, 48), @@ -1388,25 +1388,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_MIDDAY] = { - .types = MON_TYPES(TYPE_ROCK), \ - .catchRate = 90, \ - .expYield = 170, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Lycanroc"), \ - .natDexNum = NATIONAL_DEX_LYCANROC, \ - .categoryName = _("Wolf"), \ - .weight = 250, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - BACK_PIC(LycanrocMidday, 64, 56), \ - FOOTPRINT(Lycanroc) \ + .types = MON_TYPES(TYPE_ROCK), + .catchRate = 90, + .expYield = 170, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Lycanroc"), + .natDexNum = NATIONAL_DEX_LYCANROC, + .categoryName = _("Wolf"), + .weight = 250, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + BACK_PIC(LycanrocMidday, 64, 56), + FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, .baseAttack = 115, @@ -1436,25 +1436,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_MIDNIGHT] = { - .types = MON_TYPES(TYPE_ROCK), \ - .catchRate = 90, \ - .expYield = 170, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Lycanroc"), \ - .natDexNum = NATIONAL_DEX_LYCANROC, \ - .categoryName = _("Wolf"), \ - .weight = 250, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - BACK_PIC(LycanrocMidday, 64, 56), \ - FOOTPRINT(Lycanroc) \ + .types = MON_TYPES(TYPE_ROCK), + .catchRate = 90, + .expYield = 170, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Lycanroc"), + .natDexNum = NATIONAL_DEX_LYCANROC, + .categoryName = _("Wolf"), + .weight = 250, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + BACK_PIC(LycanrocMidday, 64, 56), + FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 85, .baseAttack = 115, @@ -1484,25 +1484,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_DUSK] = { - .types = MON_TYPES(TYPE_ROCK), \ - .catchRate = 90, \ - .expYield = 170, \ - .evYield_Attack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .speciesName = _("Lycanroc"), \ - .natDexNum = NATIONAL_DEX_LYCANROC, \ - .categoryName = _("Wolf"), \ - .weight = 250, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - BACK_PIC(LycanrocMidday, 64, 56), \ - FOOTPRINT(Lycanroc) \ + .types = MON_TYPES(TYPE_ROCK), + .catchRate = 90, + .expYield = 170, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .speciesName = _("Lycanroc"), + .natDexNum = NATIONAL_DEX_LYCANROC, + .categoryName = _("Wolf"), + .weight = 250, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + BACK_PIC(LycanrocMidday, 64, 56), + FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, .baseAttack = 117, @@ -1534,26 +1534,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_WISHIWASHI [SPECIES_WISHIWASHI_SOLO] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 60, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Wishiwashi"), \ - .natDexNum = NATIONAL_DEX_WISHIWASHI, \ - .categoryName = _("Small Fry"), \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Wishiwashi) \ - LEARNSETS(Wishiwashi), \ - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 60, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Wishiwashi"), + .natDexNum = NATIONAL_DEX_WISHIWASHI, + .categoryName = _("Small Fry"), + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Wishiwashi) + LEARNSETS(Wishiwashi), + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, .baseAttack = 20, @@ -1584,26 +1584,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_WISHIWASHI_SCHOOL] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 60, \ - .evYield_HP = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Wishiwashi"), \ - .natDexNum = NATIONAL_DEX_WISHIWASHI, \ - .categoryName = _("Small Fry"), \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Wishiwashi) \ - LEARNSETS(Wishiwashi), \ - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 60, + .evYield_HP = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Wishiwashi"), + .natDexNum = NATIONAL_DEX_WISHIWASHI, + .categoryName = _("Small Fry"), + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Wishiwashi) + LEARNSETS(Wishiwashi), + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, .baseAttack = 140, @@ -2966,7 +2966,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = LEARNSETS(Silvally), \ .formSpeciesIdTable = sSilvallyFormSpeciesIdTable, \ .formChangeTable = sSilvallyFormChangeTable, \ - } + } [SPECIES_SILVALLY_NORMAL] = SILVALLY_SPECIES_INFO(TYPE_NORMAL, Normal), [SPECIES_SILVALLY_FIGHTING] = SILVALLY_SPECIES_INFO(TYPE_FIGHTING, Fighting), @@ -3233,37 +3233,37 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_MIMIKYU [SPECIES_MIMIKYU_DISGUISED] = { - .baseHP = 55, \ - .baseAttack = 90, \ - .baseDefense = 80, \ - .baseSpeed = 96, \ - .baseSpAttack = 50, \ - .baseSpDefense = 105, \ - .types = MON_TYPES(TYPE_GHOST, TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpDefense = 2, \ - .itemRare = ITEM_CHESTO_BERRY, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_DISGUISE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Mimikyu"), \ - .cryId = CRY_MIMIKYU, \ - .natDexNum = NATIONAL_DEX_MIMIKYU, \ - .categoryName = _("Disguise"), \ - .height = 2, \ - .weight = 7, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Mimikyu) \ - LEARNSETS(Mimikyu), \ - .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 90, + .baseDefense = 80, + .baseSpeed = 96, + .baseSpAttack = 50, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_GHOST, TYPE_FAIRY), + .catchRate = 45, + .expYield = 167, + .evYield_SpDefense = 2, + .itemRare = ITEM_CHESTO_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_DISGUISE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Mimikyu"), + .cryId = CRY_MIMIKYU, + .natDexNum = NATIONAL_DEX_MIMIKYU, + .categoryName = _("Disguise"), + .height = 2, + .weight = 7, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Mimikyu) + LEARNSETS(Mimikyu), + .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( "A lonely Pokémon, it hides its terrifying\n" @@ -3283,37 +3283,37 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_MIMIKYU_BUSTED] = { - .baseHP = 55, \ - .baseAttack = 90, \ - .baseDefense = 80, \ - .baseSpeed = 96, \ - .baseSpAttack = 50, \ - .baseSpDefense = 105, \ - .types = MON_TYPES(TYPE_GHOST, TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = 167, \ - .evYield_SpDefense = 2, \ - .itemRare = ITEM_CHESTO_BERRY, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_DISGUISE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Mimikyu"), \ - .cryId = CRY_MIMIKYU, \ - .natDexNum = NATIONAL_DEX_MIMIKYU, \ - .categoryName = _("Disguise"), \ - .height = 2, \ - .weight = 7, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Mimikyu) \ - LEARNSETS(Mimikyu), \ - .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, \ + .baseHP = 55, + .baseAttack = 90, + .baseDefense = 80, + .baseSpeed = 96, + .baseSpAttack = 50, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_GHOST, TYPE_FAIRY), + .catchRate = 45, + .expYield = 167, + .evYield_SpDefense = 2, + .itemRare = ITEM_CHESTO_BERRY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_DISGUISE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Mimikyu"), + .cryId = CRY_MIMIKYU, + .natDexNum = NATIONAL_DEX_MIMIKYU, + .categoryName = _("Disguise"), + .height = 2, + .weight = 7, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Mimikyu) + LEARNSETS(Mimikyu), + .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( "After going to all the effort of\n" @@ -4397,22 +4397,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_NECROZMA [SPECIES_NECROZMA] = { - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .noFlip = TRUE, \ - .speciesName = _("Necrozma"), \ - .natDexNum = NATIONAL_DEX_NECROZMA, \ - .categoryName = _("Prism"), \ - .pokemonScale = 256, \ - .pokemonOffset = 3, \ - .trainerScale = 369, \ - .trainerOffset = 7, \ - FOOTPRINT(Necrozma) \ - LEARNSETS(Necrozma), \ - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .noFlip = TRUE, + .speciesName = _("Necrozma"), + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, + FOOTPRINT(Necrozma) + LEARNSETS(Necrozma), + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, .baseAttack = 107, @@ -4450,22 +4450,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FUSION_FORMS [SPECIES_NECROZMA_DUSK_MANE] = { - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .noFlip = TRUE, \ - .speciesName = _("Necrozma"), \ - .natDexNum = NATIONAL_DEX_NECROZMA, \ - .categoryName = _("Prism"), \ - .pokemonScale = 256, \ - .pokemonOffset = 3, \ - .trainerScale = 369, \ - .trainerOffset = 7, \ - FOOTPRINT(Necrozma) \ - LEARNSETS(Necrozma), \ - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .noFlip = TRUE, + .speciesName = _("Necrozma"), + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, + FOOTPRINT(Necrozma) + LEARNSETS(Necrozma), + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, .baseAttack = 157, @@ -4502,22 +4502,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_NECROZMA_DAWN_WINGS] = { - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .noFlip = TRUE, \ - .speciesName = _("Necrozma"), \ - .natDexNum = NATIONAL_DEX_NECROZMA, \ - .categoryName = _("Prism"), \ - .pokemonScale = 256, \ - .pokemonOffset = 3, \ - .trainerScale = 369, \ - .trainerOffset = 7, \ - FOOTPRINT(Necrozma) \ - LEARNSETS(Necrozma), \ - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .noFlip = TRUE, + .speciesName = _("Necrozma"), + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, + FOOTPRINT(Necrozma) + LEARNSETS(Necrozma), + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, .baseAttack = 113, @@ -4556,22 +4556,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_ULTRA_BURST_FORMS [SPECIES_NECROZMA_ULTRA] = { - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .noFlip = TRUE, \ - .speciesName = _("Necrozma"), \ - .natDexNum = NATIONAL_DEX_NECROZMA, \ - .categoryName = _("Prism"), \ - .pokemonScale = 256, \ - .pokemonOffset = 3, \ - .trainerScale = 369, \ - .trainerOffset = 7, \ - FOOTPRINT(Necrozma) \ - LEARNSETS(Necrozma), \ - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, \ + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .noFlip = TRUE, + .speciesName = _("Necrozma"), + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, + FOOTPRINT(Necrozma) + LEARNSETS(Necrozma), + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, .baseAttack = 167, @@ -4615,44 +4615,44 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_MAGEARNA [SPECIES_MAGEARNA] = { - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 65, \ - .baseSpAttack = 130, \ - .baseSpDefense = 115, \ - .types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, \ - .speciesName = _("Magearna"), \ - .cryId = CRY_MAGEARNA, \ - .natDexNum = NATIONAL_DEX_MAGEARNA, \ - .categoryName = _("Artificial"), \ - .height = 10, \ - .weight = 805, \ - .pokemonScale = 305, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - FRONT_PIC(Magearna, 56, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Magearna, \ - .frontAnimId = ANIM_H_SLIDE_SLOW, \ - BACK_PIC(Magearna, 64, 56), \ - .backPicYOffset = 4, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(Magearna), \ - ICON(Magearna, 0), \ - FOOTPRINT(Magearna) \ - LEARNSETS(Magearna), \ - .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 65, + .baseSpAttack = 130, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, + .speciesName = _("Magearna"), + .cryId = CRY_MAGEARNA, + .natDexNum = NATIONAL_DEX_MAGEARNA, + .categoryName = _("Artificial"), + .height = 10, + .weight = 805, + .pokemonScale = 305, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + FRONT_PIC(Magearna, 56, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Magearna, + .frontAnimId = ANIM_H_SLIDE_SLOW, + BACK_PIC(Magearna, 64, 56), + .backPicYOffset = 4, + /*.backAnimId = BACK_ANIM_NONE,*/ + PALETTES(Magearna), + ICON(Magearna, 0), + FOOTPRINT(Magearna) + LEARNSETS(Magearna), + .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, .bodyColor = BODY_COLOR_GRAY, .description = COMPOUND_STRING( @@ -4663,44 +4663,44 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { - .baseHP = 80, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 65, \ - .baseSpAttack = 130, \ - .baseSpDefense = 115, \ - .types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, \ - .speciesName = _("Magearna"), \ - .cryId = CRY_MAGEARNA, \ - .natDexNum = NATIONAL_DEX_MAGEARNA, \ - .categoryName = _("Artificial"), \ - .height = 10, \ - .weight = 805, \ - .pokemonScale = 305, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - FRONT_PIC(MagearnaOriginalColor, 56, 64), \ - .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Magearna, \ - .frontAnimId = ANIM_H_SLIDE_SLOW, \ - BACK_PIC(MagearnaOriginalColor, 64, 56), \ - .backPicYOffset = 4, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(MagearnaOriginalColor), \ - ICON(MagearnaOriginalColor, 0), \ - FOOTPRINT(Magearna) \ - LEARNSETS(Magearna), \ - .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 65, + .baseSpAttack = 130, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_STEEL, TYPE_FAIRY), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, + .speciesName = _("Magearna"), + .cryId = CRY_MAGEARNA, + .natDexNum = NATIONAL_DEX_MAGEARNA, + .categoryName = _("Artificial"), + .height = 10, + .weight = 805, + .pokemonScale = 305, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + FRONT_PIC(MagearnaOriginalColor, 56, 64), + .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Magearna, + .frontAnimId = ANIM_H_SLIDE_SLOW, + BACK_PIC(MagearnaOriginalColor, 64, 56), + .backPicYOffset = 4, + /*.backAnimId = BACK_ANIM_NONE,*/ + PALETTES(MagearnaOriginalColor), + ICON(MagearnaOriginalColor, 0), + FOOTPRINT(Magearna) + LEARNSETS(Magearna), + .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -5061,35 +5061,35 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_MELMETAL] = { - .baseHP = 135, \ - .baseAttack = 143, \ - .baseDefense = 143, \ - .baseSpeed = 34, \ - .baseSpAttack = 80, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_STEEL), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_IRON_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Melmetal"), \ - .cryId = CRY_MELMETAL, \ - .natDexNum = NATIONAL_DEX_MELMETAL, \ - .categoryName = _("Hex Nut"), \ - .pokemonScale = 257, \ - .pokemonOffset = 10, \ - .trainerScale = 423, \ - .trainerOffset = 8, \ - FOOTPRINT(Melmetal) \ - LEARNSETS(Melmetal), \ - .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ - .formChangeTable = sMelmetalFormChangeTable, \ + .baseHP = 135, + .baseAttack = 143, + .baseDefense = 143, + .baseSpeed = 34, + .baseSpAttack = 80, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_STEEL), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_IRON_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Melmetal"), + .cryId = CRY_MELMETAL, + .natDexNum = NATIONAL_DEX_MELMETAL, + .categoryName = _("Hex Nut"), + .pokemonScale = 257, + .pokemonOffset = 10, + .trainerScale = 423, + .trainerOffset = 8, + FOOTPRINT(Melmetal) + LEARNSETS(Melmetal), + .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, + .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, .height = 25, .weight = 800, @@ -5111,35 +5111,35 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_GIGANTAMAX_FORMS [SPECIES_MELMETAL_GIGANTAMAX] = { - .baseHP = 135, \ - .baseAttack = 143, \ - .baseDefense = 143, \ - .baseSpeed = 34, \ - .baseSpAttack = 80, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_STEEL), \ - .catchRate = 3, \ - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_IRON_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Melmetal"), \ - .cryId = CRY_MELMETAL, \ - .natDexNum = NATIONAL_DEX_MELMETAL, \ - .categoryName = _("Hex Nut"), \ - .pokemonScale = 257, \ - .pokemonOffset = 10, \ - .trainerScale = 423, \ - .trainerOffset = 8, \ - FOOTPRINT(Melmetal) \ - LEARNSETS(Melmetal), \ - .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, \ - .formChangeTable = sMelmetalFormChangeTable, \ + .baseHP = 135, + .baseAttack = 143, + .baseDefense = 143, + .baseSpeed = 34, + .baseSpAttack = 80, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_STEEL), + .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_IRON_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Melmetal"), + .cryId = CRY_MELMETAL, + .natDexNum = NATIONAL_DEX_MELMETAL, + .categoryName = _("Hex Nut"), + .pokemonScale = 257, + .pokemonOffset = 10, + .trainerScale = 423, + .trainerOffset = 8, + FOOTPRINT(Melmetal) + LEARNSETS(Melmetal), + .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, + .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, .isGigantamax = TRUE, .height = 250, diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index 3e431b46e23f..0c1e655576d7 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -101,30 +101,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_RILLABOOM] = { - .baseHP = 100, \ - .baseAttack = 125, \ - .baseDefense = 90, \ - .baseSpeed = 85, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_GRASS), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), \ - .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Rillaboom"), \ - .cryId = CRY_RILLABOOM, \ - .natDexNum = NATIONAL_DEX_RILLABOOM, \ - .categoryName = _("Drummer"), \ - FOOTPRINT(Rillaboom) \ - LEARNSETS(Rillaboom), \ - .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ + .baseHP = 100, + .baseAttack = 125, + .baseDefense = 90, + .baseSpeed = 85, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GRASS), + .catchRate = 45, + .expYield = 265, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Rillaboom"), + .cryId = CRY_RILLABOOM, + .natDexNum = NATIONAL_DEX_RILLABOOM, + .categoryName = _("Drummer"), + FOOTPRINT(Rillaboom) + LEARNSETS(Rillaboom), + .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, .formChangeTable = sRillaboomFormChangeTable, .height = 21, .weight = 900, @@ -150,30 +150,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_RILLABOOM_GIGANTAMAX] = { - .baseHP = 100, \ - .baseAttack = 125, \ - .baseDefense = 90, \ - .baseSpeed = 85, \ - .baseSpAttack = 60, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_GRASS), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), \ - .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Rillaboom"), \ - .cryId = CRY_RILLABOOM, \ - .natDexNum = NATIONAL_DEX_RILLABOOM, \ - .categoryName = _("Drummer"), \ - FOOTPRINT(Rillaboom) \ - LEARNSETS(Rillaboom), \ - .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, \ + .baseHP = 100, + .baseAttack = 125, + .baseDefense = 90, + .baseSpeed = 85, + .baseSpAttack = 60, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GRASS), + .catchRate = 45, + .expYield = 265, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_GRASSY_SURGE }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Rillaboom"), + .cryId = CRY_RILLABOOM, + .natDexNum = NATIONAL_DEX_RILLABOOM, + .categoryName = _("Drummer"), + FOOTPRINT(Rillaboom) + LEARNSETS(Rillaboom), + .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, .formChangeTable = sRillaboomFormChangeTable, .height = 280, .weight = 0, @@ -297,30 +297,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CINDERACE] = { - .baseHP = 80, \ - .baseAttack = 116, \ - .baseDefense = 75, \ - .baseSpeed = 119, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_FIRE), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Cinderace"), \ - .cryId = CRY_CINDERACE, \ - .natDexNum = NATIONAL_DEX_CINDERACE, \ - .categoryName = _("Striker"), \ - FOOTPRINT(Cinderace) \ - LEARNSETS(Cinderace), \ - .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 116, + .baseDefense = 75, + .baseSpeed = 119, + .baseSpAttack = 65, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_FIRE), + .catchRate = 45, + .expYield = 265, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Cinderace"), + .cryId = CRY_CINDERACE, + .natDexNum = NATIONAL_DEX_CINDERACE, + .categoryName = _("Striker"), + FOOTPRINT(Cinderace) + LEARNSETS(Cinderace), + .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, .formChangeTable = sCinderaceFormChangeTable, .height = 14, .weight = 330, @@ -347,30 +347,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CINDERACE_GIGANTAMAX] = { - .baseHP = 80, \ - .baseAttack = 116, \ - .baseDefense = 75, \ - .baseSpeed = 119, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_FIRE), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE),\ - .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Cinderace"), \ - .cryId = CRY_CINDERACE, \ - .natDexNum = NATIONAL_DEX_CINDERACE, \ - .categoryName = _("Striker"), \ - FOOTPRINT(Cinderace) \ - LEARNSETS(Cinderace), \ - .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, \ + .baseHP = 80, + .baseAttack = 116, + .baseDefense = 75, + .baseSpeed = 119, + .baseSpAttack = 65, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_FIRE), + .catchRate = 45, + .expYield = 265, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_LIBERO }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Cinderace"), + .cryId = CRY_CINDERACE, + .natDexNum = NATIONAL_DEX_CINDERACE, + .categoryName = _("Striker"), + FOOTPRINT(Cinderace) + LEARNSETS(Cinderace), + .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, .formChangeTable = sCinderaceFormChangeTable, .height = 270, .weight = 0, @@ -496,30 +496,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_INTELEON] = { - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 65, \ - .baseSpeed = 120, \ - .baseSpAttack = 125, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Inteleon"), \ - .cryId = CRY_INTELEON, \ - .natDexNum = NATIONAL_DEX_INTELEON, \ - .categoryName = _("Secret Agent"), \ - FOOTPRINT(Inteleon) \ - LEARNSETS(Inteleon), \ - .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 65, + .baseSpeed = 120, + .baseSpAttack = 125, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, + .expYield = 265, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Inteleon"), + .cryId = CRY_INTELEON, + .natDexNum = NATIONAL_DEX_INTELEON, + .categoryName = _("Secret Agent"), + FOOTPRINT(Inteleon) + LEARNSETS(Inteleon), + .formSpeciesIdTable = sInteleonFormSpeciesIdTable, .formChangeTable = sInteleonFormChangeTable, .height = 19, .weight = 452, @@ -546,30 +546,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_INTELEON_GIGANTAMAX] = { - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 65, \ - .baseSpeed = 120, \ - .baseSpAttack = 125, \ - .baseSpDefense = 65, \ - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 45, \ - .expYield = 265, \ - .evYield_Speed = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Inteleon"), \ - .cryId = CRY_INTELEON, \ - .natDexNum = NATIONAL_DEX_INTELEON, \ - .categoryName = _("Secret Agent"), \ - FOOTPRINT(Inteleon) \ - LEARNSETS(Inteleon), \ - .formSpeciesIdTable = sInteleonFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 65, + .baseSpeed = 120, + .baseSpAttack = 125, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, + .expYield = 265, + .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SNIPER }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Inteleon"), + .cryId = CRY_INTELEON, + .natDexNum = NATIONAL_DEX_INTELEON, + .categoryName = _("Secret Agent"), + FOOTPRINT(Inteleon) + LEARNSETS(Inteleon), + .formSpeciesIdTable = sInteleonFormSpeciesIdTable, .formChangeTable = sInteleonFormChangeTable, .height = 400, .weight = 0, @@ -794,30 +794,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CORVIKNIGHT] = { - .baseHP = 98, \ - .baseAttack = 87, \ - .baseDefense = 105, \ - .baseSpeed = 67, \ - .baseSpAttack = 53, \ - .baseSpDefense = 85, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Corviknigh"), \ - .cryId = CRY_CORVIKNIGHT, \ - .natDexNum = NATIONAL_DEX_CORVIKNIGHT, \ - .categoryName = _("Raven"), \ - FOOTPRINT(Corviknight) \ - LEARNSETS(Corviknight), \ - .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ + .baseHP = 98, + .baseAttack = 87, + .baseDefense = 105, + .baseSpeed = 67, + .baseSpAttack = 53, + .baseSpDefense = 85, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Corviknigh"), + .cryId = CRY_CORVIKNIGHT, + .natDexNum = NATIONAL_DEX_CORVIKNIGHT, + .categoryName = _("Raven"), + FOOTPRINT(Corviknight) + LEARNSETS(Corviknight), + .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, .formChangeTable = sCorviknightFormChangeTable, .height = 22, .weight = 750, @@ -844,30 +844,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CORVIKNIGHT_GIGANTAMAX] = { - .baseHP = 98, \ - .baseAttack = 87, \ - .baseDefense = 105, \ - .baseSpeed = 67, \ - .baseSpAttack = 53, \ - .baseSpDefense = 85, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Corviknigh"), \ - .cryId = CRY_CORVIKNIGHT, \ - .natDexNum = NATIONAL_DEX_CORVIKNIGHT, \ - .categoryName = _("Raven"), \ - FOOTPRINT(Corviknight) \ - LEARNSETS(Corviknight), \ - .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, \ + .baseHP = 98, + .baseAttack = 87, + .baseDefense = 105, + .baseSpeed = 67, + .baseSpAttack = 53, + .baseSpDefense = 85, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_PRESSURE, ABILITY_UNNERVE, ABILITY_MIRROR_ARMOR }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Corviknigh"), + .cryId = CRY_CORVIKNIGHT, + .natDexNum = NATIONAL_DEX_CORVIKNIGHT, + .categoryName = _("Raven"), + FOOTPRINT(Corviknight) + LEARNSETS(Corviknight), + .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, .formChangeTable = sCorviknightFormChangeTable, .height = 140, .weight = 0, @@ -994,31 +994,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ORBEETLE] = { - .baseHP = 60, \ - .baseAttack = 45, \ - .baseDefense = 110, \ - .baseSpeed = 90, \ - .baseSpAttack = 80, \ - .baseSpDefense = 120, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Orbeetle"), \ - .cryId = CRY_ORBEETLE, \ - .natDexNum = NATIONAL_DEX_ORBEETLE, \ - .categoryName = _("Seven Spot"), \ - FOOTPRINT(Orbeetle) \ - LEARNSETS(Orbeetle), \ - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ + .baseHP = 60, + .baseAttack = 45, + .baseDefense = 110, + .baseSpeed = 90, + .baseSpAttack = 80, + .baseSpDefense = 120, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Orbeetle"), + .cryId = CRY_ORBEETLE, + .natDexNum = NATIONAL_DEX_ORBEETLE, + .categoryName = _("Seven Spot"), + FOOTPRINT(Orbeetle) + LEARNSETS(Orbeetle), + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, .formChangeTable = sOrbeetleFormChangeTable, .height = 4, .weight = 408, @@ -1046,31 +1046,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_ORBEETLE_GIGANTAMAX] = { - .baseHP = 60, \ - .baseAttack = 45, \ - .baseDefense = 110, \ - .baseSpeed = 90, \ - .baseSpAttack = 80, \ - .baseSpDefense = 120, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Orbeetle"), \ - .cryId = CRY_ORBEETLE, \ - .natDexNum = NATIONAL_DEX_ORBEETLE, \ - .categoryName = _("Seven Spot"), \ - FOOTPRINT(Orbeetle) \ - LEARNSETS(Orbeetle), \ - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, \ + .baseHP = 60, + .baseAttack = 45, + .baseDefense = 110, + .baseSpeed = 90, + .baseSpAttack = 80, + .baseSpDefense = 120, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SWARM, ABILITY_FRISK, ABILITY_TELEPATHY }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Orbeetle"), + .cryId = CRY_ORBEETLE, + .natDexNum = NATIONAL_DEX_ORBEETLE, + .categoryName = _("Seven Spot"), + FOOTPRINT(Orbeetle) + LEARNSETS(Orbeetle), + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, .formChangeTable = sOrbeetleFormChangeTable, .height = 140, .weight = 0, @@ -1438,30 +1438,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_DREDNAW] = { - .baseHP = 90, \ - .baseAttack = 115, \ - .baseDefense = 90, \ - .baseSpeed = 74, \ - .baseSpAttack = 48, \ - .baseSpDefense = 68, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .abilities = { ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Drednaw"), \ - .cryId = CRY_DREDNAW, \ - .natDexNum = NATIONAL_DEX_DREDNAW, \ - .categoryName = _("Bite"), \ - FOOTPRINT(Drednaw) \ - LEARNSETS(Drednaw), \ - .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ + .baseHP = 90, + .baseAttack = 115, + .baseDefense = 90, + .baseSpeed = 74, + .baseSpAttack = 48, + .baseSpDefense = 68, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Drednaw"), + .cryId = CRY_DREDNAW, + .natDexNum = NATIONAL_DEX_DREDNAW, + .categoryName = _("Bite"), + FOOTPRINT(Drednaw) + LEARNSETS(Drednaw), + .formSpeciesIdTable = sDrednawFormSpeciesIdTable, .formChangeTable = sDrednawFormChangeTable, .height = 10, .weight = 1155, @@ -1487,30 +1487,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_DREDNAW_GIGANTAMAX] = { - .baseHP = 90, \ - .baseAttack = 115, \ - .baseDefense = 90, \ - .baseSpeed = 74, \ - .baseSpAttack = 48, \ - .baseSpDefense = 68, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), \ - .abilities = { ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Drednaw"), \ - .cryId = CRY_DREDNAW, \ - .natDexNum = NATIONAL_DEX_DREDNAW, \ - .categoryName = _("Bite"), \ - FOOTPRINT(Drednaw) \ - LEARNSETS(Drednaw), \ - .formSpeciesIdTable = sDrednawFormSpeciesIdTable, \ + .baseHP = 90, + .baseAttack = 115, + .baseDefense = 90, + .baseSpeed = 74, + .baseSpAttack = 48, + .baseSpDefense = 68, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_STRONG_JAW, ABILITY_SHELL_ARMOR, ABILITY_SWIFT_SWIM }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Drednaw"), + .cryId = CRY_DREDNAW, + .natDexNum = NATIONAL_DEX_DREDNAW, + .categoryName = _("Bite"), + FOOTPRINT(Drednaw) + LEARNSETS(Drednaw), + .formSpeciesIdTable = sDrednawFormSpeciesIdTable, .formChangeTable = sDrednawFormChangeTable, .height = 240, .weight = 0, @@ -1732,30 +1732,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_COALOSSAL] = { - .baseHP = 110, \ - .baseAttack = 80, \ - .baseDefense = 120, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 90, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Coalossal"), \ - .cryId = CRY_COALOSSAL, \ - .natDexNum = NATIONAL_DEX_COALOSSAL, \ - .categoryName = _("Coal"), \ - FOOTPRINT(Coalossal) \ - LEARNSETS(Coalossal), \ - .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ + .baseHP = 110, + .baseAttack = 80, + .baseDefense = 120, + .baseSpeed = 30, + .baseSpAttack = 80, + .baseSpDefense = 90, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE }, + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Coalossal"), + .cryId = CRY_COALOSSAL, + .natDexNum = NATIONAL_DEX_COALOSSAL, + .categoryName = _("Coal"), + FOOTPRINT(Coalossal) + LEARNSETS(Coalossal), + .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, .formChangeTable = sCoalossalFormChangeTable, .height = 28, .weight = 3105, @@ -1782,30 +1782,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_COALOSSAL_GIGANTAMAX] = { - .baseHP = 110, \ - .baseAttack = 80, \ - .baseDefense = 120, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 90, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE }, \ - .bodyColor = BODY_COLOR_BLACK, \ - .speciesName = _("Coalossal"), \ - .cryId = CRY_COALOSSAL, \ - .natDexNum = NATIONAL_DEX_COALOSSAL, \ - .categoryName = _("Coal"), \ - FOOTPRINT(Coalossal) \ - LEARNSETS(Coalossal), \ - .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, \ + .baseHP = 110, + .baseAttack = 80, + .baseDefense = 120, + .baseSpeed = 30, + .baseSpAttack = 80, + .baseSpDefense = 90, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_STEAM_ENGINE, ABILITY_FLAME_BODY, ABILITY_FLASH_FIRE }, + .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Coalossal"), + .cryId = CRY_COALOSSAL, + .natDexNum = NATIONAL_DEX_COALOSSAL, + .categoryName = _("Coal"), + FOOTPRINT(Coalossal) + LEARNSETS(Coalossal), + .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, .formChangeTable = sCoalossalFormChangeTable, .height = 420, .weight = 0, @@ -1886,30 +1886,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_FLAPPLE] = { - .baseHP = 70, \ - .baseAttack = 110, \ - .baseDefense = 80, \ - .baseSpeed = 70, \ - .baseSpAttack = 95, \ - .baseSpDefense = 60, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Flapple"), \ - .cryId = CRY_FLAPPLE, \ - .natDexNum = NATIONAL_DEX_FLAPPLE, \ - .categoryName = _("Apple Wing"), \ - FOOTPRINT(Flapple) \ - LEARNSETS(Flapple), \ - .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 80, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 60, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Flapple"), + .cryId = CRY_FLAPPLE, + .natDexNum = NATIONAL_DEX_FLAPPLE, + .categoryName = _("Apple Wing"), + FOOTPRINT(Flapple) + LEARNSETS(Flapple), + .formSpeciesIdTable = sFlappleFormSpeciesIdTable, .formChangeTable = sFlappleFormChangeTable, .height = 3, .weight = 10, @@ -1936,30 +1936,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_FLAPPLE_GIGANTAMAX] = { - .baseHP = 70, \ - .baseAttack = 110, \ - .baseDefense = 80, \ - .baseSpeed = 70, \ - .baseSpAttack = 95, \ - .baseSpDefense = 60, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Flapple"), \ - .cryId = CRY_FLAPPLE, \ - .natDexNum = NATIONAL_DEX_FLAPPLE, \ - .categoryName = _("Apple Wing"), \ - FOOTPRINT(Flapple) \ - LEARNSETS(Flapple), \ - .formSpeciesIdTable = sFlappleFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 80, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 60, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_HUSTLE }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Flapple"), + .cryId = CRY_FLAPPLE, + .natDexNum = NATIONAL_DEX_FLAPPLE, + .categoryName = _("Apple Wing"), + FOOTPRINT(Flapple) + LEARNSETS(Flapple), + .formSpeciesIdTable = sFlappleFormSpeciesIdTable, .formChangeTable = sFlappleFormChangeTable, .height = 240, .weight = 0, @@ -1987,30 +1987,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_APPLETUN] = { - .baseHP = 110, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 30, \ - .baseSpAttack = 100, \ - .baseSpDefense = 80, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Appletun"), \ - .cryId = CRY_APPLETUN, \ - .natDexNum = NATIONAL_DEX_APPLETUN, \ - .categoryName = _("Apple Nectar"), \ - FOOTPRINT(Appletun) \ - LEARNSETS(Appletun), \ - .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ + .baseHP = 110, + .baseAttack = 85, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 80, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Appletun"), + .cryId = CRY_APPLETUN, + .natDexNum = NATIONAL_DEX_APPLETUN, + .categoryName = _("Apple Nectar"), + FOOTPRINT(Appletun) + LEARNSETS(Appletun), + .formSpeciesIdTable = sAppletunFormSpeciesIdTable, .formChangeTable = sAppletunFormChangeTable, .height = 4, .weight = 130, @@ -2036,35 +2036,35 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_APPLETUN_GIGANTAMAX] = { - .baseHP = 110, \ - .baseAttack = 85, \ - .baseDefense = 80, \ - .baseSpeed = 30, \ - .baseSpAttack = 100, \ - .baseSpDefense = 80, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Appletun"), \ - .cryId = CRY_APPLETUN, \ - .natDexNum = NATIONAL_DEX_APPLETUN, \ - .categoryName = _("Apple Nectar"), \ - FOOTPRINT(Appletun) \ - LEARNSETS(Appletun), \ - .formSpeciesIdTable = sAppletunFormSpeciesIdTable, \ - .formChangeTable = sAppletunFormChangeTable, - .height = 240, - .weight = 0, - .description = COMPOUND_STRING( - "Due to Gigantamax energy, this\n" + .baseHP = 110, + .baseAttack = 85, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 80, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_GRASS, EGG_GROUP_DRAGON), + .abilities = { ABILITY_RIPEN, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Appletun"), + .cryId = CRY_APPLETUN, + .natDexNum = NATIONAL_DEX_APPLETUN, + .categoryName = _("Apple Nectar"), + FOOTPRINT(Appletun) + LEARNSETS(Appletun), + .formSpeciesIdTable = sAppletunFormSpeciesIdTable, + .formChangeTable = sAppletunFormChangeTable, + .height = 240, + .weight = 0, + .description = COMPOUND_STRING( + "Due to Gigantamax energy, this\n" "Pokémon's nectar has thickened. The\n" "increased viscosity lets the nectar\n" "absorb more damage than before."), @@ -2232,30 +2232,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_SANDACONDA] = { - .baseHP = 72, \ - .baseAttack = 107, \ - .baseDefense = 125, \ - .baseSpeed = 71, \ - .baseSpAttack = 65, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_GROUND), \ - .catchRate = 120, \ - .expYield = 179, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sandaconda"), \ - .cryId = CRY_SANDACONDA, \ - .natDexNum = NATIONAL_DEX_SANDACONDA, \ - .categoryName = _("Sand Snake"), \ - FOOTPRINT(Sandaconda) \ - LEARNSETS(Sandaconda), \ - .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ + .baseHP = 72, + .baseAttack = 107, + .baseDefense = 125, + .baseSpeed = 71, + .baseSpAttack = 65, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GROUND), + .catchRate = 120, + .expYield = 179, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sandaconda"), + .cryId = CRY_SANDACONDA, + .natDexNum = NATIONAL_DEX_SANDACONDA, + .categoryName = _("Sand Snake"), + FOOTPRINT(Sandaconda) + LEARNSETS(Sandaconda), + .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, .formChangeTable = sSandacondaFormChangeTable, .height = 38, .weight = 655, @@ -2282,30 +2282,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_SANDACONDA_GIGANTAMAX] = { - .baseHP = 72, \ - .baseAttack = 107, \ - .baseDefense = 125, \ - .baseSpeed = 71, \ - .baseSpAttack = 65, \ - .baseSpDefense = 70, \ - .types = MON_TYPES(TYPE_GROUND), \ - .catchRate = 120, \ - .expYield = 179, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sandaconda"), \ - .cryId = CRY_SANDACONDA, \ - .natDexNum = NATIONAL_DEX_SANDACONDA, \ - .categoryName = _("Sand Snake"), \ - FOOTPRINT(Sandaconda) \ - LEARNSETS(Sandaconda), \ - .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, \ + .baseHP = 72, + .baseAttack = 107, + .baseDefense = 125, + .baseSpeed = 71, + .baseSpAttack = 65, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GROUND), + .catchRate = 120, + .expYield = 179, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAND_SPIT, ABILITY_SHED_SKIN, ABILITY_SAND_VEIL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sandaconda"), + .cryId = CRY_SANDACONDA, + .natDexNum = NATIONAL_DEX_SANDACONDA, + .categoryName = _("Sand Snake"), + FOOTPRINT(Sandaconda) + LEARNSETS(Sandaconda), + .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, .formChangeTable = sSandacondaFormChangeTable, .height = 220, .weight = 0, @@ -2335,36 +2335,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_CRAMORANT [SPECIES_CRAMORANT] = { - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 85, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), \ - .catchRate = 45, \ - .expYield = 166, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),\ - .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Cramorant"), \ - .cryId = CRY_CRAMORANT, \ - .natDexNum = NATIONAL_DEX_CRAMORANT, \ - .categoryName = _("Gulp"), \ - .height = 8, \ - .weight = 180, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - FOOTPRINT(Cramorant) \ - LEARNSETS(Cramorant), \ - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), + .catchRate = 45, + .expYield = 166, + .evYield_SpDefense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING), + .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Cramorant"), + .cryId = CRY_CRAMORANT, + .natDexNum = NATIONAL_DEX_CRAMORANT, + .categoryName = _("Gulp"), + .height = 8, + .weight = 180, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + FOOTPRINT(Cramorant) + LEARNSETS(Cramorant), + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "It's so strong that it can knock out some\n" @@ -2383,36 +2383,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CRAMORANT_GULPING] = { - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 85, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), \ - .catchRate = 45, \ - .expYield = 166, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),\ - .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Cramorant"), \ - .cryId = CRY_CRAMORANT, \ - .natDexNum = NATIONAL_DEX_CRAMORANT, \ - .categoryName = _("Gulp"), \ - .height = 8, \ - .weight = 180, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - FOOTPRINT(Cramorant) \ - LEARNSETS(Cramorant), \ - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), + .catchRate = 45, + .expYield = 166, + .evYield_SpDefense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING), + .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Cramorant"), + .cryId = CRY_CRAMORANT, + .natDexNum = NATIONAL_DEX_CRAMORANT, + .categoryName = _("Gulp"), + .height = 8, + .weight = 180, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + FOOTPRINT(Cramorant) + LEARNSETS(Cramorant), + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "Cramorant's gluttony led it to try\n" @@ -2432,36 +2432,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CRAMORANT_GORGING] = { - .baseHP = 70, \ - .baseAttack = 85, \ - .baseDefense = 55, \ - .baseSpeed = 85, \ - .baseSpAttack = 85, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), \ - .catchRate = 45, \ - .expYield = 166, \ - .evYield_SpDefense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING),\ - .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Cramorant"), \ - .cryId = CRY_CRAMORANT, \ - .natDexNum = NATIONAL_DEX_CRAMORANT, \ - .categoryName = _("Gulp"), \ - .height = 8, \ - .weight = 180, \ - .pokemonScale = 366, \ - .pokemonOffset = 7, \ - .trainerScale = 257, \ - .trainerOffset = 0, \ - FOOTPRINT(Cramorant) \ - LEARNSETS(Cramorant), \ - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_FLYING, TYPE_WATER), + .catchRate = 45, + .expYield = 166, + .evYield_SpDefense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FLYING), + .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Cramorant"), + .cryId = CRY_CRAMORANT, + .natDexNum = NATIONAL_DEX_CRAMORANT, + .categoryName = _("Gulp"), + .height = 8, + .weight = 180, + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, + FOOTPRINT(Cramorant) + LEARNSETS(Cramorant), + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "This Cramorant has accidentally\n" @@ -2629,26 +2629,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_TOXTRICITY_AMPED] = { - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Toxtricity"), \ - .natDexNum = NATIONAL_DEX_TOXTRICITY, \ - .categoryName = _("Punk"), \ - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 98, + .baseDefense = 70, + .baseSpeed = 75, + .baseSpAttack = 114, + .baseSpDefense = 70, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Toxtricity"), + .natDexNum = NATIONAL_DEX_TOXTRICITY, + .categoryName = _("Punk"), + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_AMPED, @@ -2680,26 +2680,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_TOXTRICITY_AMPED_GIGANTAMAX] = { - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Toxtricity"), \ - .natDexNum = NATIONAL_DEX_TOXTRICITY, \ - .categoryName = _("Punk"), \ - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 98, + .baseDefense = 70, + .baseSpeed = 75, + .baseSpAttack = 114, + .baseSpDefense = 70, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Toxtricity"), + .natDexNum = NATIONAL_DEX_TOXTRICITY, + .categoryName = _("Punk"), + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_AMPED, @@ -2727,26 +2727,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_TOXTRICITY_LOW_KEY] = { - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Toxtricity"), \ - .natDexNum = NATIONAL_DEX_TOXTRICITY, \ - .categoryName = _("Punk"), \ - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 98, + .baseDefense = 70, + .baseSpeed = 75, + .baseSpAttack = 114, + .baseSpDefense = 70, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Toxtricity"), + .natDexNum = NATIONAL_DEX_TOXTRICITY, + .categoryName = _("Punk"), + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_LOW_KEY, @@ -2776,26 +2776,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_TOXTRICITY_LOW_KEY_GIGANTAMAX] = { - .baseHP = 75, \ - .baseAttack = 98, \ - .baseDefense = 70, \ - .baseSpeed = 75, \ - .baseSpAttack = 114, \ - .baseSpDefense = 70, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Toxtricity"), \ - .natDexNum = NATIONAL_DEX_TOXTRICITY, \ - .categoryName = _("Punk"), \ - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, \ + .baseHP = 75, + .baseAttack = 98, + .baseDefense = 70, + .baseSpeed = 75, + .baseSpAttack = 114, + .baseSpDefense = 70, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Toxtricity"), + .natDexNum = NATIONAL_DEX_TOXTRICITY, + .categoryName = _("Punk"), + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, .formChangeTable = sToxtricityAmpedFormChangeTable, .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .cryId = CRY_TOXTRICITY_LOW_KEY, @@ -2872,30 +2872,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CENTISKORCH] = { - .baseHP = 100, \ - .baseAttack = 115, \ - .baseDefense = 65, \ - .baseSpeed = 65, \ - .baseSpAttack = 90, \ - .baseSpDefense = 90, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Centiskorc"), \ - .cryId = CRY_CENTISKORCH, \ - .natDexNum = NATIONAL_DEX_CENTISKORCH, \ - .categoryName = _("Radiator"), \ - FOOTPRINT(Centiskorch) \ - LEARNSETS(Centiskorch), \ - .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ + .baseHP = 100, + .baseAttack = 115, + .baseDefense = 65, + .baseSpeed = 65, + .baseSpAttack = 90, + .baseSpDefense = 90, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Centiskorc"), + .cryId = CRY_CENTISKORCH, + .natDexNum = NATIONAL_DEX_CENTISKORCH, + .categoryName = _("Radiator"), + FOOTPRINT(Centiskorch) + LEARNSETS(Centiskorch), + .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, .formChangeTable = sCentiskorchFormChangeTable, .height = 30, .weight = 1200, @@ -2922,30 +2922,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_CENTISKORCH_GIGANTAMAX] = { - .baseHP = 100, \ - .baseAttack = 115, \ - .baseDefense = 65, \ - .baseSpeed = 65, \ - .baseSpAttack = 90, \ - .baseSpDefense = 90, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), \ - .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY }, \ - .bodyColor = BODY_COLOR_RED, \ - .speciesName = _("Centiskorc"), \ - .cryId = CRY_CENTISKORCH, \ - .natDexNum = NATIONAL_DEX_CENTISKORCH, \ - .categoryName = _("Radiator"), \ - FOOTPRINT(Centiskorch) \ - LEARNSETS(Centiskorch), \ - .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, \ + .baseHP = 100, + .baseAttack = 115, + .baseDefense = 65, + .baseSpeed = 65, + .baseSpAttack = 90, + .baseSpDefense = 90, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_FLASH_FIRE, ABILITY_WHITE_SMOKE, ABILITY_FLAME_BODY }, + .bodyColor = BODY_COLOR_RED, + .speciesName = _("Centiskorc"), + .cryId = CRY_CENTISKORCH, + .natDexNum = NATIONAL_DEX_CENTISKORCH, + .categoryName = _("Radiator"), + FOOTPRINT(Centiskorch) + LEARNSETS(Centiskorch), + .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, .formChangeTable = sCentiskorchFormChangeTable, .height = 750, .weight = 0, @@ -3071,44 +3071,44 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_SINISTEA [SPECIES_SINISTEA_PHONY] = { - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 74, \ - .baseSpDefense = 54, \ - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 120, \ - .expYield = 62, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sinistea"), \ - .cryId = CRY_SINISTEA, \ - .natDexNum = NATIONAL_DEX_SINISTEA, \ - .categoryName = _("Black Tea"), \ - .height = 1, \ - .weight = 2, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Sinistea, 40, 32), \ - .frontPicYOffset = 17, \ - .frontAnimFrames = sAnims_Sinistea, \ + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 74, + .baseSpDefense = 54, + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 120, + .expYield = 62, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sinistea"), + .cryId = CRY_SINISTEA, + .natDexNum = NATIONAL_DEX_SINISTEA, + .categoryName = _("Black Tea"), + .height = 1, + .weight = 2, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Sinistea, 40, 32), + .frontPicYOffset = 17, + .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sinistea, 48, 32), \ - .backPicYOffset = 16, \ + BACK_PIC(Sinistea, 48, 32), + .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistea), \ - ICON(Sinistea, 2), \ - FOOTPRINT(Sinistea) \ - LEARNSETS(Sinistea), \ + PALETTES(Sinistea), + ICON(Sinistea, 2), + FOOTPRINT(Sinistea) + LEARNSETS(Sinistea), .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "This Pokémon is said to have been born\n" @@ -3120,44 +3120,44 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_SINISTEA_ANTIQUE] = { - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 74, \ - .baseSpDefense = 54, \ - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 120, \ - .expYield = 62, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Sinistea"), \ - .cryId = CRY_SINISTEA, \ - .natDexNum = NATIONAL_DEX_SINISTEA, \ - .categoryName = _("Black Tea"), \ - .height = 1, \ - .weight = 2, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Sinistea, 40, 32), \ - .frontPicYOffset = 17, \ - .frontAnimFrames = sAnims_Sinistea, \ + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 74, + .baseSpDefense = 54, + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 120, + .expYield = 62, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Sinistea"), + .cryId = CRY_SINISTEA, + .natDexNum = NATIONAL_DEX_SINISTEA, + .categoryName = _("Black Tea"), + .height = 1, + .weight = 2, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Sinistea, 40, 32), + .frontPicYOffset = 17, + .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sinistea, 48, 32), \ - .backPicYOffset = 16, \ + BACK_PIC(Sinistea, 48, 32), + .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistea), \ - ICON(Sinistea, 2), \ - FOOTPRINT(Sinistea) \ - LEARNSETS(Sinistea), \ + PALETTES(Sinistea), + ICON(Sinistea, 2), + FOOTPRINT(Sinistea) + LEARNSETS(Sinistea), .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "The swirl pattern in this Pokémon's\n" @@ -3170,44 +3170,44 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_POLTEAGEIST_PHONY] = { - .baseHP = 60, \ - .baseAttack = 65, \ - .baseDefense = 65, \ - .baseSpeed = 70, \ - .baseSpAttack = 134, \ - .baseSpDefense = 114, \ - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 60, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Polteageis"), \ - .cryId = CRY_POLTEAGEIST, \ - .natDexNum = NATIONAL_DEX_POLTEAGEIST, \ - .categoryName = _("Black Tea"), \ - .height = 2, \ - .weight = 4, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Polteageist, 48, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Polteageist, \ + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 134, + .baseSpDefense = 114, + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 60, + .expYield = 178, + .evYield_SpAttack = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Polteageis"), + .cryId = CRY_POLTEAGEIST, + .natDexNum = NATIONAL_DEX_POLTEAGEIST, + .categoryName = _("Black Tea"), + .height = 2, + .weight = 4, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Polteageist, 48, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Polteageist, 64, 40), \ - .backPicYOffset = 13, \ + BACK_PIC(Polteageist, 64, 40), + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Polteageist), \ - ICON(Polteageist, 2), \ - FOOTPRINT(Polteageist) \ - LEARNSETS(Polteageist), \ + PALETTES(Polteageist), + ICON(Polteageist, 2), + FOOTPRINT(Polteageist) + LEARNSETS(Polteageist), .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "This species lives in antique teapots.\n" @@ -3218,44 +3218,44 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_POLTEAGEIST_ANTIQUE] = { - .baseHP = 60, \ - .baseAttack = 65, \ - .baseDefense = 65, \ - .baseSpeed = 70, \ - .baseSpAttack = 134, \ - .baseSpDefense = 114, \ - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 60, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Polteageis"), \ - .cryId = CRY_POLTEAGEIST, \ - .natDexNum = NATIONAL_DEX_POLTEAGEIST, \ - .categoryName = _("Black Tea"), \ - .height = 2, \ - .weight = 4, \ - .pokemonScale = 682, \ - .pokemonOffset = 24, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Polteageist, 48, 48), \ - .frontPicYOffset = 11, \ - .frontAnimFrames = sAnims_Polteageist, \ + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 134, + .baseSpDefense = 114, + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 60, + .expYield = 178, + .evYield_SpAttack = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Polteageis"), + .cryId = CRY_POLTEAGEIST, + .natDexNum = NATIONAL_DEX_POLTEAGEIST, + .categoryName = _("Black Tea"), + .height = 2, + .weight = 4, + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Polteageist, 48, 48), + .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Polteageist, 64, 40), \ - .backPicYOffset = 13, \ + BACK_PIC(Polteageist, 64, 40), + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Polteageist), \ - ICON(Polteageist, 2), \ - FOOTPRINT(Polteageist) \ - LEARNSETS(Polteageist), \ + PALETTES(Polteageist), + ICON(Polteageist, 2), + FOOTPRINT(Polteageist) + LEARNSETS(Polteageist), .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "Trainers Polteageist trusts will be\n" @@ -3364,30 +3364,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_HATTERENE] = { - .baseHP = 57, \ - .baseAttack = 90, \ - .baseDefense = 95, \ - .baseSpeed = 29, \ - .baseSpAttack = 136, \ - .baseSpDefense = 103, \ - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = 255, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .abilities = { ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE }, \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Hatterene"), \ - .cryId = CRY_HATTERENE, \ - .natDexNum = NATIONAL_DEX_HATTERENE, \ - .categoryName = _("Silent"), \ - FOOTPRINT(Hatterene) \ - LEARNSETS(Hatterene), \ - .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ + .baseHP = 57, + .baseAttack = 90, + .baseDefense = 95, + .baseSpeed = 29, + .baseSpAttack = 136, + .baseSpDefense = 103, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), + .catchRate = 45, + .expYield = 255, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .abilities = { ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE }, + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Hatterene"), + .cryId = CRY_HATTERENE, + .natDexNum = NATIONAL_DEX_HATTERENE, + .categoryName = _("Silent"), + FOOTPRINT(Hatterene) + LEARNSETS(Hatterene), + .formSpeciesIdTable = sHattereneFormSpeciesIdTable, .formChangeTable = sHattereneFormChangeTable, .height = 21, .weight = 51, @@ -3413,30 +3413,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_HATTERENE_GIGANTAMAX] = { - .baseHP = 57, \ - .baseAttack = 90, \ - .baseDefense = 95, \ - .baseSpeed = 29, \ - .baseSpAttack = 136, \ - .baseSpDefense = 103, \ - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), \ - .catchRate = 45, \ - .expYield = 255, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .abilities = { ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE }, \ - .bodyColor = BODY_COLOR_PINK, \ - .speciesName = _("Hatterene"), \ - .cryId = CRY_HATTERENE, \ - .natDexNum = NATIONAL_DEX_HATTERENE, \ - .categoryName = _("Silent"), \ - FOOTPRINT(Hatterene) \ - LEARNSETS(Hatterene), \ - .formSpeciesIdTable = sHattereneFormSpeciesIdTable, \ + .baseHP = 57, + .baseAttack = 90, + .baseDefense = 95, + .baseSpeed = 29, + .baseSpAttack = 136, + .baseSpDefense = 103, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), + .catchRate = 45, + .expYield = 255, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .abilities = { ABILITY_HEALER, ABILITY_ANTICIPATION, ABILITY_MAGIC_BOUNCE }, + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Hatterene"), + .cryId = CRY_HATTERENE, + .natDexNum = NATIONAL_DEX_HATTERENE, + .categoryName = _("Silent"), + FOOTPRINT(Hatterene) + LEARNSETS(Hatterene), + .formSpeciesIdTable = sHattereneFormSpeciesIdTable, .formChangeTable = sHattereneFormChangeTable, .height = 260, .weight = 0, @@ -3563,30 +3563,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_GRIMMSNARL] = { - .baseHP = 95, \ - .baseAttack = 120, \ - .baseDefense = 65, \ - .baseSpeed = 60, \ - .baseSpAttack = 95, \ - .baseSpDefense = 75, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE), \ - .abilities = { ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Grimmsnarl"), \ - .cryId = CRY_GRIMMSNARL, \ - .natDexNum = NATIONAL_DEX_GRIMMSNARL, \ - .categoryName = _("Bulk Up"), \ - FOOTPRINT(Grimmsnarl) \ - LEARNSETS(Grimmsnarl), \ - .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ + .baseHP = 95, + .baseAttack = 120, + .baseDefense = 65, + .baseSpeed = 60, + .baseSpAttack = 95, + .baseSpDefense = 75, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Grimmsnarl"), + .cryId = CRY_GRIMMSNARL, + .natDexNum = NATIONAL_DEX_GRIMMSNARL, + .categoryName = _("Bulk Up"), + FOOTPRINT(Grimmsnarl) + LEARNSETS(Grimmsnarl), + .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, .formChangeTable = sGrimmsnarlFormChangeTable, .height = 15, .weight = 610, @@ -3612,30 +3612,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_GRIMMSNARL_GIGANTAMAX] = { - .baseHP = 95, \ - .baseAttack = 120, \ - .baseDefense = 65, \ - .baseSpeed = 60, \ - .baseSpAttack = 95, \ - .baseSpDefense = 75, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE), \ - .abilities = { ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Grimmsnarl"), \ - .cryId = CRY_GRIMMSNARL, \ - .natDexNum = NATIONAL_DEX_GRIMMSNARL, \ - .categoryName = _("Bulk Up"), \ - FOOTPRINT(Grimmsnarl) \ - LEARNSETS(Grimmsnarl), \ - .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, \ + .baseHP = 95, + .baseAttack = 120, + .baseDefense = 65, + .baseSpeed = 60, + .baseSpAttack = 95, + .baseSpDefense = 75, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PRANKSTER, ABILITY_FRISK, ABILITY_PICKPOCKET }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Grimmsnarl"), + .cryId = CRY_GRIMMSNARL, + .natDexNum = NATIONAL_DEX_GRIMMSNARL, + .categoryName = _("Bulk Up"), + FOOTPRINT(Grimmsnarl) + LEARNSETS(Grimmsnarl), + .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, .formChangeTable = sGrimmsnarlFormChangeTable, .height = 320, .weight = 0, @@ -4115,29 +4115,29 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_EISCUE [SPECIES_EISCUE_ICE_FACE] = { - .types = MON_TYPES(TYPE_ICE), \ - .catchRate = 60, \ - .expYield = 165, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ - .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Eiscue"), \ - .natDexNum = NATIONAL_DEX_EISCUE, \ - .categoryName = _("Penguin"), \ - .height = 14, \ - .weight = 890, \ - .pokemonScale = 265, \ - .pokemonOffset = 2, \ - .trainerScale = 262, \ - .trainerOffset = 0, \ - FOOTPRINT(Eiscue) \ - LEARNSETS(Eiscue), \ - .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ICE), + .catchRate = 60, + .expYield = 165, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Eiscue"), + .natDexNum = NATIONAL_DEX_EISCUE, + .categoryName = _("Penguin"), + .height = 14, + .weight = 890, + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, + FOOTPRINT(Eiscue) + LEARNSETS(Eiscue), + .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, .baseAttack = 80, @@ -4164,29 +4164,29 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_EISCUE_NOICE_FACE] = { - .types = MON_TYPES(TYPE_ICE), \ - .catchRate = 60, \ - .expYield = 165, \ - .evYield_Defense = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 25, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD),\ - .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Eiscue"), \ - .natDexNum = NATIONAL_DEX_EISCUE, \ - .categoryName = _("Penguin"), \ - .height = 14, \ - .weight = 890, \ - .pokemonScale = 265, \ - .pokemonOffset = 2, \ - .trainerScale = 262, \ - .trainerOffset = 0, \ - FOOTPRINT(Eiscue) \ - LEARNSETS(Eiscue), \ - .formSpeciesIdTable = sEiscueFormSpeciesIdTable, \ + .types = MON_TYPES(TYPE_ICE), + .catchRate = 60, + .expYield = 165, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Eiscue"), + .natDexNum = NATIONAL_DEX_EISCUE, + .categoryName = _("Penguin"), + .height = 14, + .weight = 890, + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, + FOOTPRINT(Eiscue) + LEARNSETS(Eiscue), + .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, .baseAttack = 80, @@ -4215,24 +4215,24 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_INDEEDEE [SPECIES_INDEEDEE_MALE] = { - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), \ - .catchRate = 30, \ - .expYield = 166, \ - .eggCycles = 40, \ - .friendship = 140, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Indeedee"), \ - .natDexNum = NATIONAL_DEX_INDEEDEE, \ - .categoryName = _("Emotion"), \ - .height = 9, \ - .weight = 280, \ - .pokemonScale = 338, \ - .pokemonOffset = 8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Indeedee) \ + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), + .catchRate = 30, + .expYield = 166, + .eggCycles = 40, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Indeedee"), + .natDexNum = NATIONAL_DEX_INDEEDEE, + .categoryName = _("Emotion"), + .height = 9, + .weight = 280, + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Indeedee) .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, .baseHP = 60, .baseAttack = 65, @@ -4263,24 +4263,24 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_INDEEDEE_FEMALE] = { - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), \ - .catchRate = 30, \ - .expYield = 166, \ - .eggCycles = 40, \ - .friendship = 140, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ - .bodyColor = BODY_COLOR_PURPLE, \ - .speciesName = _("Indeedee"), \ - .natDexNum = NATIONAL_DEX_INDEEDEE, \ - .categoryName = _("Emotion"), \ - .height = 9, \ - .weight = 280, \ - .pokemonScale = 338, \ - .pokemonOffset = 8, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Indeedee) \ + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), + .catchRate = 30, + .expYield = 166, + .eggCycles = 40, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Indeedee"), + .natDexNum = NATIONAL_DEX_INDEEDEE, + .categoryName = _("Emotion"), + .height = 9, + .weight = 280, + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Indeedee) .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, .baseHP = 70, .baseAttack = 55, @@ -4313,35 +4313,35 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_MORPEKO [SPECIES_MORPEKO_FULL_BELLY] = { - .baseHP = 58, \ - .baseAttack = 95, \ - .baseDefense = 58, \ - .baseSpeed = 97, \ - .baseSpAttack = 70, \ - .baseSpDefense = 58, \ - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DARK), \ - .catchRate = 180, \ - .expYield = 153, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ - .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Morpeko"), \ - .natDexNum = NATIONAL_DEX_MORPEKO, \ - .categoryName = _("Two-Sided"), \ - .height = 3, \ - .weight = 30, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Morpeko) \ - LEARNSETS(Morpeko), \ - .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ + .baseHP = 58, + .baseAttack = 95, + .baseDefense = 58, + .baseSpeed = 97, + .baseSpAttack = 70, + .baseSpDefense = 58, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DARK), + .catchRate = 180, + .expYield = 153, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Morpeko"), + .natDexNum = NATIONAL_DEX_MORPEKO, + .categoryName = _("Two-Sided"), + .height = 3, + .weight = 30, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Morpeko) + LEARNSETS(Morpeko), + .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_FULL_BELLY, .description = COMPOUND_STRING( @@ -4362,35 +4362,35 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_MORPEKO_HANGRY] = { - .baseHP = 58, \ - .baseAttack = 95, \ - .baseDefense = 58, \ - .baseSpeed = 97, \ - .baseSpAttack = 70, \ - .baseSpDefense = 58, \ - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DARK), \ - .catchRate = 180, \ - .expYield = 153, \ - .evYield_Speed = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY),\ - .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_YELLOW, \ - .speciesName = _("Morpeko"), \ - .natDexNum = NATIONAL_DEX_MORPEKO, \ - .categoryName = _("Two-Sided"), \ - .height = 3, \ - .weight = 30, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Morpeko) \ - LEARNSETS(Morpeko), \ - .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, \ + .baseHP = 58, + .baseAttack = 95, + .baseDefense = 58, + .baseSpeed = 97, + .baseSpAttack = 70, + .baseSpDefense = 58, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DARK), + .catchRate = 180, + .expYield = 153, + .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Morpeko"), + .natDexNum = NATIONAL_DEX_MORPEKO, + .categoryName = _("Two-Sided"), + .height = 3, + .weight = 30, + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Morpeko) + LEARNSETS(Morpeko), + .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_HANGRY, .description = COMPOUND_STRING( @@ -4462,31 +4462,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_COPPERAJAH] = { - .baseHP = 122, \ - .baseAttack = 130, \ - .baseDefense = 69, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 69, \ - .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Copperajah"), \ - .cryId = CRY_COPPERAJAH, \ - .natDexNum = NATIONAL_DEX_COPPERAJAH, \ - .categoryName = _("Copperderm"), \ - FOOTPRINT(Copperajah) \ - LEARNSETS(Copperajah), \ - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ + .baseHP = 122, + .baseAttack = 130, + .baseDefense = 69, + .baseSpeed = 30, + .baseSpAttack = 80, + .baseSpDefense = 69, + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_MINERAL), + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Copperajah"), + .cryId = CRY_COPPERAJAH, + .natDexNum = NATIONAL_DEX_COPPERAJAH, + .categoryName = _("Copperderm"), + FOOTPRINT(Copperajah) + LEARNSETS(Copperajah), + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, .formChangeTable = sCopperajahFormChangeTable, .height = 30, .weight = 6500, @@ -4512,31 +4512,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_COPPERAJAH_GIGANTAMAX] = { - .baseHP = 122, \ - .baseAttack = 130, \ - .baseDefense = 69, \ - .baseSpeed = 30, \ - .baseSpAttack = 80, \ - .baseSpDefense = 69, \ - .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_MINERAL), \ - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Copperajah"), \ - .cryId = CRY_COPPERAJAH, \ - .natDexNum = NATIONAL_DEX_COPPERAJAH, \ - .categoryName = _("Copperderm"), \ - FOOTPRINT(Copperajah) \ - LEARNSETS(Copperajah), \ - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, \ + .baseHP = 122, + .baseAttack = 130, + .baseDefense = 69, + .baseSpeed = 30, + .baseSpAttack = 80, + .baseSpDefense = 69, + .types = MON_TYPES(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 = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_MINERAL), + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_HEAVY_METAL }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Copperajah"), + .cryId = CRY_COPPERAJAH, + .natDexNum = NATIONAL_DEX_COPPERAJAH, + .categoryName = _("Copperderm"), + FOOTPRINT(Copperajah) + LEARNSETS(Copperajah), + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, .formChangeTable = sCopperajahFormChangeTable, .height = 230, .weight = 0, @@ -4761,30 +4761,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_DURALUDON [SPECIES_DURALUDON] = { - .baseHP = 70, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 85, \ - .baseSpAttack = 120, \ - .baseSpDefense = 50, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Duraludon"), \ - .cryId = CRY_DURALUDON, \ - .natDexNum = NATIONAL_DEX_DURALUDON, \ - .categoryName = _("Alloy"), \ - FOOTPRINT(Duraludon) \ - LEARNSETS(Duraludon), \ - .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 85, + .baseSpAttack = 120, + .baseSpDefense = 50, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_DRAGON), + .abilities = { ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Duraludon"), + .cryId = CRY_DURALUDON, + .natDexNum = NATIONAL_DEX_DURALUDON, + .categoryName = _("Alloy"), + FOOTPRINT(Duraludon) + LEARNSETS(Duraludon), + .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formChangeTable = sDuraludonFormChangeTable, .height = 18, .weight = 400, @@ -4811,30 +4811,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_DURALUDON_GIGANTAMAX] = { - .baseHP = 70, \ - .baseAttack = 95, \ - .baseDefense = 115, \ - .baseSpeed = 85, \ - .baseSpAttack = 120, \ - .baseSpDefense = 50, \ - .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_DRAGON), \ - .abilities = { ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Duraludon"), \ - .cryId = CRY_DURALUDON, \ - .natDexNum = NATIONAL_DEX_DURALUDON, \ - .categoryName = _("Alloy"), \ - FOOTPRINT(Duraludon) \ - LEARNSETS(Duraludon), \ - .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, \ + .baseHP = 70, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 85, + .baseSpAttack = 120, + .baseSpDefense = 50, + .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_DRAGON), + .abilities = { ABILITY_LIGHT_METAL, ABILITY_HEAVY_METAL, ABILITY_STALWART }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Duraludon"), + .cryId = CRY_DURALUDON, + .natDexNum = NATIONAL_DEX_DURALUDON, + .categoryName = _("Alloy"), + FOOTPRINT(Duraludon) + LEARNSETS(Duraludon), + .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formChangeTable = sDuraludonFormChangeTable, .height = 430, .weight = 0, @@ -5060,27 +5060,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZACIAN [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { - .catchRate = 10, \ - .evYield_Speed = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Zacian"), \ - .natDexNum = NATIONAL_DEX_ZACIAN, \ - .categoryName = _("Warrior"), \ - .height = 28, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zacian) \ - LEARNSETS(Zacian), \ - .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ + .catchRate = 10, + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Zacian"), + .natDexNum = NATIONAL_DEX_ZACIAN, + .categoryName = _("Warrior"), + .height = 28, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zacian) + LEARNSETS(Zacian), + .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, @@ -5109,27 +5109,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZACIAN_CROWNED_SWORD] = { - .catchRate = 10, \ - .evYield_Speed = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .isLegendary = TRUE, \ - .speciesName = _("Zacian"), \ - .natDexNum = NATIONAL_DEX_ZACIAN, \ - .categoryName = _("Warrior"), \ - .height = 28, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zacian) \ - LEARNSETS(Zacian), \ - .formSpeciesIdTable = sZacianFormSpeciesIdTable, \ + .catchRate = 10, + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .isLegendary = TRUE, + .speciesName = _("Zacian"), + .natDexNum = NATIONAL_DEX_ZACIAN, + .categoryName = _("Warrior"), + .height = 28, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zacian) + LEARNSETS(Zacian), + .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 150 : 170, @@ -5161,27 +5161,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZAMAZENTA [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { - .catchRate = 10, \ - .evYield_Speed = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isLegendary = TRUE, \ - .speciesName = _("Zamazenta"), \ - .natDexNum = NATIONAL_DEX_ZAMAZENTA, \ - .categoryName = _("Warrior"), \ - .height = 29, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zamazenta) \ - LEARNSETS(Zamazenta), \ - .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ + .catchRate = 10, + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isLegendary = TRUE, + .speciesName = _("Zamazenta"), + .natDexNum = NATIONAL_DEX_ZAMAZENTA, + .categoryName = _("Warrior"), + .height = 29, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zamazenta) + LEARNSETS(Zamazenta), + .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, @@ -5211,27 +5211,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { - .catchRate = 10, \ - .evYield_Speed = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_RED, \ - .isLegendary = TRUE, \ - .speciesName = _("Zamazenta"), \ - .natDexNum = NATIONAL_DEX_ZAMAZENTA, \ - .categoryName = _("Warrior"), \ - .height = 29, \ - .pokemonScale = 275, \ - .pokemonOffset = 7, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FOOTPRINT(Zamazenta) \ - LEARNSETS(Zamazenta), \ - .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, \ + .catchRate = 10, + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, + .isLegendary = TRUE, + .speciesName = _("Zamazenta"), + .natDexNum = NATIONAL_DEX_ZAMAZENTA, + .categoryName = _("Warrior"), + .height = 29, + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, + FOOTPRINT(Zamazenta) + LEARNSETS(Zamazenta), + .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, @@ -5263,22 +5263,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ETERNATUS [SPECIES_ETERNATUS] = { - .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), \ - .catchRate = 255, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .isLegendary = TRUE, \ - .speciesName = _("Eternatus"), \ - .natDexNum = NATIONAL_DEX_ETERNATUS, \ - .categoryName = _("Gigantic"), \ - FOOTPRINT(Eternatus) \ - LEARNSETS(Eternatus), \ + .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), + .catchRate = 255, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, + .isLegendary = TRUE, + .speciesName = _("Eternatus"), + .natDexNum = NATIONAL_DEX_ETERNATUS, + .categoryName = _("Gigantic"), + FOOTPRINT(Eternatus) + LEARNSETS(Eternatus), .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 140, .baseAttack = 85, @@ -5313,22 +5313,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ETERNATUS_ETERNAMAX] = { - .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), \ - .catchRate = 255, \ - .evYield_HP = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_PURPLE, \ - .isLegendary = TRUE, \ - .speciesName = _("Eternatus"), \ - .natDexNum = NATIONAL_DEX_ETERNATUS, \ - .categoryName = _("Gigantic"), \ - FOOTPRINT(Eternatus) \ - LEARNSETS(Eternatus), \ + .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), + .catchRate = 255, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, + .isLegendary = TRUE, + .speciesName = _("Eternatus"), + .natDexNum = NATIONAL_DEX_ETERNATUS, + .categoryName = _("Gigantic"), + FOOTPRINT(Eternatus) + LEARNSETS(Eternatus), .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 255, .baseAttack = 115, @@ -5416,30 +5416,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK),\ - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, \ - LEARNSETS(UrshifuSingleStrikeStyle), \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .isLegendary = TRUE, \ - .speciesName = _("Urshifu"), \ - .natDexNum = NATIONAL_DEX_URSHIFU, \ - .categoryName = _("Wushu"), \ - FOOTPRINT(Urshifu) \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + LEARNSETS(UrshifuSingleStrikeStyle), + .baseHP = 100, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 97, + .baseSpAttack = 63, + .baseSpDefense = 60, + .catchRate = 3, + .expYield = 275, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 120, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .isLegendary = TRUE, + .speciesName = _("Urshifu"), + .natDexNum = NATIONAL_DEX_URSHIFU, + .categoryName = _("Wushu"), + FOOTPRINT(Urshifu) .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, @@ -5467,30 +5467,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK),\ - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, \ - LEARNSETS(UrshifuSingleStrikeStyle), \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .isLegendary = TRUE, \ - .speciesName = _("Urshifu"), \ - .natDexNum = NATIONAL_DEX_URSHIFU, \ - .categoryName = _("Wushu"), \ - FOOTPRINT(Urshifu) \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + LEARNSETS(UrshifuSingleStrikeStyle), + .baseHP = 100, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 97, + .baseSpAttack = 63, + .baseSpDefense = 60, + .catchRate = 3, + .expYield = 275, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 120, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .isLegendary = TRUE, + .speciesName = _("Urshifu"), + .natDexNum = NATIONAL_DEX_URSHIFU, + .categoryName = _("Wushu"), + FOOTPRINT(Urshifu) .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 290, .weight = 0, @@ -5518,30 +5518,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), \ - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, \ - LEARNSETS(UrshifuRapidStrikeStyle), \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .isLegendary = TRUE, \ - .speciesName = _("Urshifu"), \ - .natDexNum = NATIONAL_DEX_URSHIFU, \ - .categoryName = _("Wushu"), \ - FOOTPRINT(Urshifu) \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + LEARNSETS(UrshifuRapidStrikeStyle), + .baseHP = 100, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 97, + .baseSpAttack = 63, + .baseSpDefense = 60, + .catchRate = 3, + .expYield = 275, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 120, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .isLegendary = TRUE, + .speciesName = _("Urshifu"), + .natDexNum = NATIONAL_DEX_URSHIFU, + .categoryName = _("Wushu"), + FOOTPRINT(Urshifu) .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, @@ -5569,30 +5569,30 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), \ - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, \ - LEARNSETS(UrshifuRapidStrikeStyle), \ - .baseHP = 100, \ - .baseAttack = 130, \ - .baseDefense = 100, \ - .baseSpeed = 97, \ - .baseSpAttack = 63, \ - .baseSpDefense = 60, \ - .catchRate = 3, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = PERCENT_FEMALE(12.5), \ - .eggCycles = 120, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GRAY, \ - .isLegendary = TRUE, \ - .speciesName = _("Urshifu"), \ - .natDexNum = NATIONAL_DEX_URSHIFU, \ - .categoryName = _("Wushu"), \ - FOOTPRINT(Urshifu) \ + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + LEARNSETS(UrshifuRapidStrikeStyle), + .baseHP = 100, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 97, + .baseSpAttack = 63, + .baseSpDefense = 60, + .catchRate = 3, + .expYield = 275, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 120, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .isLegendary = TRUE, + .speciesName = _("Urshifu"), + .natDexNum = NATIONAL_DEX_URSHIFU, + .categoryName = _("Wushu"), + FOOTPRINT(Urshifu) .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 260, .weight = 0, @@ -5623,36 +5623,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZARUDE [SPECIES_ZARUDE] = { - .baseHP = 105, \ - .baseAttack = 120, \ - .baseDefense = 105, \ - .baseSpeed = 105, \ - .baseSpAttack = 70, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_DARK, TYPE_GRASS), \ - .catchRate = 3, \ - .expYield = 300, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .isMythical = TRUE, \ - .speciesName = _("Zarude"), \ - .cryId = CRY_ZARUDE, \ - .natDexNum = NATIONAL_DEX_ZARUDE, \ - .categoryName = _("Rogue Monkey"), \ - .height = 18, \ - .weight = 700, \ - .pokemonScale = 267, \ - .pokemonOffset = 2, \ - .trainerScale = 286, \ - .trainerOffset = 1, \ - FOOTPRINT(Zarude) \ - LEARNSETS(Zarude), \ + .baseHP = 105, + .baseAttack = 120, + .baseDefense = 105, + .baseSpeed = 105, + .baseSpAttack = 70, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DARK, TYPE_GRASS), + .catchRate = 3, + .expYield = 300, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GREEN, + .isMythical = TRUE, + .speciesName = _("Zarude"), + .cryId = CRY_ZARUDE, + .natDexNum = NATIONAL_DEX_ZARUDE, + .categoryName = _("Rogue Monkey"), + .height = 18, + .weight = 700, + .pokemonScale = 267, + .pokemonOffset = 2, + .trainerScale = 286, + .trainerOffset = 1, + FOOTPRINT(Zarude) + LEARNSETS(Zarude), .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "Within dense forests, this Pokémon lives\n" @@ -5671,36 +5671,36 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = }, [SPECIES_ZARUDE_DADA] = { - .baseHP = 105, \ - .baseAttack = 120, \ - .baseDefense = 105, \ - .baseSpeed = 105, \ - .baseSpAttack = 70, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_DARK, TYPE_GRASS), \ - .catchRate = 3, \ - .expYield = 300, \ - .evYield_Attack = 3, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 120, \ - .friendship = 0, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .isMythical = TRUE, \ - .speciesName = _("Zarude"), \ - .cryId = CRY_ZARUDE, \ - .natDexNum = NATIONAL_DEX_ZARUDE, \ - .categoryName = _("Rogue Monkey"), \ - .height = 18, \ - .weight = 700, \ - .pokemonScale = 267, \ - .pokemonOffset = 2, \ - .trainerScale = 286, \ - .trainerOffset = 1, \ - FOOTPRINT(Zarude) \ - LEARNSETS(Zarude), \ + .baseHP = 105, + .baseAttack = 120, + .baseDefense = 105, + .baseSpeed = 105, + .baseSpAttack = 70, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DARK, TYPE_GRASS), + .catchRate = 3, + .expYield = 300, + .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GREEN, + .isMythical = TRUE, + .speciesName = _("Zarude"), + .cryId = CRY_ZARUDE, + .natDexNum = NATIONAL_DEX_ZARUDE, + .categoryName = _("Rogue Monkey"), + .height = 18, + .weight = 700, + .pokemonScale = 267, + .pokemonOffset = 2, + .trainerScale = 286, + .trainerOffset = 1, + FOOTPRINT(Zarude) + LEARNSETS(Zarude), .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "This Zarude's special strength\n" @@ -5923,10 +5923,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_CALYREX [SPECIES_CALYREX] = { - .speciesName = _("Calyrex"), \ - .natDexNum = NATIONAL_DEX_CALYREX, \ - FOOTPRINT(Calyrex) \ - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 100, .baseAttack = 80, @@ -5973,10 +5973,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FUSION_FORMS [SPECIES_CALYREX_ICE_RIDER] = { - .speciesName = _("Calyrex"), \ - .natDexNum = NATIONAL_DEX_CALYREX, \ - FOOTPRINT(Calyrex) \ - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 100, .baseAttack = 165, @@ -6023,10 +6023,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CALYREX_SHADOW_RIDER] = { - .speciesName = _("Calyrex"), \ - .natDexNum = NATIONAL_DEX_CALYREX, \ - FOOTPRINT(Calyrex) \ - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, \ + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 100, .baseAttack = 85, @@ -6076,27 +6076,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ENAMORUS [SPECIES_ENAMORUS_INCARNATE] = { - .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = 116, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PINK, \ - .isLegendary = TRUE, \ - .speciesName = _("Enamorus"), \ - .natDexNum = NATIONAL_DEX_ENAMORUS, \ - .categoryName = _("Love-Hate"), \ - .height = 16, \ - .weight = 480, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - LEARNSETS(Enamorus), \ + .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), + .catchRate = 3, + .expYield = 116, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PINK, + .isLegendary = TRUE, + .speciesName = _("Enamorus"), + .natDexNum = NATIONAL_DEX_ENAMORUS, + .categoryName = _("Love-Hate"), + .height = 16, + .weight = 480, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + LEARNSETS(Enamorus), .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, @@ -6126,27 +6126,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ENAMORUS_THERIAN] = { - .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), \ - .catchRate = 3, \ - .expYield = 116, \ - .evYield_SpAttack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_PINK, \ - .isLegendary = TRUE, \ - .speciesName = _("Enamorus"), \ - .natDexNum = NATIONAL_DEX_ENAMORUS, \ - .categoryName = _("Love-Hate"), \ - .height = 16, \ - .weight = 480, \ - .pokemonScale = 259, \ - .pokemonOffset = 1, \ - .trainerScale = 296, \ - .trainerOffset = 1, \ - LEARNSETS(Enamorus), \ + .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), + .catchRate = 3, + .expYield = 116, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_PINK, + .isLegendary = TRUE, + .speciesName = _("Enamorus"), + .natDexNum = NATIONAL_DEX_ENAMORUS, + .categoryName = _("Love-Hate"), + .height = 16, + .weight = 480, + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, + LEARNSETS(Enamorus), .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index e909de42852d..3d5987283ba4 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -490,25 +490,25 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_OINKOLOGNE_MALE] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 100, \ - .expYield = 171, \ - .evYield_HP = 2, \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Oinkologne"), \ - .natDexNum = NATIONAL_DEX_OINKOLOGNE, \ - .categoryName = _("Hog"), \ - .height = 10, \ - .weight = 1200, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .teachableLearnset = sOinkologneTeachableLearnset, \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 100, + .expYield = 171, + .evYield_HP = 2, + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Oinkologne"), + .natDexNum = NATIONAL_DEX_OINKOLOGNE, + .categoryName = _("Hog"), + .height = 10, + .weight = 1200, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .teachableLearnset = sOinkologneTeachableLearnset, .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, .baseHP = 110, .baseAttack = 100, @@ -538,25 +538,25 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_OINKOLOGNE_FEMALE] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 100, \ - .expYield = 171, \ - .evYield_HP = 2, \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), \ - .bodyColor = BODY_COLOR_GRAY, \ - .speciesName = _("Oinkologne"), \ - .natDexNum = NATIONAL_DEX_OINKOLOGNE, \ - .categoryName = _("Hog"), \ - .height = 10, \ - .weight = 1200, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .teachableLearnset = sOinkologneTeachableLearnset, \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 100, + .expYield = 171, + .evYield_HP = 2, + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .bodyColor = BODY_COLOR_GRAY, + .speciesName = _("Oinkologne"), + .natDexNum = NATIONAL_DEX_OINKOLOGNE, + .categoryName = _("Hog"), + .height = 10, + .weight = 1200, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .teachableLearnset = sOinkologneTeachableLearnset, .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, .baseHP = 115, .baseAttack = 90, @@ -977,39 +977,39 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_MAUSHOLD_FAMILY_OF_THREE] = { - .baseHP = 74, \ - .baseAttack = 75, \ - .baseDefense = 70, \ - .baseSpeed = 111, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 75, \ - .expYield = 165, \ - .evYield_Speed = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ - .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Maushold"), \ - .natDexNum = NATIONAL_DEX_MAUSHOLD, \ - .categoryName = _("Family"), \ - .height = 3, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 15, \ - .frontAnimFrames = sAnims_Maushold, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backPicYOffset = 15, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(Maushold), \ - /*FOOTPRINT(Maushold)*/ \ - LEARNSETS(Maushold), \ + .baseHP = 74, + .baseAttack = 75, + .baseDefense = 70, + .baseSpeed = 111, + .baseSpAttack = 65, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 75, + .expYield = 165, + .evYield_Speed = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Maushold"), + .natDexNum = NATIONAL_DEX_MAUSHOLD, + .categoryName = _("Family"), + .height = 3, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 15, + .frontAnimFrames = sAnims_Maushold, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPicYOffset = 15, + /*.backAnimId = BACK_ANIM_NONE,*/ + PALETTES(Maushold), + /*FOOTPRINT(Maushold)*/ + LEARNSETS(Maushold), .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, .weight = 23, @@ -1024,39 +1024,39 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { - .baseHP = 74, \ - .baseAttack = 75, \ - .baseDefense = 70, \ - .baseSpeed = 111, \ - .baseSpAttack = 65, \ - .baseSpDefense = 75, \ - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 75, \ - .expYield = 165, \ - .evYield_Speed = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), \ - .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, \ - .bodyColor = BODY_COLOR_WHITE, \ - .speciesName = _("Maushold"), \ - .natDexNum = NATIONAL_DEX_MAUSHOLD, \ - .categoryName = _("Family"), \ - .height = 3, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 15, \ - .frontAnimFrames = sAnims_Maushold, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backPicYOffset = 15, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(Maushold), \ - /*FOOTPRINT(Maushold)*/ \ - LEARNSETS(Maushold), \ + .baseHP = 74, + .baseAttack = 75, + .baseDefense = 70, + .baseSpeed = 111, + .baseSpAttack = 65, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 75, + .expYield = 165, + .evYield_Speed = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 10, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Maushold"), + .natDexNum = NATIONAL_DEX_MAUSHOLD, + .categoryName = _("Family"), + .height = 3, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 15, + .frontAnimFrames = sAnims_Maushold, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPicYOffset = 15, + /*.backAnimId = BACK_ANIM_NONE,*/ + PALETTES(Maushold), + /*FOOTPRINT(Maushold)*/ + LEARNSETS(Maushold), .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, .weight = 28, @@ -1316,40 +1316,40 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_SQUAWKABILLY [SPECIES_SQUAWKABILLY_GREEN_PLUMAGE] = { - .baseHP = 82, \ - .baseAttack = 96, \ - .baseDefense = 51, \ - .baseSpeed = 92, \ - .baseSpAttack = 45, \ - .baseSpDefense = 51, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ - .catchRate = 190, \ - .expYield = 146, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Sqawkabily"), \ - .cryId = CRY_SQUAWKABILLY, \ - .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ - .categoryName = _("Parrot"), \ - .height = 6, \ - .weight = 24, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Squawkabilly, 64, 64), \ - .frontPicYOffset = 4, \ - .frontAnimFrames = sAnims_Squawkabilly, \ + .baseHP = 82, + .baseAttack = 96, + .baseDefense = 51, + .baseSpeed = 92, + .baseSpAttack = 45, + .baseSpDefense = 51, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 190, + .expYield = 146, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Sqawkabily"), + .cryId = CRY_SQUAWKABILLY, + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, + .categoryName = _("Parrot"), + .height = 6, + .weight = 24, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Squawkabilly, 64, 64), + .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), \ - .backPicYOffset = 4, \ + BACK_PIC(Squawkabilly, 64, 64), + .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), \ + LEARNSETS(Squawkabilly), .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_GREEN, @@ -1364,40 +1364,40 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = { - .baseHP = 82, \ - .baseAttack = 96, \ - .baseDefense = 51, \ - .baseSpeed = 92, \ - .baseSpAttack = 45, \ - .baseSpDefense = 51, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ - .catchRate = 190, \ - .expYield = 146, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Sqawkabily"), \ - .cryId = CRY_SQUAWKABILLY, \ - .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ - .categoryName = _("Parrot"), \ - .height = 6, \ - .weight = 24, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Squawkabilly, 64, 64), \ - .frontPicYOffset = 4, \ - .frontAnimFrames = sAnims_Squawkabilly, \ + .baseHP = 82, + .baseAttack = 96, + .baseDefense = 51, + .baseSpeed = 92, + .baseSpAttack = 45, + .baseSpDefense = 51, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 190, + .expYield = 146, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Sqawkabily"), + .cryId = CRY_SQUAWKABILLY, + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, + .categoryName = _("Parrot"), + .height = 6, + .weight = 24, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Squawkabilly, 64, 64), + .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), \ - .backPicYOffset = 4, \ + BACK_PIC(Squawkabilly, 64, 64), + .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), \ + LEARNSETS(Squawkabilly), .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_BLUE, @@ -1412,40 +1412,40 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = { - .baseHP = 82, \ - .baseAttack = 96, \ - .baseDefense = 51, \ - .baseSpeed = 92, \ - .baseSpAttack = 45, \ - .baseSpDefense = 51, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ - .catchRate = 190, \ - .expYield = 146, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Sqawkabily"), \ - .cryId = CRY_SQUAWKABILLY, \ - .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ - .categoryName = _("Parrot"), \ - .height = 6, \ - .weight = 24, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Squawkabilly, 64, 64), \ - .frontPicYOffset = 4, \ - .frontAnimFrames = sAnims_Squawkabilly, \ + .baseHP = 82, + .baseAttack = 96, + .baseDefense = 51, + .baseSpeed = 92, + .baseSpAttack = 45, + .baseSpDefense = 51, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 190, + .expYield = 146, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Sqawkabily"), + .cryId = CRY_SQUAWKABILLY, + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, + .categoryName = _("Parrot"), + .height = 6, + .weight = 24, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Squawkabilly, 64, 64), + .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), \ - .backPicYOffset = 4, \ + BACK_PIC(Squawkabilly, 64, 64), + .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), \ + LEARNSETS(Squawkabilly), .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_YELLOW, @@ -1460,40 +1460,40 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = { - .baseHP = 82, \ - .baseAttack = 96, \ - .baseDefense = 51, \ - .baseSpeed = 92, \ - .baseSpAttack = 45, \ - .baseSpDefense = 51, \ - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), \ - .catchRate = 190, \ - .expYield = 146, \ - .evYield_Attack = 1, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 15, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_ERRATIC, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), \ - .speciesName = _("Sqawkabily"), \ - .cryId = CRY_SQUAWKABILLY, \ - .natDexNum = NATIONAL_DEX_SQUAWKABILLY, \ - .categoryName = _("Parrot"), \ - .height = 6, \ - .weight = 24, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Squawkabilly, 64, 64), \ - .frontPicYOffset = 4, \ - .frontAnimFrames = sAnims_Squawkabilly, \ + .baseHP = 82, + .baseAttack = 96, + .baseDefense = 51, + .baseSpeed = 92, + .baseSpAttack = 45, + .baseSpDefense = 51, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 190, + .expYield = 146, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_ERRATIC, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .speciesName = _("Sqawkabily"), + .cryId = CRY_SQUAWKABILLY, + .natDexNum = NATIONAL_DEX_SQUAWKABILLY, + .categoryName = _("Parrot"), + .height = 6, + .weight = 24, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Squawkabilly, 64, 64), + .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), \ - .backPicYOffset = 4, \ + BACK_PIC(Squawkabilly, 64, 64), + .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), \ + LEARNSETS(Squawkabilly), .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_WHITE, @@ -3060,27 +3060,27 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_PALAFIN_ZERO] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 45, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_WATER_2),\ - .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Palafin"), \ - .natDexNum = NATIONAL_DEX_PALAFIN, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Palafin, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_WATER_2), + .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Palafin"), + .natDexNum = NATIONAL_DEX_PALAFIN, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ /*FOOTPRINT(Palafin)*/ - LEARNSETS(Palafin), \ - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ + LEARNSETS(Palafin), + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, .baseAttack = 70, @@ -3109,27 +3109,27 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_PALAFIN_HERO] = { - .types = MON_TYPES(TYPE_WATER), \ - .catchRate = 45, \ - .evYield_HP = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 40, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_WATER_2),\ - .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Palafin"), \ - .natDexNum = NATIONAL_DEX_PALAFIN, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontAnimFrames = sAnims_Palafin, \ + .types = MON_TYPES(TYPE_WATER), + .catchRate = 45, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_WATER_2), + .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Palafin"), + .natDexNum = NATIONAL_DEX_PALAFIN, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ /*FOOTPRINT(Palafin)*/ - LEARNSETS(Palafin), \ - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, \ + LEARNSETS(Palafin), + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, .baseAttack = 160, @@ -3797,38 +3797,38 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_TATSUGIRI [SPECIES_TATSUGIRI_CURLY] = { - .baseHP = 68, \ - .baseAttack = 50, \ - .baseDefense = 60, \ - .baseSpeed = 82, \ - .baseSpAttack = 120, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), \ - .catchRate = 100, \ - .expYield = 166, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, \ - .speciesName = _("Tatsugiri"), \ - .natDexNum = NATIONAL_DEX_TATSUGIRI, \ - .categoryName = _("Mimicry"), \ - .height = 3, \ - .weight = 80, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 14, \ - .frontAnimFrames = sAnims_Tatsugiri, \ + .baseHP = 68, + .baseAttack = 50, + .baseDefense = 60, + .baseSpeed = 82, + .baseSpAttack = 120, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), + .catchRate = 100, + .expYield = 166, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .speciesName = _("Tatsugiri"), + .natDexNum = NATIONAL_DEX_TATSUGIRI, + .categoryName = _("Mimicry"), + .height = 3, + .weight = 80, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 14, + .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, \ + .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), \ + LEARNSETS(Tatsugiri), .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .cryId = CRY_TATSUGIRI_CURLY, @@ -3845,38 +3845,38 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TATSUGIRI_DROOPY] = { - .baseHP = 68, \ - .baseAttack = 50, \ - .baseDefense = 60, \ - .baseSpeed = 82, \ - .baseSpAttack = 120, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), \ - .catchRate = 100, \ - .expYield = 166, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, \ - .speciesName = _("Tatsugiri"), \ - .natDexNum = NATIONAL_DEX_TATSUGIRI, \ - .categoryName = _("Mimicry"), \ - .height = 3, \ - .weight = 80, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 14, \ - .frontAnimFrames = sAnims_Tatsugiri, \ + .baseHP = 68, + .baseAttack = 50, + .baseDefense = 60, + .baseSpeed = 82, + .baseSpAttack = 120, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), + .catchRate = 100, + .expYield = 166, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .speciesName = _("Tatsugiri"), + .natDexNum = NATIONAL_DEX_TATSUGIRI, + .categoryName = _("Mimicry"), + .height = 3, + .weight = 80, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 14, + .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, \ + .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), \ + LEARNSETS(Tatsugiri), .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .cryId = CRY_TATSUGIRI_DROOPY, @@ -3892,38 +3892,38 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TATSUGIRI_STRETCHY] = { - .baseHP = 68, \ - .baseAttack = 50, \ - .baseDefense = 60, \ - .baseSpeed = 82, \ - .baseSpAttack = 120, \ - .baseSpDefense = 95, \ - .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), \ - .catchRate = 100, \ - .expYield = 166, \ - .evYield_SpAttack = 2, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 35, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), \ - .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, \ - .speciesName = _("Tatsugiri"), \ - .natDexNum = NATIONAL_DEX_TATSUGIRI, \ - .categoryName = _("Mimicry"), \ - .height = 3, \ - .weight = 80, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPicYOffset = 14, \ - .frontAnimFrames = sAnims_Tatsugiri, \ + .baseHP = 68, + .baseAttack = 50, + .baseDefense = 60, + .baseSpeed = 82, + .baseSpAttack = 120, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_WATER), + .catchRate = 100, + .expYield = 166, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 35, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .speciesName = _("Tatsugiri"), + .natDexNum = NATIONAL_DEX_TATSUGIRI, + .categoryName = _("Mimicry"), + .height = 3, + .weight = 80, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + .frontPicYOffset = 14, + .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, \ + .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), \ + LEARNSETS(Tatsugiri), .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_TATSUGIRI_STRETCHY, @@ -4690,24 +4690,24 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_GIMMIGHOUL [SPECIES_GIMMIGHOUL_CHEST] = { - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = 60, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 50, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Gimmighoul"), \ - .cryId = CRY_GIMMIGHOUL, \ - .natDexNum = NATIONAL_DEX_GIMMIGHOUL, \ - .frontAnimFrames = sAnims_Gimmighoul, \ + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 45, + .expYield = 60, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Gimmighoul"), + .cryId = CRY_GIMMIGHOUL, + .natDexNum = NATIONAL_DEX_GIMMIGHOUL, + .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Gimmighoul) - LEARNSETS(Gimmighoul), \ - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, \ + LEARNSETS(Gimmighoul), + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, .baseAttack = 30, @@ -4739,24 +4739,24 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_GIMMIGHOUL_ROAMING] = { - .types = MON_TYPES(TYPE_GHOST), \ - .catchRate = 45, \ - .expYield = 60, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 50, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .speciesName = _("Gimmighoul"), \ - .cryId = CRY_GIMMIGHOUL, \ - .natDexNum = NATIONAL_DEX_GIMMIGHOUL, \ - .frontAnimFrames = sAnims_Gimmighoul, \ + .types = MON_TYPES(TYPE_GHOST), + .catchRate = 45, + .expYield = 60, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 50, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .speciesName = _("Gimmighoul"), + .cryId = CRY_GIMMIGHOUL, + .natDexNum = NATIONAL_DEX_GIMMIGHOUL, + .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Gimmighoul) - LEARNSETS(Gimmighoul), \ - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, \ + LEARNSETS(Gimmighoul), + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, .baseAttack = 30, @@ -5338,43 +5338,43 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_POLTCHAGEIST [SPECIES_POLTCHAGEIST_COUNTERFEIT] = { - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 74, \ - .baseSpDefense = 54, \ - .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ - .catchRate = 120, \ - .expYield = 62, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Ptchageist"), \ - .cryId = CRY_POLTCHAGEIST, \ - .natDexNum = NATIONAL_DEX_POLTCHAGEIST, \ - .categoryName = _("Matcha"), \ - .height = 1, \ - .weight = 11, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Poltchageist, 64, 64), \ - .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Poltchageist, \ + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 74, + .baseSpDefense = 54, + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), + .catchRate = 120, + .expYield = 62, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Ptchageist"), + .cryId = CRY_POLTCHAGEIST, + .natDexNum = NATIONAL_DEX_POLTCHAGEIST, + .categoryName = _("Matcha"), + .height = 1, + .weight = 11, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Poltchageist, 64, 64), + .frontPicYOffset = 7, + .frontAnimFrames = sAnims_Poltchageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 10, \ - BACK_PIC(Poltchageist, 64, 64), \ - .backPicYOffset = 5, \ + .enemyMonElevation = 10, + BACK_PIC(Poltchageist, 64, 64), + .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Poltchageist), \ - ICON(Poltchageist, 4), \ + PALETTES(Poltchageist), + ICON(Poltchageist, 4), //FOOTPRINT(Poltchageist) LEARNSETS(Poltchageist), .description = COMPOUND_STRING( @@ -5386,43 +5386,43 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_POLTCHAGEIST_ARTISAN] = { - .baseHP = 40, \ - .baseAttack = 45, \ - .baseDefense = 45, \ - .baseSpeed = 50, \ - .baseSpAttack = 74, \ - .baseSpDefense = 54, \ - .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ - .catchRate = 120, \ - .expYield = 62, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Ptchageist"), \ - .cryId = CRY_POLTCHAGEIST, \ - .natDexNum = NATIONAL_DEX_POLTCHAGEIST, \ - .categoryName = _("Matcha"), \ - .height = 1, \ - .weight = 11, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Poltchageist, 64, 64), \ - .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Poltchageist, \ + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 74, + .baseSpDefense = 54, + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), + .catchRate = 120, + .expYield = 62, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Ptchageist"), + .cryId = CRY_POLTCHAGEIST, + .natDexNum = NATIONAL_DEX_POLTCHAGEIST, + .categoryName = _("Matcha"), + .height = 1, + .weight = 11, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Poltchageist, 64, 64), + .frontPicYOffset = 7, + .frontAnimFrames = sAnims_Poltchageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 10, \ - BACK_PIC(Poltchageist, 64, 64), \ - .backPicYOffset = 5, \ + .enemyMonElevation = 10, + BACK_PIC(Poltchageist, 64, 64), + .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Poltchageist), \ - ICON(Poltchageist, 4), \ + PALETTES(Poltchageist), + ICON(Poltchageist, 4), //FOOTPRINT(Poltchageist) LEARNSETS(Poltchageist), .description = COMPOUND_STRING( @@ -5435,43 +5435,43 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_SINISTCHA_UNREMARKABLE] = { - .baseHP = 71, \ - .baseAttack = 60, \ - .baseDefense = 106, \ - .baseSpeed = 70, \ - .baseSpAttack = 121, \ - .baseSpDefense = 80, \ - .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ - .catchRate = 60, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sinistcha"), \ - .cryId = CRY_SINISTCHA, \ - .natDexNum = NATIONAL_DEX_SINISTCHA, \ - .categoryName = _("Matcha"), \ - .height = 2, \ - .weight = 22, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Sinistcha, 64, 64), \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Sinistcha, \ + .baseHP = 71, + .baseAttack = 60, + .baseDefense = 106, + .baseSpeed = 70, + .baseSpAttack = 121, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), + .catchRate = 60, + .expYield = 178, + .evYield_SpAttack = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sinistcha"), + .cryId = CRY_SINISTCHA, + .natDexNum = NATIONAL_DEX_SINISTCHA, + .categoryName = _("Matcha"), + .height = 2, + .weight = 22, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Sinistcha, 64, 64), + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 10, \ - BACK_PIC(Sinistcha, 64, 64), \ - .backPicYOffset = 13, \ + .enemyMonElevation = 10, + BACK_PIC(Sinistcha, 64, 64), + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistcha), \ - ICON(Sinistcha, 1), \ + PALETTES(Sinistcha), + ICON(Sinistcha, 1), //FOOTPRINT(Sinistcha) LEARNSETS(Sinistcha), .description = COMPOUND_STRING( @@ -5482,43 +5482,43 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = }, [SPECIES_SINISTCHA_MASTERPIECE] = { - .baseHP = 71, \ - .baseAttack = 60, \ - .baseDefense = 106, \ - .baseSpeed = 70, \ - .baseSpAttack = 121, \ - .baseSpDefense = 80, \ - .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), \ - .catchRate = 60, \ - .expYield = 178, \ - .evYield_SpAttack = 2, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 20, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_MEDIUM_FAST, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), \ - .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, \ - .bodyColor = BODY_COLOR_GREEN, \ - .speciesName = _("Sinistcha"), \ - .cryId = CRY_SINISTCHA, \ - .natDexNum = NATIONAL_DEX_SINISTCHA, \ - .categoryName = _("Matcha"), \ - .height = 2, \ - .weight = 22, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Sinistcha, 64, 64), \ - .frontPicYOffset = 10, \ - .frontAnimFrames = sAnims_Sinistcha, \ + .baseHP = 71, + .baseAttack = 60, + .baseDefense = 106, + .baseSpeed = 70, + .baseSpAttack = 121, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), + .catchRate = 60, + .expYield = 178, + .evYield_SpAttack = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Sinistcha"), + .cryId = CRY_SINISTCHA, + .natDexNum = NATIONAL_DEX_SINISTCHA, + .categoryName = _("Matcha"), + .height = 2, + .weight = 22, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + FRONT_PIC(Sinistcha, 64, 64), + .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 10, \ - BACK_PIC(Sinistcha, 64, 64), \ - .backPicYOffset = 13, \ + .enemyMonElevation = 10, + BACK_PIC(Sinistcha, 64, 64), + .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistcha), \ - ICON(Sinistcha, 1), \ + PALETTES(Sinistcha), + ICON(Sinistcha, 1), //FOOTPRINT(Sinistcha) LEARNSETS(Sinistcha), .description = COMPOUND_STRING( @@ -5942,22 +5942,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_TERAPAGOS [SPECIES_TERAPAGOS_NORMAL] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 255, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 5, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Terapagos"), \ - .cryId = CRY_TERAPAGOS, \ - .natDexNum = NATIONAL_DEX_TERAPAGOS, \ - .categoryName = _("Tera"), \ - LEARNSETS(Terapagos), \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 255, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 5, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Terapagos"), + .cryId = CRY_TERAPAGOS, + .natDexNum = NATIONAL_DEX_TERAPAGOS, + .categoryName = _("Tera"), + LEARNSETS(Terapagos), //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ - .formChangeTable = sTerapagosFormChangeTable, \ + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, .isLegendary = TRUE, .baseHP = 90, .baseAttack = 65, @@ -5992,22 +5992,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_TERASTAL] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 255, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 5, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Terapagos"), \ - .cryId = CRY_TERAPAGOS, \ - .natDexNum = NATIONAL_DEX_TERAPAGOS, \ - .categoryName = _("Tera"), \ - LEARNSETS(Terapagos), \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 255, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 5, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Terapagos"), + .cryId = CRY_TERAPAGOS, + .natDexNum = NATIONAL_DEX_TERAPAGOS, + .categoryName = _("Tera"), + LEARNSETS(Terapagos), //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ - .formChangeTable = sTerapagosFormChangeTable, \ + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, .isLegendary = TRUE, .baseHP = 95, .baseAttack = 95, @@ -6043,22 +6043,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_STELLAR] = { - .types = MON_TYPES(TYPE_NORMAL), \ - .catchRate = 255, \ - .genderRatio = PERCENT_FEMALE(50), \ - .eggCycles = 5, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .bodyColor = BODY_COLOR_BLUE, \ - .speciesName = _("Terapagos"), \ - .cryId = CRY_TERAPAGOS, \ - .natDexNum = NATIONAL_DEX_TERAPAGOS, \ - .categoryName = _("Tera"), \ - LEARNSETS(Terapagos), \ + .types = MON_TYPES(TYPE_NORMAL), + .catchRate = 255, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 5, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Terapagos"), + .cryId = CRY_TERAPAGOS, + .natDexNum = NATIONAL_DEX_TERAPAGOS, + .categoryName = _("Tera"), + LEARNSETS(Terapagos), //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ - .formChangeTable = sTerapagosFormChangeTable, \ + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, .isLegendary = TRUE, .baseHP = 160, .baseAttack = 105, From 54fcf2d3856ac20db0653cebe77ae5eab2f6e317 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 12 Mar 2024 10:44:30 -0300 Subject: [PATCH 13/23] Expanded macros for sprites, pals, icons and learnsets (using shasum) --- src/data/pokemon/species_info.h | 84 +- src/data/pokemon/species_info/gen_1.h | 4194 ++++++++++++++++--------- src/data/pokemon/species_info/gen_2.h | 1815 +++++++---- src/data/pokemon/species_info/gen_3.h | 2685 ++++++++++------ src/data/pokemon/species_info/gen_4.h | 1596 ++++++---- src/data/pokemon/species_info/gen_5.h | 2850 +++++++++++------ src/data/pokemon/species_info/gen_6.h | 1383 +++++--- src/data/pokemon/species_info/gen_7.h | 1541 ++++++--- src/data/pokemon/species_info/gen_8.h | 1890 +++++++---- src/data/pokemon/species_info/gen_9.h | 1866 +++++++---- 10 files changed, 13237 insertions(+), 6667 deletions(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 7c58669066ff..ac7e2c5d582e 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -181,42 +181,6 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _( #define EVOLUTION(...) (const struct Evolution[]) { __VA_ARGS__, { EVOLUTIONS_END }, } -#define FRONT_PIC(sprite, width, height) \ - .frontPic = gMonFrontPic_## sprite, \ - .frontPicSize = MON_COORDS_SIZE(width, height) - -#define FRONT_PIC_FEMALE(sprite, width, height) \ - .frontPicFemale = gMonFrontPic_## sprite##F, \ - .frontPicSizeFemale = MON_COORDS_SIZE(width, height) - -#define BACK_PIC(sprite, width, height) \ - .backPic = gMonBackPic_## sprite, \ - .backPicSize = MON_COORDS_SIZE(width, height) - -#define BACK_PIC_FEMALE(sprite, width, height) \ - .backPicFemale = gMonBackPic_## sprite##F, \ - .backPicSizeFemale = MON_COORDS_SIZE(width, height) - -#define PALETTES(pal) \ - .palette = gMonPalette_## pal, \ - .shinyPalette = gMonShinyPalette_## pal - -#define PALETTE_FEMALE(pal) \ - .paletteFemale = gMonPalette_## pal##F, \ - .shinyPaletteFemale = gMonShinyPalette_## pal##F - -#define ICON(sprite, palId) \ - .iconSprite = gMonIcon_## sprite, \ - .iconPalIndex = palId - -#define ICON_FEMALE(sprite, palId) \ - .iconSpriteFemale = gMonIcon_## sprite##F, \ - .iconPalIndexFemale = palId - -#define LEARNSETS(learn) \ - .levelUpLearnset = s ## learn##LevelUpLearnset, \ - .teachableLearnset = s ## learn##TeachableLearnset - #if P_FOOTPRINTS #define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite, #else @@ -252,16 +216,21 @@ const struct SpeciesInfo gSpeciesInfo[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CircledQuestionMark, 40, 40), + .frontPic = gMonFrontPic_CircledQuestionMark, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_None, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CircledQuestionMark, 40, 40), + .backPic = gMonBackPic_CircledQuestionMark, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_NONE, - PALETTES(CircledQuestionMark), - ICON(QuestionMark, 0), - LEARNSETS(None), + .palette = gMonPalette_CircledQuestionMark, + .shinyPalette = gMonShinyPalette_CircledQuestionMark, + .iconSprite = gMonIcon_QuestionMark, + .iconPalIndex = 0, + .levelUpLearnset = sNoneLevelUpLearnset, + .teachableLearnset = sNoneTeachableLearnset, }, #include "species_info/gen_1.h" @@ -276,14 +245,16 @@ const struct SpeciesInfo gSpeciesInfo[] = [SPECIES_EGG] = { - FRONT_PIC(Egg, 24, 24), + .frontPic = gMonFrontPic_Egg, + .frontPicSize = MON_COORDS_SIZE(24, 24), .frontPicYOffset = 20, .backPic = gMonFrontPic_Egg, .backPicSize = MON_COORDS_SIZE(24, 24), .backPicYOffset = 20, .palette = gMonPalette_Egg, .shinyPalette = gMonPalette_Egg, - ICON(Egg, 1), + .iconSprite = gMonIcon_Egg, + .iconPalIndex = 1, }, /* You may add any custom species below this point based on the following structure: */ @@ -325,22 +296,31 @@ const struct SpeciesInfo gSpeciesInfo[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CircledQuestionMark, 64, 64), - //FRONT_PIC_FEMALE(CircledQuestionMark, 64, 64), + .frontPic = gMonFrontPic_CircledQuestionMark, + .frontPicSize = MON_COORDS_SIZE(64, 64), + //.frontPicFemale = gMonFrontPic_CircledQuestionMark, + //.frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_None, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 0, - BACK_PIC(CircledQuestionMark, 64, 64), - //BACK_PIC_FEMALE(CircledQuestionMark, 64, 64), + .backPic = gMonBackPic_CircledQuestionMark, + .backPicSize = MON_COORDS_SIZE(64, 64), + //.backPicFemale = gMonBackPic_CircledQuestionMarkF, + //.backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_NONE, - PALETTES(CircledQuestionMark), - //PALETTE_FEMALE(CircledQuestionMark), - ICON(QuestionMark, 0), - //ICON_FEMALE(QuestionMark, 1), + .palette = gMonPalette_CircledQuestionMark, + .shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.paletteFemale = gMonPalette_CircledQuestionMarkF, + .shinyPaletteFemale = gMonShinyPalette_CircledQuestionMarkF, + .iconSprite = gMonIcon_QuestionMark, + .iconPalIndex = 0, + //.iconSpriteFemale = gMonIcon_QuestionMarkF, + //.iconPalIndexFemale = 1, //FOOTPRINT(None) - LEARNSETS(None), + .levelUpLearnset = sNoneLevelUpLearnset, + .teachableLearnset = sNoneTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 100, SPECIES_NONE}, {EVO_ITEM, ITEM_MOOMOO_MILK, SPECIES_NONE}), //.formSpeciesIdTable = sNoneFormSpeciesIdTable, diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index bcc868950d82..c7c34126e601 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bulbasaur, 40, 40), + .frontPic = gMonFrontPic_Bulbasaur, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Bulbasaur, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Bulbasaur, 56, 40), + .backPic = gMonBackPic_Bulbasaur, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Bulbasaur), - ICON(Bulbasaur, 4), + .palette = gMonPalette_Bulbasaur, + .shinyPalette = gMonShinyPalette_Bulbasaur, + .iconSprite = gMonIcon_Bulbasaur, + .iconPalIndex = 4, FOOTPRINT(Bulbasaur) - LEARNSETS(Bulbasaur), + .levelUpLearnset = sBulbasaurLevelUpLearnset, + .teachableLearnset = sBulbasaurTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_IVYSAUR}), }, @@ -87,17 +92,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ivysaur, 56, 48), + .frontPic = gMonFrontPic_Ivysaur, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Ivysaur, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Ivysaur, 64, 56), + .backPic = gMonBackPic_Ivysaur, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Ivysaur), - ICON(Ivysaur, 4), + .palette = gMonPalette_Ivysaur, + .shinyPalette = gMonShinyPalette_Ivysaur, + .iconSprite = gMonIcon_Ivysaur, + .iconPalIndex = 4, FOOTPRINT(Ivysaur) - LEARNSETS(Ivysaur), + .levelUpLearnset = sIvysaurLevelUpLearnset, + .teachableLearnset = sIvysaurTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_VENUSAUR}), }, @@ -142,19 +152,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 388, .trainerOffset = 6, - FRONT_PIC(Venusaur, 64, 64), - FRONT_PIC_FEMALE(Venusaur, 64, 64), + .frontPic = gMonFrontPic_Venusaur, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_VenusaurF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Venusaur, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, - BACK_PIC(Venusaur, 64, 48), - BACK_PIC_FEMALE(Venusaur, 64, 48), + .backPic = gMonBackPic_Venusaur, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_VenusaurF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Venusaur), - ICON(Venusaur, 4), + .palette = gMonPalette_Venusaur, + .shinyPalette = gMonShinyPalette_Venusaur, + .iconSprite = gMonIcon_Venusaur, + .iconPalIndex = 4, FOOTPRINT(Venusaur) - LEARNSETS(Venusaur), + .levelUpLearnset = sVenusaurLevelUpLearnset, + .teachableLearnset = sVenusaurTeachableLearnset, .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, .formChangeTable = sVenusaurFormChangeTable, }, @@ -194,17 +211,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 388, .trainerOffset = 6, - FRONT_PIC(VenusaurMega, 64, 64), + .frontPic = gMonFrontPic_VenusaurMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_VenusaurMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(VenusaurMega, 64, 64), + .backPic = gMonBackPic_VenusaurMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(VenusaurMega), - ICON(VenusaurMega, 4), + .palette = gMonPalette_VenusaurMega, + .shinyPalette = gMonShinyPalette_VenusaurMega, + .iconSprite = gMonIcon_VenusaurMega, + .iconPalIndex = 4, FOOTPRINT(Venusaur) - LEARNSETS(Venusaur), + .levelUpLearnset = sVenusaurLevelUpLearnset, + .teachableLearnset = sVenusaurTeachableLearnset, .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, .formChangeTable = sVenusaurFormChangeTable, .isMegaEvolution = TRUE, @@ -247,17 +269,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 388, .trainerOffset = 6, - FRONT_PIC(VenusaurGigantamax, 64, 64), + .frontPic = gMonFrontPic_VenusaurGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_VenusaurGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(VenusaurGigantamax, 64, 64), + .backPic = gMonBackPic_VenusaurGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(VenusaurGigantamax), - ICON(VenusaurGigantamax, 0), + .palette = gMonPalette_VenusaurGigantamax, + .shinyPalette = gMonShinyPalette_VenusaurGigantamax, + .iconSprite = gMonIcon_VenusaurGigantamax, + .iconPalIndex = 0, FOOTPRINT(Venusaur) - LEARNSETS(Venusaur), + .levelUpLearnset = sVenusaurLevelUpLearnset, + .teachableLearnset = sVenusaurTeachableLearnset, .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, .formChangeTable = sVenusaurFormChangeTable, .isGigantamax = TRUE, @@ -300,17 +327,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Charmander, 48, 48), + .frontPic = gMonFrontPic_Charmander, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Charmander, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Charmander, 48, 48), + .backPic = gMonBackPic_Charmander, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Charmander), - ICON(Charmander, 0), + .palette = gMonPalette_Charmander, + .shinyPalette = gMonShinyPalette_Charmander, + .iconSprite = gMonIcon_Charmander, + .iconPalIndex = 0, FOOTPRINT(Charmander) - LEARNSETS(Charmander), + .levelUpLearnset = sCharmanderLevelUpLearnset, + .teachableLearnset = sCharmanderTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CHARMELEON}), }, @@ -349,17 +381,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Charmeleon, 56, 56), + .frontPic = gMonFrontPic_Charmeleon, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Charmeleon, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Charmeleon, 56, 48), + .backPic = gMonBackPic_Charmeleon, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Charmeleon), - ICON(Charmeleon, 0), + .palette = gMonPalette_Charmeleon, + .shinyPalette = gMonShinyPalette_Charmeleon, + .iconSprite = gMonIcon_Charmeleon, + .iconPalIndex = 0, FOOTPRINT(Charmeleon) - LEARNSETS(Charmeleon), + .levelUpLearnset = sCharmeleonLevelUpLearnset, + .teachableLearnset = sCharmeleonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHARIZARD}), }, @@ -403,17 +440,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 302, .trainerOffset = 3, - FRONT_PIC(Charizard, 64, 64), + .frontPic = gMonFrontPic_Charizard, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Charizard, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Charizard, 64, 64), + .backPic = gMonBackPic_Charizard, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Charizard), - ICON(Charizard, 0), + .palette = gMonPalette_Charizard, + .shinyPalette = gMonShinyPalette_Charizard, + .iconSprite = gMonIcon_Charizard, + .iconPalIndex = 0, FOOTPRINT(Charizard) - LEARNSETS(Charizard), + .levelUpLearnset = sCharizardLevelUpLearnset, + .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, }, @@ -452,17 +494,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 302, .trainerOffset = 3, - FRONT_PIC(CharizardMegaX, 64, 64), + .frontPic = gMonFrontPic_CharizardMegaX, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_CharizardMegaX, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CharizardMegaX, 64, 64), + .backPic = gMonBackPic_CharizardMegaX, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(CharizardMegaX), - ICON(CharizardMegaX, 0), + .palette = gMonPalette_CharizardMegaX, + .shinyPalette = gMonShinyPalette_CharizardMegaX, + .iconSprite = gMonIcon_CharizardMegaX, + .iconPalIndex = 0, FOOTPRINT(Charizard) - LEARNSETS(Charizard), + .levelUpLearnset = sCharizardLevelUpLearnset, + .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, .isMegaEvolution = TRUE, @@ -502,17 +549,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 302, .trainerOffset = 3, - FRONT_PIC(CharizardMegaY, 64, 64), + .frontPic = gMonFrontPic_CharizardMegaY, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_CharizardMegaY, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CharizardMegaY, 64, 64), + .backPic = gMonBackPic_CharizardMegaY, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(CharizardMegaY), - ICON(CharizardMegaY, 0), + .palette = gMonPalette_CharizardMegaY, + .shinyPalette = gMonShinyPalette_CharizardMegaY, + .iconSprite = gMonIcon_CharizardMegaY, + .iconPalIndex = 0, FOOTPRINT(Charizard) - LEARNSETS(Charizard), + .levelUpLearnset = sCharizardLevelUpLearnset, + .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, .isMegaEvolution = TRUE, @@ -554,17 +606,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 302, .trainerOffset = 3, - FRONT_PIC(CharizardGigantamax, 64, 64), + .frontPic = gMonFrontPic_CharizardGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_CharizardGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CharizardGigantamax, 64, 64), + .backPic = gMonBackPic_CharizardGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CharizardGigantamax), - ICON(CharizardGigantamax, 0), + .palette = gMonPalette_CharizardGigantamax, + .shinyPalette = gMonShinyPalette_CharizardGigantamax, + .iconSprite = gMonIcon_CharizardGigantamax, + .iconPalIndex = 0, FOOTPRINT(Charizard) - LEARNSETS(Charizard), + .levelUpLearnset = sCharizardLevelUpLearnset, + .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, .isGigantamax = TRUE, @@ -607,17 +664,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Squirtle, 40, 48), + .frontPic = gMonFrontPic_Squirtle, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Squirtle, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Squirtle, 48, 48), + .backPic = gMonBackPic_Squirtle, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Squirtle), - ICON(Squirtle, 0), + .palette = gMonPalette_Squirtle, + .shinyPalette = gMonShinyPalette_Squirtle, + .iconSprite = gMonIcon_Squirtle, + .iconPalIndex = 0, FOOTPRINT(Squirtle) - LEARNSETS(Squirtle), + .levelUpLearnset = sSquirtleLevelUpLearnset, + .teachableLearnset = sSquirtleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_WARTORTLE}), }, @@ -656,17 +718,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wartortle, 56, 56), + .frontPic = gMonFrontPic_Wartortle, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Wartortle, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Wartortle, 64, 56), + .backPic = gMonBackPic_Wartortle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Wartortle), - ICON(Wartortle, 2), + .palette = gMonPalette_Wartortle, + .shinyPalette = gMonShinyPalette_Wartortle, + .iconSprite = gMonIcon_Wartortle, + .iconPalIndex = 2, FOOTPRINT(Wartortle) - LEARNSETS(Wartortle), + .levelUpLearnset = sWartortleLevelUpLearnset, + .teachableLearnset = sWartortleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLASTOISE}), }, @@ -710,18 +777,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(Blastoise, 64, 64), + .frontPic = gMonFrontPic_Blastoise, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Blastoise, .frontAnimId = ANIM_V_SHAKE_TWICE, .frontAnimDelay = 20, - BACK_PIC(Blastoise, 64, 56), + .backPic = gMonBackPic_Blastoise, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Blastoise), - ICON(Blastoise, 2), + .palette = gMonPalette_Blastoise, + .shinyPalette = gMonShinyPalette_Blastoise, + .iconSprite = gMonIcon_Blastoise, + .iconPalIndex = 2, FOOTPRINT(Blastoise) - LEARNSETS(Blastoise), + .levelUpLearnset = sBlastoiseLevelUpLearnset, + .teachableLearnset = sBlastoiseTeachableLearnset, .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, .formChangeTable = sBlastoiseFormChangeTable, }, @@ -761,17 +833,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(BlastoiseMega, 64, 64), + .frontPic = gMonFrontPic_BlastoiseMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_BlastoiseMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(BlastoiseMega, 64, 64), + .backPic = gMonBackPic_BlastoiseMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(BlastoiseMega), - ICON(BlastoiseMega, 2), + .palette = gMonPalette_BlastoiseMega, + .shinyPalette = gMonShinyPalette_BlastoiseMega, + .iconSprite = gMonIcon_BlastoiseMega, + .iconPalIndex = 2, FOOTPRINT(Blastoise) - LEARNSETS(Blastoise), + .levelUpLearnset = sBlastoiseLevelUpLearnset, + .teachableLearnset = sBlastoiseTeachableLearnset, .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, .formChangeTable = sBlastoiseFormChangeTable, .isMegaEvolution = TRUE, @@ -813,17 +890,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(BlastoiseGigantamax, 64, 64), + .frontPic = gMonFrontPic_BlastoiseGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_BlastoiseGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(BlastoiseGigantamax, 64, 64), + .backPic = gMonBackPic_BlastoiseGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(BlastoiseGigantamax), - ICON(BlastoiseGigantamax, 0), + .palette = gMonPalette_BlastoiseGigantamax, + .shinyPalette = gMonShinyPalette_BlastoiseGigantamax, + .iconSprite = gMonIcon_BlastoiseGigantamax, + .iconPalIndex = 0, FOOTPRINT(Blastoise) - LEARNSETS(Blastoise), + .levelUpLearnset = sBlastoiseLevelUpLearnset, + .teachableLearnset = sBlastoiseTeachableLearnset, .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, .formChangeTable = sBlastoiseFormChangeTable, .isGigantamax = TRUE, @@ -866,17 +948,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Caterpie, 40, 40), + .frontPic = gMonFrontPic_Caterpie, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Caterpie, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Caterpie, 48, 40), + .backPic = gMonBackPic_Caterpie, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Caterpie), - ICON(Caterpie, 1), + .palette = gMonPalette_Caterpie, + .shinyPalette = gMonShinyPalette_Caterpie, + .iconSprite = gMonIcon_Caterpie, + .iconPalIndex = 1, FOOTPRINT(Caterpie) - LEARNSETS(Caterpie), + .levelUpLearnset = sCaterpieLevelUpLearnset, + .teachableLearnset = sCaterpieTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_METAPOD}), }, @@ -915,17 +1002,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Metapod, 40, 40), + .frontPic = gMonFrontPic_Metapod, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Metapod, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Metapod, 40, 48), + .backPic = gMonBackPic_Metapod, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Metapod), - ICON(Metapod, 1), + .palette = gMonPalette_Metapod, + .shinyPalette = gMonShinyPalette_Metapod, + .iconSprite = gMonIcon_Metapod, + .iconPalIndex = 1, FOOTPRINT(Metapod) - LEARNSETS(Metapod), + .levelUpLearnset = sMetapodLevelUpLearnset, + .teachableLearnset = sMetapodTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BUTTERFREE}), }, @@ -976,20 +1068,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Butterfree, 64, 56), - FRONT_PIC_FEMALE(Butterfree, 64, 56), + .frontPic = gMonFrontPic_Butterfree, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_ButterfreeF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Butterfree, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 12, - BACK_PIC(Butterfree, 64, 56), - BACK_PIC_FEMALE(Butterfree, 64, 56), + .backPic = gMonBackPic_Butterfree, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_ButterfreeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Butterfree), - ICON(Butterfree, 0), + .palette = gMonPalette_Butterfree, + .shinyPalette = gMonShinyPalette_Butterfree, + .iconSprite = gMonIcon_Butterfree, + .iconPalIndex = 0, FOOTPRINT(Butterfree) - LEARNSETS(Butterfree), + .levelUpLearnset = sButterfreeLevelUpLearnset, + .teachableLearnset = sButterfreeTeachableLearnset, .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, .formChangeTable = sButterfreeFormChangeTable, }, @@ -1031,18 +1130,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ButterfreeGigantamax, 64, 64), + .frontPic = gMonFrontPic_ButterfreeGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_ButterfreeGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(ButterfreeGigantamax, 64, 64), + .backPic = gMonBackPic_ButterfreeGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ButterfreeGigantamax), - ICON(ButterfreeGigantamax, 0), + .palette = gMonPalette_ButterfreeGigantamax, + .shinyPalette = gMonShinyPalette_ButterfreeGigantamax, + .iconSprite = gMonIcon_ButterfreeGigantamax, + .iconPalIndex = 0, FOOTPRINT(Butterfree) - LEARNSETS(Butterfree), + .levelUpLearnset = sButterfreeLevelUpLearnset, + .teachableLearnset = sButterfreeTeachableLearnset, .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, .formChangeTable = sButterfreeFormChangeTable, .isGigantamax = TRUE, @@ -1085,18 +1189,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Weedle, 40, 40), + .frontPic = gMonFrontPic_Weedle, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Weedle, .frontAnimId = ANIM_H_SLIDE_SLOW, .frontAnimDelay = 10, - BACK_PIC(Weedle, 56, 56), + .backPic = gMonBackPic_Weedle, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Weedle), - ICON(Weedle, 2), + .palette = gMonPalette_Weedle, + .shinyPalette = gMonShinyPalette_Weedle, + .iconSprite = gMonIcon_Weedle, + .iconPalIndex = 2, FOOTPRINT(Weedle) - LEARNSETS(Weedle), + .levelUpLearnset = sWeedleLevelUpLearnset, + .teachableLearnset = sWeedleTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_KAKUNA}), }, @@ -1135,18 +1244,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kakuna, 24, 48), + .frontPic = gMonFrontPic_Kakuna, + .frontPicSize = MON_COORDS_SIZE(24, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Kakuna, .frontAnimId = ANIM_GLOW_ORANGE, .frontAnimDelay = 20, - BACK_PIC(Kakuna, 32, 40), + .backPic = gMonBackPic_Kakuna, + .backPicSize = MON_COORDS_SIZE(32, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Kakuna), - ICON(Kakuna, 2), + .palette = gMonPalette_Kakuna, + .shinyPalette = gMonShinyPalette_Kakuna, + .iconSprite = gMonIcon_Kakuna, + .iconPalIndex = 2, FOOTPRINT(Kakuna) - LEARNSETS(Kakuna), + .levelUpLearnset = sKakunaLevelUpLearnset, + .teachableLearnset = sKakunaTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEEDRILL}), }, @@ -1197,18 +1311,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Beedrill, 64, 56), + .frontPic = gMonFrontPic_Beedrill, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Beedrill, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 9, - BACK_PIC(Beedrill, 64, 56), + .backPic = gMonBackPic_Beedrill, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Beedrill), - ICON(Beedrill, 2), + .palette = gMonPalette_Beedrill, + .shinyPalette = gMonShinyPalette_Beedrill, + .iconSprite = gMonIcon_Beedrill, + .iconPalIndex = 2, FOOTPRINT(Beedrill) - LEARNSETS(Beedrill), + .levelUpLearnset = sBeedrillLevelUpLearnset, + .teachableLearnset = sBeedrillTeachableLearnset, .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, .formChangeTable = sBeedrillFormChangeTable, }, @@ -1250,18 +1369,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(BeedrillMega, 64, 64), + .frontPic = gMonFrontPic_BeedrillMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_BeedrillMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(BeedrillMega, 64, 64), + .backPic = gMonBackPic_BeedrillMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(BeedrillMega), - ICON(BeedrillMega, 2), + .palette = gMonPalette_BeedrillMega, + .shinyPalette = gMonShinyPalette_BeedrillMega, + .iconSprite = gMonIcon_BeedrillMega, + .iconPalIndex = 2, FOOTPRINT(Beedrill) - LEARNSETS(Beedrill), + .levelUpLearnset = sBeedrillLevelUpLearnset, + .teachableLearnset = sBeedrillTeachableLearnset, .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, .formChangeTable = sBeedrillFormChangeTable, .isMegaEvolution = TRUE, @@ -1304,17 +1428,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pidgey, 40, 40), + .frontPic = gMonFrontPic_Pidgey, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pidgey, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Pidgey, 56, 48), + .backPic = gMonBackPic_Pidgey, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pidgey), - ICON(Pidgey, 0), + .palette = gMonPalette_Pidgey, + .shinyPalette = gMonShinyPalette_Pidgey, + .iconSprite = gMonIcon_Pidgey, + .iconPalIndex = 0, FOOTPRINT(Pidgey) - LEARNSETS(Pidgey), + .levelUpLearnset = sPidgeyLevelUpLearnset, + .teachableLearnset = sPidgeyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PIDGEOTTO}), }, @@ -1352,18 +1481,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pidgeotto, 56, 56), + .frontPic = gMonFrontPic_Pidgeotto, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Pidgeotto, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 25, - BACK_PIC(Pidgeotto, 64, 56), + .backPic = gMonBackPic_Pidgeotto, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Pidgeotto), - ICON(Pidgeotto, 0), + .palette = gMonPalette_Pidgeotto, + .shinyPalette = gMonShinyPalette_Pidgeotto, + .iconSprite = gMonIcon_Pidgeotto, + .iconPalIndex = 0, FOOTPRINT(Pidgeotto) - LEARNSETS(Pidgeotto), + .levelUpLearnset = sPidgeottoLevelUpLearnset, + .teachableLearnset = sPidgeottoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_PIDGEOT}), }, @@ -1411,18 +1545,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pidgeot, 64, 64), + .frontPic = gMonFrontPic_Pidgeot, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Pidgeot, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 5, - BACK_PIC(Pidgeot, 64, 56), + .backPic = gMonBackPic_Pidgeot, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pidgeot), - ICON(Pidgeot, 0), + .palette = gMonPalette_Pidgeot, + .shinyPalette = gMonShinyPalette_Pidgeot, + .iconSprite = gMonIcon_Pidgeot, + .iconPalIndex = 0, FOOTPRINT(Pidgeot) - LEARNSETS(Pidgeot), + .levelUpLearnset = sPidgeotLevelUpLearnset, + .teachableLearnset = sPidgeotTeachableLearnset, .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, .formChangeTable = sPidgeotFormChangeTable, }, @@ -1461,18 +1600,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PidgeotMega, 64, 64), + .frontPic = gMonFrontPic_PidgeotMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_PidgeotMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(PidgeotMega, 64, 64), + .backPic = gMonBackPic_PidgeotMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(PidgeotMega), - ICON(PidgeotMega, 0), + .palette = gMonPalette_PidgeotMega, + .shinyPalette = gMonShinyPalette_PidgeotMega, + .iconSprite = gMonIcon_PidgeotMega, + .iconPalIndex = 0, FOOTPRINT(Pidgeot) - LEARNSETS(Pidgeot), + .levelUpLearnset = sPidgeotLevelUpLearnset, + .teachableLearnset = sPidgeotTeachableLearnset, .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, .formChangeTable = sPidgeotFormChangeTable, .isMegaEvolution = TRUE, @@ -1515,19 +1659,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rattata, 40, 40), - FRONT_PIC_FEMALE(Rattata, 40, 40), + .frontPic = gMonFrontPic_Rattata, + .frontPicSize = MON_COORDS_SIZE(40, 40), + .frontPicFemale = gMonFrontPic_RattataF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Rattata, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Rattata, 64, 56), - BACK_PIC_FEMALE(Rattata, 64, 56), + .backPic = gMonBackPic_Rattata, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RattataF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Rattata), - ICON(Rattata, 2), + .palette = gMonPalette_Rattata, + .shinyPalette = gMonShinyPalette_Rattata, + .iconSprite = gMonIcon_Rattata, + .iconPalIndex = 2, FOOTPRINT(Rattata) - LEARNSETS(Rattata), + .levelUpLearnset = sRattataLevelUpLearnset, + .teachableLearnset = sRattataTeachableLearnset, .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_RATICATE}), }, @@ -1566,19 +1717,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Raticate, 64, 56), - FRONT_PIC_FEMALE(Raticate, 64, 56), + .frontPic = gMonFrontPic_Raticate, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_RaticateF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Raticate, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, - BACK_PIC(Raticate, 64, 48), - BACK_PIC_FEMALE(Raticate, 64, 48), + .backPic = gMonBackPic_Raticate, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_RaticateF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Raticate), - ICON(Raticate, 2), + .palette = gMonPalette_Raticate, + .shinyPalette = gMonShinyPalette_Raticate, + .iconSprite = gMonIcon_Raticate, + .iconPalIndex = 2, FOOTPRINT(Raticate) - LEARNSETS(Raticate), + .levelUpLearnset = sRaticateLevelUpLearnset, + .teachableLearnset = sRaticateTeachableLearnset, .formSpeciesIdTable = sRaticateFormSpeciesIdTable, }, @@ -1618,17 +1776,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(RattataAlolan, 40, 48), + .frontPic = gMonFrontPic_RattataAlolan, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_RattataAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(RattataAlolan, 64, 56), + .backPic = gMonBackPic_RattataAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RattataAlolan), - ICON(RattataAlolan, 2), + .palette = gMonPalette_RattataAlolan, + .shinyPalette = gMonShinyPalette_RattataAlolan, + .iconSprite = gMonIcon_RattataAlolan, + .iconPalIndex = 2, FOOTPRINT(Rattata) - LEARNSETS(RattataAlolan), + .levelUpLearnset = sRattataAlolanLevelUpLearnset, + .teachableLearnset = sRattataAlolanTeachableLearnset, .isAlolanForm = TRUE, .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}), @@ -1669,17 +1832,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(RaticateAlolan, 56, 48), + .frontPic = gMonFrontPic_RaticateAlolan, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_RaticateAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(RaticateAlolan, 64, 48), + .backPic = gMonBackPic_RaticateAlolan, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RaticateAlolan), - ICON(RaticateAlolan, 2), + .palette = gMonPalette_RaticateAlolan, + .shinyPalette = gMonShinyPalette_RaticateAlolan, + .iconSprite = gMonIcon_RaticateAlolan, + .iconPalIndex = 2, FOOTPRINT(Raticate) - LEARNSETS(RaticateAlolan), + .levelUpLearnset = sRaticateAlolanLevelUpLearnset, + .teachableLearnset = sRaticateAlolanTeachableLearnset, .formSpeciesIdTable = sRaticateFormSpeciesIdTable, .isAlolanForm = TRUE, }, @@ -1722,17 +1890,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spearow, 40, 40), + .frontPic = gMonFrontPic_Spearow, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Spearow, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Spearow, 56, 56), + .backPic = gMonBackPic_Spearow, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Spearow), - ICON(Spearow, 0), + .palette = gMonPalette_Spearow, + .shinyPalette = gMonShinyPalette_Spearow, + .iconSprite = gMonIcon_Spearow, + .iconPalIndex = 0, FOOTPRINT(Spearow) - LEARNSETS(Spearow), + .levelUpLearnset = sSpearowLevelUpLearnset, + .teachableLearnset = sSpearowTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_FEAROW}), }, @@ -1771,19 +1944,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fearow, 64, 64), + .frontPic = gMonFrontPic_Fearow, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Fearow, .frontAnimId = ANIM_FIGURE_8, .frontAnimDelay = 2, .enemyMonElevation = 6, - BACK_PIC(Fearow, 64, 56), + .backPic = gMonBackPic_Fearow, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Fearow), - ICON(Fearow, 0), + .palette = gMonPalette_Fearow, + .shinyPalette = gMonShinyPalette_Fearow, + .iconSprite = gMonIcon_Fearow, + .iconPalIndex = 0, FOOTPRINT(Fearow) - LEARNSETS(Fearow), + .levelUpLearnset = sFearowLevelUpLearnset, + .teachableLearnset = sFearowTeachableLearnset, }, #endif //P_FAMILY_SPEAROW @@ -1822,18 +2000,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ekans, 48, 48), + .frontPic = gMonFrontPic_Ekans, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Ekans, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 30, - BACK_PIC(Ekans, 56, 48), + .backPic = gMonBackPic_Ekans, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Ekans), - ICON(Ekans, 2), + .palette = gMonPalette_Ekans, + .shinyPalette = gMonShinyPalette_Ekans, + .iconSprite = gMonIcon_Ekans, + .iconPalIndex = 2, FOOTPRINT(Ekans) - LEARNSETS(Ekans), + .levelUpLearnset = sEkansLevelUpLearnset, + .teachableLearnset = sEkansTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARBOK}), }, @@ -1877,17 +2060,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(Arbok, 64, 64), + .frontPic = gMonFrontPic_Arbok, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Arbok, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Arbok, 64, 64), + .backPic = gMonBackPic_Arbok, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Arbok), - ICON(Arbok, 2), + .palette = gMonPalette_Arbok, + .shinyPalette = gMonShinyPalette_Arbok, + .iconSprite = gMonIcon_Arbok, + .iconPalIndex = 2, FOOTPRINT(Arbok) - LEARNSETS(Arbok), + .levelUpLearnset = sArbokLevelUpLearnset, + .teachableLearnset = sArbokTeachableLearnset, }, #endif //P_FAMILY_EKANS @@ -1925,17 +2113,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Pichu) - LEARNSETS(Pichu), + .levelUpLearnset = sPichuLevelUpLearnset, + .teachableLearnset = sPichuTeachableLearnset, .formSpeciesIdTable = sPichuFormSpeciesIdTable, - FRONT_PIC(Pichu, 32, 40), + .frontPic = gMonFrontPic_Pichu, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Pichu, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Pichu, 48, 56), + .backPic = gMonBackPic_Pichu, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Pichu), - ICON(Pichu, 1), + .palette = gMonPalette_Pichu, + .shinyPalette = gMonShinyPalette_Pichu, + .iconSprite = gMonIcon_Pichu, + .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}), }, @@ -1970,18 +2163,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Pichu) - LEARNSETS(Pichu), + .levelUpLearnset = sPichuLevelUpLearnset, + .teachableLearnset = sPichuTeachableLearnset, .formSpeciesIdTable = sPichuFormSpeciesIdTable, .noFlip = TRUE, - FRONT_PIC(PichuSpikyEared, 32, 40), + .frontPic = gMonFrontPic_PichuSpikyEared, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_PichuSpikyEared, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PichuSpikyEared, 48, 56), + .backPic = gMonBackPic_PichuSpikyEared, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PichuSpikyEared), - ICON(PichuSpikyEared, 1), + .palette = gMonPalette_PichuSpikyEared, + .shinyPalette = gMonShinyPalette_PichuSpikyEared, + .iconSprite = gMonIcon_PichuSpikyEared, + .iconPalIndex = 1, }, #endif //P_GEN_2_CROSS_EVOS @@ -2016,7 +2214,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2027,20 +2226,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .description = gPikachuPokedexText, - FRONT_PIC(Pikachu, 48, 48), - FRONT_PIC_FEMALE(Pikachu, 48, 48), + .frontPic = gMonFrontPic_Pikachu, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_PikachuF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Pikachu, .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 25, - BACK_PIC(Pikachu, 64, 56), - BACK_PIC_FEMALE(Pikachu, 64, 56), + .backPic = gMonBackPic_Pikachu, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_PikachuF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Pikachu), - ICON(Pikachu, 2), + .palette = gMonPalette_Pikachu, + .shinyPalette = gMonShinyPalette_Pikachu, + .iconSprite = gMonIcon_Pikachu, + .iconPalIndex = 2, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - ICON_FEMALE(Pikachu, 2), + .iconSpriteFemale = gMonIcon_PikachuF, + .iconPalIndexFemale = 2, #endif .formChangeTable = sPikachuFormChangeTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}, @@ -2071,7 +2277,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2082,15 +2289,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .genderRatio = MON_FEMALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - FRONT_PIC(PikachuCosplay, 48, 48), + .frontPic = gMonFrontPic_PikachuCosplay, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuCosplay, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuCosplay, 64, 56), + .backPic = gMonBackPic_PikachuCosplay, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuCosplay), - ICON(PikachuCosplay, 2), + .palette = gMonPalette_PikachuCosplay, + .shinyPalette = gMonShinyPalette_PikachuCosplay, + .iconSprite = gMonIcon_PikachuCosplay, + .iconPalIndex = 2, }, [SPECIES_PIKACHU_ROCK_STAR] = @@ -2116,7 +2327,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2127,15 +2339,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .genderRatio = MON_FEMALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - FRONT_PIC(PikachuRockStar, 48, 48), + .frontPic = gMonFrontPic_PikachuRockStar, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuRockStar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuRockStar, 64, 56), + .backPic = gMonBackPic_PikachuRockStar, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuRockStar), - ICON(PikachuRockStar, 1), + .palette = gMonPalette_PikachuRockStar, + .shinyPalette = gMonShinyPalette_PikachuRockStar, + .iconSprite = gMonIcon_PikachuRockStar, + .iconPalIndex = 1, }, [SPECIES_PIKACHU_BELLE] = @@ -2161,7 +2377,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2173,15 +2390,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .noFlip = TRUE, - FRONT_PIC(PikachuBelle, 48, 48), + .frontPic = gMonFrontPic_PikachuBelle, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuBelle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuBelle, 64, 56), + .backPic = gMonBackPic_PikachuBelle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuBelle), - ICON(PikachuBelle, 0), + .palette = gMonPalette_PikachuBelle, + .shinyPalette = gMonShinyPalette_PikachuBelle, + .iconSprite = gMonIcon_PikachuBelle, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_POP_STAR] = @@ -2207,7 +2428,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2219,15 +2441,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .noFlip = TRUE, - FRONT_PIC(PikachuPopStar, 48, 48), + .frontPic = gMonFrontPic_PikachuPopStar, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuPopStar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuPopStar, 64, 56), + .backPic = gMonBackPic_PikachuPopStar, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuPopStar), - ICON(PikachuPopStar, 0), + .palette = gMonPalette_PikachuPopStar, + .shinyPalette = gMonShinyPalette_PikachuPopStar, + .iconSprite = gMonIcon_PikachuPopStar, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_PH_D] = @@ -2253,7 +2479,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2264,15 +2491,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .genderRatio = MON_FEMALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - FRONT_PIC(PikachuPhD, 48, 48), + .frontPic = gMonFrontPic_PikachuPhD, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuPhD, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuPhD, 64, 56), + .backPic = gMonBackPic_PikachuPhD, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuPhD), - ICON(PikachuPhD, 1), + .palette = gMonPalette_PikachuPhD, + .shinyPalette = gMonShinyPalette_PikachuPhD, + .iconSprite = gMonIcon_PikachuPhD, + .iconPalIndex = 1, }, [SPECIES_PIKACHU_LIBRE] = @@ -2298,7 +2529,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2309,15 +2541,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .genderRatio = MON_FEMALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - FRONT_PIC(PikachuLibre, 48, 48), + .frontPic = gMonFrontPic_PikachuLibre, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuLibre, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuLibre, 64, 56), + .backPic = gMonBackPic_PikachuLibre, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuLibre), - ICON(PikachuLibre, 0), + .palette = gMonPalette_PikachuLibre, + .shinyPalette = gMonShinyPalette_PikachuLibre, + .iconSprite = gMonIcon_PikachuLibre, + .iconPalIndex = 0, }, #endif //P_COSPLAY_PIKACHU_FORMS @@ -2346,7 +2582,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2362,15 +2599,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across many different regions."), - FRONT_PIC(PikachuOriginalCap, 48, 48), + .frontPic = gMonFrontPic_PikachuOriginalCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuOriginalCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuOriginalCap, 64, 56), + .backPic = gMonBackPic_PikachuOriginalCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuOriginalCap), - ICON(PikachuOriginalCap, 0), + .palette = gMonPalette_PikachuOriginalCap, + .shinyPalette = gMonShinyPalette_PikachuOriginalCap, + .iconSprite = gMonIcon_PikachuOriginalCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_HOENN_CAP] = @@ -2396,7 +2637,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2411,15 +2653,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Hoenn region together."), - FRONT_PIC(PikachuHoennCap, 48, 48), + .frontPic = gMonFrontPic_PikachuHoennCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuHoennCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuHoennCap, 64, 56), + .backPic = gMonBackPic_PikachuHoennCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuHoennCap), - ICON(PikachuHoennCap, 0), + .palette = gMonPalette_PikachuHoennCap, + .shinyPalette = gMonShinyPalette_PikachuHoennCap, + .iconSprite = gMonIcon_PikachuHoennCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_SINNOH_CAP] = @@ -2445,7 +2691,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2460,15 +2707,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Sinnoh region together."), - FRONT_PIC(PikachuSinnohCap, 48, 48), + .frontPic = gMonFrontPic_PikachuSinnohCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuSinnohCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuSinnohCap, 64, 56), + .backPic = gMonBackPic_PikachuSinnohCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuSinnohCap), - ICON(PikachuSinnohCap, 0), + .palette = gMonPalette_PikachuSinnohCap, + .shinyPalette = gMonShinyPalette_PikachuSinnohCap, + .iconSprite = gMonIcon_PikachuSinnohCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_UNOVA_CAP] = @@ -2494,7 +2745,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2509,15 +2761,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Unova region together."), - FRONT_PIC(PikachuUnovaCap, 48, 48), + .frontPic = gMonFrontPic_PikachuUnovaCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuUnovaCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuUnovaCap, 64, 56), + .backPic = gMonBackPic_PikachuUnovaCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuUnovaCap), - ICON(PikachuUnovaCap, 0), + .palette = gMonPalette_PikachuUnovaCap, + .shinyPalette = gMonShinyPalette_PikachuUnovaCap, + .iconSprite = gMonIcon_PikachuUnovaCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_KALOS_CAP] = @@ -2543,7 +2799,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2558,15 +2815,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Kalos region together."), - FRONT_PIC(PikachuKalosCap, 48, 48), + .frontPic = gMonFrontPic_PikachuKalosCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuKalosCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuKalosCap, 64, 56), + .backPic = gMonBackPic_PikachuKalosCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuKalosCap), - ICON(PikachuKalosCap, 0), + .palette = gMonPalette_PikachuKalosCap, + .shinyPalette = gMonShinyPalette_PikachuKalosCap, + .iconSprite = gMonIcon_PikachuKalosCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_ALOLA_CAP] = @@ -2592,7 +2853,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2607,15 +2869,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Alola region together."), - FRONT_PIC(PikachuAlolaCap, 48, 48), + .frontPic = gMonFrontPic_PikachuAlolaCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuAlolaCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuAlolaCap, 64, 56), + .backPic = gMonBackPic_PikachuAlolaCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuAlolaCap), - ICON(PikachuAlolaCap, 0), + .palette = gMonPalette_PikachuAlolaCap, + .shinyPalette = gMonShinyPalette_PikachuAlolaCap, + .iconSprite = gMonIcon_PikachuAlolaCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_PARTNER_CAP] = @@ -2641,7 +2907,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2657,15 +2924,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed as the two overcame\n" "many hardships together."), - FRONT_PIC(PikachuPartnerCap, 48, 48), + .frontPic = gMonFrontPic_PikachuPartnerCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuPartnerCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuPartnerCap, 64, 56), + .backPic = gMonBackPic_PikachuPartnerCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuPartnerCap), - ICON(PikachuPartnerCap, 0), + .palette = gMonPalette_PikachuPartnerCap, + .shinyPalette = gMonShinyPalette_PikachuPartnerCap, + .iconSprite = gMonIcon_PikachuPartnerCap, + .iconPalIndex = 0, }, [SPECIES_PIKACHU_WORLD_CAP] = @@ -2691,7 +2962,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .height = 4, .weight = 60, @@ -2706,15 +2978,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the world together."), - FRONT_PIC(PikachuWorldCap, 48, 48), + .frontPic = gMonFrontPic_PikachuWorldCap, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_PikachuWorldCap, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuWorldCap, 64, 56), + .backPic = gMonBackPic_PikachuWorldCap, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuWorldCap), - ICON(PikachuWorldCap, 0), + .palette = gMonPalette_PikachuWorldCap, + .shinyPalette = gMonShinyPalette_PikachuWorldCap, + .iconSprite = gMonIcon_PikachuWorldCap, + .iconPalIndex = 0, }, #endif //P_CAP_PIKACHU_FORMS @@ -2743,7 +3019,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), FOOTPRINT(Pikachu) - LEARNSETS(Pikachu), + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(50), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), @@ -2758,15 +3035,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "its bolt-shaped tail, it delivers a\n" "surge of electricity equivalent to a\n" "lightning strike."), - FRONT_PIC(PikachuGigantamax, 64, 64), + .frontPic = gMonFrontPic_PikachuGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_PikachuGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PikachuGigantamax, 64, 64), + .backPic = gMonBackPic_PikachuGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PikachuGigantamax), - ICON(PikachuGigantamax, 2), + .palette = gMonPalette_PikachuGigantamax, + .shinyPalette = gMonShinyPalette_PikachuGigantamax, + .iconSprite = gMonIcon_PikachuGigantamax, + .iconPalIndex = 2, .formChangeTable = sPikachuFormChangeTable, .isGigantamax = TRUE, }, @@ -2820,17 +3101,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Raichu, 64, 64), - FRONT_PIC_FEMALE(Raichu, 64, 64), + .frontPic = gMonFrontPic_Raichu, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_RaichuF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Raichu, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Raichu, 64, 56), + .backPic = gMonBackPic_Raichu, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Raichu), - ICON(Raichu, 0), - LEARNSETS(Raichu), + .palette = gMonPalette_Raichu, + .shinyPalette = gMonShinyPalette_Raichu, + .iconSprite = gMonIcon_Raichu, + .iconPalIndex = 0, + .levelUpLearnset = sRaichuLevelUpLearnset, + .teachableLearnset = sRaichuTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -2871,17 +3158,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(RaichuAlolan, 64, 64), + .frontPic = gMonFrontPic_RaichuAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RaichuAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(RaichuAlolan, 56, 56), + .backPic = gMonBackPic_RaichuAlolan, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RaichuAlolan), - ICON(RaichuAlolan, 2), - LEARNSETS(RaichuAlolan), + .palette = gMonPalette_RaichuAlolan, + .shinyPalette = gMonShinyPalette_RaichuAlolan, + .iconSprite = gMonIcon_RaichuAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sRaichuAlolanLevelUpLearnset, + .teachableLearnset = sRaichuAlolanTeachableLearnset, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU @@ -2924,16 +3216,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sandshrew, 48, 48), + .frontPic = gMonFrontPic_Sandshrew, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Sandshrew, .frontAnimId = ANIM_SWING_CONCAVE_FAST_SHORT, - BACK_PIC(Sandshrew, 48, 40), + .backPic = gMonBackPic_Sandshrew, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Sandshrew), - ICON(Sandshrew, 2), - LEARNSETS(Sandshrew), + .palette = gMonPalette_Sandshrew, + .shinyPalette = gMonShinyPalette_Sandshrew, + .iconSprite = gMonIcon_Sandshrew, + .iconPalIndex = 2, + .levelUpLearnset = sSandshrewLevelUpLearnset, + .teachableLearnset = sSandshrewTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SANDSLASH}), }, @@ -2974,16 +3271,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sandslash, 64, 56), + .frontPic = gMonFrontPic_Sandslash, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Sandslash, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Sandslash, 64, 48), + .backPic = gMonBackPic_Sandslash, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Sandslash), - ICON(Sandslash, 2), - LEARNSETS(Sandslash), + .palette = gMonPalette_Sandslash, + .shinyPalette = gMonShinyPalette_Sandslash, + .iconSprite = gMonIcon_Sandslash, + .iconPalIndex = 2, + .levelUpLearnset = sSandslashLevelUpLearnset, + .teachableLearnset = sSandslashTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -3024,16 +3326,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SandshrewAlolan, 40, 40), + .frontPic = gMonFrontPic_SandshrewAlolan, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_SandshrewAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SandshrewAlolan, 56, 40), + .backPic = gMonBackPic_SandshrewAlolan, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SandshrewAlolan), - ICON(SandshrewAlolan, 0), - LEARNSETS(SandshrewAlolan), + .palette = gMonPalette_SandshrewAlolan, + .shinyPalette = gMonShinyPalette_SandshrewAlolan, + .iconSprite = gMonIcon_SandshrewAlolan, + .iconPalIndex = 0, + .levelUpLearnset = sSandshrewAlolanLevelUpLearnset, + .teachableLearnset = sSandshrewAlolanTeachableLearnset, .isAlolanForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}), }, @@ -3075,16 +3382,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SandslashAlolan, 64, 64), + .frontPic = gMonFrontPic_SandslashAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_SandslashAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SandslashAlolan, 64, 56), + .backPic = gMonBackPic_SandslashAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SandslashAlolan), - ICON(SandslashAlolan, 0), - LEARNSETS(SandslashAlolan), + .palette = gMonPalette_SandslashAlolan, + .shinyPalette = gMonShinyPalette_SandslashAlolan, + .iconSprite = gMonIcon_SandslashAlolan, + .iconPalIndex = 0, + .levelUpLearnset = sSandslashAlolanLevelUpLearnset, + .teachableLearnset = sSandslashAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -3125,18 +3437,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(NidoranF, 40, 40), + .frontPic = gMonFrontPic_NidoranF, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_NidoranF, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 28, - BACK_PIC(NidoranF, 48, 40), + .backPic = gMonBackPic_NidoranF, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(NidoranF), - ICON(NidoranF, 0), + .palette = gMonPalette_NidoranF, + .shinyPalette = gMonShinyPalette_NidoranF, + .iconSprite = gMonIcon_NidoranF, + .iconPalIndex = 0, FOOTPRINT(NidoranF) - LEARNSETS(NidoranF), + .levelUpLearnset = sNidoranFLevelUpLearnset, + .teachableLearnset = sNidoranFTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINA}), }, @@ -3174,17 +3491,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nidorina, 48, 48), + .frontPic = gMonFrontPic_Nidorina, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Nidorina, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Nidorina, 56, 56), + .backPic = gMonBackPic_Nidorina, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Nidorina), - ICON(Nidorina, 0), + .palette = gMonPalette_Nidorina, + .shinyPalette = gMonShinyPalette_Nidorina, + .iconSprite = gMonIcon_Nidorina, + .iconPalIndex = 0, FOOTPRINT(Nidorina) - LEARNSETS(Nidorina), + .levelUpLearnset = sNidorinaLevelUpLearnset, + .teachableLearnset = sNidorinaTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}), }, @@ -3230,17 +3552,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nidoqueen, 64, 64), + .frontPic = gMonFrontPic_Nidoqueen, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Nidoqueen, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Nidoqueen, 64, 56), + .backPic = gMonBackPic_Nidoqueen, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Nidoqueen), - ICON(Nidoqueen, 2), + .palette = gMonPalette_Nidoqueen, + .shinyPalette = gMonShinyPalette_Nidoqueen, + .iconSprite = gMonIcon_Nidoqueen, + .iconPalIndex = 2, FOOTPRINT(Nidoqueen) - LEARNSETS(Nidoqueen), + .levelUpLearnset = sNidoqueenLevelUpLearnset, + .teachableLearnset = sNidoqueenTeachableLearnset, }, [SPECIES_NIDORAN_M] = @@ -3277,17 +3604,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(NidoranM, 40, 40), + .frontPic = gMonFrontPic_NidoranM, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_NidoranM, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(NidoranM, 48, 48), + .backPic = gMonBackPic_NidoranM, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(NidoranM), - ICON(NidoranM, 2), + .palette = gMonPalette_NidoranM, + .shinyPalette = gMonShinyPalette_NidoranM, + .iconSprite = gMonIcon_NidoranM, + .iconPalIndex = 2, FOOTPRINT(NidoranM) - LEARNSETS(NidoranM), + .levelUpLearnset = sNidoranMLevelUpLearnset, + .teachableLearnset = sNidoranMTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_NIDORINO}), }, @@ -3325,17 +3657,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nidorino, 56, 48), + .frontPic = gMonFrontPic_Nidorino, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Nidorino, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Nidorino, 64, 56), + .backPic = gMonBackPic_Nidorino, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Nidorino), - ICON(Nidorino, 2), + .palette = gMonPalette_Nidorino, + .shinyPalette = gMonShinyPalette_Nidorino, + .iconSprite = gMonIcon_Nidorino, + .iconPalIndex = 2, FOOTPRINT(Nidorino) - LEARNSETS(Nidorino), + .levelUpLearnset = sNidorinoLevelUpLearnset, + .teachableLearnset = sNidorinoTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}), }, @@ -3381,18 +3718,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nidoking, 64, 64), + .frontPic = gMonFrontPic_Nidoking, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Nidoking, .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 25, - BACK_PIC(Nidoking, 64, 64), + .backPic = gMonBackPic_Nidoking, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Nidoking), - ICON(Nidoking, 2), + .palette = gMonPalette_Nidoking, + .shinyPalette = gMonShinyPalette_Nidoking, + .iconSprite = gMonIcon_Nidoking, + .iconPalIndex = 2, FOOTPRINT(Nidoking) - LEARNSETS(Nidoking), + .levelUpLearnset = sNidokingLevelUpLearnset, + .teachableLearnset = sNidokingTeachableLearnset, }, #endif //P_FAMILY_NIDORAN @@ -3440,17 +3782,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cleffa, 32, 32), + .frontPic = gMonFrontPic_Cleffa, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 18, .frontAnimFrames = sAnims_Cleffa, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Cleffa, 48, 40), + .backPic = gMonBackPic_Cleffa, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Cleffa), - ICON(Cleffa, 0), + .palette = gMonPalette_Cleffa, + .shinyPalette = gMonShinyPalette_Cleffa, + .iconSprite = gMonIcon_Cleffa, + .iconPalIndex = 0, FOOTPRINT(Cleffa) - LEARNSETS(Cleffa), + .levelUpLearnset = sCleffaLevelUpLearnset, + .teachableLearnset = sCleffaTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}), }, #endif //P_GEN_2_CROSS_EVOS @@ -3491,17 +3838,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clefairy, 40, 40), + .frontPic = gMonFrontPic_Clefairy, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Clefairy, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Clefairy, 56, 40), + .backPic = gMonBackPic_Clefairy, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Clefairy), - ICON(Clefairy, 0), + .palette = gMonPalette_Clefairy, + .shinyPalette = gMonShinyPalette_Clefairy, + .iconSprite = gMonIcon_Clefairy, + .iconPalIndex = 0, FOOTPRINT(Clefairy) - LEARNSETS(Clefairy), + .levelUpLearnset = sClefairyLevelUpLearnset, + .teachableLearnset = sClefairyTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}), }, @@ -3549,17 +3901,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clefable, 56, 56), + .frontPic = gMonFrontPic_Clefable, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Clefable, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Clefable, 64, 48), + .backPic = gMonBackPic_Clefable, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Clefable), - ICON(Clefable, 0), + .palette = gMonPalette_Clefable, + .shinyPalette = gMonShinyPalette_Clefable, + .iconSprite = gMonIcon_Clefable, + .iconPalIndex = 0, FOOTPRINT(Clefable) - LEARNSETS(Clefable), + .levelUpLearnset = sClefableLevelUpLearnset, + .teachableLearnset = sClefableTeachableLearnset, }, #endif //P_FAMILY_CLEFAIRY @@ -3601,16 +3958,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "orbs fly like will-o'-the-wisps. Just\n" "before evolution, its six tails grow hot \n" "as if on fire."), - FRONT_PIC(Vulpix, 56, 48), + .frontPic = gMonFrontPic_Vulpix, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Vulpix, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Vulpix, 64, 48), + .backPic = gMonBackPic_Vulpix, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Vulpix), - ICON(Vulpix, 5), - LEARNSETS(Vulpix), + .palette = gMonPalette_Vulpix, + .shinyPalette = gMonShinyPalette_Vulpix, + .iconSprite = gMonIcon_Vulpix, + .iconPalIndex = 5, + .levelUpLearnset = sVulpixLevelUpLearnset, + .teachableLearnset = sVulpixTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}), }, @@ -3652,16 +4014,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "nine tails embody an enchanted power.\n" "A long-lived Ninetales will have fur that\n" "shines like gold."), - FRONT_PIC(Ninetales, 64, 64), + .frontPic = gMonFrontPic_Ninetales, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Ninetales, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Ninetales, 64, 56), + .backPic = gMonBackPic_Ninetales, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Ninetales), - ICON(Ninetales, 3), - LEARNSETS(Ninetales), + .palette = gMonPalette_Ninetales, + .shinyPalette = gMonShinyPalette_Ninetales, + .iconSprite = gMonIcon_Ninetales, + .iconPalIndex = 3, + .levelUpLearnset = sNinetalesLevelUpLearnset, + .teachableLearnset = sNinetalesTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -3702,16 +4069,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "one another. In hot weather, this Pokémon\n" "makes ice shards with its six tails and\n" "sprays them around to cool itself off."), - FRONT_PIC(VulpixAlolan, 48, 48), + .frontPic = gMonFrontPic_VulpixAlolan, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_VulpixAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(VulpixAlolan, 64, 56), + .backPic = gMonBackPic_VulpixAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(VulpixAlolan), - ICON(VulpixAlolan, 2), - LEARNSETS(VulpixAlolan), + .palette = gMonPalette_VulpixAlolan, + .shinyPalette = gMonShinyPalette_VulpixAlolan, + .iconSprite = gMonIcon_VulpixAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sVulpixAlolanLevelUpLearnset, + .teachableLearnset = sVulpixAlolanTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}), .isAlolanForm = TRUE, }, @@ -3754,16 +4126,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "on a snowy mountain down to the\n" "mountain's base, it won't forgive anyone\n" "who harms nature."), - FRONT_PIC(NinetalesAlolan, 64, 64), + .frontPic = gMonFrontPic_NinetalesAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_NinetalesAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(NinetalesAlolan, 64, 56), + .backPic = gMonBackPic_NinetalesAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(NinetalesAlolan), - ICON(NinetalesAlolan, 2), - LEARNSETS(NinetalesAlolan), + .palette = gMonPalette_NinetalesAlolan, + .shinyPalette = gMonShinyPalette_NinetalesAlolan, + .iconSprite = gMonIcon_NinetalesAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sNinetalesAlolanLevelUpLearnset, + .teachableLearnset = sNinetalesAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -3812,17 +4189,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Igglybuff, 32, 32), + .frontPic = gMonFrontPic_Igglybuff, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Igglybuff, .frontAnimId = ANIM_SWING_CONCAVE_FAST, - BACK_PIC(Igglybuff, 40, 40), + .backPic = gMonBackPic_Igglybuff, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Igglybuff), - ICON(Igglybuff, 1), + .palette = gMonPalette_Igglybuff, + .shinyPalette = gMonShinyPalette_Igglybuff, + .iconSprite = gMonIcon_Igglybuff, + .iconPalIndex = 1, FOOTPRINT(Igglybuff) - LEARNSETS(Igglybuff), + .levelUpLearnset = sIgglybuffLevelUpLearnset, + .teachableLearnset = sIgglybuffTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}), }, #endif //P_GEN_2_CROSS_EVOS @@ -3863,17 +4245,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Jigglypuff, 40, 40), + .frontPic = gMonFrontPic_Jigglypuff, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Jigglypuff, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, - BACK_PIC(Jigglypuff, 56, 48), + .backPic = gMonBackPic_Jigglypuff, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Jigglypuff), - ICON(Jigglypuff, 0), + .palette = gMonPalette_Jigglypuff, + .shinyPalette = gMonShinyPalette_Jigglypuff, + .iconSprite = gMonIcon_Jigglypuff, + .iconPalIndex = 0, FOOTPRINT(Jigglypuff) - LEARNSETS(Jigglypuff), + .levelUpLearnset = sJigglypuffLevelUpLearnset, + .teachableLearnset = sJigglypuffTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}), }, @@ -3921,17 +4308,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wigglytuff, 48, 64), + .frontPic = gMonFrontPic_Wigglytuff, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Wigglytuff, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Wigglytuff, 56, 64), + .backPic = gMonBackPic_Wigglytuff, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_GROW, - PALETTES(Wigglytuff), - ICON(Wigglytuff, 0), + .palette = gMonPalette_Wigglytuff, + .shinyPalette = gMonShinyPalette_Wigglytuff, + .iconSprite = gMonIcon_Wigglytuff, + .iconPalIndex = 0, FOOTPRINT(Wigglytuff) - LEARNSETS(Wigglytuff), + .levelUpLearnset = sWigglytuffLevelUpLearnset, + .teachableLearnset = sWigglytuffTeachableLearnset, }, #endif //P_FAMILY_JIGGLYPUFF @@ -3970,20 +4362,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Zubat, 56, 48), - FRONT_PIC_FEMALE(Zubat, 56, 48), + .frontPic = gMonFrontPic_Zubat, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_ZubatF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Zubat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 16, - BACK_PIC(Zubat, 56, 56), - BACK_PIC_FEMALE(Zubat, 56, 56), + .backPic = gMonBackPic_Zubat, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_ZubatF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Zubat), - ICON(Zubat, 2), + .palette = gMonPalette_Zubat, + .shinyPalette = gMonShinyPalette_Zubat, + .iconSprite = gMonIcon_Zubat, + .iconPalIndex = 2, FOOTPRINT(Zubat) - LEARNSETS(Zubat), + .levelUpLearnset = sZubatLevelUpLearnset, + .teachableLearnset = sZubatTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_GOLBAT}), }, @@ -4021,20 +4420,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Golbat, 64, 56), - FRONT_PIC_FEMALE(Golbat, 64, 56), + .frontPic = gMonFrontPic_Golbat, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_GolbatF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Golbat, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 10, - BACK_PIC(Golbat, 56, 40), - BACK_PIC_FEMALE(Golbat, 56, 40), + .backPic = gMonBackPic_Golbat, + .backPicSize = MON_COORDS_SIZE(56, 40), + .backPicFemale = gMonBackPic_GolbatF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Golbat), - ICON(Golbat, 2), + .palette = gMonPalette_Golbat, + .shinyPalette = gMonShinyPalette_Golbat, + .iconSprite = gMonIcon_Golbat, + .iconPalIndex = 2, FOOTPRINT(Golbat) - LEARNSETS(Golbat), + .levelUpLearnset = sGolbatLevelUpLearnset, + .teachableLearnset = sGolbatTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_CROBAT}), }, @@ -4079,18 +4485,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 281, .trainerOffset = 1, - FRONT_PIC(Crobat, 64, 56), + .frontPic = gMonFrontPic_Crobat, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Crobat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, - BACK_PIC(Crobat, 64, 64), + .backPic = gMonBackPic_Crobat, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Crobat), - ICON(Crobat, 2), + .palette = gMonPalette_Crobat, + .shinyPalette = gMonShinyPalette_Crobat, + .iconSprite = gMonIcon_Crobat, + .iconPalIndex = 2, FOOTPRINT(Crobat) - LEARNSETS(Crobat), + .levelUpLearnset = sCrobatLevelUpLearnset, + .teachableLearnset = sCrobatTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ZUBAT @@ -4131,17 +4542,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Oddish, 40, 40), + .frontPic = gMonFrontPic_Oddish, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Oddish, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Oddish, 48, 48), + .backPic = gMonBackPic_Oddish, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Oddish), - ICON(Oddish, 4), + .palette = gMonPalette_Oddish, + .shinyPalette = gMonShinyPalette_Oddish, + .iconSprite = gMonIcon_Oddish, + .iconPalIndex = 4, FOOTPRINT(Oddish) - LEARNSETS(Oddish), + .levelUpLearnset = sOddishLevelUpLearnset, + .teachableLearnset = sOddishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_GLOOM}), }, @@ -4180,19 +4596,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gloom, 56, 48), - FRONT_PIC_FEMALE(Gloom, 56, 48), + .frontPic = gMonFrontPic_Gloom, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_GloomF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Gloom, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Gloom, 64, 48), - BACK_PIC_FEMALE(Gloom, 64, 48), + .backPic = gMonBackPic_Gloom, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_GloomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Gloom), - ICON(Gloom, 0), + .palette = gMonPalette_Gloom, + .shinyPalette = gMonShinyPalette_Gloom, + .iconSprite = gMonIcon_Gloom, + .iconPalIndex = 0, FOOTPRINT(Gloom) - LEARNSETS(Gloom), + .levelUpLearnset = sGloomLevelUpLearnset, + .teachableLearnset = sGloomTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}), }, @@ -4240,19 +4663,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vileplume, 56, 56), - FRONT_PIC_FEMALE(Vileplume, 56, 56), + .frontPic = gMonFrontPic_Vileplume, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_VileplumeF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Vileplume, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Vileplume, 64, 56), - BACK_PIC_FEMALE(Vileplume, 64, 56), + .backPic = gMonBackPic_Vileplume, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_VileplumeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Vileplume), - ICON(Vileplume, 0), + .palette = gMonPalette_Vileplume, + .shinyPalette = gMonShinyPalette_Vileplume, + .iconSprite = gMonIcon_Vileplume, + .iconPalIndex = 0, FOOTPRINT(Vileplume) - LEARNSETS(Vileplume), + .levelUpLearnset = sVileplumeLevelUpLearnset, + .teachableLearnset = sVileplumeTeachableLearnset, }, #if P_GEN_2_CROSS_EVOS @@ -4299,17 +4729,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bellossom, 32, 40), + .frontPic = gMonFrontPic_Bellossom, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Bellossom, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Bellossom, 48, 48), + .backPic = gMonBackPic_Bellossom, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Bellossom), - ICON(Bellossom, 1), + .palette = gMonPalette_Bellossom, + .shinyPalette = gMonShinyPalette_Bellossom, + .iconSprite = gMonIcon_Bellossom, + .iconPalIndex = 1, FOOTPRINT(Bellossom) - LEARNSETS(Bellossom), + .levelUpLearnset = sBellossomLevelUpLearnset, + .teachableLearnset = sBellossomTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ODDISH @@ -4351,18 +4786,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Paras, 48, 40), + .frontPic = gMonFrontPic_Paras, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Paras, .frontAnimId = ANIM_H_SLIDE_SLOW, .frontAnimDelay = 10, - BACK_PIC(Paras, 64, 32), + .backPic = gMonBackPic_Paras, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Paras), - ICON(Paras, 0), + .palette = gMonPalette_Paras, + .shinyPalette = gMonShinyPalette_Paras, + .iconSprite = gMonIcon_Paras, + .iconPalIndex = 0, FOOTPRINT(Paras) - LEARNSETS(Paras), + .levelUpLearnset = sParasLevelUpLearnset, + .teachableLearnset = sParasTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_PARASECT}), }, @@ -4403,18 +4843,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Parasect, 56, 56), + .frontPic = gMonFrontPic_Parasect, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Parasect, .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 45, - BACK_PIC(Parasect, 64, 40), + .backPic = gMonBackPic_Parasect, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Parasect), - ICON(Parasect, 0), + .palette = gMonPalette_Parasect, + .shinyPalette = gMonShinyPalette_Parasect, + .iconSprite = gMonIcon_Parasect, + .iconPalIndex = 0, FOOTPRINT(Parasect) - LEARNSETS(Parasect), + .levelUpLearnset = sParasectLevelUpLearnset, + .teachableLearnset = sParasectTeachableLearnset, }, #endif //P_FAMILY_PARAS @@ -4453,18 +4898,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = -1, - FRONT_PIC(Venonat, 40, 56), + .frontPic = gMonFrontPic_Venonat, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Venonat, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimDelay = 20, - BACK_PIC(Venonat, 64, 56), + .backPic = gMonBackPic_Venonat, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Venonat), - ICON(Venonat, 2), + .palette = gMonPalette_Venonat, + .shinyPalette = gMonShinyPalette_Venonat, + .iconSprite = gMonIcon_Venonat, + .iconPalIndex = 2, FOOTPRINT(Venonat) - LEARNSETS(Venonat), + .levelUpLearnset = sVenonatLevelUpLearnset, + .teachableLearnset = sVenonatTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_VENOMOTH}), }, @@ -4504,18 +4954,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 1, - FRONT_PIC(Venomoth, 64, 48), + .frontPic = gMonFrontPic_Venomoth, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Venomoth, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 16, - BACK_PIC(Venomoth, 64, 56), + .backPic = gMonBackPic_Venomoth, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Venomoth), - ICON(Venomoth, 2), + .palette = gMonPalette_Venomoth, + .shinyPalette = gMonShinyPalette_Venomoth, + .iconSprite = gMonIcon_Venomoth, + .iconPalIndex = 2, FOOTPRINT(Venomoth) - LEARNSETS(Venomoth), + .levelUpLearnset = sVenomothLevelUpLearnset, + .teachableLearnset = sVenomothTeachableLearnset, }, #endif //P_FAMILY_VENONAT @@ -4568,17 +5023,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "The reason is simple--wherever they\n" "burrow, the soil is left perfectly tilled\n" "for growing delicious crops."), - FRONT_PIC(Diglett, 32, 32), + .frontPic = gMonFrontPic_Diglett, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Diglett, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 25, - BACK_PIC(Diglett, 40, 40), + .backPic = gMonBackPic_Diglett, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Diglett), - ICON(Diglett, 2), - LEARNSETS(Diglett), + .palette = gMonPalette_Diglett, + .shinyPalette = gMonShinyPalette_Diglett, + .iconSprite = gMonIcon_Diglett, + .iconPalIndex = 2, + .levelUpLearnset = sDiglettLevelUpLearnset, + .teachableLearnset = sDiglettTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO}), }, @@ -4619,17 +5079,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "one body, they think exactly alike.\n" "They work cooperatively to burrow\n" "endlessly through the ground."), - FRONT_PIC(Dugtrio, 48, 48), + .frontPic = gMonFrontPic_Dugtrio, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Dugtrio, .frontAnimId = ANIM_H_SHAKE_SLOW, .frontAnimDelay = 35, - BACK_PIC(Dugtrio, 48, 32), + .backPic = gMonBackPic_Dugtrio, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Dugtrio), - ICON(Dugtrio, 2), - LEARNSETS(Dugtrio), + .palette = gMonPalette_Dugtrio, + .shinyPalette = gMonShinyPalette_Dugtrio, + .iconSprite = gMonIcon_Dugtrio, + .iconPalIndex = 2, + .levelUpLearnset = sDugtrioLevelUpLearnset, + .teachableLearnset = sDugtrioTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -4670,16 +5135,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "caused it to develop steel whiskers on its\n" "head that change shape depending on its\n" "mood and when communicating with others."), - FRONT_PIC(DiglettAlolan, 32, 40), + .frontPic = gMonFrontPic_DiglettAlolan, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 19, .frontAnimFrames = sAnims_DiglettAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DiglettAlolan, 40, 48), + .backPic = gMonBackPic_DiglettAlolan, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DiglettAlolan), - ICON(DiglettAlolan, 2), - LEARNSETS(DiglettAlolan), + .palette = gMonPalette_DiglettAlolan, + .shinyPalette = gMonShinyPalette_DiglettAlolan, + .iconSprite = gMonIcon_DiglettAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sDiglettAlolanLevelUpLearnset, + .teachableLearnset = sDiglettAlolanTeachableLearnset, .isAlolanForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}), }, @@ -4722,16 +5192,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "a sort of protective helmet on\n" "heir heads, and they also function\n" "as highly precise sensors."), - FRONT_PIC(DugtrioAlolan, 48, 48), + .frontPic = gMonFrontPic_DugtrioAlolan, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_DugtrioAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DugtrioAlolan, 64, 32), + .backPic = gMonBackPic_DugtrioAlolan, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DugtrioAlolan), - ICON(DugtrioAlolan, 2), - LEARNSETS(DugtrioAlolan), + .palette = gMonPalette_DugtrioAlolan, + .shinyPalette = gMonShinyPalette_DugtrioAlolan, + .iconSprite = gMonIcon_DugtrioAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sDugtrioAlolanLevelUpLearnset, + .teachableLearnset = sDugtrioAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -4775,17 +5250,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Meowth, 48, 48), + .frontPic = gMonFrontPic_Meowth, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Meowth, .frontAnimId = ANIM_V_JUMPS_SMALL, .frontAnimDelay = 40, - BACK_PIC(Meowth, 56, 56), + .backPic = gMonBackPic_Meowth, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Meowth), - ICON(Meowth, 1), - LEARNSETS(Meowth), + .palette = gMonPalette_Meowth, + .shinyPalette = gMonShinyPalette_Meowth, + .iconSprite = gMonIcon_Meowth, + .iconPalIndex = 1, + .levelUpLearnset = sMeowthLevelUpLearnset, + .teachableLearnset = sMeowthTeachableLearnset, .formChangeTable = sMeowthFormChangeTable, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERSIAN}), }, @@ -4827,17 +5307,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Persian, 64, 56), + .frontPic = gMonFrontPic_Persian, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Persian, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, - BACK_PIC(Persian, 64, 56), + .backPic = gMonBackPic_Persian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Persian), - ICON(Persian, 1), - LEARNSETS(Persian), + .palette = gMonPalette_Persian, + .shinyPalette = gMonShinyPalette_Persian, + .iconSprite = gMonIcon_Persian, + .iconPalIndex = 1, + .levelUpLearnset = sPersianLevelUpLearnset, + .teachableLearnset = sPersianTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -4878,16 +5363,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MeowthAlolan, 48, 48), + .frontPic = gMonFrontPic_MeowthAlolan, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_MeowthAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MeowthAlolan, 64, 56), + .backPic = gMonBackPic_MeowthAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MeowthAlolan), - ICON(MeowthAlolan, 2), - LEARNSETS(MeowthAlolan), + .palette = gMonPalette_MeowthAlolan, + .shinyPalette = gMonShinyPalette_MeowthAlolan, + .iconSprite = gMonIcon_MeowthAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sMeowthAlolanLevelUpLearnset, + .teachableLearnset = sMeowthAlolanTeachableLearnset, .isAlolanForm = TRUE, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}), }, @@ -4929,16 +5419,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PersianAlolan, 56, 56), + .frontPic = gMonFrontPic_PersianAlolan, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_PersianAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PersianAlolan, 64, 56), + .backPic = gMonBackPic_PersianAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PersianAlolan), - ICON(PersianAlolan, 2), - LEARNSETS(PersianAlolan), + .palette = gMonPalette_PersianAlolan, + .shinyPalette = gMonShinyPalette_PersianAlolan, + .iconSprite = gMonIcon_PersianAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sPersianAlolanLevelUpLearnset, + .teachableLearnset = sPersianAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -4980,16 +5475,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MeowthGalarian, 48, 48), + .frontPic = gMonFrontPic_MeowthGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_MeowthGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MeowthGalarian, 64, 56), + .backPic = gMonBackPic_MeowthGalarian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MeowthGalarian), - ICON(MeowthGalarian, 0), - LEARNSETS(MeowthGalarian), + .palette = gMonPalette_MeowthGalarian, + .shinyPalette = gMonShinyPalette_MeowthGalarian, + .iconSprite = gMonIcon_MeowthGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sMeowthGalarianLevelUpLearnset, + .teachableLearnset = sMeowthGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERRSERKER}), }, @@ -5027,17 +5527,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Perrserker, 48, 64), + .frontPic = gMonFrontPic_Perrserker, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Perrserker, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Perrserker, 64, 56), + .backPic = gMonBackPic_Perrserker, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Perrserker), - ICON(Perrserker, 2), + .palette = gMonPalette_Perrserker, + .shinyPalette = gMonShinyPalette_Perrserker, + .iconSprite = gMonIcon_Perrserker, + .iconPalIndex = 2, FOOTPRINT(Perrserker) - LEARNSETS(Perrserker), + .levelUpLearnset = sPerrserkerLevelUpLearnset, + .teachableLearnset = sPerrserkerTeachableLearnset, }, #endif //P_GALARIAN_FORMS @@ -5079,16 +5584,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MeowthGigantamax, 64, 64), + .frontPic = gMonFrontPic_MeowthGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_MeowthGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MeowthGigantamax, 64, 64), + .backPic = gMonBackPic_MeowthGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MeowthGigantamax), - ICON(MeowthGigantamax, 1), - LEARNSETS(Meowth), + .palette = gMonPalette_MeowthGigantamax, + .shinyPalette = gMonShinyPalette_MeowthGigantamax, + .iconSprite = gMonIcon_MeowthGigantamax, + .iconPalIndex = 1, + .levelUpLearnset = sMeowthLevelUpLearnset, + .teachableLearnset = sMeowthTeachableLearnset, .isGigantamax = TRUE, .formChangeTable = sMeowthFormChangeTable, }, @@ -5130,17 +5640,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Psyduck, 40, 48), + .frontPic = gMonFrontPic_Psyduck, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Psyduck, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Psyduck, 48, 48), + .backPic = gMonBackPic_Psyduck, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Psyduck), - ICON(Psyduck, 1), + .palette = gMonPalette_Psyduck, + .shinyPalette = gMonShinyPalette_Psyduck, + .iconSprite = gMonIcon_Psyduck, + .iconPalIndex = 1, FOOTPRINT(Psyduck) - LEARNSETS(Psyduck), + .levelUpLearnset = sPsyduckLevelUpLearnset, + .teachableLearnset = sPsyduckTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_GOLDUCK}), }, @@ -5178,17 +5693,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 273, .trainerOffset = 1, - FRONT_PIC(Golduck, 64, 64), + .frontPic = gMonFrontPic_Golduck, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Golduck, .frontAnimId = ANIM_H_SHAKE_SLOW, - BACK_PIC(Golduck, 64, 64), + .backPic = gMonBackPic_Golduck, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Golduck), - ICON(Golduck, 0), + .palette = gMonPalette_Golduck, + .shinyPalette = gMonShinyPalette_Golduck, + .iconSprite = gMonIcon_Golduck, + .iconPalIndex = 0, FOOTPRINT(Golduck) - LEARNSETS(Golduck), + .levelUpLearnset = sGolduckLevelUpLearnset, + .teachableLearnset = sGolduckTeachableLearnset, }, #endif //P_FAMILY_PSYDUCK @@ -5227,18 +5747,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mankey, 56, 48), + .frontPic = gMonFrontPic_Mankey, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Mankey, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 20, - BACK_PIC(Mankey, 64, 48), + .backPic = gMonBackPic_Mankey, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Mankey), - ICON(Mankey, 1), + .palette = gMonPalette_Mankey, + .shinyPalette = gMonShinyPalette_Mankey, + .iconSprite = gMonIcon_Mankey, + .iconPalIndex = 1, FOOTPRINT(Mankey) - LEARNSETS(Mankey), + .levelUpLearnset = sMankeyLevelUpLearnset, + .teachableLearnset = sMankeyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PRIMEAPE}), }, @@ -5276,17 +5801,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Primeape, 64, 56), + .frontPic = gMonFrontPic_Primeape, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Primeape, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, - BACK_PIC(Primeape, 64, 48), + .backPic = gMonBackPic_Primeape, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Primeape), - ICON(Primeape, 2), + .palette = gMonPalette_Primeape, + .shinyPalette = gMonShinyPalette_Primeape, + .iconSprite = gMonIcon_Primeape, + .iconPalIndex = 2, FOOTPRINT(Primeape) - LEARNSETS(Primeape), + .levelUpLearnset = sPrimeapeLevelUpLearnset, + .teachableLearnset = sPrimeapeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_MOVE_TWENTY_TIMES, MOVE_RAGE_FIST, SPECIES_ANNIHILAPE}), }, @@ -5325,17 +5855,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Annihilape, 64, 64), + .frontPic = gMonFrontPic_Annihilape, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Annihilape, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Annihilape, 64, 64), + .backPic = gMonBackPic_Annihilape, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Annihilape), - ICON(Annihilape, 0), + .palette = gMonPalette_Annihilape, + .shinyPalette = gMonShinyPalette_Annihilape, + .iconSprite = gMonIcon_Annihilape, + .iconPalIndex = 0, //FOOTPRINT(Annihilape) - LEARNSETS(Annihilape), + .levelUpLearnset = sAnnihilapeLevelUpLearnset, + .teachableLearnset = sAnnihilapeTeachableLearnset, }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY @@ -5377,17 +5912,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Growlithe, 48, 48), + .frontPic = gMonFrontPic_Growlithe, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Growlithe, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 30, - BACK_PIC(Growlithe, 48, 56), + .backPic = gMonBackPic_Growlithe, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Growlithe), - ICON(Growlithe, 3), - LEARNSETS(Growlithe), + .palette = gMonPalette_Growlithe, + .shinyPalette = gMonShinyPalette_Growlithe, + .iconSprite = gMonIcon_Growlithe, + .iconPalIndex = 3, + .levelUpLearnset = sGrowlitheLevelUpLearnset, + .teachableLearnset = sGrowlitheTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}), }, @@ -5427,17 +5967,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 312, .trainerOffset = 4, - FRONT_PIC(Arcanine, 64, 64), + .frontPic = gMonFrontPic_Arcanine, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Arcanine, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 8, - BACK_PIC(Arcanine, 64, 56), + .backPic = gMonBackPic_Arcanine, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Arcanine), - ICON(Arcanine, 3), - LEARNSETS(Arcanine), + .palette = gMonPalette_Arcanine, + .shinyPalette = gMonShinyPalette_Arcanine, + .iconSprite = gMonIcon_Arcanine, + .iconPalIndex = 3, + .levelUpLearnset = sArcanineLevelUpLearnset, + .teachableLearnset = sArcanineTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -5477,16 +6022,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GrowlitheHisuian, 48, 48), + .frontPic = gMonFrontPic_GrowlitheHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_GrowlitheHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GrowlitheHisuian, 56, 56), + .backPic = gMonBackPic_GrowlitheHisuian, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GrowlitheHisuian), - ICON(GrowlitheHisuian, 0), - LEARNSETS(GrowlitheHisuian), + .palette = gMonPalette_GrowlitheHisuian, + .shinyPalette = gMonShinyPalette_GrowlitheHisuian, + .iconSprite = gMonIcon_GrowlitheHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sGrowlitheHisuianLevelUpLearnset, + .teachableLearnset = sGrowlitheHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUIAN}), }, @@ -5527,16 +6077,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 312, .trainerOffset = 4, - FRONT_PIC(ArcanineHisuian, 64, 64), + .frontPic = gMonFrontPic_ArcanineHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ArcanineHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ArcanineHisuian, 64, 64), + .backPic = gMonBackPic_ArcanineHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ArcanineHisuian), - ICON(ArcanineHisuian, 0), - LEARNSETS(ArcanineHisuian), + .palette = gMonPalette_ArcanineHisuian, + .shinyPalette = gMonShinyPalette_ArcanineHisuian, + .iconSprite = gMonIcon_ArcanineHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sArcanineHisuianLevelUpLearnset, + .teachableLearnset = sArcanineHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -5578,17 +6133,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poliwag, 64, 40), + .frontPic = gMonFrontPic_Poliwag, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Poliwag, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Poliwag, 48, 32), + .backPic = gMonBackPic_Poliwag, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Poliwag), - ICON(Poliwag, 0), + .palette = gMonPalette_Poliwag, + .shinyPalette = gMonShinyPalette_Poliwag, + .iconSprite = gMonIcon_Poliwag, + .iconPalIndex = 0, FOOTPRINT(Poliwag) - LEARNSETS(Poliwag), + .levelUpLearnset = sPoliwagLevelUpLearnset, + .teachableLearnset = sPoliwagTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_POLIWHIRL}), }, @@ -5628,18 +6188,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poliwhirl, 64, 48), + .frontPic = gMonFrontPic_Poliwhirl, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Poliwhirl, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 5, - BACK_PIC(Poliwhirl, 64, 40), + .backPic = gMonBackPic_Poliwhirl, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Poliwhirl), - ICON(Poliwhirl, 0), + .palette = gMonPalette_Poliwhirl, + .shinyPalette = gMonShinyPalette_Poliwhirl, + .iconSprite = gMonIcon_Poliwhirl, + .iconPalIndex = 0, FOOTPRINT(Poliwhirl) - LEARNSETS(Poliwhirl), + .levelUpLearnset = sPoliwhirlLevelUpLearnset, + .teachableLearnset = sPoliwhirlTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}, {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}), @@ -5689,17 +6254,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poliwrath, 64, 56), + .frontPic = gMonFrontPic_Poliwrath, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Poliwrath, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Poliwrath, 64, 56), + .backPic = gMonBackPic_Poliwrath, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Poliwrath), - ICON(Poliwrath, 0), + .palette = gMonPalette_Poliwrath, + .shinyPalette = gMonShinyPalette_Poliwrath, + .iconSprite = gMonIcon_Poliwrath, + .iconPalIndex = 0, FOOTPRINT(Poliwrath) - LEARNSETS(Poliwrath), + .levelUpLearnset = sPoliwrathLevelUpLearnset, + .teachableLearnset = sPoliwrathTeachableLearnset, }, #if P_GEN_2_CROSS_EVOS @@ -5745,20 +6315,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Politoed, 48, 56), - FRONT_PIC_FEMALE(Politoed, 48, 56), + .frontPic = gMonFrontPic_Politoed, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_PolitoedF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Politoed, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 40, - BACK_PIC(Politoed, 56, 56), - BACK_PIC_FEMALE(Politoed, 56, 56), + .backPic = gMonBackPic_Politoed, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_PolitoedF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Politoed), - ICON(Politoed, 1), + .palette = gMonPalette_Politoed, + .shinyPalette = gMonShinyPalette_Politoed, + .iconSprite = gMonIcon_Politoed, + .iconPalIndex = 1, FOOTPRINT(Politoed) - LEARNSETS(Politoed), + .levelUpLearnset = sPolitoedLevelUpLearnset, + .teachableLearnset = sPolitoedTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_POLIWAG @@ -5805,17 +6382,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Abra, 56, 48), + .frontPic = gMonFrontPic_Abra, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Abra, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Abra, 56, 48), + .backPic = gMonBackPic_Abra, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Abra), - ICON(Abra, 2), + .palette = gMonPalette_Abra, + .shinyPalette = gMonShinyPalette_Abra, + .iconSprite = gMonIcon_Abra, + .iconPalIndex = 2, FOOTPRINT(Abra) - LEARNSETS(Abra), + .levelUpLearnset = sAbraLevelUpLearnset, + .teachableLearnset = sAbraTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_KADABRA}), }, @@ -5855,19 +6437,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kadabra, 64, 56), - FRONT_PIC_FEMALE(Kadabra, 64, 56), + .frontPic = gMonFrontPic_Kadabra, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_KadabraF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Kadabra, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Kadabra, 64, 48), - BACK_PIC_FEMALE(Kadabra, 64, 48), + .backPic = gMonBackPic_Kadabra, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_KadabraF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Kadabra), - ICON(Kadabra, 2), + .palette = gMonPalette_Kadabra, + .shinyPalette = gMonShinyPalette_Kadabra, + .iconSprite = gMonIcon_Kadabra, + .iconPalIndex = 2, FOOTPRINT(Kadabra) - LEARNSETS(Kadabra), + .levelUpLearnset = sKadabraLevelUpLearnset, + .teachableLearnset = sKadabraTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_ALAKAZAM}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_ALAKAZAM}), }, @@ -5890,7 +6479,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_ALAKAZAM, .categoryName = _("Psi"), FOOTPRINT(Alakazam) - LEARNSETS(Alakazam), + .levelUpLearnset = sAlakazamLevelUpLearnset, + .teachableLearnset = sAlakazamTeachableLearnset, .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, @@ -5921,17 +6511,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Alakazam, 64, 64), - FRONT_PIC_FEMALE(Alakazam, 64, 64), + .frontPic = gMonFrontPic_Alakazam, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_AlakazamF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Alakazam, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Alakazam, 64, 56), - BACK_PIC_FEMALE(Alakazam, 64, 56), + .backPic = gMonBackPic_Alakazam, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_AlakazamF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Alakazam), - ICON(Alakazam, 2), + .palette = gMonPalette_Alakazam, + .shinyPalette = gMonShinyPalette_Alakazam, + .iconSprite = gMonIcon_Alakazam, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -5951,7 +6547,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_ALAKAZAM, .categoryName = _("Psi"), FOOTPRINT(Alakazam) - LEARNSETS(Alakazam), + .levelUpLearnset = sAlakazamLevelUpLearnset, + .teachableLearnset = sAlakazamTeachableLearnset, .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, .formChangeTable = sAlakazamFormChangeTable, .baseHP = 55, @@ -5973,16 +6570,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(AlakazamMega, 64, 64), + .frontPic = gMonFrontPic_AlakazamMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AlakazamMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(AlakazamMega, 64, 64), + .backPic = gMonBackPic_AlakazamMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(AlakazamMega), - ICON(AlakazamMega, 2), + .palette = gMonPalette_AlakazamMega, + .shinyPalette = gMonShinyPalette_AlakazamMega, + .iconSprite = gMonIcon_AlakazamMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -6030,17 +6631,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Machop, 48, 48), + .frontPic = gMonFrontPic_Machop, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Machop, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Machop, 48, 56), + .backPic = gMonBackPic_Machop, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Machop), - ICON(Machop, 0), + .palette = gMonPalette_Machop, + .shinyPalette = gMonShinyPalette_Machop, + .iconSprite = gMonIcon_Machop, + .iconPalIndex = 0, FOOTPRINT(Machop) - LEARNSETS(Machop), + .levelUpLearnset = sMachopLevelUpLearnset, + .teachableLearnset = sMachopTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MACHOKE}), }, @@ -6080,17 +6686,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 9, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Machoke, 56, 56), + .frontPic = gMonFrontPic_Machoke, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Machoke, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Machoke, 64, 48), + .backPic = gMonBackPic_Machoke, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Machoke), - ICON(Machoke, 2), + .palette = gMonPalette_Machoke, + .shinyPalette = gMonShinyPalette_Machoke, + .iconSprite = gMonIcon_Machoke, + .iconPalIndex = 2, FOOTPRINT(Machoke) - LEARNSETS(Machoke), + .levelUpLearnset = sMachokeLevelUpLearnset, + .teachableLearnset = sMachokeTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_MACHAMP}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_MACHAMP}), }, @@ -6128,7 +6739,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MACHAMP, .categoryName = _("Superpower"), FOOTPRINT(Machamp) - LEARNSETS(Machamp), + .levelUpLearnset = sMachampLevelUpLearnset, + .teachableLearnset = sMachampTeachableLearnset, .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, .height = 16, @@ -6142,15 +6754,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 269, .trainerOffset = -1, - FRONT_PIC(Machamp, 64, 64), + .frontPic = gMonFrontPic_Machamp, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Machamp, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Machamp, 64, 56), + .backPic = gMonBackPic_Machamp, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Machamp), - ICON(Machamp, 0), + .palette = gMonPalette_Machamp, + .shinyPalette = gMonShinyPalette_Machamp, + .iconSprite = gMonIcon_Machamp, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -6179,7 +6795,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MACHAMP, .categoryName = _("Superpower"), FOOTPRINT(Machamp) - LEARNSETS(Machamp), + .levelUpLearnset = sMachampLevelUpLearnset, + .teachableLearnset = sMachampTeachableLearnset, .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, .height = 250, @@ -6193,15 +6810,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 269, .trainerOffset = -1, - FRONT_PIC(MachampGigantamax, 64, 64), + .frontPic = gMonFrontPic_MachampGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MachampGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MachampGigantamax, 64, 64), + .backPic = gMonBackPic_MachampGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MachampGigantamax), - ICON(MachampGigantamax, 0), + .palette = gMonPalette_MachampGigantamax, + .shinyPalette = gMonShinyPalette_MachampGigantamax, + .iconSprite = gMonIcon_MachampGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -6242,17 +6863,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bellsprout, 40, 40), + .frontPic = gMonFrontPic_Bellsprout, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Bellsprout, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Bellsprout, 40, 48), + .backPic = gMonBackPic_Bellsprout, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Bellsprout), - ICON(Bellsprout, 1), + .palette = gMonPalette_Bellsprout, + .shinyPalette = gMonShinyPalette_Bellsprout, + .iconSprite = gMonIcon_Bellsprout, + .iconPalIndex = 1, FOOTPRINT(Bellsprout) - LEARNSETS(Bellsprout), + .levelUpLearnset = sBellsproutLevelUpLearnset, + .teachableLearnset = sBellsproutTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_WEEPINBELL}), }, @@ -6290,18 +6916,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Weepinbell, 56, 48), + .frontPic = gMonFrontPic_Weepinbell, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Weepinbell, .frontAnimId = ANIM_SWING_CONVEX, .frontAnimDelay = 3, - BACK_PIC(Weepinbell, 64, 48), + .backPic = gMonBackPic_Weepinbell, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Weepinbell), - ICON(Weepinbell, 1), + .palette = gMonPalette_Weepinbell, + .shinyPalette = gMonShinyPalette_Weepinbell, + .iconSprite = gMonIcon_Weepinbell, + .iconPalIndex = 1, FOOTPRINT(Weepinbell) - LEARNSETS(Weepinbell), + .levelUpLearnset = sWeepinbellLevelUpLearnset, + .teachableLearnset = sWeepinbellTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}), }, @@ -6347,17 +6978,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 312, .trainerOffset = 3, - FRONT_PIC(Victreebel, 64, 56), + .frontPic = gMonFrontPic_Victreebel, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Victreebel, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Victreebel, 64, 56), + .backPic = gMonBackPic_Victreebel, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Victreebel), - ICON(Victreebel, 1), + .palette = gMonPalette_Victreebel, + .shinyPalette = gMonShinyPalette_Victreebel, + .iconSprite = gMonIcon_Victreebel, + .iconPalIndex = 1, FOOTPRINT(Victreebel) - LEARNSETS(Victreebel), + .levelUpLearnset = sVictreebelLevelUpLearnset, + .teachableLearnset = sVictreebelTeachableLearnset, }, #endif //P_FAMILY_BELLSPROUT @@ -6397,17 +7033,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tentacool, 48, 56), + .frontPic = gMonFrontPic_Tentacool, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Tentacool, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tentacool, 64, 48), + .backPic = gMonBackPic_Tentacool, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Tentacool), - ICON(Tentacool, 0), + .palette = gMonPalette_Tentacool, + .shinyPalette = gMonShinyPalette_Tentacool, + .iconSprite = gMonIcon_Tentacool, + .iconPalIndex = 0, FOOTPRINT(Tentacool) - LEARNSETS(Tentacool), + .levelUpLearnset = sTentacoolLevelUpLearnset, + .teachableLearnset = sTentacoolTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TENTACRUEL}), }, @@ -6446,17 +7087,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 312, .trainerOffset = 1, - FRONT_PIC(Tentacruel, 64, 56), + .frontPic = gMonFrontPic_Tentacruel, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Tentacruel, .frontAnimId = ANIM_V_SLIDE_WOBBLE, - BACK_PIC(Tentacruel, 64, 48), + .backPic = gMonBackPic_Tentacruel, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Tentacruel), - ICON(Tentacruel, 0), + .palette = gMonPalette_Tentacruel, + .shinyPalette = gMonShinyPalette_Tentacruel, + .iconSprite = gMonIcon_Tentacruel, + .iconPalIndex = 0, FOOTPRINT(Tentacruel) - LEARNSETS(Tentacruel), + .levelUpLearnset = sTentacruelLevelUpLearnset, + .teachableLearnset = sTentacruelTeachableLearnset, }, #endif //P_FAMILY_TENTACOOL @@ -6519,17 +7165,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "power of its arms. Because they look just\n" "like boulders lining paths, hikers may step\n" "on them without noticing."), - FRONT_PIC(Geodude, 64, 32), + .frontPic = gMonFrontPic_Geodude, + .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 19, .frontAnimFrames = sAnims_Geodude, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .enemyMonElevation = 10, - BACK_PIC(Geodude, 64, 48), + .backPic = gMonBackPic_Geodude, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Geodude), - ICON(Geodude, 1), - LEARNSETS(Geodude), + .palette = gMonPalette_Geodude, + .shinyPalette = gMonShinyPalette_Geodude, + .iconSprite = gMonIcon_Geodude, + .iconPalIndex = 1, + .levelUpLearnset = sGeodudeLevelUpLearnset, + .teachableLearnset = sGeodudeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER}), }, @@ -6570,16 +7221,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "down steep slopes. They are so brutal,\n" "they smash aside obstructing trees and\n" "massive boulders with thunderous tackles."), - FRONT_PIC(Graveler, 64, 48), + .frontPic = gMonFrontPic_Graveler, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Graveler, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Graveler, 64, 48), + .backPic = gMonBackPic_Graveler, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Graveler), - ICON(Graveler, 1), - LEARNSETS(Graveler), + .palette = gMonPalette_Graveler, + .shinyPalette = gMonShinyPalette_Graveler, + .iconSprite = gMonIcon_Graveler, + .iconPalIndex = 1, + .levelUpLearnset = sGravelerLevelUpLearnset, + .teachableLearnset = sGravelerTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM}), }, @@ -6621,16 +7277,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(Golem, 64, 56), + .frontPic = gMonFrontPic_Golem, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Golem, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, - BACK_PIC(Golem, 64, 48), + .backPic = gMonBackPic_Golem, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Golem), - ICON(Golem, 2), - LEARNSETS(Golem), + .palette = gMonPalette_Golem, + .shinyPalette = gMonShinyPalette_Golem, + .iconSprite = gMonIcon_Golem, + .iconPalIndex = 2, + .levelUpLearnset = sGolemLevelUpLearnset, + .teachableLearnset = sGolemTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -6672,17 +7333,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "attach to parts of its body with stronger\n" "magnetism. If you carelessly step on one,\n" "it will headbutt and shock you in anger."), - FRONT_PIC(GeodudeAlolan, 48, 32), + .frontPic = gMonFrontPic_GeodudeAlolan, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_GeodudeAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 16, - BACK_PIC(GeodudeAlolan, 64, 56), + .backPic = gMonBackPic_GeodudeAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GeodudeAlolan), - ICON(GeodudeAlolan, 2), - LEARNSETS(GeodudeAlolan), + .palette = gMonPalette_GeodudeAlolan, + .shinyPalette = gMonShinyPalette_GeodudeAlolan, + .iconSprite = gMonIcon_GeodudeAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sGeodudeAlolanLevelUpLearnset, + .teachableLearnset = sGeodudeAlolanTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}), }, @@ -6724,16 +7390,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "dravite, their favorite food, they cause\n" "flashes of light and booming noises.\n" "People call them “fireworks of the earth.”"), - FRONT_PIC(GravelerAlolan, 64, 56), + .frontPic = gMonFrontPic_GravelerAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_GravelerAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GravelerAlolan, 64, 48), + .backPic = gMonBackPic_GravelerAlolan, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GravelerAlolan), - ICON(GravelerAlolan, 2), - LEARNSETS(GravelerAlolan), + .palette = gMonPalette_GravelerAlolan, + .shinyPalette = gMonShinyPalette_GravelerAlolan, + .iconSprite = gMonIcon_GravelerAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sGravelerAlolanLevelUpLearnset, + .teachableLearnset = sGravelerAlolanTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLAN}), }, @@ -6776,16 +7447,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(GolemAlolan, 56, 64), + .frontPic = gMonFrontPic_GolemAlolan, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_GolemAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GolemAlolan, 64, 48), + .backPic = gMonBackPic_GolemAlolan, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GolemAlolan), - ICON(GolemAlolan, 2), - LEARNSETS(GolemAlolan), + .palette = gMonPalette_GolemAlolan, + .shinyPalette = gMonShinyPalette_GolemAlolan, + .iconSprite = gMonIcon_GolemAlolan, + .iconPalIndex = 2, + .levelUpLearnset = sGolemAlolanLevelUpLearnset, + .teachableLearnset = sGolemAlolanTeachableLearnset, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE @@ -6827,17 +7503,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ponyta, 56, 56), + .frontPic = gMonFrontPic_Ponyta, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Ponyta, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 10, - BACK_PIC(Ponyta, 64, 56), + .backPic = gMonBackPic_Ponyta, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Ponyta), - ICON(Ponyta, 3), - LEARNSETS(Ponyta), + .palette = gMonPalette_Ponyta, + .shinyPalette = gMonShinyPalette_Ponyta, + .iconSprite = gMonIcon_Ponyta, + .iconPalIndex = 3, + .levelUpLearnset = sPonytaLevelUpLearnset, + .teachableLearnset = sPonytaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH}), }, @@ -6877,16 +7558,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "and plains. But once a Rapidash turns\n" "serious, its fiery manes flare and blaze\n" "as it gallops its way up to 150 mph."), - FRONT_PIC(Rapidash, 64, 64), + .frontPic = gMonFrontPic_Rapidash, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Rapidash, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Rapidash, 64, 64), + .backPic = gMonBackPic_Rapidash, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Rapidash), - ICON(Rapidash, 3), - LEARNSETS(Rapidash), + .palette = gMonPalette_Rapidash, + .shinyPalette = gMonShinyPalette_Rapidash, + .iconSprite = gMonIcon_Rapidash, + .iconPalIndex = 3, + .levelUpLearnset = sRapidashLevelUpLearnset, + .teachableLearnset = sRapidashTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -6927,16 +7613,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PonytaGalarian, 64, 56), + .frontPic = gMonFrontPic_PonytaGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_PonytaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PonytaGalarian, 64, 56), + .backPic = gMonBackPic_PonytaGalarian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PonytaGalarian), - ICON(PonytaGalarian, 2), - LEARNSETS(PonytaGalarian), + .palette = gMonPalette_PonytaGalarian, + .shinyPalette = gMonShinyPalette_PonytaGalarian, + .iconSprite = gMonIcon_PonytaGalarian, + .iconPalIndex = 2, + .levelUpLearnset = sPonytaGalarianLevelUpLearnset, + .teachableLearnset = sPonytaGalarianTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}), }, @@ -6977,16 +7668,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "Unleashed from this Pokémon's horn,\n" "the move will punch a hole right\n" "through a thick metal sheet."), - FRONT_PIC(RapidashGalarian, 64, 64), + .frontPic = gMonFrontPic_RapidashGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RapidashGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(RapidashGalarian, 64, 56), + .backPic = gMonBackPic_RapidashGalarian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RapidashGalarian), - ICON(RapidashGalarian, 2), - LEARNSETS(RapidashGalarian), + .palette = gMonPalette_RapidashGalarian, + .shinyPalette = gMonShinyPalette_RapidashGalarian, + .iconSprite = gMonIcon_RapidashGalarian, + .iconPalIndex = 2, + .levelUpLearnset = sRapidashGalarianLevelUpLearnset, + .teachableLearnset = sRapidashGalarianTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA @@ -7029,16 +7725,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "water at the side of a river. But it often\n" "forgets what it is doing and spends entire\n" "days just loafing at water's edge."), - FRONT_PIC(Slowpoke, 64, 32), + .frontPic = gMonFrontPic_Slowpoke, + .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Slowpoke, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Slowpoke, 64, 40), + .backPic = gMonBackPic_Slowpoke, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Slowpoke), - ICON(Slowpoke, 0), - LEARNSETS(Slowpoke), + .palette = gMonPalette_Slowpoke, + .shinyPalette = gMonShinyPalette_Slowpoke, + .iconSprite = gMonIcon_Slowpoke, + .iconPalIndex = 0, + .levelUpLearnset = sSlowpokeLevelUpLearnset, + .teachableLearnset = sSlowpokeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}, {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}), @@ -7081,16 +7782,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(Slowbro, 56, 56), + .frontPic = gMonFrontPic_Slowbro, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Slowbro, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Slowbro, 64, 48), + .backPic = gMonBackPic_Slowbro, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Slowbro), - ICON(Slowbro, 0), - LEARNSETS(Slowbro), + .palette = gMonPalette_Slowbro, + .shinyPalette = gMonShinyPalette_Slowbro, + .iconSprite = gMonIcon_Slowbro, + .iconPalIndex = 0, + .levelUpLearnset = sSlowbroLevelUpLearnset, + .teachableLearnset = sSlowbroTeachableLearnset, .formChangeTable = sSlowbroFormChangeTable, }, @@ -7132,16 +7838,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - FRONT_PIC(Slowking, 48, 64), + .frontPic = gMonFrontPic_Slowking, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Slowking, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Slowking, 56, 64), + .backPic = gMonBackPic_Slowking, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Slowking), - ICON(Slowking, 0), - LEARNSETS(Slowking), + .palette = gMonPalette_Slowking, + .shinyPalette = gMonShinyPalette_Slowking, + .iconSprite = gMonIcon_Slowking, + .iconPalIndex = 0, + .levelUpLearnset = sSlowkingLevelUpLearnset, + .teachableLearnset = sSlowkingTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS @@ -7183,16 +7894,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(SlowbroMega, 56, 64), + .frontPic = gMonFrontPic_SlowbroMega, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SlowbroMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SlowbroMega, 64, 48), + .backPic = gMonBackPic_SlowbroMega, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(SlowbroMega), - ICON(SlowbroMega, 0), - LEARNSETS(Slowbro), + .palette = gMonPalette_SlowbroMega, + .shinyPalette = gMonShinyPalette_SlowbroMega, + .iconSprite = gMonIcon_SlowbroMega, + .iconPalIndex = 0, + .levelUpLearnset = sSlowbroLevelUpLearnset, + .teachableLearnset = sSlowbroTeachableLearnset, .formChangeTable = sSlowbroFormChangeTable, .isMegaEvolution = TRUE, }, @@ -7235,16 +7951,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "expression abruptly sharpens on occasion.\n" "The cause seems to lie in Slowpoke's diet,\n" "which also give their tails a spicy flavor."), - FRONT_PIC(SlowpokeGalarian, 56, 32), + .frontPic = gMonFrontPic_SlowpokeGalarian, + .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 19, .frontAnimFrames = sAnims_SlowpokeGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SlowpokeGalarian, 64, 40), + .backPic = gMonBackPic_SlowpokeGalarian, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SlowpokeGalarian), - ICON(SlowpokeGalarian, 1), - LEARNSETS(SlowpokeGalarian), + .palette = gMonPalette_SlowpokeGalarian, + .shinyPalette = gMonShinyPalette_SlowpokeGalarian, + .iconSprite = gMonIcon_SlowpokeGalarian, + .iconPalIndex = 1, + .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, + .teachableLearnset = sSlowpokeGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}), @@ -7287,16 +8008,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 296, .trainerOffset = 2, - FRONT_PIC(SlowbroGalarian, 64, 56), + .frontPic = gMonFrontPic_SlowbroGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_SlowbroGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SlowbroGalarian, 64, 48), + .backPic = gMonBackPic_SlowbroGalarian, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SlowbroGalarian), - ICON(SlowbroGalarian, 0), - LEARNSETS(SlowbroGalarian), + .palette = gMonPalette_SlowbroGalarian, + .shinyPalette = gMonShinyPalette_SlowbroGalarian, + .iconSprite = gMonIcon_SlowbroGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sSlowbroGalarianLevelUpLearnset, + .teachableLearnset = sSlowbroGalarianTeachableLearnset, .isGalarianForm = TRUE, }, @@ -7337,16 +8063,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - FRONT_PIC(SlowkingGalarian, 48, 64), + .frontPic = gMonFrontPic_SlowkingGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SlowkingGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SlowkingGalarian, 56, 64), + .backPic = gMonBackPic_SlowkingGalarian, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SlowkingGalarian), - ICON(SlowkingGalarian, 2), - LEARNSETS(SlowkingGalarian), + .palette = gMonPalette_SlowkingGalarian, + .shinyPalette = gMonShinyPalette_SlowkingGalarian, + .iconSprite = gMonIcon_SlowkingGalarian, + .iconPalIndex = 2, + .levelUpLearnset = sSlowkingGalarianLevelUpLearnset, + .teachableLearnset = sSlowkingGalarianTeachableLearnset, .isGalarianForm = TRUE, }, #endif //P_GEN_2_CROSS_EVOS @@ -7389,18 +8120,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magnemite, 48, 32), + .frontPic = gMonFrontPic_Magnemite, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 20, .frontAnimFrames = sAnims_Magnemite, .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, .enemyMonElevation = 17, - BACK_PIC(Magnemite, 48, 40), + .backPic = gMonBackPic_Magnemite, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Magnemite), - ICON(Magnemite, 0), + .palette = gMonPalette_Magnemite, + .shinyPalette = gMonShinyPalette_Magnemite, + .iconSprite = gMonIcon_Magnemite, + .iconPalIndex = 0, FOOTPRINT(Magnemite) - LEARNSETS(Magnemite), + .levelUpLearnset = sMagnemiteLevelUpLearnset, + .teachableLearnset = sMagnemiteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGNETON}), }, @@ -7439,18 +8175,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magneton, 64, 56), + .frontPic = gMonFrontPic_Magneton, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Magneton, .frontAnimId = ANIM_FLASH_YELLOW, .enemyMonElevation = 9, - BACK_PIC(Magneton, 64, 56), + .backPic = gMonBackPic_Magneton, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Magneton), - ICON(Magneton, 0), + .palette = gMonPalette_Magneton, + .shinyPalette = gMonShinyPalette_Magneton, + .iconSprite = gMonIcon_Magneton, + .iconPalIndex = 0, FOOTPRINT(Magneton) - LEARNSETS(Magneton), + .levelUpLearnset = sMagnetonLevelUpLearnset, + .teachableLearnset = sMagnetonTeachableLearnset, .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}), }, @@ -7497,18 +8238,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magnezone, 64, 56), + .frontPic = gMonFrontPic_Magnezone, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Magnezone, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 4, - BACK_PIC(Magnezone, 64, 40), + .backPic = gMonBackPic_Magnezone, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Magnezone), - ICON(Magnezone, 0), + .palette = gMonPalette_Magnezone, + .shinyPalette = gMonShinyPalette_Magnezone, + .iconSprite = gMonIcon_Magnezone, + .iconPalIndex = 0, FOOTPRINT(Magnezone) - LEARNSETS(Magnezone), + .levelUpLearnset = sMagnezoneLevelUpLearnset, + .teachableLearnset = sMagnezoneTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGNEMITE @@ -7561,16 +8307,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(Farfetchd, 48, 56), + .frontPic = gMonFrontPic_Farfetchd, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Farfetchd, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, - BACK_PIC(Farfetchd, 64, 48), + .backPic = gMonBackPic_Farfetchd, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Farfetchd), - ICON(Farfetchd, 1), - LEARNSETS(Farfetchd), + .palette = gMonPalette_Farfetchd, + .shinyPalette = gMonShinyPalette_Farfetchd, + .iconSprite = gMonIcon_Farfetchd, + .iconPalIndex = 1, + .levelUpLearnset = sFarfetchdLevelUpLearnset, + .teachableLearnset = sFarfetchdTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -7611,16 +8362,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(FarfetchdGalarian, 64, 48), + .frontPic = gMonFrontPic_FarfetchdGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_FarfetchdGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(FarfetchdGalarian, 64, 48), + .backPic = gMonBackPic_FarfetchdGalarian, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(FarfetchdGalarian), - ICON(FarfetchdGalarian, 1), - LEARNSETS(FarfetchdGalarian), + .palette = gMonPalette_FarfetchdGalarian, + .shinyPalette = gMonShinyPalette_FarfetchdGalarian, + .iconSprite = gMonIcon_FarfetchdGalarian, + .iconPalIndex = 1, + .levelUpLearnset = sFarfetchdGalarianLevelUpLearnset, + .teachableLearnset = sFarfetchdGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}), }, @@ -7660,17 +8416,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Sirfetchd, 64, 64), + .frontPic = gMonFrontPic_Sirfetchd, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sirfetchd, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sirfetchd, 64, 48), + .backPic = gMonBackPic_Sirfetchd, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sirfetchd), - ICON(Sirfetchd, 1), + .palette = gMonPalette_Sirfetchd, + .shinyPalette = gMonShinyPalette_Sirfetchd, + .iconSprite = gMonIcon_Sirfetchd, + .iconPalIndex = 1, FOOTPRINT(Sirfetchd) - LEARNSETS(Sirfetchd), + .levelUpLearnset = sSirfetchdLevelUpLearnset, + .teachableLearnset = sSirfetchdTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD @@ -7711,19 +8472,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 257, .trainerOffset = -1, - FRONT_PIC(Doduo, 64, 56), - FRONT_PIC_FEMALE(Doduo, 64, 56), + .frontPic = gMonFrontPic_Doduo, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_DoduoF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Doduo, .frontAnimId = ANIM_H_SHAKE_SLOW, - BACK_PIC(Doduo, 64, 56), - BACK_PIC_FEMALE(Doduo, 64, 56), + .backPic = gMonBackPic_Doduo, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_DoduoF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Doduo), - ICON(Doduo, 2), + .palette = gMonPalette_Doduo, + .shinyPalette = gMonShinyPalette_Doduo, + .iconSprite = gMonIcon_Doduo, + .iconPalIndex = 2, FOOTPRINT(Doduo) - LEARNSETS(Doduo), + .levelUpLearnset = sDoduoLevelUpLearnset, + .teachableLearnset = sDoduoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_DODRIO}), }, @@ -7768,19 +8536,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = 0, - FRONT_PIC(Dodrio, 64, 64), - FRONT_PIC_FEMALE(Dodrio, 64, 64), + .frontPic = gMonFrontPic_Dodrio, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_DodrioF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dodrio, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Dodrio, 64, 64), - BACK_PIC_FEMALE(Dodrio, 64, 64), + .backPic = gMonBackPic_Dodrio, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_DodrioF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Dodrio), - ICON(Dodrio, 2), + .palette = gMonPalette_Dodrio, + .shinyPalette = gMonShinyPalette_Dodrio, + .iconSprite = gMonIcon_Dodrio, + .iconPalIndex = 2, FOOTPRINT(Dodrio) - LEARNSETS(Dodrio), + .levelUpLearnset = sDodrioLevelUpLearnset, + .teachableLearnset = sDodrioTeachableLearnset, }, #endif //P_FAMILY_DODUO @@ -7819,17 +8594,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Seel, 56, 48), + .frontPic = gMonFrontPic_Seel, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Seel, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Seel, 64, 40), + .backPic = gMonBackPic_Seel, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Seel), - ICON(Seel, 0), + .palette = gMonPalette_Seel, + .shinyPalette = gMonShinyPalette_Seel, + .iconSprite = gMonIcon_Seel, + .iconPalIndex = 0, FOOTPRINT(Seel) - LEARNSETS(Seel), + .levelUpLearnset = sSeelLevelUpLearnset, + .teachableLearnset = sSeelTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DEWGONG}), }, @@ -7867,17 +8647,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 275, .trainerOffset = 0, - FRONT_PIC(Dewgong, 64, 64), + .frontPic = gMonFrontPic_Dewgong, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Dewgong, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Dewgong, 64, 56), + .backPic = gMonBackPic_Dewgong, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Dewgong), - ICON(Dewgong, 2), + .palette = gMonPalette_Dewgong, + .shinyPalette = gMonShinyPalette_Dewgong, + .iconSprite = gMonIcon_Dewgong, + .iconPalIndex = 2, FOOTPRINT(Dewgong) - LEARNSETS(Dewgong), + .levelUpLearnset = sDewgongLevelUpLearnset, + .teachableLearnset = sDewgongTeachableLearnset, }, #endif //P_FAMILY_SEEL @@ -7919,16 +8704,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grimer, 48, 48), + .frontPic = gMonFrontPic_Grimer, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Grimer, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Grimer, 64, 40), + .backPic = gMonBackPic_Grimer, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Grimer), - ICON(Grimer, 2), - LEARNSETS(Grimer), + .palette = gMonPalette_Grimer, + .shinyPalette = gMonShinyPalette_Grimer, + .iconSprite = gMonIcon_Grimer, + .iconPalIndex = 2, + .levelUpLearnset = sGrimerLevelUpLearnset, + .teachableLearnset = sGrimerTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK}), }, @@ -7970,17 +8760,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Muk, 64, 56), + .frontPic = gMonFrontPic_Muk, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Muk, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 45, - BACK_PIC(Muk, 64, 56), + .backPic = gMonBackPic_Muk, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Muk), - ICON(Muk, 2), - LEARNSETS(Muk), + .palette = gMonPalette_Muk, + .shinyPalette = gMonShinyPalette_Muk, + .iconSprite = gMonIcon_Muk, + .iconPalIndex = 2, + .levelUpLearnset = sMukLevelUpLearnset, + .teachableLearnset = sMukTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -8022,16 +8817,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GrimerAlolan, 56, 48), + .frontPic = gMonFrontPic_GrimerAlolan, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_GrimerAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GrimerAlolan, 64, 40), + .backPic = gMonBackPic_GrimerAlolan, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GrimerAlolan), - ICON(GrimerAlolan, 1), - LEARNSETS(GrimerAlolan), + .palette = gMonPalette_GrimerAlolan, + .shinyPalette = gMonShinyPalette_GrimerAlolan, + .iconSprite = gMonIcon_GrimerAlolan, + .iconPalIndex = 1, + .levelUpLearnset = sGrimerAlolanLevelUpLearnset, + .teachableLearnset = sGrimerAlolanTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}), }, @@ -8075,16 +8875,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MukAlolan, 64, 64), + .frontPic = gMonFrontPic_MukAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_MukAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MukAlolan, 64, 56), + .backPic = gMonBackPic_MukAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MukAlolan), - ICON(MukAlolan, 0), - LEARNSETS(MukAlolan), + .palette = gMonPalette_MukAlolan, + .shinyPalette = gMonShinyPalette_MukAlolan, + .iconSprite = gMonIcon_MukAlolan, + .iconPalIndex = 0, + .levelUpLearnset = sMukAlolanLevelUpLearnset, + .teachableLearnset = sMukAlolanTeachableLearnset, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER @@ -8126,18 +8931,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shellder, 40, 40), + .frontPic = gMonFrontPic_Shellder, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shellder, .frontAnimId = ANIM_TWIST, .frontAnimDelay = 20, - BACK_PIC(Shellder, 48, 24), + .backPic = gMonBackPic_Shellder, + .backPicSize = MON_COORDS_SIZE(48, 24), .backPicYOffset = 21, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Shellder), - ICON(Shellder, 2), + .palette = gMonPalette_Shellder, + .shinyPalette = gMonShinyPalette_Shellder, + .iconSprite = gMonIcon_Shellder, + .iconPalIndex = 2, FOOTPRINT(Shellder) - LEARNSETS(Shellder), + .levelUpLearnset = sShellderLevelUpLearnset, + .teachableLearnset = sShellderTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}), }, @@ -8177,17 +8987,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 269, .trainerOffset = 1, - FRONT_PIC(Cloyster, 64, 64), + .frontPic = gMonFrontPic_Cloyster, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Cloyster, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Cloyster, 64, 56), + .backPic = gMonBackPic_Cloyster, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Cloyster), - ICON(Cloyster, 2), + .palette = gMonPalette_Cloyster, + .shinyPalette = gMonShinyPalette_Cloyster, + .iconSprite = gMonIcon_Cloyster, + .iconPalIndex = 2, FOOTPRINT(Cloyster) - LEARNSETS(Cloyster), + .levelUpLearnset = sCloysterLevelUpLearnset, + .teachableLearnset = sCloysterTeachableLearnset, }, #endif //P_FAMILY_SHELLDER @@ -8226,18 +9041,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gastly, 64, 48), + .frontPic = gMonFrontPic_Gastly, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Gastly, .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = 13, - BACK_PIC(Gastly, 64, 56), + .backPic = gMonBackPic_Gastly, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Gastly), - ICON(Gastly, 2), + .palette = gMonPalette_Gastly, + .shinyPalette = gMonShinyPalette_Gastly, + .iconSprite = gMonIcon_Gastly, + .iconPalIndex = 2, FOOTPRINT(Gastly) - LEARNSETS(Gastly), + .levelUpLearnset = sGastlyLevelUpLearnset, + .teachableLearnset = sGastlyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_HAUNTER}), }, @@ -8275,19 +9095,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(Haunter, 64, 48), + .frontPic = gMonFrontPic_Haunter, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Haunter, .frontAnimId = ANIM_FLICKER_INCREASING, .frontAnimDelay = 23, .enemyMonElevation = 14, - BACK_PIC(Haunter, 64, 56), + .backPic = gMonBackPic_Haunter, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Haunter), - ICON(Haunter, 2), + .palette = gMonPalette_Haunter, + .shinyPalette = gMonShinyPalette_Haunter, + .iconSprite = gMonIcon_Haunter, + .iconPalIndex = 2, FOOTPRINT(Haunter) - LEARNSETS(Haunter), + .levelUpLearnset = sHaunterLevelUpLearnset, + .teachableLearnset = sHaunterTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GENGAR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GENGAR}), }, @@ -8313,7 +9138,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), FOOTPRINT(Gengar) - LEARNSETS(Gengar), + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, @@ -8341,15 +9167,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 302, .trainerOffset = 2, - FRONT_PIC(Gengar, 56, 56), + .frontPic = gMonFrontPic_Gengar, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Gengar, .frontAnimId = ANIM_GROW_IN_STAGES, - BACK_PIC(Gengar, 64, 48), + .backPic = gMonBackPic_Gengar, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Gengar), - ICON(Gengar, 2), + .palette = gMonPalette_Gengar, + .shinyPalette = gMonShinyPalette_Gengar, + .iconSprite = gMonIcon_Gengar, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -8368,7 +9198,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), FOOTPRINT(Gengar) - LEARNSETS(Gengar), + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, @@ -8391,15 +9222,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 302, .trainerOffset = 2, - FRONT_PIC(GengarMega, 64, 64), + .frontPic = gMonFrontPic_GengarMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_GengarMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GengarMega, 64, 64), + .backPic = gMonBackPic_GengarMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(GengarMega), - ICON(GengarMega, 2), + .palette = gMonPalette_GengarMega, + .shinyPalette = gMonShinyPalette_GengarMega, + .iconSprite = gMonIcon_GengarMega, + .iconPalIndex = 2, }, #endif //P_MEGA_EVOLUTIONS @@ -8419,7 +9254,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), FOOTPRINT(Gengar) - LEARNSETS(Gengar), + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, .baseHP = 60, @@ -8442,15 +9278,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 302, .trainerOffset = 2, - FRONT_PIC(GengarGigantamax, 64, 64), + .frontPic = gMonFrontPic_GengarGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_GengarGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GengarGigantamax, 64, 64), + .backPic = gMonBackPic_GengarGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GengarGigantamax), - ICON(GengarGigantamax, 2), + .palette = gMonPalette_GengarGigantamax, + .shinyPalette = gMonShinyPalette_GengarGigantamax, + .iconSprite = gMonIcon_GengarGigantamax, + .iconPalIndex = 2, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY @@ -8490,17 +9330,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 515, .trainerOffset = 14, - FRONT_PIC(Onix, 64, 64), + .frontPic = gMonFrontPic_Onix, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Onix, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Onix, 64, 64), + .backPic = gMonBackPic_Onix, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Onix), - ICON(Onix, 2), + .palette = gMonPalette_Onix, + .shinyPalette = gMonShinyPalette_Onix, + .iconSprite = gMonIcon_Onix, + .iconPalIndex = 2, FOOTPRINT(Onix) - LEARNSETS(Onix), + .levelUpLearnset = sOnixLevelUpLearnset, + .teachableLearnset = sOnixTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}, {EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}), }, @@ -8522,7 +9367,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_STEELIX, .categoryName = _("Iron Snake"), FOOTPRINT(Steelix) - LEARNSETS(Steelix), + .levelUpLearnset = sSteelixLevelUpLearnset, + .teachableLearnset = sSteelixTeachableLearnset, .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, @@ -8545,18 +9391,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 516, .trainerOffset = 13, - FRONT_PIC(Steelix, 64, 64), - FRONT_PIC_FEMALE(Steelix, 64, 64), + .frontPic = gMonFrontPic_Steelix, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_SteelixF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Steelix, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 45, - BACK_PIC(Steelix, 64, 64), - BACK_PIC_FEMALE(Steelix, 64, 64), + .backPic = gMonBackPic_Steelix, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_SteelixF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Steelix), - ICON(Steelix, 0), + .palette = gMonPalette_Steelix, + .shinyPalette = gMonShinyPalette_Steelix, + .iconSprite = gMonIcon_Steelix, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -8576,7 +9428,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_STEELIX, .categoryName = _("Iron Snake"), FOOTPRINT(Steelix) - LEARNSETS(Steelix), + .levelUpLearnset = sSteelixLevelUpLearnset, + .teachableLearnset = sSteelixTeachableLearnset, .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, .baseHP = 75, @@ -8599,15 +9452,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 516, .trainerOffset = 13, - FRONT_PIC(SteelixMega, 64, 64), + .frontPic = gMonFrontPic_SteelixMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SteelixMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SteelixMega, 64, 64), + .backPic = gMonBackPic_SteelixMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(SteelixMega), - ICON(SteelixMega, 0), + .palette = gMonPalette_SteelixMega, + .shinyPalette = gMonShinyPalette_SteelixMega, + .iconSprite = gMonIcon_SteelixMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -8649,18 +9506,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drowzee, 48, 56), + .frontPic = gMonFrontPic_Drowzee, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Drowzee, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 48, - BACK_PIC(Drowzee, 56, 48), + .backPic = gMonBackPic_Drowzee, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Drowzee), - ICON(Drowzee, 2), + .palette = gMonPalette_Drowzee, + .shinyPalette = gMonShinyPalette_Drowzee, + .iconSprite = gMonIcon_Drowzee, + .iconPalIndex = 2, FOOTPRINT(Drowzee) - LEARNSETS(Drowzee), + .levelUpLearnset = sDrowzeeLevelUpLearnset, + .teachableLearnset = sDrowzeeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_HYPNO}), }, @@ -8698,20 +9560,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Hypno, 64, 64), - FRONT_PIC_FEMALE(Hypno, 64, 64), + .frontPic = gMonFrontPic_Hypno, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_HypnoF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Hypno, .frontAnimId = ANIM_GROW_VIBRATE, .frontAnimDelay = 40, - BACK_PIC(Hypno, 64, 56), - BACK_PIC_FEMALE(Hypno, 64, 56), + .backPic = gMonBackPic_Hypno, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_HypnoF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Hypno), - ICON(Hypno, 2), + .palette = gMonPalette_Hypno, + .shinyPalette = gMonShinyPalette_Hypno, + .iconSprite = gMonIcon_Hypno, + .iconPalIndex = 2, FOOTPRINT(Hypno) - LEARNSETS(Hypno), + .levelUpLearnset = sHypnoLevelUpLearnset, + .teachableLearnset = sHypnoTeachableLearnset, }, #endif //P_FAMILY_DROWZEE @@ -8750,17 +9619,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Krabby, 64, 48), + .frontPic = gMonFrontPic_Krabby, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Krabby, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Krabby, 56, 40), + .backPic = gMonBackPic_Krabby, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Krabby), - ICON(Krabby, 0), + .palette = gMonPalette_Krabby, + .shinyPalette = gMonShinyPalette_Krabby, + .iconSprite = gMonIcon_Krabby, + .iconPalIndex = 0, FOOTPRINT(Krabby) - LEARNSETS(Krabby), + .levelUpLearnset = sKrabbyLevelUpLearnset, + .teachableLearnset = sKrabbyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_KINGLER}), }, @@ -8789,7 +9663,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_KINGLER, .categoryName = _("Pincer"), FOOTPRINT(Kingler) - LEARNSETS(Kingler), + .levelUpLearnset = sKinglerLevelUpLearnset, + .teachableLearnset = sKinglerTeachableLearnset, .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, .height = 13, @@ -8803,16 +9678,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kingler, 64, 48), + .frontPic = gMonFrontPic_Kingler, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Kingler, .frontAnimId = ANIM_V_SHAKE_TWICE, .frontAnimDelay = 4, - BACK_PIC(Kingler, 64, 56), + .backPic = gMonBackPic_Kingler, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Kingler), - ICON(Kingler, 0), + .palette = gMonPalette_Kingler, + .shinyPalette = gMonShinyPalette_Kingler, + .iconSprite = gMonIcon_Kingler, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -8841,7 +9720,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_KINGLER, .categoryName = _("Pincer"), FOOTPRINT(Kingler) - LEARNSETS(Kingler), + .levelUpLearnset = sKinglerLevelUpLearnset, + .teachableLearnset = sKinglerTeachableLearnset, .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, .height = 190, @@ -8855,15 +9735,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(KinglerGigantamax, 64, 64), + .frontPic = gMonFrontPic_KinglerGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KinglerGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(KinglerGigantamax, 64, 64), + .backPic = gMonBackPic_KinglerGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(KinglerGigantamax), - ICON(KinglerGigantamax, 0), + .palette = gMonPalette_KinglerGigantamax, + .shinyPalette = gMonShinyPalette_KinglerGigantamax, + .iconSprite = gMonIcon_KinglerGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -8914,16 +9798,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "resemblance to a Poké Ball. Because it\n" "explodes at the slightest shock, even\n" "veteran Trainers treat it with caution."), - FRONT_PIC(Voltorb, 32, 40), + .frontPic = gMonFrontPic_Voltorb, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Voltorb, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Voltorb, 48, 40), + .backPic = gMonBackPic_Voltorb, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Voltorb), - ICON(Voltorb, 0), - LEARNSETS(Voltorb), + .palette = gMonPalette_Voltorb, + .shinyPalette = gMonShinyPalette_Voltorb, + .iconSprite = gMonIcon_Voltorb, + .iconPalIndex = 0, + .levelUpLearnset = sVoltorbLevelUpLearnset, + .teachableLearnset = sVoltorbTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTRODE}), }, @@ -8963,16 +9852,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "power plants. Because they feed on\n" "electricity, they cause massive and\n" "chaotic blackouts in nearby cities."), - FRONT_PIC(Electrode, 48, 48), + .frontPic = gMonFrontPic_Electrode, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Electrode, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_SLOW, - BACK_PIC(Electrode, 64, 40), + .backPic = gMonBackPic_Electrode, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Electrode), - ICON(Electrode, 0), - LEARNSETS(Electrode), + .palette = gMonPalette_Electrode, + .shinyPalette = gMonShinyPalette_Electrode, + .iconSprite = gMonIcon_Electrode, + .iconPalIndex = 0, + .levelUpLearnset = sElectrodeLevelUpLearnset, + .teachableLearnset = sElectrodeTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -9012,16 +9906,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "When excited, it discharges the electric\n" "current it has stored in its belly, then\n" "lets out a great, uproarious laugh."), - FRONT_PIC(VoltorbHisuian, 32, 32), + .frontPic = gMonFrontPic_VoltorbHisuian, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_VoltorbHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(VoltorbHisuian, 48, 32), + .backPic = gMonBackPic_VoltorbHisuian, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(VoltorbHisuian), - ICON(VoltorbHisuian, 0), - LEARNSETS(VoltorbHisuian), + .palette = gMonPalette_VoltorbHisuian, + .shinyPalette = gMonShinyPalette_VoltorbHisuian, + .iconSprite = gMonIcon_VoltorbHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sVoltorbHisuianLevelUpLearnset, + .teachableLearnset = sVoltorbHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUIAN}), }, @@ -9062,16 +9961,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "similar in composition to an Apricorn.\n" "When irritated, it lets loose an electric\n" "current equal to 20 lightning bolts."), - FRONT_PIC(ElectrodeHisuian, 48, 48), + .frontPic = gMonFrontPic_ElectrodeHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_ElectrodeHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ElectrodeHisuian, 64, 40), + .backPic = gMonBackPic_ElectrodeHisuian, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ElectrodeHisuian), - ICON(ElectrodeHisuian, 1), - LEARNSETS(ElectrodeHisuian), + .palette = gMonPalette_ElectrodeHisuian, + .shinyPalette = gMonShinyPalette_ElectrodeHisuian, + .iconSprite = gMonIcon_ElectrodeHisuian, + .iconPalIndex = 1, + .levelUpLearnset = sElectrodeHisuianLevelUpLearnset, + .teachableLearnset = sElectrodeHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -9113,17 +10017,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Exeggcute, 56, 40), + .frontPic = gMonFrontPic_Exeggcute, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Exeggcute, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Exeggcute, 64, 32), + .backPic = gMonBackPic_Exeggcute, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Exeggcute), - ICON(Exeggcute, 0), + .palette = gMonPalette_Exeggcute, + .shinyPalette = gMonShinyPalette_Exeggcute, + .iconSprite = gMonIcon_Exeggcute, + .iconPalIndex = 0, FOOTPRINT(Exeggcute) - LEARNSETS(Exeggcute), + .levelUpLearnset = sExeggcuteLevelUpLearnset, + .teachableLearnset = sExeggcuteTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}, {EVO_NONE, 0, SPECIES_EXEGGUTOR_ALOLAN}), }, @@ -9174,16 +10083,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - FRONT_PIC(Exeggutor, 64, 64), + .frontPic = gMonFrontPic_Exeggutor, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Exeggutor, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Exeggutor, 64, 48), + .backPic = gMonBackPic_Exeggutor, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Exeggutor), - ICON(Exeggutor, 1), - LEARNSETS(Exeggutor), + .palette = gMonPalette_Exeggutor, + .shinyPalette = gMonShinyPalette_Exeggutor, + .iconSprite = gMonIcon_Exeggutor, + .iconPalIndex = 1, + .levelUpLearnset = sExeggutorLevelUpLearnset, + .teachableLearnset = sExeggutorTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -9223,16 +10137,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - FRONT_PIC(ExeggutorAlolan, 64, 64), + .frontPic = gMonFrontPic_ExeggutorAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_ExeggutorAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ExeggutorAlolan, 64, 56), + .backPic = gMonBackPic_ExeggutorAlolan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ExeggutorAlolan), - ICON(ExeggutorAlolan, 1), - LEARNSETS(ExeggutorAlolan), + .palette = gMonPalette_ExeggutorAlolan, + .shinyPalette = gMonShinyPalette_ExeggutorAlolan, + .iconSprite = gMonIcon_ExeggutorAlolan, + .iconPalIndex = 1, + .levelUpLearnset = sExeggutorAlolanLevelUpLearnset, + .teachableLearnset = sExeggutorAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -9274,18 +10193,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cubone, 56, 40), + .frontPic = gMonFrontPic_Cubone, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Cubone, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 30, - BACK_PIC(Cubone, 56, 48), + .backPic = gMonBackPic_Cubone, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Cubone), - ICON(Cubone, 2), + .palette = gMonPalette_Cubone, + .shinyPalette = gMonShinyPalette_Cubone, + .iconSprite = gMonIcon_Cubone, + .iconPalIndex = 2, FOOTPRINT(Cubone) - LEARNSETS(Cubone), + .levelUpLearnset = sCuboneLevelUpLearnset, + .teachableLearnset = sCuboneTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_MAROWAK}, {EVO_NONE, 0, SPECIES_MAROWAK_ALOLAN}), }, @@ -9327,16 +10251,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "that has grown tough by overcoming the\n" "grief of losing its mother. Its tempered\n" "and hardened spirit is not easily broken."), - FRONT_PIC(Marowak, 56, 64), + .frontPic = gMonFrontPic_Marowak, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Marowak, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, - BACK_PIC(Marowak, 48, 56), + .backPic = gMonBackPic_Marowak, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Marowak), - ICON(Marowak, 2), - LEARNSETS(Marowak), + .palette = gMonPalette_Marowak, + .shinyPalette = gMonShinyPalette_Marowak, + .iconSprite = gMonIcon_Marowak, + .iconPalIndex = 2, + .levelUpLearnset = sMarowakLevelUpLearnset, + .teachableLearnset = sMarowakTeachableLearnset, }, #if P_ALOLAN_FORMS @@ -9377,16 +10306,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "carried by this Pokémon are said\n" "to cause both mental and physical\n" "pain that will never fade."), - FRONT_PIC(MarowakAlolan, 64, 64), + .frontPic = gMonFrontPic_MarowakAlolan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_MarowakAlolan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MarowakAlolan, 56, 56), + .backPic = gMonBackPic_MarowakAlolan, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MarowakAlolan), - ICON(MarowakAlolan, 1), - LEARNSETS(MarowakAlolan), + .palette = gMonPalette_MarowakAlolan, + .shinyPalette = gMonShinyPalette_MarowakAlolan, + .iconSprite = gMonIcon_MarowakAlolan, + .iconPalIndex = 1, + .levelUpLearnset = sMarowakAlolanLevelUpLearnset, + .teachableLearnset = sMarowakAlolanTeachableLearnset, .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS @@ -9428,17 +10362,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tyrogue, 40, 48), + .frontPic = gMonFrontPic_Tyrogue, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Tyrogue, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Tyrogue, 48, 48), + .backPic = gMonBackPic_Tyrogue, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Tyrogue), - ICON(Tyrogue, 2), + .palette = gMonPalette_Tyrogue, + .shinyPalette = gMonShinyPalette_Tyrogue, + .iconSprite = gMonIcon_Tyrogue, + .iconPalIndex = 2, FOOTPRINT(Tyrogue) - LEARNSETS(Tyrogue), + .levelUpLearnset = sTyrogueLevelUpLearnset, + .teachableLearnset = sTyrogueTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}), @@ -9479,17 +10418,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 259, .trainerOffset = 1, - FRONT_PIC(Hitmonlee, 64, 64), + .frontPic = gMonFrontPic_Hitmonlee, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Hitmonlee, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Hitmonlee, 64, 56), + .backPic = gMonBackPic_Hitmonlee, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Hitmonlee), - ICON(Hitmonlee, 2), + .palette = gMonPalette_Hitmonlee, + .shinyPalette = gMonShinyPalette_Hitmonlee, + .iconSprite = gMonIcon_Hitmonlee, + .iconPalIndex = 2, FOOTPRINT(Hitmonlee) - LEARNSETS(Hitmonlee), + .levelUpLearnset = sHitmonleeLevelUpLearnset, + .teachableLearnset = sHitmonleeTeachableLearnset, }, [SPECIES_HITMONCHAN] = @@ -9526,17 +10470,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 277, .trainerOffset = 2, - FRONT_PIC(Hitmonchan, 48, 64), + .frontPic = gMonFrontPic_Hitmonchan, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Hitmonchan, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Hitmonchan, 56, 56), + .backPic = gMonBackPic_Hitmonchan, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Hitmonchan), - ICON(Hitmonchan, 2), + .palette = gMonPalette_Hitmonchan, + .shinyPalette = gMonShinyPalette_Hitmonchan, + .iconSprite = gMonIcon_Hitmonchan, + .iconPalIndex = 2, FOOTPRINT(Hitmonchan) - LEARNSETS(Hitmonchan), + .levelUpLearnset = sHitmonchanLevelUpLearnset, + .teachableLearnset = sHitmonchanTeachableLearnset, }, #if P_GEN_2_CROSS_EVOS @@ -9574,17 +10523,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Hitmontop, 64, 56), + .frontPic = gMonFrontPic_Hitmontop, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Hitmontop, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Hitmontop, 64, 56), + .backPic = gMonBackPic_Hitmontop, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Hitmontop), - ICON(Hitmontop, 2), + .palette = gMonPalette_Hitmontop, + .shinyPalette = gMonShinyPalette_Hitmontop, + .iconSprite = gMonIcon_Hitmontop, + .iconPalIndex = 2, FOOTPRINT(Hitmontop) - LEARNSETS(Hitmontop), + .levelUpLearnset = sHitmontopLevelUpLearnset, + .teachableLearnset = sHitmontopTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HITMONS @@ -9625,17 +10579,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lickitung, 64, 56), + .frontPic = gMonFrontPic_Lickitung, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Lickitung, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Lickitung, 64, 40), + .backPic = gMonBackPic_Lickitung, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Lickitung), - ICON(Lickitung, 0), + .palette = gMonPalette_Lickitung, + .shinyPalette = gMonShinyPalette_Lickitung, + .iconSprite = gMonIcon_Lickitung, + .iconPalIndex = 0, FOOTPRINT(Lickitung) - LEARNSETS(Lickitung), + .levelUpLearnset = sLickitungLevelUpLearnset, + .teachableLearnset = sLickitungTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY}), }, @@ -9675,17 +10634,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Lickilicky, 64, 64), + .frontPic = gMonFrontPic_Lickilicky, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Lickilicky, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lickilicky, 64, 64), + .backPic = gMonBackPic_Lickilicky, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Lickilicky), - ICON(Lickilicky, 1), + .palette = gMonPalette_Lickilicky, + .shinyPalette = gMonShinyPalette_Lickilicky, + .iconSprite = gMonIcon_Lickilicky, + .iconPalIndex = 1, FOOTPRINT(Lickilicky) - LEARNSETS(Lickilicky), + .levelUpLearnset = sLickilickyLevelUpLearnset, + .teachableLearnset = sLickilickyTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_LICKITUNG @@ -9730,18 +10694,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Koffing, 56, 48), + .frontPic = gMonFrontPic_Koffing, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Koffing, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 14, - BACK_PIC(Koffing, 64, 64), + .backPic = gMonBackPic_Koffing, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_GROW, - PALETTES(Koffing), - ICON(Koffing, 2), + .palette = gMonPalette_Koffing, + .shinyPalette = gMonShinyPalette_Koffing, + .iconSprite = gMonIcon_Koffing, + .iconPalIndex = 2, FOOTPRINT(Koffing) - LEARNSETS(Koffing), + .levelUpLearnset = sKoffingLevelUpLearnset, + .teachableLearnset = sKoffingTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_WEEZING}, {EVO_NONE, 0, SPECIES_WEEZING_GALARIAN}), }, @@ -9788,17 +10757,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Weezing, 64, 64), + .frontPic = gMonFrontPic_Weezing, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Weezing, .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = 3, - BACK_PIC(Weezing, 64, 48), + .backPic = gMonBackPic_Weezing, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_GROW, - PALETTES(Weezing), - ICON(Weezing, 2), - LEARNSETS(Weezing), + .palette = gMonPalette_Weezing, + .shinyPalette = gMonShinyPalette_Weezing, + .iconSprite = gMonIcon_Weezing, + .iconPalIndex = 2, + .levelUpLearnset = sWeezingLevelUpLearnset, + .teachableLearnset = sWeezingTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -9841,17 +10815,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(WeezingGalarian, 64, 64), + .frontPic = gMonFrontPic_WeezingGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WeezingGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(WeezingGalarian, 64, 64), + .backPic = gMonBackPic_WeezingGalarian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(WeezingGalarian), - ICON(WeezingGalarian, 1), - LEARNSETS(WeezingGalarian), + .palette = gMonPalette_WeezingGalarian, + .shinyPalette = gMonShinyPalette_WeezingGalarian, + .iconSprite = gMonIcon_WeezingGalarian, + .iconPalIndex = 1, + .levelUpLearnset = sWeezingGalarianLevelUpLearnset, + .teachableLearnset = sWeezingGalarianTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING @@ -9891,19 +10870,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rhyhorn, 56, 40), - FRONT_PIC_FEMALE(Rhyhorn, 56, 40), + .frontPic = gMonFrontPic_Rhyhorn, + .frontPicSize = MON_COORDS_SIZE(56, 40), + .frontPicFemale = gMonFrontPic_RhyhornF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Rhyhorn, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Rhyhorn, 64, 48), - BACK_PIC_FEMALE(Rhyhorn, 64, 48), + .backPic = gMonBackPic_Rhyhorn, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_RhyhornF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Rhyhorn), - ICON(Rhyhorn, 1), + .palette = gMonPalette_Rhyhorn, + .shinyPalette = gMonShinyPalette_Rhyhorn, + .iconSprite = gMonIcon_Rhyhorn, + .iconPalIndex = 1, FOOTPRINT(Rhyhorn) - LEARNSETS(Rhyhorn), + .levelUpLearnset = sRhyhornLevelUpLearnset, + .teachableLearnset = sRhyhornTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_RHYDON}), }, @@ -9941,19 +10927,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 299, .trainerOffset = 2, - FRONT_PIC(Rhydon, 64, 56), - FRONT_PIC_FEMALE(Rhydon, 64, 56), + .frontPic = gMonFrontPic_Rhydon, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_RhydonF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Rhydon, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Rhydon, 64, 56), - BACK_PIC_FEMALE(Rhydon, 64, 56), + .backPic = gMonBackPic_Rhydon, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RhydonF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Rhydon), - ICON(Rhydon, 1), + .palette = gMonPalette_Rhydon, + .shinyPalette = gMonShinyPalette_Rhydon, + .iconSprite = gMonIcon_Rhydon, + .iconPalIndex = 1, FOOTPRINT(Rhydon) - LEARNSETS(Rhydon), + .levelUpLearnset = sRhydonLevelUpLearnset, + .teachableLearnset = sRhydonTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}, {EVO_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}), }, @@ -9999,19 +10992,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 369, .trainerOffset = 7, - FRONT_PIC(Rhyperior, 64, 64), - FRONT_PIC_FEMALE(Rhyperior, 64, 64), + .frontPic = gMonFrontPic_Rhyperior, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_RhyperiorF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Rhyperior, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Rhyperior, 64, 64), - BACK_PIC_FEMALE(Rhyperior, 64, 64), + .backPic = gMonBackPic_Rhyperior, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_RhyperiorF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Rhyperior), - ICON(Rhyperior, 0), + .palette = gMonPalette_Rhyperior, + .shinyPalette = gMonShinyPalette_Rhyperior, + .iconSprite = gMonIcon_Rhyperior, + .iconPalIndex = 0, FOOTPRINT(Rhyperior) - LEARNSETS(Rhyperior), + .levelUpLearnset = sRhyperiorLevelUpLearnset, + .teachableLearnset = sRhyperiorTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RHYHORN @@ -10053,17 +11053,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Happiny, 32, 48), + .frontPic = gMonFrontPic_Happiny, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Happiny, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Happiny, 48, 56), + .backPic = gMonBackPic_Happiny, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Happiny), - ICON(Happiny, 0), + .palette = gMonPalette_Happiny, + .shinyPalette = gMonShinyPalette_Happiny, + .iconSprite = gMonIcon_Happiny, + .iconPalIndex = 0, FOOTPRINT(Happiny) - LEARNSETS(Happiny), + .levelUpLearnset = sHappinyLevelUpLearnset, + .teachableLearnset = sHappinyTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}, {EVO_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}), }, @@ -10104,17 +11109,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chansey, 56, 48), + .frontPic = gMonFrontPic_Chansey, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Chansey, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Chansey, 64, 48), + .backPic = gMonBackPic_Chansey, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Chansey), - ICON(Chansey, 0), + .palette = gMonPalette_Chansey, + .shinyPalette = gMonShinyPalette_Chansey, + .iconSprite = gMonIcon_Chansey, + .iconPalIndex = 0, FOOTPRINT(Chansey) - LEARNSETS(Chansey), + .levelUpLearnset = sChanseyLevelUpLearnset, + .teachableLearnset = sChanseyTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}), }, @@ -10154,17 +11164,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 310, .trainerOffset = 3, - FRONT_PIC(Blissey, 56, 56), + .frontPic = gMonFrontPic_Blissey, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Blissey, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Blissey, 64, 32), + .backPic = gMonBackPic_Blissey, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Blissey), - ICON(Blissey, 0), + .palette = gMonPalette_Blissey, + .shinyPalette = gMonShinyPalette_Blissey, + .iconSprite = gMonIcon_Blissey, + .iconPalIndex = 0, FOOTPRINT(Blissey) - LEARNSETS(Blissey), + .levelUpLearnset = sBlisseyLevelUpLearnset, + .teachableLearnset = sBlisseyTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_CHANSEY @@ -10204,17 +11219,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tangela, 48, 40), + .frontPic = gMonFrontPic_Tangela, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Tangela, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Tangela, 64, 40), + .backPic = gMonBackPic_Tangela, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Tangela), - ICON(Tangela, 0), + .palette = gMonPalette_Tangela, + .shinyPalette = gMonShinyPalette_Tangela, + .iconSprite = gMonIcon_Tangela, + .iconPalIndex = 0, FOOTPRINT(Tangela) - LEARNSETS(Tangela), + .levelUpLearnset = sTangelaLevelUpLearnset, + .teachableLearnset = sTangelaTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_TANGROWTH}), }, @@ -10253,18 +11273,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Tangrowth, 64, 64), - FRONT_PIC_FEMALE(Tangrowth, 64, 64), + .frontPic = gMonFrontPic_Tangrowth, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_TangrowthF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Tangrowth, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Tangrowth, 64, 56), + .backPic = gMonBackPic_Tangrowth, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW, - PALETTES(Tangrowth), - ICON(Tangrowth, 0), + .palette = gMonPalette_Tangrowth, + .shinyPalette = gMonShinyPalette_Tangrowth, + .iconSprite = gMonIcon_Tangrowth, + .iconPalIndex = 0, FOOTPRINT(Tangrowth) - LEARNSETS(Tangrowth), + .levelUpLearnset = sTangrowthLevelUpLearnset, + .teachableLearnset = sTangrowthTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TANGELA @@ -10290,7 +11316,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 387, .trainerOffset = 8, FOOTPRINT(Kangaskhan) - LEARNSETS(Kangaskhan), + .levelUpLearnset = sKangaskhanLevelUpLearnset, + .teachableLearnset = sKangaskhanTeachableLearnset, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, @@ -10308,15 +11335,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "playing by itself, never try to catch it.\n" "The baby's parent is sure to be in the area,\n" "and it will become violently enraged."), - FRONT_PIC(Kangaskhan, 64, 64), + .frontPic = gMonFrontPic_Kangaskhan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Kangaskhan, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Kangaskhan, 64, 56), + .backPic = gMonBackPic_Kangaskhan, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Kangaskhan), - ICON(Kangaskhan, 2), + .palette = gMonPalette_Kangaskhan, + .shinyPalette = gMonShinyPalette_Kangaskhan, + .iconSprite = gMonIcon_Kangaskhan, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -10340,7 +11371,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 387, .trainerOffset = 8, FOOTPRINT(Kangaskhan) - LEARNSETS(Kangaskhan), + .levelUpLearnset = sKangaskhanLevelUpLearnset, + .teachableLearnset = sKangaskhanTeachableLearnset, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, .baseHP = 105, @@ -10359,15 +11391,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "Mega-Evolved child, it makes her think\n" "of the day when her child will inevitably\n" "leave her."), - FRONT_PIC(KangaskhanMega, 64, 64), + .frontPic = gMonFrontPic_KangaskhanMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KangaskhanMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(KangaskhanMega, 64, 56), + .backPic = gMonBackPic_KangaskhanMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(KangaskhanMega), - ICON(KangaskhanMega, 2), + .palette = gMonPalette_KangaskhanMega, + .shinyPalette = gMonShinyPalette_KangaskhanMega, + .iconSprite = gMonIcon_KangaskhanMega, + .iconPalIndex = 2, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN @@ -10408,17 +11444,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Horsea, 32, 40), + .frontPic = gMonFrontPic_Horsea, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Horsea, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Horsea, 48, 40), + .backPic = gMonBackPic_Horsea, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Horsea), - ICON(Horsea, 0), + .palette = gMonPalette_Horsea, + .shinyPalette = gMonShinyPalette_Horsea, + .iconSprite = gMonIcon_Horsea, + .iconPalIndex = 0, FOOTPRINT(Horsea) - LEARNSETS(Horsea), + .levelUpLearnset = sHorseaLevelUpLearnset, + .teachableLearnset = sHorseaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEADRA}), }, @@ -10458,17 +11499,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Seadra, 64, 56), + .frontPic = gMonFrontPic_Seadra, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Seadra, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Seadra, 64, 56), + .backPic = gMonBackPic_Seadra, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Seadra), - ICON(Seadra, 0), + .palette = gMonPalette_Seadra, + .shinyPalette = gMonShinyPalette_Seadra, + .iconSprite = gMonIcon_Seadra, + .iconPalIndex = 0, FOOTPRINT(Seadra) - LEARNSETS(Seadra), + .levelUpLearnset = sSeadraLevelUpLearnset, + .teachableLearnset = sSeadraTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}, {EVO_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}), }, @@ -10517,17 +11563,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 287, .trainerOffset = 0, - FRONT_PIC(Kingdra, 64, 64), + .frontPic = gMonFrontPic_Kingdra, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Kingdra, .frontAnimId = ANIM_CIRCLE_INTO_BG, - BACK_PIC(Kingdra, 64, 56), + .backPic = gMonBackPic_Kingdra, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Kingdra), - ICON(Kingdra, 0), + .palette = gMonPalette_Kingdra, + .shinyPalette = gMonShinyPalette_Kingdra, + .iconSprite = gMonIcon_Kingdra, + .iconPalIndex = 0, FOOTPRINT(Kingdra) - LEARNSETS(Kingdra), + .levelUpLearnset = sKingdraLevelUpLearnset, + .teachableLearnset = sKingdraTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HORSEA @@ -10568,19 +11619,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Goldeen, 64, 40), - FRONT_PIC_FEMALE(Goldeen, 64, 40), + .frontPic = gMonFrontPic_Goldeen, + .frontPicSize = MON_COORDS_SIZE(64, 40), + .frontPicFemale = gMonFrontPic_GoldeenF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Goldeen, .frontAnimId = ANIM_H_SLIDE_WOBBLE, - BACK_PIC(Goldeen, 64, 48), - BACK_PIC_FEMALE(Goldeen, 64, 48), + .backPic = gMonBackPic_Goldeen, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_GoldeenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Goldeen), - ICON(Goldeen, 0), + .palette = gMonPalette_Goldeen, + .shinyPalette = gMonShinyPalette_Goldeen, + .iconSprite = gMonIcon_Goldeen, + .iconPalIndex = 0, FOOTPRINT(Goldeen) - LEARNSETS(Goldeen), + .levelUpLearnset = sGoldeenLevelUpLearnset, + .teachableLearnset = sGoldeenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_SEAKING}), }, @@ -10619,19 +11677,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Seaking, 64, 56), - FRONT_PIC_FEMALE(Seaking, 64, 56), + .frontPic = gMonFrontPic_Seaking, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_SeakingF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Seaking, .frontAnimId = ANIM_V_SLIDE_WOBBLE, - BACK_PIC(Seaking, 64, 56), - BACK_PIC_FEMALE(Seaking, 64, 56), + .backPic = gMonBackPic_Seaking, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_SeakingF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Seaking), - ICON(Seaking, 0), + .palette = gMonPalette_Seaking, + .shinyPalette = gMonShinyPalette_Seaking, + .iconSprite = gMonIcon_Seaking, + .iconPalIndex = 0, FOOTPRINT(Seaking) - LEARNSETS(Seaking), + .levelUpLearnset = sSeakingLevelUpLearnset, + .teachableLearnset = sSeakingTeachableLearnset, }, #endif //P_FAMILY_GOLDEEN @@ -10673,17 +11738,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Staryu, 40, 48), + .frontPic = gMonFrontPic_Staryu, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Staryu, .frontAnimId = ANIM_TWIST_TWICE, - BACK_PIC(Staryu, 56, 56), + .backPic = gMonBackPic_Staryu, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Staryu), - ICON(Staryu, 2), + .palette = gMonPalette_Staryu, + .shinyPalette = gMonShinyPalette_Staryu, + .iconSprite = gMonIcon_Staryu, + .iconPalIndex = 2, FOOTPRINT(Staryu) - LEARNSETS(Staryu), + .levelUpLearnset = sStaryuLevelUpLearnset, + .teachableLearnset = sStaryuTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}), }, @@ -10723,17 +11793,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Starmie, 56, 56), + .frontPic = gMonFrontPic_Starmie, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Starmie, .frontAnimId = ANIM_TWIST, - BACK_PIC(Starmie, 64, 64), + .backPic = gMonBackPic_Starmie, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Starmie), - ICON(Starmie, 2), + .palette = gMonPalette_Starmie, + .shinyPalette = gMonShinyPalette_Starmie, + .iconSprite = gMonIcon_Starmie, + .iconPalIndex = 2, FOOTPRINT(Starmie) - LEARNSETS(Starmie), + .levelUpLearnset = sStarmieLevelUpLearnset, + .teachableLearnset = sStarmieTeachableLearnset, }, #endif //P_FAMILY_STARYU @@ -10777,17 +11852,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MimeJr, 32, 56), + .frontPic = gMonFrontPic_MimeJr, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_MimeJr, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(MimeJr, 64, 64), + .backPic = gMonBackPic_MimeJr, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(MimeJr), - ICON(MimeJr, 0), + .palette = gMonPalette_MimeJr, + .shinyPalette = gMonShinyPalette_MimeJr, + .iconSprite = gMonIcon_MimeJr, + .iconPalIndex = 0, FOOTPRINT(MimeJr) - LEARNSETS(MimeJr), + .levelUpLearnset = sMimeJrLevelUpLearnset, + .teachableLearnset = sMimeJrTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}, {EVO_NONE, 0, SPECIES_MR_MIME_GALARIAN}), }, @@ -10833,16 +11913,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MrMime, 56, 56), + .frontPic = gMonFrontPic_MrMime, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_MrMime, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(MrMime, 64, 48), + .backPic = gMonBackPic_MrMime, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(MrMime), - ICON(MrMime, 0), - LEARNSETS(MrMime), + .palette = gMonPalette_MrMime, + .shinyPalette = gMonShinyPalette_MrMime, + .iconSprite = gMonIcon_MrMime, + .iconPalIndex = 0, + .levelUpLearnset = sMrMimeLevelUpLearnset, + .teachableLearnset = sMrMimeTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -10882,16 +11967,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MrMimeGalarian, 56, 56), + .frontPic = gMonFrontPic_MrMimeGalarian, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_MrMimeGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MrMimeGalarian, 64, 48), + .backPic = gMonBackPic_MrMimeGalarian, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MrMimeGalarian), - ICON(MrMimeGalarian, 0), - LEARNSETS(MrMimeGalarian), + .palette = gMonPalette_MrMimeGalarian, + .shinyPalette = gMonShinyPalette_MrMimeGalarian, + .iconSprite = gMonIcon_MrMimeGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sMrMimeGalarianLevelUpLearnset, + .teachableLearnset = sMrMimeGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_MR_RIME}), }, @@ -10929,17 +12019,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(MrRime, 56, 64), + .frontPic = gMonFrontPic_MrRime, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_MrRime, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MrRime, 64, 56), + .backPic = gMonBackPic_MrRime, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MrRime), - ICON(MrRime, 0), + .palette = gMonPalette_MrRime, + .shinyPalette = gMonShinyPalette_MrRime, + .iconSprite = gMonIcon_MrRime, + .iconPalIndex = 0, FOOTPRINT(MrRime) - LEARNSETS(MrRime), + .levelUpLearnset = sMrRimeLevelUpLearnset, + .teachableLearnset = sMrRimeTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME @@ -10979,19 +12074,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 293, .trainerOffset = 2, - FRONT_PIC(Scyther, 56, 64), - FRONT_PIC_FEMALE(Scyther, 56, 64), + .frontPic = gMonFrontPic_Scyther, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_ScytherF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Scyther, .frontAnimId = ANIM_H_VIBRATE, .frontAnimDelay = 10, - BACK_PIC(Scyther, 64, 64), + .backPic = gMonBackPic_Scyther, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Scyther), - ICON(Scyther, 1), + .palette = gMonPalette_Scyther, + .shinyPalette = gMonShinyPalette_Scyther, + .iconSprite = gMonIcon_Scyther, + .iconPalIndex = 1, FOOTPRINT(Scyther) - LEARNSETS(Scyther), + .levelUpLearnset = sScytherLevelUpLearnset, + .teachableLearnset = sScytherTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}, {EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR}, {EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}), @@ -11013,7 +12114,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_SCIZOR, .categoryName = _("Pincer"), FOOTPRINT(Scizor) - LEARNSETS(Scizor), + .levelUpLearnset = sScizorLevelUpLearnset, + .teachableLearnset = sScizorTeachableLearnset, .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, .baseHP = 70, @@ -11036,17 +12138,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scizor, 64, 64), - FRONT_PIC_FEMALE(Scizor, 64, 64), + .frontPic = gMonFrontPic_Scizor, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_ScizorF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Scizor, .frontAnimId = ANIM_H_VIBRATE, .frontAnimDelay = 19, - BACK_PIC(Scizor, 64, 56), + .backPic = gMonBackPic_Scizor, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Scizor), - ICON(Scizor, 0), + .palette = gMonPalette_Scizor, + .shinyPalette = gMonShinyPalette_Scizor, + .iconSprite = gMonIcon_Scizor, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -11065,7 +12172,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_SCIZOR, .categoryName = _("Pincer"), FOOTPRINT(Scizor) - LEARNSETS(Scizor), + .levelUpLearnset = sScizorLevelUpLearnset, + .teachableLearnset = sScizorTeachableLearnset, .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, .baseHP = 70, @@ -11089,15 +12197,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ScizorMega, 64, 64), + .frontPic = gMonFrontPic_ScizorMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ScizorMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ScizorMega, 64, 56), + .backPic = gMonBackPic_ScizorMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(ScizorMega), - ICON(ScizorMega, 0), + .palette = gMonPalette_ScizorMega, + .shinyPalette = gMonShinyPalette_ScizorMega, + .iconSprite = gMonIcon_ScizorMega, + .iconPalIndex = 0, }, #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS @@ -11137,17 +12249,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Kleavor, 64, 64), + .frontPic = gMonFrontPic_Kleavor, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Kleavor, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kleavor, 64, 56), + .backPic = gMonBackPic_Kleavor, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Kleavor), - ICON(Kleavor, 2), + .palette = gMonPalette_Kleavor, + .shinyPalette = gMonShinyPalette_Kleavor, + .iconSprite = gMonIcon_Kleavor, + .iconPalIndex = 2, //FOOTPRINT(Kleavor) - LEARNSETS(Kleavor), + .levelUpLearnset = sKleavorLevelUpLearnset, + .teachableLearnset = sKleavorTeachableLearnset, }, #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER @@ -11188,18 +12305,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Smoochum, 32, 40), + .frontPic = gMonFrontPic_Smoochum, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Smoochum, .frontAnimId = ANIM_GROW_VIBRATE, .frontAnimDelay = 40, - BACK_PIC(Smoochum, 40, 48), + .backPic = gMonBackPic_Smoochum, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Smoochum), - ICON(Smoochum, 1), + .palette = gMonPalette_Smoochum, + .shinyPalette = gMonShinyPalette_Smoochum, + .iconSprite = gMonIcon_Smoochum, + .iconPalIndex = 1, FOOTPRINT(Smoochum) - LEARNSETS(Smoochum), + .levelUpLearnset = sSmoochumLevelUpLearnset, + .teachableLearnset = sSmoochumTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_JYNX}), }, #endif //P_GEN_2_CROSS_EVOS @@ -11238,17 +12360,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 300, .trainerOffset = 1, - FRONT_PIC(Jynx, 64, 48), + .frontPic = gMonFrontPic_Jynx, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Jynx, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Jynx, 56, 64), + .backPic = gMonBackPic_Jynx, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Jynx), - ICON(Jynx, 2), + .palette = gMonPalette_Jynx, + .shinyPalette = gMonShinyPalette_Jynx, + .iconSprite = gMonIcon_Jynx, + .iconPalIndex = 2, FOOTPRINT(Jynx) - LEARNSETS(Jynx), + .levelUpLearnset = sJynxLevelUpLearnset, + .teachableLearnset = sJynxTeachableLearnset, }, #endif //P_FAMILY_JYNX @@ -11290,17 +12417,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Elekid, 48, 40), + .frontPic = gMonFrontPic_Elekid, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Elekid, .frontAnimId = ANIM_FLASH_YELLOW, - BACK_PIC(Elekid, 64, 48), + .backPic = gMonBackPic_Elekid, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Elekid), - ICON(Elekid, 1), + .palette = gMonPalette_Elekid, + .shinyPalette = gMonShinyPalette_Elekid, + .iconSprite = gMonIcon_Elekid, + .iconPalIndex = 1, FOOTPRINT(Elekid) - LEARNSETS(Elekid), + .levelUpLearnset = sElekidLevelUpLearnset, + .teachableLearnset = sElekidTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTABUZZ}), }, #endif //P_GEN_2_CROSS_EVOS @@ -11341,17 +12473,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Electabuzz, 64, 64), + .frontPic = gMonFrontPic_Electabuzz, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Electabuzz, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, - BACK_PIC(Electabuzz, 64, 64), + .backPic = gMonBackPic_Electabuzz, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Electabuzz), - ICON(Electabuzz, 1), + .palette = gMonPalette_Electabuzz, + .shinyPalette = gMonShinyPalette_Electabuzz, + .iconSprite = gMonIcon_Electabuzz, + .iconPalIndex = 1, FOOTPRINT(Electabuzz) - LEARNSETS(Electabuzz), + .levelUpLearnset = sElectabuzzLevelUpLearnset, + .teachableLearnset = sElectabuzzTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}, {EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}), }, @@ -11398,17 +12535,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Electivire, 64, 64), + .frontPic = gMonFrontPic_Electivire, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Electivire, .frontAnimId = ANIM_GLOW_YELLOW, - BACK_PIC(Electivire, 64, 48), + .backPic = gMonBackPic_Electivire, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Electivire), - ICON(Electivire, 1), + .palette = gMonPalette_Electivire, + .shinyPalette = gMonShinyPalette_Electivire, + .iconSprite = gMonIcon_Electivire, + .iconPalIndex = 1, FOOTPRINT(Electivire) - LEARNSETS(Electivire), + .levelUpLearnset = sElectivireLevelUpLearnset, + .teachableLearnset = sElectivireTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ELECTABUZZ @@ -11451,17 +12593,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magby, 32, 48), + .frontPic = gMonFrontPic_Magby, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Magby, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Magby, 40, 48), + .backPic = gMonBackPic_Magby, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Magby), - ICON(Magby, 0), + .palette = gMonPalette_Magby, + .shinyPalette = gMonShinyPalette_Magby, + .iconSprite = gMonIcon_Magby, + .iconPalIndex = 0, FOOTPRINT(Magby) - LEARNSETS(Magby), + .levelUpLearnset = sMagbyLevelUpLearnset, + .teachableLearnset = sMagbyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MAGMAR}), }, #endif //P_GEN_2_CROSS_EVOS @@ -11501,17 +12648,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magmar, 64, 56), + .frontPic = gMonFrontPic_Magmar, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Magmar, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Magmar, 64, 64), + .backPic = gMonBackPic_Magmar, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Magmar), - ICON(Magmar, 0), + .palette = gMonPalette_Magmar, + .shinyPalette = gMonShinyPalette_Magmar, + .iconSprite = gMonIcon_Magmar, + .iconPalIndex = 0, FOOTPRINT(Magmar) - LEARNSETS(Magmar), + .levelUpLearnset = sMagmarLevelUpLearnset, + .teachableLearnset = sMagmarTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}, {EVO_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}), }, @@ -11559,17 +12711,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Magmortar, 64, 64), + .frontPic = gMonFrontPic_Magmortar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Magmortar, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Magmortar, 64, 56), + .backPic = gMonBackPic_Magmortar, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Magmortar), - ICON(Magmortar, 0), + .palette = gMonPalette_Magmortar, + .shinyPalette = gMonShinyPalette_Magmortar, + .iconSprite = gMonIcon_Magmortar, + .iconPalIndex = 0, FOOTPRINT(Magmortar) - LEARNSETS(Magmortar), + .levelUpLearnset = sMagmortarLevelUpLearnset, + .teachableLearnset = sMagmortarTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGMAR @@ -11589,7 +12746,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PINSIR, .categoryName = _("Stag Beetle"), FOOTPRINT(Pinsir) - LEARNSETS(Pinsir), + .levelUpLearnset = sPinsirLevelUpLearnset, + .teachableLearnset = sPinsirTeachableLearnset, .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, @@ -11613,15 +12771,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Pinsir, 64, 64), + .frontPic = gMonFrontPic_Pinsir, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Pinsir, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pinsir, 64, 56), + .backPic = gMonBackPic_Pinsir, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Pinsir), - ICON(Pinsir, 2), + .palette = gMonPalette_Pinsir, + .shinyPalette = gMonShinyPalette_Pinsir, + .iconSprite = gMonIcon_Pinsir, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -11639,7 +12801,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_PINSIR, .categoryName = _("Stag Beetle"), FOOTPRINT(Pinsir) - LEARNSETS(Pinsir), + .levelUpLearnset = sPinsirLevelUpLearnset, + .teachableLearnset = sPinsirTeachableLearnset, .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, .baseHP = 65, @@ -11663,16 +12826,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(PinsirMega, 64, 64), + .frontPic = gMonFrontPic_PinsirMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_PinsirMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(PinsirMega, 64, 56), + .backPic = gMonBackPic_PinsirMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(PinsirMega), - ICON(PinsirMega, 2), + .palette = gMonPalette_PinsirMega, + .shinyPalette = gMonShinyPalette_PinsirMega, + .iconSprite = gMonIcon_PinsirMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -11716,17 +12883,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "at all times. If there is no opponent for\n" "Tauros to battle, it will charge at thick\n" "trees and knock them down to calm itself."), - FRONT_PIC(Tauros, 64, 64), + .frontPic = gMonFrontPic_Tauros, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Tauros, .frontAnimId = ANIM_V_SHAKE_TWICE, .frontAnimDelay = 10, - BACK_PIC(Tauros, 64, 48), + .backPic = gMonBackPic_Tauros, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Tauros), - ICON(Tauros, 2), - LEARNSETS(Tauros), + .palette = gMonPalette_Tauros, + .shinyPalette = gMonShinyPalette_Tauros, + .iconSprite = gMonIcon_Tauros, + .iconPalIndex = 2, + .levelUpLearnset = sTaurosLevelUpLearnset, + .teachableLearnset = sTaurosTeachableLearnset, }, #if P_PALDEAN_FORMS @@ -11770,13 +12942,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "and excels at close-quarters combat.\n" "It uses its short horns to strike\n" "the opponent’s weak spots."), - FRONT_PIC(TaurosPaldeanCombatBreed, 64, 64), + .frontPic = gMonFrontPic_TaurosPaldeanCombatBreed, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - BACK_PIC(TaurosPaldeanCombatBreed, 64, 48), + .backPic = gMonBackPic_TaurosPaldeanCombatBreed, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, - PALETTES(TaurosPaldeanCombatBreed), - ICON(TaurosPaldeanCombatBreed, 0), - LEARNSETS(TaurosPaldeanCombatBreed), + .palette = gMonPalette_TaurosPaldeanCombatBreed, + .shinyPalette = gMonShinyPalette_TaurosPaldeanCombatBreed, + .iconSprite = gMonIcon_TaurosPaldeanCombatBreed, + .iconPalIndex = 0, + .levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset, + .teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset, }, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = @@ -11819,13 +12996,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "get hotter than 1,800 degrees Fahrenheit.\n" "Those gored by them will suffer\n" "both wounds and burns."), - FRONT_PIC(TaurosPaldeanBlazeBreed, 64, 64), + .frontPic = gMonFrontPic_TaurosPaldeanBlazeBreed, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - BACK_PIC(TaurosPaldeanBlazeBreed, 64, 48), + .backPic = gMonBackPic_TaurosPaldeanBlazeBreed, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, - PALETTES(TaurosPaldeanBlazeBreed), - ICON(TaurosPaldeanBlazeBreed, 0), - LEARNSETS(TaurosPaldeanBlazeBreed), + .palette = gMonPalette_TaurosPaldeanBlazeBreed, + .shinyPalette = gMonShinyPalette_TaurosPaldeanBlazeBreed, + .iconSprite = gMonIcon_TaurosPaldeanBlazeBreed, + .iconPalIndex = 0, + .levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset, + .teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset, }, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = @@ -11868,13 +13050,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "the tips of its horns--the high-pressure\n" "jets pierce right through\n" "Tauros’s enemies."), - FRONT_PIC(TaurosPaldeanAquaBreed, 64, 64), + .frontPic = gMonFrontPic_TaurosPaldeanAquaBreed, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - BACK_PIC(TaurosPaldeanAquaBreed, 64, 48), + .backPic = gMonBackPic_TaurosPaldeanAquaBreed, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, - PALETTES(TaurosPaldeanAquaBreed), - ICON(TaurosPaldeanAquaBreed, 0), - LEARNSETS(TaurosPaldeanAquaBreed), + .palette = gMonPalette_TaurosPaldeanAquaBreed, + .shinyPalette = gMonShinyPalette_TaurosPaldeanAquaBreed, + .iconSprite = gMonIcon_TaurosPaldeanAquaBreed, + .iconPalIndex = 0, + .levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset, + .teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset, }, #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS @@ -11914,19 +13101,26 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magikarp, 48, 56), - FRONT_PIC_FEMALE(Magikarp, 48, 56), + .frontPic = gMonFrontPic_Magikarp, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_MagikarpF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Magikarp, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, - BACK_PIC(Magikarp, 64, 56), - BACK_PIC_FEMALE(Magikarp, 64, 56), + .backPic = gMonBackPic_Magikarp, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_MagikarpF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Magikarp), - ICON(Magikarp, 0), + .palette = gMonPalette_Magikarp, + .shinyPalette = gMonShinyPalette_Magikarp, + .iconSprite = gMonIcon_Magikarp, + .iconPalIndex = 0, FOOTPRINT(Magikarp) - LEARNSETS(Magikarp), + .levelUpLearnset = sMagikarpLevelUpLearnset, + .teachableLearnset = sMagikarpTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_GYARADOS}), }, @@ -11950,7 +13144,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 481, .trainerOffset = 13, FOOTPRINT(Gyarados) - LEARNSETS(Gyarados), + .levelUpLearnset = sGyaradosLevelUpLearnset, + .teachableLearnset = sGyaradosTeachableLearnset, .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, @@ -11969,17 +13164,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "Pokémon. When humans begin to fight,\n" "it will appear and burn everything to the\n" "ground with intensely hot flames."), - FRONT_PIC(Gyarados, 64, 64), - FRONT_PIC_FEMALE(Gyarados, 64, 64), + .frontPic = gMonFrontPic_Gyarados, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_GyaradosF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gyarados, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, - BACK_PIC(Gyarados, 64, 64), - BACK_PIC_FEMALE(Gyarados, 64, 64), + .backPic = gMonBackPic_Gyarados, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GyaradosF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Gyarados), - ICON(Gyarados, 0), + .palette = gMonPalette_Gyarados, + .shinyPalette = gMonShinyPalette_Gyarados, + .iconSprite = gMonIcon_Gyarados, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -12002,7 +13203,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 481, .trainerOffset = 13, FOOTPRINT(Gyarados) - LEARNSETS(Gyarados), + .levelUpLearnset = sGyaradosLevelUpLearnset, + .teachableLearnset = sGyaradosTeachableLearnset, .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, .formChangeTable = sGyaradosFormChangeTable, .baseHP = 95, @@ -12021,16 +13223,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "destroy everything within its reach, it\n" "will respond to orders from a Trainer it\n" "truly trusts."), - FRONT_PIC(GyaradosMega, 64, 64), + .frontPic = gMonFrontPic_GyaradosMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GyaradosMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(GyaradosMega, 64, 64), + .backPic = gMonBackPic_GyaradosMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(GyaradosMega), - ICON(GyaradosMega, 0), + .palette = gMonPalette_GyaradosMega, + .shinyPalette = gMonShinyPalette_GyaradosMega, + .iconSprite = gMonIcon_GyaradosMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -12063,7 +13269,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_LAPRAS, .categoryName = _("Transport"), FOOTPRINT(Lapras) - LEARNSETS(Lapras), + .levelUpLearnset = sLaprasLevelUpLearnset, + .teachableLearnset = sLaprasTeachableLearnset, .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, .height = 25, @@ -12077,15 +13284,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Lapras, 64, 64), + .frontPic = gMonFrontPic_Lapras, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Lapras, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Lapras, 56, 64), + .backPic = gMonBackPic_Lapras, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Lapras), - ICON(Lapras, 2), + .palette = gMonPalette_Lapras, + .shinyPalette = gMonShinyPalette_Lapras, + .iconSprite = gMonIcon_Lapras, + .iconPalIndex = 2, }, #if P_GIGANTAMAX_FORMS @@ -12115,7 +13326,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_LAPRAS, .categoryName = _("Transport"), FOOTPRINT(Lapras) - LEARNSETS(Lapras), + .levelUpLearnset = sLaprasLevelUpLearnset, + .teachableLearnset = sLaprasTeachableLearnset, .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, .height = 240, @@ -12129,15 +13341,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(LaprasGigantamax, 64, 64), + .frontPic = gMonFrontPic_LaprasGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LaprasGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(LaprasGigantamax, 64, 64), + .backPic = gMonBackPic_LaprasGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(LaprasGigantamax), - ICON(LaprasGigantamax, 2), + .palette = gMonPalette_LaprasGigantamax, + .shinyPalette = gMonShinyPalette_LaprasGigantamax, + .iconSprite = gMonIcon_LaprasGigantamax, + .iconPalIndex = 2, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -12180,17 +13396,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ditto, 40, 40), + .frontPic = gMonFrontPic_Ditto, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Ditto, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Ditto, 48, 32), + .backPic = gMonBackPic_Ditto, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Ditto), - ICON(Ditto, 2), + .palette = gMonPalette_Ditto, + .shinyPalette = gMonShinyPalette_Ditto, + .iconSprite = gMonIcon_Ditto, + .iconPalIndex = 2, FOOTPRINT(Ditto) - LEARNSETS(Ditto), + .levelUpLearnset = sDittoLevelUpLearnset, + .teachableLearnset = sDittoTeachableLearnset, .tmIlliterate = TRUE, }, #endif //P_FAMILY_DITTO @@ -12220,7 +13441,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_EEVEE, .categoryName = _("Evolution"), FOOTPRINT(Eevee) - LEARNSETS(Eevee), + .levelUpLearnset = sEeveeLevelUpLearnset, + .teachableLearnset = sEeveeTeachableLearnset, .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, .height = 3, @@ -12234,17 +13456,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Eevee, 40, 48), - FRONT_PIC_FEMALE(Eevee, 40, 48), + .frontPic = gMonFrontPic_Eevee, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .frontPicFemale = gMonFrontPic_EeveeF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Eevee, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Eevee, 56, 48), - BACK_PIC_FEMALE(Eevee, 56, 48), + .backPic = gMonBackPic_Eevee, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_EeveeF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Eevee), - ICON(Eevee, 2), + .palette = gMonPalette_Eevee, + .shinyPalette = gMonShinyPalette_Eevee, + .iconSprite = gMonIcon_Eevee, + .iconPalIndex = 2, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, @@ -12282,7 +13510,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_EEVEE, .categoryName = _("Evolution"), FOOTPRINT(Eevee) - LEARNSETS(Eevee), + .levelUpLearnset = sEeveeLevelUpLearnset, + .teachableLearnset = sEeveeTeachableLearnset, .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, .height = 180, @@ -12296,15 +13525,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(EeveeGigantamax, 64, 64), + .frontPic = gMonFrontPic_EeveeGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_EeveeGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(EeveeGigantamax, 64, 64), + .backPic = gMonBackPic_EeveeGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EeveeGigantamax), - ICON(EeveeGigantamax, 2), + .palette = gMonPalette_EeveeGigantamax, + .shinyPalette = gMonShinyPalette_EeveeGigantamax, + .iconSprite = gMonIcon_EeveeGigantamax, + .iconPalIndex = 2, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -12343,17 +13576,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vaporeon, 48, 48), + .frontPic = gMonFrontPic_Vaporeon, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Vaporeon, .frontAnimId = ANIM_GLOW_BLUE, - BACK_PIC(Vaporeon, 64, 56), + .backPic = gMonBackPic_Vaporeon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Vaporeon), - ICON(Vaporeon, 0), + .palette = gMonPalette_Vaporeon, + .shinyPalette = gMonShinyPalette_Vaporeon, + .iconSprite = gMonIcon_Vaporeon, + .iconPalIndex = 0, FOOTPRINT(Vaporeon) - LEARNSETS(Vaporeon), + .levelUpLearnset = sVaporeonLevelUpLearnset, + .teachableLearnset = sVaporeonTeachableLearnset, }, [SPECIES_JOLTEON] = @@ -12390,17 +13628,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Jolteon, 48, 48), + .frontPic = gMonFrontPic_Jolteon, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Jolteon, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Jolteon, 56, 56), + .backPic = gMonBackPic_Jolteon, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Jolteon), - ICON(Jolteon, 2), + .palette = gMonPalette_Jolteon, + .shinyPalette = gMonShinyPalette_Jolteon, + .iconSprite = gMonIcon_Jolteon, + .iconPalIndex = 2, FOOTPRINT(Jolteon) - LEARNSETS(Jolteon), + .levelUpLearnset = sJolteonLevelUpLearnset, + .teachableLearnset = sJolteonTeachableLearnset, }, [SPECIES_FLAREON] = @@ -12437,17 +13680,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Flareon, 56, 56), + .frontPic = gMonFrontPic_Flareon, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Flareon, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Flareon, 64, 56), + .backPic = gMonBackPic_Flareon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Flareon), - ICON(Flareon, 3), + .palette = gMonPalette_Flareon, + .shinyPalette = gMonShinyPalette_Flareon, + .iconSprite = gMonIcon_Flareon, + .iconPalIndex = 3, FOOTPRINT(Flareon) - LEARNSETS(Flareon), + .levelUpLearnset = sFlareonLevelUpLearnset, + .teachableLearnset = sFlareonTeachableLearnset, }, #if P_GEN_2_CROSS_EVOS @@ -12485,17 +13733,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Espeon, 48, 56), + .frontPic = gMonFrontPic_Espeon, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Espeon, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Espeon, 64, 56), + .backPic = gMonBackPic_Espeon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Espeon), - ICON(Espeon, 2), + .palette = gMonPalette_Espeon, + .shinyPalette = gMonShinyPalette_Espeon, + .iconSprite = gMonIcon_Espeon, + .iconPalIndex = 2, FOOTPRINT(Espeon) - LEARNSETS(Espeon), + .levelUpLearnset = sEspeonLevelUpLearnset, + .teachableLearnset = sEspeonTeachableLearnset, }, [SPECIES_UMBREON] = @@ -12532,17 +13785,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Umbreon, 40, 48), + .frontPic = gMonFrontPic_Umbreon, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Umbreon, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Umbreon, 64, 64), + .backPic = gMonBackPic_Umbreon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Umbreon), - ICON(Umbreon, 0), + .palette = gMonPalette_Umbreon, + .shinyPalette = gMonShinyPalette_Umbreon, + .iconSprite = gMonIcon_Umbreon, + .iconPalIndex = 0, FOOTPRINT(Umbreon) - LEARNSETS(Umbreon), + .levelUpLearnset = sUmbreonLevelUpLearnset, + .teachableLearnset = sUmbreonTeachableLearnset, }, #endif //P_GEN_2_CROSS_EVOS @@ -12581,17 +13839,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Leafeon, 56, 48), + .frontPic = gMonFrontPic_Leafeon, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Leafeon, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Leafeon, 48, 64), + .backPic = gMonBackPic_Leafeon, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Leafeon), - ICON(Leafeon, 1), + .palette = gMonPalette_Leafeon, + .shinyPalette = gMonShinyPalette_Leafeon, + .iconSprite = gMonIcon_Leafeon, + .iconPalIndex = 1, FOOTPRINT(Leafeon) - LEARNSETS(Leafeon), + .levelUpLearnset = sLeafeonLevelUpLearnset, + .teachableLearnset = sLeafeonTeachableLearnset, }, [SPECIES_GLACEON] = @@ -12628,17 +13891,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Glaceon, 64, 56), + .frontPic = gMonFrontPic_Glaceon, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Glaceon, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Glaceon, 56, 64), + .backPic = gMonBackPic_Glaceon, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Glaceon), - ICON(Glaceon, 0), + .palette = gMonPalette_Glaceon, + .shinyPalette = gMonShinyPalette_Glaceon, + .iconSprite = gMonIcon_Glaceon, + .iconPalIndex = 0, FOOTPRINT(Glaceon) - LEARNSETS(Glaceon), + .levelUpLearnset = sGlaceonLevelUpLearnset, + .teachableLearnset = sGlaceonTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS @@ -12678,17 +13946,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Sylveon, 48, 56), + .frontPic = gMonFrontPic_Sylveon, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Sylveon, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Sylveon, 64, 64), + .backPic = gMonBackPic_Sylveon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Sylveon), - ICON(Sylveon, 0), + .palette = gMonPalette_Sylveon, + .shinyPalette = gMonShinyPalette_Sylveon, + .iconSprite = gMonIcon_Sylveon, + .iconPalIndex = 0, FOOTPRINT(Sylveon) - LEARNSETS(Sylveon), + .levelUpLearnset = sSylveonLevelUpLearnset, + .teachableLearnset = sSylveonTeachableLearnset, }, #endif //P_GEN_6_CROSS_EVOS #endif //P_FAMILY_EEVEE @@ -12728,17 +14001,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Porygon, 40, 40), + .frontPic = gMonFrontPic_Porygon, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Porygon, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Porygon, 56, 40), + .backPic = gMonBackPic_Porygon, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Porygon), - ICON(Porygon, 0), + .palette = gMonPalette_Porygon, + .shinyPalette = gMonShinyPalette_Porygon, + .iconSprite = gMonIcon_Porygon, + .iconPalIndex = 0, FOOTPRINT(Porygon) - LEARNSETS(Porygon), + .levelUpLearnset = sPorygonLevelUpLearnset, + .teachableLearnset = sPorygonTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}, {EVO_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}), }, @@ -12778,18 +14056,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Porygon2, 40, 40), + .frontPic = gMonFrontPic_Porygon2, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Porygon2, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, - BACK_PIC(Porygon2, 56, 48), + .backPic = gMonBackPic_Porygon2, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Porygon2), - ICON(Porygon2, 0), + .palette = gMonPalette_Porygon2, + .shinyPalette = gMonShinyPalette_Porygon2, + .iconSprite = gMonIcon_Porygon2, + .iconPalIndex = 0, FOOTPRINT(Porygon2) - LEARNSETS(Porygon2), + .levelUpLearnset = sPorygon2LevelUpLearnset, + .teachableLearnset = sPorygon2TeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}, {EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}), }, @@ -12835,18 +14118,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PorygonZ, 40, 56), + .frontPic = gMonFrontPic_PorygonZ, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Porygon_Z, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, .enemyMonElevation = 12, - BACK_PIC(PorygonZ, 64, 56), + .backPic = gMonBackPic_PorygonZ, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(PorygonZ), - ICON(PorygonZ, 0), + .palette = gMonPalette_PorygonZ, + .shinyPalette = gMonShinyPalette_PorygonZ, + .iconSprite = gMonIcon_PorygonZ, + .iconPalIndex = 0, FOOTPRINT(PorygonZ) - LEARNSETS(PorygonZ), + .levelUpLearnset = sPorygonZLevelUpLearnset, + .teachableLearnset = sPorygonZTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS @@ -12893,17 +14181,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Omanyte, 40, 40), + .frontPic = gMonFrontPic_Omanyte, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Omanyte, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, - BACK_PIC(Omanyte, 48, 40), + .backPic = gMonBackPic_Omanyte, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Omanyte), - ICON(Omanyte, 0), + .palette = gMonPalette_Omanyte, + .shinyPalette = gMonShinyPalette_Omanyte, + .iconSprite = gMonIcon_Omanyte, + .iconPalIndex = 0, FOOTPRINT(Omanyte) - LEARNSETS(Omanyte), + .levelUpLearnset = sOmanyteLevelUpLearnset, + .teachableLearnset = sOmanyteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_OMASTAR}), }, @@ -12941,17 +14234,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Omastar, 64, 56), + .frontPic = gMonFrontPic_Omastar, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Omastar, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Omastar, 56, 56), + .backPic = gMonBackPic_Omastar, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Omastar), - ICON(Omastar, 0), + .palette = gMonPalette_Omastar, + .shinyPalette = gMonShinyPalette_Omastar, + .iconSprite = gMonIcon_Omastar, + .iconPalIndex = 0, FOOTPRINT(Omastar) - LEARNSETS(Omastar), + .levelUpLearnset = sOmastarLevelUpLearnset, + .teachableLearnset = sOmastarTeachableLearnset, }, #endif //P_FAMILY_OMANYTE @@ -12996,17 +14294,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kabuto, 40, 32), + .frontPic = gMonFrontPic_Kabuto, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Kabuto, .frontAnimId = ANIM_H_SLIDE_WOBBLE, - BACK_PIC(Kabuto, 48, 40), + .backPic = gMonBackPic_Kabuto, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Kabuto), - ICON(Kabuto, 2), + .palette = gMonPalette_Kabuto, + .shinyPalette = gMonShinyPalette_Kabuto, + .iconSprite = gMonIcon_Kabuto, + .iconPalIndex = 2, FOOTPRINT(Kabuto) - LEARNSETS(Kabuto), + .levelUpLearnset = sKabutoLevelUpLearnset, + .teachableLearnset = sKabutoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KABUTOPS}), }, @@ -13050,17 +14353,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kabutops, 64, 64), + .frontPic = gMonFrontPic_Kabutops, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Kabutops, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Kabutops, 64, 56), + .backPic = gMonBackPic_Kabutops, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Kabutops), - ICON(Kabutops, 2), + .palette = gMonPalette_Kabutops, + .shinyPalette = gMonShinyPalette_Kabutops, + .iconSprite = gMonIcon_Kabutops, + .iconPalIndex = 2, FOOTPRINT(Kabutops) - LEARNSETS(Kabutops), + .levelUpLearnset = sKabutopsLevelUpLearnset, + .teachableLearnset = sKabutopsTeachableLearnset, }, #endif //P_FAMILY_KABUTO @@ -13080,7 +14388,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_AERODACTYL, .categoryName = _("Fossil"), FOOTPRINT(Aerodactyl) - LEARNSETS(Aerodactyl), + .levelUpLearnset = sAerodactylLevelUpLearnset, + .teachableLearnset = sAerodactylTeachableLearnset, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, @@ -13103,16 +14412,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 302, .trainerOffset = 4, - FRONT_PIC(Aerodactyl, 64, 64), + .frontPic = gMonFrontPic_Aerodactyl, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Aerodactyl, .frontAnimId = ANIM_V_SLIDE_SLOW, .enemyMonElevation = 9, - BACK_PIC(Aerodactyl, 64, 48), + .backPic = gMonBackPic_Aerodactyl, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Aerodactyl), - ICON(Aerodactyl, 2), + .palette = gMonPalette_Aerodactyl, + .shinyPalette = gMonShinyPalette_Aerodactyl, + .iconSprite = gMonIcon_Aerodactyl, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -13131,7 +14444,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_AERODACTYL, .categoryName = _("Fossil"), FOOTPRINT(Aerodactyl) - LEARNSETS(Aerodactyl), + .levelUpLearnset = sAerodactylLevelUpLearnset, + .teachableLearnset = sAerodactylTeachableLearnset, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, .baseHP = 80, @@ -13153,16 +14467,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 302, .trainerOffset = 4, - FRONT_PIC(AerodactylMega, 64, 64), + .frontPic = gMonFrontPic_AerodactylMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_AerodactylMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(AerodactylMega, 64, 64), + .backPic = gMonBackPic_AerodactylMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(AerodactylMega), - ICON(AerodactylMega, 2), + .palette = gMonPalette_AerodactylMega, + .shinyPalette = gMonShinyPalette_AerodactylMega, + .iconSprite = gMonIcon_AerodactylMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -13206,17 +14524,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Munchlax, 48, 48), + .frontPic = gMonFrontPic_Munchlax, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Munchlax, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Munchlax, 48, 56), + .backPic = gMonBackPic_Munchlax, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_GROW, - PALETTES(Munchlax), - ICON(Munchlax, 3), + .palette = gMonPalette_Munchlax, + .shinyPalette = gMonShinyPalette_Munchlax, + .iconSprite = gMonIcon_Munchlax, + .iconPalIndex = 3, FOOTPRINT(Munchlax) - LEARNSETS(Munchlax), + .levelUpLearnset = sMunchlaxLevelUpLearnset, + .teachableLearnset = sMunchlaxTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}), }, #endif //P_GEN_4_CROSS_EVOS @@ -13247,7 +14570,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_SNORLAX, .categoryName = _("Sleeping"), FOOTPRINT(Snorlax) - LEARNSETS(Snorlax), + .levelUpLearnset = sSnorlaxLevelUpLearnset, + .teachableLearnset = sSnorlaxTeachableLearnset, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, .height = 21, @@ -13261,15 +14585,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 423, .trainerOffset = 11, - FRONT_PIC(Snorlax, 64, 64), + .frontPic = gMonFrontPic_Snorlax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Snorlax, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Snorlax, 64, 40), + .backPic = gMonBackPic_Snorlax, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Snorlax), - ICON(Snorlax, 3), + .palette = gMonPalette_Snorlax, + .shinyPalette = gMonShinyPalette_Snorlax, + .iconSprite = gMonIcon_Snorlax, + .iconPalIndex = 3, }, #if P_GIGANTAMAX_FORMS @@ -13299,7 +14627,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_SNORLAX, .categoryName = _("Sleeping"), FOOTPRINT(Snorlax) - LEARNSETS(Snorlax), + .levelUpLearnset = sSnorlaxLevelUpLearnset, + .teachableLearnset = sSnorlaxTeachableLearnset, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, .height = 350, @@ -13313,15 +14642,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 423, .trainerOffset = 11, - FRONT_PIC(SnorlaxGigantamax, 64, 64), + .frontPic = gMonFrontPic_SnorlaxGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SnorlaxGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SnorlaxGigantamax, 64, 64), + .backPic = gMonBackPic_SnorlaxGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SnorlaxGigantamax), - ICON(SnorlaxGigantamax, 3), + .palette = gMonPalette_SnorlaxGigantamax, + .shinyPalette = gMonShinyPalette_SnorlaxGigantamax, + .iconSprite = gMonIcon_SnorlaxGigantamax, + .iconPalIndex = 3, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -13371,16 +14704,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "can control ice. The flapping of its wings\n" "chills the air. As a result, it is said that\n" "when this Pokémon flies, snow will fall."), - FRONT_PIC(Articuno, 64, 64), + .frontPic = gMonFrontPic_Articuno, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Articuno, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Articuno, 64, 56), + .backPic = gMonBackPic_Articuno, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Articuno), - ICON(Articuno, 2), - LEARNSETS(Articuno), + .palette = gMonPalette_Articuno, + .shinyPalette = gMonShinyPalette_Articuno, + .iconSprite = gMonIcon_Articuno, + .iconPalIndex = 2, + .levelUpLearnset = sArticunoLevelUpLearnset, + .teachableLearnset = sArticunoTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -13421,17 +14759,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "as if they had been frozen solid.\n" "Its feather-like blades of psychic energy\n" "rip through thick iron sheets like paper."), - FRONT_PIC(ArticunoGalarian, 64, 56), + .frontPic = gMonFrontPic_ArticunoGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_ArticunoGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(ArticunoGalarian, 64, 56), + .backPic = gMonBackPic_ArticunoGalarian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ArticunoGalarian), - ICON(ArticunoGalarian, 2), - LEARNSETS(ArticunoGalarian), + .palette = gMonPalette_ArticunoGalarian, + .shinyPalette = gMonShinyPalette_ArticunoGalarian, + .iconSprite = gMonIcon_ArticunoGalarian, + .iconPalIndex = 2, + .levelUpLearnset = sArticunoGalarianLevelUpLearnset, + .teachableLearnset = sArticunoGalarianTeachableLearnset, .isGalarianForm = TRUE, }, #endif //P_GALARIAN_FORMS @@ -13485,17 +14828,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "has the ability to control electricity.\n" "It usually lives in thunderclouds. It gains\n" "power if it is stricken by lightning bolts."), - FRONT_PIC(Zapdos, 64, 56), + .frontPic = gMonFrontPic_Zapdos, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Zapdos, .frontAnimId = ANIM_FLASH_YELLOW, .enemyMonElevation = 8, - BACK_PIC(Zapdos, 64, 40), + .backPic = gMonBackPic_Zapdos, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Zapdos), - ICON(Zapdos, 0), - LEARNSETS(Zapdos), + .palette = gMonPalette_Zapdos, + .shinyPalette = gMonShinyPalette_Zapdos, + .iconSprite = gMonIcon_Zapdos, + .iconPalIndex = 0, + .levelUpLearnset = sZapdosLevelUpLearnset, + .teachableLearnset = sZapdosTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -13536,16 +14884,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "produce a crackling sound like the\n" "zapping of electricity. Apparently, it runs\n" "through the mountains at over 180 mph."), - FRONT_PIC(ZapdosGalarian, 48, 64), + .frontPic = gMonFrontPic_ZapdosGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZapdosGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZapdosGalarian, 56, 48), + .backPic = gMonBackPic_ZapdosGalarian, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZapdosGalarian), - ICON(ZapdosGalarian, 0), - LEARNSETS(ZapdosGalarian), + .palette = gMonPalette_ZapdosGalarian, + .shinyPalette = gMonShinyPalette_ZapdosGalarian, + .iconSprite = gMonIcon_ZapdosGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sZapdosGalarianLevelUpLearnset, + .teachableLearnset = sZapdosGalarianTeachableLearnset, .isGalarianForm = TRUE, }, #endif //P_GALARIAN_FORMS @@ -13595,16 +14948,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "that can control fire. If injured, it is said\n" "to dip its body in the molten magma of\n" "a volcano to burn and heal itself."), - FRONT_PIC(Moltres, 64, 64), + .frontPic = gMonFrontPic_Moltres, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Moltres, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Moltres, 64, 56), + .backPic = gMonBackPic_Moltres, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Moltres), - ICON(Moltres, 0), - LEARNSETS(Moltres), + .palette = gMonPalette_Moltres, + .shinyPalette = gMonShinyPalette_Moltres, + .iconSprite = gMonIcon_Moltres, + .iconPalIndex = 0, + .levelUpLearnset = sMoltresLevelUpLearnset, + .teachableLearnset = sMoltresTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -13645,16 +15003,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "will consume the spirit of any creature\n" "it hits. Victims become burned-out\n" "shadows of themselves."), - FRONT_PIC(MoltresGalarian, 64, 64), + .frontPic = gMonFrontPic_MoltresGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_MoltresGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MoltresGalarian, 56, 56), + .backPic = gMonBackPic_MoltresGalarian, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MoltresGalarian), - ICON(MoltresGalarian, 0), - LEARNSETS(MoltresGalarian), + .palette = gMonPalette_MoltresGalarian, + .shinyPalette = gMonShinyPalette_MoltresGalarian, + .iconSprite = gMonIcon_MoltresGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sMoltresGalarianLevelUpLearnset, + .teachableLearnset = sMoltresGalarianTeachableLearnset, .isGalarianForm = TRUE, }, #endif //P_GALARIAN_FORMS @@ -13696,17 +15059,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 386, .trainerOffset = 6, - FRONT_PIC(Dratini, 56, 48), + .frontPic = gMonFrontPic_Dratini, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Dratini, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dratini, 56, 48), + .backPic = gMonBackPic_Dratini, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Dratini), - ICON(Dratini, 0), + .palette = gMonPalette_Dratini, + .shinyPalette = gMonShinyPalette_Dratini, + .iconSprite = gMonIcon_Dratini, + .iconPalIndex = 0, FOOTPRINT(Dratini) - LEARNSETS(Dratini), + .levelUpLearnset = sDratiniLevelUpLearnset, + .teachableLearnset = sDratiniTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_DRAGONAIR}), }, @@ -13745,17 +15113,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 411, .trainerOffset = 5, - FRONT_PIC(Dragonair, 64, 64), + .frontPic = gMonFrontPic_Dragonair, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Dragonair, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Dragonair, 40, 56), + .backPic = gMonBackPic_Dragonair, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Dragonair), - ICON(Dragonair, 0), + .palette = gMonPalette_Dragonair, + .shinyPalette = gMonShinyPalette_Dragonair, + .iconSprite = gMonIcon_Dragonair, + .iconPalIndex = 0, FOOTPRINT(Dragonair) - LEARNSETS(Dragonair), + .levelUpLearnset = sDragonairLevelUpLearnset, + .teachableLearnset = sDragonairTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_DRAGONITE}), }, @@ -13800,17 +15173,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 4, - FRONT_PIC(Dragonite, 64, 64), + .frontPic = gMonFrontPic_Dragonite, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dragonite, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Dragonite, 64, 64), + .backPic = gMonBackPic_Dragonite, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Dragonite), - ICON(Dragonite, 2), + .palette = gMonPalette_Dragonite, + .shinyPalette = gMonShinyPalette_Dragonite, + .iconSprite = gMonIcon_Dragonite, + .iconPalIndex = 2, FOOTPRINT(Dragonite) - LEARNSETS(Dragonite), + .levelUpLearnset = sDragoniteLevelUpLearnset, + .teachableLearnset = sDragoniteTeachableLearnset, }, #endif //P_FAMILY_DRATINI @@ -13829,7 +15207,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), FOOTPRINT(Mewtwo) - LEARNSETS(Mewtwo), + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, @@ -13860,15 +15239,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 4, - FRONT_PIC(Mewtwo, 64, 64), + .frontPic = gMonFrontPic_Mewtwo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Mewtwo, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Mewtwo, 64, 64), + .backPic = gMonBackPic_Mewtwo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Mewtwo), - ICON(Mewtwo, 2), + .palette = gMonPalette_Mewtwo, + .shinyPalette = gMonShinyPalette_Mewtwo, + .iconSprite = gMonIcon_Mewtwo, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -13886,7 +15269,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), FOOTPRINT(Mewtwo) - LEARNSETS(Mewtwo), + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, @@ -13912,15 +15296,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 4, - FRONT_PIC(MewtwoMegaX, 48, 64), + .frontPic = gMonFrontPic_MewtwoMegaX, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MewtwoMegaX, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MewtwoMegaX, 56, 64), + .backPic = gMonBackPic_MewtwoMegaX, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(MewtwoMegaX), - ICON(MewtwoMegaX, 2), + .palette = gMonPalette_MewtwoMegaX, + .shinyPalette = gMonShinyPalette_MewtwoMegaX, + .iconSprite = gMonIcon_MewtwoMegaX, + .iconPalIndex = 2, }, [SPECIES_MEWTWO_MEGA_Y] = @@ -13937,7 +15325,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), FOOTPRINT(Mewtwo) - LEARNSETS(Mewtwo), + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, @@ -13963,16 +15352,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 4, - FRONT_PIC(MewtwoMegaY, 40, 64), + .frontPic = gMonFrontPic_MewtwoMegaY, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MewtwoMegaY, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, - BACK_PIC(MewtwoMegaY, 64, 64), + .backPic = gMonBackPic_MewtwoMegaY, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(MewtwoMegaY), - ICON(MewtwoMegaY, 2), + .palette = gMonPalette_MewtwoMegaY, + .shinyPalette = gMonShinyPalette_MewtwoMegaY, + .iconSprite = gMonIcon_MewtwoMegaY, + .iconPalIndex = 2, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO @@ -14021,18 +15414,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mew, 64, 48), + .frontPic = gMonFrontPic_Mew, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Mew, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 11, - BACK_PIC(Mew, 64, 64), + .backPic = gMonBackPic_Mew, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Mew), - ICON(Mew, 0), + .palette = gMonPalette_Mew, + .shinyPalette = gMonShinyPalette_Mew, + .iconSprite = gMonIcon_Mew, + .iconPalIndex = 0, FOOTPRINT(Mew) - LEARNSETS(Mew), + .levelUpLearnset = sMewLevelUpLearnset, + .teachableLearnset = sMewTeachableLearnset, }, #endif //P_FAMILY_MEW diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index f8d35e1d0869..1a352500865b 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chikorita, 48, 48), + .frontPic = gMonFrontPic_Chikorita, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Chikorita, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Chikorita, 56, 48), + .backPic = gMonBackPic_Chikorita, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Chikorita), - ICON(Chikorita, 1), + .palette = gMonPalette_Chikorita, + .shinyPalette = gMonShinyPalette_Chikorita, + .iconSprite = gMonIcon_Chikorita, + .iconPalIndex = 1, FOOTPRINT(Chikorita) - LEARNSETS(Chikorita), + .levelUpLearnset = sChikoritaLevelUpLearnset, + .teachableLearnset = sChikoritaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BAYLEEF}), }, @@ -87,17 +92,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bayleef, 48, 64), + .frontPic = gMonFrontPic_Bayleef, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Bayleef, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Bayleef, 64, 56), + .backPic = gMonBackPic_Bayleef, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Bayleef), - ICON(Bayleef, 1), + .palette = gMonPalette_Bayleef, + .shinyPalette = gMonShinyPalette_Bayleef, + .iconSprite = gMonIcon_Bayleef, + .iconPalIndex = 1, FOOTPRINT(Bayleef) - LEARNSETS(Bayleef), + .levelUpLearnset = sBayleefLevelUpLearnset, + .teachableLearnset = sBayleefTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MEGANIUM}), }, @@ -142,19 +152,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 277, .trainerOffset = 1, - FRONT_PIC(Meganium, 48, 64), - FRONT_PIC_FEMALE(Meganium, 48, 64), + .frontPic = gMonFrontPic_Meganium, + .frontPicSize = MON_COORDS_SIZE(48, 64), + .frontPicFemale = gMonFrontPic_MeganiumF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Meganium, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Meganium, 56, 64), - BACK_PIC_FEMALE(Meganium, 56, 64), + .backPic = gMonBackPic_Meganium, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_MeganiumF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Meganium), - ICON(Meganium, 1), + .palette = gMonPalette_Meganium, + .shinyPalette = gMonShinyPalette_Meganium, + .iconSprite = gMonIcon_Meganium, + .iconPalIndex = 1, FOOTPRINT(Meganium) - LEARNSETS(Meganium), + .levelUpLearnset = sMeganiumLevelUpLearnset, + .teachableLearnset = sMeganiumTeachableLearnset, }, #endif //P_FAMILY_CHIKORITA @@ -193,17 +210,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cyndaquil, 48, 40), + .frontPic = gMonFrontPic_Cyndaquil, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Cyndaquil, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Cyndaquil, 64, 64), + .backPic = gMonBackPic_Cyndaquil, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Cyndaquil), - ICON(Cyndaquil, 3), + .palette = gMonPalette_Cyndaquil, + .shinyPalette = gMonShinyPalette_Cyndaquil, + .iconSprite = gMonIcon_Cyndaquil, + .iconPalIndex = 3, FOOTPRINT(Cyndaquil) - LEARNSETS(Cyndaquil), + .levelUpLearnset = sCyndaquilLevelUpLearnset, + .teachableLearnset = sCyndaquilTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_QUILAVA}), }, @@ -242,17 +264,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quilava, 64, 48), + .frontPic = gMonFrontPic_Quilava, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Quilava, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Quilava, 64, 64), + .backPic = gMonBackPic_Quilava, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Quilava), - ICON(Quilava, 3), + .palette = gMonPalette_Quilava, + .shinyPalette = gMonShinyPalette_Quilava, + .iconSprite = gMonIcon_Quilava, + .iconPalIndex = 3, FOOTPRINT(Quilava) - LEARNSETS(Quilava), + .levelUpLearnset = sQuilavaLevelUpLearnset, + .teachableLearnset = sQuilavaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_TYPHLOSION}, {EVO_NONE, 0, SPECIES_TYPHLOSION_HISUIAN}), }, @@ -301,17 +328,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = 1, - FRONT_PIC(Typhlosion, 56, 64), + .frontPic = gMonFrontPic_Typhlosion, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Typhlosion, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 20, - BACK_PIC(Typhlosion, 64, 64), + .backPic = gMonBackPic_Typhlosion, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Typhlosion), - ICON(Typhlosion, 3), - LEARNSETS(Typhlosion), + .palette = gMonPalette_Typhlosion, + .shinyPalette = gMonShinyPalette_Typhlosion, + .iconSprite = gMonIcon_Typhlosion, + .iconPalIndex = 3, + .levelUpLearnset = sTyphlosionLevelUpLearnset, + .teachableLearnset = sTyphlosionTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -351,16 +383,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = 1, - FRONT_PIC(TyphlosionHisuian, 48, 64), + .frontPic = gMonFrontPic_TyphlosionHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyphlosionHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(TyphlosionHisuian, 64, 56), + .backPic = gMonBackPic_TyphlosionHisuian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TyphlosionHisuian), - ICON(TyphlosionHisuian, 1), - LEARNSETS(TyphlosionHisuian), + .palette = gMonPalette_TyphlosionHisuian, + .shinyPalette = gMonShinyPalette_TyphlosionHisuian, + .iconSprite = gMonIcon_TyphlosionHisuian, + .iconPalIndex = 1, + .levelUpLearnset = sTyphlosionHisuianLevelUpLearnset, + .teachableLearnset = sTyphlosionHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -401,17 +438,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Totodile, 40, 40), + .frontPic = gMonFrontPic_Totodile, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Totodile, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Totodile, 56, 48), + .backPic = gMonBackPic_Totodile, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Totodile), - ICON(Totodile, 0), + .palette = gMonPalette_Totodile, + .shinyPalette = gMonShinyPalette_Totodile, + .iconSprite = gMonIcon_Totodile, + .iconPalIndex = 0, FOOTPRINT(Totodile) - LEARNSETS(Totodile), + .levelUpLearnset = sTotodileLevelUpLearnset, + .teachableLearnset = sTotodileTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CROCONAW}), }, @@ -451,17 +493,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Croconaw, 48, 56), + .frontPic = gMonFrontPic_Croconaw, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Croconaw, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Croconaw, 56, 64), + .backPic = gMonBackPic_Croconaw, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Croconaw), - ICON(Croconaw, 0), + .palette = gMonPalette_Croconaw, + .shinyPalette = gMonShinyPalette_Croconaw, + .iconSprite = gMonIcon_Croconaw, + .iconPalIndex = 0, FOOTPRINT(Croconaw) - LEARNSETS(Croconaw), + .levelUpLearnset = sCroconawLevelUpLearnset, + .teachableLearnset = sCroconawTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_FERALIGATR}), }, @@ -506,18 +553,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 342, .trainerOffset = 7, - FRONT_PIC(Feraligatr, 64, 64), + .frontPic = gMonFrontPic_Feraligatr, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Feraligatr, .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 5, - BACK_PIC(Feraligatr, 56, 64), + .backPic = gMonBackPic_Feraligatr, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Feraligatr), - ICON(Feraligatr, 0), + .palette = gMonPalette_Feraligatr, + .shinyPalette = gMonShinyPalette_Feraligatr, + .iconSprite = gMonIcon_Feraligatr, + .iconPalIndex = 0, FOOTPRINT(Feraligatr) - LEARNSETS(Feraligatr), + .levelUpLearnset = sFeraligatrLevelUpLearnset, + .teachableLearnset = sFeraligatrTeachableLearnset, }, #endif //P_FAMILY_TOTODILE @@ -556,17 +608,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sentret, 40, 64), + .frontPic = gMonFrontPic_Sentret, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Sentret, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sentret, 48, 64), + .backPic = gMonBackPic_Sentret, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Sentret), - ICON(Sentret, 2), + .palette = gMonPalette_Sentret, + .shinyPalette = gMonShinyPalette_Sentret, + .iconSprite = gMonIcon_Sentret, + .iconPalIndex = 2, FOOTPRINT(Sentret) - LEARNSETS(Sentret), + .levelUpLearnset = sSentretLevelUpLearnset, + .teachableLearnset = sSentretTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FURRET}), }, @@ -604,17 +661,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Furret, 48, 56), + .frontPic = gMonFrontPic_Furret, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Furret, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Furret, 64, 56), + .backPic = gMonBackPic_Furret, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Furret), - ICON(Furret, 2), + .palette = gMonPalette_Furret, + .shinyPalette = gMonShinyPalette_Furret, + .iconSprite = gMonIcon_Furret, + .iconPalIndex = 2, FOOTPRINT(Furret) - LEARNSETS(Furret), + .levelUpLearnset = sFurretLevelUpLearnset, + .teachableLearnset = sFurretTeachableLearnset, }, #endif //P_FAMILY_SENTRET @@ -653,17 +715,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Hoothoot, 40, 40), + .frontPic = gMonFrontPic_Hoothoot, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Hoothoot, .frontAnimId = ANIM_V_SLIDE_SLOW, - BACK_PIC(Hoothoot, 56, 64), + .backPic = gMonBackPic_Hoothoot, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Hoothoot), - ICON(Hoothoot, 2), + .palette = gMonPalette_Hoothoot, + .shinyPalette = gMonShinyPalette_Hoothoot, + .iconSprite = gMonIcon_Hoothoot, + .iconPalIndex = 2, FOOTPRINT(Hoothoot) - LEARNSETS(Hoothoot), + .levelUpLearnset = sHoothootLevelUpLearnset, + .teachableLearnset = sHoothootTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_NOCTOWL}), }, @@ -707,17 +774,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Noctowl, 40, 64), + .frontPic = gMonFrontPic_Noctowl, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Noctowl, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Noctowl, 48, 64), + .backPic = gMonBackPic_Noctowl, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Noctowl), - ICON(Noctowl, 2), + .palette = gMonPalette_Noctowl, + .shinyPalette = gMonShinyPalette_Noctowl, + .iconSprite = gMonIcon_Noctowl, + .iconPalIndex = 2, FOOTPRINT(Noctowl) - LEARNSETS(Noctowl), + .levelUpLearnset = sNoctowlLevelUpLearnset, + .teachableLearnset = sNoctowlTeachableLearnset, }, #endif //P_FAMILY_HOOTHOOT @@ -756,19 +828,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ledyba, 48, 48), - FRONT_PIC_FEMALE(Ledyba, 48, 48), + .frontPic = gMonFrontPic_Ledyba, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_LedybaF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Ledyba, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Ledyba, 56, 48), - BACK_PIC_FEMALE(Ledyba, 56, 48), + .backPic = gMonBackPic_Ledyba, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_LedybaF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Ledyba), - ICON(Ledyba, 0), + .palette = gMonPalette_Ledyba, + .shinyPalette = gMonShinyPalette_Ledyba, + .iconSprite = gMonIcon_Ledyba, + .iconPalIndex = 0, FOOTPRINT(Ledyba) - LEARNSETS(Ledyba), + .levelUpLearnset = sLedybaLevelUpLearnset, + .teachableLearnset = sLedybaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_LEDIAN}), }, @@ -806,20 +885,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ledian, 48, 56), - FRONT_PIC_FEMALE(Ledian, 48, 56), + .frontPic = gMonFrontPic_Ledian, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_LedianF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Ledian, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 10, - BACK_PIC(Ledian, 64, 64), - BACK_PIC_FEMALE(Ledian, 64, 64), + .backPic = gMonBackPic_Ledian, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_LedianF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Ledian), - ICON(Ledian, 0), + .palette = gMonPalette_Ledian, + .shinyPalette = gMonShinyPalette_Ledian, + .iconSprite = gMonIcon_Ledian, + .iconPalIndex = 0, FOOTPRINT(Ledian) - LEARNSETS(Ledian), + .levelUpLearnset = sLedianLevelUpLearnset, + .teachableLearnset = sLedianTeachableLearnset, }, #endif //P_FAMILY_LEDYBA @@ -858,17 +944,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spinarak, 48, 32), + .frontPic = gMonFrontPic_Spinarak, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Spinarak, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, - BACK_PIC(Spinarak, 64, 32), + .backPic = gMonBackPic_Spinarak, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Spinarak), - ICON(Spinarak, 1), + .palette = gMonPalette_Spinarak, + .shinyPalette = gMonShinyPalette_Spinarak, + .iconSprite = gMonIcon_Spinarak, + .iconPalIndex = 1, FOOTPRINT(Spinarak) - LEARNSETS(Spinarak), + .levelUpLearnset = sSpinarakLevelUpLearnset, + .teachableLearnset = sSpinarakTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARIADOS}), }, @@ -912,17 +1003,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ariados, 64, 56), + .frontPic = gMonFrontPic_Ariados, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Ariados, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Ariados, 64, 48), + .backPic = gMonBackPic_Ariados, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Ariados), - ICON(Ariados, 0), + .palette = gMonPalette_Ariados, + .shinyPalette = gMonShinyPalette_Ariados, + .iconSprite = gMonIcon_Ariados, + .iconPalIndex = 0, FOOTPRINT(Ariados) - LEARNSETS(Ariados), + .levelUpLearnset = sAriadosLevelUpLearnset, + .teachableLearnset = sAriadosTeachableLearnset, }, #endif //P_FAMILY_SPINARAK @@ -962,17 +1058,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chinchou, 64, 48), + .frontPic = gMonFrontPic_Chinchou, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Chinchou, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Chinchou, 64, 48), + .backPic = gMonBackPic_Chinchou, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Chinchou), - ICON(Chinchou, 2), + .palette = gMonPalette_Chinchou, + .shinyPalette = gMonShinyPalette_Chinchou, + .iconSprite = gMonIcon_Chinchou, + .iconPalIndex = 2, FOOTPRINT(Chinchou) - LEARNSETS(Chinchou), + .levelUpLearnset = sChinchouLevelUpLearnset, + .teachableLearnset = sChinchouTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_LANTURN}), }, @@ -1011,17 +1112,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lanturn, 64, 48), + .frontPic = gMonFrontPic_Lanturn, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Lanturn, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, - BACK_PIC(Lanturn, 64, 56), + .backPic = gMonBackPic_Lanturn, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Lanturn), - ICON(Lanturn, 0), + .palette = gMonPalette_Lanturn, + .shinyPalette = gMonShinyPalette_Lanturn, + .iconSprite = gMonIcon_Lanturn, + .iconPalIndex = 0, FOOTPRINT(Lanturn) - LEARNSETS(Lanturn), + .levelUpLearnset = sLanturnLevelUpLearnset, + .teachableLearnset = sLanturnTeachableLearnset, }, #endif //P_FAMILY_CHINCHOU @@ -1062,17 +1168,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Togepi, 24, 32), + .frontPic = gMonFrontPic_Togepi, + .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Togepi, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Togepi, 48, 40), + .backPic = gMonBackPic_Togepi, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Togepi), - ICON(Togepi, 0), + .palette = gMonPalette_Togepi, + .shinyPalette = gMonShinyPalette_Togepi, + .iconSprite = gMonIcon_Togepi, + .iconPalIndex = 0, FOOTPRINT(Togepi) - LEARNSETS(Togepi), + .levelUpLearnset = sTogepiLevelUpLearnset, + .teachableLearnset = sTogepiTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}), }, @@ -1110,17 +1221,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Togetic, 32, 48), + .frontPic = gMonFrontPic_Togetic, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Togetic, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Togetic, 56, 56), + .backPic = gMonBackPic_Togetic, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Togetic), - ICON(Togetic, 0), + .palette = gMonPalette_Togetic, + .shinyPalette = gMonShinyPalette_Togetic, + .iconSprite = gMonIcon_Togetic, + .iconPalIndex = 0, FOOTPRINT(Togetic) - LEARNSETS(Togetic), + .levelUpLearnset = sTogeticLevelUpLearnset, + .teachableLearnset = sTogeticTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}), }, @@ -1171,18 +1287,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Togekiss, 64, 56), + .frontPic = gMonFrontPic_Togekiss, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Togekiss, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 14, - BACK_PIC(Togekiss, 64, 48), + .backPic = gMonBackPic_Togekiss, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Togekiss), - ICON(Togekiss, 2), + .palette = gMonPalette_Togekiss, + .shinyPalette = gMonShinyPalette_Togekiss, + .iconSprite = gMonIcon_Togekiss, + .iconPalIndex = 2, FOOTPRINT(Togekiss) - LEARNSETS(Togekiss), + .levelUpLearnset = sTogekissLevelUpLearnset, + .teachableLearnset = sTogekissTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TOGEPI @@ -1222,18 +1343,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 25, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Natu, 32, 32), + .frontPic = gMonFrontPic_Natu, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Natu, .frontAnimId = ANIM_H_JUMPS, .frontAnimDelay = 30, - BACK_PIC(Natu, 40, 40), + .backPic = gMonBackPic_Natu, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Natu), - ICON(Natu, 1), + .palette = gMonPalette_Natu, + .shinyPalette = gMonShinyPalette_Natu, + .iconSprite = gMonIcon_Natu, + .iconPalIndex = 1, FOOTPRINT(Natu) - LEARNSETS(Natu), + .levelUpLearnset = sNatuLevelUpLearnset, + .teachableLearnset = sNatuTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_XATU}), }, @@ -1272,18 +1398,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 6, .trainerScale = 318, .trainerOffset = 4, - FRONT_PIC(Xatu, 40, 56), - FRONT_PIC_FEMALE(Xatu, 40, 56), + .frontPic = gMonFrontPic_Xatu, + .frontPicSize = MON_COORDS_SIZE(40, 56), + .frontPicFemale = gMonFrontPic_XatuF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Xatu, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Xatu, 64, 56), + .backPic = gMonBackPic_Xatu, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Xatu), - ICON(Xatu, 1), + .palette = gMonPalette_Xatu, + .shinyPalette = gMonShinyPalette_Xatu, + .iconSprite = gMonIcon_Xatu, + .iconPalIndex = 1, FOOTPRINT(Xatu) - LEARNSETS(Xatu), + .levelUpLearnset = sXatuLevelUpLearnset, + .teachableLearnset = sXatuTeachableLearnset, }, #endif //P_FAMILY_NATU @@ -1322,18 +1454,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mareep, 40, 48), + .frontPic = gMonFrontPic_Mareep, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Mareep, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 50, - BACK_PIC(Mareep, 56, 40), + .backPic = gMonBackPic_Mareep, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Mareep), - ICON(Mareep, 0), + .palette = gMonPalette_Mareep, + .shinyPalette = gMonShinyPalette_Mareep, + .iconSprite = gMonIcon_Mareep, + .iconPalIndex = 0, FOOTPRINT(Mareep) - LEARNSETS(Mareep), + .levelUpLearnset = sMareepLevelUpLearnset, + .teachableLearnset = sMareepTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_FLAAFFY}), }, @@ -1371,17 +1508,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Flaaffy, 48, 48), + .frontPic = gMonFrontPic_Flaaffy, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Flaaffy, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Flaaffy, 48, 56), + .backPic = gMonBackPic_Flaaffy, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Flaaffy), - ICON(Flaaffy, 0), + .palette = gMonPalette_Flaaffy, + .shinyPalette = gMonShinyPalette_Flaaffy, + .iconSprite = gMonIcon_Flaaffy, + .iconPalIndex = 0, FOOTPRINT(Flaaffy) - LEARNSETS(Flaaffy), + .levelUpLearnset = sFlaaffyLevelUpLearnset, + .teachableLearnset = sFlaaffyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_AMPHAROS}), }, @@ -1407,7 +1549,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Ampharos) - LEARNSETS(Ampharos), + .levelUpLearnset = sAmpharosLevelUpLearnset, + .teachableLearnset = sAmpharosTeachableLearnset, .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, @@ -1433,16 +1576,20 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "seen even from space. People in the old\n" "days used its light to send signals back\n" "and forth with others far away."), - FRONT_PIC(Ampharos, 56, 64), + .frontPic = gMonFrontPic_Ampharos, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Ampharos, .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 10, - BACK_PIC(Ampharos, 56, 64), + .backPic = gMonBackPic_Ampharos, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Ampharos), - ICON(Ampharos, 0), + .palette = gMonPalette_Ampharos, + .shinyPalette = gMonShinyPalette_Ampharos, + .iconSprite = gMonIcon_Ampharos, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -1466,7 +1613,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Ampharos) - LEARNSETS(Ampharos), + .levelUpLearnset = sAmpharosLevelUpLearnset, + .teachableLearnset = sAmpharosTeachableLearnset, .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, .baseHP = 90, @@ -1484,15 +1632,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "stimulated Ampharos's cells, apparently\n" "awakening its long-sleeping dragon's\n" "blood."), - FRONT_PIC(AmpharosMega, 64, 64), + .frontPic = gMonFrontPic_AmpharosMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AmpharosMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AmpharosMega, 64, 64), + .backPic = gMonBackPic_AmpharosMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(AmpharosMega), - ICON(AmpharosMega, 0), + .palette = gMonPalette_AmpharosMega, + .shinyPalette = gMonShinyPalette_AmpharosMega, + .iconSprite = gMonIcon_AmpharosMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -1538,17 +1690,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Azurill, 48, 48), + .frontPic = gMonFrontPic_Azurill, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Azurill, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Azurill, 64, 56), + .backPic = gMonBackPic_Azurill, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Azurill), - ICON(Azurill, 0), + .palette = gMonPalette_Azurill, + .shinyPalette = gMonShinyPalette_Azurill, + .iconSprite = gMonIcon_Azurill, + .iconPalIndex = 0, FOOTPRINT(Azurill) - LEARNSETS(Azurill), + .levelUpLearnset = sAzurillLevelUpLearnset, + .teachableLearnset = sAzurillTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_MARILL}), }, #endif //P_GEN_3_CROSS_EVOS @@ -1591,17 +1748,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Marill, 56, 40), + .frontPic = gMonFrontPic_Marill, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Marill, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Marill, 64, 40), + .backPic = gMonBackPic_Marill, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Marill), - ICON(Marill, 0), + .palette = gMonPalette_Marill, + .shinyPalette = gMonShinyPalette_Marill, + .iconSprite = gMonIcon_Marill, + .iconPalIndex = 0, FOOTPRINT(Marill) - LEARNSETS(Marill), + .levelUpLearnset = sMarillLevelUpLearnset, + .teachableLearnset = sMarillTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_AZUMARILL}), }, @@ -1651,17 +1813,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Azumarill, 56, 64), + .frontPic = gMonFrontPic_Azumarill, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Azumarill, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Azumarill, 64, 64), + .backPic = gMonBackPic_Azumarill, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Azumarill), - ICON(Azumarill, 0), + .palette = gMonPalette_Azumarill, + .shinyPalette = gMonShinyPalette_Azumarill, + .iconSprite = gMonIcon_Azumarill, + .iconPalIndex = 0, FOOTPRINT(Azumarill) - LEARNSETS(Azumarill), + .levelUpLearnset = sAzumarillLevelUpLearnset, + .teachableLearnset = sAzumarillTeachableLearnset, }, #endif //P_FAMILY_MARILL @@ -1701,17 +1868,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bonsly, 32, 48), + .frontPic = gMonFrontPic_Bonsly, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Bonsly, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, - BACK_PIC(Bonsly, 40, 64), + .backPic = gMonBackPic_Bonsly, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Bonsly), - ICON(Bonsly, 1), + .palette = gMonPalette_Bonsly, + .shinyPalette = gMonShinyPalette_Bonsly, + .iconSprite = gMonIcon_Bonsly, + .iconPalIndex = 1, FOOTPRINT(Bonsly) - LEARNSETS(Bonsly), + .levelUpLearnset = sBonslyLevelUpLearnset, + .teachableLearnset = sBonslyTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}), }, #endif //P_GEN_4_CROSS_EVOS @@ -1750,19 +1922,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sudowoodo, 48, 56), - FRONT_PIC_FEMALE(Sudowoodo, 48, 56), + .frontPic = gMonFrontPic_Sudowoodo, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_SudowoodoF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Sudowoodo, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Sudowoodo, 48, 56), - BACK_PIC_FEMALE(Sudowoodo, 48, 56), + .backPic = gMonBackPic_Sudowoodo, + .backPicSize = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_SudowoodoF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Sudowoodo), - ICON(Sudowoodo, 1), + .palette = gMonPalette_Sudowoodo, + .shinyPalette = gMonShinyPalette_Sudowoodo, + .iconSprite = gMonIcon_Sudowoodo, + .iconPalIndex = 1, FOOTPRINT(Sudowoodo) - LEARNSETS(Sudowoodo), + .levelUpLearnset = sSudowoodoLevelUpLearnset, + .teachableLearnset = sSudowoodoTeachableLearnset, }, #endif //P_FAMILY_SUDOWOODO @@ -1801,18 +1980,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Hoppip, 64, 56), + .frontPic = gMonFrontPic_Hoppip, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Hoppip, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 15, - BACK_PIC(Hoppip, 64, 48), + .backPic = gMonBackPic_Hoppip, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Hoppip), - ICON(Hoppip, 1), + .palette = gMonPalette_Hoppip, + .shinyPalette = gMonShinyPalette_Hoppip, + .iconSprite = gMonIcon_Hoppip, + .iconPalIndex = 1, FOOTPRINT(Hoppip) - LEARNSETS(Hoppip), + .levelUpLearnset = sHoppipLevelUpLearnset, + .teachableLearnset = sHoppipTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_SKIPLOOM}), }, @@ -1850,18 +2034,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skiploom, 40, 40), + .frontPic = gMonFrontPic_Skiploom, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Skiploom, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 15, - BACK_PIC(Skiploom, 64, 56), + .backPic = gMonBackPic_Skiploom, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Skiploom), - ICON(Skiploom, 1), + .palette = gMonPalette_Skiploom, + .shinyPalette = gMonShinyPalette_Skiploom, + .iconSprite = gMonIcon_Skiploom, + .iconPalIndex = 1, FOOTPRINT(Skiploom) - LEARNSETS(Skiploom), + .levelUpLearnset = sSkiploomLevelUpLearnset, + .teachableLearnset = sSkiploomTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_JUMPLUFF}), }, @@ -1907,18 +2096,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Jumpluff, 64, 56), + .frontPic = gMonFrontPic_Jumpluff, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Jumpluff, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 9, - BACK_PIC(Jumpluff, 56, 64), + .backPic = gMonBackPic_Jumpluff, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Jumpluff), - ICON(Jumpluff, 2), + .palette = gMonPalette_Jumpluff, + .shinyPalette = gMonShinyPalette_Jumpluff, + .iconSprite = gMonIcon_Jumpluff, + .iconPalIndex = 2, FOOTPRINT(Jumpluff) - LEARNSETS(Jumpluff), + .levelUpLearnset = sJumpluffLevelUpLearnset, + .teachableLearnset = sJumpluffTeachableLearnset, }, #endif //P_FAMILY_HOPPIP @@ -1957,19 +2151,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Aipom, 32, 64), - FRONT_PIC_FEMALE(Aipom, 32, 64), + .frontPic = gMonFrontPic_Aipom, + .frontPicSize = MON_COORDS_SIZE(32, 64), + .frontPicFemale = gMonFrontPic_AipomF, + .frontPicSizeFemale = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Aipom, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Aipom, 64, 64), - BACK_PIC_FEMALE(Aipom, 64, 64), + .backPic = gMonBackPic_Aipom, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_AipomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Aipom), - ICON(Aipom, 2), + .palette = gMonPalette_Aipom, + .shinyPalette = gMonShinyPalette_Aipom, + .iconSprite = gMonIcon_Aipom, + .iconPalIndex = 2, FOOTPRINT(Aipom) - LEARNSETS(Aipom), + .levelUpLearnset = sAipomLevelUpLearnset, + .teachableLearnset = sAipomTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_DOUBLE_HIT, SPECIES_AMBIPOM}), }, @@ -2008,19 +2209,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ambipom, 64, 64), - FRONT_PIC_FEMALE(Ambipom, 64, 64), + .frontPic = gMonFrontPic_Ambipom, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_AmbipomF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Ambipom, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Ambipom, 64, 64), - BACK_PIC_FEMALE(Ambipom, 64, 64), + .backPic = gMonBackPic_Ambipom, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_AmbipomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Ambipom), - ICON(Ambipom, 2), + .palette = gMonPalette_Ambipom, + .shinyPalette = gMonShinyPalette_Ambipom, + .iconSprite = gMonIcon_Ambipom, + .iconPalIndex = 2, FOOTPRINT(Ambipom) - LEARNSETS(Ambipom), + .levelUpLearnset = sAmbipomLevelUpLearnset, + .teachableLearnset = sAmbipomTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_AIPOM @@ -2060,17 +2268,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sunkern, 32, 40), + .frontPic = gMonFrontPic_Sunkern, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sunkern, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Sunkern, 48, 48), + .backPic = gMonBackPic_Sunkern, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Sunkern), - ICON(Sunkern, 1), + .palette = gMonPalette_Sunkern, + .shinyPalette = gMonShinyPalette_Sunkern, + .iconSprite = gMonIcon_Sunkern, + .iconPalIndex = 1, FOOTPRINT(Sunkern) - LEARNSETS(Sunkern), + .levelUpLearnset = sSunkernLevelUpLearnset, + .teachableLearnset = sSunkernTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}), }, @@ -2108,17 +2321,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sunflora, 40, 48), + .frontPic = gMonFrontPic_Sunflora, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Sunflora, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sunflora, 56, 56), + .backPic = gMonBackPic_Sunflora, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Sunflora), - ICON(Sunflora, 1), + .palette = gMonPalette_Sunflora, + .shinyPalette = gMonShinyPalette_Sunflora, + .iconSprite = gMonIcon_Sunflora, + .iconPalIndex = 1, FOOTPRINT(Sunflora) - LEARNSETS(Sunflora), + .levelUpLearnset = sSunfloraLevelUpLearnset, + .teachableLearnset = sSunfloraTeachableLearnset, }, #endif //P_FAMILY_SUNKERN @@ -2158,18 +2376,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Yanma, 64, 40), + .frontPic = gMonFrontPic_Yanma, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Yanma, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 13, - BACK_PIC(Yanma, 64, 64), + .backPic = gMonBackPic_Yanma, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Yanma), - ICON(Yanma, 1), + .palette = gMonPalette_Yanma, + .shinyPalette = gMonShinyPalette_Yanma, + .iconSprite = gMonIcon_Yanma, + .iconPalIndex = 1, FOOTPRINT(Yanma) - LEARNSETS(Yanma), + .levelUpLearnset = sYanmaLevelUpLearnset, + .teachableLearnset = sYanmaTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_YANMEGA}), }, @@ -2209,18 +2432,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(Yanmega, 64, 56), + .frontPic = gMonFrontPic_Yanmega, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Yanmega, .frontAnimId = ANIM_H_VIBRATE, .enemyMonElevation = 6, - BACK_PIC(Yanmega, 64, 56), + .backPic = gMonBackPic_Yanmega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Yanmega), - ICON(Yanmega, 1), + .palette = gMonPalette_Yanmega, + .shinyPalette = gMonShinyPalette_Yanmega, + .iconSprite = gMonIcon_Yanmega, + .iconPalIndex = 1, FOOTPRINT(Yanmega) - LEARNSETS(Yanmega), + .levelUpLearnset = sYanmegaLevelUpLearnset, + .teachableLearnset = sYanmegaTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_YANMA @@ -2262,18 +2490,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "out onto land seeking food occasionally.\n" "On land, they coat their bodies with a\n" "gooey, toxic film."), - FRONT_PIC(Wooper, 40, 32), - FRONT_PIC_FEMALE(Wooper, 40, 32), + .frontPic = gMonFrontPic_Wooper, + .frontPicSize = MON_COORDS_SIZE(40, 32), + .frontPicFemale = gMonFrontPic_WooperF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Wooper, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wooper, 64, 40), - BACK_PIC_FEMALE(Wooper, 64, 40), + .backPic = gMonBackPic_Wooper, + .backPicSize = MON_COORDS_SIZE(64, 40), + .backPicFemale = gMonBackPic_WooperF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Wooper), - ICON(Wooper, 0), - LEARNSETS(Wooper), + .palette = gMonPalette_Wooper, + .shinyPalette = gMonShinyPalette_Wooper, + .iconSprite = gMonIcon_Wooper, + .iconPalIndex = 0, + .levelUpLearnset = sWooperLevelUpLearnset, + .teachableLearnset = sWooperTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_QUAGSIRE}), }, @@ -2311,19 +2546,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quagsire, 64, 56), - FRONT_PIC_FEMALE(Quagsire, 64, 56), + .frontPic = gMonFrontPic_Quagsire, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_QuagsireF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Quagsire, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Quagsire, 64, 56), - BACK_PIC_FEMALE(Quagsire, 64, 56), + .backPic = gMonBackPic_Quagsire, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_QuagsireF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Quagsire), - ICON(Quagsire, 0), + .palette = gMonPalette_Quagsire, + .shinyPalette = gMonShinyPalette_Quagsire, + .iconSprite = gMonIcon_Quagsire, + .iconPalIndex = 0, FOOTPRINT(Quagsire) - LEARNSETS(Quagsire), + .levelUpLearnset = sQuagsireLevelUpLearnset, + .teachableLearnset = sQuagsireTeachableLearnset, }, #if P_PALDEAN_FORMS @@ -2364,16 +2606,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "Wooper began living on land.\n" "The Pokémon changed over time, developing\n" "a poisonous film to protect its body."), - FRONT_PIC(WooperPaldean, 40, 32), + .frontPic = gMonFrontPic_WooperPaldean, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_WooperPaldean, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(WooperPaldean, 64, 40), + .backPic = gMonBackPic_WooperPaldean, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(WooperPaldean), - ICON(WooperPaldean, 2), - LEARNSETS(WooperPaldean), + .palette = gMonPalette_WooperPaldean, + .shinyPalette = gMonShinyPalette_WooperPaldean, + .iconSprite = gMonIcon_WooperPaldean, + .iconPalIndex = 2, + .levelUpLearnset = sWooperPaldeanLevelUpLearnset, + .teachableLearnset = sWooperPaldeanTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CLODSIRE}), }, @@ -2411,17 +2658,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clodsire, 64, 64), + .frontPic = gMonFrontPic_Clodsire, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Clodsire, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Clodsire, 64, 64), + .backPic = gMonBackPic_Clodsire, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Clodsire), - ICON(Clodsire, 2), + .palette = gMonPalette_Clodsire, + .shinyPalette = gMonShinyPalette_Clodsire, + .iconSprite = gMonIcon_Clodsire, + .iconPalIndex = 2, //FOOTPRINT(Clodsire) - LEARNSETS(Clodsire), + .levelUpLearnset = sClodsireLevelUpLearnset, + .teachableLearnset = sClodsireTeachableLearnset, }, #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER @@ -2461,20 +2713,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 1, - FRONT_PIC(Murkrow, 48, 40), - FRONT_PIC_FEMALE(Murkrow, 48, 40), + .frontPic = gMonFrontPic_Murkrow, + .frontPicSize = MON_COORDS_SIZE(48, 40), + .frontPicFemale = gMonFrontPic_MurkrowF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Murkrow, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, - BACK_PIC(Murkrow, 40, 56), - BACK_PIC_FEMALE(Murkrow, 40, 56), + .backPic = gMonBackPic_Murkrow, + .backPicSize = MON_COORDS_SIZE(40, 56), + .backPicFemale = gMonBackPic_MurkrowF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Murkrow), - ICON(Murkrow, 2), + .palette = gMonPalette_Murkrow, + .shinyPalette = gMonShinyPalette_Murkrow, + .iconSprite = gMonIcon_Murkrow, + .iconPalIndex = 2, FOOTPRINT(Murkrow) - LEARNSETS(Murkrow), + .levelUpLearnset = sMurkrowLevelUpLearnset, + .teachableLearnset = sMurkrowTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}), }, @@ -2513,17 +2772,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Honchkrow, 64, 56), + .frontPic = gMonFrontPic_Honchkrow, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Honchkrow, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Honchkrow, 64, 48), + .backPic = gMonBackPic_Honchkrow, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Honchkrow), - ICON(Honchkrow, 2), + .palette = gMonPalette_Honchkrow, + .shinyPalette = gMonShinyPalette_Honchkrow, + .iconSprite = gMonIcon_Honchkrow, + .iconPalIndex = 2, FOOTPRINT(Honchkrow) - LEARNSETS(Honchkrow), + .levelUpLearnset = sHonchkrowLevelUpLearnset, + .teachableLearnset = sHonchkrowTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MURKROW @@ -2564,18 +2828,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Misdreavus, 48, 48), + .frontPic = gMonFrontPic_Misdreavus, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Misdreavus, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 12, - BACK_PIC(Misdreavus, 56, 48), + .backPic = gMonBackPic_Misdreavus, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Misdreavus), - ICON(Misdreavus, 0), + .palette = gMonPalette_Misdreavus, + .shinyPalette = gMonShinyPalette_Misdreavus, + .iconSprite = gMonIcon_Misdreavus, + .iconPalIndex = 0, FOOTPRINT(Misdreavus) - LEARNSETS(Misdreavus), + .levelUpLearnset = sMisdreavusLevelUpLearnset, + .teachableLearnset = sMisdreavusTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}), }, @@ -2615,18 +2884,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mismagius, 56, 64), + .frontPic = gMonFrontPic_Mismagius, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Mismagius, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 3, - BACK_PIC(Mismagius, 56, 64), + .backPic = gMonBackPic_Mismagius, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Mismagius), - ICON(Mismagius, 2), + .palette = gMonPalette_Mismagius, + .shinyPalette = gMonShinyPalette_Mismagius, + .iconSprite = gMonIcon_Mismagius, + .iconPalIndex = 2, FOOTPRINT(Mismagius) - LEARNSETS(Mismagius), + .levelUpLearnset = sMismagiusLevelUpLearnset, + .teachableLearnset = sMismagiusTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS @@ -2664,18 +2938,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 2, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Unown ##letter, frontWidth, frontHeight), \ + .frontPic = gMonFrontPic_Unown ##letter, \ + .frontPicSize = MON_COORDS_SIZE(frontWidth, frontHeight), \ .frontPicYOffset = 16, \ .frontAnimFrames = sAnims_Unown, \ .frontAnimId = ANIM_ZIGZAG_FAST, \ .enemyMonElevation = 8, \ - BACK_PIC(Unown ##letter, backWidth, backHeight), \ + .backPic = gMonBackPic_Unown ##letter, \ + .backPicSize = MON_COORDS_SIZE(backWidth, backHeight), \ .backPicYOffset = backYOffset, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - PALETTES(Unown), \ - ICON(Unown ##letter, 0), \ + .palette = gMonPalette_Unown, \ + .shinyPalette = gMonShinyPalette_Unown, \ + .iconSprite = gMonIcon_Unown ##letter, \ + .iconPalIndex = 0, \ FOOTPRINT(Unown) \ - LEARNSETS(Unown), \ + .levelUpLearnset = sUnownLevelUpLearnset, \ + .teachableLearnset = sUnownTeachableLearnset, \ .tmIlliterate = TRUE, \ .formSpeciesIdTable = sUnownFormSpeciesIdTable, \ } @@ -2746,18 +3025,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wynaut, 48, 40), + .frontPic = gMonFrontPic_Wynaut, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Wynaut, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 15, - BACK_PIC(Wynaut, 48, 48), + .backPic = gMonBackPic_Wynaut, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Wynaut), - ICON(Wynaut, 0), + .palette = gMonPalette_Wynaut, + .shinyPalette = gMonShinyPalette_Wynaut, + .iconSprite = gMonIcon_Wynaut, + .iconPalIndex = 0, FOOTPRINT(Wynaut) - LEARNSETS(Wynaut), + .levelUpLearnset = sWynautLevelUpLearnset, + .teachableLearnset = sWynautTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_WOBBUFFET}), }, @@ -2797,22 +3081,30 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wobbuffet, 64, 56), - FRONT_PIC_FEMALE(Wobbuffet, 64, 56), + .frontPic = gMonFrontPic_Wobbuffet, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_WobbuffetF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Wobbuffet, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Wobbuffet, 56, 56), - BACK_PIC_FEMALE(Wobbuffet, 56, 56), + .backPic = gMonBackPic_Wobbuffet, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_WobbuffetF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Wobbuffet), - ICON(Wobbuffet, 0), + .palette = gMonPalette_Wobbuffet, + .shinyPalette = gMonShinyPalette_Wobbuffet, + .iconSprite = gMonIcon_Wobbuffet, + .iconPalIndex = 0, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - ICON_FEMALE(Wobbuffet, 0), + .iconSpriteFemale = gMonIcon_WobbuffetF, + .iconPalIndexFemale = 0, #endif FOOTPRINT(Wobbuffet) - LEARNSETS(Wobbuffet), + .levelUpLearnset = sWobbuffetLevelUpLearnset, + .teachableLearnset = sWobbuffetTeachableLearnset, .tmIlliterate = TRUE, }, #endif //P_FAMILY_WOBBUFFET @@ -2852,19 +3144,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Girafarig, 56, 64), - FRONT_PIC_FEMALE(Girafarig, 56, 64), + .frontPic = gMonFrontPic_Girafarig, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_GirafarigF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Girafarig, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Girafarig, 64, 64), - BACK_PIC_FEMALE(Girafarig, 64, 64), + .backPic = gMonBackPic_Girafarig, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GirafarigF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Girafarig), - ICON(Girafarig, 1), + .palette = gMonPalette_Girafarig, + .shinyPalette = gMonShinyPalette_Girafarig, + .iconSprite = gMonIcon_Girafarig, + .iconPalIndex = 1, FOOTPRINT(Girafarig) - LEARNSETS(Girafarig), + .levelUpLearnset = sGirafarigLevelUpLearnset, + .teachableLearnset = sGirafarigTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}), }, @@ -2903,17 +3202,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Farigiraf, 64, 64), + .frontPic = gMonFrontPic_Farigiraf, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Farigiraf, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Farigiraf, 64, 64), + .backPic = gMonBackPic_Farigiraf, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Farigiraf), - ICON(Farigiraf, 0), + .palette = gMonPalette_Farigiraf, + .shinyPalette = gMonShinyPalette_Farigiraf, + .iconSprite = gMonIcon_Farigiraf, + .iconPalIndex = 0, //FOOTPRINT(Farigiraf) - LEARNSETS(Farigiraf), + .levelUpLearnset = sFarigirafLevelUpLearnset, + .teachableLearnset = sFarigirafTeachableLearnset, }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG @@ -2953,17 +3257,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pineco, 40, 40), + .frontPic = gMonFrontPic_Pineco, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pineco, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Pineco, 56, 40), + .backPic = gMonBackPic_Pineco, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Pineco), - ICON(Pineco, 0), + .palette = gMonPalette_Pineco, + .shinyPalette = gMonShinyPalette_Pineco, + .iconSprite = gMonIcon_Pineco, + .iconPalIndex = 0, FOOTPRINT(Pineco) - LEARNSETS(Pineco), + .levelUpLearnset = sPinecoLevelUpLearnset, + .teachableLearnset = sPinecoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_FORRETRESS}), }, @@ -3001,17 +3310,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Forretress, 64, 48), + .frontPic = gMonFrontPic_Forretress, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Forretress, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Forretress, 64, 32), + .backPic = gMonBackPic_Forretress, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Forretress), - ICON(Forretress, 2), + .palette = gMonPalette_Forretress, + .shinyPalette = gMonShinyPalette_Forretress, + .iconSprite = gMonIcon_Forretress, + .iconPalIndex = 2, FOOTPRINT(Forretress) - LEARNSETS(Forretress), + .levelUpLearnset = sForretressLevelUpLearnset, + .teachableLearnset = sForretressTeachableLearnset, }, #endif //P_FAMILY_PINECO @@ -3056,18 +3370,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dunsparce, 48, 48), + .frontPic = gMonFrontPic_Dunsparce, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Dunsparce, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 10, - BACK_PIC(Dunsparce, 56, 32), + .backPic = gMonBackPic_Dunsparce, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Dunsparce), - ICON(Dunsparce, 0), + .palette = gMonPalette_Dunsparce, + .shinyPalette = gMonShinyPalette_Dunsparce, + .iconSprite = gMonIcon_Dunsparce, + .iconPalIndex = 0, FOOTPRINT(Dunsparce) - LEARNSETS(Dunsparce), + .levelUpLearnset = sDunsparceLevelUpLearnset, + .teachableLearnset = sDunsparceTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE_TWO_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT}, {EVO_MOVE_THREE_SEGMENT, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}), }, @@ -3100,14 +3419,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(DudunsparceTwoSegment, 64, 64), + .frontPic = gMonFrontPic_DudunsparceTwoSegment, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Dudunsparce, - BACK_PIC(DudunsparceTwoSegment, 64, 64), + .backPic = gMonBackPic_DudunsparceTwoSegment, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, - PALETTES(Dudunsparce), - ICON(Dudunsparce, 0), - LEARNSETS(Dudunsparce), + .palette = gMonPalette_Dudunsparce, + .shinyPalette = gMonShinyPalette_Dudunsparce, + .iconSprite = gMonIcon_Dudunsparce, + .iconPalIndex = 0, + .levelUpLearnset = sDudunsparceLevelUpLearnset, + .teachableLearnset = sDudunsparceTeachableLearnset, .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3148,14 +3472,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(DudunsparceThreeSegment, 64, 64), + .frontPic = gMonFrontPic_DudunsparceThreeSegment, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Dudunsparce, - BACK_PIC(DudunsparceThreeSegment, 64, 64), + .backPic = gMonBackPic_DudunsparceThreeSegment, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, - PALETTES(Dudunsparce), - ICON(Dudunsparce, 0), - LEARNSETS(Dudunsparce), + .palette = gMonPalette_Dudunsparce, + .shinyPalette = gMonShinyPalette_Dudunsparce, + .iconSprite = gMonIcon_Dudunsparce, + .iconPalIndex = 0, + .levelUpLearnset = sDudunsparceLevelUpLearnset, + .teachableLearnset = sDudunsparceTeachableLearnset, .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3206,20 +3535,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gligar, 56, 56), - FRONT_PIC_FEMALE(Gligar, 56, 56), + .frontPic = gMonFrontPic_Gligar, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_GligarF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Gligar, .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = 8, - BACK_PIC(Gligar, 64, 64), - BACK_PIC_FEMALE(Gligar, 64, 64), + .backPic = gMonBackPic_Gligar, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GligarF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Gligar), - ICON(Gligar, 0), + .palette = gMonPalette_Gligar, + .shinyPalette = gMonShinyPalette_Gligar, + .iconSprite = gMonIcon_Gligar, + .iconPalIndex = 0, FOOTPRINT(Gligar) - LEARNSETS(Gligar), + .levelUpLearnset = sGligarLevelUpLearnset, + .teachableLearnset = sGligarTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}, {EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}), }, @@ -3259,18 +3595,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Gliscor, 64, 56), + .frontPic = gMonFrontPic_Gliscor, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Gliscor, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 9, - BACK_PIC(Gliscor, 64, 48), + .backPic = gMonBackPic_Gliscor, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gliscor), - ICON(Gliscor, 2), + .palette = gMonPalette_Gliscor, + .shinyPalette = gMonShinyPalette_Gliscor, + .iconSprite = gMonIcon_Gliscor, + .iconPalIndex = 2, FOOTPRINT(Gliscor) - LEARNSETS(Gliscor), + .levelUpLearnset = sGliscorLevelUpLearnset, + .teachableLearnset = sGliscorTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_GLIGAR @@ -3314,17 +3655,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Snubbull, 40, 40), + .frontPic = gMonFrontPic_Snubbull, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Snubbull, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Snubbull, 56, 40), + .backPic = gMonBackPic_Snubbull, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Snubbull), - ICON(Snubbull, 0), + .palette = gMonPalette_Snubbull, + .shinyPalette = gMonShinyPalette_Snubbull, + .iconSprite = gMonIcon_Snubbull, + .iconPalIndex = 0, FOOTPRINT(Snubbull) - LEARNSETS(Snubbull), + .levelUpLearnset = sSnubbullLevelUpLearnset, + .teachableLearnset = sSnubbullTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_GRANBULL}), }, @@ -3366,17 +3712,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Granbull, 56, 56), + .frontPic = gMonFrontPic_Granbull, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Granbull, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Granbull, 56, 48), + .backPic = gMonBackPic_Granbull, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Granbull), - ICON(Granbull, 2), + .palette = gMonPalette_Granbull, + .shinyPalette = gMonShinyPalette_Granbull, + .iconSprite = gMonIcon_Granbull, + .iconPalIndex = 2, FOOTPRINT(Granbull) - LEARNSETS(Granbull), + .levelUpLearnset = sGranbullLevelUpLearnset, + .teachableLearnset = sGranbullTeachableLearnset, }, #endif //P_FAMILY_SNUBBULL @@ -3427,17 +3778,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "it swallows to shoot toxic quills all at\n" "once from all over its body. It finds\n" "swimming to be somewhat challenging."), - FRONT_PIC(Qwilfish, 40, 48), + .frontPic = gMonFrontPic_Qwilfish, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Qwilfish, .frontAnimId = ANIM_GROW_IN_STAGES, .frontAnimDelay = 39, - BACK_PIC(Qwilfish, 56, 56), + .backPic = gMonBackPic_Qwilfish, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Qwilfish), - ICON(Qwilfish, 0), - LEARNSETS(Qwilfish), + .palette = gMonPalette_Qwilfish, + .shinyPalette = gMonShinyPalette_Qwilfish, + .iconSprite = gMonIcon_Qwilfish, + .iconPalIndex = 0, + .levelUpLearnset = sQwilfishLevelUpLearnset, + .teachableLearnset = sQwilfishTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -3478,17 +3834,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "Fishers detest this troublesome Pokémon\n" "because it sprays poison from its spines,\n" "getting it everywhere."), - FRONT_PIC(QwilfishHisuian, 48, 40), + .frontPic = gMonFrontPic_QwilfishHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_QwilfishHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, - BACK_PIC(QwilfishHisuian, 56, 56), + .backPic = gMonBackPic_QwilfishHisuian, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(QwilfishHisuian), - ICON(QwilfishHisuian, 0), - LEARNSETS(QwilfishHisuian), + .palette = gMonPalette_QwilfishHisuian, + .shinyPalette = gMonShinyPalette_QwilfishHisuian, + .iconSprite = gMonIcon_QwilfishHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sQwilfishHisuianLevelUpLearnset, + .teachableLearnset = sQwilfishHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_MOVE, MOVE_BARB_BARRAGE, SPECIES_OVERQWIL}), }, @@ -3527,17 +3888,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Overqwil, 64, 64), + .frontPic = gMonFrontPic_Overqwil, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Overqwil, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Overqwil, 64, 56), + .backPic = gMonBackPic_Overqwil, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Overqwil), - ICON(Overqwil, 2), + .palette = gMonPalette_Overqwil, + .shinyPalette = gMonShinyPalette_Overqwil, + .iconSprite = gMonIcon_Overqwil, + .iconPalIndex = 2, //FOOTPRINT(Overqwil) - LEARNSETS(Overqwil), + .levelUpLearnset = sOverqwilLevelUpLearnset, + .teachableLearnset = sOverqwilTeachableLearnset, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH @@ -3580,17 +3946,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shuckle, 56, 48), + .frontPic = gMonFrontPic_Shuckle, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Shuckle, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Shuckle, 48, 48), + .backPic = gMonBackPic_Shuckle, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Shuckle), - ICON(Shuckle, 1), + .palette = gMonPalette_Shuckle, + .shinyPalette = gMonShinyPalette_Shuckle, + .iconSprite = gMonIcon_Shuckle, + .iconPalIndex = 1, FOOTPRINT(Shuckle) - LEARNSETS(Shuckle), + .levelUpLearnset = sShuckleLevelUpLearnset, + .teachableLearnset = sShuckleTeachableLearnset, }, #endif //P_FAMILY_SHUCKLE @@ -3610,7 +3981,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_HERACROSS, .categoryName = _("Single Horn"), FOOTPRINT(Heracross) - LEARNSETS(Heracross), + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, @@ -3633,17 +4005,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Heracross, 64, 64), - FRONT_PIC_FEMALE(Heracross, 64, 64), + .frontPic = gMonFrontPic_Heracross, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_HeracrossF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Heracross, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Heracross, 48, 64), - BACK_PIC_FEMALE(Heracross, 48, 64), + .backPic = gMonBackPic_Heracross, + .backPicSize = MON_COORDS_SIZE(48, 64), + .backPicFemale = gMonBackPic_HeracrossF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Heracross), - ICON(Heracross, 0), + .palette = gMonPalette_Heracross, + .shinyPalette = gMonShinyPalette_Heracross, + .iconSprite = gMonIcon_Heracross, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -3662,7 +4040,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_HERACROSS, .categoryName = _("Single Horn"), FOOTPRINT(Heracross) - LEARNSETS(Heracross), + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, .formChangeTable = sHeracrossFormChangeTable, .baseHP = 80, @@ -3685,15 +4064,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(HeracrossMega, 64, 64), + .frontPic = gMonFrontPic_HeracrossMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_HeracrossMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(HeracrossMega, 56, 64), + .backPic = gMonBackPic_HeracrossMega, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(HeracrossMega), - ICON(HeracrossMega, 0), + .palette = gMonPalette_HeracrossMega, + .shinyPalette = gMonShinyPalette_HeracrossMega, + .iconSprite = gMonIcon_HeracrossMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3738,18 +4121,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "hooked claws into the bark. It seeks out\n" "unguarded nests and steals eggs for food\n" "while the parents are away."), - FRONT_PIC(Sneasel, 56, 48), - FRONT_PIC_FEMALE(Sneasel, 56, 48), + .frontPic = gMonFrontPic_Sneasel, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_SneaselF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Sneasel, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Sneasel, 64, 64), - BACK_PIC_FEMALE(Sneasel, 64, 64), + .backPic = gMonBackPic_Sneasel, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_SneaselF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Sneasel), - ICON(Sneasel, 0), - LEARNSETS(Sneasel), + .palette = gMonPalette_Sneasel, + .shinyPalette = gMonShinyPalette_Sneasel, + .iconSprite = gMonIcon_Sneasel, + .iconPalIndex = 0, + .levelUpLearnset = sSneaselLevelUpLearnset, + .teachableLearnset = sSneaselTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}, {EVO_ITEM_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}), }, @@ -3791,19 +4181,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Weavile, 56, 56), - FRONT_PIC_FEMALE(Weavile, 56, 56), + .frontPic = gMonFrontPic_Weavile, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_WeavileF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Weavile, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Weavile, 64, 64), - BACK_PIC_FEMALE(Weavile, 64, 64), + .backPic = gMonBackPic_Weavile, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_WeavileF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Weavile), - ICON(Weavile, 0), + .palette = gMonPalette_Weavile, + .shinyPalette = gMonShinyPalette_Weavile, + .iconSprite = gMonIcon_Weavile, + .iconPalIndex = 0, FOOTPRINT(Weavile) - LEARNSETS(Weavile), + .levelUpLearnset = sWeavileLevelUpLearnset, + .teachableLearnset = sWeavileTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS @@ -3846,18 +4243,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "traversing precipitous cliffs. From the\n" "tips of these claws drips a venom that\n" "infiltrates the nerves of any prey caught."), - FRONT_PIC(SneaselHisuian, 56, 56), - FRONT_PIC_FEMALE(SneaselHisuian, 56, 56), + .frontPic = gMonFrontPic_SneaselHisuian, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_SneaselHisuianF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_SneaselHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SneaselHisuian, 56, 64), - BACK_PIC_FEMALE(SneaselHisuian, 56, 64), + .backPic = gMonBackPic_SneaselHisuian, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_SneaselHisuianF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SneaselHisuian), - ICON(SneaselHisuian, 2), - LEARNSETS(SneaselHisuian), + .palette = gMonPalette_SneaselHisuian, + .shinyPalette = gMonShinyPalette_SneaselHisuian, + .iconSprite = gMonIcon_SneaselHisuian, + .iconPalIndex = 2, + .levelUpLearnset = sSneaselHisuianLevelUpLearnset, + .teachableLearnset = sSneaselHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}, {EVO_ITEM_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}), @@ -3897,17 +4301,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sneasler, 64, 64), + .frontPic = gMonFrontPic_Sneasler, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Sneasler, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sneasler, 64, 64), + .backPic = gMonBackPic_Sneasler, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sneasler), - ICON(Sneasler, 2), + .palette = gMonPalette_Sneasler, + .shinyPalette = gMonShinyPalette_Sneasler, + .iconSprite = gMonIcon_Sneasler, + .iconPalIndex = 2, //FOOTPRINT(Sneasler) - LEARNSETS(Sneasler), + .levelUpLearnset = sSneaslerLevelUpLearnset, + .teachableLearnset = sSneaslerTeachableLearnset, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL @@ -3948,17 +4357,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Teddiursa, 40, 40), + .frontPic = gMonFrontPic_Teddiursa, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Teddiursa, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Teddiursa, 48, 48), + .backPic = gMonBackPic_Teddiursa, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Teddiursa), - ICON(Teddiursa, 0), + .palette = gMonPalette_Teddiursa, + .shinyPalette = gMonShinyPalette_Teddiursa, + .iconSprite = gMonIcon_Teddiursa, + .iconPalIndex = 0, FOOTPRINT(Teddiursa) - LEARNSETS(Teddiursa), + .levelUpLearnset = sTeddiursaLevelUpLearnset, + .teachableLearnset = sTeddiursaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_URSARING}), }, @@ -3996,19 +4410,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ursaring, 64, 64), - FRONT_PIC_FEMALE(Ursaring, 64, 64), + .frontPic = gMonFrontPic_Ursaring, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_UrsaringF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ursaring, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Ursaring, 56, 64), - BACK_PIC_FEMALE(Ursaring, 56, 64), + .backPic = gMonBackPic_Ursaring, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_UrsaringF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Ursaring), - ICON(Ursaring, 2), + .palette = gMonPalette_Ursaring, + .shinyPalette = gMonShinyPalette_Ursaring, + .iconSprite = gMonIcon_Ursaring, + .iconPalIndex = 2, FOOTPRINT(Ursaring) - LEARNSETS(Ursaring), + .levelUpLearnset = sUrsaringLevelUpLearnset, + .teachableLearnset = sUrsaringTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM_NIGHT, ITEM_PEAT_BLOCK, SPECIES_URSALUNA}, {EVO_NONE, 0, SPECIES_URSALUNA_BLOODMOON}), }, @@ -4048,17 +4469,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 369, .trainerOffset = 7, - FRONT_PIC(Ursaluna, 56, 56), + .frontPic = gMonFrontPic_Ursaluna, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Ursaluna, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Ursaluna, 64, 40), + .backPic = gMonBackPic_Ursaluna, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Ursaluna), - ICON(Ursaluna, 2), + .palette = gMonPalette_Ursaluna, + .shinyPalette = gMonShinyPalette_Ursaluna, + .iconSprite = gMonIcon_Ursaluna, + .iconPalIndex = 2, //FOOTPRINT(Ursaluna) - LEARNSETS(Ursaluna), + .levelUpLearnset = sUrsalunaLevelUpLearnset, + .teachableLearnset = sUrsalunaTeachableLearnset, }, [SPECIES_URSALUNA_BLOODMOON] = @@ -4096,17 +4522,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 369, .trainerOffset = 7, - FRONT_PIC(UrsalunaBloodmoon, 64, 64), + .frontPic = gMonFrontPic_UrsalunaBloodmoon, + .frontPicSize = MON_COORDS_SIZE(64, 64), //.frontPicYOffset = 0, .frontAnimFrames = sAnims_UrsalunaBloodmoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(UrsalunaBloodmoon, 64, 40), + .backPic = gMonBackPic_UrsalunaBloodmoon, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(UrsalunaBloodmoon), - //ICON(UrsalunaBloodmoon, 0), + .palette = gMonPalette_UrsalunaBloodmoon, + .shinyPalette = gMonShinyPalette_UrsalunaBloodmoon, + //.iconSprite = gMonIcon_UrsalunaBloodmoon, + //.iconPalIndex = 0, //FOOTPRINT(UrsalunaBloodmoon) - LEARNSETS(UrsalunaBloodmoon), + .levelUpLearnset = sUrsalunaBloodmoonLevelUpLearnset, + .teachableLearnset = sUrsalunaBloodmoonTeachableLearnset, }, #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA @@ -4146,17 +4577,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Slugma, 32, 48), + .frontPic = gMonFrontPic_Slugma, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Slugma, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Slugma, 64, 56), + .backPic = gMonBackPic_Slugma, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Slugma), - ICON(Slugma, 0), + .palette = gMonPalette_Slugma, + .shinyPalette = gMonShinyPalette_Slugma, + .iconSprite = gMonIcon_Slugma, + .iconPalIndex = 0, FOOTPRINT(Slugma) - LEARNSETS(Slugma), + .levelUpLearnset = sSlugmaLevelUpLearnset, + .teachableLearnset = sSlugmaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MAGCARGO}), }, @@ -4201,17 +4637,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Magcargo, 56, 64), + .frontPic = gMonFrontPic_Magcargo, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Magcargo, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Magcargo, 64, 56), + .backPic = gMonBackPic_Magcargo, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Magcargo), - ICON(Magcargo, 0), + .palette = gMonPalette_Magcargo, + .shinyPalette = gMonShinyPalette_Magcargo, + .iconSprite = gMonIcon_Magcargo, + .iconPalIndex = 0, FOOTPRINT(Magcargo) - LEARNSETS(Magcargo), + .levelUpLearnset = sMagcargoLevelUpLearnset, + .teachableLearnset = sMagcargoTeachableLearnset, }, #endif //P_FAMILY_SLUGMA @@ -4250,17 +4691,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swinub, 40, 32), + .frontPic = gMonFrontPic_Swinub, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 18, .frontAnimFrames = sAnims_Swinub, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Swinub, 56, 40), + .backPic = gMonBackPic_Swinub, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Swinub), - ICON(Swinub, 2), + .palette = gMonPalette_Swinub, + .shinyPalette = gMonShinyPalette_Swinub, + .iconSprite = gMonIcon_Swinub, + .iconPalIndex = 2, FOOTPRINT(Swinub) - LEARNSETS(Swinub), + .levelUpLearnset = sSwinubLevelUpLearnset, + .teachableLearnset = sSwinubTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_PILOSWINE}), }, @@ -4299,19 +4745,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Piloswine, 48, 56), - FRONT_PIC_FEMALE(Piloswine, 48, 56), + .frontPic = gMonFrontPic_Piloswine, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_PiloswineF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Piloswine, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Piloswine, 64, 48), - BACK_PIC_FEMALE(Piloswine, 64, 48), + .backPic = gMonBackPic_Piloswine, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_PiloswineF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Piloswine), - ICON(Piloswine, 2), + .palette = gMonPalette_Piloswine, + .shinyPalette = gMonShinyPalette_Piloswine, + .iconSprite = gMonIcon_Piloswine, + .iconPalIndex = 2, FOOTPRINT(Piloswine) - LEARNSETS(Piloswine), + .levelUpLearnset = sPiloswineLevelUpLearnset, + .teachableLearnset = sPiloswineTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_ANCIENT_POWER, SPECIES_MAMOSWINE}), }, @@ -4356,18 +4809,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 6, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Mamoswine, 64, 56), - FRONT_PIC_FEMALE(Mamoswine, 64, 56), + .frontPic = gMonFrontPic_Mamoswine, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_MamoswineF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Mamoswine, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Mamoswine, 64, 56), + .backPic = gMonBackPic_Mamoswine, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Mamoswine), - ICON(Mamoswine, 2), + .palette = gMonPalette_Mamoswine, + .shinyPalette = gMonShinyPalette_Mamoswine, + .iconSprite = gMonIcon_Mamoswine, + .iconPalIndex = 2, FOOTPRINT(Mamoswine) - LEARNSETS(Mamoswine), + .levelUpLearnset = sMamoswineLevelUpLearnset, + .teachableLearnset = sMamoswineTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SWINUB @@ -4421,16 +4880,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "If the sea becomes polluted, the beautiful\n" "coral stalks become discolored and crumble\n" "away in tatters."), - FRONT_PIC(Corsola, 48, 40), + .frontPic = gMonFrontPic_Corsola, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Corsola, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Corsola, 56, 48), + .backPic = gMonBackPic_Corsola, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Corsola), - ICON(Corsola, 0), - LEARNSETS(Corsola), + .palette = gMonPalette_Corsola, + .shinyPalette = gMonShinyPalette_Corsola, + .iconSprite = gMonIcon_Corsola, + .iconPalIndex = 0, + .levelUpLearnset = sCorsolaLevelUpLearnset, + .teachableLearnset = sCorsolaTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -4470,16 +4934,21 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "ancient kind of Corsola. With its branches,\n" "it absorbs others' life-force. It curses\n" "those unaware that kick it by accident."), - FRONT_PIC(CorsolaGalarian, 48, 48), + .frontPic = gMonFrontPic_CorsolaGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_CorsolaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CorsolaGalarian, 56, 48), + .backPic = gMonBackPic_CorsolaGalarian, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CorsolaGalarian), - ICON(CorsolaGalarian, 0), - LEARNSETS(CorsolaGalarian), + .palette = gMonPalette_CorsolaGalarian, + .shinyPalette = gMonShinyPalette_CorsolaGalarian, + .iconSprite = gMonIcon_CorsolaGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sCorsolaGalarianLevelUpLearnset, + .teachableLearnset = sCorsolaGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CURSOLA}), }, @@ -4518,17 +4987,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Cursola, 64, 64), + .frontPic = gMonFrontPic_Cursola, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cursola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cursola, 64, 56), + .backPic = gMonBackPic_Cursola, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cursola), - ICON(Cursola, 0), + .palette = gMonPalette_Cursola, + .shinyPalette = gMonShinyPalette_Cursola, + .iconSprite = gMonIcon_Cursola, + .iconPalIndex = 0, FOOTPRINT(Cursola) - LEARNSETS(Cursola), + .levelUpLearnset = sCursolaLevelUpLearnset, + .teachableLearnset = sCursolaTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA @@ -4568,17 +5042,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Remoraid, 40, 48), + .frontPic = gMonFrontPic_Remoraid, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Remoraid, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Remoraid, 56, 40), + .backPic = gMonBackPic_Remoraid, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Remoraid), - ICON(Remoraid, 0), + .palette = gMonPalette_Remoraid, + .shinyPalette = gMonShinyPalette_Remoraid, + .iconSprite = gMonIcon_Remoraid, + .iconPalIndex = 0, FOOTPRINT(Remoraid) - LEARNSETS(Remoraid), + .levelUpLearnset = sRemoraidLevelUpLearnset, + .teachableLearnset = sRemoraidTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_OCTILLERY}), }, @@ -4617,20 +5096,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Octillery, 56, 48), - FRONT_PIC_FEMALE(Octillery, 56, 48), + .frontPic = gMonFrontPic_Octillery, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_OctilleryF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Octillery, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, - BACK_PIC(Octillery, 64, 56), - BACK_PIC_FEMALE(Octillery, 64, 56), + .backPic = gMonBackPic_Octillery, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_OctilleryF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Octillery), - ICON(Octillery, 0), + .palette = gMonPalette_Octillery, + .shinyPalette = gMonShinyPalette_Octillery, + .iconSprite = gMonIcon_Octillery, + .iconPalIndex = 0, FOOTPRINT(Octillery) - LEARNSETS(Octillery), + .levelUpLearnset = sOctilleryLevelUpLearnset, + .teachableLearnset = sOctilleryTeachableLearnset, }, #endif //P_FAMILY_REMORAID @@ -4669,17 +5155,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Delibird, 48, 56), + .frontPic = gMonFrontPic_Delibird, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Delibird, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Delibird, 56, 56), + .backPic = gMonBackPic_Delibird, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Delibird), - ICON(Delibird, 1), + .palette = gMonPalette_Delibird, + .shinyPalette = gMonShinyPalette_Delibird, + .iconSprite = gMonIcon_Delibird, + .iconPalIndex = 1, FOOTPRINT(Delibird) - LEARNSETS(Delibird), + .levelUpLearnset = sDelibirdLevelUpLearnset, + .teachableLearnset = sDelibirdTeachableLearnset, }, #endif //P_FAMILY_DELIBIRD @@ -4719,17 +5210,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Mantyke, 48, 48), + .frontPic = gMonFrontPic_Mantyke, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Mantyke, .frontAnimId = ANIM_TWIST_TWICE, - BACK_PIC(Mantyke, 64, 56), + .backPic = gMonBackPic_Mantyke, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Mantyke), - ICON(Mantyke, 0), + .palette = gMonPalette_Mantyke, + .shinyPalette = gMonShinyPalette_Mantyke, + .iconSprite = gMonIcon_Mantyke, + .iconPalIndex = 0, FOOTPRINT(Mantyke) - LEARNSETS(Mantyke), + .levelUpLearnset = sMantykeLevelUpLearnset, + .teachableLearnset = sMantykeTeachableLearnset, .evolutions = EVOLUTION({EVO_SPECIFIC_MON_IN_PARTY, SPECIES_REMORAID, SPECIES_MANTINE}), }, #endif //P_GEN_4_CROSS_EVOS @@ -4774,18 +5270,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 342, .trainerOffset = 7, - FRONT_PIC(Mantine, 64, 56), + .frontPic = gMonFrontPic_Mantine, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Mantine, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 6, - BACK_PIC(Mantine, 64, 64), + .backPic = gMonBackPic_Mantine, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Mantine), - ICON(Mantine, 2), + .palette = gMonPalette_Mantine, + .shinyPalette = gMonShinyPalette_Mantine, + .iconSprite = gMonIcon_Mantine, + .iconPalIndex = 2, FOOTPRINT(Mantine) - LEARNSETS(Mantine), + .levelUpLearnset = sMantineLevelUpLearnset, + .teachableLearnset = sMantineTeachableLearnset, }, #endif //P_FAMILY_MANTINE @@ -4825,17 +5326,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 271, .trainerOffset = 1, - FRONT_PIC(Skarmory, 64, 64), + .frontPic = gMonFrontPic_Skarmory, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Skarmory, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Skarmory, 48, 64), + .backPic = gMonBackPic_Skarmory, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Skarmory), - ICON(Skarmory, 0), + .palette = gMonPalette_Skarmory, + .shinyPalette = gMonShinyPalette_Skarmory, + .iconSprite = gMonIcon_Skarmory, + .iconPalIndex = 0, FOOTPRINT(Skarmory) - LEARNSETS(Skarmory), + .levelUpLearnset = sSkarmoryLevelUpLearnset, + .teachableLearnset = sSkarmoryTeachableLearnset, }, #endif //P_FAMILY_SKARMORY @@ -4874,17 +5380,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Houndour, 40, 48), + .frontPic = gMonFrontPic_Houndour, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Houndour, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Houndour, 40, 48), + .backPic = gMonBackPic_Houndour, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Houndour), - ICON(Houndour, 0), + .palette = gMonPalette_Houndour, + .shinyPalette = gMonShinyPalette_Houndour, + .iconSprite = gMonIcon_Houndour, + .iconPalIndex = 0, FOOTPRINT(Houndour) - LEARNSETS(Houndour), + .levelUpLearnset = sHoundourLevelUpLearnset, + .teachableLearnset = sHoundourTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HOUNDOOM}), }, @@ -4903,7 +5414,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_HOUNDOOM, .categoryName = _("Dark"), FOOTPRINT(Houndoom) - LEARNSETS(Houndoom), + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, @@ -4926,17 +5438,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Houndoom, 64, 64), - FRONT_PIC_FEMALE(Houndoom, 64, 64), + .frontPic = gMonFrontPic_Houndoom, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_HoundoomF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Houndoom, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Houndoom, 64, 56), - BACK_PIC_FEMALE(Houndoom, 64, 56), + .backPic = gMonBackPic_Houndoom, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_HoundoomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Houndoom), - ICON(Houndoom, 0), + .palette = gMonPalette_Houndoom, + .shinyPalette = gMonShinyPalette_Houndoom, + .iconSprite = gMonIcon_Houndoom, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -4955,7 +5473,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_HOUNDOOM, .categoryName = _("Dark"), FOOTPRINT(Houndoom) - LEARNSETS(Houndoom), + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, .formChangeTable = sHoundoomFormChangeTable, .baseHP = 75, @@ -4977,15 +5496,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(HoundoomMega, 64, 64), + .frontPic = gMonFrontPic_HoundoomMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_HoundoomMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(HoundoomMega, 64, 64), + .backPic = gMonBackPic_HoundoomMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(HoundoomMega), - ICON(HoundoomMega, 0), + .palette = gMonPalette_HoundoomMega, + .shinyPalette = gMonShinyPalette_HoundoomMega, + .iconSprite = gMonIcon_HoundoomMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -5026,17 +5549,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Phanpy, 40, 32), + .frontPic = gMonFrontPic_Phanpy, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Phanpy, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Phanpy, 56, 40), + .backPic = gMonBackPic_Phanpy, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Phanpy), - ICON(Phanpy, 0), + .palette = gMonPalette_Phanpy, + .shinyPalette = gMonShinyPalette_Phanpy, + .iconSprite = gMonIcon_Phanpy, + .iconPalIndex = 0, FOOTPRINT(Phanpy) - LEARNSETS(Phanpy), + .levelUpLearnset = sPhanpyLevelUpLearnset, + .teachableLearnset = sPhanpyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DONPHAN}), }, @@ -5075,19 +5603,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Donphan, 64, 48), - FRONT_PIC_FEMALE(Donphan, 64, 48), + .frontPic = gMonFrontPic_Donphan, + .frontPicSize = MON_COORDS_SIZE(64, 48), + .frontPicFemale = gMonFrontPic_DonphanF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Donphan, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, - BACK_PIC(Donphan, 64, 48), - BACK_PIC_FEMALE(Donphan, 64, 48), + .backPic = gMonBackPic_Donphan, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_DonphanF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Donphan), - ICON(Donphan, 0), + .palette = gMonPalette_Donphan, + .shinyPalette = gMonShinyPalette_Donphan, + .iconSprite = gMonIcon_Donphan, + .iconPalIndex = 0, FOOTPRINT(Donphan) - LEARNSETS(Donphan), + .levelUpLearnset = sDonphanLevelUpLearnset, + .teachableLearnset = sDonphanTeachableLearnset, }, #endif //P_FAMILY_PHANPY @@ -5126,17 +5661,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Stantler, 48, 64), + .frontPic = gMonFrontPic_Stantler, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Stantler, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Stantler, 64, 64), + .backPic = gMonBackPic_Stantler, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Stantler), - ICON(Stantler, 2), + .palette = gMonPalette_Stantler, + .shinyPalette = gMonShinyPalette_Stantler, + .iconSprite = gMonIcon_Stantler, + .iconPalIndex = 2, FOOTPRINT(Stantler) - LEARNSETS(Stantler), + .levelUpLearnset = sStantlerLevelUpLearnset, + .teachableLearnset = sStantlerTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_MOVE_TWENTY_TIMES, MOVE_PSYSHIELD_BASH, SPECIES_WYRDEER}), }, @@ -5176,17 +5716,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Wyrdeer, 64, 64), + .frontPic = gMonFrontPic_Wyrdeer, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Wyrdeer, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wyrdeer, 64, 64), + .backPic = gMonBackPic_Wyrdeer, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wyrdeer), - ICON(Wyrdeer, 2), + .palette = gMonPalette_Wyrdeer, + .shinyPalette = gMonShinyPalette_Wyrdeer, + .iconSprite = gMonIcon_Wyrdeer, + .iconPalIndex = 2, //FOOTPRINT(Wyrdeer) - LEARNSETS(Wyrdeer), + .levelUpLearnset = sWyrdeerLevelUpLearnset, + .teachableLearnset = sWyrdeerTeachableLearnset, }, #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER @@ -5226,17 +5771,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Smeargle, 64, 56), + .frontPic = gMonFrontPic_Smeargle, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Smeargle, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Smeargle, 56, 48), + .backPic = gMonBackPic_Smeargle, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Smeargle), - ICON(Smeargle, 1), + .palette = gMonPalette_Smeargle, + .shinyPalette = gMonShinyPalette_Smeargle, + .iconSprite = gMonIcon_Smeargle, + .iconPalIndex = 1, FOOTPRINT(Smeargle) - LEARNSETS(Smeargle), + .levelUpLearnset = sSmeargleLevelUpLearnset, + .teachableLearnset = sSmeargleTeachableLearnset, .tmIlliterate = TRUE, }, #endif //P_FAMILY_SMEARGLE @@ -5278,17 +5828,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Miltank, 64, 48), + .frontPic = gMonFrontPic_Miltank, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Miltank, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Miltank, 64, 56), + .backPic = gMonBackPic_Miltank, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Miltank), - ICON(Miltank, 0), + .palette = gMonPalette_Miltank, + .shinyPalette = gMonShinyPalette_Miltank, + .iconSprite = gMonIcon_Miltank, + .iconPalIndex = 0, FOOTPRINT(Miltank) - LEARNSETS(Miltank), + .levelUpLearnset = sMiltankLevelUpLearnset, + .teachableLearnset = sMiltankTeachableLearnset, }, #endif //P_FAMILY_MILTANK @@ -5339,17 +5894,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(Raikou, 64, 56), + .frontPic = gMonFrontPic_Raikou, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Raikou, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Raikou, 64, 56), + .backPic = gMonBackPic_Raikou, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Raikou), - ICON(Raikou, 2), + .palette = gMonPalette_Raikou, + .shinyPalette = gMonShinyPalette_Raikou, + .iconSprite = gMonIcon_Raikou, + .iconPalIndex = 2, FOOTPRINT(Raikou) - LEARNSETS(Raikou), + .levelUpLearnset = sRaikouLevelUpLearnset, + .teachableLearnset = sRaikouTeachableLearnset, }, #endif //P_FAMILY_RAIKOU @@ -5400,17 +5960,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(Entei, 64, 64), + .frontPic = gMonFrontPic_Entei, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Entei, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Entei, 64, 48), + .backPic = gMonBackPic_Entei, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Entei), - ICON(Entei, 2), + .palette = gMonPalette_Entei, + .shinyPalette = gMonShinyPalette_Entei, + .iconSprite = gMonIcon_Entei, + .iconPalIndex = 2, FOOTPRINT(Entei) - LEARNSETS(Entei), + .levelUpLearnset = sEnteiLevelUpLearnset, + .teachableLearnset = sEnteiTeachableLearnset, }, #endif //P_FAMILY_ENTEI @@ -5461,17 +6026,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(Suicune, 64, 64), + .frontPic = gMonFrontPic_Suicune, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Suicune, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Suicune, 64, 64), + .backPic = gMonBackPic_Suicune, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Suicune), - ICON(Suicune, 2), + .palette = gMonPalette_Suicune, + .shinyPalette = gMonShinyPalette_Suicune, + .iconSprite = gMonIcon_Suicune, + .iconPalIndex = 2, FOOTPRINT(Suicune) - LEARNSETS(Suicune), + .levelUpLearnset = sSuicuneLevelUpLearnset, + .teachableLearnset = sSuicuneTeachableLearnset, }, #endif //P_FAMILY_SUICUNE @@ -5510,17 +6080,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Larvitar, 40, 48), + .frontPic = gMonFrontPic_Larvitar, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Larvitar, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Larvitar, 56, 64), + .backPic = gMonBackPic_Larvitar, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Larvitar), - ICON(Larvitar, 1), + .palette = gMonPalette_Larvitar, + .shinyPalette = gMonShinyPalette_Larvitar, + .iconSprite = gMonIcon_Larvitar, + .iconPalIndex = 1, FOOTPRINT(Larvitar) - LEARNSETS(Larvitar), + .levelUpLearnset = sLarvitarLevelUpLearnset, + .teachableLearnset = sLarvitarTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_PUPITAR}), }, @@ -5558,17 +6133,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pupitar, 40, 48), + .frontPic = gMonFrontPic_Pupitar, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Pupitar, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Pupitar, 48, 56), + .backPic = gMonBackPic_Pupitar, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Pupitar), - ICON(Pupitar, 2), + .palette = gMonPalette_Pupitar, + .shinyPalette = gMonShinyPalette_Pupitar, + .iconSprite = gMonIcon_Pupitar, + .iconPalIndex = 2, FOOTPRINT(Pupitar) - LEARNSETS(Pupitar), + .levelUpLearnset = sPupitarLevelUpLearnset, + .teachableLearnset = sPupitarTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 55, SPECIES_TYRANITAR}), }, @@ -5587,7 +6167,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_TYRANITAR, .categoryName = _("Armor"), FOOTPRINT(Tyranitar) - LEARNSETS(Tyranitar), + .levelUpLearnset = sTyranitarLevelUpLearnset, + .teachableLearnset = sTyranitarTeachableLearnset, .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, @@ -5616,16 +6197,20 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(Tyranitar, 64, 64), + .frontPic = gMonFrontPic_Tyranitar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Tyranitar, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 10, - BACK_PIC(Tyranitar, 64, 64), + .backPic = gMonBackPic_Tyranitar, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Tyranitar), - ICON(Tyranitar, 4), + .palette = gMonPalette_Tyranitar, + .shinyPalette = gMonShinyPalette_Tyranitar, + .iconSprite = gMonIcon_Tyranitar, + .iconPalIndex = 4, }, #if P_MEGA_EVOLUTIONS @@ -5644,7 +6229,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .natDexNum = NATIONAL_DEX_TYRANITAR, .categoryName = _("Armor"), FOOTPRINT(Tyranitar) - LEARNSETS(Tyranitar), + .levelUpLearnset = sTyranitarLevelUpLearnset, + .teachableLearnset = sTyranitarTeachableLearnset, .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, .formChangeTable = sTyranitarFormChangeTable, .baseHP = 100, @@ -5667,15 +6253,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(TyranitarMega, 64, 64), + .frontPic = gMonFrontPic_TyranitarMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyranitarMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(TyranitarMega, 64, 64), + .backPic = gMonBackPic_TyranitarMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(TyranitarMega), - ICON(TyranitarMega, 1), + .palette = gMonPalette_TyranitarMega, + .shinyPalette = gMonShinyPalette_TyranitarMega, + .iconSprite = gMonIcon_TyranitarMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -5723,19 +6313,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Lugia, 64, 64), + .frontPic = gMonFrontPic_Lugia, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Lugia, .frontAnimId = ANIM_GROW_IN_STAGES, .frontAnimDelay = 20, .enemyMonElevation = 6, - BACK_PIC(Lugia, 64, 64), + .backPic = gMonBackPic_Lugia, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Lugia), - ICON(Lugia, 0), + .palette = gMonPalette_Lugia, + .shinyPalette = gMonShinyPalette_Lugia, + .iconSprite = gMonIcon_Lugia, + .iconPalIndex = 0, FOOTPRINT(Lugia) - LEARNSETS(Lugia), + .levelUpLearnset = sLugiaLevelUpLearnset, + .teachableLearnset = sLugiaTeachableLearnset, }, #endif //P_FAMILY_LUGIA @@ -5783,18 +6378,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 610, .trainerOffset = 17, - FRONT_PIC(HoOh, 64, 64), + .frontPic = gMonFrontPic_HoOh, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_HoOh, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 6, - BACK_PIC(HoOh, 64, 64), + .backPic = gMonBackPic_HoOh, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(HoOh), - ICON(HoOh, 1), + .palette = gMonPalette_HoOh, + .shinyPalette = gMonShinyPalette_HoOh, + .iconSprite = gMonIcon_HoOh, + .iconPalIndex = 1, FOOTPRINT(HoOh) - LEARNSETS(HoOh), + .levelUpLearnset = sHoOhLevelUpLearnset, + .teachableLearnset = sHoOhTeachableLearnset, }, #endif //P_FAMILY_HO_OH @@ -5842,18 +6442,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Celebi, 40, 40), + .frontPic = gMonFrontPic_Celebi, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Celebi, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 15, - BACK_PIC(Celebi, 48, 56), + .backPic = gMonBackPic_Celebi, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(Celebi), - ICON(Celebi, 1), + .palette = gMonPalette_Celebi, + .shinyPalette = gMonShinyPalette_Celebi, + .iconSprite = gMonIcon_Celebi, + .iconPalIndex = 1, FOOTPRINT(Celebi) - LEARNSETS(Celebi), + .levelUpLearnset = sCelebiLevelUpLearnset, + .teachableLearnset = sCelebiTeachableLearnset, }, #endif //P_FAMILY_CELEBI diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 1ce8df52fb90..0d300641b54e 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Treecko, 48, 48), + .frontPic = gMonFrontPic_Treecko, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Treecko, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Treecko, 56, 48), + .backPic = gMonBackPic_Treecko, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Treecko), - ICON(Treecko, 1), + .palette = gMonPalette_Treecko, + .shinyPalette = gMonShinyPalette_Treecko, + .iconSprite = gMonIcon_Treecko, + .iconPalIndex = 1, FOOTPRINT(Treecko) - LEARNSETS(Treecko), + .levelUpLearnset = sTreeckoLevelUpLearnset, + .teachableLearnset = sTreeckoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_GROVYLE}), }, @@ -86,17 +91,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grovyle, 64, 56), + .frontPic = gMonFrontPic_Grovyle, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Grovyle, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Grovyle, 64, 56), + .backPic = gMonBackPic_Grovyle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Grovyle), - ICON(Grovyle, 1), + .palette = gMonPalette_Grovyle, + .shinyPalette = gMonShinyPalette_Grovyle, + .iconSprite = gMonIcon_Grovyle, + .iconPalIndex = 1, FOOTPRINT(Grovyle) - LEARNSETS(Grovyle), + .levelUpLearnset = sGrovyleLevelUpLearnset, + .teachableLearnset = sGrovyleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SCEPTILE}), }, @@ -114,7 +124,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SCEPTILE, .categoryName = _("Forest"), FOOTPRINT(Sceptile) - LEARNSETS(Sceptile), + .levelUpLearnset = sSceptileLevelUpLearnset, + .teachableLearnset = sSceptileTeachableLearnset, .formSpeciesIdTable = sSceptileFormSpeciesIdTable, .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, @@ -144,15 +155,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 275, .trainerOffset = 2, - FRONT_PIC(Sceptile, 64, 64), + .frontPic = gMonFrontPic_Sceptile, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sceptile, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Sceptile, 64, 64), + .backPic = gMonBackPic_Sceptile, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Sceptile), - ICON(Sceptile, 1), + .palette = gMonPalette_Sceptile, + .shinyPalette = gMonShinyPalette_Sceptile, + .iconSprite = gMonIcon_Sceptile, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -170,7 +185,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SCEPTILE, .categoryName = _("Forest"), FOOTPRINT(Sceptile) - LEARNSETS(Sceptile), + .levelUpLearnset = sSceptileLevelUpLearnset, + .teachableLearnset = sSceptileTeachableLearnset, .formSpeciesIdTable = sSceptileFormSpeciesIdTable, .formChangeTable = sSceptileFormChangeTable, .baseHP = 70, @@ -194,15 +210,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 275, .trainerOffset = 2, - FRONT_PIC(SceptileMega, 64, 64), + .frontPic = gMonFrontPic_SceptileMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SceptileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SceptileMega, 64, 64), + .backPic = gMonBackPic_SceptileMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(SceptileMega), - ICON(SceptileMega, 1), + .palette = gMonPalette_SceptileMega, + .shinyPalette = gMonShinyPalette_SceptileMega, + .iconSprite = gMonIcon_SceptileMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -243,18 +263,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Torchic, 32, 48), + .frontPic = gMonFrontPic_Torchic, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Torchic, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Torchic, 40, 48), - BACK_PIC_FEMALE(Torchic, 40, 48), + .backPic = gMonBackPic_Torchic, + .backPicSize = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_TorchicF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Torchic), - ICON(Torchic, 0), + .palette = gMonPalette_Torchic, + .shinyPalette = gMonShinyPalette_Torchic, + .iconSprite = gMonIcon_Torchic, + .iconPalIndex = 0, FOOTPRINT(Torchic) - LEARNSETS(Torchic), + .levelUpLearnset = sTorchicLevelUpLearnset, + .teachableLearnset = sTorchicTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_COMBUSKEN}), }, @@ -293,19 +319,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Combusken, 48, 64), - FRONT_PIC_FEMALE(Combusken, 48, 64), + .frontPic = gMonFrontPic_Combusken, + .frontPicSize = MON_COORDS_SIZE(48, 64), + .frontPicFemale = gMonFrontPic_CombuskenF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Combusken, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Combusken, 64, 64), - BACK_PIC_FEMALE(Combusken, 64, 64), + .backPic = gMonBackPic_Combusken, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_CombuskenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Combusken), - ICON(Combusken, 0), + .palette = gMonPalette_Combusken, + .shinyPalette = gMonShinyPalette_Combusken, + .iconSprite = gMonIcon_Combusken, + .iconPalIndex = 0, FOOTPRINT(Combusken) - LEARNSETS(Combusken), + .levelUpLearnset = sCombuskenLevelUpLearnset, + .teachableLearnset = sCombuskenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_BLAZIKEN}), }, @@ -330,7 +363,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 301, .trainerOffset = 4, FOOTPRINT(Blaziken) - LEARNSETS(Blaziken), + .levelUpLearnset = sBlazikenLevelUpLearnset, + .teachableLearnset = sBlazikenTeachableLearnset, .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, @@ -353,17 +387,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "and kicks. Every several years, its old\n" "feathers burn off, and new, supple\n" "feathers grow back in their place."), - FRONT_PIC(Blaziken, 56, 64), - FRONT_PIC_FEMALE(Blaziken, 56, 64), + .frontPic = gMonFrontPic_Blaziken, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_BlazikenF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Blaziken, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Blaziken, 64, 64), - BACK_PIC_FEMALE(Blaziken, 64, 64), + .backPic = gMonBackPic_Blaziken, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_BlazikenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Blaziken), - ICON(Blaziken, 0), + .palette = gMonPalette_Blaziken, + .shinyPalette = gMonShinyPalette_Blaziken, + .iconSprite = gMonIcon_Blaziken, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -388,7 +428,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 301, .trainerOffset = 4, FOOTPRINT(Blaziken) - LEARNSETS(Blaziken), + .levelUpLearnset = sBlazikenLevelUpLearnset, + .teachableLearnset = sBlazikenTeachableLearnset, .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, .baseHP = 80, @@ -405,15 +446,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "its legs can begin to burn from the\n" "friction of the surrounding atmosphere.\n" "They're always a source of pride to it."), - FRONT_PIC(BlazikenMega, 64, 64), + .frontPic = gMonFrontPic_BlazikenMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_BlazikenMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(BlazikenMega, 56, 64), + .backPic = gMonBackPic_BlazikenMega, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(BlazikenMega), - ICON(BlazikenMega, 0), + .palette = gMonPalette_BlazikenMega, + .shinyPalette = gMonShinyPalette_BlazikenMega, + .iconSprite = gMonIcon_BlazikenMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -454,17 +499,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mudkip, 40, 40), + .frontPic = gMonFrontPic_Mudkip, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Mudkip, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Mudkip, 48, 48), + .backPic = gMonBackPic_Mudkip, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Mudkip), - ICON(Mudkip, 0), + .palette = gMonPalette_Mudkip, + .shinyPalette = gMonShinyPalette_Mudkip, + .iconSprite = gMonIcon_Mudkip, + .iconPalIndex = 0, FOOTPRINT(Mudkip) - LEARNSETS(Mudkip), + .levelUpLearnset = sMudkipLevelUpLearnset, + .teachableLearnset = sMudkipTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_MARSHTOMP}), }, @@ -502,17 +552,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Marshtomp, 48, 56), + .frontPic = gMonFrontPic_Marshtomp, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Marshtomp, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Marshtomp, 64, 64), + .backPic = gMonBackPic_Marshtomp, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Marshtomp), - ICON(Marshtomp, 0), + .palette = gMonPalette_Marshtomp, + .shinyPalette = gMonShinyPalette_Marshtomp, + .iconSprite = gMonIcon_Marshtomp, + .iconPalIndex = 0, FOOTPRINT(Marshtomp) - LEARNSETS(Marshtomp), + .levelUpLearnset = sMarshtompLevelUpLearnset, + .teachableLearnset = sMarshtompTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SWAMPERT}), }, @@ -531,7 +586,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SWAMPERT, .categoryName = _("Mud Fish"), FOOTPRINT(Swampert) - LEARNSETS(Swampert), + .levelUpLearnset = sSwampertLevelUpLearnset, + .teachableLearnset = sSwampertTeachableLearnset, .formSpeciesIdTable = sSwampertFormSpeciesIdTable, .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, @@ -560,15 +616,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swampert, 64, 56), + .frontPic = gMonFrontPic_Swampert, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Swampert, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Swampert, 64, 64), + .backPic = gMonBackPic_Swampert, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Swampert), - ICON(Swampert, 0), + .palette = gMonPalette_Swampert, + .shinyPalette = gMonShinyPalette_Swampert, + .iconSprite = gMonIcon_Swampert, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -587,7 +647,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SWAMPERT, .categoryName = _("Mud Fish"), FOOTPRINT(Swampert) - LEARNSETS(Swampert), + .levelUpLearnset = sSwampertLevelUpLearnset, + .teachableLearnset = sSwampertTeachableLearnset, .formSpeciesIdTable = sSwampertFormSpeciesIdTable, .formChangeTable = sSwampertFormChangeTable, .baseHP = 100, @@ -610,15 +671,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SwampertMega, 64, 64), + .frontPic = gMonFrontPic_SwampertMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_SwampertMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SwampertMega, 64, 56), + .backPic = gMonBackPic_SwampertMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(SwampertMega), - ICON(SwampertMega, 0), + .palette = gMonPalette_SwampertMega, + .shinyPalette = gMonShinyPalette_SwampertMega, + .iconSprite = gMonIcon_SwampertMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -665,17 +730,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poochyena, 48, 48), + .frontPic = gMonFrontPic_Poochyena, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Poochyena, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Poochyena, 64, 48), + .backPic = gMonBackPic_Poochyena, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Poochyena), - ICON(Poochyena, 2), + .palette = gMonPalette_Poochyena, + .shinyPalette = gMonShinyPalette_Poochyena, + .iconSprite = gMonIcon_Poochyena, + .iconPalIndex = 2, FOOTPRINT(Poochyena) - LEARNSETS(Poochyena), + .levelUpLearnset = sPoochyenaLevelUpLearnset, + .teachableLearnset = sPoochyenaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_MIGHTYENA}), }, @@ -713,17 +783,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mightyena, 64, 64), + .frontPic = gMonFrontPic_Mightyena, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Mightyena, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Mightyena, 64, 64), + .backPic = gMonBackPic_Mightyena, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Mightyena), - ICON(Mightyena, 2), + .palette = gMonPalette_Mightyena, + .shinyPalette = gMonShinyPalette_Mightyena, + .iconSprite = gMonIcon_Mightyena, + .iconPalIndex = 2, FOOTPRINT(Mightyena) - LEARNSETS(Mightyena), + .levelUpLearnset = sMightyenaLevelUpLearnset, + .teachableLearnset = sMightyenaTeachableLearnset, }, #endif //P_FAMILY_POOCHYENA @@ -774,16 +849,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "always wanders about back and forth in\n" "search of something. It is distinguished\n" "by the zigzag footprints it leaves."), - FRONT_PIC(Zigzagoon, 56, 40), + .frontPic = gMonFrontPic_Zigzagoon, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Zigzagoon, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Zigzagoon, 56, 56), + .backPic = gMonBackPic_Zigzagoon, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Zigzagoon), - ICON(Zigzagoon, 2), - LEARNSETS(Zigzagoon), + .palette = gMonPalette_Zigzagoon, + .shinyPalette = gMonShinyPalette_Zigzagoon, + .iconSprite = gMonIcon_Zigzagoon, + .iconPalIndex = 2, + .levelUpLearnset = sZigzagoonLevelUpLearnset, + .teachableLearnset = sZigzagoonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}), }, @@ -825,16 +905,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "in a straight line. When it spots pond-\n" "dwelling prey underwater, it quickly leaps\n" "in and catches it with its sharp claws."), - FRONT_PIC(Linoone, 64, 40), + .frontPic = gMonFrontPic_Linoone, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Linoone, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Linoone, 56, 40), + .backPic = gMonBackPic_Linoone, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Linoone), - ICON(Linoone, 2), - LEARNSETS(Linoone), + .palette = gMonPalette_Linoone, + .shinyPalette = gMonShinyPalette_Linoone, + .iconSprite = gMonIcon_Linoone, + .iconPalIndex = 2, + .levelUpLearnset = sLinooneLevelUpLearnset, + .teachableLearnset = sLinooneTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -874,16 +959,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "in zigzags. It will purposely run into other\n" "Pokémon to start fights. It's thought to\n" "be the oldest form of Zigzagoon."), - FRONT_PIC(ZigzagoonGalarian, 56, 40), + .frontPic = gMonFrontPic_ZigzagoonGalarian, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_ZigzagoonGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZigzagoonGalarian, 56, 48), + .backPic = gMonBackPic_ZigzagoonGalarian, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZigzagoonGalarian), - ICON(ZigzagoonGalarian, 0), - LEARNSETS(ZigzagoonGalarian), + .palette = gMonPalette_ZigzagoonGalarian, + .shinyPalette = gMonShinyPalette_ZigzagoonGalarian, + .iconSprite = gMonIcon_ZigzagoonGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sZigzagoonGalarianLevelUpLearnset, + .teachableLearnset = sZigzagoonGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}), }, @@ -924,16 +1014,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "recklessly challenge opponents stronger\n" "than itself. It uses its long tongue to\n" "taunt them to then tackle forcefully."), - FRONT_PIC(LinooneGalarian, 64, 40), + .frontPic = gMonFrontPic_LinooneGalarian, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_LinooneGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(LinooneGalarian, 64, 40), + .backPic = gMonBackPic_LinooneGalarian, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(LinooneGalarian), - ICON(LinooneGalarian, 0), - LEARNSETS(LinooneGalarian), + .palette = gMonPalette_LinooneGalarian, + .shinyPalette = gMonShinyPalette_LinooneGalarian, + .iconSprite = gMonIcon_LinooneGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sLinooneGalarianLevelUpLearnset, + .teachableLearnset = sLinooneGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}), }, @@ -972,17 +1067,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Obstagoon, 56, 64), + .frontPic = gMonFrontPic_Obstagoon, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Obstagoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Obstagoon, 64, 64), + .backPic = gMonBackPic_Obstagoon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Obstagoon), - ICON(Obstagoon, 0), + .palette = gMonPalette_Obstagoon, + .shinyPalette = gMonShinyPalette_Obstagoon, + .iconSprite = gMonIcon_Obstagoon, + .iconPalIndex = 0, FOOTPRINT(Obstagoon) - LEARNSETS(Obstagoon), + .levelUpLearnset = sObstagoonLevelUpLearnset, + .teachableLearnset = sObstagoonTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON @@ -1030,17 +1130,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wurmple, 40, 40), + .frontPic = gMonFrontPic_Wurmple, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Wurmple, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wurmple, 64, 56), + .backPic = gMonBackPic_Wurmple, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Wurmple), - ICON(Wurmple, 0), + .palette = gMonPalette_Wurmple, + .shinyPalette = gMonShinyPalette_Wurmple, + .iconSprite = gMonIcon_Wurmple, + .iconPalIndex = 0, FOOTPRINT(Wurmple) - LEARNSETS(Wurmple), + .levelUpLearnset = sWurmpleLevelUpLearnset, + .teachableLearnset = sWurmpleTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}), @@ -1080,17 +1185,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Silcoon, 56, 48), + .frontPic = gMonFrontPic_Silcoon, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Silcoon, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Silcoon, 64, 40), + .backPic = gMonBackPic_Silcoon, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Silcoon), - ICON(Silcoon, 2), + .palette = gMonPalette_Silcoon, + .shinyPalette = gMonShinyPalette_Silcoon, + .iconSprite = gMonIcon_Silcoon, + .iconPalIndex = 2, FOOTPRINT(Silcoon) - LEARNSETS(Silcoon), + .levelUpLearnset = sSilcoonLevelUpLearnset, + .teachableLearnset = sSilcoonTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEAUTIFLY}), }, @@ -1138,20 +1248,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Beautifly, 64, 56), - FRONT_PIC_FEMALE(Beautifly, 64, 56), + .frontPic = gMonFrontPic_Beautifly, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_BeautiflyF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Beautifly, .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = 10, - BACK_PIC(Beautifly, 64, 64), - BACK_PIC_FEMALE(Beautifly, 64, 64), + .backPic = gMonBackPic_Beautifly, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_BeautiflyF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Beautifly), - ICON(Beautifly, 0), + .palette = gMonPalette_Beautifly, + .shinyPalette = gMonShinyPalette_Beautifly, + .iconSprite = gMonIcon_Beautifly, + .iconPalIndex = 0, FOOTPRINT(Beautifly) - LEARNSETS(Beautifly), + .levelUpLearnset = sBeautiflyLevelUpLearnset, + .teachableLearnset = sBeautiflyTeachableLearnset, }, [SPECIES_CASCOON] = @@ -1194,17 +1311,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cascoon, 56, 48), + .frontPic = gMonFrontPic_Cascoon, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Cascoon, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Cascoon, 56, 40), + .backPic = gMonBackPic_Cascoon, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Cascoon), - ICON(Cascoon, 2), + .palette = gMonPalette_Cascoon, + .shinyPalette = gMonShinyPalette_Cascoon, + .iconSprite = gMonIcon_Cascoon, + .iconPalIndex = 2, FOOTPRINT(Cascoon) - LEARNSETS(Cascoon), + .levelUpLearnset = sCascoonLevelUpLearnset, + .teachableLearnset = sCascoonTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DUSTOX}), }, @@ -1254,20 +1376,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dustox, 64, 48), - FRONT_PIC_FEMALE(Dustox, 64, 48), + .frontPic = gMonFrontPic_Dustox, + .frontPicSize = MON_COORDS_SIZE(64, 48), + .frontPicFemale = gMonFrontPic_DustoxF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Dustox, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .enemyMonElevation = 12, - BACK_PIC(Dustox, 64, 64), - BACK_PIC_FEMALE(Dustox, 64, 64), + .backPic = gMonBackPic_Dustox, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_DustoxF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Dustox), - ICON(Dustox, 5), + .palette = gMonPalette_Dustox, + .shinyPalette = gMonShinyPalette_Dustox, + .iconSprite = gMonIcon_Dustox, + .iconPalIndex = 5, FOOTPRINT(Dustox) - LEARNSETS(Dustox), + .levelUpLearnset = sDustoxLevelUpLearnset, + .teachableLearnset = sDustoxTeachableLearnset, }, #endif //P_FAMILY_WURMPLE @@ -1307,17 +1436,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lotad, 40, 40), + .frontPic = gMonFrontPic_Lotad, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Lotad, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lotad, 56, 40), + .backPic = gMonBackPic_Lotad, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Lotad), - ICON(Lotad, 4), + .palette = gMonPalette_Lotad, + .shinyPalette = gMonShinyPalette_Lotad, + .iconSprite = gMonIcon_Lotad, + .iconPalIndex = 4, FOOTPRINT(Lotad) - LEARNSETS(Lotad), + .levelUpLearnset = sLotadLevelUpLearnset, + .teachableLearnset = sLotadTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_LOMBRE}), }, @@ -1356,17 +1490,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lombre, 48, 48), + .frontPic = gMonFrontPic_Lombre, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Lombre, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lombre, 48, 56), + .backPic = gMonBackPic_Lombre, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Lombre), - ICON(Lombre, 1), + .palette = gMonPalette_Lombre, + .shinyPalette = gMonShinyPalette_Lombre, + .iconSprite = gMonIcon_Lombre, + .iconPalIndex = 1, FOOTPRINT(Lombre) - LEARNSETS(Lombre), + .levelUpLearnset = sLombreLevelUpLearnset, + .teachableLearnset = sLombreTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}), }, @@ -1411,19 +1550,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = -1, - FRONT_PIC(Ludicolo, 56, 64), - FRONT_PIC_FEMALE(Ludicolo, 56, 64), + .frontPic = gMonFrontPic_Ludicolo, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_LudicoloF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ludicolo, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, - BACK_PIC(Ludicolo, 64, 56), - BACK_PIC_FEMALE(Ludicolo, 64, 56), + .backPic = gMonBackPic_Ludicolo, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_LudicoloF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Ludicolo), - ICON(Ludicolo, 1), + .palette = gMonPalette_Ludicolo, + .shinyPalette = gMonShinyPalette_Ludicolo, + .iconSprite = gMonIcon_Ludicolo, + .iconPalIndex = 1, FOOTPRINT(Ludicolo) - LEARNSETS(Ludicolo), + .levelUpLearnset = sLudicoloLevelUpLearnset, + .teachableLearnset = sLudicoloTeachableLearnset, }, #endif //P_FAMILY_LOTAD @@ -1463,17 +1609,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Seedot, 32, 40), + .frontPic = gMonFrontPic_Seedot, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Seedot, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Seedot, 48, 48), + .backPic = gMonBackPic_Seedot, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Seedot), - ICON(Seedot, 2), + .palette = gMonPalette_Seedot, + .shinyPalette = gMonShinyPalette_Seedot, + .iconSprite = gMonIcon_Seedot, + .iconPalIndex = 2, FOOTPRINT(Seedot) - LEARNSETS(Seedot), + .levelUpLearnset = sSeedotLevelUpLearnset, + .teachableLearnset = sSeedotTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_NUZLEAF}), }, @@ -1512,19 +1663,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nuzleaf, 40, 56), - FRONT_PIC_FEMALE(Nuzleaf, 40, 56), + .frontPic = gMonFrontPic_Nuzleaf, + .frontPicSize = MON_COORDS_SIZE(40, 56), + .frontPicFemale = gMonFrontPic_NuzleafF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Nuzleaf, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Nuzleaf, 56, 48), - BACK_PIC_FEMALE(Nuzleaf, 56, 48), + .backPic = gMonBackPic_Nuzleaf, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_NuzleafF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Nuzleaf), - ICON(Nuzleaf, 1), + .palette = gMonPalette_Nuzleaf, + .shinyPalette = gMonShinyPalette_Nuzleaf, + .iconSprite = gMonIcon_Nuzleaf, + .iconPalIndex = 1, FOOTPRINT(Nuzleaf) - LEARNSETS(Nuzleaf), + .levelUpLearnset = sNuzleafLevelUpLearnset, + .teachableLearnset = sNuzleafTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}), }, @@ -1573,19 +1731,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shiftry, 64, 56), - FRONT_PIC_FEMALE(Shiftry, 64, 56), + .frontPic = gMonFrontPic_Shiftry, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_ShiftryF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Shiftry, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Shiftry, 64, 56), - BACK_PIC_FEMALE(Shiftry, 64, 56), + .backPic = gMonBackPic_Shiftry, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_ShiftryF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Shiftry), - ICON(Shiftry, 5), + .palette = gMonPalette_Shiftry, + .shinyPalette = gMonShinyPalette_Shiftry, + .iconSprite = gMonIcon_Shiftry, + .iconPalIndex = 5, FOOTPRINT(Shiftry) - LEARNSETS(Shiftry), + .levelUpLearnset = sShiftryLevelUpLearnset, + .teachableLearnset = sShiftryTeachableLearnset, }, #endif //P_FAMILY_SEEDOT @@ -1624,17 +1789,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Taillow, 48, 48), + .frontPic = gMonFrontPic_Taillow, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Taillow, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Taillow, 56, 40), + .backPic = gMonBackPic_Taillow, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Taillow), - ICON(Taillow, 2), + .palette = gMonPalette_Taillow, + .shinyPalette = gMonShinyPalette_Taillow, + .iconSprite = gMonIcon_Taillow, + .iconPalIndex = 2, FOOTPRINT(Taillow) - LEARNSETS(Taillow), + .levelUpLearnset = sTaillowLevelUpLearnset, + .teachableLearnset = sTaillowTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SWELLOW}), }, @@ -1678,17 +1848,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swellow, 64, 56), + .frontPic = gMonFrontPic_Swellow, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Swellow, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Swellow, 56, 56), + .backPic = gMonBackPic_Swellow, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Swellow), - ICON(Swellow, 2), + .palette = gMonPalette_Swellow, + .shinyPalette = gMonShinyPalette_Swellow, + .iconSprite = gMonIcon_Swellow, + .iconPalIndex = 2, FOOTPRINT(Swellow) - LEARNSETS(Swellow), + .levelUpLearnset = sSwellowLevelUpLearnset, + .teachableLearnset = sSwellowTeachableLearnset, }, #endif //P_FAMILY_TAILLOW @@ -1728,18 +1903,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wingull, 64, 48), + .frontPic = gMonFrontPic_Wingull, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Wingull, .frontAnimId = ANIM_H_PIVOT, .enemyMonElevation = 15, - BACK_PIC(Wingull, 64, 40), + .backPic = gMonBackPic_Wingull, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Wingull), - ICON(Wingull, 0), + .palette = gMonPalette_Wingull, + .shinyPalette = gMonShinyPalette_Wingull, + .iconSprite = gMonIcon_Wingull, + .iconPalIndex = 0, FOOTPRINT(Wingull) - LEARNSETS(Wingull), + .levelUpLearnset = sWingullLevelUpLearnset, + .teachableLearnset = sWingullTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PELIPPER}), }, @@ -1784,18 +1964,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pelipper, 64, 64), + .frontPic = gMonFrontPic_Pelipper, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Pelipper, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Pelipper, 64, 56), + .backPic = gMonBackPic_Pelipper, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Pelipper), - ICON(Pelipper, 2), + .palette = gMonPalette_Pelipper, + .shinyPalette = gMonShinyPalette_Pelipper, + .iconSprite = gMonIcon_Pelipper, + .iconPalIndex = 2, FOOTPRINT(Pelipper) - LEARNSETS(Pelipper), + .levelUpLearnset = sPelipperLevelUpLearnset, + .teachableLearnset = sPelipperTeachableLearnset, }, #endif //P_FAMILY_WINGULL @@ -1842,17 +2027,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ralts, 24, 40), + .frontPic = gMonFrontPic_Ralts, + .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Ralts, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Ralts, 32, 40), + .backPic = gMonBackPic_Ralts, + .backPicSize = MON_COORDS_SIZE(32, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Ralts), - ICON(Ralts, 1), + .palette = gMonPalette_Ralts, + .shinyPalette = gMonShinyPalette_Ralts, + .iconSprite = gMonIcon_Ralts, + .iconPalIndex = 1, FOOTPRINT(Ralts) - LEARNSETS(Ralts), + .levelUpLearnset = sRaltsLevelUpLearnset, + .teachableLearnset = sRaltsTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_KIRLIA}), }, @@ -1890,17 +2080,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kirlia, 32, 56), + .frontPic = gMonFrontPic_Kirlia, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Kirlia, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kirlia, 48, 56), + .backPic = gMonBackPic_Kirlia, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Kirlia), - ICON(Kirlia, 1), + .palette = gMonPalette_Kirlia, + .shinyPalette = gMonShinyPalette_Kirlia, + .iconSprite = gMonIcon_Kirlia, + .iconPalIndex = 1, FOOTPRINT(Kirlia) - LEARNSETS(Kirlia), + .levelUpLearnset = sKirliaLevelUpLearnset, + .teachableLearnset = sKirliaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GARDEVOIR}, {EVO_ITEM_MALE, ITEM_DAWN_STONE, SPECIES_GALLADE}), }, @@ -1926,7 +2121,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Gardevoir) - LEARNSETS(Gardevoir), + .levelUpLearnset = sGardevoirLevelUpLearnset, + .teachableLearnset = sGardevoirTeachableLearnset, .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, @@ -1949,15 +2145,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "gravity because it supports itself with\n" "psychic power. It will give its life to\n" "protect its Trainer."), - FRONT_PIC(Gardevoir, 64, 64), + .frontPic = gMonFrontPic_Gardevoir, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Gardevoir, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Gardevoir, 48, 56), + .backPic = gMonBackPic_Gardevoir, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Gardevoir), - ICON(Gardevoir, 1), + .palette = gMonPalette_Gardevoir, + .shinyPalette = gMonShinyPalette_Gardevoir, + .iconSprite = gMonIcon_Gardevoir, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -1982,7 +2182,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Gardevoir) - LEARNSETS(Gardevoir), + .levelUpLearnset = sGardevoirLevelUpLearnset, + .teachableLearnset = sGardevoirTeachableLearnset, .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, .baseHP = 68, @@ -1999,15 +2200,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "becomes able to use tremendous psychic\n" "power. The red plate in its chest is said to\n" "be a physical manifestation of its heart."), - FRONT_PIC(GardevoirMega, 64, 64), + .frontPic = gMonFrontPic_GardevoirMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GardevoirMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GardevoirMega, 48, 56), + .backPic = gMonBackPic_GardevoirMega, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(GardevoirMega), - ICON(GardevoirMega, 1), + .palette = gMonPalette_GardevoirMega, + .shinyPalette = gMonShinyPalette_GardevoirMega, + .iconSprite = gMonIcon_GardevoirMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -2033,7 +2238,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 296, .trainerOffset = 1, FOOTPRINT(Gallade) - LEARNSETS(Gallade), + .levelUpLearnset = sGalladeLevelUpLearnset, + .teachableLearnset = sGalladeTeachableLearnset, .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, @@ -2061,15 +2267,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "it fights using extending swords on its\n" "elbows when trying to protect someone.\n" "It can sense what its foe is thinking."), - FRONT_PIC(Gallade, 56, 64), + .frontPic = gMonFrontPic_Gallade, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Gallade, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Gallade, 64, 64), + .backPic = gMonBackPic_Gallade, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Gallade), - ICON(Gallade, 1), + .palette = gMonPalette_Gallade, + .shinyPalette = gMonShinyPalette_Gallade, + .iconSprite = gMonIcon_Gallade, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -2093,7 +2303,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 296, .trainerOffset = 1, FOOTPRINT(Gallade) - LEARNSETS(Gallade), + .levelUpLearnset = sGalladeLevelUpLearnset, + .teachableLearnset = sGalladeTeachableLearnset, .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, .baseHP = 68, @@ -2111,15 +2322,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "It can use its psychic power to reshape\n" "both arms into blades simultaneously and\n" "fight using a dual-wielding style."), - FRONT_PIC(GalladeMega, 64, 64), + .frontPic = gMonFrontPic_GalladeMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_GalladeMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GalladeMega, 64, 64), + .backPic = gMonBackPic_GalladeMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(GalladeMega), - ICON(GalladeMega, 1), + .palette = gMonPalette_GalladeMega, + .shinyPalette = gMonShinyPalette_GalladeMega, + .iconSprite = gMonIcon_GalladeMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -2162,17 +2377,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Surskit, 48, 48), + .frontPic = gMonFrontPic_Surskit, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Surskit, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Surskit, 56, 40), + .backPic = gMonBackPic_Surskit, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SPRING, - PALETTES(Surskit), - ICON(Surskit, 0), + .palette = gMonPalette_Surskit, + .shinyPalette = gMonShinyPalette_Surskit, + .iconSprite = gMonIcon_Surskit, + .iconPalIndex = 0, FOOTPRINT(Surskit) - LEARNSETS(Surskit), + .levelUpLearnset = sSurskitLevelUpLearnset, + .teachableLearnset = sSurskitTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_MASQUERAIN}), }, @@ -2223,18 +2443,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Masquerain, 64, 64), + .frontPic = gMonFrontPic_Masquerain, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Masquerain, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Masquerain, 64, 64), + .backPic = gMonBackPic_Masquerain, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Masquerain), - ICON(Masquerain, 0), + .palette = gMonPalette_Masquerain, + .shinyPalette = gMonShinyPalette_Masquerain, + .iconSprite = gMonIcon_Masquerain, + .iconPalIndex = 0, FOOTPRINT(Masquerain) - LEARNSETS(Masquerain), + .levelUpLearnset = sMasquerainLevelUpLearnset, + .teachableLearnset = sMasquerainTeachableLearnset, }, #endif //P_FAMILY_SURSKIT @@ -2275,17 +2500,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shroomish, 40, 40), + .frontPic = gMonFrontPic_Shroomish, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Shroomish, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Shroomish, 56, 48), + .backPic = gMonBackPic_Shroomish, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Shroomish), - ICON(Shroomish, 1), + .palette = gMonPalette_Shroomish, + .shinyPalette = gMonShinyPalette_Shroomish, + .iconSprite = gMonIcon_Shroomish, + .iconPalIndex = 1, FOOTPRINT(Shroomish) - LEARNSETS(Shroomish), + .levelUpLearnset = sShroomishLevelUpLearnset, + .teachableLearnset = sShroomishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 23, SPECIES_BRELOOM}), }, @@ -2325,17 +2555,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Breloom, 48, 64), + .frontPic = gMonFrontPic_Breloom, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Breloom, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Breloom, 64, 64), + .backPic = gMonBackPic_Breloom, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Breloom), - ICON(Breloom, 1), + .palette = gMonPalette_Breloom, + .shinyPalette = gMonShinyPalette_Breloom, + .iconSprite = gMonIcon_Breloom, + .iconPalIndex = 1, FOOTPRINT(Breloom) - LEARNSETS(Breloom), + .levelUpLearnset = sBreloomLevelUpLearnset, + .teachableLearnset = sBreloomTeachableLearnset, }, #endif //P_FAMILY_SHROOMISH @@ -2374,17 +2609,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Slakoth, 56, 40), + .frontPic = gMonFrontPic_Slakoth, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Slakoth, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Slakoth, 64, 40), + .backPic = gMonBackPic_Slakoth, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Slakoth), - ICON(Slakoth, 2), + .palette = gMonPalette_Slakoth, + .shinyPalette = gMonShinyPalette_Slakoth, + .iconSprite = gMonIcon_Slakoth, + .iconPalIndex = 2, FOOTPRINT(Slakoth) - LEARNSETS(Slakoth), + .levelUpLearnset = sSlakothLevelUpLearnset, + .teachableLearnset = sSlakothTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_VIGOROTH}), }, @@ -2422,17 +2662,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vigoroth, 64, 56), + .frontPic = gMonFrontPic_Vigoroth, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Vigoroth, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Vigoroth, 56, 64), + .backPic = gMonBackPic_Vigoroth, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Vigoroth), - ICON(Vigoroth, 2), + .palette = gMonPalette_Vigoroth, + .shinyPalette = gMonShinyPalette_Vigoroth, + .iconSprite = gMonIcon_Vigoroth, + .iconPalIndex = 2, FOOTPRINT(Vigoroth) - LEARNSETS(Vigoroth), + .levelUpLearnset = sVigorothLevelUpLearnset, + .teachableLearnset = sVigorothTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SLAKING}), }, @@ -2476,17 +2721,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 300, .trainerOffset = 1, - FRONT_PIC(Slaking, 64, 56), + .frontPic = gMonFrontPic_Slaking, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Slaking, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Slaking, 64, 56), + .backPic = gMonBackPic_Slaking, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Slaking), - ICON(Slaking, 2), + .palette = gMonPalette_Slaking, + .shinyPalette = gMonShinyPalette_Slaking, + .iconSprite = gMonIcon_Slaking, + .iconPalIndex = 2, FOOTPRINT(Slaking) - LEARNSETS(Slaking), + .levelUpLearnset = sSlakingLevelUpLearnset, + .teachableLearnset = sSlakingTeachableLearnset, }, #endif //P_FAMILY_SLAKOTH @@ -2526,17 +2776,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nincada, 56, 32), + .frontPic = gMonFrontPic_Nincada, + .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Nincada, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Nincada, 64, 32), + .backPic = gMonBackPic_Nincada, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Nincada), - ICON(Nincada, 1), + .palette = gMonPalette_Nincada, + .shinyPalette = gMonShinyPalette_Nincada, + .iconSprite = gMonIcon_Nincada, + .iconPalIndex = 1, FOOTPRINT(Nincada) - LEARNSETS(Nincada), + .levelUpLearnset = sNincadaLevelUpLearnset, + .teachableLearnset = sNincadaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}), }, @@ -2575,18 +2830,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ninjask, 64, 48), + .frontPic = gMonFrontPic_Ninjask, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Ninjask, .frontAnimId = ANIM_H_SLIDE_SLOW, .enemyMonElevation = 10, - BACK_PIC(Ninjask, 64, 40), + .backPic = gMonBackPic_Ninjask, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Ninjask), - ICON(Ninjask, 1), + .palette = gMonPalette_Ninjask, + .shinyPalette = gMonShinyPalette_Ninjask, + .iconSprite = gMonIcon_Ninjask, + .iconPalIndex = 1, FOOTPRINT(Ninjask) - LEARNSETS(Ninjask), + .levelUpLearnset = sNinjaskLevelUpLearnset, + .teachableLearnset = sNinjaskTeachableLearnset, }, [SPECIES_SHEDINJA] = @@ -2623,18 +2883,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shedinja, 48, 48), + .frontPic = gMonFrontPic_Shedinja, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Shedinja, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Shedinja, 64, 56), + .backPic = gMonBackPic_Shedinja, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Shedinja), - ICON(Shedinja, 1), + .palette = gMonPalette_Shedinja, + .shinyPalette = gMonShinyPalette_Shedinja, + .iconSprite = gMonIcon_Shedinja, + .iconPalIndex = 1, FOOTPRINT(Shedinja) - LEARNSETS(Shedinja), + .levelUpLearnset = sShedinjaLevelUpLearnset, + .teachableLearnset = sShedinjaTeachableLearnset, }, #endif //P_FAMILY_NINCADA @@ -2673,17 +2938,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Whismur, 48, 40), + .frontPic = gMonFrontPic_Whismur, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Whismur, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Whismur, 56, 40), + .backPic = gMonBackPic_Whismur, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Whismur), - ICON(Whismur, 1), + .palette = gMonPalette_Whismur, + .shinyPalette = gMonShinyPalette_Whismur, + .iconSprite = gMonIcon_Whismur, + .iconPalIndex = 1, FOOTPRINT(Whismur) - LEARNSETS(Whismur), + .levelUpLearnset = sWhismurLevelUpLearnset, + .teachableLearnset = sWhismurTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LOUDRED}), }, @@ -2721,17 +2991,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Loudred, 56, 64), + .frontPic = gMonFrontPic_Loudred, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Loudred, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Loudred, 64, 56), + .backPic = gMonBackPic_Loudred, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Loudred), - ICON(Loudred, 2), + .palette = gMonPalette_Loudred, + .shinyPalette = gMonShinyPalette_Loudred, + .iconSprite = gMonIcon_Loudred, + .iconPalIndex = 2, FOOTPRINT(Loudred) - LEARNSETS(Loudred), + .levelUpLearnset = sLoudredLevelUpLearnset, + .teachableLearnset = sLoudredTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_EXPLOUD}), }, @@ -2777,17 +3052,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Exploud, 64, 64), + .frontPic = gMonFrontPic_Exploud, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Exploud, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Exploud, 64, 64), + .backPic = gMonBackPic_Exploud, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Exploud), - ICON(Exploud, 2), + .palette = gMonPalette_Exploud, + .shinyPalette = gMonShinyPalette_Exploud, + .iconSprite = gMonIcon_Exploud, + .iconPalIndex = 2, FOOTPRINT(Exploud) - LEARNSETS(Exploud), + .levelUpLearnset = sExploudLevelUpLearnset, + .teachableLearnset = sExploudTeachableLearnset, }, #endif //P_FAMILY_WHISMUR @@ -2827,17 +3107,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Makuhita, 48, 48), + .frontPic = gMonFrontPic_Makuhita, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Makuhita, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Makuhita, 56, 56), + .backPic = gMonBackPic_Makuhita, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Makuhita), - ICON(Makuhita, 1), + .palette = gMonPalette_Makuhita, + .shinyPalette = gMonShinyPalette_Makuhita, + .iconSprite = gMonIcon_Makuhita, + .iconPalIndex = 1, FOOTPRINT(Makuhita) - LEARNSETS(Makuhita), + .levelUpLearnset = sMakuhitaLevelUpLearnset, + .teachableLearnset = sMakuhitaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_HARIYAMA}), }, @@ -2876,17 +3161,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 343, .trainerOffset = 7, - FRONT_PIC(Hariyama, 64, 64), + .frontPic = gMonFrontPic_Hariyama, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Hariyama, .frontAnimId = ANIM_ROTATE_UP_TO_SIDES, - BACK_PIC(Hariyama, 64, 56), + .backPic = gMonBackPic_Hariyama, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Hariyama), - ICON(Hariyama, 2), + .palette = gMonPalette_Hariyama, + .shinyPalette = gMonShinyPalette_Hariyama, + .iconSprite = gMonIcon_Hariyama, + .iconPalIndex = 2, FOOTPRINT(Hariyama) - LEARNSETS(Hariyama), + .levelUpLearnset = sHariyamaLevelUpLearnset, + .teachableLearnset = sHariyamaTeachableLearnset, }, #endif //P_FAMILY_MAKUHITA @@ -2926,17 +3216,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 289, .trainerOffset = 3, - FRONT_PIC(Nosepass, 40, 48), + .frontPic = gMonFrontPic_Nosepass, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Nosepass, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Nosepass, 56, 48), + .backPic = gMonBackPic_Nosepass, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Nosepass), - ICON(Nosepass, 0), + .palette = gMonPalette_Nosepass, + .shinyPalette = gMonShinyPalette_Nosepass, + .iconSprite = gMonIcon_Nosepass, + .iconPalIndex = 0, FOOTPRINT(Nosepass) - LEARNSETS(Nosepass), + .levelUpLearnset = sNosepassLevelUpLearnset, + .teachableLearnset = sNosepassTeachableLearnset, .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}), }, @@ -2978,18 +3273,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Probopass, 56, 56), + .frontPic = gMonFrontPic_Probopass, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Probopass, .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = 6, - BACK_PIC(Probopass, 64, 56), + .backPic = gMonBackPic_Probopass, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Probopass), - ICON(Probopass, 0), + .palette = gMonPalette_Probopass, + .shinyPalette = gMonShinyPalette_Probopass, + .iconSprite = gMonIcon_Probopass, + .iconPalIndex = 0, FOOTPRINT(Probopass) - LEARNSETS(Probopass), + .levelUpLearnset = sProbopassLevelUpLearnset, + .teachableLearnset = sProbopassTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_NOSEPASS @@ -3029,17 +3329,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skitty, 56, 40), + .frontPic = gMonFrontPic_Skitty, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Skitty, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Skitty, 64, 56), + .backPic = gMonBackPic_Skitty, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Skitty), - ICON(Skitty, 0), + .palette = gMonPalette_Skitty, + .shinyPalette = gMonShinyPalette_Skitty, + .iconSprite = gMonIcon_Skitty, + .iconPalIndex = 0, FOOTPRINT(Skitty) - LEARNSETS(Skitty), + .levelUpLearnset = sSkittyLevelUpLearnset, + .teachableLearnset = sSkittyTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}), }, @@ -3084,17 +3389,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Delcatty, 56, 56), + .frontPic = gMonFrontPic_Delcatty, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Delcatty, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Delcatty, 64, 64), + .backPic = gMonBackPic_Delcatty, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Delcatty), - ICON(Delcatty, 2), + .palette = gMonPalette_Delcatty, + .shinyPalette = gMonShinyPalette_Delcatty, + .iconSprite = gMonIcon_Delcatty, + .iconPalIndex = 2, FOOTPRINT(Delcatty) - LEARNSETS(Delcatty), + .levelUpLearnset = sDelcattyLevelUpLearnset, + .teachableLearnset = sDelcattyTeachableLearnset, }, #endif //P_FAMILY_SKITTY @@ -3116,7 +3426,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("Darkness"), .height = 5, FOOTPRINT(Sableye) - LEARNSETS(Sableye), + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, .formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, @@ -3139,15 +3450,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sableye, 48, 48), + .frontPic = gMonFrontPic_Sableye, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sableye, .frontAnimId = ANIM_GLOW_BLACK, - BACK_PIC(Sableye, 48, 48), + .backPic = gMonBackPic_Sableye, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Sableye), - ICON(Sableye, 2), + .palette = gMonPalette_Sableye, + .shinyPalette = gMonShinyPalette_Sableye, + .iconSprite = gMonIcon_Sableye, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -3168,7 +3483,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("Darkness"), .height = 5, FOOTPRINT(Sableye) - LEARNSETS(Sableye), + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, .formSpeciesIdTable = sSableyeFormSpeciesIdTable, .formChangeTable = sSableyeFormChangeTable, .baseHP = 50, @@ -3189,15 +3505,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SableyeMega, 64, 64), + .frontPic = gMonFrontPic_SableyeMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_SableyeMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SableyeMega, 64, 64), + .backPic = gMonBackPic_SableyeMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(SableyeMega), - ICON(SableyeMega, 2), + .palette = gMonPalette_SableyeMega, + .shinyPalette = gMonShinyPalette_SableyeMega, + .iconSprite = gMonIcon_SableyeMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3226,7 +3546,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_MAWILE, .categoryName = _("Deceiver"), FOOTPRINT(Mawile) - LEARNSETS(Mawile), + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, .formSpeciesIdTable = sMawileFormSpeciesIdTable, .formChangeTable = sMawileFormChangeTable, .baseHP = 50, @@ -3250,15 +3571,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mawile, 64, 48), + .frontPic = gMonFrontPic_Mawile, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Mawile, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Mawile, 64, 56), + .backPic = gMonBackPic_Mawile, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Mawile), - ICON(Mawile, 2), + .palette = gMonPalette_Mawile, + .shinyPalette = gMonShinyPalette_Mawile, + .iconSprite = gMonIcon_Mawile, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -3278,7 +3603,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_MAWILE, .categoryName = _("Deceiver"), FOOTPRINT(Mawile) - LEARNSETS(Mawile), + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, .formSpeciesIdTable = sMawileFormSpeciesIdTable, .formChangeTable = sMawileFormChangeTable, .baseHP = 50, @@ -3301,15 +3627,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(MawileMega, 64, 64), + .frontPic = gMonFrontPic_MawileMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_MawileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MawileMega, 64, 64), + .backPic = gMonBackPic_MawileMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(MawileMega), - ICON(MawileMega, 0), + .palette = gMonPalette_MawileMega, + .shinyPalette = gMonShinyPalette_MawileMega, + .iconSprite = gMonIcon_MawileMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3351,17 +3681,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Aron, 32, 40), + .frontPic = gMonFrontPic_Aron, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Aron, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Aron, 48, 40), + .backPic = gMonBackPic_Aron, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Aron), - ICON(Aron, 2), + .palette = gMonPalette_Aron, + .shinyPalette = gMonShinyPalette_Aron, + .iconSprite = gMonIcon_Aron, + .iconPalIndex = 2, FOOTPRINT(Aron) - LEARNSETS(Aron), + .levelUpLearnset = sAronLevelUpLearnset, + .teachableLearnset = sAronTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_LAIRON}), }, @@ -3400,17 +3735,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lairon, 56, 48), + .frontPic = gMonFrontPic_Lairon, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Lairon, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lairon, 64, 40), + .backPic = gMonBackPic_Lairon, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Lairon), - ICON(Lairon, 2), + .palette = gMonPalette_Lairon, + .shinyPalette = gMonShinyPalette_Lairon, + .iconSprite = gMonIcon_Lairon, + .iconPalIndex = 2, FOOTPRINT(Lairon) - LEARNSETS(Lairon), + .levelUpLearnset = sLaironLevelUpLearnset, + .teachableLearnset = sLaironTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_AGGRON}), }, @@ -3429,7 +3769,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_AGGRON, .categoryName = _("Iron Armor"), FOOTPRINT(Aggron) - LEARNSETS(Aggron), + .levelUpLearnset = sAggronLevelUpLearnset, + .teachableLearnset = sAggronTeachableLearnset, .formSpeciesIdTable = sAggronFormSpeciesIdTable, .formChangeTable = sAggronFormChangeTable, .baseHP = 70, @@ -3459,15 +3800,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 350, .trainerOffset = 6, - FRONT_PIC(Aggron, 64, 64), + .frontPic = gMonFrontPic_Aggron, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Aggron, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Aggron, 64, 56), + .backPic = gMonBackPic_Aggron, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Aggron), - ICON(Aggron, 2), + .palette = gMonPalette_Aggron, + .shinyPalette = gMonShinyPalette_Aggron, + .iconSprite = gMonIcon_Aggron, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -3486,7 +3831,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_AGGRON, .categoryName = _("Iron Armor"), FOOTPRINT(Aggron) - LEARNSETS(Aggron), + .levelUpLearnset = sAggronLevelUpLearnset, + .teachableLearnset = sAggronTeachableLearnset, .formSpeciesIdTable = sAggronFormSpeciesIdTable, .formChangeTable = sAggronFormChangeTable, .baseHP = 70, @@ -3510,15 +3856,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 350, .trainerOffset = 6, - FRONT_PIC(AggronMega, 64, 64), + .frontPic = gMonFrontPic_AggronMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AggronMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AggronMega, 64, 56), + .backPic = gMonBackPic_AggronMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(AggronMega), - ICON(AggronMega, 2), + .palette = gMonPalette_AggronMega, + .shinyPalette = gMonShinyPalette_AggronMega, + .iconSprite = gMonIcon_AggronMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3559,19 +3909,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Meditite, 48, 48), - FRONT_PIC_FEMALE(Meditite, 48, 48), + .frontPic = gMonFrontPic_Meditite, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_MedititeF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Meditite, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, - BACK_PIC(Meditite, 48, 48), - BACK_PIC_FEMALE(Meditite, 48, 48), + .backPic = gMonBackPic_Meditite, + .backPicSize = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_MedititeF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Meditite), - ICON(Meditite, 0), + .palette = gMonPalette_Meditite, + .shinyPalette = gMonShinyPalette_Meditite, + .iconSprite = gMonIcon_Meditite, + .iconPalIndex = 0, FOOTPRINT(Meditite) - LEARNSETS(Meditite), + .levelUpLearnset = sMedititeLevelUpLearnset, + .teachableLearnset = sMedititeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_MEDICHAM}), }, @@ -3596,7 +3953,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Medicham) - LEARNSETS(Medicham), + .levelUpLearnset = sMedichamLevelUpLearnset, + .teachableLearnset = sMedichamTeachableLearnset, .formSpeciesIdTable = sMedichamFormSpeciesIdTable, .formChangeTable = sMedichamFormChangeTable, .baseHP = 60, @@ -3613,17 +3971,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "gained the power to foretell its foe's\n" "actions. It battles with elegant, dance-\n" "like movement."), - FRONT_PIC(Medicham, 40, 64), - FRONT_PIC_FEMALE(Medicham, 40, 64), + .frontPic = gMonFrontPic_Medicham, + .frontPicSize = MON_COORDS_SIZE(40, 64), + .frontPicFemale = gMonFrontPic_MedichamF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Medicham, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Medicham, 56, 64), - BACK_PIC_FEMALE(Medicham, 56, 64), + .backPic = gMonBackPic_Medicham, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_MedichamF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Medicham), - ICON(Medicham, 0), + .palette = gMonPalette_Medicham, + .shinyPalette = gMonShinyPalette_Medicham, + .iconSprite = gMonIcon_Medicham, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -3648,7 +4012,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Medicham) - LEARNSETS(Medicham), + .levelUpLearnset = sMedichamLevelUpLearnset, + .teachableLearnset = sMedichamTeachableLearnset, .formSpeciesIdTable = sMedichamFormSpeciesIdTable, .formChangeTable = sMedichamFormChangeTable, .baseHP = 60, @@ -3665,15 +4030,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "additional arms for itself. The more it has\n" "trained its spirit, the more realistic and\n" "dexterous these self-created arms become."), - FRONT_PIC(MedichamMega, 64, 64), + .frontPic = gMonFrontPic_MedichamMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MedichamMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MedichamMega, 64, 64), + .backPic = gMonBackPic_MedichamMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(MedichamMega), - ICON(MedichamMega, 0), + .palette = gMonPalette_MedichamMega, + .shinyPalette = gMonShinyPalette_MedichamMega, + .iconSprite = gMonIcon_MedichamMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3714,17 +4083,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Electrike, 48, 40), + .frontPic = gMonFrontPic_Electrike, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Electrike, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Electrike, 56, 40), + .backPic = gMonBackPic_Electrike, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Electrike), - ICON(Electrike, 1), + .palette = gMonPalette_Electrike, + .shinyPalette = gMonShinyPalette_Electrike, + .iconSprite = gMonIcon_Electrike, + .iconPalIndex = 1, FOOTPRINT(Electrike) - LEARNSETS(Electrike), + .levelUpLearnset = sElectrikeLevelUpLearnset, + .teachableLearnset = sElectrikeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_MANECTRIC}), }, @@ -3743,7 +4117,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_MANECTRIC, .categoryName = _("Discharge"), FOOTPRINT(Manectric) - LEARNSETS(Manectric), + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, .formSpeciesIdTable = sManectricFormSpeciesIdTable, .formChangeTable = sManectricFormChangeTable, .baseHP = 70, @@ -3766,15 +4141,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Manectric, 56, 64), + .frontPic = gMonFrontPic_Manectric, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Manectric, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Manectric, 56, 64), + .backPic = gMonBackPic_Manectric, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Manectric), - ICON(Manectric, 0), + .palette = gMonPalette_Manectric, + .shinyPalette = gMonShinyPalette_Manectric, + .iconSprite = gMonIcon_Manectric, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -3793,7 +4172,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_MANECTRIC, .categoryName = _("Discharge"), FOOTPRINT(Manectric) - LEARNSETS(Manectric), + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, .formSpeciesIdTable = sManectricFormSpeciesIdTable, .formChangeTable = sManectricFormChangeTable, .baseHP = 70, @@ -3815,15 +4195,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(ManectricMega, 64, 64), + .frontPic = gMonFrontPic_ManectricMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_ManectricMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ManectricMega, 64, 64), + .backPic = gMonBackPic_ManectricMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(ManectricMega), - ICON(ManectricMega, 0), + .palette = gMonPalette_ManectricMega, + .shinyPalette = gMonShinyPalette_ManectricMega, + .iconSprite = gMonIcon_ManectricMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3865,17 +4249,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Plusle, 40, 48), + .frontPic = gMonFrontPic_Plusle, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Plusle, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Plusle, 56, 64), + .backPic = gMonBackPic_Plusle, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Plusle), - ICON(Plusle, 0), + .palette = gMonPalette_Plusle, + .shinyPalette = gMonShinyPalette_Plusle, + .iconSprite = gMonIcon_Plusle, + .iconPalIndex = 0, FOOTPRINT(Plusle) - LEARNSETS(Plusle), + .levelUpLearnset = sPlusleLevelUpLearnset, + .teachableLearnset = sPlusleTeachableLearnset, }, #endif //P_FAMILY_PLUSLE @@ -3915,17 +4304,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Minun, 40, 48), + .frontPic = gMonFrontPic_Minun, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Minun, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, - BACK_PIC(Minun, 48, 64), + .backPic = gMonBackPic_Minun, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Minun), - ICON(Minun, 0), + .palette = gMonPalette_Minun, + .shinyPalette = gMonShinyPalette_Minun, + .iconSprite = gMonIcon_Minun, + .iconPalIndex = 0, FOOTPRINT(Minun) - LEARNSETS(Minun), + .levelUpLearnset = sMinunLevelUpLearnset, + .teachableLearnset = sMinunTeachableLearnset, }, #endif //P_FAMILY_MINUN @@ -3976,17 +4370,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Volbeat, 48, 56), + .frontPic = gMonFrontPic_Volbeat, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Volbeat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Volbeat, 48, 64), + .backPic = gMonBackPic_Volbeat, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Volbeat), - ICON(Volbeat, 0), + .palette = gMonPalette_Volbeat, + .shinyPalette = gMonShinyPalette_Volbeat, + .iconSprite = gMonIcon_Volbeat, + .iconPalIndex = 0, FOOTPRINT(Volbeat) - LEARNSETS(Volbeat), + .levelUpLearnset = sVolbeatLevelUpLearnset, + .teachableLearnset = sVolbeatTeachableLearnset, }, [SPECIES_ILLUMISE] = @@ -4035,17 +4434,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Illumise, 40, 48), + .frontPic = gMonFrontPic_Illumise, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Illumise, .frontAnimId = ANIM_RISING_WOBBLE, - BACK_PIC(Illumise, 48, 56), + .backPic = gMonBackPic_Illumise, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Illumise), - ICON(Illumise, 2), + .palette = gMonPalette_Illumise, + .shinyPalette = gMonShinyPalette_Illumise, + .iconSprite = gMonIcon_Illumise, + .iconPalIndex = 2, FOOTPRINT(Illumise) - LEARNSETS(Illumise), + .levelUpLearnset = sIllumiseLevelUpLearnset, + .teachableLearnset = sIllumiseTeachableLearnset, }, #endif //P_FAMILY_VOLBEAT_ILLUMISE @@ -4087,17 +4491,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Budew, 32, 40), + .frontPic = gMonFrontPic_Budew, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Budew, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Budew, 40, 56), + .backPic = gMonBackPic_Budew, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Budew), - ICON(Budew, 1), + .palette = gMonPalette_Budew, + .shinyPalette = gMonShinyPalette_Budew, + .iconSprite = gMonIcon_Budew, + .iconPalIndex = 1, FOOTPRINT(Budew) - LEARNSETS(Budew), + .levelUpLearnset = sBudewLevelUpLearnset, + .teachableLearnset = sBudewTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_ROSELIA}), }, #endif //P_GEN_4_CROSS_EVOS @@ -4138,19 +4547,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Roselia, 56, 48), - FRONT_PIC_FEMALE(Roselia, 56, 48), + .frontPic = gMonFrontPic_Roselia, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_RoseliaF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Roselia, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Roselia, 64, 56), - BACK_PIC_FEMALE(Roselia, 64, 56), + .backPic = gMonBackPic_Roselia, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RoseliaF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(Roselia), - ICON(Roselia, 4), + .palette = gMonPalette_Roselia, + .shinyPalette = gMonShinyPalette_Roselia, + .iconSprite = gMonIcon_Roselia, + .iconPalIndex = 4, FOOTPRINT(Roselia) - LEARNSETS(Roselia), + .levelUpLearnset = sRoseliaLevelUpLearnset, + .teachableLearnset = sRoseliaTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}), }, @@ -4199,19 +4615,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Roserade, 48, 56), - FRONT_PIC_FEMALE(Roserade, 48, 56), + .frontPic = gMonFrontPic_Roserade, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_RoseradeF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Roserade, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Roserade, 64, 56), - BACK_PIC_FEMALE(Roserade, 64, 56), + .backPic = gMonBackPic_Roserade, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RoseradeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Roserade), - ICON(Roserade, 0), + .palette = gMonPalette_Roserade, + .shinyPalette = gMonShinyPalette_Roserade, + .iconSprite = gMonIcon_Roserade, + .iconPalIndex = 0, FOOTPRINT(Roserade) - LEARNSETS(Roserade), + .levelUpLearnset = sRoseradeLevelUpLearnset, + .teachableLearnset = sRoseradeTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ROSELIA @@ -4253,19 +4676,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 23, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gulpin, 40, 48), - FRONT_PIC_FEMALE(Gulpin, 40, 48), + .frontPic = gMonFrontPic_Gulpin, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .frontPicFemale = gMonFrontPic_GulpinF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Gulpin, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Gulpin, 56, 48), - BACK_PIC_FEMALE(Gulpin, 56, 48), + .backPic = gMonBackPic_Gulpin, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_GulpinF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gulpin), - ICON(Gulpin, 1), + .palette = gMonPalette_Gulpin, + .shinyPalette = gMonShinyPalette_Gulpin, + .iconSprite = gMonIcon_Gulpin, + .iconPalIndex = 1, FOOTPRINT(Gulpin) - LEARNSETS(Gulpin), + .levelUpLearnset = sGulpinLevelUpLearnset, + .teachableLearnset = sGulpinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_SWALOT}), }, @@ -4305,19 +4735,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 6, .trainerScale = 345, .trainerOffset = 3, - FRONT_PIC(Swalot, 56, 56), - FRONT_PIC_FEMALE(Swalot, 56, 56), + .frontPic = gMonFrontPic_Swalot, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_SwalotF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Swalot, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Swalot, 64, 64), - BACK_PIC_FEMALE(Swalot, 64, 64), + .backPic = gMonBackPic_Swalot, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_SwalotF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Swalot), - ICON(Swalot, 2), + .palette = gMonPalette_Swalot, + .shinyPalette = gMonShinyPalette_Swalot, + .iconSprite = gMonIcon_Swalot, + .iconPalIndex = 2, FOOTPRINT(Swalot) - LEARNSETS(Swalot), + .levelUpLearnset = sSwalotLevelUpLearnset, + .teachableLearnset = sSwalotTeachableLearnset, }, #endif //P_FAMILY_GULPIN @@ -4357,17 +4794,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Carvanha, 48, 56), + .frontPic = gMonFrontPic_Carvanha, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Carvanha, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, - BACK_PIC(Carvanha, 64, 48), + .backPic = gMonBackPic_Carvanha, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SPRING_REPEATED, - PALETTES(Carvanha), - ICON(Carvanha, 0), + .palette = gMonPalette_Carvanha, + .shinyPalette = gMonShinyPalette_Carvanha, + .iconSprite = gMonIcon_Carvanha, + .iconPalIndex = 0, FOOTPRINT(Carvanha) - LEARNSETS(Carvanha), + .levelUpLearnset = sCarvanhaLevelUpLearnset, + .teachableLearnset = sCarvanhaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHARPEDO}), }, @@ -4387,7 +4829,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SHARPEDO, .categoryName = _("Brutal"), FOOTPRINT(Sharpedo) - LEARNSETS(Sharpedo), + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, @@ -4410,15 +4853,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 317, .trainerOffset = 3, - FRONT_PIC(Sharpedo, 64, 64), + .frontPic = gMonFrontPic_Sharpedo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sharpedo, .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, - BACK_PIC(Sharpedo, 64, 64), + .backPic = gMonBackPic_Sharpedo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Sharpedo), - ICON(Sharpedo, 0), + .palette = gMonPalette_Sharpedo, + .shinyPalette = gMonShinyPalette_Sharpedo, + .iconSprite = gMonIcon_Sharpedo, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -4438,7 +4885,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SHARPEDO, .categoryName = _("Brutal"), FOOTPRINT(Sharpedo) - LEARNSETS(Sharpedo), + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, .formChangeTable = sSharpedoFormChangeTable, .baseHP = 70, @@ -4461,16 +4909,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 317, .trainerOffset = 3, - FRONT_PIC(SharpedoMega, 64, 64), + .frontPic = gMonFrontPic_SharpedoMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SharpedoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, - BACK_PIC(SharpedoMega, 64, 64), + .backPic = gMonBackPic_SharpedoMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(SharpedoMega), - ICON(SharpedoMega, 0), + .palette = gMonPalette_SharpedoMega, + .shinyPalette = gMonShinyPalette_SharpedoMega, + .iconSprite = gMonIcon_SharpedoMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -4511,17 +4963,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 493, .trainerOffset = 0, - FRONT_PIC(Wailmer, 64, 48), + .frontPic = gMonFrontPic_Wailmer, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wailmer, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Wailmer, 64, 48), + .backPic = gMonBackPic_Wailmer, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Wailmer), - ICON(Wailmer, 2), + .palette = gMonPalette_Wailmer, + .shinyPalette = gMonShinyPalette_Wailmer, + .iconSprite = gMonIcon_Wailmer, + .iconPalIndex = 2, FOOTPRINT(Wailmer) - LEARNSETS(Wailmer), + .levelUpLearnset = sWailmerLevelUpLearnset, + .teachableLearnset = sWailmerTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_WAILORD}), }, @@ -4559,18 +5016,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 1352, .trainerOffset = 18, - FRONT_PIC(Wailord, 64, 56), + .frontPic = gMonFrontPic_Wailord, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Wailord, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .frontAnimDelay = 10, - BACK_PIC(Wailord, 64, 40), + .backPic = gMonBackPic_Wailord, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Wailord), - ICON(Wailord, 0), + .palette = gMonPalette_Wailord, + .shinyPalette = gMonShinyPalette_Wailord, + .iconSprite = gMonIcon_Wailord, + .iconPalIndex = 0, FOOTPRINT(Wailord) - LEARNSETS(Wailord), + .levelUpLearnset = sWailordLevelUpLearnset, + .teachableLearnset = sWailordTeachableLearnset, }, #endif //P_FAMILY_WAILMER @@ -4609,19 +5071,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Numel, 40, 48), - FRONT_PIC_FEMALE(Numel, 40, 48), + .frontPic = gMonFrontPic_Numel, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .frontPicFemale = gMonFrontPic_NumelF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Numel, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Numel, 56, 56), - BACK_PIC_FEMALE(Numel, 56, 56), + .backPic = gMonBackPic_Numel, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_NumelF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Numel), - ICON(Numel, 1), + .palette = gMonPalette_Numel, + .shinyPalette = gMonShinyPalette_Numel, + .iconSprite = gMonIcon_Numel, + .iconPalIndex = 1, FOOTPRINT(Numel) - LEARNSETS(Numel), + .levelUpLearnset = sNumelLevelUpLearnset, + .teachableLearnset = sNumelTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_CAMERUPT}), }, @@ -4641,7 +5110,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_CAMERUPT, .categoryName = _("Eruption"), FOOTPRINT(Camerupt) - LEARNSETS(Camerupt), + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, .formSpeciesIdTable = sCameruptFormSpeciesIdTable, .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, @@ -4664,17 +5134,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 345, .trainerOffset = 6, - FRONT_PIC(Camerupt, 64, 56), - FRONT_PIC_FEMALE(Camerupt, 64, 56), + .frontPic = gMonFrontPic_Camerupt, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicFemale = gMonFrontPic_CameruptF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Camerupt, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Camerupt, 64, 40), - BACK_PIC_FEMALE(Camerupt, 64, 40), + .backPic = gMonBackPic_Camerupt, + .backPicSize = MON_COORDS_SIZE(64, 40), + .backPicFemale = gMonBackPic_CameruptF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Camerupt), - ICON(Camerupt, 0), + .palette = gMonPalette_Camerupt, + .shinyPalette = gMonShinyPalette_Camerupt, + .iconSprite = gMonIcon_Camerupt, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -4694,7 +5170,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_CAMERUPT, .categoryName = _("Eruption"), FOOTPRINT(Camerupt) - LEARNSETS(Camerupt), + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, .formSpeciesIdTable = sCameruptFormSpeciesIdTable, .formChangeTable = sCameruptFormChangeTable, .baseHP = 70, @@ -4717,15 +5194,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 345, .trainerOffset = 6, - FRONT_PIC(CameruptMega, 64, 64), + .frontPic = gMonFrontPic_CameruptMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_CameruptMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CameruptMega, 64, 64), + .backPic = gMonBackPic_CameruptMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(CameruptMega), - ICON(CameruptMega, 0), + .palette = gMonPalette_CameruptMega, + .shinyPalette = gMonShinyPalette_CameruptMega, + .iconSprite = gMonIcon_CameruptMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -4767,17 +5248,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Torkoal, 64, 64), + .frontPic = gMonFrontPic_Torkoal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Torkoal, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Torkoal, 64, 48), + .backPic = gMonBackPic_Torkoal, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Torkoal), - ICON(Torkoal, 2), + .palette = gMonPalette_Torkoal, + .shinyPalette = gMonShinyPalette_Torkoal, + .iconSprite = gMonIcon_Torkoal, + .iconPalIndex = 2, FOOTPRINT(Torkoal) - LEARNSETS(Torkoal), + .levelUpLearnset = sTorkoalLevelUpLearnset, + .teachableLearnset = sTorkoalTeachableLearnset, }, #endif //P_FAMILY_TORKOAL @@ -4816,17 +5302,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spoink, 32, 48), + .frontPic = gMonFrontPic_Spoink, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Spoink, .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, - BACK_PIC(Spoink, 40, 64), + .backPic = gMonBackPic_Spoink, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Spoink), - ICON(Spoink, 0), + .palette = gMonPalette_Spoink, + .shinyPalette = gMonShinyPalette_Spoink, + .iconSprite = gMonIcon_Spoink, + .iconPalIndex = 0, FOOTPRINT(Spoink) - LEARNSETS(Spoink), + .levelUpLearnset = sSpoinkLevelUpLearnset, + .teachableLearnset = sSpoinkTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GRUMPIG}), }, @@ -4864,18 +5355,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grumpig, 56, 64), + .frontPic = gMonFrontPic_Grumpig, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Grumpig, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 15, - BACK_PIC(Grumpig, 64, 64), + .backPic = gMonBackPic_Grumpig, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Grumpig), - ICON(Grumpig, 2), + .palette = gMonPalette_Grumpig, + .shinyPalette = gMonShinyPalette_Grumpig, + .iconSprite = gMonIcon_Grumpig, + .iconPalIndex = 2, FOOTPRINT(Grumpig) - LEARNSETS(Grumpig), + .levelUpLearnset = sGrumpigLevelUpLearnset, + .teachableLearnset = sGrumpigTeachableLearnset, }, #endif //P_FAMILY_SPOINK @@ -4915,17 +5411,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spinda, 48, 64), + .frontPic = gMonFrontPic_Spinda, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Spinda, .frontAnimId = ANIM_CIRCLE_INTO_BG, - BACK_PIC(Spinda, 56, 56), + .backPic = gMonBackPic_Spinda, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Spinda), - ICON(Spinda, 1), + .palette = gMonPalette_Spinda, + .shinyPalette = gMonShinyPalette_Spinda, + .iconSprite = gMonIcon_Spinda, + .iconPalIndex = 1, FOOTPRINT(Spinda) - LEARNSETS(Spinda), + .levelUpLearnset = sSpindaLevelUpLearnset, + .teachableLearnset = sSpindaTeachableLearnset, }, #endif //P_FAMILY_SPINDA @@ -4969,17 +5470,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Trapinch, 40, 40), + .frontPic = gMonFrontPic_Trapinch, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Trapinch, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Trapinch, 48, 48), + .backPic = gMonBackPic_Trapinch, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Trapinch), - ICON(Trapinch, 0), + .palette = gMonPalette_Trapinch, + .shinyPalette = gMonShinyPalette_Trapinch, + .iconSprite = gMonIcon_Trapinch, + .iconPalIndex = 0, FOOTPRINT(Trapinch) - LEARNSETS(Trapinch), + .levelUpLearnset = sTrapinchLevelUpLearnset, + .teachableLearnset = sTrapinchTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VIBRAVA}), }, @@ -5022,17 +5528,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vibrava, 64, 48), + .frontPic = gMonFrontPic_Vibrava, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Vibrava, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Vibrava, 64, 40), + .backPic = gMonBackPic_Vibrava, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Vibrava), - ICON(Vibrava, 1), + .palette = gMonPalette_Vibrava, + .shinyPalette = gMonShinyPalette_Vibrava, + .iconSprite = gMonIcon_Vibrava, + .iconPalIndex = 1, FOOTPRINT(Vibrava) - LEARNSETS(Vibrava), + .levelUpLearnset = sVibravaLevelUpLearnset, + .teachableLearnset = sVibravaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_FLYGON}), }, @@ -5081,18 +5592,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = 1, - FRONT_PIC(Flygon, 64, 64), + .frontPic = gMonFrontPic_Flygon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Flygon, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 7, - BACK_PIC(Flygon, 64, 64), + .backPic = gMonBackPic_Flygon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Flygon), - ICON(Flygon, 1), + .palette = gMonPalette_Flygon, + .shinyPalette = gMonShinyPalette_Flygon, + .iconSprite = gMonIcon_Flygon, + .iconPalIndex = 1, FOOTPRINT(Flygon) - LEARNSETS(Flygon), + .levelUpLearnset = sFlygonLevelUpLearnset, + .teachableLearnset = sFlygonTeachableLearnset, }, #endif //P_FAMILY_TRAPINCH @@ -5132,17 +5648,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cacnea, 56, 40), + .frontPic = gMonFrontPic_Cacnea, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Cacnea, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, - BACK_PIC(Cacnea, 64, 40), + .backPic = gMonBackPic_Cacnea, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Cacnea), - ICON(Cacnea, 1), + .palette = gMonPalette_Cacnea, + .shinyPalette = gMonShinyPalette_Cacnea, + .iconSprite = gMonIcon_Cacnea, + .iconPalIndex = 1, FOOTPRINT(Cacnea) - LEARNSETS(Cacnea), + .levelUpLearnset = sCacneaLevelUpLearnset, + .teachableLearnset = sCacneaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_CACTURNE}), }, @@ -5182,18 +5703,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cacturne, 64, 64), - FRONT_PIC_FEMALE(Cacturne, 64, 64), + .frontPic = gMonFrontPic_Cacturne, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_CacturneF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cacturne, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Cacturne, 64, 64), + .backPic = gMonBackPic_Cacturne, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Cacturne), - ICON(Cacturne, 1), + .palette = gMonPalette_Cacturne, + .shinyPalette = gMonShinyPalette_Cacturne, + .iconSprite = gMonIcon_Cacturne, + .iconPalIndex = 1, FOOTPRINT(Cacturne) - LEARNSETS(Cacturne), + .levelUpLearnset = sCacturneLevelUpLearnset, + .teachableLearnset = sCacturneTeachableLearnset, }, #endif //P_FAMILY_CACNEA @@ -5232,17 +5759,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swablu, 48, 40), + .frontPic = gMonFrontPic_Swablu, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Swablu, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Swablu, 64, 48), + .backPic = gMonBackPic_Swablu, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Swablu), - ICON(Swablu, 0), + .palette = gMonPalette_Swablu, + .shinyPalette = gMonShinyPalette_Swablu, + .iconSprite = gMonIcon_Swablu, + .iconPalIndex = 0, FOOTPRINT(Swablu) - LEARNSETS(Swablu), + .levelUpLearnset = sSwabluLevelUpLearnset, + .teachableLearnset = sSwabluTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ALTARIA}), }, @@ -5260,7 +5792,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_ALTARIA, .categoryName = _("Humming"), FOOTPRINT(Altaria) - LEARNSETS(Altaria), + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, .formSpeciesIdTable = sAltariaFormSpeciesIdTable, .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, @@ -5284,15 +5817,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Altaria, 64, 64), + .frontPic = gMonFrontPic_Altaria, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Altaria, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Altaria, 64, 48), + .backPic = gMonBackPic_Altaria, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Altaria), - ICON(Altaria, 0), + .palette = gMonPalette_Altaria, + .shinyPalette = gMonShinyPalette_Altaria, + .iconSprite = gMonIcon_Altaria, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -5310,7 +5847,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_ALTARIA, .categoryName = _("Humming"), FOOTPRINT(Altaria) - LEARNSETS(Altaria), + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, .formSpeciesIdTable = sAltariaFormSpeciesIdTable, .formChangeTable = sAltariaFormChangeTable, .baseHP = 75, @@ -5334,16 +5872,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(AltariaMega, 64, 64), + .frontPic = gMonFrontPic_AltariaMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AltariaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(AltariaMega, 64, 48), + .backPic = gMonBackPic_AltariaMega, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(AltariaMega), - ICON(AltariaMega, 0), + .palette = gMonPalette_AltariaMega, + .shinyPalette = gMonShinyPalette_AltariaMega, + .iconSprite = gMonIcon_AltariaMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -5386,17 +5928,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Zangoose, 56, 56), + .frontPic = gMonFrontPic_Zangoose, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Zangoose, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Zangoose, 64, 56), + .backPic = gMonBackPic_Zangoose, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Zangoose), - ICON(Zangoose, 0), + .palette = gMonPalette_Zangoose, + .shinyPalette = gMonShinyPalette_Zangoose, + .iconSprite = gMonIcon_Zangoose, + .iconPalIndex = 0, FOOTPRINT(Zangoose) - LEARNSETS(Zangoose), + .levelUpLearnset = sZangooseLevelUpLearnset, + .teachableLearnset = sZangooseTeachableLearnset, }, #endif //P_FAMILY_ZANGOOSE @@ -5438,17 +5985,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Seviper, 64, 56), + .frontPic = gMonFrontPic_Seviper, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Seviper, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Seviper, 64, 64), + .backPic = gMonBackPic_Seviper, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Seviper), - ICON(Seviper, 2), + .palette = gMonPalette_Seviper, + .shinyPalette = gMonShinyPalette_Seviper, + .iconSprite = gMonIcon_Seviper, + .iconPalIndex = 2, FOOTPRINT(Seviper) - LEARNSETS(Seviper), + .levelUpLearnset = sSeviperLevelUpLearnset, + .teachableLearnset = sSeviperTeachableLearnset, }, #endif //P_FAMILY_SEVIPER @@ -5495,18 +6047,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lunatone, 48, 48), + .frontPic = gMonFrontPic_Lunatone, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Lunatone, .frontAnimId = ANIM_SWING_CONVEX_FAST, .enemyMonElevation = 13, - BACK_PIC(Lunatone, 48, 48), + .backPic = gMonBackPic_Lunatone, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Lunatone), - ICON(Lunatone, 1), + .palette = gMonPalette_Lunatone, + .shinyPalette = gMonShinyPalette_Lunatone, + .iconSprite = gMonIcon_Lunatone, + .iconPalIndex = 1, FOOTPRINT(Lunatone) - LEARNSETS(Lunatone), + .levelUpLearnset = sLunatoneLevelUpLearnset, + .teachableLearnset = sLunatoneTeachableLearnset, }, #endif //P_FAMILY_LUNATONE @@ -5553,18 +6110,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Solrock, 64, 64), + .frontPic = gMonFrontPic_Solrock, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Solrock, .frontAnimId = ANIM_ROTATE_TO_SIDES_TWICE, .enemyMonElevation = 4, - BACK_PIC(Solrock, 64, 64), + .backPic = gMonBackPic_Solrock, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Solrock), - ICON(Solrock, 0), + .palette = gMonPalette_Solrock, + .shinyPalette = gMonShinyPalette_Solrock, + .iconSprite = gMonIcon_Solrock, + .iconPalIndex = 0, FOOTPRINT(Solrock) - LEARNSETS(Solrock), + .levelUpLearnset = sSolrockLevelUpLearnset, + .teachableLearnset = sSolrockTeachableLearnset, }, #endif //P_FAMILY_SOLROCK @@ -5603,18 +6165,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Barboach, 48, 40), + .frontPic = gMonFrontPic_Barboach, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Barboach, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .enemyMonElevation = 7, - BACK_PIC(Barboach, 56, 48), + .backPic = gMonBackPic_Barboach, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Barboach), - ICON(Barboach, 0), + .palette = gMonPalette_Barboach, + .shinyPalette = gMonShinyPalette_Barboach, + .iconSprite = gMonIcon_Barboach, + .iconPalIndex = 0, FOOTPRINT(Barboach) - LEARNSETS(Barboach), + .levelUpLearnset = sBarboachLevelUpLearnset, + .teachableLearnset = sBarboachTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_WHISCASH}), }, @@ -5652,17 +6219,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Whiscash, 64, 48), + .frontPic = gMonFrontPic_Whiscash, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Whiscash, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, - BACK_PIC(Whiscash, 64, 48), + .backPic = gMonBackPic_Whiscash, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Whiscash), - ICON(Whiscash, 0), + .palette = gMonPalette_Whiscash, + .shinyPalette = gMonShinyPalette_Whiscash, + .iconSprite = gMonIcon_Whiscash, + .iconPalIndex = 0, FOOTPRINT(Whiscash) - LEARNSETS(Whiscash), + .levelUpLearnset = sWhiscashLevelUpLearnset, + .teachableLearnset = sWhiscashTeachableLearnset, }, #endif //P_FAMILY_BARBOACH @@ -5701,17 +6273,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Corphish, 56, 48), + .frontPic = gMonFrontPic_Corphish, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Corphish, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Corphish, 64, 48), + .backPic = gMonBackPic_Corphish, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Corphish), - ICON(Corphish, 0), + .palette = gMonPalette_Corphish, + .shinyPalette = gMonShinyPalette_Corphish, + .iconSprite = gMonIcon_Corphish, + .iconPalIndex = 0, FOOTPRINT(Corphish) - LEARNSETS(Corphish), + .levelUpLearnset = sCorphishLevelUpLearnset, + .teachableLearnset = sCorphishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_CRAWDAUNT}), }, @@ -5749,17 +6326,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Crawdaunt, 64, 64), + .frontPic = gMonFrontPic_Crawdaunt, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Crawdaunt, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Crawdaunt, 64, 56), + .backPic = gMonBackPic_Crawdaunt, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Crawdaunt), - ICON(Crawdaunt, 0), + .palette = gMonPalette_Crawdaunt, + .shinyPalette = gMonShinyPalette_Crawdaunt, + .iconSprite = gMonIcon_Crawdaunt, + .iconPalIndex = 0, FOOTPRINT(Crawdaunt) - LEARNSETS(Crawdaunt), + .levelUpLearnset = sCrawdauntLevelUpLearnset, + .teachableLearnset = sCrawdauntTeachableLearnset, }, #endif //P_FAMILY_CORPHISH @@ -5799,18 +6381,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Baltoy, 40, 40), + .frontPic = gMonFrontPic_Baltoy, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Baltoy, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Baltoy, 64, 48), + .backPic = gMonBackPic_Baltoy, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Baltoy), - ICON(Baltoy, 2), + .palette = gMonPalette_Baltoy, + .shinyPalette = gMonShinyPalette_Baltoy, + .iconSprite = gMonIcon_Baltoy, + .iconPalIndex = 2, FOOTPRINT(Baltoy) - LEARNSETS(Baltoy), + .levelUpLearnset = sBaltoyLevelUpLearnset, + .teachableLearnset = sBaltoyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CLAYDOL}), }, @@ -5849,18 +6436,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 280, .trainerOffset = 1, - FRONT_PIC(Claydol, 56, 64), + .frontPic = gMonFrontPic_Claydol, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Claydol, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 10, - BACK_PIC(Claydol, 64, 56), + .backPic = gMonBackPic_Claydol, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Claydol), - ICON(Claydol, 0), + .palette = gMonPalette_Claydol, + .shinyPalette = gMonShinyPalette_Claydol, + .iconSprite = gMonIcon_Claydol, + .iconPalIndex = 0, FOOTPRINT(Claydol) - LEARNSETS(Claydol), + .levelUpLearnset = sClaydolLevelUpLearnset, + .teachableLearnset = sClaydolTeachableLearnset, }, #endif //P_FAMILY_BALTOY @@ -5906,17 +6498,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lileep, 48, 56), + .frontPic = gMonFrontPic_Lileep, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Lileep, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Lileep, 48, 48), + .backPic = gMonBackPic_Lileep, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Lileep), - ICON(Lileep, 2), + .palette = gMonPalette_Lileep, + .shinyPalette = gMonShinyPalette_Lileep, + .iconSprite = gMonIcon_Lileep, + .iconPalIndex = 2, FOOTPRINT(Lileep) - LEARNSETS(Lileep), + .levelUpLearnset = sLileepLevelUpLearnset, + .teachableLearnset = sLileepTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_CRADILY}), }, @@ -5961,17 +6558,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cradily, 56, 64), + .frontPic = gMonFrontPic_Cradily, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cradily, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Cradily, 56, 64), + .backPic = gMonBackPic_Cradily, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Cradily), - ICON(Cradily, 1), + .palette = gMonPalette_Cradily, + .shinyPalette = gMonShinyPalette_Cradily, + .iconSprite = gMonIcon_Cradily, + .iconPalIndex = 1, FOOTPRINT(Cradily) - LEARNSETS(Cradily), + .levelUpLearnset = sCradilyLevelUpLearnset, + .teachableLearnset = sCradilyTeachableLearnset, }, #endif //P_FAMILY_LILEEP @@ -6016,17 +6618,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Anorith, 48, 56), + .frontPic = gMonFrontPic_Anorith, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Anorith, .frontAnimId = ANIM_TWIST, - BACK_PIC(Anorith, 56, 32), + .backPic = gMonBackPic_Anorith, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 19, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Anorith), - ICON(Anorith, 0), + .palette = gMonPalette_Anorith, + .shinyPalette = gMonShinyPalette_Anorith, + .iconSprite = gMonIcon_Anorith, + .iconPalIndex = 0, FOOTPRINT(Anorith) - LEARNSETS(Anorith), + .levelUpLearnset = sAnorithLevelUpLearnset, + .teachableLearnset = sAnorithTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ARMALDO}), }, @@ -6070,17 +6677,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Armaldo, 64, 64), + .frontPic = gMonFrontPic_Armaldo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Armaldo, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Armaldo, 64, 64), + .backPic = gMonBackPic_Armaldo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Armaldo), - ICON(Armaldo, 2), + .palette = gMonPalette_Armaldo, + .shinyPalette = gMonShinyPalette_Armaldo, + .iconSprite = gMonIcon_Armaldo, + .iconPalIndex = 2, FOOTPRINT(Armaldo) - LEARNSETS(Armaldo), + .levelUpLearnset = sArmaldoLevelUpLearnset, + .teachableLearnset = sArmaldoTeachableLearnset, }, #endif //P_FAMILY_ANORITH @@ -6119,17 +6731,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Feebas, 40, 48), + .frontPic = gMonFrontPic_Feebas, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Feebas, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, - BACK_PIC(Feebas, 48, 56), + .backPic = gMonBackPic_Feebas, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SPRING, - PALETTES(Feebas), - ICON(Feebas, 2), + .palette = gMonPalette_Feebas, + .shinyPalette = gMonShinyPalette_Feebas, + .iconSprite = gMonIcon_Feebas, + .iconPalIndex = 2, FOOTPRINT(Feebas) - LEARNSETS(Feebas), + .levelUpLearnset = sFeebasLevelUpLearnset, + .teachableLearnset = sFeebasTeachableLearnset, .evolutions = EVOLUTION({EVO_BEAUTY, 170, SPECIES_MILOTIC}, {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}, {EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}), @@ -6169,20 +6786,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 360, .trainerOffset = 7, - FRONT_PIC(Milotic, 64, 64), - FRONT_PIC_FEMALE(Milotic, 64, 64), + .frontPic = gMonFrontPic_Milotic, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_MiloticF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Milotic, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .frontAnimDelay = 45, - BACK_PIC(Milotic, 64, 64), - BACK_PIC_FEMALE(Milotic, 64, 64), + .backPic = gMonBackPic_Milotic, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_MiloticF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Milotic), - ICON(Milotic, 2), + .palette = gMonPalette_Milotic, + .shinyPalette = gMonShinyPalette_Milotic, + .iconSprite = gMonIcon_Milotic, + .iconPalIndex = 2, FOOTPRINT(Milotic) - LEARNSETS(Milotic), + .levelUpLearnset = sMiloticLevelUpLearnset, + .teachableLearnset = sMiloticTeachableLearnset, }, #endif //P_FAMILY_FEEBAS @@ -6217,7 +6841,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Castform) - LEARNSETS(Castform), + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_NORMAL), @@ -6227,16 +6852,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "weather. Changes in the climate such as\n" "the temperature and humidity appear to\n" "affect its cellular structure."), - FRONT_PIC(CastformNormal, 24, 32), + .frontPic = gMonFrontPic_CastformNormal, + .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_CastformNormal, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 16, - BACK_PIC(CastformNormal, 32, 64), + .backPic = gMonBackPic_CastformNormal, + .backPicSize = MON_COORDS_SIZE(32, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(CastformNormal), - ICON(CastformNormal, 0), + .palette = gMonPalette_CastformNormal, + .shinyPalette = gMonShinyPalette_CastformNormal, + .iconSprite = gMonIcon_CastformNormal, + .iconPalIndex = 0, }, [SPECIES_CASTFORM_SUNNY] = @@ -6269,7 +6898,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Castform) - LEARNSETS(Castform), + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_FIRE), @@ -6279,16 +6909,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "In an experiment where is was placed in\n" "front of a heater, it didn't change to this\n" "form. Its body is warm and toasty."), - FRONT_PIC(CastformSunny, 40, 48), + .frontPic = gMonFrontPic_CastformSunny, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformSunny, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 5, - BACK_PIC(CastformSunny, 56, 64), + .backPic = gMonBackPic_CastformSunny, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(CastformSunny), - ICON(CastformSunny, 0), + .palette = gMonPalette_CastformSunny, + .shinyPalette = gMonShinyPalette_CastformSunny, + .iconSprite = gMonIcon_CastformSunny, + .iconPalIndex = 0, }, [SPECIES_CASTFORM_RAINY] = @@ -6321,7 +6955,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Castform) - LEARNSETS(Castform), + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_WATER), @@ -6331,16 +6966,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "In an experiment where it was placed in a\n" "shower, it didn't change to this form. Its\n" "body is soft, slightly swollen with water."), - FRONT_PIC(CastformRainy, 32, 48), + .frontPic = gMonFrontPic_CastformRainy, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformRainy, .frontAnimId = ANIM_SWING_CONVEX_FAST, .enemyMonElevation = 5, - BACK_PIC(CastformRainy, 40, 64), + .backPic = gMonBackPic_CastformRainy, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(CastformRainy), - ICON(CastformRainy, 0), + .palette = gMonPalette_CastformRainy, + .shinyPalette = gMonShinyPalette_CastformRainy, + .iconSprite = gMonIcon_CastformRainy, + .iconPalIndex = 0, }, [SPECIES_CASTFORM_SNOWY] = @@ -6373,7 +7012,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Castform) - LEARNSETS(Castform), + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, .types = MON_TYPES(TYPE_ICE), @@ -6383,16 +7023,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "In an experiment where it was placed\n" "in a freezer, it didn't change to this form.\n" "Its cold skin is as smooth as ice."), - FRONT_PIC(CastformSnowy, 40, 56), + .frontPic = gMonFrontPic_CastformSnowy, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_CastformSnowy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 5, - BACK_PIC(CastformSnowy, 56, 64), + .backPic = gMonBackPic_CastformSnowy, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(CastformSnowy), - ICON(CastformSnowy, 0), + .palette = gMonPalette_CastformSnowy, + .shinyPalette = gMonShinyPalette_CastformSnowy, + .iconSprite = gMonIcon_CastformSnowy, + .iconPalIndex = 0, }, #endif //P_FAMILY_CASTFORM @@ -6431,18 +7075,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kecleon, 48, 56), + .frontPic = gMonFrontPic_Kecleon, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Kecleon, .frontAnimId = ANIM_FLICKER_INCREASING, .frontAnimDelay = 30, - BACK_PIC(Kecleon, 56, 56), + .backPic = gMonBackPic_Kecleon, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Kecleon), - ICON(Kecleon, 1), + .palette = gMonPalette_Kecleon, + .shinyPalette = gMonShinyPalette_Kecleon, + .iconSprite = gMonIcon_Kecleon, + .iconPalIndex = 1, FOOTPRINT(Kecleon) - LEARNSETS(Kecleon), + .levelUpLearnset = sKecleonLevelUpLearnset, + .teachableLearnset = sKecleonTeachableLearnset, }, #endif //P_FAMILY_KECLEON @@ -6482,18 +7131,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shuppet, 40, 40), + .frontPic = gMonFrontPic_Shuppet, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shuppet, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 14, - BACK_PIC(Shuppet, 56, 56), + .backPic = gMonBackPic_Shuppet, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Shuppet), - ICON(Shuppet, 0), + .palette = gMonPalette_Shuppet, + .shinyPalette = gMonShinyPalette_Shuppet, + .iconSprite = gMonIcon_Shuppet, + .iconPalIndex = 0, FOOTPRINT(Shuppet) - LEARNSETS(Shuppet), + .levelUpLearnset = sShuppetLevelUpLearnset, + .teachableLearnset = sShuppetTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BANETTE}), }, @@ -6513,7 +7167,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_BANETTE, .categoryName = _("Marionette"), FOOTPRINT(Banette) - LEARNSETS(Banette), + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, .formSpeciesIdTable = sBanetteFormSpeciesIdTable, .formChangeTable = sBanetteFormChangeTable, .baseHP = 64, @@ -6536,15 +7191,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Banette, 56, 56), + .frontPic = gMonFrontPic_Banette, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Banette, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Banette, 64, 64), + .backPic = gMonBackPic_Banette, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Banette), - ICON(Banette, 0), + .palette = gMonPalette_Banette, + .shinyPalette = gMonShinyPalette_Banette, + .iconSprite = gMonIcon_Banette, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -6564,7 +7223,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_BANETTE, .categoryName = _("Marionette"), FOOTPRINT(Banette) - LEARNSETS(Banette), + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, .formSpeciesIdTable = sBanetteFormSpeciesIdTable, .formChangeTable = sBanetteFormChangeTable, .baseHP = 64, @@ -6586,16 +7246,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(BanetteMega, 64, 64), + .frontPic = gMonFrontPic_BanetteMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_BanetteMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(BanetteMega, 64, 64), + .backPic = gMonBackPic_BanetteMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(BanetteMega), - ICON(BanetteMega, 0), + .palette = gMonPalette_BanetteMega, + .shinyPalette = gMonShinyPalette_BanetteMega, + .iconSprite = gMonIcon_BanetteMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -6638,18 +7302,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Duskull, 40, 48), + .frontPic = gMonFrontPic_Duskull, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Duskull, .frontAnimId = ANIM_ZIGZAG_FAST, .enemyMonElevation = 13, - BACK_PIC(Duskull, 56, 56), + .backPic = gMonBackPic_Duskull, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Duskull), - ICON(Duskull, 0), + .palette = gMonPalette_Duskull, + .shinyPalette = gMonShinyPalette_Duskull, + .iconSprite = gMonIcon_Duskull, + .iconPalIndex = 0, FOOTPRINT(Duskull) - LEARNSETS(Duskull), + .levelUpLearnset = sDuskullLevelUpLearnset, + .teachableLearnset = sDuskullTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_DUSCLOPS}), }, @@ -6689,18 +7358,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 299, .trainerOffset = 1, - FRONT_PIC(Dusclops, 64, 64), + .frontPic = gMonFrontPic_Dusclops, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Dusclops, .frontAnimId = ANIM_H_VIBRATE, .frontAnimDelay = 30, - BACK_PIC(Dusclops, 64, 64), + .backPic = gMonBackPic_Dusclops, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Dusclops), - ICON(Dusclops, 0), + .palette = gMonPalette_Dusclops, + .shinyPalette = gMonShinyPalette_Dusclops, + .iconSprite = gMonIcon_Dusclops, + .iconPalIndex = 0, FOOTPRINT(Dusclops) - LEARNSETS(Dusclops), + .levelUpLearnset = sDusclopsLevelUpLearnset, + .teachableLearnset = sDusclopsTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}, {EVO_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}), }, @@ -6748,18 +7422,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Dusknoir, 64, 64), + .frontPic = gMonFrontPic_Dusknoir, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Dusknoir, .frontAnimId = ANIM_H_SLIDE, .enemyMonElevation = 6, - BACK_PIC(Dusknoir, 64, 56), + .backPic = gMonBackPic_Dusknoir, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Dusknoir), - ICON(Dusknoir, 2), + .palette = gMonPalette_Dusknoir, + .shinyPalette = gMonShinyPalette_Dusknoir, + .iconSprite = gMonIcon_Dusknoir, + .iconPalIndex = 2, FOOTPRINT(Dusknoir) - LEARNSETS(Dusknoir), + .levelUpLearnset = sDusknoirLevelUpLearnset, + .teachableLearnset = sDusknoirTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_DUSKULL @@ -6799,17 +7478,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 344, .trainerOffset = 7, - FRONT_PIC(Tropius, 64, 64), + .frontPic = gMonFrontPic_Tropius, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Tropius, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Tropius, 56, 64), + .backPic = gMonBackPic_Tropius, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Tropius), - ICON(Tropius, 1), + .palette = gMonPalette_Tropius, + .shinyPalette = gMonShinyPalette_Tropius, + .iconSprite = gMonIcon_Tropius, + .iconPalIndex = 1, FOOTPRINT(Tropius) - LEARNSETS(Tropius), + .levelUpLearnset = sTropiusLevelUpLearnset, + .teachableLearnset = sTropiusTeachableLearnset, }, #endif //P_FAMILY_TROPIUS @@ -6850,17 +7534,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chingling, 40, 40), + .frontPic = gMonFrontPic_Chingling, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Chingling, .frontAnimId = ANIM_H_SLIDE_WOBBLE, - BACK_PIC(Chingling, 48, 48), + .backPic = gMonBackPic_Chingling, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Chingling), - ICON(Chingling, 1), + .palette = gMonPalette_Chingling, + .shinyPalette = gMonShinyPalette_Chingling, + .iconSprite = gMonIcon_Chingling, + .iconPalIndex = 1, FOOTPRINT(Chingling) - LEARNSETS(Chingling), + .levelUpLearnset = sChinglingLevelUpLearnset, + .teachableLearnset = sChinglingTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO}), }, #endif //P_GEN_4_CROSS_EVOS @@ -6913,18 +7602,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chimecho, 48, 48), + .frontPic = gMonFrontPic_Chimecho, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Chimecho, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 16, - BACK_PIC(Chimecho, 64, 56), + .backPic = gMonBackPic_Chimecho, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Chimecho), - ICON(Chimecho, 0), + .palette = gMonPalette_Chimecho, + .shinyPalette = gMonShinyPalette_Chimecho, + .iconSprite = gMonIcon_Chimecho, + .iconPalIndex = 0, FOOTPRINT(Chimecho) - LEARNSETS(Chimecho), + .levelUpLearnset = sChimechoLevelUpLearnset, + .teachableLearnset = sChimechoTeachableLearnset, }, #endif //P_FAMILY_CHIMECHO @@ -6950,7 +7644,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Absol) - LEARNSETS(Absol), + .levelUpLearnset = sAbsolLevelUpLearnset, + .teachableLearnset = sAbsolTeachableLearnset, .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, @@ -6968,16 +7663,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "the sky and the land to predict natural\n" "disasters. It is a long-lived Pokémon that\n" "has a life-span of 100 years."), - FRONT_PIC(Absol, 56, 64), + .frontPic = gMonFrontPic_Absol, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Absol, .frontAnimId = ANIM_CIRCULAR_VIBRATE, .frontAnimDelay = 45, - BACK_PIC(Absol, 64, 64), + .backPic = gMonBackPic_Absol, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Absol), - ICON(Absol, 0), + .palette = gMonPalette_Absol, + .shinyPalette = gMonShinyPalette_Absol, + .iconSprite = gMonIcon_Absol, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -7002,7 +7701,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Absol) - LEARNSETS(Absol), + .levelUpLearnset = sAbsolLevelUpLearnset, + .teachableLearnset = sAbsolTeachableLearnset, .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, .baseHP = 65, @@ -7020,15 +7720,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "its fur bristles. What you see on its back\n" "are not true wings, and this Pokémon isn't\n" "able to fly."), - FRONT_PIC(AbsolMega, 64, 64), + .frontPic = gMonFrontPic_AbsolMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_AbsolMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AbsolMega, 64, 64), + .backPic = gMonBackPic_AbsolMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(AbsolMega), - ICON(AbsolMega, 0), + .palette = gMonPalette_AbsolMega, + .shinyPalette = gMonShinyPalette_AbsolMega, + .iconSprite = gMonIcon_AbsolMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -7070,18 +7774,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Snorunt, 32, 40), + .frontPic = gMonFrontPic_Snorunt, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Snorunt, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .frontAnimDelay = 20, - BACK_PIC(Snorunt, 56, 48), + .backPic = gMonBackPic_Snorunt, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Snorunt), - ICON(Snorunt, 2), + .palette = gMonPalette_Snorunt, + .shinyPalette = gMonShinyPalette_Snorunt, + .iconSprite = gMonIcon_Snorunt, + .iconPalIndex = 2, FOOTPRINT(Snorunt) - LEARNSETS(Snorunt), + .levelUpLearnset = sSnoruntLevelUpLearnset, + .teachableLearnset = sSnoruntTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE}, {EVO_ITEM_FEMALE, ITEM_DAWN_STONE, SPECIES_FROSLASS}), }, @@ -7101,7 +7810,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_GLALIE, .categoryName = _("Face"), FOOTPRINT(Glalie) - LEARNSETS(Glalie), + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, .formSpeciesIdTable = sGlalieFormSpeciesIdTable, .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, @@ -7124,16 +7834,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 344, .trainerOffset = 0, - FRONT_PIC(Glalie, 56, 56), + .frontPic = gMonFrontPic_Glalie, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Glalie, .frontAnimId = ANIM_ZIGZAG_FAST, .enemyMonElevation = 12, - BACK_PIC(Glalie, 64, 48), + .backPic = gMonBackPic_Glalie, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Glalie), - ICON(Glalie, 0), + .palette = gMonPalette_Glalie, + .shinyPalette = gMonShinyPalette_Glalie, + .iconSprite = gMonIcon_Glalie, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -7152,7 +7866,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_GLALIE, .categoryName = _("Face"), FOOTPRINT(Glalie) - LEARNSETS(Glalie), + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, .formSpeciesIdTable = sGlalieFormSpeciesIdTable, .formChangeTable = sGlalieFormChangeTable, .baseHP = 80, @@ -7174,16 +7889,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 344, .trainerOffset = 0, - FRONT_PIC(GlalieMega, 56, 64), + .frontPic = gMonFrontPic_GlalieMega, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_GlalieMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(GlalieMega, 64, 48), + .backPic = gMonBackPic_GlalieMega, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(GlalieMega), - ICON(GlalieMega, 0), + .palette = gMonPalette_GlalieMega, + .shinyPalette = gMonShinyPalette_GlalieMega, + .iconSprite = gMonIcon_GlalieMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -7223,18 +7942,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Froslass, 48, 48), + .frontPic = gMonFrontPic_Froslass, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Froslass, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 7, - BACK_PIC(Froslass, 64, 64), + .backPic = gMonBackPic_Froslass, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Froslass), - ICON(Froslass, 0), + .palette = gMonPalette_Froslass, + .shinyPalette = gMonShinyPalette_Froslass, + .iconSprite = gMonIcon_Froslass, + .iconPalIndex = 0, FOOTPRINT(Froslass) - LEARNSETS(Froslass), + .levelUpLearnset = sFroslassLevelUpLearnset, + .teachableLearnset = sFroslassTeachableLearnset, }, #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SNORUNT @@ -7274,18 +7998,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spheal, 40, 48), + .frontPic = gMonFrontPic_Spheal, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Spheal, .frontAnimId = ANIM_SPIN_LONG, .frontAnimDelay = 15, - BACK_PIC(Spheal, 48, 40), + .backPic = gMonBackPic_Spheal, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Spheal), - ICON(Spheal, 2), + .palette = gMonPalette_Spheal, + .shinyPalette = gMonShinyPalette_Spheal, + .iconSprite = gMonIcon_Spheal, + .iconPalIndex = 2, FOOTPRINT(Spheal) - LEARNSETS(Spheal), + .levelUpLearnset = sSphealLevelUpLearnset, + .teachableLearnset = sSphealTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_SEALEO}), }, @@ -7323,17 +8052,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sealeo, 56, 48), + .frontPic = gMonFrontPic_Sealeo, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sealeo, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Sealeo, 64, 48), + .backPic = gMonBackPic_Sealeo, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Sealeo), - ICON(Sealeo, 2), + .palette = gMonPalette_Sealeo, + .shinyPalette = gMonShinyPalette_Sealeo, + .iconSprite = gMonIcon_Sealeo, + .iconPalIndex = 2, FOOTPRINT(Sealeo) - LEARNSETS(Sealeo), + .levelUpLearnset = sSealeoLevelUpLearnset, + .teachableLearnset = sSealeoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 44, SPECIES_WALREIN}), }, @@ -7377,17 +8111,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Walrein, 64, 64), + .frontPic = gMonFrontPic_Walrein, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Walrein, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Walrein, 64, 64), + .backPic = gMonBackPic_Walrein, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Walrein), - ICON(Walrein, 0), + .palette = gMonPalette_Walrein, + .shinyPalette = gMonShinyPalette_Walrein, + .iconSprite = gMonIcon_Walrein, + .iconPalIndex = 0, FOOTPRINT(Walrein) - LEARNSETS(Walrein), + .levelUpLearnset = sWalreinLevelUpLearnset, + .teachableLearnset = sWalreinTeachableLearnset, }, #endif //P_FAMILY_SPHEAL @@ -7428,17 +8167,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clamperl, 40, 48), + .frontPic = gMonFrontPic_Clamperl, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Clamperl, .frontAnimId = ANIM_TWIST, - BACK_PIC(Clamperl, 56, 40), + .backPic = gMonBackPic_Clamperl, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Clamperl), - ICON(Clamperl, 0), + .palette = gMonPalette_Clamperl, + .shinyPalette = gMonShinyPalette_Clamperl, + .iconSprite = gMonIcon_Clamperl, + .iconPalIndex = 0, FOOTPRINT(Clamperl) - LEARNSETS(Clamperl), + .levelUpLearnset = sClamperlLevelUpLearnset, + .teachableLearnset = sClamperlTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}, {EVO_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, @@ -7481,17 +8225,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Huntail, 64, 64), + .frontPic = gMonFrontPic_Huntail, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Huntail, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Huntail, 64, 56), + .backPic = gMonBackPic_Huntail, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Huntail), - ICON(Huntail, 0), + .palette = gMonPalette_Huntail, + .shinyPalette = gMonShinyPalette_Huntail, + .iconSprite = gMonIcon_Huntail, + .iconPalIndex = 0, FOOTPRINT(Huntail) - LEARNSETS(Huntail), + .levelUpLearnset = sHuntailLevelUpLearnset, + .teachableLearnset = sHuntailTeachableLearnset, }, [SPECIES_GOREBYSS] = @@ -7529,17 +8278,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gorebyss, 64, 56), + .frontPic = gMonFrontPic_Gorebyss, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Gorebyss, .frontAnimId = ANIM_V_SLIDE_WOBBLE, - BACK_PIC(Gorebyss, 64, 56), + .backPic = gMonBackPic_Gorebyss, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Gorebyss), - ICON(Gorebyss, 0), + .palette = gMonPalette_Gorebyss, + .shinyPalette = gMonShinyPalette_Gorebyss, + .iconSprite = gMonIcon_Gorebyss, + .iconPalIndex = 0, FOOTPRINT(Gorebyss) - LEARNSETS(Gorebyss), + .levelUpLearnset = sGorebyssLevelUpLearnset, + .teachableLearnset = sGorebyssTeachableLearnset, }, #endif //P_FAMILY_CLAMPERL @@ -7580,19 +8334,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Relicanth, 56, 56), - FRONT_PIC_FEMALE(Relicanth, 56, 56), + .frontPic = gMonFrontPic_Relicanth, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_RelicanthF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Relicanth, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Relicanth, 64, 40), - BACK_PIC_FEMALE(Relicanth, 64, 40), + .backPic = gMonBackPic_Relicanth, + .backPicSize = MON_COORDS_SIZE(64, 40), + .backPicFemale = gMonBackPic_RelicanthF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Relicanth), - ICON(Relicanth, 2), + .palette = gMonPalette_Relicanth, + .shinyPalette = gMonShinyPalette_Relicanth, + .iconSprite = gMonIcon_Relicanth, + .iconPalIndex = 2, FOOTPRINT(Relicanth) - LEARNSETS(Relicanth), + .levelUpLearnset = sRelicanthLevelUpLearnset, + .teachableLearnset = sRelicanthTeachableLearnset, }, #endif //P_FAMILY_RELICANTH @@ -7632,17 +8393,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Luvdisc, 32, 40), + .frontPic = gMonFrontPic_Luvdisc, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Luvdisc, .frontAnimId = ANIM_H_SLIDE_WOBBLE, - BACK_PIC(Luvdisc, 40, 48), + .backPic = gMonBackPic_Luvdisc, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SPRING_REPEATED, - PALETTES(Luvdisc), - ICON(Luvdisc, 0), + .palette = gMonPalette_Luvdisc, + .shinyPalette = gMonShinyPalette_Luvdisc, + .iconSprite = gMonIcon_Luvdisc, + .iconPalIndex = 0, FOOTPRINT(Luvdisc) - LEARNSETS(Luvdisc), + .levelUpLearnset = sLuvdiscLevelUpLearnset, + .teachableLearnset = sLuvdiscTeachableLearnset, }, #endif //P_FAMILY_LUVDISC @@ -7682,17 +8448,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bagon, 32, 48), + .frontPic = gMonFrontPic_Bagon, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Bagon, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Bagon, 48, 56), + .backPic = gMonBackPic_Bagon, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Bagon), - ICON(Bagon, 0), + .palette = gMonPalette_Bagon, + .shinyPalette = gMonShinyPalette_Bagon, + .iconSprite = gMonIcon_Bagon, + .iconPalIndex = 0, FOOTPRINT(Bagon) - LEARNSETS(Bagon), + .levelUpLearnset = sBagonLevelUpLearnset, + .teachableLearnset = sBagonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SHELGON}), }, @@ -7731,17 +8502,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shelgon, 48, 48), + .frontPic = gMonFrontPic_Shelgon, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Shelgon, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Shelgon, 64, 40), + .backPic = gMonBackPic_Shelgon, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Shelgon), - ICON(Shelgon, 2), + .palette = gMonPalette_Shelgon, + .shinyPalette = gMonShinyPalette_Shelgon, + .iconSprite = gMonIcon_Shelgon, + .iconPalIndex = 2, FOOTPRINT(Shelgon) - LEARNSETS(Shelgon), + .levelUpLearnset = sShelgonLevelUpLearnset, + .teachableLearnset = sShelgonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_SALAMENCE}), }, @@ -7761,7 +8537,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SALAMENCE, .categoryName = _("Dragon"), FOOTPRINT(Salamence) - LEARNSETS(Salamence), + .levelUpLearnset = sSalamenceLevelUpLearnset, + .teachableLearnset = sSalamenceTeachableLearnset, .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, @@ -7790,16 +8567,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Salamence, 64, 64), + .frontPic = gMonFrontPic_Salamence, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Salamence, .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 70, - BACK_PIC(Salamence, 56, 64), + .backPic = gMonBackPic_Salamence, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Salamence), - ICON(Salamence, 0), + .palette = gMonPalette_Salamence, + .shinyPalette = gMonShinyPalette_Salamence, + .iconSprite = gMonIcon_Salamence, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -7819,7 +8600,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_SALAMENCE, .categoryName = _("Dragon"), FOOTPRINT(Salamence) - LEARNSETS(Salamence), + .levelUpLearnset = sSalamenceLevelUpLearnset, + .teachableLearnset = sSalamenceTeachableLearnset, .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, .formChangeTable = sSalamenceFormChangeTable, .baseHP = 95, @@ -7842,15 +8624,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SalamenceMega, 64, 64), + .frontPic = gMonFrontPic_SalamenceMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_SalamenceMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SalamenceMega, 56, 64), + .backPic = gMonBackPic_SalamenceMega, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(SalamenceMega), - ICON(SalamenceMega, 0), + .palette = gMonPalette_SalamenceMega, + .shinyPalette = gMonShinyPalette_SalamenceMega, + .iconSprite = gMonIcon_SalamenceMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -7892,18 +8678,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -1, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Beldum, 48, 40), + .frontPic = gMonFrontPic_Beldum, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Beldum, .frontAnimId = ANIM_H_SHAKE, .enemyMonElevation = 8, - BACK_PIC(Beldum, 64, 48), + .backPic = gMonBackPic_Beldum, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Beldum), - ICON(Beldum, 0), + .palette = gMonPalette_Beldum, + .shinyPalette = gMonShinyPalette_Beldum, + .iconSprite = gMonIcon_Beldum, + .iconPalIndex = 0, FOOTPRINT(Beldum) - LEARNSETS(Beldum), + .levelUpLearnset = sBeldumLevelUpLearnset, + .teachableLearnset = sBeldumTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_METANG}), }, @@ -7943,17 +8734,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Metang, 64, 48), + .frontPic = gMonFrontPic_Metang, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Metang, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Metang, 64, 40), + .backPic = gMonBackPic_Metang, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Metang), - ICON(Metang, 0), + .palette = gMonPalette_Metang, + .shinyPalette = gMonShinyPalette_Metang, + .iconSprite = gMonIcon_Metang, + .iconPalIndex = 0, FOOTPRINT(Metang) - LEARNSETS(Metang), + .levelUpLearnset = sMetangLevelUpLearnset, + .teachableLearnset = sMetangTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_METAGROSS}), }, @@ -7973,7 +8769,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_METAGROSS, .categoryName = _("Iron Leg"), FOOTPRINT(Metagross) - LEARNSETS(Metagross), + .levelUpLearnset = sMetagrossLevelUpLearnset, + .teachableLearnset = sMetagrossTeachableLearnset, .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, @@ -8002,15 +8799,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 447, .trainerOffset = 9, - FRONT_PIC(Metagross, 64, 48), + .frontPic = gMonFrontPic_Metagross, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Metagross, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Metagross, 64, 56), + .backPic = gMonBackPic_Metagross, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Metagross), - ICON(Metagross, 0), + .palette = gMonPalette_Metagross, + .shinyPalette = gMonShinyPalette_Metagross, + .iconSprite = gMonIcon_Metagross, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -8030,7 +8831,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_METAGROSS, .categoryName = _("Iron Leg"), FOOTPRINT(Metagross) - LEARNSETS(Metagross), + .levelUpLearnset = sMetagrossLevelUpLearnset, + .teachableLearnset = sMetagrossTeachableLearnset, .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, .formChangeTable = sMetagrossFormChangeTable, .baseHP = 80, @@ -8052,16 +8854,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 4, .trainerScale = 447, .trainerOffset = 9, - FRONT_PIC(MetagrossMega, 64, 64), + .frontPic = gMonFrontPic_MetagrossMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MetagrossMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(MetagrossMega, 64, 56), + .backPic = gMonBackPic_MetagrossMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(MetagrossMega), - ICON(MetagrossMega, 0), + .palette = gMonPalette_MetagrossMega, + .shinyPalette = gMonShinyPalette_MetagrossMega, + .iconSprite = gMonIcon_MetagrossMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -8110,17 +8916,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 2, .trainerScale = 309, .trainerOffset = 1, - FRONT_PIC(Regirock, 64, 64), + .frontPic = gMonFrontPic_Regirock, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Regirock, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Regirock, 64, 56), + .backPic = gMonBackPic_Regirock, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Regirock), - ICON(Regirock, 2), + .palette = gMonPalette_Regirock, + .shinyPalette = gMonShinyPalette_Regirock, + .iconSprite = gMonIcon_Regirock, + .iconPalIndex = 2, FOOTPRINT(Regirock) - LEARNSETS(Regirock), + .levelUpLearnset = sRegirockLevelUpLearnset, + .teachableLearnset = sRegirockTeachableLearnset, }, #endif //P_FAMILY_REGIROCK @@ -8166,17 +8977,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 301, .trainerOffset = 2, - FRONT_PIC(Regice, 64, 64), + .frontPic = gMonFrontPic_Regice, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Regice, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Regice, 64, 48), + .backPic = gMonBackPic_Regice, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Regice), - ICON(Regice, 0), + .palette = gMonPalette_Regice, + .shinyPalette = gMonShinyPalette_Regice, + .iconSprite = gMonIcon_Regice, + .iconPalIndex = 0, FOOTPRINT(Regice) - LEARNSETS(Regice), + .levelUpLearnset = sRegiceLevelUpLearnset, + .teachableLearnset = sRegiceTeachableLearnset, }, #endif //P_FAMILY_REGICE @@ -8223,17 +9039,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 359, .trainerOffset = 6, - FRONT_PIC(Registeel, 64, 56), + .frontPic = gMonFrontPic_Registeel, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Registeel, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Registeel, 64, 48), + .backPic = gMonBackPic_Registeel, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Registeel), - ICON(Registeel, 2), + .palette = gMonPalette_Registeel, + .shinyPalette = gMonShinyPalette_Registeel, + .iconSprite = gMonIcon_Registeel, + .iconPalIndex = 2, FOOTPRINT(Registeel) - LEARNSETS(Registeel), + .levelUpLearnset = sRegisteelLevelUpLearnset, + .teachableLearnset = sRegisteelTeachableLearnset, }, #endif //P_FAMILY_REGISTEEL @@ -8252,7 +9073,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_LATIAS, .categoryName = _("Eon"), FOOTPRINT(Latias) - LEARNSETS(Latias), + .levelUpLearnset = sLatiasLevelUpLearnset, + .teachableLearnset = sLatiasTeachableLearnset, .formSpeciesIdTable = sLatiasFormSpeciesIdTable, .formChangeTable = sLatiasFormChangeTable, .isLegendary = TRUE, @@ -8283,16 +9105,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Latias, 64, 48), + .frontPic = gMonFrontPic_Latias, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Latias, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 12, - BACK_PIC(Latias, 56, 64), + .backPic = gMonBackPic_Latias, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Latias), - ICON(Latias, 0), + .palette = gMonPalette_Latias, + .shinyPalette = gMonShinyPalette_Latias, + .iconSprite = gMonIcon_Latias, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -8310,7 +9136,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_LATIAS, .categoryName = _("Eon"), FOOTPRINT(Latias) - LEARNSETS(Latias), + .levelUpLearnset = sLatiasLevelUpLearnset, + .teachableLearnset = sLatiasTeachableLearnset, .formSpeciesIdTable = sLatiasFormSpeciesIdTable, .formChangeTable = sLatiasFormChangeTable, .isLegendary = TRUE, @@ -8335,16 +9162,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(LatiasMega, 64, 64), + .frontPic = gMonFrontPic_LatiasMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiasMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(LatiasMega, 64, 64), + .backPic = gMonBackPic_LatiasMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(LatiasMega), - ICON(LatiasMega, 2), + .palette = gMonPalette_LatiasMega, + .shinyPalette = gMonShinyPalette_LatiasMega, + .iconSprite = gMonIcon_LatiasMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -8366,7 +9197,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_LATIOS, .categoryName = _("Eon"), FOOTPRINT(Latios) - LEARNSETS(Latios), + .levelUpLearnset = sLatiosLevelUpLearnset, + .teachableLearnset = sLatiosTeachableLearnset, .formSpeciesIdTable = sLatiosFormSpeciesIdTable, .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, @@ -8396,16 +9228,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 294, .trainerOffset = 3, - FRONT_PIC(Latios, 64, 64), + .frontPic = gMonFrontPic_Latios, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Latios, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, .enemyMonElevation = 6, - BACK_PIC(Latios, 56, 64), + .backPic = gMonBackPic_Latios, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Latios), - ICON(Latios, 0), + .palette = gMonPalette_Latios, + .shinyPalette = gMonShinyPalette_Latios, + .iconSprite = gMonIcon_Latios, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -8424,7 +9260,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_LATIOS, .categoryName = _("Eon"), FOOTPRINT(Latios) - LEARNSETS(Latios), + .levelUpLearnset = sLatiosLevelUpLearnset, + .teachableLearnset = sLatiosTeachableLearnset, .formSpeciesIdTable = sLatiosFormSpeciesIdTable, .formChangeTable = sLatiosFormChangeTable, .baseHP = 80, @@ -8448,16 +9285,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 294, .trainerOffset = 3, - FRONT_PIC(LatiosMega, 64, 64), + .frontPic = gMonFrontPic_LatiosMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiosMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(LatiosMega, 64, 64), + .backPic = gMonBackPic_LatiosMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(LatiosMega), - ICON(LatiosMega, 2), + .palette = gMonPalette_LatiosMega, + .shinyPalette = gMonShinyPalette_LatiosMega, + .iconSprite = gMonIcon_LatiosMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -8480,7 +9321,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_KYOGRE, .categoryName = _("Sea Basin"), FOOTPRINT(Kyogre) - LEARNSETS(Kyogre), + .levelUpLearnset = sKyogreLevelUpLearnset, + .teachableLearnset = sKyogreTeachableLearnset, .formSpeciesIdTable = sKyogreFormSpeciesIdTable, .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, @@ -8509,16 +9351,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 614, .trainerOffset = 13, - FRONT_PIC(Kyogre, 64, 64), + .frontPic = gMonFrontPic_Kyogre, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Kyogre, .frontAnimId = ANIM_SWING_CONCAVE_FAST_SHORT, .frontAnimDelay = 60, - BACK_PIC(Kyogre, 64, 32), + .backPic = gMonBackPic_Kyogre, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Kyogre), - ICON(Kyogre, 2), + .palette = gMonPalette_Kyogre, + .shinyPalette = gMonShinyPalette_Kyogre, + .iconSprite = gMonIcon_Kyogre, + .iconPalIndex = 2, }, #if P_PRIMAL_REVERSIONS [SPECIES_KYOGRE_PRIMAL] = @@ -8537,7 +9383,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_KYOGRE, .categoryName = _("Sea Basin"), FOOTPRINT(Kyogre) - LEARNSETS(Kyogre), + .levelUpLearnset = sKyogreLevelUpLearnset, + .teachableLearnset = sKyogreTeachableLearnset, .formSpeciesIdTable = sKyogreFormSpeciesIdTable, .formChangeTable = sKyogreFormChangeTable, .baseHP = 100, @@ -8560,15 +9407,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 515, .trainerOffset = 14, - FRONT_PIC(KyogrePrimal, 64, 64), + .frontPic = gMonFrontPic_KyogrePrimal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KyogrePrimal, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(KyogrePrimal, 64, 32), + .backPic = gMonBackPic_KyogrePrimal, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(KyogrePrimal), - ICON(KyogrePrimal, 0), + .palette = gMonPalette_KyogrePrimal, + .shinyPalette = gMonShinyPalette_KyogrePrimal, + .iconSprite = gMonIcon_KyogrePrimal, + .iconPalIndex = 0, .isPrimalReversion = TRUE, }, #endif //P_PRIMAL_REVERSIONS @@ -8591,7 +9442,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_GROUDON, .categoryName = _("Continent"), FOOTPRINT(Groudon) - LEARNSETS(Groudon), + .levelUpLearnset = sGroudonLevelUpLearnset, + .teachableLearnset = sGroudonTeachableLearnset, .formSpeciesIdTable = sGroudonFormSpeciesIdTable, .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, @@ -8620,15 +9472,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 515, .trainerOffset = 14, - FRONT_PIC(Groudon, 64, 64), + .frontPic = gMonFrontPic_Groudon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Groudon, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Groudon, 64, 48), + .backPic = gMonBackPic_Groudon, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Groudon), - ICON(Groudon, 0), + .palette = gMonPalette_Groudon, + .shinyPalette = gMonShinyPalette_Groudon, + .iconSprite = gMonIcon_Groudon, + .iconPalIndex = 0, }, #if P_PRIMAL_REVERSIONS @@ -8648,7 +9504,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_GROUDON, .categoryName = _("Continent"), FOOTPRINT(Groudon) - LEARNSETS(Groudon), + .levelUpLearnset = sGroudonLevelUpLearnset, + .teachableLearnset = sGroudonTeachableLearnset, .formSpeciesIdTable = sGroudonFormSpeciesIdTable, .formChangeTable = sGroudonFormChangeTable, .baseHP = 100, @@ -8671,7 +9528,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 515, .trainerOffset = 14, - FRONT_PIC(GroudonPrimal, 64, 64), + .frontPic = gMonFrontPic_GroudonPrimal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GroudonPrimal, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8679,8 +9537,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(GroudonPrimal), - ICON(GroudonPrimal, 0), + .palette = gMonPalette_GroudonPrimal, + .shinyPalette = gMonShinyPalette_GroudonPrimal, + .iconSprite = gMonIcon_GroudonPrimal, + .iconPalIndex = 0, .isPrimalReversion = TRUE, }, #endif //P_PRIMAL_REVERSIONS @@ -8704,7 +9564,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_RAYQUAZA, .categoryName = _("Sky High"), FOOTPRINT(Rayquaza) - LEARNSETS(Rayquaza), + .levelUpLearnset = sRayquazaLevelUpLearnset, + .teachableLearnset = sRayquazaTeachableLearnset, .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, .formChangeTable = sRayquazaFormChangeTable, .isLegendary = TRUE, @@ -8733,17 +9594,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 448, .trainerOffset = 12, - FRONT_PIC(Rayquaza, 64, 64), + .frontPic = gMonFrontPic_Rayquaza, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Rayquaza, .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 60, .enemyMonElevation = 6, - BACK_PIC(Rayquaza, 64, 64), + .backPic = gMonBackPic_Rayquaza, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Rayquaza), - ICON(Rayquaza, 1), + .palette = gMonPalette_Rayquaza, + .shinyPalette = gMonShinyPalette_Rayquaza, + .iconSprite = gMonIcon_Rayquaza, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -8764,7 +9629,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .natDexNum = NATIONAL_DEX_RAYQUAZA, .categoryName = _("Sky High"), FOOTPRINT(Rayquaza) - LEARNSETS(Rayquaza), + .levelUpLearnset = sRayquazaLevelUpLearnset, + .teachableLearnset = sRayquazaTeachableLearnset, .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, .formChangeTable = sRayquazaFormChangeTable, .isLegendary = TRUE, @@ -8787,16 +9653,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 0, .trainerScale = 448, .trainerOffset = 12, - FRONT_PIC(RayquazaMega, 64, 64), + .frontPic = gMonFrontPic_RayquazaMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RayquazaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(RayquazaMega, 64, 64), + .backPic = gMonBackPic_RayquazaMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(RayquazaMega), - ICON(RayquazaMega, 1), + .palette = gMonPalette_RayquazaMega, + .shinyPalette = gMonShinyPalette_RayquazaMega, + .iconSprite = gMonIcon_RayquazaMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -8846,18 +9716,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Jirachi, 56, 48), + .frontPic = gMonFrontPic_Jirachi, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Jirachi, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 14, - BACK_PIC(Jirachi, 64, 56), + .backPic = gMonBackPic_Jirachi, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Jirachi), - ICON(Jirachi, 0), + .palette = gMonPalette_Jirachi, + .shinyPalette = gMonShinyPalette_Jirachi, + .iconSprite = gMonIcon_Jirachi, + .iconPalIndex = 0, FOOTPRINT(Jirachi) - LEARNSETS(Jirachi), + .levelUpLearnset = sJirachiLevelUpLearnset, + .teachableLearnset = sJirachiTeachableLearnset, }, #endif //P_FAMILY_JIRACHI @@ -8905,16 +9780,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .evYield_Attack = 1, .evYield_Speed = 1, .evYield_SpAttack = 1, - FRONT_PIC(DeoxysNormal, 64, 64), + .frontPic = gMonFrontPic_DeoxysNormal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DeoxysNormal, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(DeoxysNormal, 64, 56), + .backPic = gMonBackPic_DeoxysNormal, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(DeoxysNormal), - ICON(DeoxysNormal, 0), - LEARNSETS(DeoxysNormal), + .palette = gMonPalette_DeoxysNormal, + .shinyPalette = gMonShinyPalette_DeoxysNormal, + .iconSprite = gMonIcon_DeoxysNormal, + .iconPalIndex = 0, + .levelUpLearnset = sDeoxysNormalLevelUpLearnset, + .teachableLearnset = sDeoxysNormalTeachableLearnset, .formChangeTable = sDeoxysNormalFormChangeTable, }, @@ -8952,16 +9832,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 20, .evYield_Attack = 2, .evYield_SpAttack = 1, - FRONT_PIC(DeoxysAttack, 64, 64), + .frontPic = gMonFrontPic_DeoxysAttack, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DeoxysAttack, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(DeoxysAttack, 64, 64), + .backPic = gMonBackPic_DeoxysAttack, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(DeoxysAttack), - ICON(DeoxysAttack, 0), - LEARNSETS(DeoxysAttack), + .palette = gMonPalette_DeoxysAttack, + .shinyPalette = gMonShinyPalette_DeoxysAttack, + .iconSprite = gMonIcon_DeoxysAttack, + .iconPalIndex = 0, + .levelUpLearnset = sDeoxysAttackLevelUpLearnset, + .teachableLearnset = sDeoxysAttackTeachableLearnset, .formChangeTable = sDeoxysAttackFormChangeTable, }, @@ -8999,16 +9884,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 160, .evYield_Defense = 2, .evYield_SpDefense = 1, - FRONT_PIC(DeoxysDefense, 56, 64), + .frontPic = gMonFrontPic_DeoxysDefense, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DeoxysDefense, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(DeoxysDefense, 64, 56), + .backPic = gMonBackPic_DeoxysDefense, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(DeoxysDefense), - ICON(DeoxysDefense, 0), - LEARNSETS(DeoxysDefense), + .palette = gMonPalette_DeoxysDefense, + .shinyPalette = gMonShinyPalette_DeoxysDefense, + .iconSprite = gMonIcon_DeoxysDefense, + .iconPalIndex = 0, + .levelUpLearnset = sDeoxysDefenseLevelUpLearnset, + .teachableLearnset = sDeoxysDefenseTeachableLearnset, .formChangeTable = sDeoxysDefenseFormChangeTable, }, @@ -9046,16 +9936,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 90, .evYield_Speed = 3, .noFlip = TRUE, - FRONT_PIC(DeoxysSpeed, 64, 64), + .frontPic = gMonFrontPic_DeoxysSpeed, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_DeoxysSpeed, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(DeoxysSpeed, 64, 64), + .backPic = gMonBackPic_DeoxysSpeed, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(DeoxysSpeed), - ICON(DeoxysSpeed, 0), - LEARNSETS(DeoxysSpeed), + .palette = gMonPalette_DeoxysSpeed, + .shinyPalette = gMonShinyPalette_DeoxysSpeed, + .iconSprite = gMonIcon_DeoxysSpeed, + .iconPalIndex = 0, + .levelUpLearnset = sDeoxysSpeedLevelUpLearnset, + .teachableLearnset = sDeoxysSpeedTeachableLearnset, .formChangeTable = sDeoxysSpeedFormChangeTable, }, #endif //P_FAMILY_DEOXYS diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index 4dcd5630f613..93e744b225a3 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Turtwig, 40, 48), + .frontPic = gMonFrontPic_Turtwig, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Turtwig, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Turtwig, 48, 56), + .backPic = gMonBackPic_Turtwig, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Turtwig), - ICON(Turtwig, 1), + .palette = gMonPalette_Turtwig, + .shinyPalette = gMonShinyPalette_Turtwig, + .iconSprite = gMonIcon_Turtwig, + .iconPalIndex = 1, FOOTPRINT(Turtwig) - LEARNSETS(Turtwig), + .levelUpLearnset = sTurtwigLevelUpLearnset, + .teachableLearnset = sTurtwigTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_GROTLE}), }, @@ -87,17 +92,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grotle, 56, 56), + .frontPic = gMonFrontPic_Grotle, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Grotle, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Grotle, 64, 48), + .backPic = gMonBackPic_Grotle, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Grotle), - ICON(Grotle, 1), + .palette = gMonPalette_Grotle, + .shinyPalette = gMonShinyPalette_Grotle, + .iconSprite = gMonIcon_Grotle, + .iconPalIndex = 1, FOOTPRINT(Grotle) - LEARNSETS(Grotle), + .levelUpLearnset = sGrotleLevelUpLearnset, + .teachableLearnset = sGrotleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_TORTERRA}), }, @@ -143,17 +153,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Torterra, 64, 64), + .frontPic = gMonFrontPic_Torterra, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Torterra, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Torterra, 64, 56), + .backPic = gMonBackPic_Torterra, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(Torterra), - ICON(Torterra, 1), + .palette = gMonPalette_Torterra, + .shinyPalette = gMonShinyPalette_Torterra, + .iconSprite = gMonIcon_Torterra, + .iconPalIndex = 1, FOOTPRINT(Torterra) - LEARNSETS(Torterra), + .levelUpLearnset = sTorterraLevelUpLearnset, + .teachableLearnset = sTorterraTeachableLearnset, }, #endif //P_FAMILY_TURTWIG @@ -193,17 +208,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chimchar, 32, 48), + .frontPic = gMonFrontPic_Chimchar, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Chimchar, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Chimchar, 56, 56), + .backPic = gMonBackPic_Chimchar, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Chimchar), - ICON(Chimchar, 1), + .palette = gMonPalette_Chimchar, + .shinyPalette = gMonShinyPalette_Chimchar, + .iconSprite = gMonIcon_Chimchar, + .iconPalIndex = 1, FOOTPRINT(Chimchar) - LEARNSETS(Chimchar), + .levelUpLearnset = sChimcharLevelUpLearnset, + .teachableLearnset = sChimcharTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_MONFERNO}), }, @@ -243,17 +263,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Monferno, 56, 56), + .frontPic = gMonFrontPic_Monferno, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Monferno, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Monferno, 64, 64), + .backPic = gMonBackPic_Monferno, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Monferno), - ICON(Monferno, 0), + .palette = gMonPalette_Monferno, + .shinyPalette = gMonShinyPalette_Monferno, + .iconSprite = gMonIcon_Monferno, + .iconPalIndex = 0, FOOTPRINT(Monferno) - LEARNSETS(Monferno), + .levelUpLearnset = sMonfernoLevelUpLearnset, + .teachableLearnset = sMonfernoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_INFERNAPE}), }, @@ -299,17 +324,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Infernape, 64, 64), + .frontPic = gMonFrontPic_Infernape, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Infernape, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Infernape, 64, 64), + .backPic = gMonBackPic_Infernape, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Infernape), - ICON(Infernape, 0), + .palette = gMonPalette_Infernape, + .shinyPalette = gMonShinyPalette_Infernape, + .iconSprite = gMonIcon_Infernape, + .iconPalIndex = 0, FOOTPRINT(Infernape) - LEARNSETS(Infernape), + .levelUpLearnset = sInfernapeLevelUpLearnset, + .teachableLearnset = sInfernapeTeachableLearnset, }, #endif //P_FAMILY_CHIMCHAR @@ -352,17 +382,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Piplup, 24, 40), + .frontPic = gMonFrontPic_Piplup, + .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Piplup, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Piplup, 40, 48), + .backPic = gMonBackPic_Piplup, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Piplup), - ICON(Piplup, 0), + .palette = gMonPalette_Piplup, + .shinyPalette = gMonShinyPalette_Piplup, + .iconSprite = gMonIcon_Piplup, + .iconPalIndex = 0, FOOTPRINT(Piplup) - LEARNSETS(Piplup), + .levelUpLearnset = sPiplupLevelUpLearnset, + .teachableLearnset = sPiplupTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_PRINPLUP}), }, @@ -404,17 +439,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 10, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Prinplup, 48, 56), + .frontPic = gMonFrontPic_Prinplup, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Prinplup, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Prinplup, 48, 56), + .backPic = gMonBackPic_Prinplup, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Prinplup), - ICON(Prinplup, 0), + .palette = gMonPalette_Prinplup, + .shinyPalette = gMonShinyPalette_Prinplup, + .iconSprite = gMonIcon_Prinplup, + .iconPalIndex = 0, FOOTPRINT(Prinplup) - LEARNSETS(Prinplup), + .levelUpLearnset = sPrinplupLevelUpLearnset, + .teachableLearnset = sPrinplupTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMPOLEON}), }, @@ -462,17 +502,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Empoleon, 64, 64), + .frontPic = gMonFrontPic_Empoleon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Empoleon, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Empoleon, 64, 64), + .backPic = gMonBackPic_Empoleon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Empoleon), - ICON(Empoleon, 0), + .palette = gMonPalette_Empoleon, + .shinyPalette = gMonShinyPalette_Empoleon, + .iconSprite = gMonIcon_Empoleon, + .iconPalIndex = 0, FOOTPRINT(Empoleon) - LEARNSETS(Empoleon), + .levelUpLearnset = sEmpoleonLevelUpLearnset, + .teachableLearnset = sEmpoleonTeachableLearnset, }, #endif //P_FAMILY_PIPLUP @@ -511,19 +556,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Starly, 40, 40), - FRONT_PIC_FEMALE(Starly, 40, 40), + .frontPic = gMonFrontPic_Starly, + .frontPicSize = MON_COORDS_SIZE(40, 40), + .frontPicFemale = gMonFrontPic_StarlyF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Starly, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Starly, 56, 48), - BACK_PIC_FEMALE(Starly, 56, 48), + .backPic = gMonBackPic_Starly, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_StarlyF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Starly), - ICON(Starly, 0), + .palette = gMonPalette_Starly, + .shinyPalette = gMonShinyPalette_Starly, + .iconSprite = gMonIcon_Starly, + .iconPalIndex = 0, FOOTPRINT(Starly) - LEARNSETS(Starly), + .levelUpLearnset = sStarlyLevelUpLearnset, + .teachableLearnset = sStarlyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_STARAVIA}), }, @@ -561,19 +613,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Staravia, 40, 48), - FRONT_PIC_FEMALE(Staravia, 40, 48), + .frontPic = gMonFrontPic_Staravia, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .frontPicFemale = gMonFrontPic_StaraviaF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Staravia, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Staravia, 64, 64), - BACK_PIC_FEMALE(Staravia, 64, 64), + .backPic = gMonBackPic_Staravia, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_StaraviaF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Staravia), - ICON(Staravia, 0), + .palette = gMonPalette_Staravia, + .shinyPalette = gMonShinyPalette_Staravia, + .iconSprite = gMonIcon_Staravia, + .iconPalIndex = 0, FOOTPRINT(Staravia) - LEARNSETS(Staravia), + .levelUpLearnset = sStaraviaLevelUpLearnset, + .teachableLearnset = sStaraviaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_STARAPTOR}), }, @@ -619,18 +678,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Staraptor, 56, 64), - FRONT_PIC_FEMALE(Staraptor, 56, 64), + .frontPic = gMonFrontPic_Staraptor, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_StaraptorF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Staraptor, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Staraptor, 64, 64), + .backPic = gMonBackPic_Staraptor, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Staraptor), - ICON(Staraptor, 0), + .palette = gMonPalette_Staraptor, + .shinyPalette = gMonShinyPalette_Staraptor, + .iconSprite = gMonIcon_Staraptor, + .iconPalIndex = 0, FOOTPRINT(Staraptor) - LEARNSETS(Staraptor), + .levelUpLearnset = sStaraptorLevelUpLearnset, + .teachableLearnset = sStaraptorTeachableLearnset, }, #endif //P_FAMILY_STARLY @@ -669,19 +734,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bidoof, 40, 40), - FRONT_PIC_FEMALE(Bidoof, 40, 40), + .frontPic = gMonFrontPic_Bidoof, + .frontPicSize = MON_COORDS_SIZE(40, 40), + .frontPicFemale = gMonFrontPic_BidoofF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Bidoof, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Bidoof, 64, 40), - BACK_PIC_FEMALE(Bidoof, 64, 40), + .backPic = gMonBackPic_Bidoof, + .backPicSize = MON_COORDS_SIZE(64, 40), + .backPicFemale = gMonBackPic_BidoofF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Bidoof), - ICON(Bidoof, 2), + .palette = gMonPalette_Bidoof, + .shinyPalette = gMonShinyPalette_Bidoof, + .iconSprite = gMonIcon_Bidoof, + .iconPalIndex = 2, FOOTPRINT(Bidoof) - LEARNSETS(Bidoof), + .levelUpLearnset = sBidoofLevelUpLearnset, + .teachableLearnset = sBidoofTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_BIBAREL}), }, @@ -719,18 +791,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 8, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Bibarel, 56, 48), - FRONT_PIC_FEMALE(Bibarel, 56, 48), + .frontPic = gMonFrontPic_Bibarel, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .frontPicFemale = gMonFrontPic_BibarelF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Bibarel, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Bibarel, 64, 56), + .backPic = gMonBackPic_Bibarel, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Bibarel), - ICON(Bibarel, 2), + .palette = gMonPalette_Bibarel, + .shinyPalette = gMonShinyPalette_Bibarel, + .iconSprite = gMonIcon_Bibarel, + .iconPalIndex = 2, FOOTPRINT(Bibarel) - LEARNSETS(Bibarel), + .levelUpLearnset = sBibarelLevelUpLearnset, + .teachableLearnset = sBibarelTeachableLearnset, }, #endif //P_FAMILY_BIDOOF @@ -770,19 +848,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kricketot, 48, 48), - FRONT_PIC_FEMALE(Kricketot, 48, 48), + .frontPic = gMonFrontPic_Kricketot, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_KricketotF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Kricketot, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Kricketot, 48, 56), - BACK_PIC_FEMALE(Kricketot, 48, 56), + .backPic = gMonBackPic_Kricketot, + .backPicSize = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_KricketotF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Kricketot), - ICON(Kricketot, 2), + .palette = gMonPalette_Kricketot, + .shinyPalette = gMonShinyPalette_Kricketot, + .iconSprite = gMonIcon_Kricketot, + .iconPalIndex = 2, FOOTPRINT(Kricketot) - LEARNSETS(Kricketot), + .levelUpLearnset = sKricketotLevelUpLearnset, + .teachableLearnset = sKricketotTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_KRICKETUNE}), }, @@ -822,19 +907,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 8, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Kricketune, 56, 56), - FRONT_PIC_FEMALE(Kricketune, 56, 56), + .frontPic = gMonFrontPic_Kricketune, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_KricketuneF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Kricketune, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Kricketune, 56, 64), - BACK_PIC_FEMALE(Kricketune, 56, 64), + .backPic = gMonBackPic_Kricketune, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_KricketuneF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Kricketune), - ICON(Kricketune, 2), + .palette = gMonPalette_Kricketune, + .shinyPalette = gMonShinyPalette_Kricketune, + .iconSprite = gMonIcon_Kricketune, + .iconPalIndex = 2, FOOTPRINT(Kricketune) - LEARNSETS(Kricketune), + .levelUpLearnset = sKricketuneLevelUpLearnset, + .teachableLearnset = sKricketuneTeachableLearnset, }, #endif //P_FAMILY_KRICKETOT @@ -873,19 +965,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shinx, 48, 40), - FRONT_PIC_FEMALE(Shinx, 48, 40), + .frontPic = gMonFrontPic_Shinx, + .frontPicSize = MON_COORDS_SIZE(48, 40), + .frontPicFemale = gMonFrontPic_ShinxF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shinx, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Shinx, 64, 48), - BACK_PIC_FEMALE(Shinx, 64, 48), + .backPic = gMonBackPic_Shinx, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_ShinxF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Shinx), - ICON(Shinx, 0), + .palette = gMonPalette_Shinx, + .shinyPalette = gMonShinyPalette_Shinx, + .iconSprite = gMonIcon_Shinx, + .iconPalIndex = 0, FOOTPRINT(Shinx) - LEARNSETS(Shinx), + .levelUpLearnset = sShinxLevelUpLearnset, + .teachableLearnset = sShinxTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_LUXIO}), }, @@ -923,19 +1022,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Luxio, 48, 48), - FRONT_PIC_FEMALE(Luxio, 48, 48), + .frontPic = gMonFrontPic_Luxio, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_LuxioF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Luxio, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Luxio, 64, 64), - BACK_PIC_FEMALE(Luxio, 64, 64), + .backPic = gMonBackPic_Luxio, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_LuxioF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Luxio), - ICON(Luxio, 0), + .palette = gMonPalette_Luxio, + .shinyPalette = gMonShinyPalette_Luxio, + .iconSprite = gMonIcon_Luxio, + .iconPalIndex = 0, FOOTPRINT(Luxio) - LEARNSETS(Luxio), + .levelUpLearnset = sLuxioLevelUpLearnset, + .teachableLearnset = sLuxioTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_LUXRAY}), }, @@ -979,19 +1085,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Luxray, 64, 64), - FRONT_PIC_FEMALE(Luxray, 64, 64), + .frontPic = gMonFrontPic_Luxray, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_LuxrayF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Luxray, .frontAnimId = ANIM_GLOW_YELLOW, - BACK_PIC(Luxray, 64, 64), - BACK_PIC_FEMALE(Luxray, 64, 64), + .backPic = gMonBackPic_Luxray, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_LuxrayF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Luxray), - ICON(Luxray, 0), + .palette = gMonPalette_Luxray, + .shinyPalette = gMonShinyPalette_Luxray, + .iconSprite = gMonIcon_Luxray, + .iconPalIndex = 0, FOOTPRINT(Luxray) - LEARNSETS(Luxray), + .levelUpLearnset = sLuxrayLevelUpLearnset, + .teachableLearnset = sLuxrayTeachableLearnset, }, #endif //P_FAMILY_SHINX @@ -1030,17 +1143,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cranidos, 48, 48), + .frontPic = gMonFrontPic_Cranidos, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Cranidos, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Cranidos, 64, 56), + .backPic = gMonBackPic_Cranidos, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Cranidos), - ICON(Cranidos, 0), + .palette = gMonPalette_Cranidos, + .shinyPalette = gMonShinyPalette_Cranidos, + .iconSprite = gMonIcon_Cranidos, + .iconPalIndex = 0, FOOTPRINT(Cranidos) - LEARNSETS(Cranidos), + .levelUpLearnset = sCranidosLevelUpLearnset, + .teachableLearnset = sCranidosTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_RAMPARDOS}), }, @@ -1078,17 +1196,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Rampardos, 64, 64), + .frontPic = gMonFrontPic_Rampardos, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Rampardos, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Rampardos, 64, 64), + .backPic = gMonBackPic_Rampardos, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Rampardos), - ICON(Rampardos, 0), + .palette = gMonPalette_Rampardos, + .shinyPalette = gMonShinyPalette_Rampardos, + .iconSprite = gMonIcon_Rampardos, + .iconPalIndex = 0, FOOTPRINT(Rampardos) - LEARNSETS(Rampardos), + .levelUpLearnset = sRampardosLevelUpLearnset, + .teachableLearnset = sRampardosTeachableLearnset, }, #endif //P_FAMILY_CRANIDOS @@ -1127,17 +1250,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shieldon, 40, 40), + .frontPic = gMonFrontPic_Shieldon, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Shieldon, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Shieldon, 56, 48), + .backPic = gMonBackPic_Shieldon, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Shieldon), - ICON(Shieldon, 1), + .palette = gMonPalette_Shieldon, + .shinyPalette = gMonShinyPalette_Shieldon, + .iconSprite = gMonIcon_Shieldon, + .iconPalIndex = 1, FOOTPRINT(Shieldon) - LEARNSETS(Shieldon), + .levelUpLearnset = sShieldonLevelUpLearnset, + .teachableLearnset = sShieldonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_BASTIODON}), }, @@ -1175,17 +1303,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bastiodon, 64, 56), + .frontPic = gMonFrontPic_Bastiodon, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Bastiodon, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Bastiodon, 64, 56), + .backPic = gMonBackPic_Bastiodon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Bastiodon), - ICON(Bastiodon, 1), + .palette = gMonPalette_Bastiodon, + .shinyPalette = gMonShinyPalette_Bastiodon, + .iconSprite = gMonIcon_Bastiodon, + .iconPalIndex = 1, FOOTPRINT(Bastiodon) - LEARNSETS(Bastiodon), + .levelUpLearnset = sBastiodonLevelUpLearnset, + .teachableLearnset = sBastiodonTeachableLearnset, }, #endif //P_FAMILY_SHIELDON @@ -1223,7 +1356,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) - LEARNSETS(Burmy), + .levelUpLearnset = sBurmyLevelUpLearnset, + .teachableLearnset = sBurmyTeachableLearnset, .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, @@ -1233,12 +1367,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "will immediately repair it with whatever is\n" "near at hand. The Pokémon within the cloak\n" "is scrawny and vulnerable to the cold."), - FRONT_PIC(BurmyPlantCloak, 32, 56), + .frontPic = gMonFrontPic_BurmyPlantCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 13, - BACK_PIC(BurmyPlantCloak, 40, 56), + .backPic = gMonBackPic_BurmyPlantCloak, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 6, - PALETTES(BurmyPlantCloak), - ICON(BurmyPlantCloak, 1), + .palette = gMonPalette_BurmyPlantCloak, + .shinyPalette = gMonShinyPalette_BurmyPlantCloak, + .iconSprite = gMonIcon_BurmyPlantCloak, + .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1276,7 +1414,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) - LEARNSETS(Burmy), + .levelUpLearnset = sBurmyLevelUpLearnset, + .teachableLearnset = sBurmyTeachableLearnset, .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, @@ -1286,12 +1425,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "and silk it spits out. This earthen cloak\n" "is ruined by wind and rain, so the Pokémon\n" "hides away in caves and other such places."), - FRONT_PIC(BurmySandyCloak, 32, 56), + .frontPic = gMonFrontPic_BurmySandyCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 12, - BACK_PIC(BurmySandyCloak, 32, 56), + .backPic = gMonBackPic_BurmySandyCloak, + .backPicSize = MON_COORDS_SIZE(32, 56), .backPicYOffset = 7, - PALETTES(BurmySandyCloak), - ICON(BurmySandyCloak, 1), + .palette = gMonPalette_BurmySandyCloak, + .shinyPalette = gMonShinyPalette_BurmySandyCloak, + .iconSprite = gMonIcon_BurmySandyCloak, + .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1329,7 +1472,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) - LEARNSETS(Burmy), + .levelUpLearnset = sBurmyLevelUpLearnset, + .teachableLearnset = sBurmyTeachableLearnset, .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, @@ -1339,12 +1483,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "materials, Burmy will create its cloak\n" "using dust and refuse. The cloak seems to\n" "be more comfortable than one would think."), - FRONT_PIC(BurmyTrashCloak, 32, 56), + .frontPic = gMonFrontPic_BurmyTrashCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 8, - BACK_PIC(BurmyTrashCloak, 40, 64), + .backPic = gMonBackPic_BurmyTrashCloak, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, - PALETTES(BurmyTrashCloak), - ICON(BurmyTrashCloak, 0), + .palette = gMonPalette_BurmyTrashCloak, + .shinyPalette = gMonShinyPalette_BurmyTrashCloak, + .iconSprite = gMonIcon_BurmyTrashCloak, + .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1392,11 +1540,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "on where Burmy evolved. The materials\n" "on hand become a part of its body.\n" "The cloak is never shed."), - FRONT_PIC(WormadamPlantCloak, 48, 56), - BACK_PIC(WormadamPlantCloak, 56, 64), - PALETTES(WormadamPlantCloak), - ICON(WormadamPlantCloak, 1), - LEARNSETS(WormadamPlantCloak), + .frontPic = gMonFrontPic_WormadamPlantCloak, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .backPic = gMonBackPic_WormadamPlantCloak, + .backPicSize = MON_COORDS_SIZE(56, 64), + .palette = gMonPalette_WormadamPlantCloak, + .shinyPalette = gMonShinyPalette_WormadamPlantCloak, + .iconSprite = gMonIcon_WormadamPlantCloak, + .iconPalIndex = 1, + .levelUpLearnset = sWormadamPlantCloakLevelUpLearnset, + .teachableLearnset = sWormadamPlantCloakTeachableLearnset, }, [SPECIES_WORMADAM_SANDY_CLOAK] = @@ -1442,11 +1595,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "no problem repelling a Starly's pecking.\n" "It is said that a Wormadam that evolves\n" "on a cold day will have a thicker cloak."), - FRONT_PIC(WormadamSandyCloak, 40, 56), - BACK_PIC(WormadamSandyCloak, 56, 64), - PALETTES(WormadamSandyCloak), - ICON(WormadamSandyCloak, 1), - LEARNSETS(WormadamSandyCloak), + .frontPic = gMonFrontPic_WormadamSandyCloak, + .frontPicSize = MON_COORDS_SIZE(40, 56), + .backPic = gMonBackPic_WormadamSandyCloak, + .backPicSize = MON_COORDS_SIZE(56, 64), + .palette = gMonPalette_WormadamSandyCloak, + .shinyPalette = gMonShinyPalette_WormadamSandyCloak, + .iconSprite = gMonIcon_WormadamSandyCloak, + .iconPalIndex = 1, + .levelUpLearnset = sWormadamSandyCloakLevelUpLearnset, + .teachableLearnset = sWormadamSandyCloakTeachableLearnset, }, [SPECIES_WORMADAM_TRASH_CLOAK] = @@ -1493,11 +1651,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "the scenery enough to be inconspicuous.\n" "This seems to be the perfect way for it to\n" "evade the detection of predators."), - FRONT_PIC(WormadamTrashCloak, 48, 56), - BACK_PIC(WormadamTrashCloak, 64, 64), - PALETTES(WormadamTrashCloak), - ICON(WormadamTrashCloak, 0), - LEARNSETS(WormadamTrashCloak), + .frontPic = gMonFrontPic_WormadamTrashCloak, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .backPic = gMonBackPic_WormadamTrashCloak, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_WormadamTrashCloak, + .shinyPalette = gMonShinyPalette_WormadamTrashCloak, + .iconSprite = gMonIcon_WormadamTrashCloak, + .iconPalIndex = 0, + .levelUpLearnset = sWormadamTrashCloakLevelUpLearnset, + .teachableLearnset = sWormadamTrashCloakTeachableLearnset, }, [SPECIES_MOTHIM] = @@ -1536,18 +1699,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mothim, 64, 64), + .frontPic = gMonFrontPic_Mothim, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Mothim, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 10, - BACK_PIC(Mothim, 64, 56), + .backPic = gMonBackPic_Mothim, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Mothim), - ICON(Mothim, 0), + .palette = gMonPalette_Mothim, + .shinyPalette = gMonShinyPalette_Mothim, + .iconSprite = gMonIcon_Mothim, + .iconPalIndex = 0, FOOTPRINT(Mothim) - LEARNSETS(Mothim), + .levelUpLearnset = sMothimLevelUpLearnset, + .teachableLearnset = sMothimTeachableLearnset, }, #endif //P_FAMILY_BURMY @@ -1587,19 +1755,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Combee, 64, 40), + .frontPic = gMonFrontPic_Combee, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Combee, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 15, - BACK_PIC(Combee, 64, 48), + .backPic = gMonBackPic_Combee, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 22, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Combee), - PALETTE_FEMALE(Combee), - ICON(Combee, 0), + .palette = gMonPalette_Combee, + .shinyPalette = gMonShinyPalette_Combee, + .paletteFemale = gMonPalette_CombeeF, + .shinyPaletteFemale = gMonShinyPalette_CombeeF, + .iconSprite = gMonIcon_Combee, + .iconPalIndex = 0, FOOTPRINT(Combee) - LEARNSETS(Combee), + .levelUpLearnset = sCombeeLevelUpLearnset, + .teachableLearnset = sCombeeTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}), }, @@ -1640,18 +1814,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vespiquen, 48, 56), + .frontPic = gMonFrontPic_Vespiquen, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Vespiquen, .frontAnimId = ANIM_LUNGE_GROW, .enemyMonElevation = 4, - BACK_PIC(Vespiquen, 64, 64), + .backPic = gMonBackPic_Vespiquen, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Vespiquen), - ICON(Vespiquen, 0), + .palette = gMonPalette_Vespiquen, + .shinyPalette = gMonShinyPalette_Vespiquen, + .iconSprite = gMonIcon_Vespiquen, + .iconPalIndex = 0, FOOTPRINT(Vespiquen) - LEARNSETS(Vespiquen), + .levelUpLearnset = sVespiquenLevelUpLearnset, + .teachableLearnset = sVespiquenTeachableLearnset, }, #endif //P_FAMILY_COMBEE @@ -1690,18 +1869,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pachirisu, 48, 56), - FRONT_PIC_FEMALE(Pachirisu, 48, 56), + .frontPic = gMonFrontPic_Pachirisu, + .frontPicSize = MON_COORDS_SIZE(48, 56), + .frontPicFemale = gMonFrontPic_PachirisuF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pachirisu, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pachirisu, 64, 64), + .backPic = gMonBackPic_Pachirisu, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Pachirisu), - ICON(Pachirisu, 0), + .palette = gMonPalette_Pachirisu, + .shinyPalette = gMonShinyPalette_Pachirisu, + .iconSprite = gMonIcon_Pachirisu, + .iconPalIndex = 0, FOOTPRINT(Pachirisu) - LEARNSETS(Pachirisu), + .levelUpLearnset = sPachirisuLevelUpLearnset, + .teachableLearnset = sPachirisuTeachableLearnset, }, #endif //P_FAMILY_PACHIRISU @@ -1740,18 +1925,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Buizel, 56, 48), + .frontPic = gMonFrontPic_Buizel, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Buizel, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Buizel, 64, 48), - BACK_PIC_FEMALE(Buizel, 64, 48), + .backPic = gMonBackPic_Buizel, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_BuizelF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Buizel), - ICON(Buizel, 0), + .palette = gMonPalette_Buizel, + .shinyPalette = gMonShinyPalette_Buizel, + .iconSprite = gMonIcon_Buizel, + .iconPalIndex = 0, FOOTPRINT(Buizel) - LEARNSETS(Buizel), + .levelUpLearnset = sBuizelLevelUpLearnset, + .teachableLearnset = sBuizelTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_FLOATZEL}), }, @@ -1789,18 +1980,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Floatzel, 64, 64), + .frontPic = gMonFrontPic_Floatzel, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Floatzel, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Floatzel, 64, 64), - BACK_PIC_FEMALE(Floatzel, 64, 64), + .backPic = gMonBackPic_Floatzel, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_FloatzelF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Floatzel), - ICON(Floatzel, 0), + .palette = gMonPalette_Floatzel, + .shinyPalette = gMonShinyPalette_Floatzel, + .iconSprite = gMonIcon_Floatzel, + .iconPalIndex = 0, FOOTPRINT(Floatzel) - LEARNSETS(Floatzel), + .levelUpLearnset = sFloatzelLevelUpLearnset, + .teachableLearnset = sFloatzelTeachableLearnset, }, #endif //P_FAMILY_BUIZEL @@ -1840,17 +2037,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cherubi, 40, 32), + .frontPic = gMonFrontPic_Cherubi, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Cherubi, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cherubi, 48, 40), + .backPic = gMonBackPic_Cherubi, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Cherubi), - ICON(Cherubi, 1), + .palette = gMonPalette_Cherubi, + .shinyPalette = gMonShinyPalette_Cherubi, + .iconSprite = gMonIcon_Cherubi, + .iconPalIndex = 1, FOOTPRINT(Cherubi) - LEARNSETS(Cherubi), + .levelUpLearnset = sCherubiLevelUpLearnset, + .teachableLearnset = sCherubiTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_CHERRIM_OVERCAST}), }, @@ -1884,7 +2086,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Cherrim) - LEARNSETS(Cherrim), + .levelUpLearnset = sCherrimLevelUpLearnset, + .teachableLearnset = sCherrimTeachableLearnset, .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PURPLE, @@ -1893,15 +2096,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "quiver. A rich array of Pokémon can be\n" "found gathered around it, drawn by the\n" "scent exuded from Cherrim's folded petals."), - FRONT_PIC(CherrimOvercast, 32, 48), + .frontPic = gMonFrontPic_CherrimOvercast, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_CherrimOvercast, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, - BACK_PIC(CherrimOvercast, 40, 56), + .backPic = gMonBackPic_CherrimOvercast, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(CherrimOvercast), - ICON(CherrimOvercast, 0), + .palette = gMonPalette_CherrimOvercast, + .shinyPalette = gMonShinyPalette_CherrimOvercast, + .iconSprite = gMonIcon_CherrimOvercast, + .iconPalIndex = 0, }, [SPECIES_CHERRIM_SUNSHINE] = @@ -1934,7 +2141,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Cherrim) - LEARNSETS(Cherrim), + .levelUpLearnset = sCherrimLevelUpLearnset, + .teachableLearnset = sCherrimTeachableLearnset, .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, .bodyColor = BODY_COLOR_PINK, @@ -1943,15 +2151,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "Its faint scent entices bug Pokémon to it.\n" "It immediately closes its petals and\n" "becomes immobile once the sun hides."), - FRONT_PIC(CherrimSunshine, 48, 40), + .frontPic = gMonFrontPic_CherrimSunshine, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_CherrimSunshine, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(CherrimSunshine, 64, 56), + .backPic = gMonBackPic_CherrimSunshine, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(CherrimSunshine), - ICON(CherrimSunshine, 1), + .palette = gMonPalette_CherrimSunshine, + .shinyPalette = gMonShinyPalette_CherrimSunshine, + .iconSprite = gMonIcon_CherrimSunshine, + .iconPalIndex = 1, }, #endif //P_FAMILY_CHERUBI @@ -1989,7 +2201,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, FOOTPRINT(Shellos) - LEARNSETS(Shellos), + .levelUpLearnset = sShellosLevelUpLearnset, + .teachableLearnset = sShellosTeachableLearnset, .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( @@ -1997,11 +2210,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "While harmless, the fluid is awfully sticky.\n" "Apparently, there are more West Sea\n" "Shellos now than there were in the past."), - FRONT_PIC(ShellosWestSea, 40, 40), + .frontPic = gMonFrontPic_ShellosWestSea, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, - BACK_PIC(ShellosWestSea, 40, 56), - PALETTES(ShellosWestSea), - ICON(ShellosWestSea, 0), + .backPic = gMonBackPic_ShellosWestSea, + .backPicSize = MON_COORDS_SIZE(40, 56), + .palette = gMonPalette_ShellosWestSea, + .shinyPalette = gMonShinyPalette_ShellosWestSea, + .iconSprite = gMonIcon_ShellosWestSea, + .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}), }, @@ -2038,7 +2255,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, FOOTPRINT(Shellos) - LEARNSETS(Shellos), + .levelUpLearnset = sShellosLevelUpLearnset, + .teachableLearnset = sShellosTeachableLearnset, .formSpeciesIdTable = sShellosFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -2046,11 +2264,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "of time on land until their skin dries out.\n" "One theory suggests that living in cold\n" "seas causes Shellos to take on this form."), - FRONT_PIC(ShellosEastSea, 40, 40), + .frontPic = gMonFrontPic_ShellosEastSea, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - BACK_PIC(ShellosEastSea, 56, 48), - PALETTES(ShellosEastSea), - ICON(ShellosEastSea, 0), + .backPic = gMonBackPic_ShellosEastSea, + .backPicSize = MON_COORDS_SIZE(56, 48), + .palette = gMonPalette_ShellosEastSea, + .shinyPalette = gMonShinyPalette_ShellosEastSea, + .iconSprite = gMonIcon_ShellosEastSea, + .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}), }, @@ -2088,7 +2310,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, FOOTPRINT(Gastrodon) - LEARNSETS(Gastrodon), + .levelUpLearnset = sGastrodonLevelUpLearnset, + .teachableLearnset = sGastrodonTeachableLearnset, .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_PURPLE, .description = COMPOUND_STRING( @@ -2096,10 +2319,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "eat sand for nourishment. Should one\n" "Gastrodon encounter another of a\n" "different color, a fierce battle will ensue."), - FRONT_PIC(GastrodonWestSea, 48, 48), - BACK_PIC(GastrodonWestSea, 56, 64), - PALETTES(GastrodonWestSea), - ICON(GastrodonWestSea, 0), + .frontPic = gMonFrontPic_GastrodonWestSea, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .backPic = gMonBackPic_GastrodonWestSea, + .backPicSize = MON_COORDS_SIZE(56, 64), + .palette = gMonPalette_GastrodonWestSea, + .shinyPalette = gMonShinyPalette_GastrodonWestSea, + .iconSprite = gMonIcon_GastrodonWestSea, + .iconPalIndex = 0, }, [SPECIES_GASTRODON_EAST_SEA] = @@ -2136,7 +2363,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, FOOTPRINT(Gastrodon) - LEARNSETS(Gastrodon), + .levelUpLearnset = sGastrodonLevelUpLearnset, + .teachableLearnset = sGastrodonTeachableLearnset, .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( @@ -2144,10 +2372,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "They normally live in rocky seashores, but\n" "when cloudy or rainy, they can sometimes\n" "be found on mountains, far from the sea."), - FRONT_PIC(GastrodonEastSea, 56, 48), - BACK_PIC(GastrodonEastSea, 56, 64), - PALETTES(GastrodonEastSea), - ICON(GastrodonEastSea, 0), + .frontPic = gMonFrontPic_GastrodonEastSea, + .frontPicSize = MON_COORDS_SIZE(56, 48), + .backPic = gMonBackPic_GastrodonEastSea, + .backPicSize = MON_COORDS_SIZE(56, 64), + .palette = gMonPalette_GastrodonEastSea, + .shinyPalette = gMonShinyPalette_GastrodonEastSea, + .iconSprite = gMonIcon_GastrodonEastSea, + .iconPalIndex = 0, }, #endif //P_FAMILY_SHELLOS @@ -2186,18 +2418,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drifloon, 32, 56), + .frontPic = gMonFrontPic_Drifloon, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Drifloon, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 5, - BACK_PIC(Drifloon, 40, 64), + .backPic = gMonBackPic_Drifloon, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Drifloon), - ICON(Drifloon, 2), + .palette = gMonPalette_Drifloon, + .shinyPalette = gMonShinyPalette_Drifloon, + .iconSprite = gMonIcon_Drifloon, + .iconPalIndex = 2, FOOTPRINT(Drifloon) - LEARNSETS(Drifloon), + .levelUpLearnset = sDrifloonLevelUpLearnset, + .teachableLearnset = sDrifloonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_DRIFBLIM}), }, @@ -2235,18 +2472,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drifblim, 56, 56), + .frontPic = gMonFrontPic_Drifblim, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Drifblim, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 7, - BACK_PIC(Drifblim, 64, 64), + .backPic = gMonBackPic_Drifblim, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Drifblim), - ICON(Drifblim, 2), + .palette = gMonPalette_Drifblim, + .shinyPalette = gMonShinyPalette_Drifblim, + .iconSprite = gMonIcon_Drifblim, + .iconPalIndex = 2, FOOTPRINT(Drifblim) - LEARNSETS(Drifblim), + .levelUpLearnset = sDrifblimLevelUpLearnset, + .teachableLearnset = sDrifblimTeachableLearnset, }, #endif //P_FAMILY_DRIFLOON @@ -2285,17 +2527,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Buneary, 32, 64), + .frontPic = gMonFrontPic_Buneary, + .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Buneary, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Buneary, 64, 64), + .backPic = gMonBackPic_Buneary, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Buneary), - ICON(Buneary, 2), + .palette = gMonPalette_Buneary, + .shinyPalette = gMonShinyPalette_Buneary, + .iconSprite = gMonIcon_Buneary, + .iconPalIndex = 2, FOOTPRINT(Buneary) - LEARNSETS(Buneary), + .levelUpLearnset = sBunearyLevelUpLearnset, + .teachableLearnset = sBunearyTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY}), }, @@ -2313,7 +2560,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_LOPUNNY, .categoryName = _("Rabbit"), FOOTPRINT(Lopunny) - LEARNSETS(Lopunny), + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, @@ -2337,15 +2585,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lopunny, 56, 56), + .frontPic = gMonFrontPic_Lopunny, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Lopunny, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Lopunny, 64, 56), + .backPic = gMonBackPic_Lopunny, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Lopunny), - ICON(Lopunny, 2), + .palette = gMonPalette_Lopunny, + .shinyPalette = gMonShinyPalette_Lopunny, + .iconSprite = gMonIcon_Lopunny, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -2363,7 +2615,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_LOPUNNY, .categoryName = _("Rabbit"), FOOTPRINT(Lopunny) - LEARNSETS(Lopunny), + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, .formChangeTable = sLopunnyFormChangeTable, .baseHP = 65, @@ -2387,15 +2640,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(LopunnyMega, 56, 64), + .frontPic = gMonFrontPic_LopunnyMega, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_LopunnyMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(LopunnyMega, 64, 64), + .backPic = gMonBackPic_LopunnyMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(LopunnyMega), - ICON(LopunnyMega, 2), + .palette = gMonPalette_LopunnyMega, + .shinyPalette = gMonShinyPalette_LopunnyMega, + .iconSprite = gMonIcon_LopunnyMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -2436,17 +2693,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Glameow, 56, 56), + .frontPic = gMonFrontPic_Glameow, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Glameow, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Glameow, 64, 56), + .backPic = gMonBackPic_Glameow, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Glameow), - ICON(Glameow, 0), + .palette = gMonPalette_Glameow, + .shinyPalette = gMonShinyPalette_Glameow, + .iconSprite = gMonIcon_Glameow, + .iconPalIndex = 0, FOOTPRINT(Glameow) - LEARNSETS(Glameow), + .levelUpLearnset = sGlameowLevelUpLearnset, + .teachableLearnset = sGlameowTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PURUGLY}), }, @@ -2484,17 +2746,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Purugly, 64, 56), + .frontPic = gMonFrontPic_Purugly, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Purugly, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Purugly, 64, 48), + .backPic = gMonBackPic_Purugly, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Purugly), - ICON(Purugly, 0), + .palette = gMonPalette_Purugly, + .shinyPalette = gMonShinyPalette_Purugly, + .iconSprite = gMonIcon_Purugly, + .iconPalIndex = 0, FOOTPRINT(Purugly) - LEARNSETS(Purugly), + .levelUpLearnset = sPuruglyLevelUpLearnset, + .teachableLearnset = sPuruglyTeachableLearnset, }, #endif //P_FAMILY_GLAMEOW @@ -2533,17 +2800,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Stunky, 56, 48), + .frontPic = gMonFrontPic_Stunky, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Stunky, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Stunky, 64, 64), + .backPic = gMonBackPic_Stunky, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Stunky), - ICON(Stunky, 2), + .palette = gMonPalette_Stunky, + .shinyPalette = gMonShinyPalette_Stunky, + .iconSprite = gMonIcon_Stunky, + .iconPalIndex = 2, FOOTPRINT(Stunky) - LEARNSETS(Stunky), + .levelUpLearnset = sStunkyLevelUpLearnset, + .teachableLearnset = sStunkyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SKUNTANK}), }, @@ -2581,17 +2853,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 9, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Skuntank, 64, 56), + .frontPic = gMonFrontPic_Skuntank, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Skuntank, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Skuntank, 64, 64), + .backPic = gMonBackPic_Skuntank, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Skuntank), - ICON(Skuntank, 2), + .palette = gMonPalette_Skuntank, + .shinyPalette = gMonShinyPalette_Skuntank, + .iconSprite = gMonIcon_Skuntank, + .iconPalIndex = 2, FOOTPRINT(Skuntank) - LEARNSETS(Skuntank), + .levelUpLearnset = sSkuntankLevelUpLearnset, + .teachableLearnset = sSkuntankTeachableLearnset, }, #endif //P_FAMILY_STUNKY @@ -2631,18 +2908,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bronzor, 32, 40), + .frontPic = gMonFrontPic_Bronzor, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Bronzor, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 9, - BACK_PIC(Bronzor, 40, 48), + .backPic = gMonBackPic_Bronzor, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Bronzor), - ICON(Bronzor, 0), + .palette = gMonPalette_Bronzor, + .shinyPalette = gMonShinyPalette_Bronzor, + .iconSprite = gMonIcon_Bronzor, + .iconPalIndex = 0, FOOTPRINT(Bronzor) - LEARNSETS(Bronzor), + .levelUpLearnset = sBronzorLevelUpLearnset, + .teachableLearnset = sBronzorTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 33, SPECIES_BRONZONG}), }, @@ -2682,18 +2964,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bronzong, 56, 56), + .frontPic = gMonFrontPic_Bronzong, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Bronzong, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 7, - BACK_PIC(Bronzong, 64, 56), + .backPic = gMonBackPic_Bronzong, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Bronzong), - ICON(Bronzong, 0), + .palette = gMonPalette_Bronzong, + .shinyPalette = gMonShinyPalette_Bronzong, + .iconSprite = gMonIcon_Bronzong, + .iconPalIndex = 0, FOOTPRINT(Bronzong) - LEARNSETS(Bronzong), + .levelUpLearnset = sBronzongLevelUpLearnset, + .teachableLearnset = sBronzongTeachableLearnset, }, #endif //P_FAMILY_BRONZOR @@ -2733,17 +3020,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chatot, 40, 48), + .frontPic = gMonFrontPic_Chatot, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Chatot, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Chatot, 48, 48), + .backPic = gMonBackPic_Chatot, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Chatot), - ICON(Chatot, 0), + .palette = gMonPalette_Chatot, + .shinyPalette = gMonShinyPalette_Chatot, + .iconSprite = gMonIcon_Chatot, + .iconPalIndex = 0, FOOTPRINT(Chatot) - LEARNSETS(Chatot), + .levelUpLearnset = sChatotLevelUpLearnset, + .teachableLearnset = sChatotTeachableLearnset, }, #endif //P_FAMILY_CHATOT @@ -2783,17 +3075,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Spiritomb, 56, 56), + .frontPic = gMonFrontPic_Spiritomb, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Spiritomb, .frontAnimId = ANIM_GROW_IN_STAGES, - BACK_PIC(Spiritomb, 64, 56), + .backPic = gMonBackPic_Spiritomb, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Spiritomb), - ICON(Spiritomb, 5), + .palette = gMonPalette_Spiritomb, + .shinyPalette = gMonShinyPalette_Spiritomb, + .iconSprite = gMonIcon_Spiritomb, + .iconPalIndex = 5, FOOTPRINT(Spiritomb) - LEARNSETS(Spiritomb), + .levelUpLearnset = sSpiritombLevelUpLearnset, + .teachableLearnset = sSpiritombTeachableLearnset, }, #endif //P_FAMILY_SPIRITOMB @@ -2832,19 +3129,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gible, 48, 48), - FRONT_PIC_FEMALE(Gible, 48, 48), + .frontPic = gMonFrontPic_Gible, + .frontPicSize = MON_COORDS_SIZE(48, 48), + .frontPicFemale = gMonFrontPic_GibleF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Gible, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Gible, 56, 48), - BACK_PIC_FEMALE(Gible, 56, 48), + .backPic = gMonBackPic_Gible, + .backPicSize = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_GibleF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Gible), - ICON(Gible, 0), + .palette = gMonPalette_Gible, + .shinyPalette = gMonShinyPalette_Gible, + .iconSprite = gMonIcon_Gible, + .iconPalIndex = 0, FOOTPRINT(Gible) - LEARNSETS(Gible), + .levelUpLearnset = sGibleLevelUpLearnset, + .teachableLearnset = sGibleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GABITE}), }, @@ -2882,19 +3186,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Gabite, 64, 64), - FRONT_PIC_FEMALE(Gabite, 64, 64), + .frontPic = gMonFrontPic_Gabite, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_GabiteF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gabite, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Gabite, 64, 64), - BACK_PIC_FEMALE(Gabite, 64, 64), + .backPic = gMonBackPic_Gabite, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GabiteF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Gabite), - ICON(Gabite, 0), + .palette = gMonPalette_Gabite, + .shinyPalette = gMonShinyPalette_Gabite, + .iconSprite = gMonIcon_Gabite, + .iconPalIndex = 0, FOOTPRINT(Gabite) - LEARNSETS(Gabite), + .levelUpLearnset = sGabiteLevelUpLearnset, + .teachableLearnset = sGabiteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_GARCHOMP}), }, @@ -2919,7 +3230,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 326, .trainerOffset = 4, FOOTPRINT(Garchomp) - LEARNSETS(Garchomp), + .levelUpLearnset = sGarchompLevelUpLearnset, + .teachableLearnset = sGarchompTeachableLearnset, .formSpeciesIdTable = sGarchompFormSpeciesIdTable, .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, @@ -2942,16 +3254,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "wings, it looks like a jet plane. It is\n" "covered in fine scales that reduce drag,\n" "enabling it to fly at high speeds."), - FRONT_PIC(Garchomp, 64, 64), - FRONT_PIC_FEMALE(Garchomp, 64, 64), + .frontPic = gMonFrontPic_Garchomp, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_GarchompF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Garchomp, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Garchomp, 64, 56), + .backPic = gMonBackPic_Garchomp, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Garchomp), - ICON(Garchomp, 0), + .palette = gMonPalette_Garchomp, + .shinyPalette = gMonShinyPalette_Garchomp, + .iconSprite = gMonIcon_Garchomp, + .iconPalIndex = 0, }, #if P_MEGA_EVOLUTIONS @@ -2976,7 +3293,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 326, .trainerOffset = 4, FOOTPRINT(Garchomp) - LEARNSETS(Garchomp), + .levelUpLearnset = sGarchompLevelUpLearnset, + .teachableLearnset = sGarchompTeachableLearnset, .formSpeciesIdTable = sGarchompFormSpeciesIdTable, .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, @@ -2993,15 +3311,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "into giant scythes, sending it mad with\n" "rage. It swings its scythes wildly and\n" "slices the ground to pieces."), - FRONT_PIC(GarchompMega, 64, 64), + .frontPic = gMonFrontPic_GarchompMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GarchompMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GarchompMega, 64, 56), + .backPic = gMonBackPic_GarchompMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(GarchompMega), - ICON(GarchompMega, 0), + .palette = gMonPalette_GarchompMega, + .shinyPalette = gMonShinyPalette_GarchompMega, + .iconSprite = gMonIcon_GarchompMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3042,17 +3364,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Riolu, 48, 48), + .frontPic = gMonFrontPic_Riolu, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Riolu, .frontAnimId = ANIM_RAPID_H_HOPS, - BACK_PIC(Riolu, 64, 64), + .backPic = gMonBackPic_Riolu, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Riolu), - ICON(Riolu, 2), + .palette = gMonPalette_Riolu, + .shinyPalette = gMonShinyPalette_Riolu, + .iconSprite = gMonIcon_Riolu, + .iconPalIndex = 2, FOOTPRINT(Riolu) - LEARNSETS(Riolu), + .levelUpLearnset = sRioluLevelUpLearnset, + .teachableLearnset = sRioluTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}), }, @@ -3072,7 +3399,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_LUCARIO, .categoryName = _("Aura"), FOOTPRINT(Lucario) - LEARNSETS(Lucario), + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, .formSpeciesIdTable = sLucarioFormSpeciesIdTable, .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, @@ -3095,15 +3423,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lucario, 48, 56), + .frontPic = gMonFrontPic_Lucario, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Lucario, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Lucario, 64, 64), + .backPic = gMonBackPic_Lucario, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Lucario), - ICON(Lucario, 2), + .palette = gMonPalette_Lucario, + .shinyPalette = gMonShinyPalette_Lucario, + .iconSprite = gMonIcon_Lucario, + .iconPalIndex = 2, }, #if P_MEGA_EVOLUTIONS @@ -3123,7 +3455,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_LUCARIO, .categoryName = _("Aura"), FOOTPRINT(Lucario) - LEARNSETS(Lucario), + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, .formSpeciesIdTable = sLucarioFormSpeciesIdTable, .formChangeTable = sLucarioFormChangeTable, .baseHP = 70, @@ -3146,15 +3479,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(LucarioMega, 48, 64), + .frontPic = gMonFrontPic_LucarioMega, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_LucarioMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(LucarioMega, 64, 64), + .backPic = gMonBackPic_LucarioMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(LucarioMega), - ICON(LucarioMega, 2), + .palette = gMonPalette_LucarioMega, + .shinyPalette = gMonShinyPalette_LucarioMega, + .iconSprite = gMonIcon_LucarioMega, + .iconPalIndex = 2, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3195,21 +3532,28 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 11, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Hippopotas, 64, 40), + .frontPic = gMonFrontPic_Hippopotas, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Hippopotas, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Hippopotas, 64, 40), + .backPic = gMonBackPic_Hippopotas, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Hippopotas), - PALETTE_FEMALE(Hippopotas), - ICON(Hippopotas, 1), + .palette = gMonPalette_Hippopotas, + .shinyPalette = gMonShinyPalette_Hippopotas, + .paletteFemale = gMonPalette_HippopotasF, + .shinyPaletteFemale = gMonShinyPalette_HippopotasF, + .iconSprite = gMonIcon_Hippopotas, + .iconPalIndex = 1, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - ICON_FEMALE(Hippopotas, 1), + .iconSpriteFemale = gMonIcon_HippopotasF, + .iconPalIndexFemale = 1, #endif FOOTPRINT(Hippopotas) - LEARNSETS(Hippopotas), + .levelUpLearnset = sHippopotasLevelUpLearnset, + .teachableLearnset = sHippopotasTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_HIPPOWDON}), }, @@ -3247,21 +3591,28 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Hippowdon, 64, 56), + .frontPic = gMonFrontPic_Hippowdon, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Hippowdon, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Hippowdon, 64, 56), + .backPic = gMonBackPic_Hippowdon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Hippowdon), - PALETTE_FEMALE(Hippowdon), - ICON(Hippowdon, 1), + .palette = gMonPalette_Hippowdon, + .shinyPalette = gMonShinyPalette_Hippowdon, + .paletteFemale = gMonPalette_HippowdonF, + .shinyPaletteFemale = gMonShinyPalette_HippowdonF, + .iconSprite = gMonIcon_Hippowdon, + .iconPalIndex = 1, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - ICON_FEMALE(Hippowdon, 1), + .iconSpriteFemale = gMonIcon_HippowdonF, + .iconPalIndexFemale = 1, #endif FOOTPRINT(Hippowdon) - LEARNSETS(Hippowdon), + .levelUpLearnset = sHippowdonLevelUpLearnset, + .teachableLearnset = sHippowdonTeachableLearnset, }, #endif //P_FAMILY_HIPPOPOTAS @@ -3301,17 +3652,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Skorupi, 48, 48), + .frontPic = gMonFrontPic_Skorupi, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Skorupi, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Skorupi, 64, 56), + .backPic = gMonBackPic_Skorupi, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Skorupi), - ICON(Skorupi, 0), + .palette = gMonPalette_Skorupi, + .shinyPalette = gMonShinyPalette_Skorupi, + .iconSprite = gMonIcon_Skorupi, + .iconPalIndex = 0, FOOTPRINT(Skorupi) - LEARNSETS(Skorupi), + .levelUpLearnset = sSkorupiLevelUpLearnset, + .teachableLearnset = sSkorupiTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_DRAPION}), }, @@ -3350,17 +3706,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drapion, 64, 56), + .frontPic = gMonFrontPic_Drapion, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Drapion, .frontAnimId = ANIM_V_JUMPS_BIG, - BACK_PIC(Drapion, 64, 56), + .backPic = gMonBackPic_Drapion, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Drapion), - ICON(Drapion, 2), + .palette = gMonPalette_Drapion, + .shinyPalette = gMonShinyPalette_Drapion, + .iconSprite = gMonIcon_Drapion, + .iconPalIndex = 2, FOOTPRINT(Drapion) - LEARNSETS(Drapion), + .levelUpLearnset = sDrapionLevelUpLearnset, + .teachableLearnset = sDrapionTeachableLearnset, }, #endif //P_FAMILY_SKORUPI @@ -3400,19 +3761,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Croagunk, 40, 48), - FRONT_PIC_FEMALE(Croagunk, 40, 48), + .frontPic = gMonFrontPic_Croagunk, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .frontPicFemale = gMonFrontPic_CroagunkF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Croagunk, .frontAnimId = ANIM_RAPID_H_HOPS, - BACK_PIC(Croagunk, 56, 56), - BACK_PIC_FEMALE(Croagunk, 56, 56), + .backPic = gMonBackPic_Croagunk, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_CroagunkF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW, - PALETTES(Croagunk), - ICON(Croagunk, 0), + .palette = gMonPalette_Croagunk, + .shinyPalette = gMonShinyPalette_Croagunk, + .iconSprite = gMonIcon_Croagunk, + .iconPalIndex = 0, FOOTPRINT(Croagunk) - LEARNSETS(Croagunk), + .levelUpLearnset = sCroagunkLevelUpLearnset, + .teachableLearnset = sCroagunkTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_TOXICROAK}), }, @@ -3451,19 +3819,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toxicroak, 56, 56), - FRONT_PIC_FEMALE(Toxicroak, 56, 56), + .frontPic = gMonFrontPic_Toxicroak, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_ToxicroakF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Toxicroak, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Toxicroak, 56, 56), - BACK_PIC_FEMALE(Toxicroak, 56, 56), + .backPic = gMonBackPic_Toxicroak, + .backPicSize = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_ToxicroakF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Toxicroak), - ICON(Toxicroak, 0), + .palette = gMonPalette_Toxicroak, + .shinyPalette = gMonShinyPalette_Toxicroak, + .iconSprite = gMonIcon_Toxicroak, + .iconPalIndex = 0, FOOTPRINT(Toxicroak) - LEARNSETS(Toxicroak), + .levelUpLearnset = sToxicroakLevelUpLearnset, + .teachableLearnset = sToxicroakTeachableLearnset, }, #endif //P_FAMILY_CROAGUNK @@ -3502,18 +3877,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Carnivine, 64, 48), + .frontPic = gMonFrontPic_Carnivine, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Carnivine, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 8, - BACK_PIC(Carnivine, 64, 56), + .backPic = gMonBackPic_Carnivine, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Carnivine), - ICON(Carnivine, 1), + .palette = gMonPalette_Carnivine, + .shinyPalette = gMonShinyPalette_Carnivine, + .iconSprite = gMonIcon_Carnivine, + .iconPalIndex = 1, FOOTPRINT(Carnivine) - LEARNSETS(Carnivine), + .levelUpLearnset = sCarnivineLevelUpLearnset, + .teachableLearnset = sCarnivineTeachableLearnset, }, #endif //P_FAMILY_CARNIVINE @@ -3552,19 +3932,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Finneon, 32, 40), - FRONT_PIC_FEMALE(Finneon, 32, 40), + .frontPic = gMonFrontPic_Finneon, + .frontPicSize = MON_COORDS_SIZE(32, 40), + .frontPicFemale = gMonFrontPic_FinneonF, + .frontPicSizeFemale = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Finneon, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, - BACK_PIC(Finneon, 56, 40), - BACK_PIC_FEMALE(Finneon, 56, 40), + .backPic = gMonBackPic_Finneon, + .backPicSize = MON_COORDS_SIZE(56, 40), + .backPicFemale = gMonBackPic_FinneonF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Finneon), - ICON(Finneon, 0), + .palette = gMonPalette_Finneon, + .shinyPalette = gMonShinyPalette_Finneon, + .iconSprite = gMonIcon_Finneon, + .iconPalIndex = 0, FOOTPRINT(Finneon) - LEARNSETS(Finneon), + .levelUpLearnset = sFinneonLevelUpLearnset, + .teachableLearnset = sFinneonTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_LUMINEON}), }, @@ -3602,19 +3989,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lumineon, 56, 56), - FRONT_PIC_FEMALE(Lumineon, 56, 56), + .frontPic = gMonFrontPic_Lumineon, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_LumineonF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Lumineon, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Lumineon, 56, 64), - BACK_PIC_FEMALE(Lumineon, 56, 64), + .backPic = gMonBackPic_Lumineon, + .backPicSize = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_LumineonF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Lumineon), - ICON(Lumineon, 0), + .palette = gMonPalette_Lumineon, + .shinyPalette = gMonShinyPalette_Lumineon, + .iconSprite = gMonIcon_Lumineon, + .iconPalIndex = 0, FOOTPRINT(Lumineon) - LEARNSETS(Lumineon), + .levelUpLearnset = sLumineonLevelUpLearnset, + .teachableLearnset = sLumineonTeachableLearnset, }, #endif //P_FAMILY_FINNEON @@ -3654,19 +4048,26 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Snover, 64, 48), - FRONT_PIC_FEMALE(Snover, 64, 48), + .frontPic = gMonFrontPic_Snover, + .frontPicSize = MON_COORDS_SIZE(64, 48), + .frontPicFemale = gMonFrontPic_SnoverF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Snover, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Snover, 64, 56), - BACK_PIC_FEMALE(Snover, 64, 56), + .backPic = gMonBackPic_Snover, + .backPicSize = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_SnoverF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Snover), - ICON(Snover, 1), + .palette = gMonPalette_Snover, + .shinyPalette = gMonShinyPalette_Snover, + .iconSprite = gMonIcon_Snover, + .iconPalIndex = 1, FOOTPRINT(Snover) - LEARNSETS(Snover), + .levelUpLearnset = sSnoverLevelUpLearnset, + .teachableLearnset = sSnoverTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_ABOMASNOW}), }, @@ -3687,7 +4088,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_ABOMASNOW, .categoryName = _("Frost Tree"), FOOTPRINT(Abomasnow) - LEARNSETS(Abomasnow), + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, @@ -3710,16 +4112,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Abomasnow, 64, 64), - FRONT_PIC_FEMALE(Abomasnow, 64, 64), + .frontPic = gMonFrontPic_Abomasnow, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_AbomasnowF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Abomasnow, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Abomasnow, 64, 56), + .backPic = gMonBackPic_Abomasnow, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Abomasnow), - ICON(Abomasnow, 1), + .palette = gMonPalette_Abomasnow, + .shinyPalette = gMonShinyPalette_Abomasnow, + .iconSprite = gMonIcon_Abomasnow, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -3740,7 +4147,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_ABOMASNOW, .categoryName = _("Frost Tree"), FOOTPRINT(Abomasnow) - LEARNSETS(Abomasnow), + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, .formChangeTable = sAbomasnowFormChangeTable, .baseHP = 90, @@ -3763,15 +4171,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(AbomasnowMega, 64, 64), + .frontPic = gMonFrontPic_AbomasnowMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_AbomasnowMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AbomasnowMega, 64, 64), + .backPic = gMonBackPic_AbomasnowMega, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(AbomasnowMega), - ICON(AbomasnowMega, 1), + .palette = gMonPalette_AbomasnowMega, + .shinyPalette = gMonShinyPalette_AbomasnowMega, + .iconSprite = gMonIcon_AbomasnowMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -3801,7 +4213,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .baseHP = 50, @@ -3817,16 +4230,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "to surprise others. One boy's invention led\n" "to the development of many machines that\n" "can use of Rotom's unique capabilities."), - FRONT_PIC(Rotom, 56, 48), + .frontPic = gMonFrontPic_Rotom, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Rotom, .frontAnimId = ANIM_GLOW_YELLOW, .enemyMonElevation = 10, - BACK_PIC(Rotom, 56, 56), + .backPic = gMonBackPic_Rotom, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Rotom), - ICON(Rotom, 0), + .palette = gMonPalette_Rotom, + .shinyPalette = gMonShinyPalette_Rotom, + .iconSprite = gMonIcon_Rotom, + .iconPalIndex = 0, }, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -3860,7 +4277,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), @@ -3876,16 +4294,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "working properly, then the Rotom inhabiting\n" "it will become lethargic. It will gleefully\n" "burn your favorite outfit in mischief."), - FRONT_PIC(RotomHeat, 56, 48), + .frontPic = gMonFrontPic_RotomHeat, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_RotomHeat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(RotomHeat, 64, 40), + .backPic = gMonBackPic_RotomHeat, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(RotomHeat), - ICON(RotomHeat, 0), + .palette = gMonPalette_RotomHeat, + .shinyPalette = gMonShinyPalette_RotomHeat, + .iconSprite = gMonIcon_RotomHeat, + .iconPalIndex = 0, }, [SPECIES_ROTOM_WASH] = @@ -3911,7 +4333,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER), @@ -3928,16 +4351,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "pranks. The model of washing machine that\n" "Rotom can inspirit has been discontinued,\n" "so they are now traded at high prices."), - FRONT_PIC(RotomWash, 64, 56), + .frontPic = gMonFrontPic_RotomWash, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_RotomWash, .frontAnimId = ANIM_V_JUMPS_SMALL, .enemyMonElevation = 6, - BACK_PIC(RotomWash, 64, 48), + .backPic = gMonBackPic_RotomWash, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(RotomWash), - ICON(RotomWash, 0), + .palette = gMonPalette_RotomWash, + .shinyPalette = gMonShinyPalette_RotomWash, + .iconSprite = gMonIcon_RotomWash, + .iconPalIndex = 0, }, [SPECIES_ROTOM_FROST] = @@ -3963,7 +4390,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE), @@ -3979,16 +4407,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "cold pranks. You may find it's turned the\n" "bath you just filled to solid ice!\n" "It battles by spewing cold air."), - FRONT_PIC(RotomFrost, 64, 64), + .frontPic = gMonFrontPic_RotomFrost, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_RotomFrost, .frontAnimId = ANIM_H_STRETCH, .enemyMonElevation = 6, - BACK_PIC(RotomFrost, 64, 56), + .backPic = gMonBackPic_RotomFrost, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(RotomFrost), - ICON(RotomFrost, 5), + .palette = gMonPalette_RotomFrost, + .shinyPalette = gMonShinyPalette_RotomFrost, + .iconSprite = gMonIcon_RotomFrost, + .iconPalIndex = 5, }, [SPECIES_ROTOM_FAN] = @@ -4014,7 +4446,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), @@ -4030,17 +4463,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "coud inspirit was the electric fan. It uses\n" "its power over wind in its pranks, happily\n" "blowing any important documents it finds."), - FRONT_PIC(RotomFan, 64, 56), + .frontPic = gMonFrontPic_RotomFan, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_RotomFan, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .frontAnimDelay = 7, .enemyMonElevation = 6, - BACK_PIC(RotomFan, 64, 48), + .backPic = gMonBackPic_RotomFan, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(RotomFan), - ICON(RotomFan, 0), + .palette = gMonPalette_RotomFan, + .shinyPalette = gMonShinyPalette_RotomFan, + .iconSprite = gMonIcon_RotomFan, + .iconPalIndex = 0, }, [SPECIES_ROTOM_MOW] = @@ -4066,7 +4503,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Rotom) - LEARNSETS(Rotom), + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), @@ -4082,16 +4520,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = "the development of the Rotom Dex. It will\n" "mow down grass and flowers, then swagger\n" "around with pride at its accomplishments."), - FRONT_PIC(RotomMow, 56, 64), + .frontPic = gMonFrontPic_RotomMow, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_RotomMow, .frontAnimId = ANIM_TIP_MOVE_FORWARD, .enemyMonElevation = 6, - BACK_PIC(RotomMow, 56, 48), + .backPic = gMonBackPic_RotomMow, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(RotomMow), - ICON(RotomMow, 0), + .palette = gMonPalette_RotomMow, + .shinyPalette = gMonShinyPalette_RotomMow, + .iconSprite = gMonIcon_RotomMow, + .iconPalIndex = 0, }, #endif //P_FAMILY_ROTOM @@ -4138,18 +4580,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Uxie, 56, 56), + .frontPic = gMonFrontPic_Uxie, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Uxie, .frontAnimId = ANIM_SWING_CONCAVE, .enemyMonElevation = 6, - BACK_PIC(Uxie, 56, 48), + .backPic = gMonBackPic_Uxie, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Uxie), - ICON(Uxie, 0), + .palette = gMonPalette_Uxie, + .shinyPalette = gMonShinyPalette_Uxie, + .iconSprite = gMonIcon_Uxie, + .iconPalIndex = 0, FOOTPRINT(Uxie) - LEARNSETS(Uxie), + .levelUpLearnset = sUxieLevelUpLearnset, + .teachableLearnset = sUxieTeachableLearnset, }, #endif //P_FAMILY_UXIE @@ -4197,18 +4644,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mesprit, 48, 56), + .frontPic = gMonFrontPic_Mesprit, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Mesprit, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 6, - BACK_PIC(Mesprit, 64, 48), + .backPic = gMonBackPic_Mesprit, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Mesprit), - ICON(Mesprit, 0), + .palette = gMonPalette_Mesprit, + .shinyPalette = gMonShinyPalette_Mesprit, + .iconSprite = gMonIcon_Mesprit, + .iconPalIndex = 0, FOOTPRINT(Mesprit) - LEARNSETS(Mesprit), + .levelUpLearnset = sMespritLevelUpLearnset, + .teachableLearnset = sMespritTeachableLearnset, }, #endif //P_FAMILY_MESPRIT @@ -4255,18 +4707,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Azelf, 48, 64), + .frontPic = gMonFrontPic_Azelf, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Azelf, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 6, - BACK_PIC(Azelf, 64, 56), + .backPic = gMonBackPic_Azelf, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Azelf), - ICON(Azelf, 0), + .palette = gMonPalette_Azelf, + .shinyPalette = gMonShinyPalette_Azelf, + .iconSprite = gMonIcon_Azelf, + .iconPalIndex = 0, FOOTPRINT(Azelf) - LEARNSETS(Azelf), + .levelUpLearnset = sAzelfLevelUpLearnset, + .teachableLearnset = sAzelfTeachableLearnset, }, #endif //P_FAMILY_AZELF @@ -4297,7 +4754,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_DIALGA, .categoryName = _("Temporal"), FOOTPRINT(Dialga) - LEARNSETS(Dialga), + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, .formSpeciesIdTable = sDialgaFormSpeciesIdTable, .formChangeTable = sDialgaFormChangeTable, .isLegendary = TRUE, @@ -4318,15 +4776,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Dialga, 64, 64), + .frontPic = gMonFrontPic_Dialga, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dialga, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Dialga, 64, 64), + .backPic = gMonBackPic_Dialga, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Dialga), - ICON(Dialga, 2), + .palette = gMonPalette_Dialga, + .shinyPalette = gMonShinyPalette_Dialga, + .iconSprite = gMonIcon_Dialga, + .iconPalIndex = 2, }, [SPECIES_DIALGA_ORIGIN] = @@ -4347,7 +4809,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_DIALGA, .categoryName = _("Temporal"), FOOTPRINT(Dialga) - LEARNSETS(Dialga), + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, .formSpeciesIdTable = sDialgaFormSpeciesIdTable, .formChangeTable = sDialgaFormChangeTable, .isLegendary = TRUE, @@ -4368,15 +4831,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(DialgaOrigin, 64, 64), + .frontPic = gMonFrontPic_DialgaOrigin, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DialgaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DialgaOrigin, 64, 64), + .backPic = gMonBackPic_DialgaOrigin, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DialgaOrigin), - ICON(DialgaOrigin, 0), + .palette = gMonPalette_DialgaOrigin, + .shinyPalette = gMonShinyPalette_DialgaOrigin, + .iconSprite = gMonIcon_DialgaOrigin, + .iconPalIndex = 0, }, #endif //P_FAMILY_DIALGA @@ -4407,7 +4874,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_PALKIA, .categoryName = _("Spatial"), FOOTPRINT(Palkia) - LEARNSETS(Palkia), + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, .formChangeTable = sPalkiaFormChangeTable, .isLegendary = TRUE, @@ -4428,15 +4896,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 650, .trainerOffset = 16, - FRONT_PIC(Palkia, 64, 64), + .frontPic = gMonFrontPic_Palkia, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Palkia, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Palkia, 64, 64), + .backPic = gMonBackPic_Palkia, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Palkia), - ICON(Palkia, 2), + .palette = gMonPalette_Palkia, + .shinyPalette = gMonShinyPalette_Palkia, + .iconSprite = gMonIcon_Palkia, + .iconPalIndex = 2, }, [SPECIES_PALKIA_ORIGIN] = @@ -4457,7 +4929,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_PALKIA, .categoryName = _("Spatial"), FOOTPRINT(Palkia) - LEARNSETS(Palkia), + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, .formChangeTable = sPalkiaFormChangeTable, .isLegendary = TRUE, @@ -4478,15 +4951,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 650, .trainerOffset = 16, - FRONT_PIC(PalkiaOrigin, 64, 64), + .frontPic = gMonFrontPic_PalkiaOrigin, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_PalkiaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(PalkiaOrigin, 64, 64), + .backPic = gMonBackPic_PalkiaOrigin, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PalkiaOrigin), - ICON(PalkiaOrigin, 2), + .palette = gMonPalette_PalkiaOrigin, + .shinyPalette = gMonShinyPalette_PalkiaOrigin, + .iconSprite = gMonIcon_PalkiaOrigin, + .iconPalIndex = 2, }, #endif //P_FAMILY_PALKIA @@ -4532,17 +5009,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 1, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Heatran, 64, 56), + .frontPic = gMonFrontPic_Heatran, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Heatran, .frontAnimId = ANIM_GLOW_ORANGE, - BACK_PIC(Heatran, 64, 40), + .backPic = gMonBackPic_Heatran, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Heatran), - ICON(Heatran, 0), + .palette = gMonPalette_Heatran, + .shinyPalette = gMonShinyPalette_Heatran, + .iconSprite = gMonIcon_Heatran, + .iconPalIndex = 0, FOOTPRINT(Heatran) - LEARNSETS(Heatran), + .levelUpLearnset = sHeatranLevelUpLearnset, + .teachableLearnset = sHeatranTeachableLearnset, }, #endif //P_FAMILY_HEATRAN @@ -4588,17 +5070,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 610, .trainerOffset = 17, - FRONT_PIC(Regigigas, 64, 64), + .frontPic = gMonFrontPic_Regigigas, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Regigigas, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Regigigas, 64, 40), + .backPic = gMonBackPic_Regigigas, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Regigigas), - ICON(Regigigas, 0), + .palette = gMonPalette_Regigigas, + .shinyPalette = gMonShinyPalette_Regigigas, + .iconSprite = gMonIcon_Regigigas, + .iconPalIndex = 0, FOOTPRINT(Regigigas) - LEARNSETS(Regigigas), + .levelUpLearnset = sRegigigasLevelUpLearnset, + .teachableLearnset = sRegigigasTeachableLearnset, }, #endif //P_FAMILY_REGIGIGAS @@ -4628,7 +5115,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_GIRATINA, .categoryName = _("Renegade"), FOOTPRINT(Giratina) - LEARNSETS(Giratina), + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, .formChangeTable = sGiratinaFormChangeTable, .isLegendary = TRUE, @@ -4650,15 +5138,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 614, .trainerOffset = 13, - FRONT_PIC(GiratinaAltered, 64, 64), + .frontPic = gMonFrontPic_GiratinaAltered, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaAltered, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(GiratinaAltered, 64, 64), + .backPic = gMonBackPic_GiratinaAltered, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(GiratinaAltered), - ICON(GiratinaAltered, 0), + .palette = gMonPalette_GiratinaAltered, + .shinyPalette = gMonShinyPalette_GiratinaAltered, + .iconSprite = gMonIcon_GiratinaAltered, + .iconPalIndex = 0, }, [SPECIES_GIRATINA_ORIGIN] = @@ -4678,7 +5170,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .natDexNum = NATIONAL_DEX_GIRATINA, .categoryName = _("Renegade"), FOOTPRINT(Giratina) - LEARNSETS(Giratina), + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, .formChangeTable = sGiratinaFormChangeTable, .isLegendary = TRUE, @@ -4700,16 +5193,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, .trainerScale = 614, .trainerOffset = 13, - FRONT_PIC(GiratinaOrigin, 64, 64), + .frontPic = gMonFrontPic_GiratinaOrigin, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaOrigin, .frontAnimId = ANIM_LUNGE_GROW, .enemyMonElevation = 7, - BACK_PIC(GiratinaOrigin, 64, 56), + .backPic = gMonBackPic_GiratinaOrigin, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(GiratinaOrigin), - ICON(GiratinaOrigin, 0), + .palette = gMonPalette_GiratinaOrigin, + .shinyPalette = gMonShinyPalette_GiratinaOrigin, + .iconSprite = gMonIcon_GiratinaOrigin, + .iconPalIndex = 0, }, #endif //P_FAMILY_GIRATINA @@ -4755,18 +5252,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Cresselia, 64, 64), + .frontPic = gMonFrontPic_Cresselia, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Cresselia, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 3, - BACK_PIC(Cresselia, 56, 64), + .backPic = gMonBackPic_Cresselia, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Cresselia), - ICON(Cresselia, 0), + .palette = gMonPalette_Cresselia, + .shinyPalette = gMonShinyPalette_Cresselia, + .iconSprite = gMonIcon_Cresselia, + .iconPalIndex = 0, FOOTPRINT(Cresselia) - LEARNSETS(Cresselia), + .levelUpLearnset = sCresseliaLevelUpLearnset, + .teachableLearnset = sCresseliaTeachableLearnset, }, #endif //P_FAMILY_CRESSELIA @@ -4812,18 +5314,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Phione, 56, 40), + .frontPic = gMonFrontPic_Phione, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Phione, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Phione, 64, 48), + .backPic = gMonBackPic_Phione, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Phione), - ICON(Phione, 0), + .palette = gMonPalette_Phione, + .shinyPalette = gMonShinyPalette_Phione, + .iconSprite = gMonIcon_Phione, + .iconPalIndex = 0, FOOTPRINT(Phione) - LEARNSETS(Phione), + .levelUpLearnset = sPhioneLevelUpLearnset, + .teachableLearnset = sPhioneTeachableLearnset, }, [SPECIES_MANAPHY] = @@ -4867,18 +5374,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Manaphy, 64, 40), + .frontPic = gMonFrontPic_Manaphy, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Manaphy, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 10, - BACK_PIC(Manaphy, 64, 56), + .backPic = gMonBackPic_Manaphy, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Manaphy), - ICON(Manaphy, 0), + .palette = gMonPalette_Manaphy, + .shinyPalette = gMonShinyPalette_Manaphy, + .iconSprite = gMonIcon_Manaphy, + .iconPalIndex = 0, FOOTPRINT(Manaphy) - LEARNSETS(Manaphy), + .levelUpLearnset = sManaphyLevelUpLearnset, + .teachableLearnset = sManaphyTeachableLearnset, }, #endif //P_FAMILY_MANAPHY @@ -4925,18 +5437,23 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Darkrai, 64, 64), + .frontPic = gMonFrontPic_Darkrai, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Darkrai, .frontAnimId = ANIM_GLOW_BLACK, .enemyMonElevation = 4, - BACK_PIC(Darkrai, 64, 64), + .backPic = gMonBackPic_Darkrai, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Darkrai), - ICON(Darkrai, 0), + .palette = gMonPalette_Darkrai, + .shinyPalette = gMonShinyPalette_Darkrai, + .iconSprite = gMonIcon_Darkrai, + .iconPalIndex = 0, FOOTPRINT(Darkrai) - LEARNSETS(Darkrai), + .levelUpLearnset = sDarkraiLevelUpLearnset, + .teachableLearnset = sDarkraiTeachableLearnset, }, #endif //P_FAMILY_DARKRAI @@ -4989,16 +5506,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ShayminLand, 40, 32), + .frontPic = gMonFrontPic_ShayminLand, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_ShayminLand, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ShayminLand, 56, 40), + .backPic = gMonBackPic_ShayminLand, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(ShayminLand), - ICON(ShayminLand, 1), - LEARNSETS(ShayminLand), + .palette = gMonPalette_ShayminLand, + .shinyPalette = gMonShinyPalette_ShayminLand, + .iconSprite = gMonIcon_ShayminLand, + .iconPalIndex = 1, + .levelUpLearnset = sShayminLandLevelUpLearnset, + .teachableLearnset = sShayminLandTeachableLearnset, }, [SPECIES_SHAYMIN_SKY] = @@ -5046,16 +5568,21 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ShayminSky, 56, 56), + .frontPic = gMonFrontPic_ShayminSky, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_ShayminSky, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(ShayminSky, 56, 64), + .backPic = gMonBackPic_ShayminSky, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(ShayminSky), - ICON(ShayminSky, 1), - LEARNSETS(ShayminSky), + .palette = gMonPalette_ShayminSky, + .shinyPalette = gMonShinyPalette_ShayminSky, + .iconSprite = gMonIcon_ShayminSky, + .iconPalIndex = 1, + .levelUpLearnset = sShayminSkyLevelUpLearnset, + .teachableLearnset = sShayminSkyTeachableLearnset, }, #endif //P_FAMILY_SHAYMIN @@ -5098,17 +5625,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 0, \ .trainerScale = 495, \ .trainerOffset = 10, \ - FRONT_PIC(Arceus, 64, 64), \ + .frontPic = gMonFrontPic_Arceus, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Arceus, \ .frontAnimId = ANIM_GROW_VIBRATE, \ - BACK_PIC(Arceus, 64, 64), \ + .backPic = gMonBackPic_Arceus, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ .backPicYOffset = 3, \ .backAnimId = BACK_ANIM_GROW_STUTTER, \ - PALETTES(Arceus ##typeName), \ - ICON(Arceus, 1), \ + .palette = gMonPalette_Arceus ##typeName, \ + .shinyPalette = gMonShinyPalette_Arceus ##typeName, \ + .iconSprite = gMonIcon_Arceus, \ + .iconPalIndex = 1, \ FOOTPRINT(Arceus) \ - LEARNSETS(Arceus), \ + .levelUpLearnset = sArceusLevelUpLearnset, \ + .teachableLearnset = sArceusTeachableLearnset, \ .formSpeciesIdTable = sArceusFormSpeciesIdTable, \ .formChangeTable = sArceusFormChangeTable, \ .isMythical = TRUE, \ diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index 2bb1870c9ba3..4e4444fa1bf8 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -39,17 +39,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Victini, 48, 56), + .frontPic = gMonFrontPic_Victini, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Victini, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Victini, 40, 64), + .backPic = gMonBackPic_Victini, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Victini), - ICON(Victini, 0), + .palette = gMonPalette_Victini, + .shinyPalette = gMonShinyPalette_Victini, + .iconSprite = gMonIcon_Victini, + .iconPalIndex = 0, FOOTPRINT(Victini) - LEARNSETS(Victini), + .levelUpLearnset = sVictiniLevelUpLearnset, + .teachableLearnset = sVictiniTeachableLearnset, }, #endif //P_FAMILY_VICTINI @@ -88,17 +93,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Snivy, 48, 40), + .frontPic = gMonFrontPic_Snivy, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Snivy, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Snivy, 56, 48), + .backPic = gMonBackPic_Snivy, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Snivy), - ICON(Snivy, 1), + .palette = gMonPalette_Snivy, + .shinyPalette = gMonShinyPalette_Snivy, + .iconSprite = gMonIcon_Snivy, + .iconPalIndex = 1, FOOTPRINT(Snivy) - LEARNSETS(Snivy), + .levelUpLearnset = sSnivyLevelUpLearnset, + .teachableLearnset = sSnivyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_SERVINE}), }, @@ -136,17 +146,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 9, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Servine, 48, 56), + .frontPic = gMonFrontPic_Servine, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Servine, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Servine, 48, 64), + .backPic = gMonBackPic_Servine, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Servine), - ICON(Servine, 1), + .palette = gMonPalette_Servine, + .shinyPalette = gMonShinyPalette_Servine, + .iconSprite = gMonIcon_Servine, + .iconPalIndex = 1, FOOTPRINT(Servine) - LEARNSETS(Servine), + .levelUpLearnset = sServineLevelUpLearnset, + .teachableLearnset = sServineTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SERPERIOR}), }, @@ -184,17 +199,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 405, .trainerOffset = 8, - FRONT_PIC(Serperior, 64, 56), + .frontPic = gMonFrontPic_Serperior, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Serperior, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Serperior, 64, 64), + .backPic = gMonBackPic_Serperior, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Serperior), - ICON(Serperior, 1), + .palette = gMonPalette_Serperior, + .shinyPalette = gMonShinyPalette_Serperior, + .iconSprite = gMonIcon_Serperior, + .iconPalIndex = 1, FOOTPRINT(Serperior) - LEARNSETS(Serperior), + .levelUpLearnset = sSerperiorLevelUpLearnset, + .teachableLearnset = sSerperiorTeachableLearnset, }, #endif //P_FAMILY_SNIVY @@ -233,17 +253,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tepig, 40, 48), + .frontPic = gMonFrontPic_Tepig, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Tepig, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Tepig, 48, 56), + .backPic = gMonBackPic_Tepig, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Tepig), - ICON(Tepig, 0), + .palette = gMonPalette_Tepig, + .shinyPalette = gMonShinyPalette_Tepig, + .iconSprite = gMonIcon_Tepig, + .iconPalIndex = 0, FOOTPRINT(Tepig) - LEARNSETS(Tepig), + .levelUpLearnset = sTepigLevelUpLearnset, + .teachableLearnset = sTepigTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_PIGNITE}), }, @@ -281,17 +306,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 8, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Pignite, 56, 56), + .frontPic = gMonFrontPic_Pignite, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Pignite, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Pignite, 64, 64), + .backPic = gMonBackPic_Pignite, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Pignite), - ICON(Pignite, 0), + .palette = gMonPalette_Pignite, + .shinyPalette = gMonShinyPalette_Pignite, + .iconSprite = gMonIcon_Pignite, + .iconPalIndex = 0, FOOTPRINT(Pignite) - LEARNSETS(Pignite), + .levelUpLearnset = sPigniteLevelUpLearnset, + .teachableLearnset = sPigniteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_EMBOAR}), }, @@ -330,17 +360,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Emboar, 64, 64), + .frontPic = gMonFrontPic_Emboar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Emboar, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, - BACK_PIC(Emboar, 64, 64), + .backPic = gMonBackPic_Emboar, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Emboar), - ICON(Emboar, 0), + .palette = gMonPalette_Emboar, + .shinyPalette = gMonShinyPalette_Emboar, + .iconSprite = gMonIcon_Emboar, + .iconPalIndex = 0, FOOTPRINT(Emboar) - LEARNSETS(Emboar), + .levelUpLearnset = sEmboarLevelUpLearnset, + .teachableLearnset = sEmboarTeachableLearnset, }, #endif //P_FAMILY_TEPIG @@ -379,17 +414,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Oshawott, 32, 40), + .frontPic = gMonFrontPic_Oshawott, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Oshawott, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Oshawott, 40, 48), + .backPic = gMonBackPic_Oshawott, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 14, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Oshawott), - ICON(Oshawott, 0), + .palette = gMonPalette_Oshawott, + .shinyPalette = gMonShinyPalette_Oshawott, + .iconSprite = gMonIcon_Oshawott, + .iconPalIndex = 0, FOOTPRINT(Oshawott) - LEARNSETS(Oshawott), + .levelUpLearnset = sOshawottLevelUpLearnset, + .teachableLearnset = sOshawottTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DEWOTT}), }, @@ -427,17 +467,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 9, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Dewott, 40, 56), + .frontPic = gMonFrontPic_Dewott, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Dewott, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Dewott, 56, 64), + .backPic = gMonBackPic_Dewott, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Dewott), - ICON(Dewott, 0), + .palette = gMonPalette_Dewott, + .shinyPalette = gMonShinyPalette_Dewott, + .iconSprite = gMonIcon_Dewott, + .iconPalIndex = 0, FOOTPRINT(Dewott) - LEARNSETS(Dewott), + .levelUpLearnset = sDewottLevelUpLearnset, + .teachableLearnset = sDewottTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SAMUROTT}, {EVO_NONE, 0, SPECIES_SAMUROTT_HISUIAN}), }, @@ -478,16 +523,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "to its armor can fell an opponent.\n" "A simple glare from one of them is\n" "enough to intimidate most enemies."), - FRONT_PIC(Samurott, 64, 64), + .frontPic = gMonFrontPic_Samurott, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Samurott, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Samurott, 64, 56), + .backPic = gMonBackPic_Samurott, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Samurott), - ICON(Samurott, 2), - LEARNSETS(Samurott), + .palette = gMonPalette_Samurott, + .shinyPalette = gMonShinyPalette_Samurott, + .iconSprite = gMonIcon_Samurott, + .iconPalIndex = 2, + .levelUpLearnset = sSamurottLevelUpLearnset, + .teachableLearnset = sSamurottTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -527,16 +577,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "this rare form of Samurott is a\n" "product of the Pokémon's evolution in the\n" "region of Hisui."), - FRONT_PIC(SamurottHisuian, 64, 64), + .frontPic = gMonFrontPic_SamurottHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SamurottHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SamurottHisuian, 64, 64), + .backPic = gMonBackPic_SamurottHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SamurottHisuian), - ICON(SamurottHisuian, 0), - LEARNSETS(SamurottHisuian), + .palette = gMonPalette_SamurottHisuian, + .shinyPalette = gMonShinyPalette_SamurottHisuian, + .iconSprite = gMonIcon_SamurottHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sSamurottHisuianLevelUpLearnset, + .teachableLearnset = sSamurottHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -577,17 +632,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Patrat, 48, 40), + .frontPic = gMonFrontPic_Patrat, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Patrat, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Patrat, 64, 40), + .backPic = gMonBackPic_Patrat, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Patrat), - ICON(Patrat, 2), + .palette = gMonPalette_Patrat, + .shinyPalette = gMonShinyPalette_Patrat, + .iconSprite = gMonIcon_Patrat, + .iconPalIndex = 2, FOOTPRINT(Patrat) - LEARNSETS(Patrat), + .levelUpLearnset = sPatratLevelUpLearnset, + .teachableLearnset = sPatratTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_WATCHOG}), }, @@ -625,17 +685,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Watchog, 32, 64), + .frontPic = gMonFrontPic_Watchog, + .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Watchog, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Watchog, 56, 64), + .backPic = gMonBackPic_Watchog, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Watchog), - ICON(Watchog, 2), + .palette = gMonPalette_Watchog, + .shinyPalette = gMonShinyPalette_Watchog, + .iconSprite = gMonIcon_Watchog, + .iconPalIndex = 2, FOOTPRINT(Watchog) - LEARNSETS(Watchog), + .levelUpLearnset = sWatchogLevelUpLearnset, + .teachableLearnset = sWatchogTeachableLearnset, }, #endif //P_FAMILY_PATRAT @@ -674,17 +739,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lillipup, 32, 40), + .frontPic = gMonFrontPic_Lillipup, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Lillipup, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Lillipup, 48, 48), + .backPic = gMonBackPic_Lillipup, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Lillipup), - ICON(Lillipup, 2), + .palette = gMonPalette_Lillipup, + .shinyPalette = gMonShinyPalette_Lillipup, + .iconSprite = gMonIcon_Lillipup, + .iconPalIndex = 2, FOOTPRINT(Lillipup) - LEARNSETS(Lillipup), + .levelUpLearnset = sLillipupLevelUpLearnset, + .teachableLearnset = sLillipupTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_HERDIER}), }, @@ -722,17 +792,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 9, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Herdier, 48, 48), + .frontPic = gMonFrontPic_Herdier, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Herdier, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Herdier, 48, 56), + .backPic = gMonBackPic_Herdier, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Herdier), - ICON(Herdier, 2), + .palette = gMonPalette_Herdier, + .shinyPalette = gMonShinyPalette_Herdier, + .iconSprite = gMonIcon_Herdier, + .iconPalIndex = 2, FOOTPRINT(Herdier) - LEARNSETS(Herdier), + .levelUpLearnset = sHerdierLevelUpLearnset, + .teachableLearnset = sHerdierTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_STOUTLAND}), }, @@ -776,17 +851,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Stoutland, 64, 64), + .frontPic = gMonFrontPic_Stoutland, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Stoutland, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Stoutland, 64, 64), + .backPic = gMonBackPic_Stoutland, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Stoutland), - ICON(Stoutland, 2), + .palette = gMonPalette_Stoutland, + .shinyPalette = gMonShinyPalette_Stoutland, + .iconSprite = gMonIcon_Stoutland, + .iconPalIndex = 2, FOOTPRINT(Stoutland) - LEARNSETS(Stoutland), + .levelUpLearnset = sStoutlandLevelUpLearnset, + .teachableLearnset = sStoutlandTeachableLearnset, }, #endif //P_FAMILY_LILLIPUP @@ -825,17 +905,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Purrloin, 48, 48), + .frontPic = gMonFrontPic_Purrloin, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Purrloin, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Purrloin, 56, 48), + .backPic = gMonBackPic_Purrloin, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Purrloin), - ICON(Purrloin, 0), + .palette = gMonPalette_Purrloin, + .shinyPalette = gMonShinyPalette_Purrloin, + .iconSprite = gMonIcon_Purrloin, + .iconPalIndex = 0, FOOTPRINT(Purrloin) - LEARNSETS(Purrloin), + .levelUpLearnset = sPurrloinLevelUpLearnset, + .teachableLearnset = sPurrloinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LIEPARD}), }, @@ -873,17 +958,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Liepard, 64, 64), + .frontPic = gMonFrontPic_Liepard, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Liepard, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Liepard, 56, 48), + .backPic = gMonBackPic_Liepard, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Liepard), - ICON(Liepard, 0), + .palette = gMonPalette_Liepard, + .shinyPalette = gMonShinyPalette_Liepard, + .iconSprite = gMonIcon_Liepard, + .iconPalIndex = 0, FOOTPRINT(Liepard) - LEARNSETS(Liepard), + .levelUpLearnset = sLiepardLevelUpLearnset, + .teachableLearnset = sLiepardTeachableLearnset, }, #endif //P_FAMILY_PURRLOIN @@ -922,17 +1012,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pansage, 40, 48), + .frontPic = gMonFrontPic_Pansage, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Pansage, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Pansage, 48, 48), + .backPic = gMonBackPic_Pansage, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Pansage), - ICON(Pansage, 1), + .palette = gMonPalette_Pansage, + .shinyPalette = gMonShinyPalette_Pansage, + .iconSprite = gMonIcon_Pansage, + .iconPalIndex = 1, FOOTPRINT(Pansage) - LEARNSETS(Pansage), + .levelUpLearnset = sPansageLevelUpLearnset, + .teachableLearnset = sPansageTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SIMISAGE}), }, @@ -970,17 +1065,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Simisage, 64, 64), + .frontPic = gMonFrontPic_Simisage, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Simisage, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Simisage, 56, 64), + .backPic = gMonBackPic_Simisage, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Simisage), - ICON(Simisage, 1), + .palette = gMonPalette_Simisage, + .shinyPalette = gMonShinyPalette_Simisage, + .iconSprite = gMonIcon_Simisage, + .iconPalIndex = 1, FOOTPRINT(Simisage) - LEARNSETS(Simisage), + .levelUpLearnset = sSimisageLevelUpLearnset, + .teachableLearnset = sSimisageTeachableLearnset, }, #endif //P_FAMILY_PANSAGE @@ -1020,17 +1120,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pansear, 48, 48), + .frontPic = gMonFrontPic_Pansear, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Pansear, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Pansear, 48, 56), + .backPic = gMonBackPic_Pansear, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Pansear), - ICON(Pansear, 2), + .palette = gMonPalette_Pansear, + .shinyPalette = gMonShinyPalette_Pansear, + .iconSprite = gMonIcon_Pansear, + .iconPalIndex = 2, FOOTPRINT(Pansear) - LEARNSETS(Pansear), + .levelUpLearnset = sPansearLevelUpLearnset, + .teachableLearnset = sPansearTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SIMISEAR}), }, @@ -1069,17 +1174,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Simisear, 56, 56), + .frontPic = gMonFrontPic_Simisear, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Simisear, .frontAnimId = ANIM_SWING_CONCAVE_FAST, - BACK_PIC(Simisear, 64, 56), + .backPic = gMonBackPic_Simisear, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Simisear), - ICON(Simisear, 2), + .palette = gMonPalette_Simisear, + .shinyPalette = gMonShinyPalette_Simisear, + .iconSprite = gMonIcon_Simisear, + .iconPalIndex = 2, FOOTPRINT(Simisear) - LEARNSETS(Simisear), + .levelUpLearnset = sSimisearLevelUpLearnset, + .teachableLearnset = sSimisearTeachableLearnset, }, #endif //P_FAMILY_PANSEAR @@ -1118,17 +1228,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Panpour, 48, 48), + .frontPic = gMonFrontPic_Panpour, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Panpour, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Panpour, 48, 48), + .backPic = gMonBackPic_Panpour, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Panpour), - ICON(Panpour, 2), + .palette = gMonPalette_Panpour, + .shinyPalette = gMonShinyPalette_Panpour, + .iconSprite = gMonIcon_Panpour, + .iconPalIndex = 2, FOOTPRINT(Panpour) - LEARNSETS(Panpour), + .levelUpLearnset = sPanpourLevelUpLearnset, + .teachableLearnset = sPanpourTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_SIMIPOUR}), }, @@ -1166,17 +1281,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Simipour, 56, 56), + .frontPic = gMonFrontPic_Simipour, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Simipour, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Simipour, 64, 56), + .backPic = gMonBackPic_Simipour, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Simipour), - ICON(Simipour, 2), + .palette = gMonPalette_Simipour, + .shinyPalette = gMonShinyPalette_Simipour, + .iconSprite = gMonIcon_Simipour, + .iconPalIndex = 2, FOOTPRINT(Simipour) - LEARNSETS(Simipour), + .levelUpLearnset = sSimipourLevelUpLearnset, + .teachableLearnset = sSimipourTeachableLearnset, }, #endif //P_FAMILY_PANPOUR @@ -1215,18 +1335,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Munna, 32, 32), + .frontPic = gMonFrontPic_Munna, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Munna, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 7, - BACK_PIC(Munna, 48, 32), + .backPic = gMonBackPic_Munna, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Munna), - ICON(Munna, 0), + .palette = gMonPalette_Munna, + .shinyPalette = gMonShinyPalette_Munna, + .iconSprite = gMonIcon_Munna, + .iconPalIndex = 0, FOOTPRINT(Munna) - LEARNSETS(Munna), + .levelUpLearnset = sMunnaLevelUpLearnset, + .teachableLearnset = sMunnaTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_MUSHARNA}), }, @@ -1264,18 +1389,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Musharna, 64, 64), + .frontPic = gMonFrontPic_Musharna, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Musharna, .frontAnimId = ANIM_ROTATE_TO_SIDES_TWICE, .enemyMonElevation = 5, - BACK_PIC(Musharna, 64, 64), + .backPic = gMonBackPic_Musharna, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_GROW, - PALETTES(Musharna), - ICON(Musharna, 0), + .palette = gMonPalette_Musharna, + .shinyPalette = gMonShinyPalette_Musharna, + .iconSprite = gMonIcon_Musharna, + .iconPalIndex = 0, FOOTPRINT(Musharna) - LEARNSETS(Musharna), + .levelUpLearnset = sMusharnaLevelUpLearnset, + .teachableLearnset = sMusharnaTeachableLearnset, }, #endif //P_FAMILY_MUNNA @@ -1314,17 +1444,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pidove, 40, 40), + .frontPic = gMonFrontPic_Pidove, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pidove, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Pidove, 48, 40), + .backPic = gMonBackPic_Pidove, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Pidove), - ICON(Pidove, 0), + .palette = gMonPalette_Pidove, + .shinyPalette = gMonShinyPalette_Pidove, + .iconSprite = gMonIcon_Pidove, + .iconPalIndex = 0, FOOTPRINT(Pidove) - LEARNSETS(Pidove), + .levelUpLearnset = sPidoveLevelUpLearnset, + .teachableLearnset = sPidoveTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 21, SPECIES_TRANQUILL}), }, @@ -1362,17 +1497,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tranquill, 40, 56), + .frontPic = gMonFrontPic_Tranquill, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Tranquill, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Tranquill, 56, 48), + .backPic = gMonBackPic_Tranquill, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Tranquill), - ICON(Tranquill, 0), + .palette = gMonPalette_Tranquill, + .shinyPalette = gMonShinyPalette_Tranquill, + .iconSprite = gMonIcon_Tranquill, + .iconPalIndex = 0, FOOTPRINT(Tranquill) - LEARNSETS(Tranquill), + .levelUpLearnset = sTranquillLevelUpLearnset, + .teachableLearnset = sTranquillTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_UNFEZANT}), }, @@ -1416,21 +1556,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Unfezant, 56, 64), - FRONT_PIC_FEMALE(Unfezant, 56, 64), + .frontPic = gMonFrontPic_Unfezant, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicFemale = gMonFrontPic_UnfezantF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Unfezant, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Unfezant, 64, 64), - BACK_PIC_FEMALE(Unfezant, 64, 64), + .backPic = gMonBackPic_Unfezant, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_UnfezantF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Unfezant), - PALETTE_FEMALE(Unfezant), - ICON(Unfezant, 1), - ICON_FEMALE(Unfezant, 1), + .palette = gMonPalette_Unfezant, + .shinyPalette = gMonShinyPalette_Unfezant, + .paletteFemale = gMonPalette_UnfezantF, + .shinyPaletteFemale = gMonShinyPalette_UnfezantF, + .iconSprite = gMonIcon_Unfezant, + .iconPalIndex = 1, + .iconSpriteFemale = gMonIcon_UnfezantF, + .iconPalIndexFemale = 1, FOOTPRINT(Unfezant) - LEARNSETS(Unfezant), + .levelUpLearnset = sUnfezantLevelUpLearnset, + .teachableLearnset = sUnfezantTeachableLearnset, }, #endif //P_FAMILY_PIDOVE @@ -1469,17 +1618,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 8, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Blitzle, 40, 56), + .frontPic = gMonFrontPic_Blitzle, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Blitzle, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Blitzle, 56, 56), + .backPic = gMonBackPic_Blitzle, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Blitzle), - ICON(Blitzle, 2), + .palette = gMonPalette_Blitzle, + .shinyPalette = gMonShinyPalette_Blitzle, + .iconSprite = gMonIcon_Blitzle, + .iconPalIndex = 2, FOOTPRINT(Blitzle) - LEARNSETS(Blitzle), + .levelUpLearnset = sBlitzleLevelUpLearnset, + .teachableLearnset = sBlitzleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}), }, @@ -1517,17 +1671,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Zebstrika, 64, 64), + .frontPic = gMonFrontPic_Zebstrika, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zebstrika, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Zebstrika, 64, 64), + .backPic = gMonBackPic_Zebstrika, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Zebstrika), - ICON(Zebstrika, 2), + .palette = gMonPalette_Zebstrika, + .shinyPalette = gMonShinyPalette_Zebstrika, + .iconSprite = gMonIcon_Zebstrika, + .iconPalIndex = 2, FOOTPRINT(Zebstrika) - LEARNSETS(Zebstrika), + .levelUpLearnset = sZebstrikaLevelUpLearnset, + .teachableLearnset = sZebstrikaTeachableLearnset, }, #endif //P_FAMILY_BLITZLE @@ -1568,17 +1727,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Roggenrola, 24, 40), + .frontPic = gMonFrontPic_Roggenrola, + .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Roggenrola, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Roggenrola, 40, 48), + .backPic = gMonBackPic_Roggenrola, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Roggenrola), - ICON(Roggenrola, 2), + .palette = gMonPalette_Roggenrola, + .shinyPalette = gMonShinyPalette_Roggenrola, + .iconSprite = gMonIcon_Roggenrola, + .iconPalIndex = 2, FOOTPRINT(Roggenrola) - LEARNSETS(Roggenrola), + .levelUpLearnset = sRoggenrolaLevelUpLearnset, + .teachableLearnset = sRoggenrolaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLDORE}), }, @@ -1619,17 +1783,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Boldore, 56, 48), + .frontPic = gMonFrontPic_Boldore, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Boldore, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Boldore, 64, 40), + .backPic = gMonBackPic_Boldore, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 16, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Boldore), - ICON(Boldore, 0), + .palette = gMonPalette_Boldore, + .shinyPalette = gMonShinyPalette_Boldore, + .iconSprite = gMonIcon_Boldore, + .iconPalIndex = 0, FOOTPRINT(Boldore) - LEARNSETS(Boldore), + .levelUpLearnset = sBoldoreLevelUpLearnset, + .teachableLearnset = sBoldoreTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GIGALITH}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GIGALITH}), }, @@ -1676,17 +1845,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Gigalith, 64, 64), + .frontPic = gMonFrontPic_Gigalith, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Gigalith, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, - BACK_PIC(Gigalith, 56, 64), + .backPic = gMonBackPic_Gigalith, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Gigalith), - ICON(Gigalith, 0), + .palette = gMonPalette_Gigalith, + .shinyPalette = gMonShinyPalette_Gigalith, + .iconSprite = gMonIcon_Gigalith, + .iconPalIndex = 0, FOOTPRINT(Gigalith) - LEARNSETS(Gigalith), + .levelUpLearnset = sGigalithLevelUpLearnset, + .teachableLearnset = sGigalithTeachableLearnset, }, #endif //P_FAMILY_ROGGENROLA @@ -1725,18 +1899,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Woobat, 64, 32), + .frontPic = gMonFrontPic_Woobat, + .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Woobat, .frontAnimId = ANIM_FOUR_PETAL, .enemyMonElevation = 19, - BACK_PIC(Woobat, 64, 32), + .backPic = gMonBackPic_Woobat, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Woobat), - ICON(Woobat, 0), + .palette = gMonPalette_Woobat, + .shinyPalette = gMonShinyPalette_Woobat, + .iconSprite = gMonIcon_Woobat, + .iconPalIndex = 0, FOOTPRINT(Woobat) - LEARNSETS(Woobat), + .levelUpLearnset = sWoobatLevelUpLearnset, + .teachableLearnset = sWoobatTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}), }, @@ -1774,18 +1953,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swoobat, 64, 64), + .frontPic = gMonFrontPic_Swoobat, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Swoobat, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .enemyMonElevation = 10, - BACK_PIC(Swoobat, 64, 64), + .backPic = gMonBackPic_Swoobat, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Swoobat), - ICON(Swoobat, 0), + .palette = gMonPalette_Swoobat, + .shinyPalette = gMonShinyPalette_Swoobat, + .iconSprite = gMonIcon_Swoobat, + .iconPalIndex = 0, FOOTPRINT(Swoobat) - LEARNSETS(Swoobat), + .levelUpLearnset = sSwoobatLevelUpLearnset, + .teachableLearnset = sSwoobatTeachableLearnset, }, #endif //P_FAMILY_WOOBAT @@ -1825,17 +2009,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drilbur, 48, 48), + .frontPic = gMonFrontPic_Drilbur, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Drilbur, .frontAnimId = ANIM_SWING_CONCAVE_FAST_SHORT, - BACK_PIC(Drilbur, 64, 40), + .backPic = gMonBackPic_Drilbur, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Drilbur), - ICON(Drilbur, 0), + .palette = gMonPalette_Drilbur, + .shinyPalette = gMonShinyPalette_Drilbur, + .iconSprite = gMonIcon_Drilbur, + .iconPalIndex = 0, FOOTPRINT(Drilbur) - LEARNSETS(Drilbur), + .levelUpLearnset = sDrilburLevelUpLearnset, + .teachableLearnset = sDrilburTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 31, SPECIES_EXCADRILL}), }, @@ -1874,17 +2063,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Excadrill, 64, 64), + .frontPic = gMonFrontPic_Excadrill, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Excadrill, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Excadrill, 64, 64), + .backPic = gMonBackPic_Excadrill, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Excadrill), - ICON(Excadrill, 0), + .palette = gMonPalette_Excadrill, + .shinyPalette = gMonShinyPalette_Excadrill, + .iconSprite = gMonIcon_Excadrill, + .iconPalIndex = 0, FOOTPRINT(Excadrill) - LEARNSETS(Excadrill), + .levelUpLearnset = sExcadrillLevelUpLearnset, + .teachableLearnset = sExcadrillTeachableLearnset, }, #endif //P_FAMILY_DRILBUR @@ -1904,7 +2098,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_AUDINO, .categoryName = _("Hearing"), FOOTPRINT(Audino) - LEARNSETS(Audino), + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, .formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, @@ -1929,15 +2124,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Audino, 40, 48), + .frontPic = gMonFrontPic_Audino, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Audino, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Audino, 56, 56), + .backPic = gMonBackPic_Audino, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Audino), - ICON(Audino, 1), + .palette = gMonPalette_Audino, + .shinyPalette = gMonShinyPalette_Audino, + .iconSprite = gMonIcon_Audino, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -1956,7 +2155,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_AUDINO, .categoryName = _("Hearing"), FOOTPRINT(Audino) - LEARNSETS(Audino), + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, .formSpeciesIdTable = sAudinoFormSpeciesIdTable, .formChangeTable = sAudinoFormChangeTable, .baseHP = 103, @@ -1981,15 +2181,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(AudinoMega, 48, 64), + .frontPic = gMonFrontPic_AudinoMega, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_AudinoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AudinoMega, 56, 64), + .backPic = gMonBackPic_AudinoMega, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(AudinoMega), - ICON(AudinoMega, 1), + .palette = gMonPalette_AudinoMega, + .shinyPalette = gMonShinyPalette_AudinoMega, + .iconSprite = gMonIcon_AudinoMega, + .iconPalIndex = 1, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -2030,17 +2234,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Timburr, 48, 40), + .frontPic = gMonFrontPic_Timburr, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Timburr, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Timburr, 64, 40), + .backPic = gMonBackPic_Timburr, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Timburr), - ICON(Timburr, 1), + .palette = gMonPalette_Timburr, + .shinyPalette = gMonShinyPalette_Timburr, + .iconSprite = gMonIcon_Timburr, + .iconPalIndex = 1, FOOTPRINT(Timburr) - LEARNSETS(Timburr), + .levelUpLearnset = sTimburrLevelUpLearnset, + .teachableLearnset = sTimburrTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GURDURR}), }, @@ -2078,17 +2287,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gurdurr, 64, 64), + .frontPic = gMonFrontPic_Gurdurr, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Gurdurr, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Gurdurr, 64, 48), + .backPic = gMonBackPic_Gurdurr, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Gurdurr), - ICON(Gurdurr, 1), + .palette = gMonPalette_Gurdurr, + .shinyPalette = gMonShinyPalette_Gurdurr, + .iconSprite = gMonIcon_Gurdurr, + .iconPalIndex = 1, FOOTPRINT(Gurdurr) - LEARNSETS(Gurdurr), + .levelUpLearnset = sGurdurrLevelUpLearnset, + .teachableLearnset = sGurdurrTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_CONKELDURR}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_CONKELDURR}), }, @@ -2127,17 +2341,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Conkeldurr, 64, 56), + .frontPic = gMonFrontPic_Conkeldurr, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Conkeldurr, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Conkeldurr, 64, 56), + .backPic = gMonBackPic_Conkeldurr, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Conkeldurr), - ICON(Conkeldurr, 1), + .palette = gMonPalette_Conkeldurr, + .shinyPalette = gMonShinyPalette_Conkeldurr, + .iconSprite = gMonIcon_Conkeldurr, + .iconPalIndex = 1, FOOTPRINT(Conkeldurr) - LEARNSETS(Conkeldurr), + .levelUpLearnset = sConkeldurrLevelUpLearnset, + .teachableLearnset = sConkeldurrTeachableLearnset, }, #endif //P_FAMILY_TIMBURR @@ -2176,17 +2395,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tympole, 40, 40), + .frontPic = gMonFrontPic_Tympole, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tympole, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Tympole, 40, 32), + .backPic = gMonBackPic_Tympole, + .backPicSize = MON_COORDS_SIZE(40, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_H_SPRING, - PALETTES(Tympole), - ICON(Tympole, 2), + .palette = gMonPalette_Tympole, + .shinyPalette = gMonShinyPalette_Tympole, + .iconSprite = gMonIcon_Tympole, + .iconPalIndex = 2, FOOTPRINT(Tympole) - LEARNSETS(Tympole), + .levelUpLearnset = sTympoleLevelUpLearnset, + .teachableLearnset = sTympoleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_PALPITOAD}), }, @@ -2224,17 +2448,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 10, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Palpitoad, 40, 48), + .frontPic = gMonFrontPic_Palpitoad, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Palpitoad, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Palpitoad, 56, 40), + .backPic = gMonBackPic_Palpitoad, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Palpitoad), - ICON(Palpitoad, 2), + .palette = gMonPalette_Palpitoad, + .shinyPalette = gMonShinyPalette_Palpitoad, + .iconSprite = gMonIcon_Palpitoad, + .iconPalIndex = 2, FOOTPRINT(Palpitoad) - LEARNSETS(Palpitoad), + .levelUpLearnset = sPalpitoadLevelUpLearnset, + .teachableLearnset = sPalpitoadTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SEISMITOAD}), }, @@ -2278,17 +2507,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Seismitoad, 64, 64), + .frontPic = gMonFrontPic_Seismitoad, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Seismitoad, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Seismitoad, 64, 40), + .backPic = gMonBackPic_Seismitoad, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Seismitoad), - ICON(Seismitoad, 0), + .palette = gMonPalette_Seismitoad, + .shinyPalette = gMonShinyPalette_Seismitoad, + .iconSprite = gMonIcon_Seismitoad, + .iconPalIndex = 0, FOOTPRINT(Seismitoad) - LEARNSETS(Seismitoad), + .levelUpLearnset = sSeismitoadLevelUpLearnset, + .teachableLearnset = sSeismitoadTeachableLearnset, }, #endif //P_FAMILY_TYMPOLE @@ -2328,17 +2562,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Throh, 64, 48), + .frontPic = gMonFrontPic_Throh, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Throh, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Throh, 64, 48), + .backPic = gMonBackPic_Throh, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Throh), - ICON(Throh, 0), + .palette = gMonPalette_Throh, + .shinyPalette = gMonShinyPalette_Throh, + .iconSprite = gMonIcon_Throh, + .iconPalIndex = 0, FOOTPRINT(Throh) - LEARNSETS(Throh), + .levelUpLearnset = sThrohLevelUpLearnset, + .teachableLearnset = sThrohTeachableLearnset, }, #endif //P_FAMILY_THROH @@ -2379,17 +2618,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Sawk, 56, 56), + .frontPic = gMonFrontPic_Sawk, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Sawk, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Sawk, 64, 40), + .backPic = gMonBackPic_Sawk, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Sawk), - ICON(Sawk, 0), + .palette = gMonPalette_Sawk, + .shinyPalette = gMonShinyPalette_Sawk, + .iconSprite = gMonIcon_Sawk, + .iconPalIndex = 0, FOOTPRINT(Sawk) - LEARNSETS(Sawk), + .levelUpLearnset = sSawkLevelUpLearnset, + .teachableLearnset = sSawkTeachableLearnset, }, #endif //P_FAMILY_SAWK @@ -2429,17 +2673,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sewaddle, 40, 40), + .frontPic = gMonFrontPic_Sewaddle, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Sewaddle, .frontAnimId = ANIM_CIRCLE_INTO_BG, - BACK_PIC(Sewaddle, 40, 48), + .backPic = gMonBackPic_Sewaddle, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Sewaddle), - ICON(Sewaddle, 1), + .palette = gMonPalette_Sewaddle, + .shinyPalette = gMonShinyPalette_Sewaddle, + .iconSprite = gMonIcon_Sewaddle, + .iconPalIndex = 1, FOOTPRINT(Sewaddle) - LEARNSETS(Sewaddle), + .levelUpLearnset = sSewaddleLevelUpLearnset, + .teachableLearnset = sSewaddleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_SWADLOON}), }, @@ -2478,17 +2727,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swadloon, 56, 48), + .frontPic = gMonFrontPic_Swadloon, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Swadloon, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Swadloon, 48, 48), + .backPic = gMonBackPic_Swadloon, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Swadloon), - ICON(Swadloon, 1), + .palette = gMonPalette_Swadloon, + .shinyPalette = gMonShinyPalette_Swadloon, + .iconSprite = gMonIcon_Swadloon, + .iconPalIndex = 1, FOOTPRINT(Swadloon) - LEARNSETS(Swadloon), + .levelUpLearnset = sSwadloonLevelUpLearnset, + .teachableLearnset = sSwadloonTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_LEAVANNY}), }, @@ -2533,17 +2787,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Leavanny, 48, 64), + .frontPic = gMonFrontPic_Leavanny, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Leavanny, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Leavanny, 56, 64), + .backPic = gMonBackPic_Leavanny, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Leavanny), - ICON(Leavanny, 1), + .palette = gMonPalette_Leavanny, + .shinyPalette = gMonShinyPalette_Leavanny, + .iconSprite = gMonIcon_Leavanny, + .iconPalIndex = 1, FOOTPRINT(Leavanny) - LEARNSETS(Leavanny), + .levelUpLearnset = sLeavannyLevelUpLearnset, + .teachableLearnset = sLeavannyTeachableLearnset, }, #endif //P_FAMILY_SEWADDLE @@ -2587,17 +2846,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 16, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Venipede, 48, 32), + .frontPic = gMonFrontPic_Venipede, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Venipede, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Venipede, 64, 40), + .backPic = gMonBackPic_Venipede, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Venipede), - ICON(Venipede, 1), + .palette = gMonPalette_Venipede, + .shinyPalette = gMonShinyPalette_Venipede, + .iconSprite = gMonIcon_Venipede, + .iconPalIndex = 1, FOOTPRINT(Venipede) - LEARNSETS(Venipede), + .levelUpLearnset = sVenipedeLevelUpLearnset, + .teachableLearnset = sVenipedeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_WHIRLIPEDE}), }, @@ -2640,17 +2904,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Whirlipede, 56, 40), + .frontPic = gMonFrontPic_Whirlipede, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Whirlipede, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Whirlipede, 64, 40), + .backPic = gMonBackPic_Whirlipede, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Whirlipede), - ICON(Whirlipede, 2), + .palette = gMonPalette_Whirlipede, + .shinyPalette = gMonShinyPalette_Whirlipede, + .iconSprite = gMonIcon_Whirlipede, + .iconPalIndex = 2, FOOTPRINT(Whirlipede) - LEARNSETS(Whirlipede), + .levelUpLearnset = sWhirlipedeLevelUpLearnset, + .teachableLearnset = sWhirlipedeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_SCOLIPEDE}), }, @@ -2699,17 +2968,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Scolipede, 64, 64), + .frontPic = gMonFrontPic_Scolipede, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Scolipede, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Scolipede, 64, 64), + .backPic = gMonBackPic_Scolipede, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Scolipede), - ICON(Scolipede, 2), + .palette = gMonPalette_Scolipede, + .shinyPalette = gMonShinyPalette_Scolipede, + .iconSprite = gMonIcon_Scolipede, + .iconPalIndex = 2, FOOTPRINT(Scolipede) - LEARNSETS(Scolipede), + .levelUpLearnset = sScolipedeLevelUpLearnset, + .teachableLearnset = sScolipedeTeachableLearnset, }, #endif //P_FAMILY_VENIPEDE @@ -2755,17 +3029,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cottonee, 48, 32), + .frontPic = gMonFrontPic_Cottonee, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 18, .frontAnimFrames = sAnims_Cottonee, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cottonee, 64, 32), + .backPic = gMonBackPic_Cottonee, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Cottonee), - ICON(Cottonee, 1), + .palette = gMonPalette_Cottonee, + .shinyPalette = gMonShinyPalette_Cottonee, + .iconSprite = gMonIcon_Cottonee, + .iconPalIndex = 1, FOOTPRINT(Cottonee) - LEARNSETS(Cottonee), + .levelUpLearnset = sCottoneeLevelUpLearnset, + .teachableLearnset = sCottoneeTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}), }, @@ -2804,17 +3083,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Whimsicott, 56, 56), + .frontPic = gMonFrontPic_Whimsicott, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Whimsicott, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Whimsicott, 64, 48), + .backPic = gMonBackPic_Whimsicott, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Whimsicott), - ICON(Whimsicott, 1), + .palette = gMonPalette_Whimsicott, + .shinyPalette = gMonShinyPalette_Whimsicott, + .iconSprite = gMonIcon_Whimsicott, + .iconPalIndex = 1, FOOTPRINT(Whimsicott) - LEARNSETS(Whimsicott), + .levelUpLearnset = sWhimsicottLevelUpLearnset, + .teachableLearnset = sWhimsicottTeachableLearnset, }, #endif //P_FAMILY_COTTONEE @@ -2854,18 +3138,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Petilil, 32, 48), + .frontPic = gMonFrontPic_Petilil, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Petilil, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .enemyMonElevation = 7, - BACK_PIC(Petilil, 40, 56), + .backPic = gMonBackPic_Petilil, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Petilil), - ICON(Petilil, 1), + .palette = gMonPalette_Petilil, + .shinyPalette = gMonShinyPalette_Petilil, + .iconSprite = gMonIcon_Petilil, + .iconPalIndex = 1, FOOTPRINT(Petilil) - LEARNSETS(Petilil), + .levelUpLearnset = sPetililLevelUpLearnset, + .teachableLearnset = sPetililTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT}, {EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}), }, @@ -2908,16 +3197,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lilligant, 56, 64), + .frontPic = gMonFrontPic_Lilligant, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Lilligant, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lilligant, 64, 56), + .backPic = gMonBackPic_Lilligant, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Lilligant), - ICON(Lilligant, 1), - LEARNSETS(Lilligant), + .palette = gMonPalette_Lilligant, + .shinyPalette = gMonShinyPalette_Lilligant, + .iconSprite = gMonIcon_Lilligant, + .iconPalIndex = 1, + .levelUpLearnset = sLilligantLevelUpLearnset, + .teachableLearnset = sLilligantTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -2960,16 +3254,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(LilligantHisuian, 56, 64), + .frontPic = gMonFrontPic_LilligantHisuian, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LilligantHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(LilligantHisuian, 56, 56), + .backPic = gMonBackPic_LilligantHisuian, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(LilligantHisuian), - ICON(LilligantHisuian, 1), - LEARNSETS(LilligantHisuian), + .palette = gMonPalette_LilligantHisuian, + .shinyPalette = gMonShinyPalette_LilligantHisuian, + .iconSprite = gMonIcon_LilligantHisuian, + .iconPalIndex = 1, + .levelUpLearnset = sLilligantHisuianLevelUpLearnset, + .teachableLearnset = sLilligantHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -3014,16 +3313,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "meat of red Basculin is on the fatty side\n" "and it's more popular with the youth.\n" "Its temperament is vicious and aggressive."), - FRONT_PIC(BasculinRedStriped, 56, 40), + .frontPic = gMonFrontPic_BasculinRedStriped, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(BasculinRedStriped, 64, 48), + .backPic = gMonBackPic_BasculinRedStriped, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(BasculinRedStriped), - ICON(BasculinRedStriped, 1), - LEARNSETS(Basculin), + .palette = gMonPalette_BasculinRedStriped, + .shinyPalette = gMonShinyPalette_BasculinRedStriped, + .iconSprite = gMonIcon_BasculinRedStriped, + .iconPalIndex = 1, + .levelUpLearnset = sBasculinLevelUpLearnset, + .teachableLearnset = sBasculinTeachableLearnset, }, [SPECIES_BASCULIN_BLUE_STRIPED] = @@ -3064,16 +3368,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "color. The greatest foe of a school of blue\n" "Basculin is a school of red Basculin.\n" "Its flavor is light and inoffensive."), - FRONT_PIC(BasculinBlueStriped, 56, 40), + .frontPic = gMonFrontPic_BasculinBlueStriped, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(BasculinBlueStriped, 64, 48), + .backPic = gMonBackPic_BasculinBlueStriped, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(BasculinBlueStriped), - ICON(BasculinBlueStriped, 0), - LEARNSETS(Basculin), + .palette = gMonPalette_BasculinBlueStriped, + .shinyPalette = gMonShinyPalette_BasculinBlueStriped, + .iconSprite = gMonIcon_BasculinBlueStriped, + .iconPalIndex = 0, + .levelUpLearnset = sBasculinLevelUpLearnset, + .teachableLearnset = sBasculinTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -3115,16 +3424,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "a vast array of qualities with other forms,\n" "it differs in several respects, including\n" "demeanor, being much gentler than others."), - FRONT_PIC(BasculinWhiteStriped, 48, 40), + .frontPic = gMonFrontPic_BasculinWhiteStriped, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(BasculinWhiteStriped, 64, 40), + .backPic = gMonBackPic_BasculinWhiteStriped, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(BasculinWhiteStriped), - ICON(BasculinWhiteStriped, 0), - LEARNSETS(BasculinWhiteStriped), + .palette = gMonPalette_BasculinWhiteStriped, + .shinyPalette = gMonShinyPalette_BasculinWhiteStriped, + .iconSprite = gMonIcon_BasculinWhiteStriped, + .iconPalIndex = 0, + .levelUpLearnset = sBasculinWhiteStripedLevelUpLearnset, + .teachableLearnset = sBasculinWhiteStripedTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_RECOIL_DAMAGE_MALE, 294, SPECIES_BASCULEGION_MALE}, {EVO_LEVEL_RECOIL_DAMAGE_FEMALE, 294, SPECIES_BASCULEGION_FEMALE}), }, @@ -3155,7 +3469,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicYOffset = 0, .enemyMonElevation = 5, .backPicYOffset = 8, - LEARNSETS(Basculegion), + .levelUpLearnset = sBasculegionLevelUpLearnset, + .teachableLearnset = sBasculegionTeachableLearnset, .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3172,10 +3487,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "perished before fulfilling their goals of\n" "journeying upstream. No other species in\n" "all Hisui's rivers is Basculegion's equal."), - FRONT_PIC(BasculegionMale, 64, 64), - BACK_PIC(BasculegionMale, 64, 64), - PALETTES(BasculegionMale), - ICON(BasculegionMale, 1), + .frontPic = gMonFrontPic_BasculegionMale, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_BasculegionMale, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_BasculegionMale, + .shinyPalette = gMonShinyPalette_BasculegionMale, + .iconSprite = gMonIcon_BasculegionMale, + .iconPalIndex = 1, }, [SPECIES_BASCULEGION_FEMALE] = @@ -3204,7 +3523,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicYOffset = 0, .enemyMonElevation = 5, .backPicYOffset = 8, - LEARNSETS(Basculegion), + .levelUpLearnset = sBasculegionLevelUpLearnset, + .teachableLearnset = sBasculegionTeachableLearnset, .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, @@ -3220,10 +3540,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "The souls of its comrades cloak its\n" "body and propel it effortlessly\n" "through even raging rapids."), - FRONT_PIC(BasculegionFemale, 64, 64), - BACK_PIC(BasculegionFemale, 64, 64), - PALETTES(BasculegionFemale), - ICON(BasculegionFemale, 0), + .frontPic = gMonFrontPic_BasculegionFemale, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_BasculegionFemale, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_BasculegionFemale, + .shinyPalette = gMonShinyPalette_BasculegionFemale, + .iconSprite = gMonIcon_BasculegionFemale, + .iconPalIndex = 0, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN @@ -3264,17 +3588,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sandile, 48, 32), + .frontPic = gMonFrontPic_Sandile, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 18, .frontAnimFrames = sAnims_Sandile, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sandile, 64, 32), + .backPic = gMonBackPic_Sandile, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 18, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Sandile), - ICON(Sandile, 1), + .palette = gMonPalette_Sandile, + .shinyPalette = gMonShinyPalette_Sandile, + .iconSprite = gMonIcon_Sandile, + .iconPalIndex = 1, FOOTPRINT(Sandile) - LEARNSETS(Sandile), + .levelUpLearnset = sSandileLevelUpLearnset, + .teachableLearnset = sSandileTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 29, SPECIES_KROKOROK}), }, @@ -3313,17 +3642,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Krokorok, 64, 56), + .frontPic = gMonFrontPic_Krokorok, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Krokorok, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Krokorok, 56, 64), + .backPic = gMonBackPic_Krokorok, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Krokorok), - ICON(Krokorok, 1), + .palette = gMonPalette_Krokorok, + .shinyPalette = gMonShinyPalette_Krokorok, + .iconSprite = gMonIcon_Krokorok, + .iconPalIndex = 1, FOOTPRINT(Krokorok) - LEARNSETS(Krokorok), + .levelUpLearnset = sKrokorokLevelUpLearnset, + .teachableLearnset = sKrokorokTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_KROOKODILE}), }, @@ -3368,17 +3702,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Krookodile, 64, 64), + .frontPic = gMonFrontPic_Krookodile, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Krookodile, .frontAnimId = ANIM_SWING_CONCAVE_FAST_SHORT, - BACK_PIC(Krookodile, 64, 56), + .backPic = gMonBackPic_Krookodile, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Krookodile), - ICON(Krookodile, 0), + .palette = gMonPalette_Krookodile, + .shinyPalette = gMonShinyPalette_Krookodile, + .iconSprite = gMonIcon_Krookodile, + .iconPalIndex = 0, FOOTPRINT(Krookodile) - LEARNSETS(Krookodile), + .levelUpLearnset = sKrookodileLevelUpLearnset, + .teachableLearnset = sKrookodileTeachableLearnset, }, #endif //P_FAMILY_SANDILE @@ -3419,16 +3758,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Darumaka, 40, 40), + .frontPic = gMonFrontPic_Darumaka, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Darumaka, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Darumaka, 56, 48), + .backPic = gMonBackPic_Darumaka, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Darumaka), - ICON(Darumaka, 0), - LEARNSETS(Darumaka), + .palette = gMonPalette_Darumaka, + .shinyPalette = gMonShinyPalette_Darumaka, + .iconSprite = gMonIcon_Darumaka, + .iconPalIndex = 0, + .levelUpLearnset = sDarumakaLevelUpLearnset, + .teachableLearnset = sDarumakaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}), }, @@ -3460,7 +3804,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - LEARNSETS(Darmanitan), + .levelUpLearnset = sDarmanitanLevelUpLearnset, + .teachableLearnset = sDarmanitanTeachableLearnset, .formChangeTable = sDarmanitanFormChangeTable, .types = MON_TYPES(TYPE_FIRE), .bodyColor = BODY_COLOR_RED, @@ -3470,15 +3815,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "it transforms into a stone statue.\n" "Then it meditates and sharpens its\n" "mind and fights on mentally."), - FRONT_PIC(DarmanitanStandardMode, 56, 64), + .frontPic = gMonFrontPic_DarmanitanStandardMode, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanStandardMode, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(DarmanitanStandardMode, 64, 64), + .backPic = gMonBackPic_DarmanitanStandardMode, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(DarmanitanStandardMode), - ICON(DarmanitanStandardMode, 0), + .palette = gMonPalette_DarmanitanStandardMode, + .shinyPalette = gMonShinyPalette_DarmanitanStandardMode, + .iconSprite = gMonIcon_DarmanitanStandardMode, + .iconPalIndex = 0, }, [SPECIES_DARMANITAN_ZEN_MODE] = @@ -3504,7 +3853,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - LEARNSETS(Darmanitan), + .levelUpLearnset = sDarmanitanLevelUpLearnset, + .teachableLearnset = sDarmanitanTeachableLearnset, .formChangeTable = sDarmanitanFormChangeTable, .baseHP = 105, .baseAttack = 30, @@ -3518,15 +3868,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "When wounded, it stops moving. It\n" "goes as still as stone to meditate,\n" "sharpening its mind and spirit."), - FRONT_PIC(DarmanitanZenMode, 40, 40), + .frontPic = gMonFrontPic_DarmanitanZenMode, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_DarmanitanZenMode, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(DarmanitanZenMode, 56, 48), + .backPic = gMonBackPic_DarmanitanZenMode, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(DarmanitanZenMode), - ICON(DarmanitanZenMode, 0), + .palette = gMonPalette_DarmanitanZenMode, + .shinyPalette = gMonShinyPalette_DarmanitanZenMode, + .iconSprite = gMonIcon_DarmanitanZenMode, + .iconPalIndex = 0, }, #if P_GALARIAN_FORMS @@ -3566,16 +3920,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(DarumakaGalarian, 40, 40), + .frontPic = gMonFrontPic_DarumakaGalarian, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_DarumakaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DarumakaGalarian, 56, 48), + .backPic = gMonBackPic_DarumakaGalarian, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DarumakaGalarian), - ICON(DarumakaGalarian, 0), - LEARNSETS(DarumakaGalarian), + .palette = gMonPalette_DarumakaGalarian, + .shinyPalette = gMonShinyPalette_DarumakaGalarian, + .iconSprite = gMonIcon_DarumakaGalarian, + .iconPalIndex = 0, + .levelUpLearnset = sDarumakaGalarianLevelUpLearnset, + .teachableLearnset = sDarumakaGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}), }, @@ -3590,7 +3949,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - LEARNSETS(DarmanitanGalarian), + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, .formChangeTable = sDarmanitanGalarianFormChangeTable, .isGalarianForm = TRUE, .baseHP = 105, @@ -3619,15 +3979,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "through, it comes down to where people\n" "live. It stashes food in the snowball on\n" "its head, taking it home for later."), - FRONT_PIC(DarmanitanGalarianStandardMode, 56, 64), + .frontPic = gMonFrontPic_DarmanitanGalarianStandardMode, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DarmanitanGalarianStandardMode, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DarmanitanGalarianStandardMode, 56, 64), + .backPic = gMonBackPic_DarmanitanGalarianStandardMode, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DarmanitanGalarianStandardMode), - ICON(DarmanitanGalarianStandardMode, 0), + .palette = gMonPalette_DarmanitanGalarianStandardMode, + .shinyPalette = gMonShinyPalette_DarmanitanGalarianStandardMode, + .iconSprite = gMonIcon_DarmanitanGalarianStandardMode, + .iconPalIndex = 0, }, [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = @@ -3640,7 +4004,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - LEARNSETS(DarmanitanGalarian), + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, .formChangeTable = sDarmanitanGalarianFormChangeTable, .isGalarianForm = TRUE, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168, @@ -3669,15 +4034,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "enraged. It won't stop spewing flames\n" "until its rage has settled, even if\n" "its body starts to melt."), - FRONT_PIC(DarmanitanGalarianZenMode, 48, 64), + .frontPic = gMonFrontPic_DarmanitanGalarianZenMode, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanGalarianZenMode, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DarmanitanGalarianZenMode, 64, 64), + .backPic = gMonBackPic_DarmanitanGalarianZenMode, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DarmanitanGalarianZenMode), - ICON(DarmanitanGalarianZenMode, 0), + .palette = gMonPalette_DarmanitanGalarianZenMode, + .shinyPalette = gMonShinyPalette_DarmanitanGalarianZenMode, + .iconSprite = gMonIcon_DarmanitanGalarianZenMode, + .iconPalIndex = 0, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -3718,17 +4087,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 6, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Maractus, 56, 64), + .frontPic = gMonFrontPic_Maractus, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Maractus, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Maractus, 64, 64), + .backPic = gMonBackPic_Maractus, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Maractus), - ICON(Maractus, 1), + .palette = gMonPalette_Maractus, + .shinyPalette = gMonShinyPalette_Maractus, + .iconSprite = gMonIcon_Maractus, + .iconPalIndex = 1, FOOTPRINT(Maractus) - LEARNSETS(Maractus), + .levelUpLearnset = sMaractusLevelUpLearnset, + .teachableLearnset = sMaractusTeachableLearnset, }, #endif //P_FAMILY_MARACTUS @@ -3768,17 +4142,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dwebble, 40, 40), + .frontPic = gMonFrontPic_Dwebble, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Dwebble, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dwebble, 56, 32), + .backPic = gMonBackPic_Dwebble, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Dwebble), - ICON(Dwebble, 0), + .palette = gMonPalette_Dwebble, + .shinyPalette = gMonShinyPalette_Dwebble, + .iconSprite = gMonIcon_Dwebble, + .iconPalIndex = 0, FOOTPRINT(Dwebble) - LEARNSETS(Dwebble), + .levelUpLearnset = sDwebbleLevelUpLearnset, + .teachableLearnset = sDwebbleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_CRUSTLE}), }, @@ -3817,17 +4196,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Crustle, 64, 64), + .frontPic = gMonFrontPic_Crustle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Crustle, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Crustle, 64, 56), + .backPic = gMonBackPic_Crustle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Crustle), - ICON(Crustle, 2), + .palette = gMonPalette_Crustle, + .shinyPalette = gMonShinyPalette_Crustle, + .iconSprite = gMonIcon_Crustle, + .iconPalIndex = 2, FOOTPRINT(Crustle) - LEARNSETS(Crustle), + .levelUpLearnset = sCrustleLevelUpLearnset, + .teachableLearnset = sCrustleTeachableLearnset, }, #endif //P_FAMILY_DWEBBLE @@ -3867,17 +4251,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scraggy, 40, 48), + .frontPic = gMonFrontPic_Scraggy, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Scraggy, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Scraggy, 48, 56), + .backPic = gMonBackPic_Scraggy, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Scraggy), - ICON(Scraggy, 2), + .palette = gMonPalette_Scraggy, + .shinyPalette = gMonShinyPalette_Scraggy, + .iconSprite = gMonIcon_Scraggy, + .iconPalIndex = 2, FOOTPRINT(Scraggy) - LEARNSETS(Scraggy), + .levelUpLearnset = sScraggyLevelUpLearnset, + .teachableLearnset = sScraggyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_SCRAFTY}), }, @@ -3917,17 +4306,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scrafty, 48, 56), + .frontPic = gMonFrontPic_Scrafty, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Scrafty, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Scrafty, 48, 64), + .backPic = gMonBackPic_Scrafty, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_GROW, - PALETTES(Scrafty), - ICON(Scrafty, 0), + .palette = gMonPalette_Scrafty, + .shinyPalette = gMonShinyPalette_Scrafty, + .iconSprite = gMonIcon_Scrafty, + .iconPalIndex = 0, FOOTPRINT(Scrafty) - LEARNSETS(Scrafty), + .levelUpLearnset = sScraftyLevelUpLearnset, + .teachableLearnset = sScraftyTeachableLearnset, }, #endif //P_FAMILY_SCRAGGY @@ -3966,18 +4360,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Sigilyph, 64, 64), + .frontPic = gMonFrontPic_Sigilyph, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sigilyph, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, - BACK_PIC(Sigilyph, 64, 64), + .backPic = gMonBackPic_Sigilyph, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Sigilyph), - ICON(Sigilyph, 0), + .palette = gMonPalette_Sigilyph, + .shinyPalette = gMonShinyPalette_Sigilyph, + .iconSprite = gMonIcon_Sigilyph, + .iconPalIndex = 0, FOOTPRINT(Sigilyph) - LEARNSETS(Sigilyph), + .levelUpLearnset = sSigilyphLevelUpLearnset, + .teachableLearnset = sSigilyphTeachableLearnset, }, #endif //P_FAMILY_SIGILYPH @@ -4019,17 +4418,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "of people interred in graves in past ages.\n" "Each of them carries a mask that used\n" "to be its face when it was human."), - FRONT_PIC(Yamask, 48, 40), + .frontPic = gMonFrontPic_Yamask, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Yamask, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 10, - BACK_PIC(Yamask, 40, 40), + .backPic = gMonBackPic_Yamask, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Yamask), - ICON(Yamask, 0), - LEARNSETS(Yamask), + .palette = gMonPalette_Yamask, + .shinyPalette = gMonShinyPalette_Yamask, + .iconSprite = gMonIcon_Yamask, + .iconPalIndex = 0, + .levelUpLearnset = sYamaskLevelUpLearnset, + .teachableLearnset = sYamaskTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COFAGRIGUS}), }, @@ -4068,17 +4472,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Cofagrigus, 64, 64), + .frontPic = gMonFrontPic_Cofagrigus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cofagrigus, .frontAnimId = ANIM_GLOW_BLACK, - BACK_PIC(Cofagrigus, 56, 56), + .backPic = gMonBackPic_Cofagrigus, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Cofagrigus), - ICON(Cofagrigus, 0), + .palette = gMonPalette_Cofagrigus, + .shinyPalette = gMonShinyPalette_Cofagrigus, + .iconSprite = gMonIcon_Cofagrigus, + .iconPalIndex = 0, FOOTPRINT(Cofagrigus) - LEARNSETS(Cofagrigus), + .levelUpLearnset = sCofagrigusLevelUpLearnset, + .teachableLearnset = sCofagrigusTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -4118,17 +4527,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "took possession of a Yamask. The\n" "slab is said to be absorbing the\n" "Yamask's dark power."), - FRONT_PIC(YamaskGalarian, 48, 40), + .frontPic = gMonFrontPic_YamaskGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_YamaskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(YamaskGalarian, 40, 40), + .backPic = gMonBackPic_YamaskGalarian, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(YamaskGalarian), - ICON(YamaskGalarian, 2), - LEARNSETS(YamaskGalarian), + .palette = gMonPalette_YamaskGalarian, + .shinyPalette = gMonShinyPalette_YamaskGalarian, + .iconSprite = gMonIcon_YamaskGalarian, + .iconPalIndex = 2, + .levelUpLearnset = sYamaskGalarianLevelUpLearnset, + .teachableLearnset = sYamaskGalarianTeachableLearnset, .isGalarianForm = TRUE, .evolutions = EVOLUTION({EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}), }, @@ -4166,18 +4580,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Runerigus, 64, 64), + .frontPic = gMonFrontPic_Runerigus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Runerigus, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Runerigus, 64, 48), + .backPic = gMonBackPic_Runerigus, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Runerigus), - ICON(Runerigus, 2), + .palette = gMonPalette_Runerigus, + .shinyPalette = gMonShinyPalette_Runerigus, + .iconSprite = gMonIcon_Runerigus, + .iconPalIndex = 2, FOOTPRINT(Runerigus) - LEARNSETS(Runerigus), + .levelUpLearnset = sRunerigusLevelUpLearnset, + .teachableLearnset = sRunerigusTeachableLearnset, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK @@ -4217,17 +4636,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tirtouga, 56, 40), + .frontPic = gMonFrontPic_Tirtouga, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Tirtouga, .frontAnimId = ANIM_RISING_WOBBLE, - BACK_PIC(Tirtouga, 64, 32), + .backPic = gMonBackPic_Tirtouga, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Tirtouga), - ICON(Tirtouga, 2), + .palette = gMonPalette_Tirtouga, + .shinyPalette = gMonShinyPalette_Tirtouga, + .iconSprite = gMonIcon_Tirtouga, + .iconPalIndex = 2, FOOTPRINT(Tirtouga) - LEARNSETS(Tirtouga), + .levelUpLearnset = sTirtougaLevelUpLearnset, + .teachableLearnset = sTirtougaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CARRACOSTA}), }, @@ -4265,17 +4689,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Carracosta, 64, 56), + .frontPic = gMonFrontPic_Carracosta, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Carracosta, .frontAnimId = ANIM_H_SHAKE_SLOW, - BACK_PIC(Carracosta, 64, 40), + .backPic = gMonBackPic_Carracosta, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Carracosta), - ICON(Carracosta, 2), + .palette = gMonPalette_Carracosta, + .shinyPalette = gMonShinyPalette_Carracosta, + .iconSprite = gMonIcon_Carracosta, + .iconPalIndex = 2, FOOTPRINT(Carracosta) - LEARNSETS(Carracosta), + .levelUpLearnset = sCarracostaLevelUpLearnset, + .teachableLearnset = sCarracostaTeachableLearnset, }, #endif //P_FAMILY_TIRTOUGA @@ -4314,17 +4743,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Archen, 56, 40), + .frontPic = gMonFrontPic_Archen, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Archen, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Archen, 64, 32), + .backPic = gMonBackPic_Archen, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Archen), - ICON(Archen, 0), + .palette = gMonPalette_Archen, + .shinyPalette = gMonShinyPalette_Archen, + .iconSprite = gMonIcon_Archen, + .iconPalIndex = 0, FOOTPRINT(Archen) - LEARNSETS(Archen), + .levelUpLearnset = sArchenLevelUpLearnset, + .teachableLearnset = sArchenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_ARCHEOPS}), }, @@ -4362,18 +4796,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Archeops, 64, 64), + .frontPic = gMonFrontPic_Archeops, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Archeops, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 11, - BACK_PIC(Archeops, 64, 40), + .backPic = gMonBackPic_Archeops, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Archeops), - ICON(Archeops, 0), + .palette = gMonPalette_Archeops, + .shinyPalette = gMonShinyPalette_Archeops, + .iconSprite = gMonIcon_Archeops, + .iconPalIndex = 0, FOOTPRINT(Archeops) - LEARNSETS(Archeops), + .levelUpLearnset = sArcheopsLevelUpLearnset, + .teachableLearnset = sArcheopsTeachableLearnset, }, #endif //P_FAMILY_ARCHEN @@ -4413,17 +4852,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Trubbish, 48, 40), + .frontPic = gMonFrontPic_Trubbish, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Trubbish, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Trubbish, 48, 48), + .backPic = gMonBackPic_Trubbish, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Trubbish), - ICON(Trubbish, 1), + .palette = gMonPalette_Trubbish, + .shinyPalette = gMonShinyPalette_Trubbish, + .iconSprite = gMonIcon_Trubbish, + .iconPalIndex = 1, FOOTPRINT(Trubbish) - LEARNSETS(Trubbish), + .levelUpLearnset = sTrubbishLevelUpLearnset, + .teachableLearnset = sTrubbishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GARBODOR}), }, @@ -4454,7 +4898,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_GARBODOR, .categoryName = _("Trash Heap"), FOOTPRINT(Garbodor) - LEARNSETS(Garbodor), + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, .formChangeTable = sGarbodorFormChangeTable, .height = 19, @@ -4468,15 +4913,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(Garbodor, 64, 64), + .frontPic = gMonFrontPic_Garbodor, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Garbodor, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Garbodor, 64, 64), + .backPic = gMonBackPic_Garbodor, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Garbodor), - ICON(Garbodor, 1), + .palette = gMonPalette_Garbodor, + .shinyPalette = gMonShinyPalette_Garbodor, + .iconSprite = gMonIcon_Garbodor, + .iconPalIndex = 1, }, #if P_GIGANTAMAX_FORMS @@ -4507,7 +4956,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .natDexNum = NATIONAL_DEX_GARBODOR, .categoryName = _("Trash Heap"), FOOTPRINT(Garbodor) - LEARNSETS(Garbodor), + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, .formChangeTable = sGarbodorFormChangeTable, .height = 210, @@ -4521,15 +4971,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(GarbodorGigantamax, 64, 64), + .frontPic = gMonFrontPic_GarbodorGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_GarbodorGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GarbodorGigantamax, 64, 64), + .backPic = gMonBackPic_GarbodorGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GarbodorGigantamax), - ICON(GarbodorGigantamax, 0), + .palette = gMonPalette_GarbodorGigantamax, + .shinyPalette = gMonShinyPalette_GarbodorGigantamax, + .iconSprite = gMonIcon_GarbodorGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -4572,16 +5026,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "hide their true identities by transforming\n" "into people and Pokémon. Apparently, it\n" "often transforms into a silent child."), - FRONT_PIC(Zorua, 40, 48), + .frontPic = gMonFrontPic_Zorua, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Zorua, .frontAnimId = ANIM_CIRCULAR_VIBRATE, - BACK_PIC(Zorua, 64, 56), + .backPic = gMonBackPic_Zorua, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Zorua), - ICON(Zorua, 0), - LEARNSETS(Zorua), + .palette = gMonPalette_Zorua, + .shinyPalette = gMonShinyPalette_Zorua, + .iconSprite = gMonIcon_Zorua, + .iconPalIndex = 0, + .levelUpLearnset = sZoruaLevelUpLearnset, + .teachableLearnset = sZoruaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK}), }, @@ -4621,16 +5080,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "strong. It protects the safety of its\n" "pack by tricking its opponents. They\n" "defend their lair with illusory scenery."), - FRONT_PIC(Zoroark, 64, 64), + .frontPic = gMonFrontPic_Zoroark, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zoroark, .frontAnimId = ANIM_FLICKER_INCREASING, - BACK_PIC(Zoroark, 64, 56), + .backPic = gMonBackPic_Zoroark, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Zoroark), - ICON(Zoroark, 0), - LEARNSETS(Zoroark), + .palette = gMonPalette_Zoroark, + .shinyPalette = gMonShinyPalette_Zoroark, + .iconSprite = gMonIcon_Zoroark, + .iconPalIndex = 0, + .levelUpLearnset = sZoroarkLevelUpLearnset, + .teachableLearnset = sZoroarkTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -4670,16 +5134,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "which rises as energy atop its head and\n" "takes on the forms of foes. In this\n" "way, Zorua vents lingering malice."), - FRONT_PIC(ZoruaHisuian, 48, 64), + .frontPic = gMonFrontPic_ZoruaHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_ZoruaHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZoruaHisuian, 56, 64), + .backPic = gMonBackPic_ZoruaHisuian, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZoruaHisuian), - ICON(ZoruaHisuian, 0), - LEARNSETS(ZoruaHisuian), + .palette = gMonPalette_ZoruaHisuian, + .shinyPalette = gMonShinyPalette_ZoruaHisuian, + .iconSprite = gMonIcon_ZoruaHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sZoruaHisuianLevelUpLearnset, + .teachableLearnset = sZoruaHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK_HISUIAN}), }, @@ -4720,16 +5189,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "Zoroark attacks its nemeses with a bitter\n" "energy so intense, it lacerates\n" "Zoroark's own body."), - FRONT_PIC(ZoroarkHisuian, 64, 64), + .frontPic = gMonFrontPic_ZoroarkHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZoroarkHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZoroarkHisuian, 64, 64), + .backPic = gMonBackPic_ZoroarkHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZoroarkHisuian), - ICON(ZoroarkHisuian, 0), - LEARNSETS(ZoroarkHisuian), + .palette = gMonPalette_ZoroarkHisuian, + .shinyPalette = gMonShinyPalette_ZoroarkHisuian, + .iconSprite = gMonIcon_ZoroarkHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sZoroarkHisuianLevelUpLearnset, + .teachableLearnset = sZoroarkHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -4770,17 +5244,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Minccino, 56, 48), + .frontPic = gMonFrontPic_Minccino, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Minccino, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Minccino, 56, 56), + .backPic = gMonBackPic_Minccino, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Minccino), - ICON(Minccino, 0), + .palette = gMonPalette_Minccino, + .shinyPalette = gMonShinyPalette_Minccino, + .iconSprite = gMonIcon_Minccino, + .iconPalIndex = 0, FOOTPRINT(Minccino) - LEARNSETS(Minccino), + .levelUpLearnset = sMinccinoLevelUpLearnset, + .teachableLearnset = sMinccinoTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_CINCCINO}), }, @@ -4819,17 +5298,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cinccino, 56, 56), + .frontPic = gMonFrontPic_Cinccino, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Cinccino, .frontAnimId = ANIM_V_SLIDE, - BACK_PIC(Cinccino, 64, 56), + .backPic = gMonBackPic_Cinccino, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Cinccino), - ICON(Cinccino, 0), + .palette = gMonPalette_Cinccino, + .shinyPalette = gMonShinyPalette_Cinccino, + .iconSprite = gMonIcon_Cinccino, + .iconPalIndex = 0, FOOTPRINT(Cinccino) - LEARNSETS(Cinccino), + .levelUpLearnset = sCinccinoLevelUpLearnset, + .teachableLearnset = sCinccinoTeachableLearnset, }, #endif //P_FAMILY_MINCCINO @@ -4868,17 +5352,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gothita, 40, 40), + .frontPic = gMonFrontPic_Gothita, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Gothita, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Gothita, 48, 48), + .backPic = gMonBackPic_Gothita, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Gothita), - ICON(Gothita, 2), + .palette = gMonPalette_Gothita, + .shinyPalette = gMonShinyPalette_Gothita, + .iconSprite = gMonIcon_Gothita, + .iconPalIndex = 2, FOOTPRINT(Gothita) - LEARNSETS(Gothita), + .levelUpLearnset = sGothitaLevelUpLearnset, + .teachableLearnset = sGothitaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOTHORITA}), }, @@ -4916,17 +5405,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gothorita, 48, 56), + .frontPic = gMonFrontPic_Gothorita, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Gothorita, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Gothorita, 64, 56), + .backPic = gMonBackPic_Gothorita, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Gothorita), - ICON(Gothorita, 2), + .palette = gMonPalette_Gothorita, + .shinyPalette = gMonShinyPalette_Gothorita, + .iconSprite = gMonIcon_Gothorita, + .iconPalIndex = 2, FOOTPRINT(Gothorita) - LEARNSETS(Gothorita), + .levelUpLearnset = sGothoritaLevelUpLearnset, + .teachableLearnset = sGothoritaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_GOTHITELLE}), }, @@ -4964,17 +5458,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Gothitelle, 48, 64), + .frontPic = gMonFrontPic_Gothitelle, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Gothitelle, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Gothitelle, 64, 64), + .backPic = gMonBackPic_Gothitelle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Gothitelle), - ICON(Gothitelle, 2), + .palette = gMonPalette_Gothitelle, + .shinyPalette = gMonShinyPalette_Gothitelle, + .iconSprite = gMonIcon_Gothitelle, + .iconPalIndex = 2, FOOTPRINT(Gothitelle) - LEARNSETS(Gothitelle), + .levelUpLearnset = sGothitelleLevelUpLearnset, + .teachableLearnset = sGothitelleTeachableLearnset, }, #endif //P_FAMILY_GOTHITA @@ -5014,18 +5513,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Solosis, 32, 32), + .frontPic = gMonFrontPic_Solosis, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Solosis, .frontAnimId = ANIM_TWIST, .enemyMonElevation = 14, - BACK_PIC(Solosis, 48, 32), + .backPic = gMonBackPic_Solosis, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 19, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Solosis), - ICON(Solosis, 1), + .palette = gMonPalette_Solosis, + .shinyPalette = gMonShinyPalette_Solosis, + .iconSprite = gMonIcon_Solosis, + .iconPalIndex = 1, FOOTPRINT(Solosis) - LEARNSETS(Solosis), + .levelUpLearnset = sSolosisLevelUpLearnset, + .teachableLearnset = sSolosisTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_DUOSION}), }, @@ -5063,18 +5567,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Duosion, 40, 48), + .frontPic = gMonFrontPic_Duosion, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Duosion, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 7, - BACK_PIC(Duosion, 56, 48), + .backPic = gMonBackPic_Duosion, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_GROW, - PALETTES(Duosion), - ICON(Duosion, 1), + .palette = gMonPalette_Duosion, + .shinyPalette = gMonShinyPalette_Duosion, + .iconSprite = gMonIcon_Duosion, + .iconPalIndex = 1, FOOTPRINT(Duosion) - LEARNSETS(Duosion), + .levelUpLearnset = sDuosionLevelUpLearnset, + .teachableLearnset = sDuosionTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_REUNICLUS}), }, @@ -5112,18 +5621,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Reuniclus, 64, 48), + .frontPic = gMonFrontPic_Reuniclus, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Reuniclus, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Reuniclus, 64, 48), + .backPic = gMonBackPic_Reuniclus, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Reuniclus), - ICON(Reuniclus, 1), + .palette = gMonPalette_Reuniclus, + .shinyPalette = gMonShinyPalette_Reuniclus, + .iconSprite = gMonIcon_Reuniclus, + .iconPalIndex = 1, FOOTPRINT(Reuniclus) - LEARNSETS(Reuniclus), + .levelUpLearnset = sReuniclusLevelUpLearnset, + .teachableLearnset = sReuniclusTeachableLearnset, }, #endif //P_FAMILY_SOLOSIS @@ -5162,17 +5676,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ducklett, 32, 40), + .frontPic = gMonFrontPic_Ducklett, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Ducklett, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Ducklett, 48, 48), + .backPic = gMonBackPic_Ducklett, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Ducklett), - ICON(Ducklett, 0), + .palette = gMonPalette_Ducklett, + .shinyPalette = gMonShinyPalette_Ducklett, + .iconSprite = gMonIcon_Ducklett, + .iconPalIndex = 0, FOOTPRINT(Ducklett) - LEARNSETS(Ducklett), + .levelUpLearnset = sDucklettLevelUpLearnset, + .teachableLearnset = sDucklettTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_SWANNA}), }, @@ -5210,17 +5729,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swanna, 56, 64), + .frontPic = gMonFrontPic_Swanna, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Swanna, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Swanna, 64, 64), + .backPic = gMonBackPic_Swanna, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Swanna), - ICON(Swanna, 2), + .palette = gMonPalette_Swanna, + .shinyPalette = gMonShinyPalette_Swanna, + .iconSprite = gMonIcon_Swanna, + .iconPalIndex = 2, FOOTPRINT(Swanna) - LEARNSETS(Swanna), + .levelUpLearnset = sSwannaLevelUpLearnset, + .teachableLearnset = sSwannaTeachableLearnset, }, #endif //P_FAMILY_DUCKLETT @@ -5260,17 +5784,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vanillite, 32, 40), + .frontPic = gMonFrontPic_Vanillite, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Vanillite, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Vanillite, 40, 48), + .backPic = gMonBackPic_Vanillite, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Vanillite), - ICON(Vanillite, 0), + .palette = gMonPalette_Vanillite, + .shinyPalette = gMonShinyPalette_Vanillite, + .iconSprite = gMonIcon_Vanillite, + .iconPalIndex = 0, FOOTPRINT(Vanillite) - LEARNSETS(Vanillite), + .levelUpLearnset = sVanilliteLevelUpLearnset, + .teachableLearnset = sVanilliteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_VANILLISH}), }, @@ -5309,17 +5838,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vanillish, 32, 56), + .frontPic = gMonFrontPic_Vanillish, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Vanillish, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Vanillish, 48, 56), + .backPic = gMonBackPic_Vanillish, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Vanillish), - ICON(Vanillish, 2), + .palette = gMonPalette_Vanillish, + .shinyPalette = gMonShinyPalette_Vanillish, + .iconSprite = gMonIcon_Vanillish, + .iconPalIndex = 2, FOOTPRINT(Vanillish) - LEARNSETS(Vanillish), + .levelUpLearnset = sVanillishLevelUpLearnset, + .teachableLearnset = sVanillishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 47, SPECIES_VANILLUXE}), }, @@ -5358,17 +5892,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vanilluxe, 56, 56), + .frontPic = gMonFrontPic_Vanilluxe, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Vanilluxe, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Vanilluxe, 64, 64), + .backPic = gMonBackPic_Vanilluxe, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Vanilluxe), - ICON(Vanilluxe, 2), + .palette = gMonPalette_Vanilluxe, + .shinyPalette = gMonShinyPalette_Vanilluxe, + .iconSprite = gMonIcon_Vanilluxe, + .iconPalIndex = 2, FOOTPRINT(Vanilluxe) - LEARNSETS(Vanilluxe), + .levelUpLearnset = sVanilluxeLevelUpLearnset, + .teachableLearnset = sVanilluxeTeachableLearnset, }, #endif //P_FAMILY_VANILLITE @@ -5401,15 +5940,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Deerling, 32, 48), + .frontPic = gMonFrontPic_Deerling, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Deerling, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Deerling, 48, 56), + .backPic = gMonBackPic_Deerling, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, FOOTPRINT(Deerling) - LEARNSETS(Deerling), + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .description = COMPOUND_STRING( @@ -5417,8 +5959,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "depending on the season. In early\n" "spring, these Pokémon give off a\n" "delicate, sweet, and calming scent."), - PALETTES(DeerlingSpring), - ICON(DeerlingSpring, 1), + .palette = gMonPalette_DeerlingSpring, + .shinyPalette = gMonShinyPalette_DeerlingSpring, + .iconSprite = gMonIcon_DeerlingSpring, + .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}), }, @@ -5450,15 +5994,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Deerling, 32, 48), + .frontPic = gMonFrontPic_Deerling, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Deerling, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Deerling, 48, 56), + .backPic = gMonBackPic_Deerling, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, FOOTPRINT(Deerling) - LEARNSETS(Deerling), + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_GREEN, .description = COMPOUND_STRING( @@ -5466,8 +6013,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "their fields, many farmers will have\n" "several Lycanroc stand guard, as\n" "they are its natural enemy."), - PALETTES(DeerlingSummer), - ICON(DeerlingSummer, 1), + .palette = gMonPalette_DeerlingSummer, + .shinyPalette = gMonShinyPalette_DeerlingSummer, + .iconSprite = gMonIcon_DeerlingSummer, + .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}), }, @@ -5499,15 +6048,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Deerling, 32, 48), + .frontPic = gMonFrontPic_Deerling, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Deerling, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Deerling, 48, 56), + .backPic = gMonBackPic_Deerling, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, FOOTPRINT(Deerling) - LEARNSETS(Deerling), + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( @@ -5515,8 +6067,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "depending on the season. In this form,\n" "Deerling have a softly sweet scent\n" "that lingers in the nose."), - PALETTES(DeerlingAutumn), - ICON(DeerlingAutumn, 0), + .palette = gMonPalette_DeerlingAutumn, + .shinyPalette = gMonShinyPalette_DeerlingAutumn, + .iconSprite = gMonIcon_DeerlingAutumn, + .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}), }, @@ -5548,15 +6102,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Deerling, 32, 48), + .frontPic = gMonFrontPic_Deerling, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Deerling, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Deerling, 48, 56), + .backPic = gMonBackPic_Deerling, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, FOOTPRINT(Deerling) - LEARNSETS(Deerling), + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( @@ -5564,8 +6121,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "seasons, but when the Pokémon is in\n" "its Winter Form, it has hardly any\n" "scent at all."), - PALETTES(DeerlingWinter), - ICON(DeerlingWinter, 2), + .palette = gMonPalette_DeerlingWinter, + .shinyPalette = gMonShinyPalette_DeerlingWinter, + .iconSprite = gMonIcon_DeerlingWinter, + .iconPalIndex = 2, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}), }, @@ -5604,17 +6163,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) - LEARNSETS(Sawsbuck), + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Some people call Sawsbuck the harbingers\n" "of spring because the plants growing on\n" "its horns change according to the season.\n" "The leader possesses magnificent horns."), - FRONT_PIC(SawsbuckSpring, 56, 64), - BACK_PIC(SawsbuckSpring, 48, 64), - PALETTES(SawsbuckSpring), - ICON(SawsbuckSpring, 1), + .frontPic = gMonFrontPic_SawsbuckSpring, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .backPic = gMonBackPic_SawsbuckSpring, + .backPicSize = MON_COORDS_SIZE(48, 64), + .palette = gMonPalette_SawsbuckSpring, + .shinyPalette = gMonShinyPalette_SawsbuckSpring, + .iconSprite = gMonIcon_SawsbuckSpring, + .iconPalIndex = 1, }, [SPECIES_SAWSBUCK_SUMMER] = @@ -5652,17 +6216,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) - LEARNSETS(Sawsbuck), + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "The thicker and larger the\n" "branches and leaves on its antlers, the\n" "more majestic the Sawsbuck is thought\n" "to be."), - FRONT_PIC(SawsbuckSummer, 64, 64), - BACK_PIC(SawsbuckSummer, 64, 64), - PALETTES(SawsbuckSummer), - ICON(SawsbuckSummer, 1), + .frontPic = gMonFrontPic_SawsbuckSummer, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_SawsbuckSummer, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_SawsbuckSummer, + .shinyPalette = gMonShinyPalette_SawsbuckSummer, + .iconSprite = gMonIcon_SawsbuckSummer, + .iconPalIndex = 1, }, [SPECIES_SAWSBUCK_AUTUMN] = @@ -5700,17 +6269,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) - LEARNSETS(Sawsbuck), + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Sawsbuck in their Autumn Form are\n" "known for having very short\n" "tempers. The males fight each other\n" "incessantly."), - FRONT_PIC(SawsbuckAutumn, 64, 64), - BACK_PIC(SawsbuckAutumn, 64, 64), - PALETTES(SawsbuckAutumn), - ICON(SawsbuckAutumn, 1), + .frontPic = gMonFrontPic_SawsbuckAutumn, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_SawsbuckAutumn, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_SawsbuckAutumn, + .shinyPalette = gMonShinyPalette_SawsbuckAutumn, + .iconSprite = gMonIcon_SawsbuckAutumn, + .iconPalIndex = 1, }, [SPECIES_SAWSBUCK_WINTER] = @@ -5748,17 +6322,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) - LEARNSETS(Sawsbuck), + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .description = COMPOUND_STRING( "Though there are many enthusiasts\n" "for Sawsbuck as a species, this\n" "seasonal form in particular is not\n" "very popular."), - FRONT_PIC(SawsbuckWinter, 56, 64), - BACK_PIC(SawsbuckWinter, 48, 64), - PALETTES(SawsbuckWinter), - ICON(SawsbuckWinter, 1), + .frontPic = gMonFrontPic_SawsbuckWinter, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .backPic = gMonBackPic_SawsbuckWinter, + .backPicSize = MON_COORDS_SIZE(48, 64), + .palette = gMonPalette_SawsbuckWinter, + .shinyPalette = gMonShinyPalette_SawsbuckWinter, + .iconSprite = gMonIcon_SawsbuckWinter, + .iconPalIndex = 1, }, #endif //P_FAMILY_DEERLING @@ -5798,18 +6377,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Emolga, 64, 48), + .frontPic = gMonFrontPic_Emolga, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Emolga, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .enemyMonElevation = 19, - BACK_PIC(Emolga, 56, 40), + .backPic = gMonBackPic_Emolga, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 16, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Emolga), - ICON(Emolga, 2), + .palette = gMonPalette_Emolga, + .shinyPalette = gMonShinyPalette_Emolga, + .iconSprite = gMonIcon_Emolga, + .iconPalIndex = 2, FOOTPRINT(Emolga) - LEARNSETS(Emolga), + .levelUpLearnset = sEmolgaLevelUpLearnset, + .teachableLearnset = sEmolgaTeachableLearnset, }, #endif //P_FAMILY_EMOLGA @@ -5848,17 +6432,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Karrablast, 40, 48), + .frontPic = gMonFrontPic_Karrablast, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Karrablast, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Karrablast, 48, 48), + .backPic = gMonBackPic_Karrablast, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 14, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Karrablast), - ICON(Karrablast, 0), + .palette = gMonPalette_Karrablast, + .shinyPalette = gMonShinyPalette_Karrablast, + .iconSprite = gMonIcon_Karrablast, + .iconPalIndex = 0, FOOTPRINT(Karrablast) - LEARNSETS(Karrablast), + .levelUpLearnset = sKarrablastLevelUpLearnset, + .teachableLearnset = sKarrablastTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_SHELMET, SPECIES_ESCAVALIER}), }, @@ -5896,17 +6485,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Escavalier, 64, 64), + .frontPic = gMonFrontPic_Escavalier, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Escavalier, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Escavalier, 64, 56), + .backPic = gMonBackPic_Escavalier, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Escavalier), - ICON(Escavalier, 0), + .palette = gMonPalette_Escavalier, + .shinyPalette = gMonShinyPalette_Escavalier, + .iconSprite = gMonIcon_Escavalier, + .iconPalIndex = 0, FOOTPRINT(Escavalier) - LEARNSETS(Escavalier), + .levelUpLearnset = sEscavalierLevelUpLearnset, + .teachableLearnset = sEscavalierTeachableLearnset, }, #endif //P_FAMILY_KARRABLAST @@ -5947,17 +6541,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Foongus, 32, 32), + .frontPic = gMonFrontPic_Foongus, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Foongus, .frontAnimId = ANIM_SWING_CONCAVE_FAST, - BACK_PIC(Foongus, 48, 40), + .backPic = gMonBackPic_Foongus, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Foongus), - ICON(Foongus, 0), + .palette = gMonPalette_Foongus, + .shinyPalette = gMonShinyPalette_Foongus, + .iconSprite = gMonIcon_Foongus, + .iconPalIndex = 0, FOOTPRINT(Foongus) - LEARNSETS(Foongus), + .levelUpLearnset = sFoongusLevelUpLearnset, + .teachableLearnset = sFoongusTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_AMOONGUSS}), }, @@ -5998,17 +6597,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Amoonguss, 56, 56), + .frontPic = gMonFrontPic_Amoonguss, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Amoonguss, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Amoonguss, 64, 48), + .backPic = gMonBackPic_Amoonguss, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Amoonguss), - ICON(Amoonguss, 1), + .palette = gMonPalette_Amoonguss, + .shinyPalette = gMonShinyPalette_Amoonguss, + .iconSprite = gMonIcon_Amoonguss, + .iconPalIndex = 1, FOOTPRINT(Amoonguss) - LEARNSETS(Amoonguss), + .levelUpLearnset = sAmoongussLevelUpLearnset, + .teachableLearnset = sAmoongussTeachableLearnset, }, #endif //P_FAMILY_FOONGUS @@ -6047,21 +6651,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Frillish, 56, 56), - FRONT_PIC_FEMALE(Frillish, 56, 56), + .frontPic = gMonFrontPic_Frillish, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicFemale = gMonFrontPic_FrillishF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Frillish, .frontAnimId = ANIM_RISING_WOBBLE, - BACK_PIC(Frillish, 40, 56), - BACK_PIC_FEMALE(Frillish, 40, 56), + .backPic = gMonBackPic_Frillish, + .backPicSize = MON_COORDS_SIZE(40, 56), + .backPicFemale = gMonBackPic_FrillishF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Frillish), - PALETTE_FEMALE(Frillish), - ICON(Frillish, 0), - ICON_FEMALE(Frillish, 1), + .palette = gMonPalette_Frillish, + .shinyPalette = gMonShinyPalette_Frillish, + .paletteFemale = gMonPalette_FrillishF, + .shinyPaletteFemale = gMonShinyPalette_FrillishF, + .iconSprite = gMonIcon_Frillish, + .iconPalIndex = 0, + .iconSpriteFemale = gMonIcon_FrillishF, + .iconPalIndexFemale = 1, FOOTPRINT(Frillish) - LEARNSETS(Frillish), + .levelUpLearnset = sFrillishLevelUpLearnset, + .teachableLearnset = sFrillishTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_JELLICENT}), }, @@ -6099,21 +6712,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Jellicent, 64, 64), - FRONT_PIC_FEMALE(Jellicent, 64, 64), + .frontPic = gMonFrontPic_Jellicent, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_JellicentF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Jellicent, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Jellicent, 64, 48), - BACK_PIC_FEMALE(Jellicent, 64, 48), + .backPic = gMonBackPic_Jellicent, + .backPicSize = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_JellicentF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Jellicent), - PALETTE_FEMALE(Jellicent), - ICON(Jellicent, 0), - ICON_FEMALE(Jellicent, 1), + .palette = gMonPalette_Jellicent, + .shinyPalette = gMonShinyPalette_Jellicent, + .paletteFemale = gMonPalette_JellicentF, + .shinyPaletteFemale = gMonShinyPalette_JellicentF, + .iconSprite = gMonIcon_Jellicent, + .iconPalIndex = 0, + .iconSpriteFemale = gMonIcon_JellicentF, + .iconPalIndexFemale = 1, FOOTPRINT(Jellicent) - LEARNSETS(Jellicent), + .levelUpLearnset = sJellicentLevelUpLearnset, + .teachableLearnset = sJellicentTeachableLearnset, }, #endif //P_FAMILY_FRILLISH @@ -6152,17 +6774,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Alomomola, 32, 64), + .frontPic = gMonFrontPic_Alomomola, + .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Alomomola, .frontAnimId = ANIM_SWING_CONCAVE, - BACK_PIC(Alomomola, 48, 64), + .backPic = gMonBackPic_Alomomola, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Alomomola), - ICON(Alomomola, 0), + .palette = gMonPalette_Alomomola, + .shinyPalette = gMonShinyPalette_Alomomola, + .iconSprite = gMonIcon_Alomomola, + .iconPalIndex = 0, FOOTPRINT(Alomomola) - LEARNSETS(Alomomola), + .levelUpLearnset = sAlomomolaLevelUpLearnset, + .teachableLearnset = sAlomomolaTeachableLearnset, }, #endif //P_FAMILY_ALOMOMOLA @@ -6201,17 +6828,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Joltik, 32, 32), + .frontPic = gMonFrontPic_Joltik, + .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Joltik, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Joltik, 48, 32), + .backPic = gMonBackPic_Joltik, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 19, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Joltik), - ICON(Joltik, 0), + .palette = gMonPalette_Joltik, + .shinyPalette = gMonShinyPalette_Joltik, + .iconSprite = gMonIcon_Joltik, + .iconPalIndex = 0, FOOTPRINT(Joltik) - LEARNSETS(Joltik), + .levelUpLearnset = sJoltikLevelUpLearnset, + .teachableLearnset = sJoltikTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GALVANTULA}), }, @@ -6249,17 +6881,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 10, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Galvantula, 56, 48), + .frontPic = gMonFrontPic_Galvantula, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Galvantula, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, - BACK_PIC(Galvantula, 64, 40), + .backPic = gMonBackPic_Galvantula, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 18, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Galvantula), - ICON(Galvantula, 2), + .palette = gMonPalette_Galvantula, + .shinyPalette = gMonShinyPalette_Galvantula, + .iconSprite = gMonIcon_Galvantula, + .iconPalIndex = 2, FOOTPRINT(Galvantula) - LEARNSETS(Galvantula), + .levelUpLearnset = sGalvantulaLevelUpLearnset, + .teachableLearnset = sGalvantulaTeachableLearnset, }, #endif //P_FAMILY_JOLTIK @@ -6299,17 +6936,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ferroseed, 32, 40), + .frontPic = gMonFrontPic_Ferroseed, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Ferroseed, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Ferroseed, 48, 40), + .backPic = gMonBackPic_Ferroseed, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 15, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Ferroseed), - ICON(Ferroseed, 1), + .palette = gMonPalette_Ferroseed, + .shinyPalette = gMonShinyPalette_Ferroseed, + .iconSprite = gMonIcon_Ferroseed, + .iconPalIndex = 1, FOOTPRINT(Ferroseed) - LEARNSETS(Ferroseed), + .levelUpLearnset = sFerroseedLevelUpLearnset, + .teachableLearnset = sFerroseedTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_FERROTHORN}), }, @@ -6348,18 +6990,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Ferrothorn, 64, 64), + .frontPic = gMonFrontPic_Ferrothorn, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Ferrothorn, .frontAnimId = ANIM_V_SHAKE, .enemyMonElevation = 10, - BACK_PIC(Ferrothorn, 64, 40), + .backPic = gMonBackPic_Ferrothorn, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Ferrothorn), - ICON(Ferrothorn, 1), + .palette = gMonPalette_Ferrothorn, + .shinyPalette = gMonShinyPalette_Ferrothorn, + .iconSprite = gMonIcon_Ferrothorn, + .iconPalIndex = 1, FOOTPRINT(Ferrothorn) - LEARNSETS(Ferrothorn), + .levelUpLearnset = sFerrothornLevelUpLearnset, + .teachableLearnset = sFerrothornTeachableLearnset, }, #endif //P_FAMILY_FERROSEED @@ -6399,18 +7046,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Klink, 48, 40), + .frontPic = gMonFrontPic_Klink, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Klink, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 12, - BACK_PIC(Klink, 64, 64), + .backPic = gMonBackPic_Klink, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 17, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Klink), - ICON(Klink, 0), + .palette = gMonPalette_Klink, + .shinyPalette = gMonShinyPalette_Klink, + .iconSprite = gMonIcon_Klink, + .iconPalIndex = 0, FOOTPRINT(Klink) - LEARNSETS(Klink), + .levelUpLearnset = sKlinkLevelUpLearnset, + .teachableLearnset = sKlinkTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_KLANG}), }, @@ -6449,18 +7101,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Klang, 64, 56), + .frontPic = gMonFrontPic_Klang, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Klang, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 8, - BACK_PIC(Klang, 64, 64), + .backPic = gMonBackPic_Klang, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Klang), - ICON(Klang, 0), + .palette = gMonPalette_Klang, + .shinyPalette = gMonShinyPalette_Klang, + .iconSprite = gMonIcon_Klang, + .iconPalIndex = 0, FOOTPRINT(Klang) - LEARNSETS(Klang), + .levelUpLearnset = sKlangLevelUpLearnset, + .teachableLearnset = sKlangTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 49, SPECIES_KLINKLANG}), }, @@ -6499,18 +7156,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Klinklang, 64, 64), + .frontPic = gMonFrontPic_Klinklang, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Klinklang, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 4, - BACK_PIC(Klinklang, 64, 64), + .backPic = gMonBackPic_Klinklang, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Klinklang), - ICON(Klinklang, 0), + .palette = gMonPalette_Klinklang, + .shinyPalette = gMonShinyPalette_Klinklang, + .iconSprite = gMonIcon_Klinklang, + .iconPalIndex = 0, FOOTPRINT(Klinklang) - LEARNSETS(Klinklang), + .levelUpLearnset = sKlinklangLevelUpLearnset, + .teachableLearnset = sKlinklangTeachableLearnset, }, #endif //P_FAMILY_KLINK @@ -6549,18 +7211,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tynamo, 40, 24), + .frontPic = gMonFrontPic_Tynamo, + .frontPicSize = MON_COORDS_SIZE(40, 24), .frontPicYOffset = 22, .frontAnimFrames = sAnims_Tynamo, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 16, - BACK_PIC(Tynamo, 64, 24), + .backPic = gMonBackPic_Tynamo, + .backPicSize = MON_COORDS_SIZE(64, 24), .backPicYOffset = 21, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Tynamo), - ICON(Tynamo, 0), + .palette = gMonPalette_Tynamo, + .shinyPalette = gMonShinyPalette_Tynamo, + .iconSprite = gMonIcon_Tynamo, + .iconPalIndex = 0, FOOTPRINT(Tynamo) - LEARNSETS(Tynamo), + .levelUpLearnset = sTynamoLevelUpLearnset, + .teachableLearnset = sTynamoTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_EELEKTRIK}), }, @@ -6599,18 +7266,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Eelektrik, 48, 64), + .frontPic = gMonFrontPic_Eelektrik, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Eelektrik, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Eelektrik, 56, 64), + .backPic = gMonBackPic_Eelektrik, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Eelektrik), - ICON(Eelektrik, 0), + .palette = gMonPalette_Eelektrik, + .shinyPalette = gMonShinyPalette_Eelektrik, + .iconSprite = gMonIcon_Eelektrik, + .iconPalIndex = 0, FOOTPRINT(Eelektrik) - LEARNSETS(Eelektrik), + .levelUpLearnset = sEelektrikLevelUpLearnset, + .teachableLearnset = sEelektrikTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_EELEKTROSS}), }, @@ -6648,18 +7320,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Eelektross, 64, 56), + .frontPic = gMonFrontPic_Eelektross, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Eelektross, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, .enemyMonElevation = 8, - BACK_PIC(Eelektross, 64, 64), + .backPic = gMonBackPic_Eelektross, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Eelektross), - ICON(Eelektross, 0), + .palette = gMonPalette_Eelektross, + .shinyPalette = gMonShinyPalette_Eelektross, + .iconSprite = gMonIcon_Eelektross, + .iconPalIndex = 0, FOOTPRINT(Eelektross) - LEARNSETS(Eelektross), + .levelUpLearnset = sEelektrossLevelUpLearnset, + .teachableLearnset = sEelektrossTeachableLearnset, }, #endif //P_FAMILY_TYNAMO @@ -6698,17 +7375,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Elgyem, 32, 48), + .frontPic = gMonFrontPic_Elgyem, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Elgyem, .frontAnimId = ANIM_RISING_WOBBLE, - BACK_PIC(Elgyem, 48, 56), + .backPic = gMonBackPic_Elgyem, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Elgyem), - ICON(Elgyem, 0), + .palette = gMonPalette_Elgyem, + .shinyPalette = gMonShinyPalette_Elgyem, + .iconSprite = gMonIcon_Elgyem, + .iconPalIndex = 0, FOOTPRINT(Elgyem) - LEARNSETS(Elgyem), + .levelUpLearnset = sElgyemLevelUpLearnset, + .teachableLearnset = sElgyemTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_BEHEEYEM}), }, @@ -6746,17 +7428,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Beheeyem, 48, 56), + .frontPic = gMonFrontPic_Beheeyem, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Beheeyem, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Beheeyem, 64, 64), + .backPic = gMonBackPic_Beheeyem, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Beheeyem), - ICON(Beheeyem, 2), + .palette = gMonPalette_Beheeyem, + .shinyPalette = gMonShinyPalette_Beheeyem, + .iconSprite = gMonIcon_Beheeyem, + .iconPalIndex = 2, FOOTPRINT(Beheeyem) - LEARNSETS(Beheeyem), + .levelUpLearnset = sBeheeyemLevelUpLearnset, + .teachableLearnset = sBeheeyemTeachableLearnset, }, #endif //P_FAMILY_ELGYEM @@ -6800,17 +7487,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Litwick, 32, 40), + .frontPic = gMonFrontPic_Litwick, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Litwick, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Litwick, 40, 40), + .backPic = gMonBackPic_Litwick, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Litwick), - ICON(Litwick, 2), + .palette = gMonPalette_Litwick, + .shinyPalette = gMonShinyPalette_Litwick, + .iconSprite = gMonIcon_Litwick, + .iconPalIndex = 2, FOOTPRINT(Litwick) - LEARNSETS(Litwick), + .levelUpLearnset = sLitwickLevelUpLearnset, + .teachableLearnset = sLitwickTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 41, SPECIES_LAMPENT}), }, @@ -6852,18 +7544,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lampent, 56, 48), + .frontPic = gMonFrontPic_Lampent, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Lampent, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 6, - BACK_PIC(Lampent, 56, 48), + .backPic = gMonBackPic_Lampent, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Lampent), - ICON(Lampent, 2), + .palette = gMonPalette_Lampent, + .shinyPalette = gMonShinyPalette_Lampent, + .iconSprite = gMonIcon_Lampent, + .iconPalIndex = 2, FOOTPRINT(Lampent) - LEARNSETS(Lampent), + .levelUpLearnset = sLampentLevelUpLearnset, + .teachableLearnset = sLampentTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_CHANDELURE}), }, @@ -6905,18 +7602,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Chandelure, 64, 64), + .frontPic = gMonFrontPic_Chandelure, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Chandelure, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 6, - BACK_PIC(Chandelure, 64, 64), + .backPic = gMonBackPic_Chandelure, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Chandelure), - ICON(Chandelure, 2), + .palette = gMonPalette_Chandelure, + .shinyPalette = gMonShinyPalette_Chandelure, + .iconSprite = gMonIcon_Chandelure, + .iconPalIndex = 2, FOOTPRINT(Chandelure) - LEARNSETS(Chandelure), + .levelUpLearnset = sChandelureLevelUpLearnset, + .teachableLearnset = sChandelureTeachableLearnset, }, #endif //P_FAMILY_LITWICK @@ -6955,17 +7657,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Axew, 40, 48), + .frontPic = gMonFrontPic_Axew, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Axew, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Axew, 48, 56), + .backPic = gMonBackPic_Axew, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Axew), - ICON(Axew, 1), + .palette = gMonPalette_Axew, + .shinyPalette = gMonShinyPalette_Axew, + .iconSprite = gMonIcon_Axew, + .iconPalIndex = 1, FOOTPRINT(Axew) - LEARNSETS(Axew), + .levelUpLearnset = sAxewLevelUpLearnset, + .teachableLearnset = sAxewTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_FRAXURE}), }, @@ -7003,17 +7710,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Fraxure, 56, 56), + .frontPic = gMonFrontPic_Fraxure, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Fraxure, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Fraxure, 64, 48), + .backPic = gMonBackPic_Fraxure, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Fraxure), - ICON(Fraxure, 1), + .palette = gMonPalette_Fraxure, + .shinyPalette = gMonShinyPalette_Fraxure, + .iconSprite = gMonIcon_Fraxure, + .iconPalIndex = 1, FOOTPRINT(Fraxure) - LEARNSETS(Fraxure), + .levelUpLearnset = sFraxureLevelUpLearnset, + .teachableLearnset = sFraxureTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_HAXORUS}), }, @@ -7051,17 +7763,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Haxorus, 64, 64), + .frontPic = gMonFrontPic_Haxorus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Haxorus, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Haxorus, 64, 56), + .backPic = gMonBackPic_Haxorus, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Haxorus), - ICON(Haxorus, 2), + .palette = gMonPalette_Haxorus, + .shinyPalette = gMonShinyPalette_Haxorus, + .iconSprite = gMonIcon_Haxorus, + .iconPalIndex = 2, FOOTPRINT(Haxorus) - LEARNSETS(Haxorus), + .levelUpLearnset = sHaxorusLevelUpLearnset, + .teachableLearnset = sHaxorusTeachableLearnset, }, #endif //P_FAMILY_AXEW @@ -7100,17 +7817,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cubchoo, 32, 40), + .frontPic = gMonFrontPic_Cubchoo, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Cubchoo, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cubchoo, 40, 40), + .backPic = gMonBackPic_Cubchoo, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Cubchoo), - ICON(Cubchoo, 0), + .palette = gMonPalette_Cubchoo, + .shinyPalette = gMonShinyPalette_Cubchoo, + .iconSprite = gMonIcon_Cubchoo, + .iconPalIndex = 0, FOOTPRINT(Cubchoo) - LEARNSETS(Cubchoo), + .levelUpLearnset = sCubchooLevelUpLearnset, + .teachableLearnset = sCubchooTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_BEARTIC}), }, @@ -7148,17 +7870,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 399, .trainerOffset = 4, - FRONT_PIC(Beartic, 64, 64), + .frontPic = gMonFrontPic_Beartic, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Beartic, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Beartic, 64, 64), + .backPic = gMonBackPic_Beartic, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Beartic), - ICON(Beartic, 0), + .palette = gMonPalette_Beartic, + .shinyPalette = gMonShinyPalette_Beartic, + .iconSprite = gMonIcon_Beartic, + .iconPalIndex = 0, FOOTPRINT(Beartic) - LEARNSETS(Beartic), + .levelUpLearnset = sBearticLevelUpLearnset, + .teachableLearnset = sBearticTeachableLearnset, }, #endif //P_FAMILY_CUBCHOO @@ -7203,18 +7930,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cryogonal, 56, 64), + .frontPic = gMonFrontPic_Cryogonal, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cryogonal, .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = 3, - BACK_PIC(Cryogonal, 56, 64), + .backPic = gMonBackPic_Cryogonal, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Cryogonal), - ICON(Cryogonal, 0), + .palette = gMonPalette_Cryogonal, + .shinyPalette = gMonShinyPalette_Cryogonal, + .iconSprite = gMonIcon_Cryogonal, + .iconPalIndex = 0, FOOTPRINT(Cryogonal) - LEARNSETS(Cryogonal), + .levelUpLearnset = sCryogonalLevelUpLearnset, + .teachableLearnset = sCryogonalTeachableLearnset, }, #endif //P_FAMILY_CRYOGONAL @@ -7253,17 +7985,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shelmet, 40, 40), + .frontPic = gMonFrontPic_Shelmet, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Shelmet, .frontAnimId = ANIM_TWIST, - BACK_PIC(Shelmet, 64, 32), + .backPic = gMonBackPic_Shelmet, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 19, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Shelmet), - ICON(Shelmet, 1), + .palette = gMonPalette_Shelmet, + .shinyPalette = gMonShinyPalette_Shelmet, + .iconSprite = gMonIcon_Shelmet, + .iconPalIndex = 1, FOOTPRINT(Shelmet) - LEARNSETS(Shelmet), + .levelUpLearnset = sShelmetLevelUpLearnset, + .teachableLearnset = sShelmetTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_SPECIFIC_MON, SPECIES_KARRABLAST, SPECIES_ACCELGOR}), }, @@ -7301,17 +8038,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 9, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Accelgor, 64, 56), + .frontPic = gMonFrontPic_Accelgor, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Accelgor, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Accelgor, 64, 64), + .backPic = gMonBackPic_Accelgor, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_H_SPRING_REPEATED, - PALETTES(Accelgor), - ICON(Accelgor, 1), + .palette = gMonPalette_Accelgor, + .shinyPalette = gMonShinyPalette_Accelgor, + .iconSprite = gMonIcon_Accelgor, + .iconPalIndex = 1, FOOTPRINT(Accelgor) - LEARNSETS(Accelgor), + .levelUpLearnset = sAccelgorLevelUpLearnset, + .teachableLearnset = sAccelgorTeachableLearnset, }, #endif //P_FAMILY_SHELMET @@ -7353,16 +8095,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "seashore. Then it waits. When prey touch\n" "it, it delivers a jolt of electricity.\n" "It smiles when transmitting electricity."), - FRONT_PIC(Stunfisk, 56, 48), + .frontPic = gMonFrontPic_Stunfisk, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Stunfisk, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Stunfisk, 64, 24), + .backPic = gMonBackPic_Stunfisk, + .backPicSize = MON_COORDS_SIZE(64, 24), .backPicYOffset = 22, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Stunfisk), - ICON(Stunfisk, 2), - LEARNSETS(Stunfisk), + .palette = gMonPalette_Stunfisk, + .shinyPalette = gMonShinyPalette_Stunfisk, + .iconSprite = gMonIcon_Stunfisk, + .iconPalIndex = 2, + .levelUpLearnset = sStunfiskLevelUpLearnset, + .teachableLearnset = sStunfiskTeachableLearnset, }, #if P_GALARIAN_FORMS @@ -7402,16 +8149,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "as it lies in wait in the mud. When\n" "prey gets close, Stunfisk clamps its\n" "jagged steel fins down on them."), - FRONT_PIC(StunfiskGalarian, 48, 40), + .frontPic = gMonFrontPic_StunfiskGalarian, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_StunfiskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(StunfiskGalarian, 64, 24), + .backPic = gMonBackPic_StunfiskGalarian, + .backPicSize = MON_COORDS_SIZE(64, 24), .backPicYOffset = 23, //.backAnimId = BACK_ANIM_NONE, - PALETTES(StunfiskGalarian), - ICON(StunfiskGalarian, 1), - LEARNSETS(StunfiskGalarian), + .palette = gMonPalette_StunfiskGalarian, + .shinyPalette = gMonShinyPalette_StunfiskGalarian, + .iconSprite = gMonIcon_StunfiskGalarian, + .iconPalIndex = 1, + .levelUpLearnset = sStunfiskGalarianLevelUpLearnset, + .teachableLearnset = sStunfiskGalarianTeachableLearnset, .isGalarianForm = TRUE, }, #endif //P_GALARIAN_FORMS @@ -7452,17 +8204,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mienfoo, 40, 48), + .frontPic = gMonFrontPic_Mienfoo, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Mienfoo, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Mienfoo, 56, 40), + .backPic = gMonBackPic_Mienfoo, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Mienfoo), - ICON(Mienfoo, 1), + .palette = gMonPalette_Mienfoo, + .shinyPalette = gMonShinyPalette_Mienfoo, + .iconSprite = gMonIcon_Mienfoo, + .iconPalIndex = 1, FOOTPRINT(Mienfoo) - LEARNSETS(Mienfoo), + .levelUpLearnset = sMienfooLevelUpLearnset, + .teachableLearnset = sMienfooTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_MIENSHAO}), }, @@ -7500,17 +8257,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Mienshao, 64, 56), + .frontPic = gMonFrontPic_Mienshao, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Mienshao, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Mienshao, 56, 56), + .backPic = gMonBackPic_Mienshao, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Mienshao), - ICON(Mienshao, 2), + .palette = gMonPalette_Mienshao, + .shinyPalette = gMonShinyPalette_Mienshao, + .iconSprite = gMonIcon_Mienshao, + .iconPalIndex = 2, FOOTPRINT(Mienshao) - LEARNSETS(Mienshao), + .levelUpLearnset = sMienshaoLevelUpLearnset, + .teachableLearnset = sMienshaoTeachableLearnset, }, #endif //P_FAMILY_MIENFOO @@ -7550,17 +8312,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Druddigon, 64, 64), + .frontPic = gMonFrontPic_Druddigon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Druddigon, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, - BACK_PIC(Druddigon, 64, 56), + .backPic = gMonBackPic_Druddigon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Druddigon), - ICON(Druddigon, 0), + .palette = gMonPalette_Druddigon, + .shinyPalette = gMonShinyPalette_Druddigon, + .iconSprite = gMonIcon_Druddigon, + .iconPalIndex = 0, FOOTPRINT(Druddigon) - LEARNSETS(Druddigon), + .levelUpLearnset = sDruddigonLevelUpLearnset, + .teachableLearnset = sDruddigonTeachableLearnset, }, #endif //P_FAMILY_DRUDDIGON @@ -7601,17 +8368,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Golett, 56, 56), + .frontPic = gMonFrontPic_Golett, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Golett, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Golett, 64, 56), + .backPic = gMonBackPic_Golett, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Golett), - ICON(Golett, 0), + .palette = gMonPalette_Golett, + .shinyPalette = gMonShinyPalette_Golett, + .iconSprite = gMonIcon_Golett, + .iconPalIndex = 0, FOOTPRINT(Golett) - LEARNSETS(Golett), + .levelUpLearnset = sGolettLevelUpLearnset, + .teachableLearnset = sGolettTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_GOLURK}), }, @@ -7651,17 +8423,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 300, .trainerOffset = 0, - FRONT_PIC(Golurk, 64, 64), + .frontPic = gMonFrontPic_Golurk, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Golurk, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Golurk, 64, 56), + .backPic = gMonBackPic_Golurk, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Golurk), - ICON(Golurk, 0), + .palette = gMonPalette_Golurk, + .shinyPalette = gMonShinyPalette_Golurk, + .iconSprite = gMonIcon_Golurk, + .iconPalIndex = 0, FOOTPRINT(Golurk) - LEARNSETS(Golurk), + .levelUpLearnset = sGolurkLevelUpLearnset, + .teachableLearnset = sGolurkTeachableLearnset, }, #endif //P_FAMILY_GOLETT @@ -7700,17 +8477,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pawniard, 56, 48), + .frontPic = gMonFrontPic_Pawniard, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Pawniard, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Pawniard, 64, 48), + .backPic = gMonBackPic_Pawniard, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Pawniard), - ICON(Pawniard, 0), + .palette = gMonPalette_Pawniard, + .shinyPalette = gMonShinyPalette_Pawniard, + .iconSprite = gMonIcon_Pawniard, + .iconPalIndex = 0, FOOTPRINT(Pawniard) - LEARNSETS(Pawniard), + .levelUpLearnset = sPawniardLevelUpLearnset, + .teachableLearnset = sPawniardTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 52, SPECIES_BISHARP}), }, @@ -7748,17 +8530,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Bisharp, 48, 64), + .frontPic = gMonFrontPic_Bisharp, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Bisharp, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Bisharp, 64, 64), + .backPic = gMonBackPic_Bisharp, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Bisharp), - ICON(Bisharp, 0), + .palette = gMonPalette_Bisharp, + .shinyPalette = gMonShinyPalette_Bisharp, + .iconSprite = gMonIcon_Bisharp, + .iconPalIndex = 0, FOOTPRINT(Bisharp) - LEARNSETS(Bisharp), + .levelUpLearnset = sBisharpLevelUpLearnset, + .teachableLearnset = sBisharpTeachableLearnset, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_KINGAMBIT}), }, @@ -7797,17 +8584,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kingambit, 64, 64), + .frontPic = gMonFrontPic_Kingambit, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Kingambit, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kingambit, 64, 64), + .backPic = gMonBackPic_Kingambit, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Kingambit), - ICON(Kingambit, 3), + .palette = gMonPalette_Kingambit, + .shinyPalette = gMonShinyPalette_Kingambit, + .iconSprite = gMonIcon_Kingambit, + .iconPalIndex = 3, //FOOTPRINT(Kingambit) - LEARNSETS(Kingambit), + .levelUpLearnset = sKingambitLevelUpLearnset, + .teachableLearnset = sKingambitTeachableLearnset, }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD @@ -7847,17 +8639,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Bouffalant, 64, 56), + .frontPic = gMonFrontPic_Bouffalant, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Bouffalant, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Bouffalant, 64, 56), + .backPic = gMonBackPic_Bouffalant, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Bouffalant), - ICON(Bouffalant, 2), + .palette = gMonPalette_Bouffalant, + .shinyPalette = gMonShinyPalette_Bouffalant, + .iconSprite = gMonIcon_Bouffalant, + .iconPalIndex = 2, FOOTPRINT(Bouffalant) - LEARNSETS(Bouffalant), + .levelUpLearnset = sBouffalantLevelUpLearnset, + .teachableLearnset = sBouffalantTeachableLearnset, }, #endif //P_FAMILY_BOUFFALANT @@ -7896,17 +8693,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rufflet, 32, 48), + .frontPic = gMonFrontPic_Rufflet, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Rufflet, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Rufflet, 48, 56), + .backPic = gMonBackPic_Rufflet, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Rufflet), - ICON(Rufflet, 2), + .palette = gMonPalette_Rufflet, + .shinyPalette = gMonShinyPalette_Rufflet, + .iconSprite = gMonIcon_Rufflet, + .iconPalIndex = 2, FOOTPRINT(Rufflet) - LEARNSETS(Rufflet), + .levelUpLearnset = sRuffletLevelUpLearnset, + .teachableLearnset = sRuffletTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BRAVIARY}, {EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}), }, @@ -7947,17 +8749,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Braviary, 64, 64), + .frontPic = gMonFrontPic_Braviary, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Braviary, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(Braviary, 64, 48), + .backPic = gMonBackPic_Braviary, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Braviary), - ICON(Braviary, 0), - LEARNSETS(Braviary), + .palette = gMonPalette_Braviary, + .shinyPalette = gMonShinyPalette_Braviary, + .iconSprite = gMonIcon_Braviary, + .iconPalIndex = 0, + .levelUpLearnset = sBraviaryLevelUpLearnset, + .teachableLearnset = sBraviaryTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -7996,17 +8803,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(BraviaryHisuian, 64, 64), + .frontPic = gMonFrontPic_BraviaryHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_BraviaryHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, - BACK_PIC(BraviaryHisuian, 64, 56), + .backPic = gMonBackPic_BraviaryHisuian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(BraviaryHisuian), - ICON(BraviaryHisuian, 2), - LEARNSETS(BraviaryHisuian), + .palette = gMonPalette_BraviaryHisuian, + .shinyPalette = gMonShinyPalette_BraviaryHisuian, + .iconSprite = gMonIcon_BraviaryHisuian, + .iconPalIndex = 2, + .levelUpLearnset = sBraviaryHisuianLevelUpLearnset, + .teachableLearnset = sBraviaryHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -8047,17 +8859,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Vullaby, 56, 56), + .frontPic = gMonFrontPic_Vullaby, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Vullaby, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Vullaby, 64, 48), + .backPic = gMonBackPic_Vullaby, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 14, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Vullaby), - ICON(Vullaby, 0), + .palette = gMonPalette_Vullaby, + .shinyPalette = gMonShinyPalette_Vullaby, + .iconSprite = gMonIcon_Vullaby, + .iconPalIndex = 0, FOOTPRINT(Vullaby) - LEARNSETS(Vullaby), + .levelUpLearnset = sVullabyLevelUpLearnset, + .teachableLearnset = sVullabyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_MANDIBUZZ}), }, @@ -8095,17 +8912,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mandibuzz, 48, 64), + .frontPic = gMonFrontPic_Mandibuzz, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Mandibuzz, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Mandibuzz, 64, 48), + .backPic = gMonBackPic_Mandibuzz, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Mandibuzz), - ICON(Mandibuzz, 1), + .palette = gMonPalette_Mandibuzz, + .shinyPalette = gMonShinyPalette_Mandibuzz, + .iconSprite = gMonIcon_Mandibuzz, + .iconPalIndex = 1, FOOTPRINT(Mandibuzz) - LEARNSETS(Mandibuzz), + .levelUpLearnset = sMandibuzzLevelUpLearnset, + .teachableLearnset = sMandibuzzTeachableLearnset, }, #endif //P_FAMILY_VULLABY @@ -8144,17 +8966,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Heatmor, 64, 56), + .frontPic = gMonFrontPic_Heatmor, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Heatmor, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Heatmor, 64, 24), + .backPic = gMonBackPic_Heatmor, + .backPicSize = MON_COORDS_SIZE(64, 24), .backPicYOffset = 21, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Heatmor), - ICON(Heatmor, 2), + .palette = gMonPalette_Heatmor, + .shinyPalette = gMonShinyPalette_Heatmor, + .iconSprite = gMonIcon_Heatmor, + .iconPalIndex = 2, FOOTPRINT(Heatmor) - LEARNSETS(Heatmor), + .levelUpLearnset = sHeatmorLevelUpLearnset, + .teachableLearnset = sHeatmorTeachableLearnset, }, #endif //P_FAMILY_HEATMOR @@ -8193,17 +9020,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Durant, 48, 32), + .frontPic = gMonFrontPic_Durant, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Durant, .frontAnimId = ANIM_RAPID_H_HOPS, - BACK_PIC(Durant, 64, 32), + .backPic = gMonBackPic_Durant, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 17, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Durant), - ICON(Durant, 0), + .palette = gMonPalette_Durant, + .shinyPalette = gMonShinyPalette_Durant, + .iconSprite = gMonIcon_Durant, + .iconPalIndex = 0, FOOTPRINT(Durant) - LEARNSETS(Durant), + .levelUpLearnset = sDurantLevelUpLearnset, + .teachableLearnset = sDurantTeachableLearnset, }, #endif //P_FAMILY_DURANT @@ -8242,17 +9074,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Deino, 40, 48), + .frontPic = gMonFrontPic_Deino, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Deino, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Deino, 48, 48), + .backPic = gMonBackPic_Deino, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 14, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Deino), - ICON(Deino, 2), + .palette = gMonPalette_Deino, + .shinyPalette = gMonShinyPalette_Deino, + .iconSprite = gMonIcon_Deino, + .iconPalIndex = 2, FOOTPRINT(Deino) - LEARNSETS(Deino), + .levelUpLearnset = sDeinoLevelUpLearnset, + .teachableLearnset = sDeinoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_ZWEILOUS}), }, @@ -8290,17 +9127,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Zweilous, 64, 56), + .frontPic = gMonFrontPic_Zweilous, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Zweilous, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Zweilous, 64, 56), + .backPic = gMonBackPic_Zweilous, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Zweilous), - ICON(Zweilous, 2), + .palette = gMonPalette_Zweilous, + .shinyPalette = gMonShinyPalette_Zweilous, + .iconSprite = gMonIcon_Zweilous, + .iconPalIndex = 2, FOOTPRINT(Zweilous) - LEARNSETS(Zweilous), + .levelUpLearnset = sZweilousLevelUpLearnset, + .teachableLearnset = sZweilousTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 64, SPECIES_HYDREIGON}), }, @@ -8338,18 +9180,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Hydreigon, 64, 64), + .frontPic = gMonFrontPic_Hydreigon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Hydreigon, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 3, - BACK_PIC(Hydreigon, 64, 56), + .backPic = gMonBackPic_Hydreigon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 11, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Hydreigon), - ICON(Hydreigon, 2), + .palette = gMonPalette_Hydreigon, + .shinyPalette = gMonShinyPalette_Hydreigon, + .iconSprite = gMonIcon_Hydreigon, + .iconPalIndex = 2, FOOTPRINT(Hydreigon) - LEARNSETS(Hydreigon), + .levelUpLearnset = sHydreigonLevelUpLearnset, + .teachableLearnset = sHydreigonTeachableLearnset, }, #endif //P_FAMILY_DEINO @@ -8388,17 +9235,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Larvesta, 40, 48), + .frontPic = gMonFrontPic_Larvesta, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Larvesta, .frontAnimId = ANIM_GLOW_ORANGE, - BACK_PIC(Larvesta, 64, 48), + .backPic = gMonBackPic_Larvesta, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Larvesta), - ICON(Larvesta, 0), + .palette = gMonPalette_Larvesta, + .shinyPalette = gMonShinyPalette_Larvesta, + .iconSprite = gMonIcon_Larvesta, + .iconPalIndex = 0, FOOTPRINT(Larvesta) - LEARNSETS(Larvesta), + .levelUpLearnset = sLarvestaLevelUpLearnset, + .teachableLearnset = sLarvestaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 59, SPECIES_VOLCARONA}), }, @@ -8438,18 +9290,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Volcarona, 64, 56), + .frontPic = gMonFrontPic_Volcarona, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Volcarona, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 6, - BACK_PIC(Volcarona, 64, 64), + .backPic = gMonBackPic_Volcarona, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Volcarona), - ICON(Volcarona, 0), + .palette = gMonPalette_Volcarona, + .shinyPalette = gMonShinyPalette_Volcarona, + .iconSprite = gMonIcon_Volcarona, + .iconPalIndex = 0, FOOTPRINT(Volcarona) - LEARNSETS(Volcarona), + .levelUpLearnset = sVolcaronaLevelUpLearnset, + .teachableLearnset = sVolcaronaTeachableLearnset, }, #endif //P_FAMILY_LARVESTA @@ -8489,17 +9346,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Cobalion, 48, 64), + .frontPic = gMonFrontPic_Cobalion, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cobalion, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Cobalion, 48, 64), + .backPic = gMonBackPic_Cobalion, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Cobalion), - ICON(Cobalion, 0), + .palette = gMonPalette_Cobalion, + .shinyPalette = gMonShinyPalette_Cobalion, + .iconSprite = gMonIcon_Cobalion, + .iconPalIndex = 0, FOOTPRINT(Cobalion) - LEARNSETS(Cobalion), + .levelUpLearnset = sCobalionLevelUpLearnset, + .teachableLearnset = sCobalionTeachableLearnset, }, #endif //P_FAMILY_COBALION @@ -8539,17 +9401,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 336, .trainerOffset = 4, - FRONT_PIC(Terrakion, 64, 56), + .frontPic = gMonFrontPic_Terrakion, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Terrakion, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Terrakion, 64, 48), + .backPic = gMonBackPic_Terrakion, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Terrakion), - ICON(Terrakion, 2), + .palette = gMonPalette_Terrakion, + .shinyPalette = gMonShinyPalette_Terrakion, + .iconSprite = gMonIcon_Terrakion, + .iconPalIndex = 2, FOOTPRINT(Terrakion) - LEARNSETS(Terrakion), + .levelUpLearnset = sTerrakionLevelUpLearnset, + .teachableLearnset = sTerrakionTeachableLearnset, }, #endif //P_FAMILY_TERRAKION @@ -8589,17 +9456,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 344, .trainerOffset = 4, - FRONT_PIC(Virizion, 48, 64), + .frontPic = gMonFrontPic_Virizion, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Virizion, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Virizion, 64, 56), + .backPic = gMonBackPic_Virizion, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Virizion), - ICON(Virizion, 1), + .palette = gMonPalette_Virizion, + .shinyPalette = gMonShinyPalette_Virizion, + .iconSprite = gMonIcon_Virizion, + .iconPalIndex = 1, FOOTPRINT(Virizion) - LEARNSETS(Virizion), + .levelUpLearnset = sVirizionLevelUpLearnset, + .teachableLearnset = sVirizionTeachableLearnset, }, #endif //P_FAMILY_VIRIZION @@ -8622,7 +9494,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Cyclone"), .weight = 630, FOOTPRINT(Tornadus) - LEARNSETS(Tornadus), + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, .formSpeciesIdTable = sTornadusFormSpeciesIdTable, .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, @@ -8643,16 +9516,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(TornadusIncarnate, 64, 64), + .frontPic = gMonFrontPic_TornadusIncarnate, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_TornadusIncarnate, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, - BACK_PIC(TornadusIncarnate, 64, 64), + .backPic = gMonBackPic_TornadusIncarnate, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(TornadusIncarnate), - ICON(TornadusIncarnate, 1), + .palette = gMonPalette_TornadusIncarnate, + .shinyPalette = gMonShinyPalette_TornadusIncarnate, + .iconSprite = gMonIcon_TornadusIncarnate, + .iconPalIndex = 1, }, [SPECIES_TORNADUS_THERIAN] = @@ -8673,7 +9550,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Cyclone"), .weight = 630, FOOTPRINT(Tornadus) - LEARNSETS(Tornadus), + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, .formSpeciesIdTable = sTornadusFormSpeciesIdTable, .formChangeTable = sTornadusFormChangeTable, .baseHP = 79, @@ -8694,15 +9572,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(TornadusTherian, 64, 64), + .frontPic = gMonFrontPic_TornadusTherian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TornadusTherian, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(TornadusTherian, 56, 64), + .backPic = gMonBackPic_TornadusTherian, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(TornadusTherian), - ICON(TornadusTherian, 1), + .palette = gMonPalette_TornadusTherian, + .shinyPalette = gMonShinyPalette_TornadusTherian, + .iconSprite = gMonIcon_TornadusTherian, + .iconPalIndex = 1, }, #endif //P_FAMILY_TORNADUS @@ -8724,7 +9606,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Bolt Strike"), .weight = 610, FOOTPRINT(Thundurus) - LEARNSETS(Thundurus), + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, .formSpeciesIdTable = sThundurusFormSpeciesIdTable, .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, @@ -8746,16 +9629,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(ThundurusIncarnate, 64, 64), + .frontPic = gMonFrontPic_ThundurusIncarnate, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_ThundurusIncarnate, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, - BACK_PIC(ThundurusIncarnate, 64, 64), + .backPic = gMonBackPic_ThundurusIncarnate, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(ThundurusIncarnate), - ICON(ThundurusIncarnate, 0), + .palette = gMonPalette_ThundurusIncarnate, + .shinyPalette = gMonShinyPalette_ThundurusIncarnate, + .iconSprite = gMonIcon_ThundurusIncarnate, + .iconPalIndex = 0, }, [SPECIES_THUNDURUS_THERIAN] = @@ -8775,7 +9662,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Bolt Strike"), .weight = 610, FOOTPRINT(Thundurus) - LEARNSETS(Thundurus), + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, .formSpeciesIdTable = sThundurusFormSpeciesIdTable, .formChangeTable = sThundurusFormChangeTable, .baseHP = 79, @@ -8797,16 +9685,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(ThundurusTherian, 64, 64), + .frontPic = gMonFrontPic_ThundurusTherian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_ThundurusTherian, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 7, - BACK_PIC(ThundurusTherian, 64, 64), + .backPic = gMonBackPic_ThundurusTherian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(ThundurusTherian), - ICON(ThundurusTherian, 0), + .palette = gMonPalette_ThundurusTherian, + .shinyPalette = gMonShinyPalette_ThundurusTherian, + .iconSprite = gMonIcon_ThundurusTherian, + .iconPalIndex = 0, }, #endif //P_FAMILY_THUNDURUS @@ -8846,17 +9738,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 0, .trainerScale = 445, .trainerOffset = 8, - FRONT_PIC(Reshiram, 64, 64), + .frontPic = gMonFrontPic_Reshiram, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Reshiram, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Reshiram, 64, 64), + .backPic = gMonBackPic_Reshiram, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Reshiram), - ICON(Reshiram, 0), + .palette = gMonPalette_Reshiram, + .shinyPalette = gMonShinyPalette_Reshiram, + .iconSprite = gMonIcon_Reshiram, + .iconPalIndex = 0, FOOTPRINT(Reshiram) - LEARNSETS(Reshiram), + .levelUpLearnset = sReshiramLevelUpLearnset, + .teachableLearnset = sReshiramTeachableLearnset, }, #endif //P_FAMILY_RESHIRAM @@ -8896,17 +9793,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 412, .trainerOffset = 10, - FRONT_PIC(Zekrom, 64, 64), + .frontPic = gMonFrontPic_Zekrom, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zekrom, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Zekrom, 64, 64), + .backPic = gMonBackPic_Zekrom, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(Zekrom), - ICON(Zekrom, 2), + .palette = gMonPalette_Zekrom, + .shinyPalette = gMonShinyPalette_Zekrom, + .iconSprite = gMonIcon_Zekrom, + .iconPalIndex = 2, FOOTPRINT(Zekrom) - LEARNSETS(Zekrom), + .levelUpLearnset = sZekromLevelUpLearnset, + .teachableLearnset = sZekromTeachableLearnset, }, #endif //P_FAMILY_ZEKROM @@ -8928,7 +9830,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Abundance"), .weight = 680, FOOTPRINT(Landorus) - LEARNSETS(Landorus), + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, .formSpeciesIdTable = sLandorusFormSpeciesIdTable, .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, @@ -8950,16 +9853,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(LandorusIncarnate, 64, 64), + .frontPic = gMonFrontPic_LandorusIncarnate, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_LandorusIncarnate, .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, - BACK_PIC(LandorusIncarnate, 64, 64), + .backPic = gMonBackPic_LandorusIncarnate, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(LandorusIncarnate), - ICON(LandorusIncarnate, 0), + .palette = gMonPalette_LandorusIncarnate, + .shinyPalette = gMonShinyPalette_LandorusIncarnate, + .iconSprite = gMonIcon_LandorusIncarnate, + .iconPalIndex = 0, }, [SPECIES_LANDORUS_THERIAN] = @@ -8979,7 +9886,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Abundance"), .weight = 680, FOOTPRINT(Landorus) - LEARNSETS(Landorus), + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, .formSpeciesIdTable = sLandorusFormSpeciesIdTable, .formChangeTable = sLandorusFormChangeTable, .baseHP = 89, @@ -9001,15 +9909,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(LandorusTherian, 64, 64), + .frontPic = gMonFrontPic_LandorusTherian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LandorusTherian, .frontAnimId = ANIM_CIRCULAR_VIBRATE, - BACK_PIC(LandorusTherian, 64, 56), + .backPic = gMonBackPic_LandorusTherian, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(LandorusTherian), - ICON(LandorusTherian, 0), + .palette = gMonPalette_LandorusTherian, + .shinyPalette = gMonShinyPalette_LandorusTherian, + .iconSprite = gMonIcon_LandorusTherian, + .iconPalIndex = 0, }, #endif //P_FAMILY_LANDORUS @@ -9054,16 +9966,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 356, .trainerOffset = 0, - FRONT_PIC(Kyurem, 64, 64), + .frontPic = gMonFrontPic_Kyurem, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Kyurem, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kyurem, 64, 40), + .backPic = gMonBackPic_Kyurem, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Kyurem), - ICON(Kyurem, 0), - LEARNSETS(Kyurem), + .palette = gMonPalette_Kyurem, + .shinyPalette = gMonShinyPalette_Kyurem, + .iconSprite = gMonIcon_Kyurem, + .iconPalIndex = 0, + .levelUpLearnset = sKyuremLevelUpLearnset, + .teachableLearnset = sKyuremTeachableLearnset, }, #if P_FUSION_FORMS @@ -9111,15 +10028,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 356, .trainerOffset = 0, - FRONT_PIC(KyuremWhite, 64, 64), + .frontPic = gMonFrontPic_KyuremWhite, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KyuremWhite, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(KyuremWhite, 64, 64), + .backPic = gMonBackPic_KyuremWhite, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(KyuremWhite), - ICON(KyuremWhite, 0), + .palette = gMonPalette_KyuremWhite, + .shinyPalette = gMonShinyPalette_KyuremWhite, + .iconSprite = gMonIcon_KyuremWhite, + .iconPalIndex = 0, .levelUpLearnset = sKyuremWhiteLevelUpLearnset, .teachableLearnset = sKyuremTeachableLearnset, .cannotBeTraded = TRUE, @@ -9169,15 +10090,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 356, .trainerOffset = 0, - FRONT_PIC(KyuremBlack, 64, 64), + .frontPic = gMonFrontPic_KyuremBlack, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KyuremBlack, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(KyuremBlack, 64, 64), + .backPic = gMonBackPic_KyuremBlack, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(KyuremBlack), - ICON(KyuremBlack, 0), + .palette = gMonPalette_KyuremBlack, + .shinyPalette = gMonShinyPalette_KyuremBlack, + .iconSprite = gMonIcon_KyuremBlack, + .iconPalIndex = 0, .levelUpLearnset = sKyuremBlackLevelUpLearnset, .teachableLearnset = sKyuremTeachableLearnset, .cannotBeTraded = TRUE, @@ -9217,7 +10142,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 262, .trainerOffset = 0, FOOTPRINT(Keldeo) - LEARNSETS(Keldeo), + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, .formChangeTable = sKeldeoFormChangeTable, .description = COMPOUND_STRING( @@ -9225,15 +10151,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "power and it becomes swifter. It crosses\n" "the world, running over the surfaces of\n" "oceans and rivers."), - FRONT_PIC(KeldeoOrdinary, 56, 56), + .frontPic = gMonFrontPic_KeldeoOrdinary, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_KeldeoOrdinary, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(KeldeoOrdinary, 56, 64), + .backPic = gMonBackPic_KeldeoOrdinary, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(KeldeoOrdinary), - ICON(KeldeoOrdinary, 0), + .palette = gMonPalette_KeldeoOrdinary, + .shinyPalette = gMonShinyPalette_KeldeoOrdinary, + .iconSprite = gMonIcon_KeldeoOrdinary, + .iconPalIndex = 0, }, [SPECIES_KELDEO_RESOLUTE] = @@ -9267,7 +10197,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 262, .trainerOffset = 0, FOOTPRINT(Keldeo) - LEARNSETS(Keldeo), + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, .formChangeTable = sKeldeoFormChangeTable, .noFlip = TRUE, @@ -9276,15 +10207,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "body now covers its horn, turning it\n" "into a sword that can slice through\n" "anything."), - FRONT_PIC(KeldeoResolute, 64, 64), + .frontPic = gMonFrontPic_KeldeoResolute, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_KeldeoResolute, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(KeldeoResolute, 64, 64), + .backPic = gMonBackPic_KeldeoResolute, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(KeldeoResolute), - ICON(KeldeoResolute, 0), + .palette = gMonPalette_KeldeoResolute, + .shinyPalette = gMonShinyPalette_KeldeoResolute, + .iconSprite = gMonIcon_KeldeoResolute, + .iconPalIndex = 0, }, #endif //P_FAMILY_KELDEO @@ -9316,7 +10251,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Meloetta) - LEARNSETS(Meloetta), + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, @@ -9333,16 +10269,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "power to make Pokémon that hear them\n" "happy or sad. Many famous songs have been\n" "inspired by the tunes that Meloetta plays."), - FRONT_PIC(MeloettaAria, 32, 48), + .frontPic = gMonFrontPic_MeloettaAria, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_MeloettaAria, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 8, - BACK_PIC(MeloettaAria, 48, 56), + .backPic = gMonBackPic_MeloettaAria, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(MeloettaAria), - ICON(MeloettaAria, 4), + .palette = gMonPalette_MeloettaAria, + .shinyPalette = gMonShinyPalette_MeloettaAria, + .iconSprite = gMonIcon_MeloettaAria, + .iconPalIndex = 4, }, [SPECIES_MELOETTA_PIROUETTE] = @@ -9372,7 +10312,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Meloetta) - LEARNSETS(Meloetta), + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, .formChangeTable = sMeloettaFormChangeTable, .baseHP = 100, @@ -9388,16 +10329,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "Meloetta's melodies are sung with\n" "a special vocalization method that can\n" "control the feelings of those who hear it."), - FRONT_PIC(MeloettaPirouette, 40, 64), + .frontPic = gMonFrontPic_MeloettaPirouette, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_MeloettaPirouette, .frontAnimId = ANIM_H_SLIDE_SLOW, .enemyMonElevation = 5, - BACK_PIC(MeloettaPirouette, 56, 64), + .backPic = gMonBackPic_MeloettaPirouette, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(MeloettaPirouette), - ICON(MeloettaPirouette, 0), + .palette = gMonPalette_MeloettaPirouette, + .shinyPalette = gMonShinyPalette_MeloettaPirouette, + .iconSprite = gMonIcon_MeloettaPirouette, + .iconPalIndex = 0, }, #endif //P_FAMILY_MELOETTA @@ -9434,17 +10379,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, \ .trainerScale = 271, \ .trainerOffset = 0, \ - FRONT_PIC(Genesect, 56, 64), \ + .frontPic = gMonFrontPic_Genesect, \ + .frontPicSize = MON_COORDS_SIZE(56, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Genesect, \ .frontAnimId = ANIM_H_VIBRATE, \ - BACK_PIC(Genesect, 64, 48), \ + .backPic = gMonBackPic_Genesect, \ + .backPicSize = MON_COORDS_SIZE(64, 48), \ .backPicYOffset = 8, \ .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ - PALETTES(form), \ - ICON(Genesect, 2), \ + .palette = gMonPalette_##form, \ + .shinyPalette = gMonShinyPalette_##form, \ + .iconSprite = gMonIcon_Genesect, \ + .iconPalIndex = 2, \ FOOTPRINT(Genesect) \ - LEARNSETS(Genesect), \ + .levelUpLearnset = sGenesectLevelUpLearnset, \ + .teachableLearnset = sGenesectTeachableLearnset, \ .formSpeciesIdTable = sGenesectFormSpeciesIdTable, \ .formChangeTable = sGenesectFormChangeTable, \ .isMythical = TRUE, \ diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index a2cb478099a4..ff48866e10c6 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chespin, 40, 48), + .frontPic = gMonFrontPic_Chespin, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Chespin, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Chespin, 56, 64), + .backPic = gMonBackPic_Chespin, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Chespin), - ICON(Chespin, 1), + .palette = gMonPalette_Chespin, + .shinyPalette = gMonShinyPalette_Chespin, + .iconSprite = gMonIcon_Chespin, + .iconPalIndex = 1, FOOTPRINT(Chespin) - LEARNSETS(Chespin), + .levelUpLearnset = sChespinLevelUpLearnset, + .teachableLearnset = sChespinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUILLADIN}), }, @@ -86,17 +91,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quilladin, 48, 48), + .frontPic = gMonFrontPic_Quilladin, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Quilladin, .frontAnimId = ANIM_LUNGE_GROW, - BACK_PIC(Quilladin, 64, 48), + .backPic = gMonBackPic_Quilladin, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_GROW, - PALETTES(Quilladin), - ICON(Quilladin, 1), + .palette = gMonPalette_Quilladin, + .shinyPalette = gMonShinyPalette_Quilladin, + .iconSprite = gMonIcon_Quilladin, + .iconPalIndex = 1, FOOTPRINT(Quilladin) - LEARNSETS(Quilladin), + .levelUpLearnset = sQuilladinLevelUpLearnset, + .teachableLearnset = sQuilladinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_CHESNAUGHT}), }, @@ -134,17 +144,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Chesnaught, 64, 64), + .frontPic = gMonFrontPic_Chesnaught, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Chesnaught, .frontAnimId = ANIM_GROW_IN_STAGES, - BACK_PIC(Chesnaught, 64, 56), + .backPic = gMonBackPic_Chesnaught, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Chesnaught), - ICON(Chesnaught, 1), + .palette = gMonPalette_Chesnaught, + .shinyPalette = gMonShinyPalette_Chesnaught, + .iconSprite = gMonIcon_Chesnaught, + .iconPalIndex = 1, FOOTPRINT(Chesnaught) - LEARNSETS(Chesnaught), + .levelUpLearnset = sChesnaughtLevelUpLearnset, + .teachableLearnset = sChesnaughtTeachableLearnset, }, #endif //P_FAMILY_CHESPIN @@ -183,17 +198,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fennekin, 40, 48), + .frontPic = gMonFrontPic_Fennekin, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Fennekin, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Fennekin, 56, 48), + .backPic = gMonBackPic_Fennekin, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Fennekin), - ICON(Fennekin, 0), + .palette = gMonPalette_Fennekin, + .shinyPalette = gMonShinyPalette_Fennekin, + .iconSprite = gMonIcon_Fennekin, + .iconPalIndex = 0, FOOTPRINT(Fennekin) - LEARNSETS(Fennekin), + .levelUpLearnset = sFennekinLevelUpLearnset, + .teachableLearnset = sFennekinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_BRAIXEN}), }, @@ -231,17 +251,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Braixen, 48, 64), + .frontPic = gMonFrontPic_Braixen, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Braixen, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Braixen, 64, 56), + .backPic = gMonBackPic_Braixen, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Braixen), - ICON(Braixen, 0), + .palette = gMonPalette_Braixen, + .shinyPalette = gMonShinyPalette_Braixen, + .iconSprite = gMonIcon_Braixen, + .iconPalIndex = 0, FOOTPRINT(Braixen) - LEARNSETS(Braixen), + .levelUpLearnset = sBraixenLevelUpLearnset, + .teachableLearnset = sBraixenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_DELPHOX}), }, @@ -279,17 +304,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Delphox, 64, 64), + .frontPic = gMonFrontPic_Delphox, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Delphox, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Delphox, 64, 64), + .backPic = gMonBackPic_Delphox, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Delphox), - ICON(Delphox, 0), + .palette = gMonPalette_Delphox, + .shinyPalette = gMonShinyPalette_Delphox, + .iconSprite = gMonIcon_Delphox, + .iconPalIndex = 0, FOOTPRINT(Delphox) - LEARNSETS(Delphox), + .levelUpLearnset = sDelphoxLevelUpLearnset, + .teachableLearnset = sDelphoxTeachableLearnset, }, #endif //P_FAMILY_FENNEKIN @@ -328,17 +358,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Froakie, 40, 40), + .frontPic = gMonFrontPic_Froakie, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Froakie, .frontAnimId = ANIM_H_JUMPS, - BACK_PIC(Froakie, 56, 56), + .backPic = gMonBackPic_Froakie, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Froakie), - ICON(Froakie, 0), + .palette = gMonPalette_Froakie, + .shinyPalette = gMonShinyPalette_Froakie, + .iconSprite = gMonIcon_Froakie, + .iconPalIndex = 0, FOOTPRINT(Froakie) - LEARNSETS(Froakie), + .levelUpLearnset = sFroakieLevelUpLearnset, + .teachableLearnset = sFroakieTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FROGADIER}), }, @@ -376,17 +411,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Frogadier, 56, 48), + .frontPic = gMonFrontPic_Frogadier, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Frogadier, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Frogadier, 64, 56), + .backPic = gMonBackPic_Frogadier, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Frogadier), - ICON(Frogadier, 0), + .palette = gMonPalette_Frogadier, + .shinyPalette = gMonShinyPalette_Frogadier, + .iconSprite = gMonIcon_Frogadier, + .iconPalIndex = 0, FOOTPRINT(Frogadier) - LEARNSETS(Frogadier), + .levelUpLearnset = sFrogadierLevelUpLearnset, + .teachableLearnset = sFrogadierTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_GRENINJA}), }, @@ -411,7 +451,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 271, .trainerOffset = 0, FOOTPRINT(Greninja) - LEARNSETS(Greninja), + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, .baseAttack = 95, @@ -421,13 +462,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpDefense = 71, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .description = gGreninjaPokedexText, - FRONT_PIC(Greninja, 64, 56), + .frontPic = gMonFrontPic_Greninja, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Greninja, - BACK_PIC(Greninja, 64, 48), + .backPic = gMonBackPic_Greninja, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, - PALETTES(Greninja), - ICON(Greninja, 0), + .palette = gMonPalette_Greninja, + .shinyPalette = gMonShinyPalette_Greninja, + .iconSprite = gMonIcon_Greninja, + .iconPalIndex = 0, .genderRatio = PERCENT_FEMALE(12.5), .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN }, @@ -456,7 +501,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 271, .trainerOffset = 0, FOOTPRINT(Greninja) - LEARNSETS(Greninja), + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, .baseAttack = 95, @@ -466,13 +512,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpDefense = 71, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .description = gGreninjaPokedexText, - FRONT_PIC(Greninja, 64, 56), + .frontPic = gMonFrontPic_Greninja, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Greninja, - BACK_PIC(Greninja, 64, 48), + .backPic = gMonBackPic_Greninja, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, - PALETTES(Greninja), - ICON(Greninja, 0), + .palette = gMonPalette_Greninja, + .shinyPalette = gMonShinyPalette_Greninja, + .iconSprite = gMonIcon_Greninja, + .iconPalIndex = 0, .genderRatio = MON_MALE, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, @@ -502,7 +552,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 271, .trainerOffset = 0, FOOTPRINT(Greninja) - LEARNSETS(Greninja), + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .baseHP = 72, .baseAttack = 145, @@ -519,13 +570,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "grace. It toys with its enemies using swift\n" "movements, while slicing them with throwing\n" "stars made of compressed water."), - FRONT_PIC(GreninjaAsh, 64, 64), + .frontPic = gMonFrontPic_GreninjaAsh, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GreninjaAsh, - BACK_PIC(GreninjaAsh, 64, 48), + .backPic = gMonBackPic_GreninjaAsh, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, - PALETTES(GreninjaAsh), - ICON(GreninjaAsh, 0), + .palette = gMonPalette_GreninjaAsh, + .shinyPalette = gMonShinyPalette_GreninjaAsh, + .iconSprite = gMonIcon_GreninjaAsh, + .iconPalIndex = 0, .frontAnimId = ANIM_V_STRETCH, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, .formChangeTable = sGreninjaBattleBondFormChangeTable, @@ -567,17 +622,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bunnelby, 48, 64), + .frontPic = gMonFrontPic_Bunnelby, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Bunnelby, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Bunnelby, 48, 64), + .backPic = gMonBackPic_Bunnelby, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Bunnelby), - ICON(Bunnelby, 2), + .palette = gMonPalette_Bunnelby, + .shinyPalette = gMonShinyPalette_Bunnelby, + .iconSprite = gMonIcon_Bunnelby, + .iconPalIndex = 2, FOOTPRINT(Bunnelby) - LEARNSETS(Bunnelby), + .levelUpLearnset = sBunnelbyLevelUpLearnset, + .teachableLearnset = sBunnelbyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_DIGGERSBY}), }, @@ -615,17 +675,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Diggersby, 64, 64), + .frontPic = gMonFrontPic_Diggersby, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Diggersby, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Diggersby, 64, 64), + .backPic = gMonBackPic_Diggersby, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Diggersby), - ICON(Diggersby, 2), + .palette = gMonPalette_Diggersby, + .shinyPalette = gMonShinyPalette_Diggersby, + .iconSprite = gMonIcon_Diggersby, + .iconPalIndex = 2, FOOTPRINT(Diggersby) - LEARNSETS(Diggersby), + .levelUpLearnset = sDiggersbyLevelUpLearnset, + .teachableLearnset = sDiggersbyTeachableLearnset, }, #endif //P_FAMILY_BUNNELBY @@ -664,17 +729,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fletchling, 40, 40), + .frontPic = gMonFrontPic_Fletchling, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Fletchling, .frontAnimId = ANIM_V_JUMPS_SMALL, - BACK_PIC(Fletchling, 64, 40), + .backPic = gMonBackPic_Fletchling, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Fletchling), - ICON(Fletchling, 2), + .palette = gMonPalette_Fletchling, + .shinyPalette = gMonShinyPalette_Fletchling, + .iconSprite = gMonIcon_Fletchling, + .iconPalIndex = 2, FOOTPRINT(Fletchling) - LEARNSETS(Fletchling), + .levelUpLearnset = sFletchlingLevelUpLearnset, + .teachableLearnset = sFletchlingTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_FLETCHINDER}), }, @@ -712,18 +782,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fletchinder, 56, 48), + .frontPic = gMonFrontPic_Fletchinder, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Fletchinder, .frontAnimId = ANIM_V_SLIDE_SLOW, .enemyMonElevation = 9, - BACK_PIC(Fletchinder, 64, 48), + .backPic = gMonBackPic_Fletchinder, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Fletchinder), - ICON(Fletchinder, 2), + .palette = gMonPalette_Fletchinder, + .shinyPalette = gMonShinyPalette_Fletchinder, + .iconSprite = gMonIcon_Fletchinder, + .iconPalIndex = 2, FOOTPRINT(Fletchinder) - LEARNSETS(Fletchinder), + .levelUpLearnset = sFletchinderLevelUpLearnset, + .teachableLearnset = sFletchinderTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_TALONFLAME}), }, @@ -761,18 +836,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Talonflame, 64, 64), + .frontPic = gMonFrontPic_Talonflame, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Talonflame, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 7, - BACK_PIC(Talonflame, 64, 56), + .backPic = gMonBackPic_Talonflame, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Talonflame), - ICON(Talonflame, 2), + .palette = gMonPalette_Talonflame, + .shinyPalette = gMonShinyPalette_Talonflame, + .iconSprite = gMonIcon_Talonflame, + .iconPalIndex = 2, FOOTPRINT(Talonflame) - LEARNSETS(Talonflame), + .levelUpLearnset = sTalonflameLevelUpLearnset, + .teachableLearnset = sTalonflameTeachableLearnset, }, #endif //P_FAMILY_FLETCHLING @@ -811,17 +891,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scatterbug, 32, 48), + .frontPic = gMonFrontPic_Scatterbug, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Scatterbug, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Scatterbug, 40, 56), + .backPic = gMonBackPic_Scatterbug, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Scatterbug), - ICON(Scatterbug, 1), + .palette = gMonPalette_Scatterbug, + .shinyPalette = gMonShinyPalette_Scatterbug, + .iconSprite = gMonIcon_Scatterbug, + .iconPalIndex = 1, FOOTPRINT(Scatterbug) - LEARNSETS(Scatterbug), + .levelUpLearnset = sScatterbugLevelUpLearnset, + .teachableLearnset = sScatterbugTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA}), }, @@ -860,17 +945,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spewpa, 40, 48), + .frontPic = gMonFrontPic_Spewpa, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Spewpa, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Spewpa, 48, 48), + .backPic = gMonBackPic_Spewpa, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Spewpa), - ICON(Spewpa, 1), + .palette = gMonPalette_Spewpa, + .shinyPalette = gMonShinyPalette_Spewpa, + .iconSprite = gMonIcon_Spewpa, + .iconPalIndex = 1, FOOTPRINT(Spewpa) - LEARNSETS(Spewpa), + .levelUpLearnset = sSpewpaLevelUpLearnset, + .teachableLearnset = sSpewpaTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 12, SPECIES_VIVILLON_ICY_SNOW}), }, @@ -905,18 +995,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 4, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Vivillon ##form, 64, 64), \ + .frontPic = gMonFrontPic_Vivillon ##form, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Vivillon, \ .frontAnimId = ANIM_ZIGZAG_SLOW, \ .enemyMonElevation = 9, \ - BACK_PIC(Vivillon ##form, 64, 64), \ + .backPic = gMonBackPic_Vivillon ##form, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ .backPicYOffset = 0, \ .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, \ - PALETTES(Vivillon ##form), \ - ICON(Vivillon ##form, iconPal), \ + .palette = gMonPalette_Vivillon ##form, \ + .shinyPalette = gMonShinyPalette_Vivillon ##form, \ + .iconSprite = gMonIcon_Vivillon ##form, \ + .iconPalIndex = iconPal, \ FOOTPRINT(Vivillon) \ - LEARNSETS(Vivillon), \ + .levelUpLearnset = sVivillonLevelUpLearnset, \ + .teachableLearnset = sVivillonTeachableLearnset, \ .formSpeciesIdTable = sVivillonFormSpeciesIdTable [SPECIES_VIVILLON_ICY_SNOW] = @@ -1136,17 +1231,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Litleo, 40, 48), + .frontPic = gMonFrontPic_Litleo, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Litleo, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Litleo, 56, 48), + .backPic = gMonBackPic_Litleo, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Litleo), - ICON(Litleo, 2), + .palette = gMonPalette_Litleo, + .shinyPalette = gMonShinyPalette_Litleo, + .iconSprite = gMonIcon_Litleo, + .iconPalIndex = 2, FOOTPRINT(Litleo) - LEARNSETS(Litleo), + .levelUpLearnset = sLitleoLevelUpLearnset, + .teachableLearnset = sLitleoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_PYROAR}), }, @@ -1184,20 +1284,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Pyroar, 64, 64), - FRONT_PIC_FEMALE(Pyroar, 64, 64), + .frontPic = gMonFrontPic_Pyroar, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .frontPicFemale = gMonFrontPic_PyroarF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Pyroar, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Pyroar, 64, 64), - BACK_PIC_FEMALE(Pyroar, 64, 64), + .backPic = gMonBackPic_Pyroar, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_PyroarF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Pyroar), - ICON(Pyroar, 2), - ICON_FEMALE(Pyroar, 2), + .palette = gMonPalette_Pyroar, + .shinyPalette = gMonShinyPalette_Pyroar, + .iconSprite = gMonIcon_Pyroar, + .iconPalIndex = 2, + .iconSpriteFemale = gMonIcon_PyroarF, + .iconPalIndexFemale = 2, FOOTPRINT(Pyroar) - LEARNSETS(Pyroar), + .levelUpLearnset = sPyroarLevelUpLearnset, + .teachableLearnset = sPyroarTeachableLearnset, }, #endif //P_FAMILY_LITLEO @@ -1230,18 +1338,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 24, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Flabebe, 48, 56), \ + .frontPic = gMonFrontPic_Flabebe, \ + .frontPicSize = MON_COORDS_SIZE(48, 56), \ .frontPicYOffset = 6, \ .frontAnimFrames = sAnims_Flabebe, \ .frontAnimId = ANIM_H_SLIDE_SLOW, \ .enemyMonElevation = 6, \ - BACK_PIC(Flabebe, 64, 40), \ + .backPic = gMonBackPic_Flabebe, \ + .backPicSize = MON_COORDS_SIZE(64, 40), \ .backPicYOffset = 12, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - PALETTES(Flabebe##Form##Flower), \ - ICON(Flabebe##Form##Flower, iconPal), \ + .palette = gMonPalette_Flabebe##Form##Flower, \ + .shinyPalette = gMonShinyPalette_Flabebe##Form##Flower, \ + .iconSprite = gMonIcon_Flabebe##Form##Flower, \ + .iconPalIndex = iconPal, \ FOOTPRINT(Flabebe) \ - LEARNSETS(Flabebe), \ + .levelUpLearnset = sFlabebeLevelUpLearnset, \ + .teachableLearnset = sFlabebeTeachableLearnset, \ .formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \ .evolutions = EVOLUTION({EVO_LEVEL, 19, SPECIES_FLOETTE_ ##FORM##_FLOWER}) @@ -1313,8 +1426,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Floette, \ .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - PALETTES(Floette ##form##Flower), \ - ICON(Floette##form##Flower, iconPal), \ + .palette = gMonPalette_Floette ##form##Flower, \ + .shinyPalette = gMonShinyPalette_Floette ##form##Flower, \ + .iconSprite = gMonIcon_Floette##form##Flower, \ + .iconPalIndex = iconPal, \ FOOTPRINT(Floette) \ .formSpeciesIdTable = sFloetteFormSpeciesIdTable @@ -1328,12 +1443,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .expYield = 130, \ .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), \ .cryId = CRY_FLOETTE, \ - FRONT_PIC(Floette, 48, 64), \ + .frontPic = gMonFrontPic_Floette, \ + .frontPicSize = MON_COORDS_SIZE(48, 64), \ .frontPicYOffset = 3, \ .enemyMonElevation = 4, \ - BACK_PIC(Floette, 64, 64), \ + .backPic = gMonBackPic_Floette, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ .backPicYOffset = 2, \ - LEARNSETS(Floette), \ + .levelUpLearnset = sFloetteLevelUpLearnset, \ + .teachableLearnset = sFloetteTeachableLearnset, \ .evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_ ##FORM##_FLOWER}),\ FLOETTE_MISC_INFO(form, FORM, iconPal) @@ -1399,12 +1517,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "also thought to contain terrifying\n" "power."), .cryId = CRY_FLOETTE_ETERNAL_FLOWER, - FRONT_PIC(FloetteEternalFlower, 64, 64), + .frontPic = gMonFrontPic_FloetteEternalFlower, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .enemyMonElevation = 4, - BACK_PIC(FloetteEternalFlower, 64, 64), + .backPic = gMonBackPic_FloetteEternalFlower, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, - LEARNSETS(FloetteEternalFlower), + .levelUpLearnset = sFloetteEternalFlowerLevelUpLearnset, + .teachableLearnset = sFloetteEternalFlowerTeachableLearnset, }, #define FLORGES_MISC_INFO(Form, iconPal) \ @@ -1435,17 +1556,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Florges, 64, 64), \ + .frontPic = gMonFrontPic_Florges, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Florges, \ .frontAnimId = ANIM_V_SLIDE_SLOW, \ - BACK_PIC(Florges, 64, 48), \ + .backPic = gMonBackPic_Florges, \ + .backPicSize = MON_COORDS_SIZE(64, 48), \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - PALETTES(Florges##Form##Flower), \ - ICON(Florges##Form##Flower, iconPal), \ + .palette = gMonPalette_Florges##Form##Flower, \ + .shinyPalette = gMonShinyPalette_Florges##Form##Flower, \ + .iconSprite = gMonIcon_Florges##Form##Flower, \ + .iconPalIndex = iconPal, \ FOOTPRINT(Florges) \ - LEARNSETS(Florges), \ + .levelUpLearnset = sFlorgesLevelUpLearnset, \ + .teachableLearnset = sFlorgesTeachableLearnset, \ .formSpeciesIdTable = sFlorgesFormSpeciesIdTable [SPECIES_FLORGES_RED_FLOWER] = @@ -1529,17 +1655,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skiddo, 48, 56), + .frontPic = gMonFrontPic_Skiddo, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Skiddo, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Skiddo, 56, 48), + .backPic = gMonBackPic_Skiddo, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Skiddo), - ICON(Skiddo, 1), + .palette = gMonPalette_Skiddo, + .shinyPalette = gMonShinyPalette_Skiddo, + .iconSprite = gMonIcon_Skiddo, + .iconPalIndex = 1, FOOTPRINT(Skiddo) - LEARNSETS(Skiddo), + .levelUpLearnset = sSkiddoLevelUpLearnset, + .teachableLearnset = sSkiddoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_GOGOAT}), }, @@ -1577,17 +1708,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Gogoat, 56, 64), + .frontPic = gMonFrontPic_Gogoat, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gogoat, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Gogoat, 64, 56), + .backPic = gMonBackPic_Gogoat, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - PALETTES(Gogoat), - ICON(Gogoat, 1), + .palette = gMonPalette_Gogoat, + .shinyPalette = gMonShinyPalette_Gogoat, + .iconSprite = gMonIcon_Gogoat, + .iconPalIndex = 1, FOOTPRINT(Gogoat) - LEARNSETS(Gogoat), + .levelUpLearnset = sGogoatLevelUpLearnset, + .teachableLearnset = sGogoatTeachableLearnset, }, #endif //P_FAMILY_SKIDDO @@ -1627,17 +1763,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pancham, 32, 48), + .frontPic = gMonFrontPic_Pancham, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pancham, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Pancham, 48, 56), + .backPic = gMonBackPic_Pancham, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Pancham), - ICON(Pancham, 1), + .palette = gMonPalette_Pancham, + .shinyPalette = gMonShinyPalette_Pancham, + .iconSprite = gMonIcon_Pancham, + .iconPalIndex = 1, FOOTPRINT(Pancham) - LEARNSETS(Pancham), + .levelUpLearnset = sPanchamLevelUpLearnset, + .teachableLearnset = sPanchamTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_DARK_TYPE_MON_IN_PARTY, 32, SPECIES_PANGORO}), }, @@ -1676,17 +1817,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Pangoro, 64, 64), + .frontPic = gMonFrontPic_Pangoro, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Pangoro, .frontAnimId = ANIM_BACK_AND_LUNGE, - BACK_PIC(Pangoro, 64, 56), + .backPic = gMonBackPic_Pangoro, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Pangoro), - ICON(Pangoro, 1), + .palette = gMonPalette_Pangoro, + .shinyPalette = gMonShinyPalette_Pangoro, + .iconSprite = gMonIcon_Pangoro, + .iconPalIndex = 1, FOOTPRINT(Pangoro) - LEARNSETS(Pangoro), + .levelUpLearnset = sPangoroLevelUpLearnset, + .teachableLearnset = sPangoroTeachableLearnset, }, #endif //P_FAMILY_PANCHAM @@ -1722,17 +1868,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 4, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Furfrou##_form, frontWidth, 64), \ + .frontPic = gMonFrontPic_Furfrou##_form, \ + .frontPicSize = MON_COORDS_SIZE(frontWidth, 64), \ .frontPicYOffset = frontYOffset, \ .frontAnimFrames = sAnims_Furfrou, \ .frontAnimId = ANIM_H_SLIDE, \ - BACK_PIC(Furfrou##_form, backWidth, 64), \ + .backPic = gMonBackPic_Furfrou##_form, \ + .backPicSize = MON_COORDS_SIZE(backWidth, 64), \ .backPicYOffset = backYOffset, \ .backAnimId = BACK_ANIM_V_STRETCH, \ - PALETTES(Furfrou##_form), \ - ICON(Furfrou##_form, _iconIdx), \ + .palette = gMonPalette_Furfrou##_form, \ + .shinyPalette = gMonShinyPalette_Furfrou##_form, \ + .iconSprite = gMonIcon_Furfrou##_form, \ + .iconPalIndex = _iconIdx, \ FOOTPRINT(Furfrou) \ - LEARNSETS(Furfrou), \ + .levelUpLearnset = sFurfrouLevelUpLearnset, \ + .teachableLearnset = sFurfrouTeachableLearnset, \ .formSpeciesIdTable = sFurfrouFormSpeciesIdTable, \ } @@ -1783,17 +1934,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Espurr, 32, 48), + .frontPic = gMonFrontPic_Espurr, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Espurr, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Espurr, 56, 56), + .backPic = gMonBackPic_Espurr, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Espurr), - ICON(Espurr, 2), + .palette = gMonPalette_Espurr, + .shinyPalette = gMonShinyPalette_Espurr, + .iconSprite = gMonIcon_Espurr, + .iconPalIndex = 2, FOOTPRINT(Espurr) - LEARNSETS(Espurr), + .levelUpLearnset = sEspurrLevelUpLearnset, + .teachableLearnset = sEspurrTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC_MALE}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_FEMALE}), }, @@ -1838,12 +1994,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "males is strong. It's when they're\n" "protecting themselves or their partners\n" "that they unleash their full power."), - FRONT_PIC(MeowsticMale, 48, 64), + .frontPic = gMonFrontPic_MeowsticMale, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, - BACK_PIC(MeowsticMale, 64, 64), - PALETTES(MeowsticMale), - ICON(MeowsticMale, 0), - LEARNSETS(MeowsticMale), + .backPic = gMonBackPic_MeowsticMale, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_MeowsticMale, + .shinyPalette = gMonShinyPalette_MeowsticMale, + .iconSprite = gMonIcon_MeowsticMale, + .iconPalIndex = 0, + .levelUpLearnset = sMeowsticMaleLevelUpLearnset, + .teachableLearnset = sMeowsticMaleTeachableLearnset, }, [SPECIES_MEOWSTIC_FEMALE] = @@ -1886,12 +2047,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "aggressive than males. If they\n" "don't get what they want, they will\n" "torment you with their psychic abilities."), - FRONT_PIC(MeowsticFemale, 56, 64), + .frontPic = gMonFrontPic_MeowsticFemale, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - BACK_PIC(MeowsticFemale, 48, 64), - PALETTES(MeowsticFemale), - ICON(MeowsticFemale, 0), - LEARNSETS(MeowsticFemale), + .backPic = gMonBackPic_MeowsticFemale, + .backPicSize = MON_COORDS_SIZE(48, 64), + .palette = gMonPalette_MeowsticFemale, + .shinyPalette = gMonShinyPalette_MeowsticFemale, + .iconSprite = gMonIcon_MeowsticFemale, + .iconPalIndex = 0, + .levelUpLearnset = sMeowsticFemaleLevelUpLearnset, + .teachableLearnset = sMeowsticFemaleTeachableLearnset, }, #endif //P_FAMILY_ESPURR @@ -1930,18 +2096,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Honedge, 64, 56), + .frontPic = gMonFrontPic_Honedge, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Honedge, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 4, - BACK_PIC(Honedge, 48, 56), + .backPic = gMonBackPic_Honedge, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Honedge), - ICON(Honedge, 2), + .palette = gMonPalette_Honedge, + .shinyPalette = gMonShinyPalette_Honedge, + .iconSprite = gMonIcon_Honedge, + .iconPalIndex = 2, FOOTPRINT(Honedge) - LEARNSETS(Honedge), + .levelUpLearnset = sHonedgeLevelUpLearnset, + .teachableLearnset = sHonedgeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DOUBLADE}), }, @@ -1979,18 +2150,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Doublade, 64, 64), + .frontPic = gMonFrontPic_Doublade, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Doublade, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 5, - BACK_PIC(Doublade, 64, 64), + .backPic = gMonBackPic_Doublade, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Doublade), - ICON(Doublade, 2), + .palette = gMonPalette_Doublade, + .shinyPalette = gMonShinyPalette_Doublade, + .iconSprite = gMonIcon_Doublade, + .iconPalIndex = 2, FOOTPRINT(Doublade) - LEARNSETS(Doublade), + .levelUpLearnset = sDoubladeLevelUpLearnset, + .teachableLearnset = sDoubladeTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_AEGISLASH_SHIELD}), }, @@ -2019,7 +2195,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 290, .trainerOffset = 1, FOOTPRINT(Aegislash) - LEARNSETS(Aegislash), + .levelUpLearnset = sAegislashLevelUpLearnset, + .teachableLearnset = sAegislashTeachableLearnset, .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, @@ -2035,16 +2212,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "Aegislash uses its steel body and a force\n" "field of spectral power to reduce the\n" "damage of any attack."), - FRONT_PIC(AegislashShield, 56, 64), + .frontPic = gMonFrontPic_AegislashShield, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AegislashShield, .frontAnimId = ANIM_H_VIBRATE, .enemyMonElevation = 3, - BACK_PIC(AegislashShield, 64, 64), + .backPic = gMonBackPic_AegislashShield, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(AegislashShield), - ICON(AegislashShield, 2), + .palette = gMonPalette_AegislashShield, + .shinyPalette = gMonShinyPalette_AegislashShield, + .iconSprite = gMonIcon_AegislashShield, + .iconPalIndex = 2, }, [SPECIES_AEGISLASH_BLADE] = @@ -2070,7 +2251,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 290, .trainerOffset = 1, FOOTPRINT(Aegislash) - LEARNSETS(Aegislash), + .levelUpLearnset = sAegislashLevelUpLearnset, + .teachableLearnset = sAegislashTeachableLearnset, .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, .baseHP = 60, @@ -2091,16 +2273,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "Aegislash reigned over the land. His\n" "Pokémon eventually drained him of\n" "life, and his kingdom fell with him."), - FRONT_PIC(AegislashBlade, 64, 64), + .frontPic = gMonFrontPic_AegislashBlade, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AegislashBlade, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, .enemyMonElevation = 3, - BACK_PIC(AegislashBlade, 64, 64), + .backPic = gMonBackPic_AegislashBlade, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(AegislashBlade), - ICON(AegislashBlade, 2), + .palette = gMonPalette_AegislashBlade, + .shinyPalette = gMonShinyPalette_AegislashBlade, + .iconSprite = gMonIcon_AegislashBlade, + .iconPalIndex = 2, }, #endif //P_FAMILY_HONEDGE @@ -2139,18 +2325,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spritzee, 48, 48), + .frontPic = gMonFrontPic_Spritzee, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Spritzee, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 14, - BACK_PIC(Spritzee, 56, 48), + .backPic = gMonBackPic_Spritzee, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Spritzee), - ICON(Spritzee, 0), + .palette = gMonPalette_Spritzee, + .shinyPalette = gMonShinyPalette_Spritzee, + .iconSprite = gMonIcon_Spritzee, + .iconPalIndex = 0, FOOTPRINT(Spritzee) - LEARNSETS(Spritzee), + .levelUpLearnset = sSpritzeeLevelUpLearnset, + .teachableLearnset = sSpritzeeTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}, {EVO_ITEM, ITEM_SACHET, SPECIES_AROMATISSE}), }, @@ -2189,17 +2380,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Aromatisse, 48, 56), + .frontPic = gMonFrontPic_Aromatisse, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Aromatisse, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Aromatisse, 64, 64), + .backPic = gMonBackPic_Aromatisse, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Aromatisse), - ICON(Aromatisse, 0), + .palette = gMonPalette_Aromatisse, + .shinyPalette = gMonShinyPalette_Aromatisse, + .iconSprite = gMonIcon_Aromatisse, + .iconPalIndex = 0, FOOTPRINT(Aromatisse) - LEARNSETS(Aromatisse), + .levelUpLearnset = sAromatisseLevelUpLearnset, + .teachableLearnset = sAromatisseTeachableLearnset, }, #endif //P_FAMILY_SPRITZEE @@ -2238,17 +2434,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Swirlix, 40, 40), + .frontPic = gMonFrontPic_Swirlix, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Swirlix, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, - BACK_PIC(Swirlix, 56, 40), + .backPic = gMonBackPic_Swirlix, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SPRING, - PALETTES(Swirlix), - ICON(Swirlix, 1), + .palette = gMonPalette_Swirlix, + .shinyPalette = gMonShinyPalette_Swirlix, + .iconSprite = gMonIcon_Swirlix, + .iconPalIndex = 1, FOOTPRINT(Swirlix) - LEARNSETS(Swirlix), + .levelUpLearnset = sSwirlixLevelUpLearnset, + .teachableLearnset = sSwirlixTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}, {EVO_ITEM, ITEM_WHIPPED_DREAM, SPECIES_SLURPUFF}), }, @@ -2287,17 +2488,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Slurpuff, 48, 56), + .frontPic = gMonFrontPic_Slurpuff, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Slurpuff, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Slurpuff, 64, 64), + .backPic = gMonBackPic_Slurpuff, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Slurpuff), - ICON(Slurpuff, 1), + .palette = gMonPalette_Slurpuff, + .shinyPalette = gMonShinyPalette_Slurpuff, + .iconSprite = gMonIcon_Slurpuff, + .iconPalIndex = 1, FOOTPRINT(Slurpuff) - LEARNSETS(Slurpuff), + .levelUpLearnset = sSlurpuffLevelUpLearnset, + .teachableLearnset = sSlurpuffTeachableLearnset, }, #endif //P_FAMILY_SWIRLIX @@ -2336,18 +2542,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Inkay, 48, 48), + .frontPic = gMonFrontPic_Inkay, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Inkay, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 14, - BACK_PIC(Inkay, 56, 64), + .backPic = gMonBackPic_Inkay, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Inkay), - ICON(Inkay, 0), + .palette = gMonPalette_Inkay, + .shinyPalette = gMonShinyPalette_Inkay, + .iconSprite = gMonIcon_Inkay, + .iconPalIndex = 0, FOOTPRINT(Inkay) - LEARNSETS(Inkay), + .levelUpLearnset = sInkayLevelUpLearnset, + .teachableLearnset = sInkayTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MALAMAR}), }, @@ -2385,17 +2596,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Malamar, 64, 64), + .frontPic = gMonFrontPic_Malamar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Malamar, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Malamar, 64, 56), + .backPic = gMonBackPic_Malamar, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Malamar), - ICON(Malamar, 2), + .palette = gMonPalette_Malamar, + .shinyPalette = gMonShinyPalette_Malamar, + .iconSprite = gMonIcon_Malamar, + .iconPalIndex = 2, FOOTPRINT(Malamar) - LEARNSETS(Malamar), + .levelUpLearnset = sMalamarLevelUpLearnset, + .teachableLearnset = sMalamarTeachableLearnset, }, #endif //P_FAMILY_INKAY @@ -2434,17 +2650,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Binacle, 48, 56), + .frontPic = gMonFrontPic_Binacle, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Binacle, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Binacle, 64, 64), + .backPic = gMonBackPic_Binacle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Binacle), - ICON(Binacle, 2), + .palette = gMonPalette_Binacle, + .shinyPalette = gMonShinyPalette_Binacle, + .iconSprite = gMonIcon_Binacle, + .iconPalIndex = 2, FOOTPRINT(Binacle) - LEARNSETS(Binacle), + .levelUpLearnset = sBinacleLevelUpLearnset, + .teachableLearnset = sBinacleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_BARBARACLE}), }, @@ -2483,17 +2704,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Barbaracle, 64, 64), + .frontPic = gMonFrontPic_Barbaracle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Barbaracle, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Barbaracle, 64, 64), + .backPic = gMonBackPic_Barbaracle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Barbaracle), - ICON(Barbaracle, 2), + .palette = gMonPalette_Barbaracle, + .shinyPalette = gMonShinyPalette_Barbaracle, + .iconSprite = gMonIcon_Barbaracle, + .iconPalIndex = 2, FOOTPRINT(Barbaracle) - LEARNSETS(Barbaracle), + .levelUpLearnset = sBarbaracleLevelUpLearnset, + .teachableLearnset = sBarbaracleTeachableLearnset, }, #endif //P_FAMILY_BINACLE @@ -2532,17 +2758,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skrelp, 40, 48), + .frontPic = gMonFrontPic_Skrelp, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Skrelp, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, - BACK_PIC(Skrelp, 64, 64), + .backPic = gMonBackPic_Skrelp, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Skrelp), - ICON(Skrelp, 2), + .palette = gMonPalette_Skrelp, + .shinyPalette = gMonShinyPalette_Skrelp, + .iconSprite = gMonIcon_Skrelp, + .iconPalIndex = 2, FOOTPRINT(Skrelp) - LEARNSETS(Skrelp), + .levelUpLearnset = sSkrelpLevelUpLearnset, + .teachableLearnset = sSkrelpTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_DRAGALGE}), }, @@ -2580,17 +2811,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Dragalge, 64, 64), + .frontPic = gMonFrontPic_Dragalge, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dragalge, .frontAnimId = ANIM_FRONT_FLIP, - BACK_PIC(Dragalge, 64, 64), + .backPic = gMonBackPic_Dragalge, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Dragalge), - ICON(Dragalge, 5), + .palette = gMonPalette_Dragalge, + .shinyPalette = gMonShinyPalette_Dragalge, + .iconSprite = gMonIcon_Dragalge, + .iconPalIndex = 5, FOOTPRINT(Dragalge) - LEARNSETS(Dragalge), + .levelUpLearnset = sDragalgeLevelUpLearnset, + .teachableLearnset = sDragalgeTeachableLearnset, }, #endif //P_FAMILY_SKRELP @@ -2630,17 +2866,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clauncher, 56, 40), + .frontPic = gMonFrontPic_Clauncher, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Clauncher, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Clauncher, 64, 48), + .backPic = gMonBackPic_Clauncher, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Clauncher), - ICON(Clauncher, 0), + .palette = gMonPalette_Clauncher, + .shinyPalette = gMonShinyPalette_Clauncher, + .iconSprite = gMonIcon_Clauncher, + .iconPalIndex = 0, FOOTPRINT(Clauncher) - LEARNSETS(Clauncher), + .levelUpLearnset = sClauncherLevelUpLearnset, + .teachableLearnset = sClauncherTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_CLAWITZER}), }, @@ -2679,17 +2920,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clawitzer, 64, 64), + .frontPic = gMonFrontPic_Clawitzer, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Clawitzer, .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, - BACK_PIC(Clawitzer, 64, 48), + .backPic = gMonBackPic_Clawitzer, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(Clawitzer), - ICON(Clawitzer, 0), + .palette = gMonPalette_Clawitzer, + .shinyPalette = gMonShinyPalette_Clawitzer, + .iconSprite = gMonIcon_Clawitzer, + .iconPalIndex = 0, FOOTPRINT(Clawitzer) - LEARNSETS(Clawitzer), + .levelUpLearnset = sClawitzerLevelUpLearnset, + .teachableLearnset = sClawitzerTeachableLearnset, }, #endif //P_FAMILY_CLAUNCHER @@ -2728,17 +2974,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Helioptile, 40, 40), + .frontPic = gMonFrontPic_Helioptile, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Helioptile, .frontAnimId = ANIM_GLOW_YELLOW, - BACK_PIC(Helioptile, 64, 48), + .backPic = gMonBackPic_Helioptile, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Helioptile), - ICON(Helioptile, 2), + .palette = gMonPalette_Helioptile, + .shinyPalette = gMonShinyPalette_Helioptile, + .iconSprite = gMonIcon_Helioptile, + .iconPalIndex = 2, FOOTPRINT(Helioptile) - LEARNSETS(Helioptile), + .levelUpLearnset = sHelioptileLevelUpLearnset, + .teachableLearnset = sHelioptileTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK}), }, @@ -2777,17 +3028,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Heliolisk, 64, 56), + .frontPic = gMonFrontPic_Heliolisk, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Heliolisk, .frontAnimId = ANIM_RAPID_H_HOPS, - BACK_PIC(Heliolisk, 56, 64), + .backPic = gMonBackPic_Heliolisk, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Heliolisk), - ICON(Heliolisk, 2), + .palette = gMonPalette_Heliolisk, + .shinyPalette = gMonShinyPalette_Heliolisk, + .iconSprite = gMonIcon_Heliolisk, + .iconPalIndex = 2, FOOTPRINT(Heliolisk) - LEARNSETS(Heliolisk), + .levelUpLearnset = sHelioliskLevelUpLearnset, + .teachableLearnset = sHelioliskTeachableLearnset, }, #endif //P_FAMILY_HELIOPTILE @@ -2826,17 +3082,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Tyrunt, 48, 48), + .frontPic = gMonFrontPic_Tyrunt, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Tyrunt, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Tyrunt, 64, 48), + .backPic = gMonBackPic_Tyrunt, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Tyrunt), - ICON(Tyrunt, 2), + .palette = gMonPalette_Tyrunt, + .shinyPalette = gMonShinyPalette_Tyrunt, + .iconSprite = gMonIcon_Tyrunt, + .iconPalIndex = 2, FOOTPRINT(Tyrunt) - LEARNSETS(Tyrunt), + .levelUpLearnset = sTyruntLevelUpLearnset, + .teachableLearnset = sTyruntTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM}), }, @@ -2874,17 +3135,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Tyrantrum, 64, 64), + .frontPic = gMonFrontPic_Tyrantrum, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Tyrantrum, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Tyrantrum, 64, 56), + .backPic = gMonBackPic_Tyrantrum, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - PALETTES(Tyrantrum), - ICON(Tyrantrum, 0), + .palette = gMonPalette_Tyrantrum, + .shinyPalette = gMonShinyPalette_Tyrantrum, + .iconSprite = gMonIcon_Tyrantrum, + .iconPalIndex = 0, FOOTPRINT(Tyrantrum) - LEARNSETS(Tyrantrum), + .levelUpLearnset = sTyrantrumLevelUpLearnset, + .teachableLearnset = sTyrantrumTeachableLearnset, }, #endif //P_FAMILY_TYRUNT @@ -2923,17 +3189,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Amaura, 32, 56), + .frontPic = gMonFrontPic_Amaura, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Amaura, .frontAnimId = ANIM_CONCAVE_ARC_SMALL_TWICE, - BACK_PIC(Amaura, 40, 64), + .backPic = gMonBackPic_Amaura, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Amaura), - ICON(Amaura, 0), + .palette = gMonPalette_Amaura, + .shinyPalette = gMonShinyPalette_Amaura, + .iconSprite = gMonIcon_Amaura, + .iconPalIndex = 0, FOOTPRINT(Amaura) - LEARNSETS(Amaura), + .levelUpLearnset = sAmauraLevelUpLearnset, + .teachableLearnset = sAmauraTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}), }, @@ -2971,17 +3242,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Aurorus, 64, 64), + .frontPic = gMonFrontPic_Aurorus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Aurorus, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Aurorus, 64, 64), + .backPic = gMonBackPic_Aurorus, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Aurorus), - ICON(Aurorus, 0), + .palette = gMonPalette_Aurorus, + .shinyPalette = gMonShinyPalette_Aurorus, + .iconSprite = gMonIcon_Aurorus, + .iconPalIndex = 0, FOOTPRINT(Aurorus) - LEARNSETS(Aurorus), + .levelUpLearnset = sAurorusLevelUpLearnset, + .teachableLearnset = sAurorusTeachableLearnset, }, #endif //P_FAMILY_AMAURA @@ -3025,17 +3301,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Hawlucha, 64, 56), + .frontPic = gMonFrontPic_Hawlucha, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Hawlucha, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Hawlucha, 64, 48), + .backPic = gMonBackPic_Hawlucha, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Hawlucha), - ICON(Hawlucha, 0), + .palette = gMonPalette_Hawlucha, + .shinyPalette = gMonShinyPalette_Hawlucha, + .iconSprite = gMonIcon_Hawlucha, + .iconPalIndex = 0, FOOTPRINT(Hawlucha) - LEARNSETS(Hawlucha), + .levelUpLearnset = sHawluchaLevelUpLearnset, + .teachableLearnset = sHawluchaTeachableLearnset, }, #endif //P_FAMILY_HAWLUCHA @@ -3074,17 +3355,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dedenne, 64, 40), + .frontPic = gMonFrontPic_Dedenne, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Dedenne, .frontAnimId = ANIM_GLOW_YELLOW, - BACK_PIC(Dedenne, 64, 48), + .backPic = gMonBackPic_Dedenne, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, - PALETTES(Dedenne), - ICON(Dedenne, 0), + .palette = gMonPalette_Dedenne, + .shinyPalette = gMonShinyPalette_Dedenne, + .iconSprite = gMonIcon_Dedenne, + .iconPalIndex = 0, FOOTPRINT(Dedenne) - LEARNSETS(Dedenne), + .levelUpLearnset = sDedenneLevelUpLearnset, + .teachableLearnset = sDedenneTeachableLearnset, }, #endif //P_FAMILY_DEDENNE @@ -3124,18 +3410,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Carbink, 48, 48), + .frontPic = gMonFrontPic_Carbink, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Carbink, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 4, - BACK_PIC(Carbink, 56, 56), + .backPic = gMonBackPic_Carbink, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_VIBRATE, - PALETTES(Carbink), - ICON(Carbink, 2), + .palette = gMonPalette_Carbink, + .shinyPalette = gMonShinyPalette_Carbink, + .iconSprite = gMonIcon_Carbink, + .iconPalIndex = 2, FOOTPRINT(Carbink) - LEARNSETS(Carbink), + .levelUpLearnset = sCarbinkLevelUpLearnset, + .teachableLearnset = sCarbinkTeachableLearnset, }, #endif //P_FAMILY_CARBINK @@ -3175,17 +3466,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Goomy, 32, 40), + .frontPic = gMonFrontPic_Goomy, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Goomy, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Goomy, 48, 56), + .backPic = gMonBackPic_Goomy, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SPRING, - PALETTES(Goomy), - ICON(Goomy, 5), + .palette = gMonPalette_Goomy, + .shinyPalette = gMonShinyPalette_Goomy, + .iconSprite = gMonIcon_Goomy, + .iconPalIndex = 5, FOOTPRINT(Goomy) - LEARNSETS(Goomy), + .levelUpLearnset = sGoomyLevelUpLearnset, + .teachableLearnset = sGoomyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_SLIGGOO}, {EVO_NONE, 0, SPECIES_SLIGGOO_HISUIAN}), }, @@ -3227,16 +3523,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Sliggoo, 32, 64), + .frontPic = gMonFrontPic_Sliggoo, + .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Sliggoo, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sliggoo, 48, 64), + .backPic = gMonBackPic_Sliggoo, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Sliggoo), - ICON(Sliggoo, 5), - LEARNSETS(Sliggoo), + .palette = gMonPalette_Sliggoo, + .shinyPalette = gMonShinyPalette_Sliggoo, + .iconSprite = gMonIcon_Sliggoo, + .iconPalIndex = 5, + .levelUpLearnset = sSliggooLevelUpLearnset, + .teachableLearnset = sSliggooTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA}, {EVO_LEVEL_FOG, 50, SPECIES_GOODRA}), }, @@ -3277,16 +3578,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Goodra, 64, 64), + .frontPic = gMonFrontPic_Goodra, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Goodra, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Goodra, 64, 64), + .backPic = gMonBackPic_Goodra, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Goodra), - ICON(Goodra, 5), - LEARNSETS(Goodra), + .palette = gMonPalette_Goodra, + .shinyPalette = gMonShinyPalette_Goodra, + .iconSprite = gMonIcon_Goodra, + .iconPalIndex = 5, + .levelUpLearnset = sGoodraLevelUpLearnset, + .teachableLearnset = sGoodraTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -3327,16 +3633,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(SliggooHisuian, 48, 56), + .frontPic = gMonFrontPic_SliggooHisuian, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_SliggooHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SliggooHisuian, 64, 64), + .backPic = gMonBackPic_SliggooHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SliggooHisuian), - ICON(SliggooHisuian, 2), - LEARNSETS(SliggooHisuian), + .palette = gMonPalette_SliggooHisuian, + .shinyPalette = gMonShinyPalette_SliggooHisuian, + .iconSprite = gMonIcon_SliggooHisuian, + .iconPalIndex = 2, + .levelUpLearnset = sSliggooHisuianLevelUpLearnset, + .teachableLearnset = sSliggooHisuianTeachableLearnset, .isHisuianForm = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA_HISUIAN}, {EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUIAN}), @@ -3378,16 +3689,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(GoodraHisuian, 56, 64), + .frontPic = gMonFrontPic_GoodraHisuian, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_GoodraHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GoodraHisuian, 64, 64), + .backPic = gMonBackPic_GoodraHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GoodraHisuian), - ICON(GoodraHisuian, 2), - LEARNSETS(GoodraHisuian), + .palette = gMonPalette_GoodraHisuian, + .shinyPalette = gMonShinyPalette_GoodraHisuian, + .iconSprite = gMonIcon_GoodraHisuian, + .iconPalIndex = 2, + .levelUpLearnset = sGoodraHisuianLevelUpLearnset, + .teachableLearnset = sGoodraHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -3429,18 +3745,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Klefki, 40, 56), + .frontPic = gMonFrontPic_Klefki, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Klefki, .frontAnimId = ANIM_FOUR_PETAL, .enemyMonElevation = 5, - BACK_PIC(Klefki, 56, 64), + .backPic = gMonBackPic_Klefki, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 8, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Klefki), - ICON(Klefki, 0), + .palette = gMonPalette_Klefki, + .shinyPalette = gMonShinyPalette_Klefki, + .iconSprite = gMonIcon_Klefki, + .iconPalIndex = 0, FOOTPRINT(Klefki) - LEARNSETS(Klefki), + .levelUpLearnset = sKlefkiLevelUpLearnset, + .teachableLearnset = sKlefkiTeachableLearnset, }, #endif //P_FAMILY_KLEFKI @@ -3479,18 +3800,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Phantump, 48, 48), + .frontPic = gMonFrontPic_Phantump, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Phantump, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Phantump, 64, 56), + .backPic = gMonBackPic_Phantump, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Phantump), - ICON(Phantump, 1), + .palette = gMonPalette_Phantump, + .shinyPalette = gMonShinyPalette_Phantump, + .iconSprite = gMonIcon_Phantump, + .iconPalIndex = 1, FOOTPRINT(Phantump) - LEARNSETS(Phantump), + .levelUpLearnset = sPhantumpLevelUpLearnset, + .teachableLearnset = sPhantumpTeachableLearnset, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_TREVENANT}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_TREVENANT}), }, @@ -3529,17 +3855,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Trevenant, 64, 64), + .frontPic = gMonFrontPic_Trevenant, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Trevenant, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Trevenant, 64, 64), + .backPic = gMonBackPic_Trevenant, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Trevenant), - ICON(Trevenant, 1), + .palette = gMonPalette_Trevenant, + .shinyPalette = gMonShinyPalette_Trevenant, + .iconSprite = gMonIcon_Trevenant, + .iconPalIndex = 1, FOOTPRINT(Trevenant) - LEARNSETS(Trevenant), + .levelUpLearnset = sTrevenantLevelUpLearnset, + .teachableLearnset = sTrevenantTeachableLearnset, }, #endif //P_FAMILY_PHANTUMP @@ -3563,10 +3894,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Pumpkaboo, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pumpkaboo), - ICON(Pumpkaboo, 2), + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, FOOTPRINT(Pumpkaboo) - LEARNSETS(Pumpkaboo), + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 49, .baseAttack = 66, @@ -3586,9 +3920,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PumpkabooAverage, 40, 40), + .frontPic = gMonFrontPic_PumpkabooAverage, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, - BACK_PIC(PumpkabooAverage, 56, 48), + .backPic = gMonBackPic_PumpkabooAverage, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 13, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_AVERAGE}), @@ -3613,10 +3949,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Pumpkaboo, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pumpkaboo), - ICON(Pumpkaboo, 2), + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, FOOTPRINT(Pumpkaboo) - LEARNSETS(Pumpkaboo), + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 44, .baseAttack = 66, @@ -3635,9 +3974,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PumpkabooSmall, 40, 40), + .frontPic = gMonFrontPic_PumpkabooSmall, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - BACK_PIC(PumpkabooSmall, 56, 48), + .backPic = gMonBackPic_PumpkabooSmall, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 14, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SMALL}), @@ -3662,10 +4003,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Pumpkaboo, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pumpkaboo), - ICON(Pumpkaboo, 2), + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, FOOTPRINT(Pumpkaboo) - LEARNSETS(Pumpkaboo), + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 54, .baseAttack = 66, @@ -3684,9 +4028,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PumpkabooLarge, 48, 48), + .frontPic = gMonFrontPic_PumpkabooLarge, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, - BACK_PIC(PumpkabooLarge, 56, 48), + .backPic = gMonBackPic_PumpkabooLarge, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 13, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_LARGE}), @@ -3711,10 +4057,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Pumpkaboo, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Pumpkaboo), - ICON(Pumpkaboo, 2), + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, FOOTPRINT(Pumpkaboo) - LEARNSETS(Pumpkaboo), + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .baseHP = 59, .baseAttack = 66, @@ -3735,9 +4084,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(PumpkabooSuper, 48, 48), + .frontPic = gMonFrontPic_PumpkabooSuper, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - BACK_PIC(PumpkabooSuper, 56, 48), + .backPic = gMonBackPic_PumpkabooSuper, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SUPER}), @@ -3762,10 +4113,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Gourgeist, .frontAnimId = ANIM_SHRINK_GROW, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gourgeist), - ICON(Gourgeist, 2), + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, FOOTPRINT(Gourgeist) - LEARNSETS(Gourgeist), + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 65, .baseAttack = 90, @@ -3785,9 +4139,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GourgeistAverage, 64, 64), + .frontPic = gMonFrontPic_GourgeistAverage, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - BACK_PIC(GourgeistAverage, 48, 64), + .backPic = gMonBackPic_GourgeistAverage, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 3, }, @@ -3810,10 +4166,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Gourgeist, .frontAnimId = ANIM_SHRINK_GROW, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gourgeist), - ICON(Gourgeist, 2), + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, FOOTPRINT(Gourgeist) - LEARNSETS(Gourgeist), + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 55, .baseAttack = 85, @@ -3833,9 +4192,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GourgeistSmall, 56, 64), + .frontPic = gMonFrontPic_GourgeistSmall, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 5, - BACK_PIC(GourgeistSmall, 48, 56), + .backPic = gMonBackPic_GourgeistSmall, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 4, }, @@ -3858,10 +4219,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Gourgeist, .frontAnimId = ANIM_SHRINK_GROW, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gourgeist), - ICON(Gourgeist, 2), + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, FOOTPRINT(Gourgeist) - LEARNSETS(Gourgeist), + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 75, .baseAttack = 95, @@ -3881,9 +4245,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GourgeistLarge, 64, 64), + .frontPic = gMonFrontPic_GourgeistLarge, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - BACK_PIC(GourgeistLarge, 48, 64), + .backPic = gMonBackPic_GourgeistLarge, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 2, }, @@ -3906,10 +4272,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Gourgeist, .frontAnimId = ANIM_SHRINK_GROW, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Gourgeist), - ICON(Gourgeist, 2), + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, FOOTPRINT(Gourgeist) - LEARNSETS(Gourgeist), + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, .baseHP = 85, .baseAttack = 100, @@ -3931,9 +4300,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GourgeistSuper, 64, 64), + .frontPic = gMonFrontPic_GourgeistSuper, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - BACK_PIC(GourgeistSuper, 56, 64), + .backPic = gMonBackPic_GourgeistSuper, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, }, #endif //P_FAMILY_PUMPKABOO @@ -3979,17 +4350,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Bergmite, 40, 40), + .frontPic = gMonFrontPic_Bergmite, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Bergmite, .frontAnimId = ANIM_LUNGE_GROW, - BACK_PIC(Bergmite, 56, 48), + .backPic = gMonBackPic_Bergmite, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Bergmite), - ICON(Bergmite, 0), + .palette = gMonPalette_Bergmite, + .shinyPalette = gMonShinyPalette_Bergmite, + .iconSprite = gMonIcon_Bergmite, + .iconPalIndex = 0, FOOTPRINT(Bergmite) - LEARNSETS(Bergmite), + .levelUpLearnset = sBergmiteLevelUpLearnset, + .teachableLearnset = sBergmiteTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_AVALUGG}, {EVO_NONE, 0, SPECIES_AVALUGG_HISUIAN}), }, @@ -4031,16 +4407,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Avalugg, 64, 56), + .frontPic = gMonFrontPic_Avalugg, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Avalugg, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Avalugg, 64, 40), + .backPic = gMonBackPic_Avalugg, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(Avalugg), - ICON(Avalugg, 0), - LEARNSETS(Avalugg), + .palette = gMonPalette_Avalugg, + .shinyPalette = gMonShinyPalette_Avalugg, + .iconSprite = gMonIcon_Avalugg, + .iconPalIndex = 0, + .levelUpLearnset = sAvaluggLevelUpLearnset, + .teachableLearnset = sAvaluggTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -4079,16 +4460,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(AvaluggHisuian, 64, 48), + .frontPic = gMonFrontPic_AvaluggHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 6, .frontAnimFrames = sAnims_AvaluggHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AvaluggHisuian, 64, 32), + .backPic = gMonBackPic_AvaluggHisuian, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(AvaluggHisuian), - ICON(AvaluggHisuian, 5), - LEARNSETS(AvaluggHisuian), + .palette = gMonPalette_AvaluggHisuian, + .shinyPalette = gMonShinyPalette_AvaluggHisuian, + .iconSprite = gMonIcon_AvaluggHisuian, + .iconPalIndex = 5, + .levelUpLearnset = sAvaluggHisuianLevelUpLearnset, + .teachableLearnset = sAvaluggHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -4133,18 +4519,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Noibat, 64, 48), + .frontPic = gMonFrontPic_Noibat, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Noibat, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Noibat, 56, 64), + .backPic = gMonBackPic_Noibat, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - PALETTES(Noibat), - ICON(Noibat, 2), + .palette = gMonPalette_Noibat, + .shinyPalette = gMonShinyPalette_Noibat, + .iconSprite = gMonIcon_Noibat, + .iconPalIndex = 2, FOOTPRINT(Noibat) - LEARNSETS(Noibat), + .levelUpLearnset = sNoibatLevelUpLearnset, + .teachableLearnset = sNoibatTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 48, SPECIES_NOIVERN}), }, @@ -4186,17 +4577,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Noivern, 64, 64), + .frontPic = gMonFrontPic_Noivern, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Noivern, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Noivern, 64, 64), + .backPic = gMonBackPic_Noivern, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Noivern), - ICON(Noivern, 2), + .palette = gMonPalette_Noivern, + .shinyPalette = gMonShinyPalette_Noivern, + .iconSprite = gMonIcon_Noivern, + .iconPalIndex = 2, FOOTPRINT(Noivern) - LEARNSETS(Noivern), + .levelUpLearnset = sNoivernLevelUpLearnset, + .teachableLearnset = sNoivernTeachableLearnset, }, #endif //P_FAMILY_NOIBAT @@ -4231,17 +4627,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(XerneasNeutral, 64, 64), + .frontPic = gMonFrontPic_XerneasNeutral, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Xerneas, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(XerneasNeutral, 64, 64), + .backPic = gMonBackPic_XerneasNeutral, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(XerneasNeutral), - ICON(XerneasNeutral, 0), + .palette = gMonPalette_XerneasNeutral, + .shinyPalette = gMonShinyPalette_XerneasNeutral, + .iconSprite = gMonIcon_XerneasNeutral, + .iconPalIndex = 0, FOOTPRINT(Xerneas) - LEARNSETS(Xerneas), + .levelUpLearnset = sXerneasLevelUpLearnset, + .teachableLearnset = sXerneasTeachableLearnset, .formSpeciesIdTable = sXerneasFormSpeciesIdTable, .formChangeTable = sXerneasFormChangeTable, .isLegendary = TRUE, @@ -4277,17 +4678,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(XerneasActive, 64, 64), + .frontPic = gMonFrontPic_XerneasActive, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Xerneas, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(XerneasActive, 64, 64), + .backPic = gMonBackPic_XerneasActive, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, - PALETTES(XerneasActive), - ICON(XerneasActive, 0), + .palette = gMonPalette_XerneasActive, + .shinyPalette = gMonShinyPalette_XerneasActive, + .iconSprite = gMonIcon_XerneasActive, + .iconPalIndex = 0, FOOTPRINT(Xerneas) - LEARNSETS(Xerneas), + .levelUpLearnset = sXerneasLevelUpLearnset, + .teachableLearnset = sXerneasTeachableLearnset, .formSpeciesIdTable = sXerneasFormSpeciesIdTable, .formChangeTable = sXerneasFormChangeTable, .isLegendary = TRUE, @@ -4330,18 +4736,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 360, .trainerOffset = 7, - FRONT_PIC(Yveltal, 64, 64), + .frontPic = gMonFrontPic_Yveltal, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Yveltal, .frontAnimId = ANIM_FRONT_FLIP, .enemyMonElevation = 5, - BACK_PIC(Yveltal, 64, 48), + .backPic = gMonBackPic_Yveltal, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Yveltal), - ICON(Yveltal, 0), + .palette = gMonPalette_Yveltal, + .shinyPalette = gMonShinyPalette_Yveltal, + .iconSprite = gMonIcon_Yveltal, + .iconPalIndex = 0, FOOTPRINT(Yveltal) - LEARNSETS(Yveltal), + .levelUpLearnset = sYveltalLevelUpLearnset, + .teachableLearnset = sYveltalTeachableLearnset, }, #endif //P_FAMILY_YVELTAL @@ -4364,15 +4775,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Zygarde50, 64, 64), + .frontPic = gMonFrontPic_Zygarde50, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zygarde50, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Zygarde50, 64, 64), + .backPic = gMonBackPic_Zygarde50, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Zygarde50), - ICON(Zygarde50, 1), + .palette = gMonPalette_Zygarde50, + .shinyPalette = gMonShinyPalette_Zygarde50, + .iconSprite = gMonIcon_Zygarde50, + .iconPalIndex = 1, .formChangeTable = sZygarde50AuraBreakFormChangeTable, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 3, @@ -4388,7 +4803,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), FOOTPRINT(Zygarde) - LEARNSETS(Zygarde), + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, }, @@ -4410,15 +4826,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Zygarde50, 64, 64), + .frontPic = gMonFrontPic_Zygarde50, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zygarde50, .frontAnimId = ANIM_TIP_MOVE_FORWARD, - BACK_PIC(Zygarde50, 64, 64), + .backPic = gMonBackPic_Zygarde50, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(Zygarde50), - ICON(Zygarde50, 1), + .palette = gMonPalette_Zygarde50, + .shinyPalette = gMonShinyPalette_Zygarde50, + .iconSprite = gMonIcon_Zygarde50, + .iconPalIndex = 1, .formChangeTable = sZygarde50PowerConstructFormChangeTable, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 3, @@ -4434,7 +4854,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), FOOTPRINT(Zygarde) - LEARNSETS(Zygarde), + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, }, @@ -4456,14 +4877,18 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Zygarde10, 56, 64), + .frontPic = gMonFrontPic_Zygarde10, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zygarde10, - BACK_PIC(Zygarde10, 64, 56), + .backPic = gMonBackPic_Zygarde10, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, - PALETTES(Zygarde10), - ICON(Zygarde10, 1), + .palette = gMonPalette_Zygarde10, + .shinyPalette = gMonShinyPalette_Zygarde10, + .iconSprite = gMonIcon_Zygarde10, + .iconPalIndex = 1, .formChangeTable = sZygarde10AuraBreakFormChangeTable, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 3, @@ -4479,7 +4904,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), FOOTPRINT(Zygarde) - LEARNSETS(Zygarde), + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, @@ -4503,14 +4929,18 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Zygarde10, 56, 64), + .frontPic = gMonFrontPic_Zygarde10, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zygarde10, - BACK_PIC(Zygarde10, 64, 56), + .backPic = gMonBackPic_Zygarde10, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(Zygarde10), - ICON(Zygarde10, 1), + .palette = gMonPalette_Zygarde10, + .shinyPalette = gMonShinyPalette_Zygarde10, + .iconSprite = gMonIcon_Zygarde10, + .iconPalIndex = 1, .formChangeTable = sZygarde10PowerConstructFormChangeTable, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 3, @@ -4526,7 +4956,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), FOOTPRINT(Zygarde) - LEARNSETS(Zygarde), + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, @@ -4548,7 +4979,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), FOOTPRINT(Zygarde) - LEARNSETS(Zygarde), + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 216, @@ -4571,15 +5003,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(ZygardeComplete, 64, 64), + .frontPic = gMonFrontPic_ZygardeComplete, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZygardeComplete, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(ZygardeComplete, 64, 64), + .backPic = gMonBackPic_ZygardeComplete, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, - PALETTES(ZygardeComplete), - ICON(ZygardeComplete, 1), + .palette = gMonPalette_ZygardeComplete, + .shinyPalette = gMonShinyPalette_ZygardeComplete, + .iconSprite = gMonIcon_ZygardeComplete, + .iconPalIndex = 1, .formChangeTable = sZygardeCompleteFormChangeTable, }, #endif //P_FAMILY_ZYGARDE @@ -4601,7 +5037,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_DIANCIE, .categoryName = _("Jewel"), FOOTPRINT(Diancie) - LEARNSETS(Diancie), + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, .formSpeciesIdTable = sDiancieFormSpeciesIdTable, .formChangeTable = sDiancieFormChangeTable, .isMythical = TRUE, @@ -4625,15 +5062,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Diancie, 40, 64), + .frontPic = gMonFrontPic_Diancie, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Diancie, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Diancie, 64, 64), + .backPic = gMonBackPic_Diancie, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, - PALETTES(Diancie), - ICON(Diancie, 1), + .palette = gMonPalette_Diancie, + .shinyPalette = gMonShinyPalette_Diancie, + .iconSprite = gMonIcon_Diancie, + .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -4653,7 +5094,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .natDexNum = NATIONAL_DEX_DIANCIE, .categoryName = _("Jewel"), FOOTPRINT(Diancie) - LEARNSETS(Diancie), + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, .formSpeciesIdTable = sDiancieFormSpeciesIdTable, .formChangeTable = sDiancieFormChangeTable, .isMythical = TRUE, @@ -4677,15 +5119,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(DiancieMega, 64, 64), + .frontPic = gMonFrontPic_DiancieMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DiancieMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DiancieMega, 64, 56), + .backPic = gMonBackPic_DiancieMega, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DiancieMega), - ICON(DiancieMega, 0), + .palette = gMonPalette_DiancieMega, + .shinyPalette = gMonShinyPalette_DiancieMega, + .iconSprite = gMonIcon_DiancieMega, + .iconPalIndex = 0, .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -4730,17 +5176,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(HoopaConfined, 48, 48), + .frontPic = gMonFrontPic_HoopaConfined, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_HoopaConfined, .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = 13, - BACK_PIC(HoopaConfined, 64, 56), + .backPic = gMonBackPic_HoopaConfined, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(HoopaConfined), - ICON(HoopaConfined, 0), - LEARNSETS(HoopaConfined), + .palette = gMonPalette_HoopaConfined, + .shinyPalette = gMonShinyPalette_HoopaConfined, + .iconSprite = gMonIcon_HoopaConfined, + .iconPalIndex = 0, + .levelUpLearnset = sHoopaConfinedLevelUpLearnset, + .teachableLearnset = sHoopaConfinedTeachableLearnset, }, [SPECIES_HOOPA_UNBOUND] = @@ -4781,17 +5232,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(HoopaUnbound, 64, 64), + .frontPic = gMonFrontPic_HoopaUnbound, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_HoopaUnbound, .frontAnimId = ANIM_GROW_IN_STAGES, .enemyMonElevation = 3, - BACK_PIC(HoopaUnbound, 64, 64), + .backPic = gMonBackPic_HoopaUnbound, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - PALETTES(HoopaUnbound), - ICON(HoopaUnbound, 0), - LEARNSETS(HoopaUnbound), + .palette = gMonPalette_HoopaUnbound, + .shinyPalette = gMonShinyPalette_HoopaUnbound, + .iconSprite = gMonIcon_HoopaUnbound, + .iconPalIndex = 0, + .levelUpLearnset = sHoopaUnboundLevelUpLearnset, + .teachableLearnset = sHoopaUnboundTeachableLearnset, }, #endif //P_FAMILY_HOOPA @@ -4831,17 +5287,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Volcanion, 64, 64), + .frontPic = gMonFrontPic_Volcanion, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Volcanion, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Volcanion, 64, 64), + .backPic = gMonBackPic_Volcanion, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, - PALETTES(Volcanion), - ICON(Volcanion, 0), + .palette = gMonPalette_Volcanion, + .shinyPalette = gMonShinyPalette_Volcanion, + .iconSprite = gMonIcon_Volcanion, + .iconPalIndex = 0, FOOTPRINT(Volcanion) - LEARNSETS(Volcanion), + .levelUpLearnset = sVolcanionLevelUpLearnset, + .teachableLearnset = sVolcanionTeachableLearnset, }, #endif //P_FAMILY_VOLCANION diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index d929f7ecbba7..ad742ce156fc 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rowlet, 31, 37), + .frontPic = gMonFrontPic_Rowlet, + .frontPicSize = MON_COORDS_SIZE(31, 37), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Rowlet, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Rowlet, 43, 36), + .backPic = gMonBackPic_Rowlet, + .backPicSize = MON_COORDS_SIZE(43, 36), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, - PALETTES(Rowlet), - ICON(Rowlet, 0), + .palette = gMonPalette_Rowlet, + .shinyPalette = gMonShinyPalette_Rowlet, + .iconSprite = gMonIcon_Rowlet, + .iconPalIndex = 0, FOOTPRINT(Rowlet) - LEARNSETS(Rowlet), + .levelUpLearnset = sRowletLevelUpLearnset, + .teachableLearnset = sRowletTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_DARTRIX}), }, @@ -87,17 +92,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dartrix, 34, 47), + .frontPic = gMonFrontPic_Dartrix, + .frontPicSize = MON_COORDS_SIZE(34, 47), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Dartrix, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Dartrix, 56, 54), + .backPic = gMonBackPic_Dartrix, + .backPicSize = MON_COORDS_SIZE(56, 54), .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_STRETCH, - PALETTES(Dartrix), - ICON(Dartrix, 1), + .palette = gMonPalette_Dartrix, + .shinyPalette = gMonShinyPalette_Dartrix, + .iconSprite = gMonIcon_Dartrix, + .iconPalIndex = 1, FOOTPRINT(Dartrix) - LEARNSETS(Dartrix), + .levelUpLearnset = sDartrixLevelUpLearnset, + .teachableLearnset = sDartrixTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_DECIDUEYE}, {EVO_NONE, 0, SPECIES_DECIDUEYE_HISUIAN}), }, @@ -138,16 +148,21 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "It fires arrow quills from its wings with\n" "such precision, they can pierce a pebble\n" "at distances of over a hundred yards."), - FRONT_PIC(Decidueye, 45, 64), + .frontPic = gMonFrontPic_Decidueye, + .frontPicSize = MON_COORDS_SIZE(45, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Decidueye, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(Decidueye, 46, 62), + .backPic = gMonBackPic_Decidueye, + .backPicSize = MON_COORDS_SIZE(46, 62), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Decidueye), - ICON(Decidueye, 1), - LEARNSETS(Decidueye), + .palette = gMonPalette_Decidueye, + .shinyPalette = gMonShinyPalette_Decidueye, + .iconSprite = gMonIcon_Decidueye, + .iconPalIndex = 1, + .levelUpLearnset = sDecidueyeLevelUpLearnset, + .teachableLearnset = sDecidueyeTeachableLearnset, }, #if P_HISUIAN_FORMS @@ -187,16 +202,21 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "of Decidueye's feathers insulates\n" "the Pokémon against Hisui's extreme\n" "cold."), - FRONT_PIC(DecidueyeHisuian, 64, 64), + .frontPic = gMonFrontPic_DecidueyeHisuian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DecidueyeHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DecidueyeHisuian, 64, 64), + .backPic = gMonBackPic_DecidueyeHisuian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DecidueyeHisuian), - ICON(DecidueyeHisuian, 0), - LEARNSETS(DecidueyeHisuian), + .palette = gMonPalette_DecidueyeHisuian, + .shinyPalette = gMonShinyPalette_DecidueyeHisuian, + .iconSprite = gMonIcon_DecidueyeHisuian, + .iconPalIndex = 0, + .levelUpLearnset = sDecidueyeHisuianLevelUpLearnset, + .teachableLearnset = sDecidueyeHisuianTeachableLearnset, .isHisuianForm = TRUE, }, #endif //P_HISUIAN_FORMS @@ -237,17 +257,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Litten, 48, 40), + .frontPic = gMonFrontPic_Litten, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Litten, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Litten, 64, 48), + .backPic = gMonBackPic_Litten, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Litten), - ICON(Litten, 0), + .palette = gMonPalette_Litten, + .shinyPalette = gMonShinyPalette_Litten, + .iconSprite = gMonIcon_Litten, + .iconPalIndex = 0, FOOTPRINT(Litten) - LEARNSETS(Litten), + .levelUpLearnset = sLittenLevelUpLearnset, + .teachableLearnset = sLittenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_TORRACAT}), }, @@ -285,17 +310,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Torracat, 56, 64), + .frontPic = gMonFrontPic_Torracat, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Torracat, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Torracat, 64, 56), + .backPic = gMonBackPic_Torracat, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Torracat), - ICON(Torracat, 0), + .palette = gMonPalette_Torracat, + .shinyPalette = gMonShinyPalette_Torracat, + .iconSprite = gMonIcon_Torracat, + .iconPalIndex = 0, FOOTPRINT(Torracat) - LEARNSETS(Torracat), + .levelUpLearnset = sTorracatLevelUpLearnset, + .teachableLearnset = sTorracatTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_INCINEROAR}), }, @@ -333,17 +363,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Incineroar, 64, 64), + .frontPic = gMonFrontPic_Incineroar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Incineroar, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Incineroar, 64, 56), + .backPic = gMonBackPic_Incineroar, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Incineroar), - ICON(Incineroar, 0), + .palette = gMonPalette_Incineroar, + .shinyPalette = gMonShinyPalette_Incineroar, + .iconSprite = gMonIcon_Incineroar, + .iconPalIndex = 0, FOOTPRINT(Incineroar) - LEARNSETS(Incineroar), + .levelUpLearnset = sIncineroarLevelUpLearnset, + .teachableLearnset = sIncineroarTeachableLearnset, }, #endif //P_FAMILY_LITTEN @@ -382,17 +417,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Popplio, 40, 48), + .frontPic = gMonFrontPic_Popplio, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Popplio, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Popplio, 48, 48), + .backPic = gMonBackPic_Popplio, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Popplio), - ICON(Popplio, 0), + .palette = gMonPalette_Popplio, + .shinyPalette = gMonShinyPalette_Popplio, + .iconSprite = gMonIcon_Popplio, + .iconPalIndex = 0, FOOTPRINT(Popplio) - LEARNSETS(Popplio), + .levelUpLearnset = sPopplioLevelUpLearnset, + .teachableLearnset = sPopplioTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 17, SPECIES_BRIONNE}), }, @@ -430,17 +470,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Brionne, 48, 56), + .frontPic = gMonFrontPic_Brionne, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Brionne, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Brionne, 48, 56), + .backPic = gMonBackPic_Brionne, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Brionne), - ICON(Brionne, 0), + .palette = gMonPalette_Brionne, + .shinyPalette = gMonShinyPalette_Brionne, + .iconSprite = gMonIcon_Brionne, + .iconPalIndex = 0, FOOTPRINT(Brionne) - LEARNSETS(Brionne), + .levelUpLearnset = sBrionneLevelUpLearnset, + .teachableLearnset = sBrionneTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_PRIMARINA}), }, @@ -478,17 +523,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Primarina, 64, 64), + .frontPic = gMonFrontPic_Primarina, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Primarina, .frontAnimId = ANIM_SHAKE_GLOW_BLUE_SLOW, - BACK_PIC(Primarina, 64, 64), + .backPic = gMonBackPic_Primarina, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Primarina), - ICON(Primarina, 0), + .palette = gMonPalette_Primarina, + .shinyPalette = gMonShinyPalette_Primarina, + .iconSprite = gMonIcon_Primarina, + .iconPalIndex = 0, FOOTPRINT(Primarina) - LEARNSETS(Primarina), + .levelUpLearnset = sPrimarinaLevelUpLearnset, + .teachableLearnset = sPrimarinaTeachableLearnset, }, #endif //P_FAMILY_POPPLIO @@ -528,17 +578,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pikipek, 29, 40), + .frontPic = gMonFrontPic_Pikipek, + .frontPicSize = MON_COORDS_SIZE(29, 40), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Pikipek, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pikipek, 48, 48), + .backPic = gMonBackPic_Pikipek, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW, - PALETTES(Pikipek), - ICON(Pikipek, 2), + .palette = gMonPalette_Pikipek, + .shinyPalette = gMonShinyPalette_Pikipek, + .iconSprite = gMonIcon_Pikipek, + .iconPalIndex = 2, FOOTPRINT(Pikipek) - LEARNSETS(Pikipek), + .levelUpLearnset = sPikipekLevelUpLearnset, + .teachableLearnset = sPikipekTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 14, SPECIES_TRUMBEAK}), }, @@ -577,17 +632,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Trumbeak, 44, 53), + .frontPic = gMonFrontPic_Trumbeak, + .frontPicSize = MON_COORDS_SIZE(44, 53), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Trumbeak, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Trumbeak, 56, 56), + .backPic = gMonBackPic_Trumbeak, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(Trumbeak), - ICON(Trumbeak, 0), + .palette = gMonPalette_Trumbeak, + .shinyPalette = gMonShinyPalette_Trumbeak, + .iconSprite = gMonIcon_Trumbeak, + .iconPalIndex = 0, FOOTPRINT(Trumbeak) - LEARNSETS(Trumbeak), + .levelUpLearnset = sTrumbeakLevelUpLearnset, + .teachableLearnset = sTrumbeakTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_TOUCANNON}), }, @@ -626,17 +686,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toucannon, 59, 59), + .frontPic = gMonFrontPic_Toucannon, + .frontPicSize = MON_COORDS_SIZE(59, 59), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Toucannon, .frontAnimId = ANIM_SHAKE_GLOW_RED_SLOW, - BACK_PIC(Toucannon, 64, 56), + .backPic = gMonBackPic_Toucannon, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(Toucannon), - ICON(Toucannon, 0), + .palette = gMonPalette_Toucannon, + .shinyPalette = gMonShinyPalette_Toucannon, + .iconSprite = gMonIcon_Toucannon, + .iconPalIndex = 0, FOOTPRINT(Toucannon) - LEARNSETS(Toucannon), + .levelUpLearnset = sToucannonLevelUpLearnset, + .teachableLearnset = sToucannonTeachableLearnset, }, #endif //P_FAMILY_PIKIPEK @@ -676,17 +741,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Yungoos, 64, 40), + .frontPic = gMonFrontPic_Yungoos, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Yungoos, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Yungoos, 48, 40), + .backPic = gMonBackPic_Yungoos, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Yungoos), - ICON(Yungoos, 2), + .palette = gMonPalette_Yungoos, + .shinyPalette = gMonShinyPalette_Yungoos, + .iconSprite = gMonIcon_Yungoos, + .iconPalIndex = 2, FOOTPRINT(Yungoos) - LEARNSETS(Yungoos), + .levelUpLearnset = sYungoosLevelUpLearnset, + .teachableLearnset = sYungoosTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS}), }, @@ -725,17 +795,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gumshoos, 56, 56), + .frontPic = gMonFrontPic_Gumshoos, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Gumshoos, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Gumshoos, 48, 56), + .backPic = gMonBackPic_Gumshoos, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Gumshoos), - ICON(Gumshoos, 2), + .palette = gMonPalette_Gumshoos, + .shinyPalette = gMonShinyPalette_Gumshoos, + .iconSprite = gMonIcon_Gumshoos, + .iconPalIndex = 2, FOOTPRINT(Gumshoos) - LEARNSETS(Gumshoos), + .levelUpLearnset = sGumshoosLevelUpLearnset, + .teachableLearnset = sGumshoosTeachableLearnset, }, #endif //P_FAMILY_YUNGOOS @@ -774,17 +849,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grubbin, 48, 32), + .frontPic = gMonFrontPic_Grubbin, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Grubbin, .frontAnimId = ANIM_H_SLIDE, - BACK_PIC(Grubbin, 64, 32), + .backPic = gMonBackPic_Grubbin, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Grubbin), - ICON(Grubbin, 0), + .palette = gMonPalette_Grubbin, + .shinyPalette = gMonShinyPalette_Grubbin, + .iconSprite = gMonIcon_Grubbin, + .iconPalIndex = 0, FOOTPRINT(Grubbin) - LEARNSETS(Grubbin), + .levelUpLearnset = sGrubbinLevelUpLearnset, + .teachableLearnset = sGrubbinTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CHARJABUG}), }, @@ -823,17 +903,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Charjabug, 40, 40), + .frontPic = gMonFrontPic_Charjabug, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Charjabug, .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_SLOW, - BACK_PIC(Charjabug, 64, 40), + .backPic = gMonBackPic_Charjabug, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Charjabug), - ICON(Charjabug, 1), + .palette = gMonPalette_Charjabug, + .shinyPalette = gMonShinyPalette_Charjabug, + .iconSprite = gMonIcon_Charjabug, + .iconPalIndex = 1, FOOTPRINT(Charjabug) - LEARNSETS(Charjabug), + .levelUpLearnset = sCharjabugLevelUpLearnset, + .teachableLearnset = sCharjabugTeachableLearnset, .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_VIKAVOLT}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT}), }, @@ -872,18 +957,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Vikavolt, 64, 56), + .frontPic = gMonFrontPic_Vikavolt, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Vikavolt, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .enemyMonElevation = 8, - BACK_PIC(Vikavolt, 64, 56), + .backPic = gMonBackPic_Vikavolt, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Vikavolt), - ICON(Vikavolt, 0), + .palette = gMonPalette_Vikavolt, + .shinyPalette = gMonShinyPalette_Vikavolt, + .iconSprite = gMonIcon_Vikavolt, + .iconPalIndex = 0, FOOTPRINT(Vikavolt) - LEARNSETS(Vikavolt), + .levelUpLearnset = sVikavoltLevelUpLearnset, + .teachableLearnset = sVikavoltTeachableLearnset, }, #endif //P_FAMILY_GRUBBIN @@ -923,17 +1013,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Crabrawler, 64, 56), + .frontPic = gMonFrontPic_Crabrawler, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Crabrawler, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Crabrawler, 64, 48), + .backPic = gMonBackPic_Crabrawler, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Crabrawler), - ICON(Crabrawler, 2), + .palette = gMonPalette_Crabrawler, + .shinyPalette = gMonShinyPalette_Crabrawler, + .iconSprite = gMonIcon_Crabrawler, + .iconPalIndex = 2, FOOTPRINT(Crabrawler) - LEARNSETS(Crabrawler), + .levelUpLearnset = sCrabrawlerLevelUpLearnset, + .teachableLearnset = sCrabrawlerTeachableLearnset, .evolutions = EVOLUTION({EVO_SPECIFIC_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM, SPECIES_CRABOMINABLE}, {EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE}), }, @@ -973,17 +1068,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, - FRONT_PIC(Crabominable, 64, 64), + .frontPic = gMonFrontPic_Crabominable, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Crabominable, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(Crabominable, 64, 64), + .backPic = gMonBackPic_Crabominable, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Crabominable), - ICON(Crabominable, 2), + .palette = gMonPalette_Crabominable, + .shinyPalette = gMonShinyPalette_Crabominable, + .iconSprite = gMonIcon_Crabominable, + .iconPalIndex = 2, FOOTPRINT(Crabominable) - LEARNSETS(Crabominable), + .levelUpLearnset = sCrabominableLevelUpLearnset, + .teachableLearnset = sCrabominableTeachableLearnset, }, #endif //P_FAMILY_CRABRAWLER @@ -1018,7 +1118,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) - LEARNSETS(Oricorio), + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, @@ -1030,13 +1131,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "with its passionate dancing and then\n" "uses the opening it creates to\n" "burn them up with blazing flames."), - FRONT_PIC(OricorioBaile, 56, 64), + .frontPic = gMonFrontPic_OricorioBaile, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimId = ANIM_CONCAVE_ARC_SMALL, - BACK_PIC(OricorioBaile, 64, 64), + .backPic = gMonBackPic_OricorioBaile, + .backPicSize = MON_COORDS_SIZE(64, 64), //.backAnimId = BACK_ANIM_NONE, - PALETTES(OricorioBaile), - ICON(OricorioBaile, 0), + .palette = gMonPalette_OricorioBaile, + .shinyPalette = gMonShinyPalette_OricorioBaile, + .iconSprite = gMonIcon_OricorioBaile, + .iconPalIndex = 0, }, [SPECIES_ORICORIO_POM_POM] = @@ -1069,7 +1174,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) - LEARNSETS(Oricorio), + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, @@ -1081,13 +1187,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "yellow nectar. It uses nimble steps to\n" "approach opponents, then knocks\n" "them out with electric punches."), - FRONT_PIC(OricorioPomPom, 56, 56), + .frontPic = gMonFrontPic_OricorioPomPom, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OricorioPomPom, 64, 64), + .backPic = gMonBackPic_OricorioPomPom, + .backPicSize = MON_COORDS_SIZE(64, 64), //.backAnimId = BACK_ANIM_NONE, - PALETTES(OricorioPomPom), - ICON(OricorioPomPom, 1), + .palette = gMonPalette_OricorioPomPom, + .shinyPalette = gMonShinyPalette_OricorioPomPom, + .iconSprite = gMonIcon_OricorioPomPom, + .iconPalIndex = 1, }, [SPECIES_ORICORIO_PAU] = @@ -1120,7 +1230,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) - LEARNSETS(Oricorio), + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, @@ -1132,13 +1243,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "pink nectar. It elevates its mind with\n" "the gentle steps of its dance, then\n" "unleashes its psychic energy."), - FRONT_PIC(OricorioPau, 56, 64), + .frontPic = gMonFrontPic_OricorioPau, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OricorioPau, 64, 64), + .backPic = gMonBackPic_OricorioPau, + .backPicSize = MON_COORDS_SIZE(64, 64), //.backAnimId = BACK_ANIM_NONE, - PALETTES(OricorioPau), - ICON(OricorioPau, 1), + .palette = gMonPalette_OricorioPau, + .shinyPalette = gMonShinyPalette_OricorioPau, + .iconSprite = gMonIcon_OricorioPau, + .iconPalIndex = 1, }, [SPECIES_ORICORIO_SENSU] = @@ -1171,7 +1286,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) - LEARNSETS(Oricorio), + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, @@ -1183,13 +1299,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "refined dancing. When they let their\n" "guard down, it places a curse on\n" "them that will bring on their demise."), - FRONT_PIC(OricorioSensu, 64, 56), + .frontPic = gMonFrontPic_OricorioSensu, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OricorioSensu, 64, 64), + .backPic = gMonBackPic_OricorioSensu, + .backPicSize = MON_COORDS_SIZE(64, 64), //.backAnimId = BACK_ANIM_NONE, - PALETTES(OricorioSensu), - ICON(OricorioSensu, 0), + .palette = gMonPalette_OricorioSensu, + .shinyPalette = gMonShinyPalette_OricorioSensu, + .iconSprite = gMonIcon_OricorioSensu, + .iconPalIndex = 0, }, #endif //P_FAMILY_ORICORIO @@ -1229,18 +1349,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cutiefly, 33, 35), + .frontPic = gMonFrontPic_Cutiefly, + .frontPicSize = MON_COORDS_SIZE(33, 35), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Cutiefly, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 10, - BACK_PIC(Cutiefly, 56, 48), + .backPic = gMonBackPic_Cutiefly, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 15, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - PALETTES(Cutiefly), - ICON(Cutiefly, 2), + .palette = gMonPalette_Cutiefly, + .shinyPalette = gMonShinyPalette_Cutiefly, + .iconSprite = gMonIcon_Cutiefly, + .iconPalIndex = 2, FOOTPRINT(Cutiefly) - LEARNSETS(Cutiefly), + .levelUpLearnset = sCutieflyLevelUpLearnset, + .teachableLearnset = sCutieflyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_RIBOMBEE}), }, @@ -1279,18 +1404,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ribombee, 32, 47), + .frontPic = gMonFrontPic_Ribombee, + .frontPicSize = MON_COORDS_SIZE(32, 47), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Ribombee, .frontAnimId = ANIM_CONVEX_DOUBLE_ARC_TWICE, .enemyMonElevation = 6, - BACK_PIC(Ribombee, 56, 48), + .backPic = gMonBackPic_Ribombee, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, - PALETTES(Ribombee), - ICON(Ribombee, 2), + .palette = gMonPalette_Ribombee, + .shinyPalette = gMonShinyPalette_Ribombee, + .iconSprite = gMonIcon_Ribombee, + .iconPalIndex = 2, FOOTPRINT(Ribombee) - LEARNSETS(Ribombee), + .levelUpLearnset = sRibombeeLevelUpLearnset, + .teachableLearnset = sRibombeeTeachableLearnset, }, #endif //P_FAMILY_CUTIEFLY @@ -1328,14 +1458,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Rockruff, .frontAnimId = ANIM_V_STRETCH, .backPicYOffset = 7, - PALETTES(Rockruff), - ICON(Rockruff, 2), + .palette = gMonPalette_Rockruff, + .shinyPalette = gMonShinyPalette_Rockruff, + .iconSprite = gMonIcon_Rockruff, + .iconPalIndex = 2, FOOTPRINT(Rockruff) - LEARNSETS(Rockruff), + .levelUpLearnset = sRockruffLevelUpLearnset, + .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST }, - FRONT_PIC(Rockruff, 37, 39), - BACK_PIC(Rockruff, 64, 56), + .frontPic = gMonFrontPic_Rockruff, + .frontPicSize = MON_COORDS_SIZE(37, 39), + .backPic = gMonBackPic_Rockruff, + .backPicSize = MON_COORDS_SIZE(64, 56), .backAnimId = BACK_ANIM_V_STRETCH, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY}, {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}), @@ -1374,14 +1509,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimFrames = sAnims_Rockruff, .frontAnimId = ANIM_V_STRETCH, .backPicYOffset = 7, - PALETTES(Rockruff), - ICON(Rockruff, 2), + .palette = gMonPalette_Rockruff, + .shinyPalette = gMonShinyPalette_Rockruff, + .iconSprite = gMonIcon_Rockruff, + .iconPalIndex = 2, FOOTPRINT(Rockruff) - LEARNSETS(Rockruff), + .levelUpLearnset = sRockruffLevelUpLearnset, + .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, .abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE }, - FRONT_PIC(Rockruff, 40, 48), - BACK_PIC(Rockruff, 64, 56), + .frontPic = gMonFrontPic_Rockruff, + .frontPicSize = MON_COORDS_SIZE(40, 48), + .backPic = gMonBackPic_Rockruff, + .backPicSize = MON_COORDS_SIZE(64, 56), //.backAnimId = BACK_ANIM_NONE, .evolutions = EVOLUTION({EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}), }, @@ -1405,7 +1545,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - BACK_PIC(LycanrocMidday, 64, 56), + .backPic = gMonBackPic_LycanrocMidday, + .backPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, @@ -1423,15 +1564,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "demeanor. It swiftly closes in on its prey,\n" "then slices them with the rocks in\n" "its mane."), - FRONT_PIC(LycanrocMidday, 57, 53), + .frontPic = gMonFrontPic_LycanrocMidday, + .frontPicSize = MON_COORDS_SIZE(57, 53), .frontPicYOffset = 5, .frontAnimFrames = sAnims_LycanrocMidday, .frontAnimId = ANIM_V_SHAKE, .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(LycanrocMidday), - ICON(LycanrocMidday, 2), - LEARNSETS(LycanrocMidday), + .palette = gMonPalette_LycanrocMidday, + .shinyPalette = gMonShinyPalette_LycanrocMidday, + .iconSprite = gMonIcon_LycanrocMidday, + .iconPalIndex = 2, + .levelUpLearnset = sLycanrocMiddayLevelUpLearnset, + .teachableLearnset = sLycanrocMiddayTeachableLearnset, }, [SPECIES_LYCANROC_MIDNIGHT] = @@ -1453,7 +1598,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - BACK_PIC(LycanrocMidday, 64, 56), + .backPic = gMonBackPic_LycanrocMidday, + .backPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 85, @@ -1471,15 +1617,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "to slash any who approach. It will\n" "even disobey its Trainer if it dislikes\n" "the orders it was given."), - FRONT_PIC(LycanrocMidnight, 56, 61), + .frontPic = gMonFrontPic_LycanrocMidnight, + .frontPicSize = MON_COORDS_SIZE(56, 61), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LycanrocMidnight, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_SLOW, .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(LycanrocMidnight), - ICON(LycanrocMidnight, 0), - LEARNSETS(LycanrocMidnight), + .palette = gMonPalette_LycanrocMidnight, + .shinyPalette = gMonShinyPalette_LycanrocMidnight, + .iconSprite = gMonIcon_LycanrocMidnight, + .iconPalIndex = 0, + .levelUpLearnset = sLycanrocMidnightLevelUpLearnset, + .teachableLearnset = sLycanrocMidnightTeachableLearnset, }, [SPECIES_LYCANROC_DUSK] = @@ -1501,7 +1651,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - BACK_PIC(LycanrocMidday, 64, 56), + .backPic = gMonBackPic_LycanrocMidday, + .backPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .baseHP = 75, @@ -1519,15 +1670,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "ferocious qualities. It's said that\n" "this form of Lycanroc is the most\n" "troublesome to raise."), - FRONT_PIC(LycanrocDusk, 57, 58), + .frontPic = gMonFrontPic_LycanrocDusk, + .frontPicSize = MON_COORDS_SIZE(57, 58), .frontPicYOffset = 6, .frontAnimFrames = sAnims_LycanrocDusk, .frontAnimId = ANIM_V_SHAKE, .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, - PALETTES(LycanrocDusk), - ICON(LycanrocDusk, 0), - LEARNSETS(LycanrocDusk), + .palette = gMonPalette_LycanrocDusk, + .shinyPalette = gMonShinyPalette_LycanrocDusk, + .iconSprite = gMonIcon_LycanrocDusk, + .iconPalIndex = 0, + .levelUpLearnset = sLycanrocDuskLevelUpLearnset, + .teachableLearnset = sLycanrocDuskTeachableLearnset, }, #endif //P_FAMILY_ROCKRUFF @@ -1552,7 +1707,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Wishiwashi) - LEARNSETS(Wishiwashi), + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, @@ -1570,16 +1726,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "weak. It's by gathering up into\n" "schools that they're able to confront\n" "opponents."), - FRONT_PIC(WishiwashiSolo, 40, 24), + .frontPic = gMonFrontPic_WishiwashiSolo, + .frontPicSize = MON_COORDS_SIZE(40, 24), .frontPicYOffset = 20, .frontAnimFrames = sAnims_WishiwashiSolo, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 12, - BACK_PIC(WishiwashiSolo, 56, 32), + .backPic = gMonBackPic_WishiwashiSolo, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 18, //.backAnimId = BACK_ANIM_NONE, - PALETTES(WishiwashiSolo), - ICON(WishiwashiSolo, 2), + .palette = gMonPalette_WishiwashiSolo, + .shinyPalette = gMonShinyPalette_WishiwashiSolo, + .iconSprite = gMonIcon_WishiwashiSolo, + .iconPalIndex = 2, }, [SPECIES_WISHIWASHI_SCHOOL] = @@ -1602,7 +1762,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Wishiwashi) - LEARNSETS(Wishiwashi), + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, .formChangeTable = sWishiwashiFormChangeTable, .baseHP = 45, @@ -1620,15 +1781,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "get into formation. But if they get\n" "wounded in battle, they'll scatter\n" "and become solitary again."), - FRONT_PIC(WishiwashiSchool, 64, 64), + .frontPic = gMonFrontPic_WishiwashiSchool, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_WishiwashiSchool, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //Todo - BACK_PIC(WishiwashiSchool, 64, 56), + .backPic = gMonBackPic_WishiwashiSchool, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(WishiwashiSchool), - ICON(WishiwashiSchool, 0), + .palette = gMonPalette_WishiwashiSchool, + .shinyPalette = gMonShinyPalette_WishiwashiSchool, + .iconSprite = gMonIcon_WishiwashiSchool, + .iconPalIndex = 0, }, #endif //P_FAMILY_WISHIWASHI @@ -1668,17 +1833,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mareanie, 48, 40), + .frontPic = gMonFrontPic_Mareanie, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Mareanie, .frontAnimId = ANIM_GLOW_PURPLE, - BACK_PIC(Mareanie, 64, 48), + .backPic = gMonBackPic_Mareanie, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Mareanie), - ICON(Mareanie, 2), + .palette = gMonPalette_Mareanie, + .shinyPalette = gMonShinyPalette_Mareanie, + .iconSprite = gMonIcon_Mareanie, + .iconPalIndex = 2, FOOTPRINT(Mareanie) - LEARNSETS(Mareanie), + .levelUpLearnset = sMareanieLevelUpLearnset, + .teachableLearnset = sMareanieTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TOXAPEX}), }, @@ -1717,17 +1887,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toxapex, 64, 64), + .frontPic = gMonFrontPic_Toxapex, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Toxapex, .frontAnimId = ANIM_SHAKE_GLOW_PURPLE_SLOW, - BACK_PIC(Toxapex, 64, 56), + .backPic = gMonBackPic_Toxapex, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Toxapex), - ICON(Toxapex, 0), + .palette = gMonPalette_Toxapex, + .shinyPalette = gMonShinyPalette_Toxapex, + .iconSprite = gMonIcon_Toxapex, + .iconPalIndex = 0, FOOTPRINT(Toxapex) - LEARNSETS(Toxapex), + .levelUpLearnset = sToxapexLevelUpLearnset, + .teachableLearnset = sToxapexTeachableLearnset, }, #endif //P_FAMILY_MAREANIE @@ -1767,17 +1942,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Mudbray, 48, 56), + .frontPic = gMonFrontPic_Mudbray, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Mudbray, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Mudbray, 64, 56), + .backPic = gMonBackPic_Mudbray, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Mudbray), - ICON(Mudbray, 2), + .palette = gMonPalette_Mudbray, + .shinyPalette = gMonShinyPalette_Mudbray, + .iconSprite = gMonIcon_Mudbray, + .iconPalIndex = 2, FOOTPRINT(Mudbray) - LEARNSETS(Mudbray), + .levelUpLearnset = sMudbrayLevelUpLearnset, + .teachableLearnset = sMudbrayTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MUDSDALE}), }, @@ -1816,17 +1996,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Mudsdale, 64, 64), + .frontPic = gMonFrontPic_Mudsdale, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Mudsdale, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Mudsdale, 64, 56), + .backPic = gMonBackPic_Mudsdale, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Mudsdale), - ICON(Mudsdale, 0), + .palette = gMonPalette_Mudsdale, + .shinyPalette = gMonShinyPalette_Mudsdale, + .iconSprite = gMonIcon_Mudsdale, + .iconPalIndex = 0, FOOTPRINT(Mudsdale) - LEARNSETS(Mudsdale), + .levelUpLearnset = sMudsdaleLevelUpLearnset, + .teachableLearnset = sMudsdaleTeachableLearnset, }, #endif //P_FAMILY_MUDBRAY @@ -1866,17 +2051,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dewpider, 32, 48), + .frontPic = gMonFrontPic_Dewpider, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Dewpider, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Dewpider, 40, 48), + .backPic = gMonBackPic_Dewpider, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dewpider), - ICON(Dewpider, 0), + .palette = gMonPalette_Dewpider, + .shinyPalette = gMonShinyPalette_Dewpider, + .iconSprite = gMonIcon_Dewpider, + .iconPalIndex = 0, FOOTPRINT(Dewpider) - LEARNSETS(Dewpider), + .levelUpLearnset = sDewpiderLevelUpLearnset, + .teachableLearnset = sDewpiderTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_ARAQUANID}), }, @@ -1915,17 +2105,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Araquanid, 64, 64), + .frontPic = gMonFrontPic_Araquanid, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Araquanid, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Araquanid, 64, 48), + .backPic = gMonBackPic_Araquanid, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Araquanid), - ICON(Araquanid, 2), + .palette = gMonPalette_Araquanid, + .shinyPalette = gMonShinyPalette_Araquanid, + .iconSprite = gMonIcon_Araquanid, + .iconPalIndex = 2, FOOTPRINT(Araquanid) - LEARNSETS(Araquanid), + .levelUpLearnset = sAraquanidLevelUpLearnset, + .teachableLearnset = sAraquanidTeachableLearnset, }, #endif //P_FAMILY_DEWPIDER @@ -1965,17 +2160,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fomantis, 40, 48), + .frontPic = gMonFrontPic_Fomantis, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Fomantis, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, - BACK_PIC(Fomantis, 40, 56), + .backPic = gMonBackPic_Fomantis, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Fomantis), - ICON(Fomantis, 1), + .palette = gMonPalette_Fomantis, + .shinyPalette = gMonShinyPalette_Fomantis, + .iconSprite = gMonIcon_Fomantis, + .iconPalIndex = 1, FOOTPRINT(Fomantis) - LEARNSETS(Fomantis), + .levelUpLearnset = sFomantisLevelUpLearnset, + .teachableLearnset = sFomantisTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 34, SPECIES_LURANTIS}), }, @@ -2014,17 +2214,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lurantis, 48, 64), + .frontPic = gMonFrontPic_Lurantis, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Lurantis, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Lurantis, 56, 64), + .backPic = gMonBackPic_Lurantis, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Lurantis), - ICON(Lurantis, 1), + .palette = gMonPalette_Lurantis, + .shinyPalette = gMonShinyPalette_Lurantis, + .iconSprite = gMonIcon_Lurantis, + .iconPalIndex = 1, FOOTPRINT(Lurantis) - LEARNSETS(Lurantis), + .levelUpLearnset = sLurantisLevelUpLearnset, + .teachableLearnset = sLurantisTeachableLearnset, }, #endif //P_FAMILY_FOMANTIS @@ -2065,17 +2270,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Morelull, 24, 48), + .frontPic = gMonFrontPic_Morelull, + .frontPicSize = MON_COORDS_SIZE(24, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Morelull, .frontAnimId = ANIM_SHAKE_FLASH_YELLOW, - BACK_PIC(Morelull, 40, 48), + .backPic = gMonBackPic_Morelull, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Morelull), - ICON(Morelull, 0), + .palette = gMonPalette_Morelull, + .shinyPalette = gMonShinyPalette_Morelull, + .iconSprite = gMonIcon_Morelull, + .iconPalIndex = 0, FOOTPRINT(Morelull) - LEARNSETS(Morelull), + .levelUpLearnset = sMorelullLevelUpLearnset, + .teachableLearnset = sMorelullTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_SHIINOTIC}), }, @@ -2115,17 +2325,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Shiinotic, 56, 56), + .frontPic = gMonFrontPic_Shiinotic, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Shiinotic, .frontAnimId = ANIM_SHAKE_GLOW_WHITE_SLOW, - BACK_PIC(Shiinotic, 64, 48), + .backPic = gMonBackPic_Shiinotic, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Shiinotic), - ICON(Shiinotic, 1), + .palette = gMonPalette_Shiinotic, + .shinyPalette = gMonShinyPalette_Shiinotic, + .iconSprite = gMonIcon_Shiinotic, + .iconPalIndex = 1, FOOTPRINT(Shiinotic) - LEARNSETS(Shiinotic), + .levelUpLearnset = sShiinoticLevelUpLearnset, + .teachableLearnset = sShiinoticTeachableLearnset, }, #endif //P_FAMILY_MORELULL @@ -2165,17 +2380,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Salandit, 56, 40), + .frontPic = gMonFrontPic_Salandit, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Salandit, .frontAnimId = ANIM_GLOW_RED, - BACK_PIC(Salandit, 56, 40), + .backPic = gMonBackPic_Salandit, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Salandit), - ICON(Salandit, 2), + .palette = gMonPalette_Salandit, + .shinyPalette = gMonShinyPalette_Salandit, + .iconSprite = gMonIcon_Salandit, + .iconPalIndex = 2, FOOTPRINT(Salandit) - LEARNSETS(Salandit), + .levelUpLearnset = sSalanditLevelUpLearnset, + .teachableLearnset = sSalanditTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 33, SPECIES_SALAZZLE}), }, @@ -2214,17 +2434,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Salazzle, 64, 64), + .frontPic = gMonFrontPic_Salazzle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Salazzle, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Salazzle, 48, 64), + .backPic = gMonBackPic_Salazzle, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Salazzle), - ICON(Salazzle, 0), + .palette = gMonPalette_Salazzle, + .shinyPalette = gMonShinyPalette_Salazzle, + .iconSprite = gMonIcon_Salazzle, + .iconPalIndex = 0, FOOTPRINT(Salazzle) - LEARNSETS(Salazzle), + .levelUpLearnset = sSalazzleLevelUpLearnset, + .teachableLearnset = sSalazzleTeachableLearnset, }, #endif //P_FAMILY_SALANDIT @@ -2263,17 +2488,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Stufful, 48, 48), + .frontPic = gMonFrontPic_Stufful, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Stufful, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Stufful, 56, 40), + .backPic = gMonBackPic_Stufful, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Stufful), - ICON(Stufful, 0), + .palette = gMonPalette_Stufful, + .shinyPalette = gMonShinyPalette_Stufful, + .iconSprite = gMonIcon_Stufful, + .iconPalIndex = 0, FOOTPRINT(Stufful) - LEARNSETS(Stufful), + .levelUpLearnset = sStuffulLevelUpLearnset, + .teachableLearnset = sStuffulTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 27, SPECIES_BEWEAR}), }, @@ -2311,17 +2541,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Bewear, 56, 64), + .frontPic = gMonFrontPic_Bewear, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Bewear, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(Bewear, 64, 64), + .backPic = gMonBackPic_Bewear, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bewear), - ICON(Bewear, 0), + .palette = gMonPalette_Bewear, + .shinyPalette = gMonShinyPalette_Bewear, + .iconSprite = gMonIcon_Bewear, + .iconPalIndex = 0, FOOTPRINT(Bewear) - LEARNSETS(Bewear), + .levelUpLearnset = sBewearLevelUpLearnset, + .teachableLearnset = sBewearTeachableLearnset, }, #endif //P_FAMILY_STUFFUL @@ -2361,17 +2596,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bounsweet, 32, 40), + .frontPic = gMonFrontPic_Bounsweet, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Bounsweet, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Bounsweet, 48, 40), + .backPic = gMonBackPic_Bounsweet, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bounsweet), - ICON(Bounsweet, 1), + .palette = gMonPalette_Bounsweet, + .shinyPalette = gMonShinyPalette_Bounsweet, + .iconSprite = gMonIcon_Bounsweet, + .iconPalIndex = 1, FOOTPRINT(Bounsweet) - LEARNSETS(Bounsweet), + .levelUpLearnset = sBounsweetLevelUpLearnset, + .teachableLearnset = sBounsweetTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_STEENEE}), }, @@ -2411,17 +2651,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Steenee, 48, 56), + .frontPic = gMonFrontPic_Steenee, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Steenee, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Steenee, 56, 56), + .backPic = gMonBackPic_Steenee, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Steenee), - ICON(Steenee, 1), + .palette = gMonPalette_Steenee, + .shinyPalette = gMonShinyPalette_Steenee, + .iconSprite = gMonIcon_Steenee, + .iconPalIndex = 1, FOOTPRINT(Steenee) - LEARNSETS(Steenee), + .levelUpLearnset = sSteeneeLevelUpLearnset, + .teachableLearnset = sSteeneeTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_STOMP, SPECIES_TSAREENA}), }, @@ -2461,17 +2706,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tsareena, 56, 64), + .frontPic = gMonFrontPic_Tsareena, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Tsareena, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Tsareena, 56, 56), + .backPic = gMonBackPic_Tsareena, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tsareena), - ICON(Tsareena, 1), + .palette = gMonPalette_Tsareena, + .shinyPalette = gMonShinyPalette_Tsareena, + .iconSprite = gMonIcon_Tsareena, + .iconPalIndex = 1, FOOTPRINT(Tsareena) - LEARNSETS(Tsareena), + .levelUpLearnset = sTsareenaLevelUpLearnset, + .teachableLearnset = sTsareenaTeachableLearnset, }, #endif //P_FAMILY_BOUNSWEET @@ -2512,18 +2762,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Comfey, 48, 48), + .frontPic = gMonFrontPic_Comfey, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Comfey, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 8, - BACK_PIC(Comfey, 64, 56), + .backPic = gMonBackPic_Comfey, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Comfey), - ICON(Comfey, 1), + .palette = gMonPalette_Comfey, + .shinyPalette = gMonShinyPalette_Comfey, + .iconSprite = gMonIcon_Comfey, + .iconPalIndex = 1, FOOTPRINT(Comfey) - LEARNSETS(Comfey), + .levelUpLearnset = sComfeyLevelUpLearnset, + .teachableLearnset = sComfeyTeachableLearnset, }, #endif //P_FAMILY_COMFEY @@ -2562,17 +2817,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Oranguru, 56, 56), + .frontPic = gMonFrontPic_Oranguru, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Oranguru, .frontAnimId = ANIM_SHRINK_GROW_SLOW, - BACK_PIC(Oranguru, 64, 48), + .backPic = gMonBackPic_Oranguru, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Oranguru), - ICON(Oranguru, 0), + .palette = gMonPalette_Oranguru, + .shinyPalette = gMonShinyPalette_Oranguru, + .iconSprite = gMonIcon_Oranguru, + .iconPalIndex = 0, FOOTPRINT(Oranguru) - LEARNSETS(Oranguru), + .levelUpLearnset = sOranguruLevelUpLearnset, + .teachableLearnset = sOranguruTeachableLearnset, }, #endif //P_FAMILY_ORANGURU @@ -2611,17 +2871,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Passimian, 57, 60), + .frontPic = gMonFrontPic_Passimian, + .frontPicSize = MON_COORDS_SIZE(57, 60), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Passimian, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(Passimian, 51, 52), + .backPic = gMonBackPic_Passimian, + .backPicSize = MON_COORDS_SIZE(51, 52), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, - PALETTES(Passimian), - ICON(Passimian, 1), + .palette = gMonPalette_Passimian, + .shinyPalette = gMonShinyPalette_Passimian, + .iconSprite = gMonIcon_Passimian, + .iconPalIndex = 1, FOOTPRINT(Passimian) - LEARNSETS(Passimian), + .levelUpLearnset = sPassimianLevelUpLearnset, + .teachableLearnset = sPassimianTeachableLearnset, }, #endif //P_FAMILY_PASSIMIAN @@ -2660,17 +2925,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wimpod, 40, 40), + .frontPic = gMonFrontPic_Wimpod, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Wimpod, .frontAnimId = ANIM_V_SHAKE_H_SLIDE_FAST, - BACK_PIC(Wimpod, 64, 48), + .backPic = gMonBackPic_Wimpod, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wimpod), - ICON(Wimpod, 2), + .palette = gMonPalette_Wimpod, + .shinyPalette = gMonShinyPalette_Wimpod, + .iconSprite = gMonIcon_Wimpod, + .iconPalIndex = 2, FOOTPRINT(Wimpod) - LEARNSETS(Wimpod), + .levelUpLearnset = sWimpodLevelUpLearnset, + .teachableLearnset = sWimpodTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GOLISOPOD}), }, @@ -2708,17 +2978,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Golisopod, 64, 64), + .frontPic = gMonFrontPic_Golisopod, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Golisopod, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(Golisopod, 64, 48), + .backPic = gMonBackPic_Golisopod, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Golisopod), - ICON(Golisopod, 2), + .palette = gMonPalette_Golisopod, + .shinyPalette = gMonShinyPalette_Golisopod, + .iconSprite = gMonIcon_Golisopod, + .iconPalIndex = 2, FOOTPRINT(Golisopod) - LEARNSETS(Golisopod), + .levelUpLearnset = sGolisopodLevelUpLearnset, + .teachableLearnset = sGolisopodTeachableLearnset, }, #endif //P_FAMILY_WIMPOD @@ -2758,17 +3033,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sandygast, 48, 48), + .frontPic = gMonFrontPic_Sandygast, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Sandygast, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - BACK_PIC(Sandygast, 40, 48), + .backPic = gMonBackPic_Sandygast, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sandygast), - ICON(Sandygast, 1), + .palette = gMonPalette_Sandygast, + .shinyPalette = gMonShinyPalette_Sandygast, + .iconSprite = gMonIcon_Sandygast, + .iconPalIndex = 1, FOOTPRINT(Sandygast) - LEARNSETS(Sandygast), + .levelUpLearnset = sSandygastLevelUpLearnset, + .teachableLearnset = sSandygastTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_PALOSSAND}), }, @@ -2807,17 +3087,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Palossand, 64, 64), + .frontPic = gMonFrontPic_Palossand, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Palossand, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Palossand, 64, 64), + .backPic = gMonBackPic_Palossand, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Palossand), - ICON(Palossand, 2), + .palette = gMonPalette_Palossand, + .shinyPalette = gMonShinyPalette_Palossand, + .iconSprite = gMonIcon_Palossand, + .iconPalIndex = 2, FOOTPRINT(Palossand) - LEARNSETS(Palossand), + .levelUpLearnset = sPalossandLevelUpLearnset, + .teachableLearnset = sPalossandTeachableLearnset, }, #endif //P_FAMILY_SANDYGAST @@ -2856,17 +3141,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pyukumuku, 40, 40), + .frontPic = gMonFrontPic_Pyukumuku, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Pyukumuku, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pyukumuku, 48, 32), + .backPic = gMonBackPic_Pyukumuku, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pyukumuku), - ICON(Pyukumuku, 0), + .palette = gMonPalette_Pyukumuku, + .shinyPalette = gMonShinyPalette_Pyukumuku, + .iconSprite = gMonIcon_Pyukumuku, + .iconPalIndex = 0, FOOTPRINT(Pyukumuku) - LEARNSETS(Pyukumuku), + .levelUpLearnset = sPyukumukuLevelUpLearnset, + .teachableLearnset = sPyukumukuTeachableLearnset, }, #endif //P_FAMILY_PYUKUMUKU @@ -2906,21 +3196,26 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(TypeNull, 64, 64), + .frontPic = gMonFrontPic_TypeNull, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_TypeNull, .frontAnimId = ANIM_H_SHAKE, - BACK_PIC(TypeNull, 56, 64), + .backPic = gMonBackPic_TypeNull, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TypeNull), - ICON(TypeNull, 0), + .palette = gMonPalette_TypeNull, + .shinyPalette = gMonShinyPalette_TypeNull, + .iconSprite = gMonIcon_TypeNull, + .iconPalIndex = 0, FOOTPRINT(Type_Null) - LEARNSETS(TypeNull), + .levelUpLearnset = sTypeNullLevelUpLearnset, + .teachableLearnset = sTypeNullTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SILVALLY_NORMAL}), }, -#define SILVALLY_SPECIES_INFO(type, palette) \ +#define SILVALLY_SPECIES_INFO(type, _palette) \ { \ .baseHP = 95, \ .baseAttack = 95, \ @@ -2953,17 +3248,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, \ .trainerScale = 342, \ .trainerOffset = 7, \ - FRONT_PIC(Silvally, 64, 64), \ + .frontPic = gMonFrontPic_Silvally, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Silvally, \ .frontAnimId = ANIM_V_SHAKE, \ - BACK_PIC(Silvally, 56, 64), \ + .backPic = gMonBackPic_Silvally, \ + .backPicSize = MON_COORDS_SIZE(56, 64), \ .backPicYOffset = 0, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(Silvally##palette), \ - ICON(Silvally, 0), \ + .palette = gMonPalette_Silvally##_palette, \ + .shinyPalette = gMonShinyPalette_Silvally##_palette, \ + .iconSprite = gMonIcon_Silvally, \ + .iconPalIndex = 0, \ FOOTPRINT(Silvally) \ - LEARNSETS(Silvally), \ + .levelUpLearnset = sSilvallyLevelUpLearnset, \ + .teachableLearnset = sSilvallyTeachableLearnset, \ .formSpeciesIdTable = sSilvallyFormSpeciesIdTable, \ .formChangeTable = sSilvallyFormChangeTable, \ } @@ -3014,7 +3314,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 256, \ .trainerOffset = 0, \ FOOTPRINT(Minior) \ - LEARNSETS(Minior), \ + .levelUpLearnset = sMiniorLevelUpLearnset, \ + .teachableLearnset = sMiniorTeachableLearnset, \ .formSpeciesIdTable = sMiniorFormSpeciesIdTable #define MINIOR_METEOR_SPECIES_INFO(Form) \ @@ -3026,16 +3327,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpAttack = 60, \ .baseSpDefense = 100, \ .weight = 400, \ - FRONT_PIC(MiniorMeteor, 48, 40), \ + .frontPic = gMonFrontPic_MiniorMeteor, \ + .frontPicSize = MON_COORDS_SIZE(48, 40), \ .frontPicYOffset = 14, \ .frontAnimFrames = sAnims_MiniorMeteor, \ .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \ .enemyMonElevation = 17, \ - BACK_PIC(MiniorMeteor, 56, 40), \ + .backPic = gMonBackPic_MiniorMeteor, \ + .backPicSize = MON_COORDS_SIZE(56, 40), \ .backPicYOffset = 14, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ - PALETTES(MiniorMeteor), \ - ICON(MiniorMeteor, 0), \ + .palette = gMonPalette_MiniorMeteor, \ + .shinyPalette = gMonShinyPalette_MiniorMeteor, \ + .iconSprite = gMonIcon_MiniorMeteor, \ + .iconPalIndex = 0, \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(BODY_COLOR_BROWN), \ } @@ -3050,17 +3355,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpDefense = 60, \ .weight = 3, \ .description = gMiniorCorePokedexText, \ - FRONT_PIC(MiniorCore, 48, 40), \ + .frontPic = gMonFrontPic_MiniorCore, \ + .frontPicSize = MON_COORDS_SIZE(48, 40), \ .frontPicYOffset = 16, \ .frontAnimFrames = sAnims_MiniorMeteor, \ .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \ .enemyMonElevation = 17, \ - BACK_PIC(MiniorCore, 56, 40), \ + .backPic = gMonBackPic_MiniorCore, \ + .backPicSize = MON_COORDS_SIZE(56, 40), \ .backPicYOffset = 15, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_MiniorCore##Form, \ .shinyPalette = gMonShinyPalette_MiniorCore, \ - ICON(MiniorCore##Form, iconPal), \ + .iconSprite = gMonIcon_MiniorCore##Form, \ + .iconPalIndex = iconPal, \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(color), \ } @@ -3116,17 +3424,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Komala, 48, 40), + .frontPic = gMonFrontPic_Komala, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Komala, .frontAnimId = ANIM_H_DIP, - BACK_PIC(Komala, 64, 48), + .backPic = gMonBackPic_Komala, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Komala), - ICON(Komala, 2), + .palette = gMonPalette_Komala, + .shinyPalette = gMonShinyPalette_Komala, + .iconSprite = gMonIcon_Komala, + .iconPalIndex = 2, FOOTPRINT(Komala) - LEARNSETS(Komala), + .levelUpLearnset = sKomalaLevelUpLearnset, + .teachableLearnset = sKomalaTeachableLearnset, }, #endif //P_FAMILY_KOMALA @@ -3166,17 +3479,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Turtonator, 64, 64), + .frontPic = gMonFrontPic_Turtonator, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Turtonator, .frontAnimId = ANIM_SHAKE_GLOW_RED, - BACK_PIC(Turtonator, 64, 56), + .backPic = gMonBackPic_Turtonator, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Turtonator), - ICON(Turtonator, 0), + .palette = gMonPalette_Turtonator, + .shinyPalette = gMonShinyPalette_Turtonator, + .iconSprite = gMonIcon_Turtonator, + .iconPalIndex = 0, FOOTPRINT(Turtonator) - LEARNSETS(Turtonator), + .levelUpLearnset = sTurtonatorLevelUpLearnset, + .teachableLearnset = sTurtonatorTeachableLearnset, }, #endif //P_FAMILY_TURTONATOR @@ -3216,17 +3534,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Togedemaru, 40, 40), + .frontPic = gMonFrontPic_Togedemaru, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Togedemaru, .frontAnimId = ANIM_FLASH_YELLOW, - BACK_PIC(Togedemaru, 64, 48), + .backPic = gMonBackPic_Togedemaru, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(Togedemaru), - ICON(Togedemaru, 2), + .palette = gMonPalette_Togedemaru, + .shinyPalette = gMonShinyPalette_Togedemaru, + .iconSprite = gMonIcon_Togedemaru, + .iconPalIndex = 2, FOOTPRINT(Togedemaru) - LEARNSETS(Togedemaru), + .levelUpLearnset = sTogedemaruLevelUpLearnset, + .teachableLearnset = sTogedemaruTeachableLearnset, }, #endif //P_FAMILY_TOGEDEMARU @@ -3262,7 +3585,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Mimikyu) - LEARNSETS(Mimikyu), + .levelUpLearnset = sMimikyuLevelUpLearnset, + .teachableLearnset = sMimikyuTeachableLearnset, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( @@ -3270,15 +3594,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "appearance beneath an old rag so it can\n" "get closer to people and other Pokémon.\n" "Its actual appearance is unknown."), - FRONT_PIC(MimikyuDisguised, 48, 40), + .frontPic = gMonFrontPic_MimikyuDisguised, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuDisguised, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, - BACK_PIC(MimikyuDisguised, 56, 56), + .backPic = gMonBackPic_MimikyuDisguised, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MimikyuDisguised), - ICON(MimikyuDisguised, 1), + .palette = gMonPalette_MimikyuDisguised, + .shinyPalette = gMonShinyPalette_MimikyuDisguised, + .iconSprite = gMonIcon_MimikyuDisguised, + .iconPalIndex = 1, }, [SPECIES_MIMIKYU_BUSTED] = @@ -3312,7 +3640,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Mimikyu) - LEARNSETS(Mimikyu), + .levelUpLearnset = sMimikyuLevelUpLearnset, + .teachableLearnset = sMimikyuTeachableLearnset, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, .description = COMPOUND_STRING( @@ -3320,15 +3649,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "disguising itself, its neck was\n" "broken. Whatever is inside is probably\n" "unharmed, but it's still feeling sad."), - FRONT_PIC(MimikyuBusted, 48, 40), + .frontPic = gMonFrontPic_MimikyuBusted, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuBusted, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, - BACK_PIC(MimikyuBusted, 64, 40), + .backPic = gMonBackPic_MimikyuBusted, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MimikyuBusted), - ICON(MimikyuBusted, 1), + .palette = gMonPalette_MimikyuBusted, + .shinyPalette = gMonShinyPalette_MimikyuBusted, + .iconSprite = gMonIcon_MimikyuBusted, + .iconPalIndex = 1, }, #endif //P_FAMILY_MIMIKYU @@ -3368,17 +3701,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bruxish, 56, 40), + .frontPic = gMonFrontPic_Bruxish, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Bruxish, .frontAnimId = ANIM_RISING_WOBBLE, - BACK_PIC(Bruxish, 64, 48), + .backPic = gMonBackPic_Bruxish, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bruxish), - ICON(Bruxish, 0), + .palette = gMonPalette_Bruxish, + .shinyPalette = gMonShinyPalette_Bruxish, + .iconSprite = gMonIcon_Bruxish, + .iconPalIndex = 0, FOOTPRINT(Bruxish) - LEARNSETS(Bruxish), + .levelUpLearnset = sBruxishLevelUpLearnset, + .teachableLearnset = sBruxishTeachableLearnset, }, #endif //P_FAMILY_BRUXISH @@ -3418,17 +3756,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drampa, 64, 64), + .frontPic = gMonFrontPic_Drampa, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Drampa, .frontAnimId = ANIM_V_SHAKE_TWICE, - BACK_PIC(Drampa, 64, 56), + .backPic = gMonBackPic_Drampa, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, - PALETTES(Drampa), - ICON(Drampa, 0), + .palette = gMonPalette_Drampa, + .shinyPalette = gMonShinyPalette_Drampa, + .iconSprite = gMonIcon_Drampa, + .iconPalIndex = 0, FOOTPRINT(Drampa) - LEARNSETS(Drampa), + .levelUpLearnset = sDrampaLevelUpLearnset, + .teachableLearnset = sDrampaTeachableLearnset, }, #endif //P_FAMILY_DRAMPA @@ -3468,18 +3811,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 510, .trainerOffset = 11, - FRONT_PIC(Dhelmise, 48, 64), + .frontPic = gMonFrontPic_Dhelmise, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Dhelmise, .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 2, - BACK_PIC(Dhelmise, 64, 64), + .backPic = gMonBackPic_Dhelmise, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dhelmise), - ICON(Dhelmise, 1), + .palette = gMonPalette_Dhelmise, + .shinyPalette = gMonShinyPalette_Dhelmise, + .iconSprite = gMonIcon_Dhelmise, + .iconPalIndex = 1, FOOTPRINT(Dhelmise) - LEARNSETS(Dhelmise), + .levelUpLearnset = sDhelmiseLevelUpLearnset, + .teachableLearnset = sDhelmiseTeachableLearnset, }, #endif //P_FAMILY_DHELMISE @@ -3519,17 +3867,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(JangmoO, 36, 43), + .frontPic = gMonFrontPic_JangmoO, + .frontPicSize = MON_COORDS_SIZE(36, 43), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Jangmo_O, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(JangmoO, 42, 56), + .backPic = gMonBackPic_JangmoO, + .backPicSize = MON_COORDS_SIZE(42, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_GROW_STUTTER, - PALETTES(JangmoO), - ICON(JangmoO, 2), + .palette = gMonPalette_JangmoO, + .shinyPalette = gMonShinyPalette_JangmoO, + .iconSprite = gMonIcon_JangmoO, + .iconPalIndex = 2, FOOTPRINT(JangmoO) - LEARNSETS(JangmoO), + .levelUpLearnset = sJangmoOLevelUpLearnset, + .teachableLearnset = sJangmoOTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_HAKAMO_O}), }, @@ -3568,17 +3921,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(HakamoO, 53, 61), + .frontPic = gMonFrontPic_HakamoO, + .frontPicSize = MON_COORDS_SIZE(53, 61), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Hakamo_O, .frontAnimId = ANIM_H_STRETCH, - BACK_PIC(HakamoO, 49, 56), + .backPic = gMonBackPic_HakamoO, + .backPicSize = MON_COORDS_SIZE(49, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_STRETCH, - PALETTES(HakamoO), - ICON(HakamoO, 2), + .palette = gMonPalette_HakamoO, + .shinyPalette = gMonShinyPalette_HakamoO, + .iconSprite = gMonIcon_HakamoO, + .iconPalIndex = 2, FOOTPRINT(HakamoO) - LEARNSETS(HakamoO), + .levelUpLearnset = sHakamoOLevelUpLearnset, + .teachableLearnset = sHakamoOTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 45, SPECIES_KOMMO_O}), }, @@ -3617,17 +3975,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(KommoO, 63, 63), + .frontPic = gMonFrontPic_KommoO, + .frontPicSize = MON_COORDS_SIZE(63, 63), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Kommo_O, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(KommoO, 60, 60), + .backPic = gMonBackPic_KommoO, + .backPicSize = MON_COORDS_SIZE(60, 60), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - PALETTES(KommoO), - ICON(KommoO, 2), + .palette = gMonPalette_KommoO, + .shinyPalette = gMonShinyPalette_KommoO, + .iconSprite = gMonIcon_KommoO, + .iconPalIndex = 2, FOOTPRINT(KommoO) - LEARNSETS(KommoO), + .levelUpLearnset = sKommoOLevelUpLearnset, + .teachableLearnset = sKommoOTeachableLearnset, }, #endif //P_FAMILY_JANGMO_O @@ -3667,18 +4030,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(TapuKoko, 64, 64), + .frontPic = gMonFrontPic_TapuKoko, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_TapuKoko, .frontAnimId = ANIM_TRIANGLE_DOWN_TWICE, .enemyMonElevation = 9, - BACK_PIC(TapuKoko, 64, 64), + .backPic = gMonBackPic_TapuKoko, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TapuKoko), - ICON(TapuKoko, 0), + .palette = gMonPalette_TapuKoko, + .shinyPalette = gMonShinyPalette_TapuKoko, + .iconSprite = gMonIcon_TapuKoko, + .iconPalIndex = 0, FOOTPRINT(Tapu_Koko) - LEARNSETS(TapuKoko), + .levelUpLearnset = sTapuKokoLevelUpLearnset, + .teachableLearnset = sTapuKokoTeachableLearnset, }, #endif //P_FAMILY_TAPU_KOKO @@ -3718,18 +4086,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(TapuLele, 48, 56), + .frontPic = gMonFrontPic_TapuLele, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_TapuLele, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 8, - BACK_PIC(TapuLele, 56, 56), + .backPic = gMonBackPic_TapuLele, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TapuLele), - ICON(TapuLele, 0), + .palette = gMonPalette_TapuLele, + .shinyPalette = gMonShinyPalette_TapuLele, + .iconSprite = gMonIcon_TapuLele, + .iconPalIndex = 0, FOOTPRINT(Tapu_Lele) - LEARNSETS(TapuLele), + .levelUpLearnset = sTapuLeleLevelUpLearnset, + .teachableLearnset = sTapuLeleTeachableLearnset, }, #endif //P_FAMILY_TAPU_LELE @@ -3769,18 +4142,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(TapuBulu, 56, 64), + .frontPic = gMonFrontPic_TapuBulu, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TapuBulu, .frontAnimId = ANIM_V_SHAKE_TWICE, .enemyMonElevation = 5, - BACK_PIC(TapuBulu, 64, 64), + .backPic = gMonBackPic_TapuBulu, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TapuBulu), - ICON(TapuBulu, 2), + .palette = gMonPalette_TapuBulu, + .shinyPalette = gMonShinyPalette_TapuBulu, + .iconSprite = gMonIcon_TapuBulu, + .iconPalIndex = 2, FOOTPRINT(Tapu_Bulu) - LEARNSETS(TapuBulu), + .levelUpLearnset = sTapuBuluLevelUpLearnset, + .teachableLearnset = sTapuBuluTeachableLearnset, }, #endif //P_FAMILY_TAPU_BULU @@ -3820,19 +4198,24 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(TapuFini, 56, 64), + .frontPic = gMonFrontPic_TapuFini, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_TapuFini, .frontAnimId = ANIM_SHAKE_GLOW_BLUE_SLOW, .frontAnimDelay = 5, .enemyMonElevation = 6, - BACK_PIC(TapuFini, 64, 56), + .backPic = gMonBackPic_TapuFini, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TapuFini), - ICON(TapuFini, 0), + .palette = gMonPalette_TapuFini, + .shinyPalette = gMonShinyPalette_TapuFini, + .iconSprite = gMonIcon_TapuFini, + .iconPalIndex = 0, FOOTPRINT(Tapu_Fini) - LEARNSETS(TapuFini), + .levelUpLearnset = sTapuFiniLevelUpLearnset, + .teachableLearnset = sTapuFiniTeachableLearnset, }, #endif //P_FAMILY_TAPU_FINI @@ -3872,18 +4255,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cosmog, 56, 48), + .frontPic = gMonFrontPic_Cosmog, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Cosmog, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .enemyMonElevation = 7, - BACK_PIC(Cosmog, 64, 48), + .backPic = gMonBackPic_Cosmog, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cosmog), - ICON(Cosmog, 2), + .palette = gMonPalette_Cosmog, + .shinyPalette = gMonShinyPalette_Cosmog, + .iconSprite = gMonIcon_Cosmog, + .iconPalIndex = 2, FOOTPRINT(Cosmog) - LEARNSETS(Cosmog), + .levelUpLearnset = sCosmogLevelUpLearnset, + .teachableLearnset = sCosmogTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_COSMOEM}), }, @@ -3924,18 +4312,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cosmoem, 48, 48), + .frontPic = gMonFrontPic_Cosmoem, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Cosmoem, .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 3, - BACK_PIC(Cosmoem, 64, 40), + .backPic = gMonBackPic_Cosmoem, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cosmoem), - ICON(Cosmoem, 0), + .palette = gMonPalette_Cosmoem, + .shinyPalette = gMonShinyPalette_Cosmoem, + .iconSprite = gMonIcon_Cosmoem, + .iconPalIndex = 0, FOOTPRINT(Cosmoem) - LEARNSETS(Cosmoem), + .levelUpLearnset = sCosmoemLevelUpLearnset, + .teachableLearnset = sCosmoemTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}), @@ -3976,17 +4369,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 405, .trainerOffset = 8, - FRONT_PIC(Solgaleo, 64, 64), + .frontPic = gMonFrontPic_Solgaleo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Solgaleo, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Solgaleo, 64, 64), + .backPic = gMonBackPic_Solgaleo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Solgaleo), - ICON(Solgaleo, 0), + .palette = gMonPalette_Solgaleo, + .shinyPalette = gMonShinyPalette_Solgaleo, + .iconSprite = gMonIcon_Solgaleo, + .iconPalIndex = 0, FOOTPRINT(Solgaleo) - LEARNSETS(Solgaleo), + .levelUpLearnset = sSolgaleoLevelUpLearnset, + .teachableLearnset = sSolgaleoTeachableLearnset, }, [SPECIES_LUNALA] = @@ -4024,18 +4422,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 411, .trainerOffset = 5, - FRONT_PIC(Lunala, 64, 64), + .frontPic = gMonFrontPic_Lunala, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Lunala, .frontAnimId = ANIM_CIRCULAR_VIBRATE, .enemyMonElevation = 6, - BACK_PIC(Lunala, 64, 64), + .backPic = gMonBackPic_Lunala, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Lunala), - ICON(Lunala, 2), + .palette = gMonPalette_Lunala, + .shinyPalette = gMonShinyPalette_Lunala, + .iconSprite = gMonIcon_Lunala, + .iconPalIndex = 2, FOOTPRINT(Lunala) - LEARNSETS(Lunala), + .levelUpLearnset = sLunalaLevelUpLearnset, + .teachableLearnset = sLunalaTeachableLearnset, }, #endif //P_FAMILY_COSMOG @@ -4075,18 +4478,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nihilego, 48, 64), + .frontPic = gMonFrontPic_Nihilego, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Nihilego, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 6, - BACK_PIC(Nihilego, 64, 48), + .backPic = gMonBackPic_Nihilego, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Nihilego), - ICON(Nihilego, 0), + .palette = gMonPalette_Nihilego, + .shinyPalette = gMonShinyPalette_Nihilego, + .iconSprite = gMonIcon_Nihilego, + .iconPalIndex = 0, FOOTPRINT(Nihilego) - LEARNSETS(Nihilego), + .levelUpLearnset = sNihilegoLevelUpLearnset, + .teachableLearnset = sNihilegoTeachableLearnset, }, #endif //P_FAMILY_NIHILEGO @@ -4127,17 +4535,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 3, .trainerScale = 369, .trainerOffset = 7, - FRONT_PIC(Buzzwole, 64, 64), + .frontPic = gMonFrontPic_Buzzwole, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Buzzwole, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(Buzzwole, 64, 56), + .backPic = gMonBackPic_Buzzwole, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Buzzwole), - ICON(Buzzwole, 0), + .palette = gMonPalette_Buzzwole, + .shinyPalette = gMonShinyPalette_Buzzwole, + .iconSprite = gMonIcon_Buzzwole, + .iconPalIndex = 0, FOOTPRINT(Buzzwole) - LEARNSETS(Buzzwole), + .levelUpLearnset = sBuzzwoleLevelUpLearnset, + .teachableLearnset = sBuzzwoleTeachableLearnset, }, #endif //P_FAMILY_BUZZWOLE @@ -4177,17 +4590,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Pheromosa, 56, 64), + .frontPic = gMonFrontPic_Pheromosa, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Pheromosa, .frontAnimId = ANIM_SHRINK_GROW, - BACK_PIC(Pheromosa, 64, 64), + .backPic = gMonBackPic_Pheromosa, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pheromosa), - ICON(Pheromosa, 2), + .palette = gMonPalette_Pheromosa, + .shinyPalette = gMonShinyPalette_Pheromosa, + .iconSprite = gMonIcon_Pheromosa, + .iconPalIndex = 2, FOOTPRINT(Pheromosa) - LEARNSETS(Pheromosa), + .levelUpLearnset = sPheromosaLevelUpLearnset, + .teachableLearnset = sPheromosaTeachableLearnset, }, #endif //P_FAMILY_PHEROMOSA @@ -4227,17 +4645,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 610, .trainerOffset = 17, - FRONT_PIC(Xurkitree, 64, 64), + .frontPic = gMonFrontPic_Xurkitree, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Xurkitree, .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST, - BACK_PIC(Xurkitree, 64, 64), + .backPic = gMonBackPic_Xurkitree, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Xurkitree), - ICON(Xurkitree, 0), + .palette = gMonPalette_Xurkitree, + .shinyPalette = gMonShinyPalette_Xurkitree, + .iconSprite = gMonIcon_Xurkitree, + .iconPalIndex = 0, FOOTPRINT(Xurkitree) - LEARNSETS(Xurkitree), + .levelUpLearnset = sXurkitreeLevelUpLearnset, + .teachableLearnset = sXurkitreeTeachableLearnset, }, #endif //P_FAMILY_XURKITREE @@ -4279,17 +4702,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 516, .trainerOffset = 13, - FRONT_PIC(Celesteela, 64, 64), + .frontPic = gMonFrontPic_Celesteela, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Celesteela, .frontAnimId = ANIM_GROW_STUTTER_SLOW, - BACK_PIC(Celesteela, 64, 64), + .backPic = gMonBackPic_Celesteela, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Celesteela), - ICON(Celesteela, 0), + .palette = gMonPalette_Celesteela, + .shinyPalette = gMonShinyPalette_Celesteela, + .iconSprite = gMonIcon_Celesteela, + .iconPalIndex = 0, FOOTPRINT(Celesteela) - LEARNSETS(Celesteela), + .levelUpLearnset = sCelesteelaLevelUpLearnset, + .teachableLearnset = sCelesteelaTeachableLearnset, }, #endif //P_FAMILY_CELESTEELA @@ -4329,18 +4757,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kartana, 64, 64), + .frontPic = gMonFrontPic_Kartana, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Kartana, .frontAnimId = ANIM_H_VIBRATE, .enemyMonElevation = 3, - BACK_PIC(Kartana, 64, 48), + .backPic = gMonBackPic_Kartana, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Kartana), - ICON(Kartana, 0), + .palette = gMonPalette_Kartana, + .shinyPalette = gMonShinyPalette_Kartana, + .iconSprite = gMonIcon_Kartana, + .iconPalIndex = 0, FOOTPRINT(Kartana) - LEARNSETS(Kartana), + .levelUpLearnset = sKartanaLevelUpLearnset, + .teachableLearnset = sKartanaTeachableLearnset, }, #endif //P_FAMILY_KARTANA @@ -4380,17 +4813,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Guzzlord, 64, 64), + .frontPic = gMonFrontPic_Guzzlord, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Guzzlord, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, - BACK_PIC(Guzzlord, 64, 56), + .backPic = gMonBackPic_Guzzlord, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Guzzlord), - ICON(Guzzlord, 0), + .palette = gMonPalette_Guzzlord, + .shinyPalette = gMonShinyPalette_Guzzlord, + .iconSprite = gMonIcon_Guzzlord, + .iconPalIndex = 0, FOOTPRINT(Guzzlord) - LEARNSETS(Guzzlord), + .levelUpLearnset = sGuzzlordLevelUpLearnset, + .teachableLearnset = sGuzzlordTeachableLearnset, }, #endif //P_FAMILY_GUZZLORD @@ -4411,7 +4849,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 369, .trainerOffset = 7, FOOTPRINT(Necrozma) - LEARNSETS(Necrozma), + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, @@ -4435,16 +4874,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "life-form, apparently asleep underground,\n" "is thought to have come from another\n" "world in ancient times."), - FRONT_PIC(Necrozma, 64, 64), + .frontPic = gMonFrontPic_Necrozma, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Necrozma, .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 6, - BACK_PIC(Necrozma, 64, 64), + .backPic = gMonBackPic_Necrozma, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Necrozma), - ICON(Necrozma, 0), + .palette = gMonPalette_Necrozma, + .shinyPalette = gMonShinyPalette_Necrozma, + .iconSprite = gMonIcon_Necrozma, + .iconPalIndex = 0, }, #if P_FUSION_FORMS @@ -4464,7 +4907,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 369, .trainerOffset = 7, FOOTPRINT(Necrozma) - LEARNSETS(Necrozma), + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, @@ -4487,15 +4931,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "devouring the light of Solgaleo. It pounces\n" "on foes and then slashes them with\n" "the claws on its four limbs and back."), - FRONT_PIC(NecrozmaDuskMane, 64, 64), + .frontPic = gMonFrontPic_NecrozmaDuskMane, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(NecrozmaDuskMane, 64, 64), + .backPic = gMonBackPic_NecrozmaDuskMane, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(NecrozmaDuskMane), - ICON(NecrozmaDuskMane, 0), + .palette = gMonPalette_NecrozmaDuskMane, + .shinyPalette = gMonShinyPalette_NecrozmaDuskMane, + .iconSprite = gMonIcon_NecrozmaDuskMane, + .iconPalIndex = 0, .cannotBeTraded = TRUE, .formChangeTable = sNecrozmaDuskManeFormChangeTable, }, @@ -4516,7 +4964,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 369, .trainerOffset = 7, FOOTPRINT(Necrozma) - LEARNSETS(Necrozma), + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, @@ -4539,16 +4988,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "devouring the light of Lunala. It grasps\n" "foes in its giant claws and rips them\n" "apart with brute force."), - FRONT_PIC(NecrozmaDawnWings, 64, 64), + .frontPic = gMonFrontPic_NecrozmaDawnWings, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(NecrozmaDawnWings, 64, 64), + .backPic = gMonBackPic_NecrozmaDawnWings, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(NecrozmaDawnWings), - ICON(NecrozmaDawnWings, 0), + .palette = gMonPalette_NecrozmaDawnWings, + .shinyPalette = gMonShinyPalette_NecrozmaDawnWings, + .iconSprite = gMonIcon_NecrozmaDawnWings, + .iconPalIndex = 0, .cannotBeTraded = TRUE, .formChangeTable = sNecrozmaDawnWingsFormChangeTable, }, @@ -4570,7 +5023,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 369, .trainerOffset = 7, FOOTPRINT(Necrozma) - LEARNSETS(Necrozma), + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .isLegendary = TRUE, .baseHP = 97, @@ -4595,16 +5049,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "its body affects living things and\n" "nature, impacting them in various\n" "ways."), - FRONT_PIC(NecrozmaUltra, 64, 64), + .frontPic = gMonFrontPic_NecrozmaUltra, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(NecrozmaUltra, 64, 64), + .backPic = gMonBackPic_NecrozmaUltra, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(NecrozmaUltra), - ICON(NecrozmaUltra, 2), + .palette = gMonPalette_NecrozmaUltra, + .shinyPalette = gMonShinyPalette_NecrozmaUltra, + .iconSprite = gMonIcon_NecrozmaUltra, + .iconPalIndex = 2, .cannotBeTraded = TRUE, .isUltraBurst = TRUE, }, @@ -4641,17 +5099,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Magearna, 56, 64), + .frontPic = gMonFrontPic_Magearna, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Magearna, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Magearna, 64, 56), + .backPic = gMonBackPic_Magearna, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - PALETTES(Magearna), - ICON(Magearna, 0), + .palette = gMonPalette_Magearna, + .shinyPalette = gMonShinyPalette_Magearna, + .iconSprite = gMonIcon_Magearna, + .iconPalIndex = 0, FOOTPRINT(Magearna) - LEARNSETS(Magearna), + .levelUpLearnset = sMagearnaLevelUpLearnset, + .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, .bodyColor = BODY_COLOR_GRAY, @@ -4689,17 +5152,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(MagearnaOriginalColor, 56, 64), + .frontPic = gMonFrontPic_MagearnaOriginalColor, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Magearna, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(MagearnaOriginalColor, 64, 56), + .backPic = gMonBackPic_MagearnaOriginalColor, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - PALETTES(MagearnaOriginalColor), - ICON(MagearnaOriginalColor, 0), + .palette = gMonPalette_MagearnaOriginalColor, + .shinyPalette = gMonShinyPalette_MagearnaOriginalColor, + .iconSprite = gMonIcon_MagearnaOriginalColor, + .iconPalIndex = 0, FOOTPRINT(Magearna) - LEARNSETS(Magearna), + .levelUpLearnset = sMagearnaLevelUpLearnset, + .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, .bodyColor = BODY_COLOR_RED, @@ -4748,17 +5216,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Marshadow, 32, 56), + .frontPic = gMonFrontPic_Marshadow, + .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Marshadow, .frontAnimId = ANIM_V_SHAKE, - BACK_PIC(Marshadow, 40, 56), + .backPic = gMonBackPic_Marshadow, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Marshadow), - ICON(Marshadow, 0), + .palette = gMonPalette_Marshadow, + .shinyPalette = gMonShinyPalette_Marshadow, + .iconSprite = gMonIcon_Marshadow, + .iconPalIndex = 0, FOOTPRINT(Marshadow) - LEARNSETS(Marshadow), + .levelUpLearnset = sMarshadowLevelUpLearnset, + .teachableLearnset = sMarshadowTeachableLearnset, .isMythical = TRUE, }, #endif //P_FAMILY_MARSHADOW @@ -4798,18 +5271,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poipole, 40, 56), + .frontPic = gMonFrontPic_Poipole, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Poipole, .frontAnimId = ANIM_SHAKE_GLOW_PURPLE_SLOW, .enemyMonElevation = 9, - BACK_PIC(Poipole, 48, 56), + .backPic = gMonBackPic_Poipole, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Poipole), - ICON(Poipole, 0), + .palette = gMonPalette_Poipole, + .shinyPalette = gMonShinyPalette_Poipole, + .iconSprite = gMonIcon_Poipole, + .iconPalIndex = 0, FOOTPRINT(Poipole) - LEARNSETS(Poipole), + .levelUpLearnset = sPoipoleLevelUpLearnset, + .teachableLearnset = sPoipoleTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}), }, @@ -4847,18 +5325,23 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 405, .trainerOffset = 8, - FRONT_PIC(Naganadel, 64, 64), + .frontPic = gMonFrontPic_Naganadel, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Naganadel, .frontAnimId = ANIM_TRIANGLE_DOWN_TWICE, .enemyMonElevation = 7, - BACK_PIC(Naganadel, 64, 56), + .backPic = gMonBackPic_Naganadel, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Naganadel), - ICON(Naganadel, 0), + .palette = gMonPalette_Naganadel, + .shinyPalette = gMonShinyPalette_Naganadel, + .iconSprite = gMonIcon_Naganadel, + .iconPalIndex = 0, FOOTPRINT(Naganadel) - LEARNSETS(Naganadel), + .levelUpLearnset = sNaganadelLevelUpLearnset, + .teachableLearnset = sNaganadelTeachableLearnset, }, #endif //P_FAMILY_POIPOLE @@ -4898,17 +5381,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 0, .trainerScale = 721, .trainerOffset = 19, - FRONT_PIC(Stakataka, 64, 64), + .frontPic = gMonFrontPic_Stakataka, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Stakataka, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Stakataka, 64, 48), + .backPic = gMonBackPic_Stakataka, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Stakataka), - ICON(Stakataka, 0), + .palette = gMonPalette_Stakataka, + .shinyPalette = gMonShinyPalette_Stakataka, + .iconSprite = gMonIcon_Stakataka, + .iconPalIndex = 0, FOOTPRINT(Stakataka) - LEARNSETS(Stakataka), + .levelUpLearnset = sStakatakaLevelUpLearnset, + .teachableLearnset = sStakatakaTeachableLearnset, }, #endif //P_FAMILY_STAKATAKA @@ -4948,17 +5436,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Blacephalon, 56, 64), + .frontPic = gMonFrontPic_Blacephalon, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Blacephalon, .frontAnimId = ANIM_SHAKE_GLOW_RED, - BACK_PIC(Blacephalon, 64, 48), + .backPic = gMonBackPic_Blacephalon, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Blacephalon), - ICON(Blacephalon, 0), + .palette = gMonPalette_Blacephalon, + .shinyPalette = gMonShinyPalette_Blacephalon, + .iconSprite = gMonIcon_Blacephalon, + .iconPalIndex = 0, FOOTPRINT(Blacephalon) - LEARNSETS(Blacephalon), + .levelUpLearnset = sBlacephalonLevelUpLearnset, + .teachableLearnset = sBlacephalonTeachableLearnset, }, #endif //P_FAMILY_BLACEPHALON @@ -4997,17 +5490,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Zeraora, 64, 56), + .frontPic = gMonFrontPic_Zeraora, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Zeraora, .frontAnimId = ANIM_V_STRETCH, - BACK_PIC(Zeraora, 64, 56), + .backPic = gMonBackPic_Zeraora, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Zeraora), - ICON(Zeraora, 0), + .palette = gMonPalette_Zeraora, + .shinyPalette = gMonShinyPalette_Zeraora, + .iconSprite = gMonIcon_Zeraora, + .iconPalIndex = 0, FOOTPRINT(Zeraora) - LEARNSETS(Zeraora), + .levelUpLearnset = sZeraoraLevelUpLearnset, + .teachableLearnset = sZeraoraTeachableLearnset, }, #endif //P_FAMILY_ZERAORA @@ -5046,17 +5544,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Meltan, 32, 48), + .frontPic = gMonFrontPic_Meltan, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Meltan, .frontAnimId = ANIM_GROW_STUTTER_SLOW, - BACK_PIC(Meltan, 40, 40), + .backPic = gMonBackPic_Meltan, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Meltan), - ICON(Meltan, 2), + .palette = gMonPalette_Meltan, + .shinyPalette = gMonShinyPalette_Meltan, + .iconSprite = gMonIcon_Meltan, + .iconPalIndex = 2, FOOTPRINT(Meltan) - LEARNSETS(Meltan), + .levelUpLearnset = sMeltanLevelUpLearnset, + .teachableLearnset = sMeltanTeachableLearnset, }, [SPECIES_MELMETAL] = @@ -5087,7 +5590,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 423, .trainerOffset = 8, FOOTPRINT(Melmetal) - LEARNSETS(Melmetal), + .levelUpLearnset = sMelmetalLevelUpLearnset, + .teachableLearnset = sMelmetalTeachableLearnset, .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, @@ -5097,15 +5601,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "Revered long ago for its capacity to create\n" "iron from nothing, for some reason it has\n" "come back to life after 3,000 years."), - FRONT_PIC(Melmetal, 64, 56), + .frontPic = gMonFrontPic_Melmetal, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Melmetal, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Melmetal, 64, 40), + .backPic = gMonBackPic_Melmetal, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Melmetal), - ICON(Melmetal, 2), + .palette = gMonPalette_Melmetal, + .shinyPalette = gMonShinyPalette_Melmetal, + .iconSprite = gMonIcon_Melmetal, + .iconPalIndex = 2, }, #if P_GIGANTAMAX_FORMS @@ -5137,7 +5645,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerScale = 423, .trainerOffset = 8, FOOTPRINT(Melmetal) - LEARNSETS(Melmetal), + .levelUpLearnset = sMelmetalLevelUpLearnset, + .teachableLearnset = sMelmetalTeachableLearnset, .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, @@ -5149,15 +5658,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "legends about a cyclopean giant. In fact,\n" "the giant was a Melmetal that was\n" "flooded with Gigantamax energy."), - FRONT_PIC(MelmetalGigantamax, 64, 64), + .frontPic = gMonFrontPic_MelmetalGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_MelmetalGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MelmetalGigantamax, 64, 64), + .backPic = gMonBackPic_MelmetalGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MelmetalGigantamax), - ICON(MelmetalGigantamax, 0), + .palette = gMonPalette_MelmetalGigantamax, + .shinyPalette = gMonShinyPalette_MelmetalGigantamax, + .iconSprite = gMonIcon_MelmetalGigantamax, + .iconPalIndex = 0, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index 0c1e655576d7..6efafbdc880a 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grookey, 40, 48), + .frontPic = gMonFrontPic_Grookey, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Grookey, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Grookey, 48, 56), + .backPic = gMonBackPic_Grookey, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Grookey), - ICON(Grookey, 1), + .palette = gMonPalette_Grookey, + .shinyPalette = gMonShinyPalette_Grookey, + .iconSprite = gMonIcon_Grookey, + .iconPalIndex = 1, FOOTPRINT(Grookey) - LEARNSETS(Grookey), + .levelUpLearnset = sGrookeyLevelUpLearnset, + .teachableLearnset = sGrookeyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_THWACKEY}), }, @@ -85,17 +90,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Thwackey, 48, 56), + .frontPic = gMonFrontPic_Thwackey, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Thwackey, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Thwackey, 56, 56), + .backPic = gMonBackPic_Thwackey, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Thwackey), - ICON(Thwackey, 1), + .palette = gMonPalette_Thwackey, + .shinyPalette = gMonShinyPalette_Thwackey, + .iconSprite = gMonIcon_Thwackey, + .iconPalIndex = 1, FOOTPRINT(Thwackey) - LEARNSETS(Thwackey), + .levelUpLearnset = sThwackeyLevelUpLearnset, + .teachableLearnset = sThwackeyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_RILLABOOM}), }, @@ -123,7 +133,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_RILLABOOM, .categoryName = _("Drummer"), FOOTPRINT(Rillaboom) - LEARNSETS(Rillaboom), + .levelUpLearnset = sRillaboomLevelUpLearnset, + .teachableLearnset = sRillaboomTeachableLearnset, .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, .formChangeTable = sRillaboomFormChangeTable, .height = 21, @@ -136,15 +147,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "By drumming, it taps into the power of\n" "its special tree stump. The roots of the\n" "stump follow its direction in battle."), - FRONT_PIC(Rillaboom, 64, 64), + .frontPic = gMonFrontPic_Rillaboom, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Rillaboom, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Rillaboom, 64, 56), + .backPic = gMonBackPic_Rillaboom, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Rillaboom), - ICON(Rillaboom, 1), + .palette = gMonPalette_Rillaboom, + .shinyPalette = gMonShinyPalette_Rillaboom, + .iconSprite = gMonIcon_Rillaboom, + .iconPalIndex = 1, }, #if P_GIGANTAMAX_FORMS @@ -172,7 +187,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_RILLABOOM, .categoryName = _("Drummer"), FOOTPRINT(Rillaboom) - LEARNSETS(Rillaboom), + .levelUpLearnset = sRillaboomLevelUpLearnset, + .teachableLearnset = sRillaboomTeachableLearnset, .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, .formChangeTable = sRillaboomFormChangeTable, .height = 280, @@ -185,15 +201,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "Rillaboom has become one with its\n" "forest of drums and continues to lay\n" "down beats that shake all of Galar."), - FRONT_PIC(RillaboomGigantamax, 64, 64), + .frontPic = gMonFrontPic_RillaboomGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RillaboomGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(RillaboomGigantamax, 64, 64), + .backPic = gMonBackPic_RillaboomGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RillaboomGigantamax), - ICON(RillaboomGigantamax, 1), + .palette = gMonPalette_RillaboomGigantamax, + .shinyPalette = gMonShinyPalette_RillaboomGigantamax, + .iconSprite = gMonIcon_RillaboomGigantamax, + .iconPalIndex = 1, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -234,17 +254,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scorbunny, 40, 56), + .frontPic = gMonFrontPic_Scorbunny, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Scorbunny, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Scorbunny, 48, 56), + .backPic = gMonBackPic_Scorbunny, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Scorbunny), - ICON(Scorbunny, 0), + .palette = gMonPalette_Scorbunny, + .shinyPalette = gMonShinyPalette_Scorbunny, + .iconSprite = gMonIcon_Scorbunny, + .iconPalIndex = 0, FOOTPRINT(Scorbunny) - LEARNSETS(Scorbunny), + .levelUpLearnset = sScorbunnyLevelUpLearnset, + .teachableLearnset = sScorbunnyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_RABOOT}), }, @@ -281,17 +306,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Raboot, 40, 56), + .frontPic = gMonFrontPic_Raboot, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Raboot, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Raboot, 56, 56), + .backPic = gMonBackPic_Raboot, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Raboot), - ICON(Raboot, 0), + .palette = gMonPalette_Raboot, + .shinyPalette = gMonShinyPalette_Raboot, + .iconSprite = gMonIcon_Raboot, + .iconPalIndex = 0, FOOTPRINT(Raboot) - LEARNSETS(Raboot), + .levelUpLearnset = sRabootLevelUpLearnset, + .teachableLearnset = sRabootTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_CINDERACE}), }, @@ -319,7 +349,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CINDERACE, .categoryName = _("Striker"), FOOTPRINT(Cinderace) - LEARNSETS(Cinderace), + .levelUpLearnset = sCinderaceLevelUpLearnset, + .teachableLearnset = sCinderaceTeachableLearnset, .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, .formChangeTable = sCinderaceFormChangeTable, .height = 14, @@ -333,15 +364,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Cinderace, 40, 64), + .frontPic = gMonFrontPic_Cinderace, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cinderace, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cinderace, 48, 56), + .backPic = gMonBackPic_Cinderace, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cinderace), - ICON(Cinderace, 0), + .palette = gMonPalette_Cinderace, + .shinyPalette = gMonShinyPalette_Cinderace, + .iconSprite = gMonIcon_Cinderace, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -369,7 +404,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CINDERACE, .categoryName = _("Striker"), FOOTPRINT(Cinderace) - LEARNSETS(Cinderace), + .levelUpLearnset = sCinderaceLevelUpLearnset, + .teachableLearnset = sCinderaceTeachableLearnset, .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, .formChangeTable = sCinderaceFormChangeTable, .height = 270, @@ -383,15 +419,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(CinderaceGigantamax, 64, 64), + .frontPic = gMonFrontPic_CinderaceGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_CinderaceGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CinderaceGigantamax, 64, 64), + .backPic = gMonBackPic_CinderaceGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CinderaceGigantamax), - ICON(CinderaceGigantamax, 0), + .palette = gMonPalette_CinderaceGigantamax, + .shinyPalette = gMonShinyPalette_CinderaceGigantamax, + .iconSprite = gMonIcon_CinderaceGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -433,17 +473,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sobble, 40, 56), + .frontPic = gMonFrontPic_Sobble, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Sobble, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sobble, 40, 56), + .backPic = gMonBackPic_Sobble, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sobble), - ICON(Sobble, 2), + .palette = gMonPalette_Sobble, + .shinyPalette = gMonShinyPalette_Sobble, + .iconSprite = gMonIcon_Sobble, + .iconPalIndex = 2, FOOTPRINT(Sobble) - LEARNSETS(Sobble), + .levelUpLearnset = sSobbleLevelUpLearnset, + .teachableLearnset = sSobbleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_DRIZZILE}), }, @@ -480,17 +525,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Drizzile, 40, 48), + .frontPic = gMonFrontPic_Drizzile, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Drizzile, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Drizzile, 56, 48), + .backPic = gMonBackPic_Drizzile, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Drizzile), - ICON(Drizzile, 2), + .palette = gMonPalette_Drizzile, + .shinyPalette = gMonShinyPalette_Drizzile, + .iconSprite = gMonIcon_Drizzile, + .iconPalIndex = 2, FOOTPRINT(Drizzile) - LEARNSETS(Drizzile), + .levelUpLearnset = sDrizzileLevelUpLearnset, + .teachableLearnset = sDrizzileTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_INTELEON}), }, @@ -518,7 +568,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_INTELEON, .categoryName = _("Secret Agent"), FOOTPRINT(Inteleon) - LEARNSETS(Inteleon), + .levelUpLearnset = sInteleonLevelUpLearnset, + .teachableLearnset = sInteleonTeachableLearnset, .formSpeciesIdTable = sInteleonFormSpeciesIdTable, .formChangeTable = sInteleonFormChangeTable, .height = 19, @@ -532,15 +583,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(Inteleon, 48, 64), + .frontPic = gMonFrontPic_Inteleon, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Inteleon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Inteleon, 56, 64), + .backPic = gMonBackPic_Inteleon, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Inteleon), - ICON(Inteleon, 0), + .palette = gMonPalette_Inteleon, + .shinyPalette = gMonShinyPalette_Inteleon, + .iconSprite = gMonIcon_Inteleon, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -568,7 +623,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_INTELEON, .categoryName = _("Secret Agent"), FOOTPRINT(Inteleon) - LEARNSETS(Inteleon), + .levelUpLearnset = sInteleonLevelUpLearnset, + .teachableLearnset = sInteleonTeachableLearnset, .formSpeciesIdTable = sInteleonFormSpeciesIdTable, .formChangeTable = sInteleonFormChangeTable, .height = 400, @@ -582,15 +638,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - FRONT_PIC(InteleonGigantamax, 64, 64), + .frontPic = gMonFrontPic_InteleonGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_InteleonGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(InteleonGigantamax, 64, 64), + .backPic = gMonBackPic_InteleonGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(InteleonGigantamax), - ICON(InteleonGigantamax, 0), + .palette = gMonPalette_InteleonGigantamax, + .shinyPalette = gMonShinyPalette_InteleonGigantamax, + .iconSprite = gMonIcon_InteleonGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -631,17 +691,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skwovet, 40, 48), + .frontPic = gMonFrontPic_Skwovet, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Skwovet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Skwovet, 64, 56), + .backPic = gMonBackPic_Skwovet, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Skwovet), - ICON(Skwovet, 2), + .palette = gMonPalette_Skwovet, + .shinyPalette = gMonShinyPalette_Skwovet, + .iconSprite = gMonIcon_Skwovet, + .iconPalIndex = 2, FOOTPRINT(Skwovet) - LEARNSETS(Skwovet), + .levelUpLearnset = sSkwovetLevelUpLearnset, + .teachableLearnset = sSkwovetTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_GREEDENT}), }, @@ -680,17 +745,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Greedent, 56, 64), + .frontPic = gMonFrontPic_Greedent, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Greedent, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Greedent, 64, 56), + .backPic = gMonBackPic_Greedent, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Greedent), - ICON(Greedent, 0), + .palette = gMonPalette_Greedent, + .shinyPalette = gMonShinyPalette_Greedent, + .iconSprite = gMonIcon_Greedent, + .iconPalIndex = 0, FOOTPRINT(Greedent) - LEARNSETS(Greedent), + .levelUpLearnset = sGreedentLevelUpLearnset, + .teachableLearnset = sGreedentTeachableLearnset, }, #endif //P_FAMILY_SKWOVET @@ -729,17 +799,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rookidee, 40, 40), + .frontPic = gMonFrontPic_Rookidee, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Rookidee, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Rookidee, 64, 32), + .backPic = gMonBackPic_Rookidee, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Rookidee), - ICON(Rookidee, 0), + .palette = gMonPalette_Rookidee, + .shinyPalette = gMonShinyPalette_Rookidee, + .iconSprite = gMonIcon_Rookidee, + .iconPalIndex = 0, FOOTPRINT(Rookidee) - LEARNSETS(Rookidee), + .levelUpLearnset = sRookideeLevelUpLearnset, + .teachableLearnset = sRookideeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CORVISQUIRE}), }, @@ -777,18 +852,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Corvisquire, 64, 56), + .frontPic = gMonFrontPic_Corvisquire, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Corvisquire, .frontAnimId = ANIM_CIRCLE_INTO_BG, .enemyMonElevation = 10, - BACK_PIC(Corvisquire, 56, 48), + .backPic = gMonBackPic_Corvisquire, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Corvisquire), - ICON(Corvisquire, 0), + .palette = gMonPalette_Corvisquire, + .shinyPalette = gMonShinyPalette_Corvisquire, + .iconSprite = gMonIcon_Corvisquire, + .iconPalIndex = 0, FOOTPRINT(Corvisquire) - LEARNSETS(Corvisquire), + .levelUpLearnset = sCorvisquireLevelUpLearnset, + .teachableLearnset = sCorvisquireTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CORVIKNIGHT}), }, @@ -816,7 +896,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CORVIKNIGHT, .categoryName = _("Raven"), FOOTPRINT(Corviknight) - LEARNSETS(Corviknight), + .levelUpLearnset = sCorviknightLevelUpLearnset, + .teachableLearnset = sCorviknightTeachableLearnset, .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, .formChangeTable = sCorviknightFormChangeTable, .height = 22, @@ -830,15 +911,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Corviknight, 56, 64), + .frontPic = gMonFrontPic_Corviknight, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Corviknight, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Corviknight, 64, 64), + .backPic = gMonBackPic_Corviknight, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Corviknight), - ICON(Corviknight, 0), + .palette = gMonPalette_Corviknight, + .shinyPalette = gMonShinyPalette_Corviknight, + .iconSprite = gMonIcon_Corviknight, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -866,7 +951,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CORVIKNIGHT, .categoryName = _("Raven"), FOOTPRINT(Corviknight) - LEARNSETS(Corviknight), + .levelUpLearnset = sCorviknightLevelUpLearnset, + .teachableLearnset = sCorviknightTeachableLearnset, .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, .formChangeTable = sCorviknightFormChangeTable, .height = 140, @@ -880,15 +966,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(CorviknightGigantamax, 64, 64), + .frontPic = gMonFrontPic_CorviknightGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_CorviknightGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CorviknightGigantamax, 64, 64), + .backPic = gMonBackPic_CorviknightGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CorviknightGigantamax), - ICON(CorviknightGigantamax, 0), + .palette = gMonPalette_CorviknightGigantamax, + .shinyPalette = gMonShinyPalette_CorviknightGigantamax, + .iconSprite = gMonIcon_CorviknightGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -928,17 +1018,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Blipbug, 32, 40), + .frontPic = gMonFrontPic_Blipbug, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Blipbug, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Blipbug, 40, 56), + .backPic = gMonBackPic_Blipbug, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Blipbug), - ICON(Blipbug, 0), + .palette = gMonPalette_Blipbug, + .shinyPalette = gMonShinyPalette_Blipbug, + .iconSprite = gMonIcon_Blipbug, + .iconPalIndex = 0, FOOTPRINT(Blipbug) - LEARNSETS(Blipbug), + .levelUpLearnset = sBlipbugLevelUpLearnset, + .teachableLearnset = sBlipbugTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}), }, @@ -978,17 +1073,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dottler, 48, 40), + .frontPic = gMonFrontPic_Dottler, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Dottler, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dottler, 56, 32), + .backPic = gMonBackPic_Dottler, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dottler), - ICON(Dottler, 2), + .palette = gMonPalette_Dottler, + .shinyPalette = gMonShinyPalette_Dottler, + .iconSprite = gMonIcon_Dottler, + .iconPalIndex = 2, FOOTPRINT(Dottler) - LEARNSETS(Dottler), + .levelUpLearnset = sDottlerLevelUpLearnset, + .teachableLearnset = sDottlerTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ORBEETLE}), }, @@ -1017,7 +1117,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_ORBEETLE, .categoryName = _("Seven Spot"), FOOTPRINT(Orbeetle) - LEARNSETS(Orbeetle), + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, .formChangeTable = sOrbeetleFormChangeTable, .height = 4, @@ -1031,16 +1132,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Orbeetle, 48, 56), + .frontPic = gMonFrontPic_Orbeetle, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Orbeetle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Orbeetle, 64, 56), + .backPic = gMonBackPic_Orbeetle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Orbeetle), - ICON(Orbeetle, 0), + .palette = gMonPalette_Orbeetle, + .shinyPalette = gMonShinyPalette_Orbeetle, + .iconSprite = gMonIcon_Orbeetle, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -1069,7 +1174,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_ORBEETLE, .categoryName = _("Seven Spot"), FOOTPRINT(Orbeetle) - LEARNSETS(Orbeetle), + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, .formChangeTable = sOrbeetleFormChangeTable, .height = 140, @@ -1083,15 +1189,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(OrbeetleGigantamax, 64, 64), + .frontPic = gMonFrontPic_OrbeetleGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_OrbeetleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OrbeetleGigantamax, 64, 64), + .backPic = gMonBackPic_OrbeetleGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(OrbeetleGigantamax), - ICON(OrbeetleGigantamax, 0), + .palette = gMonPalette_OrbeetleGigantamax, + .shinyPalette = gMonShinyPalette_OrbeetleGigantamax, + .iconSprite = gMonIcon_OrbeetleGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -1132,17 +1242,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nickit, 56, 48), + .frontPic = gMonFrontPic_Nickit, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Nickit, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Nickit, 64, 56), + .backPic = gMonBackPic_Nickit, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Nickit), - ICON(Nickit, 2), + .palette = gMonPalette_Nickit, + .shinyPalette = gMonShinyPalette_Nickit, + .iconSprite = gMonIcon_Nickit, + .iconPalIndex = 2, FOOTPRINT(Nickit) - LEARNSETS(Nickit), + .levelUpLearnset = sNickitLevelUpLearnset, + .teachableLearnset = sNickitTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_THIEVUL}), }, @@ -1180,17 +1295,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Thievul, 64, 56), + .frontPic = gMonFrontPic_Thievul, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Thievul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Thievul, 56, 64), + .backPic = gMonBackPic_Thievul, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Thievul), - ICON(Thievul, 2), + .palette = gMonPalette_Thievul, + .shinyPalette = gMonShinyPalette_Thievul, + .iconSprite = gMonIcon_Thievul, + .iconPalIndex = 2, FOOTPRINT(Thievul) - LEARNSETS(Thievul), + .levelUpLearnset = sThievulLevelUpLearnset, + .teachableLearnset = sThievulTeachableLearnset, }, #endif //P_FAMILY_NICKIT @@ -1229,17 +1349,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gossifleur, 48, 56), + .frontPic = gMonFrontPic_Gossifleur, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Gossifleur, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Gossifleur, 56, 48), + .backPic = gMonBackPic_Gossifleur, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Gossifleur), - ICON(Gossifleur, 1), + .palette = gMonPalette_Gossifleur, + .shinyPalette = gMonShinyPalette_Gossifleur, + .iconSprite = gMonIcon_Gossifleur, + .iconPalIndex = 1, FOOTPRINT(Gossifleur) - LEARNSETS(Gossifleur), + .levelUpLearnset = sGossifleurLevelUpLearnset, + .teachableLearnset = sGossifleurTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_ELDEGOSS}), }, @@ -1277,17 +1402,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Eldegoss, 48, 56), + .frontPic = gMonFrontPic_Eldegoss, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Eldegoss, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Eldegoss, 64, 40), + .backPic = gMonBackPic_Eldegoss, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Eldegoss), - ICON(Eldegoss, 1), + .palette = gMonPalette_Eldegoss, + .shinyPalette = gMonShinyPalette_Eldegoss, + .iconSprite = gMonIcon_Eldegoss, + .iconPalIndex = 1, FOOTPRINT(Eldegoss) - LEARNSETS(Eldegoss), + .levelUpLearnset = sEldegossLevelUpLearnset, + .teachableLearnset = sEldegossTeachableLearnset, }, #endif //P_FAMILY_GOSSIFLEUR @@ -1326,17 +1456,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wooloo, 40, 40), + .frontPic = gMonFrontPic_Wooloo, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Wooloo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wooloo, 56, 32), + .backPic = gMonBackPic_Wooloo, + .backPicSize = MON_COORDS_SIZE(56, 32), .backPicYOffset = 18, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wooloo), - ICON(Wooloo, 0), + .palette = gMonPalette_Wooloo, + .shinyPalette = gMonShinyPalette_Wooloo, + .iconSprite = gMonIcon_Wooloo, + .iconPalIndex = 0, FOOTPRINT(Wooloo) - LEARNSETS(Wooloo), + .levelUpLearnset = sWoolooLevelUpLearnset, + .teachableLearnset = sWoolooTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_DUBWOOL}), }, @@ -1374,17 +1509,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dubwool, 48, 56), + .frontPic = gMonFrontPic_Dubwool, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Dubwool, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dubwool, 64, 40), + .backPic = gMonBackPic_Dubwool, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dubwool), - ICON(Dubwool, 2), + .palette = gMonPalette_Dubwool, + .shinyPalette = gMonShinyPalette_Dubwool, + .iconSprite = gMonIcon_Dubwool, + .iconPalIndex = 2, FOOTPRINT(Dubwool) - LEARNSETS(Dubwool), + .levelUpLearnset = sDubwoolLevelUpLearnset, + .teachableLearnset = sDubwoolTeachableLearnset, }, #endif //P_FAMILY_WOOLOO @@ -1422,17 +1562,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Chewtle, 32, 48), + .frontPic = gMonFrontPic_Chewtle, + .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Chewtle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Chewtle, 56, 56), + .backPic = gMonBackPic_Chewtle, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Chewtle), - ICON(Chewtle, 0), + .palette = gMonPalette_Chewtle, + .shinyPalette = gMonShinyPalette_Chewtle, + .iconSprite = gMonIcon_Chewtle, + .iconPalIndex = 0, FOOTPRINT(Chewtle) - LEARNSETS(Chewtle), + .levelUpLearnset = sChewtleLevelUpLearnset, + .teachableLearnset = sChewtleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_DREDNAW}), }, @@ -1460,7 +1605,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_DREDNAW, .categoryName = _("Bite"), FOOTPRINT(Drednaw) - LEARNSETS(Drednaw), + .levelUpLearnset = sDrednawLevelUpLearnset, + .teachableLearnset = sDrednawTeachableLearnset, .formSpeciesIdTable = sDrednawFormSpeciesIdTable, .formChangeTable = sDrednawFormChangeTable, .height = 10, @@ -1473,15 +1619,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Drednaw, 64, 56), + .frontPic = gMonFrontPic_Drednaw, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Drednaw, .frontAnimId = ANIM_GROW_VIBRATE, - BACK_PIC(Drednaw, 64, 40), + .backPic = gMonBackPic_Drednaw, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 18, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Drednaw), - ICON(Drednaw, 0), + .palette = gMonPalette_Drednaw, + .shinyPalette = gMonShinyPalette_Drednaw, + .iconSprite = gMonIcon_Drednaw, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -1509,7 +1659,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_DREDNAW, .categoryName = _("Bite"), FOOTPRINT(Drednaw) - LEARNSETS(Drednaw), + .levelUpLearnset = sDrednawLevelUpLearnset, + .teachableLearnset = sDrednawTeachableLearnset, .formSpeciesIdTable = sDrednawFormSpeciesIdTable, .formChangeTable = sDrednawFormChangeTable, .height = 240, @@ -1523,15 +1674,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(DrednawGigantamax, 64, 64), + .frontPic = gMonFrontPic_DrednawGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DrednawGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DrednawGigantamax, 64, 64), + .backPic = gMonBackPic_DrednawGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DrednawGigantamax), - ICON(DrednawGigantamax, 0), + .palette = gMonPalette_DrednawGigantamax, + .shinyPalette = gMonShinyPalette_DrednawGigantamax, + .iconSprite = gMonIcon_DrednawGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -1572,17 +1727,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Yamper, 40, 48), + .frontPic = gMonFrontPic_Yamper, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Yamper, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Yamper, 48, 48), + .backPic = gMonBackPic_Yamper, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Yamper), - ICON(Yamper, 1), + .palette = gMonPalette_Yamper, + .shinyPalette = gMonShinyPalette_Yamper, + .iconSprite = gMonIcon_Yamper, + .iconPalIndex = 1, FOOTPRINT(Yamper) - LEARNSETS(Yamper), + .levelUpLearnset = sYamperLevelUpLearnset, + .teachableLearnset = sYamperTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_BOLTUND}), }, @@ -1620,17 +1780,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Boltund, 48, 56), + .frontPic = gMonFrontPic_Boltund, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Boltund, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Boltund, 64, 56), + .backPic = gMonBackPic_Boltund, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Boltund), - ICON(Boltund, 1), + .palette = gMonPalette_Boltund, + .shinyPalette = gMonShinyPalette_Boltund, + .iconSprite = gMonIcon_Boltund, + .iconPalIndex = 1, FOOTPRINT(Boltund) - LEARNSETS(Boltund), + .levelUpLearnset = sBoltundLevelUpLearnset, + .teachableLearnset = sBoltundTeachableLearnset, }, #endif //P_FAMILY_YAMPER @@ -1669,17 +1834,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rolycoly, 40, 40), + .frontPic = gMonFrontPic_Rolycoly, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Rolycoly, .frontAnimId = ANIM_H_SLIDE_SLOW, - BACK_PIC(Rolycoly, 64, 32), + .backPic = gMonBackPic_Rolycoly, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Rolycoly), - ICON(Rolycoly, 0), + .palette = gMonPalette_Rolycoly, + .shinyPalette = gMonShinyPalette_Rolycoly, + .iconSprite = gMonIcon_Rolycoly, + .iconPalIndex = 0, FOOTPRINT(Rolycoly) - LEARNSETS(Rolycoly), + .levelUpLearnset = sRolycolyLevelUpLearnset, + .teachableLearnset = sRolycolyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_CARKOL}), }, @@ -1716,17 +1886,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Carkol, 48, 56), + .frontPic = gMonFrontPic_Carkol, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Carkol, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Carkol, 64, 48), + .backPic = gMonBackPic_Carkol, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Carkol), - ICON(Carkol, 0), + .palette = gMonPalette_Carkol, + .shinyPalette = gMonShinyPalette_Carkol, + .iconSprite = gMonIcon_Carkol, + .iconPalIndex = 0, FOOTPRINT(Carkol) - LEARNSETS(Carkol), + .levelUpLearnset = sCarkolLevelUpLearnset, + .teachableLearnset = sCarkolTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COALOSSAL}), }, @@ -1754,7 +1929,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_COALOSSAL, .categoryName = _("Coal"), FOOTPRINT(Coalossal) - LEARNSETS(Coalossal), + .levelUpLearnset = sCoalossalLevelUpLearnset, + .teachableLearnset = sCoalossalTeachableLearnset, .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, .formChangeTable = sCoalossalFormChangeTable, .height = 28, @@ -1768,15 +1944,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Coalossal, 56, 64), + .frontPic = gMonFrontPic_Coalossal, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Coalossal, .frontAnimId = ANIM_GLOW_RED, - BACK_PIC(Coalossal, 64, 48), + .backPic = gMonBackPic_Coalossal, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Coalossal), - ICON(Coalossal, 0), + .palette = gMonPalette_Coalossal, + .shinyPalette = gMonShinyPalette_Coalossal, + .iconSprite = gMonIcon_Coalossal, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -1804,7 +1984,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_COALOSSAL, .categoryName = _("Coal"), FOOTPRINT(Coalossal) - LEARNSETS(Coalossal), + .levelUpLearnset = sCoalossalLevelUpLearnset, + .teachableLearnset = sCoalossalTeachableLearnset, .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, .formChangeTable = sCoalossalFormChangeTable, .height = 420, @@ -1818,15 +1999,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CoalossalGigantamax, 64, 64), + .frontPic = gMonFrontPic_CoalossalGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_CoalossalGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CoalossalGigantamax, 64, 64), + .backPic = gMonBackPic_CoalossalGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CoalossalGigantamax), - ICON(CoalossalGigantamax, 0), + .palette = gMonPalette_CoalossalGigantamax, + .shinyPalette = gMonShinyPalette_CoalossalGigantamax, + .iconSprite = gMonIcon_CoalossalGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -1867,17 +2052,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Applin, 32, 40), + .frontPic = gMonFrontPic_Applin, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Applin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Applin, 40, 48), + .backPic = gMonBackPic_Applin, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Applin), - ICON(Applin, 1), + .palette = gMonPalette_Applin, + .shinyPalette = gMonShinyPalette_Applin, + .iconSprite = gMonIcon_Applin, + .iconPalIndex = 1, FOOTPRINT(Applin) - LEARNSETS(Applin), + .levelUpLearnset = sApplinLevelUpLearnset, + .teachableLearnset = sApplinTeachableLearnset, .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}, @@ -1908,7 +2098,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_FLAPPLE, .categoryName = _("Apple Wing"), FOOTPRINT(Flapple) - LEARNSETS(Flapple), + .levelUpLearnset = sFlappleLevelUpLearnset, + .teachableLearnset = sFlappleTeachableLearnset, .formSpeciesIdTable = sFlappleFormSpeciesIdTable, .formChangeTable = sFlappleFormChangeTable, .height = 3, @@ -1921,16 +2112,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Flapple, 56, 48), + .frontPic = gMonFrontPic_Flapple, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Flapple, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, - BACK_PIC(Flapple, 48, 56), + .backPic = gMonBackPic_Flapple, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Flapple), - ICON(Flapple, 1), + .palette = gMonPalette_Flapple, + .shinyPalette = gMonShinyPalette_Flapple, + .iconSprite = gMonIcon_Flapple, + .iconPalIndex = 1, }, #if P_GIGANTAMAX_FORMS @@ -1958,7 +2153,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_FLAPPLE, .categoryName = _("Apple Wing"), FOOTPRINT(Flapple) - LEARNSETS(Flapple), + .levelUpLearnset = sFlappleLevelUpLearnset, + .teachableLearnset = sFlappleTeachableLearnset, .formSpeciesIdTable = sFlappleFormSpeciesIdTable, .formChangeTable = sFlappleFormChangeTable, .height = 240, @@ -1972,15 +2168,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(FlappleGigantamax, 64, 64), + .frontPic = gMonFrontPic_FlappleGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_FlappleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(FlappleGigantamax, 64, 64), + .backPic = gMonBackPic_FlappleGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(FlappleGigantamax), - ICON(FlappleGigantamax, 1), + .palette = gMonPalette_FlappleGigantamax, + .shinyPalette = gMonShinyPalette_FlappleGigantamax, + .iconSprite = gMonIcon_FlappleGigantamax, + .iconPalIndex = 1, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -2009,7 +2209,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_APPLETUN, .categoryName = _("Apple Nectar"), FOOTPRINT(Appletun) - LEARNSETS(Appletun), + .levelUpLearnset = sAppletunLevelUpLearnset, + .teachableLearnset = sAppletunTeachableLearnset, .formSpeciesIdTable = sAppletunFormSpeciesIdTable, .formChangeTable = sAppletunFormChangeTable, .height = 4, @@ -2022,15 +2223,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Appletun, 64, 56), + .frontPic = gMonFrontPic_Appletun, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Appletun, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Appletun, 64, 56), + .backPic = gMonBackPic_Appletun, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Appletun), - ICON(Appletun, 1), + .palette = gMonPalette_Appletun, + .shinyPalette = gMonShinyPalette_Appletun, + .iconSprite = gMonIcon_Appletun, + .iconPalIndex = 1, }, #if P_GIGANTAMAX_FORMS @@ -2058,7 +2263,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_APPLETUN, .categoryName = _("Apple Nectar"), FOOTPRINT(Appletun) - LEARNSETS(Appletun), + .levelUpLearnset = sAppletunLevelUpLearnset, + .teachableLearnset = sAppletunTeachableLearnset, .formSpeciesIdTable = sAppletunFormSpeciesIdTable, .formChangeTable = sAppletunFormChangeTable, .height = 240, @@ -2072,15 +2278,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(AppletunGigantamax, 64, 64), + .frontPic = gMonFrontPic_AppletunGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_AppletunGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AppletunGigantamax, 64, 64), + .backPic = gMonBackPic_AppletunGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(AppletunGigantamax), - ICON(AppletunGigantamax, 1), + .palette = gMonPalette_AppletunGigantamax, + .shinyPalette = gMonShinyPalette_AppletunGigantamax, + .iconSprite = gMonIcon_AppletunGigantamax, + .iconPalIndex = 1, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -2119,17 +2329,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dipplin, 64, 64), + .frontPic = gMonFrontPic_Dipplin, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Dipplin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dipplin, 64, 64), + .backPic = gMonBackPic_Dipplin, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dipplin), - ICON(Dipplin, 1), + .palette = gMonPalette_Dipplin, + .shinyPalette = gMonShinyPalette_Dipplin, + .iconSprite = gMonIcon_Dipplin, + .iconPalIndex = 1, //FOOTPRINT(Dipplin) - LEARNSETS(Dipplin), + .levelUpLearnset = sDipplinLevelUpLearnset, + .teachableLearnset = sDipplinTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_CHEER, SPECIES_HYDRAPPLE}), }, @@ -2167,17 +2382,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Hydrapple, 64, 64), + .frontPic = gMonFrontPic_Hydrapple, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Hydrapple, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Hydrapple, 64, 64), + .backPic = gMonBackPic_Hydrapple, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_NONE, - PALETTES(Hydrapple), - ICON(Hydrapple, 1), + .palette = gMonPalette_Hydrapple, + .shinyPalette = gMonShinyPalette_Hydrapple, + .iconSprite = gMonIcon_Hydrapple, + .iconPalIndex = 1, //FOOTPRINT(Hydrapple) - LEARNSETS(Hydrapple), + .levelUpLearnset = sHydrappleLevelUpLearnset, + .teachableLearnset = sHydrappleTeachableLearnset, }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -2216,17 +2436,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Silicobra, 40, 40), + .frontPic = gMonFrontPic_Silicobra, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Silicobra, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Silicobra, 56, 48), + .backPic = gMonBackPic_Silicobra, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Silicobra), - ICON(Silicobra, 1), + .palette = gMonPalette_Silicobra, + .shinyPalette = gMonShinyPalette_Silicobra, + .iconSprite = gMonIcon_Silicobra, + .iconPalIndex = 1, FOOTPRINT(Silicobra) - LEARNSETS(Silicobra), + .levelUpLearnset = sSilicobraLevelUpLearnset, + .teachableLearnset = sSilicobraTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SANDACONDA}), }, @@ -2254,7 +2479,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_SANDACONDA, .categoryName = _("Sand Snake"), FOOTPRINT(Sandaconda) - LEARNSETS(Sandaconda), + .levelUpLearnset = sSandacondaLevelUpLearnset, + .teachableLearnset = sSandacondaTeachableLearnset, .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, .formChangeTable = sSandacondaFormChangeTable, .height = 38, @@ -2268,15 +2494,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 610, .trainerOffset = 17, - FRONT_PIC(Sandaconda, 64, 40), + .frontPic = gMonFrontPic_Sandaconda, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Sandaconda, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sandaconda, 64, 40), + .backPic = gMonBackPic_Sandaconda, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sandaconda), - ICON(Sandaconda, 1), + .palette = gMonPalette_Sandaconda, + .shinyPalette = gMonShinyPalette_Sandaconda, + .iconSprite = gMonIcon_Sandaconda, + .iconPalIndex = 1, }, #if P_GIGANTAMAX_FORMS @@ -2304,7 +2534,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_SANDACONDA, .categoryName = _("Sand Snake"), FOOTPRINT(Sandaconda) - LEARNSETS(Sandaconda), + .levelUpLearnset = sSandacondaLevelUpLearnset, + .teachableLearnset = sSandacondaTeachableLearnset, .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, .formChangeTable = sSandacondaFormChangeTable, .height = 220, @@ -2318,15 +2549,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 610, .trainerOffset = 17, - FRONT_PIC(SandacondaGigantamax, 64, 64), + .frontPic = gMonFrontPic_SandacondaGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_SandacondaGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SandacondaGigantamax, 64, 64), + .backPic = gMonBackPic_SandacondaGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SandacondaGigantamax), - ICON(SandacondaGigantamax, 1), + .palette = gMonPalette_SandacondaGigantamax, + .shinyPalette = gMonShinyPalette_SandacondaGigantamax, + .iconSprite = gMonIcon_SandacondaGigantamax, + .iconPalIndex = 1, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -2363,22 +2598,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 257, .trainerOffset = 0, FOOTPRINT(Cramorant) - LEARNSETS(Cramorant), + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "It's so strong that it can knock out some\n" "opponents in a single hit, but it also may\n" "forget what it's battling midfight."), - FRONT_PIC(Cramorant, 64, 64), + .frontPic = gMonFrontPic_Cramorant, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cramorant, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cramorant, 56, 64), + .backPic = gMonBackPic_Cramorant, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cramorant), - ICON(Cramorant, 0), + .palette = gMonPalette_Cramorant, + .shinyPalette = gMonShinyPalette_Cramorant, + .iconSprite = gMonIcon_Cramorant, + .iconPalIndex = 0, }, [SPECIES_CRAMORANT_GULPING] = @@ -2411,7 +2651,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 257, .trainerOffset = 0, FOOTPRINT(Cramorant) - LEARNSETS(Cramorant), + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( @@ -2419,15 +2660,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "to swallow an Arrokuda whole, which\n" "in turn led to Cramorant getting an\n" "Arrokuda stuck in its throat."), - FRONT_PIC(CramorantGulping, 64, 64), + .frontPic = gMonFrontPic_CramorantGulping, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cramorant, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CramorantGulping, 64, 64), + .backPic = gMonBackPic_CramorantGulping, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CramorantGulping), - ICON(CramorantGulping, 0), + .palette = gMonPalette_CramorantGulping, + .shinyPalette = gMonShinyPalette_CramorantGulping, + .iconSprite = gMonIcon_CramorantGulping, + .iconPalIndex = 0, }, [SPECIES_CRAMORANT_GORGING] = @@ -2460,7 +2705,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 257, .trainerOffset = 0, FOOTPRINT(Cramorant) - LEARNSETS(Cramorant), + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, .formSpeciesIdTable = sCramorantFormSpeciesIdTable, .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( @@ -2468,15 +2714,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "gotten a Pikachu lodged in its gullet.\n" "Cramorant is choking a little, but it\n" "isn't really bothered."), - FRONT_PIC(CramorantGorging, 64, 64), + .frontPic = gMonFrontPic_CramorantGorging, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cramorant, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CramorantGorging, 64, 64), + .backPic = gMonBackPic_CramorantGorging, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CramorantGorging), - ICON(CramorantGorging, 0), + .palette = gMonPalette_CramorantGorging, + .shinyPalette = gMonShinyPalette_CramorantGorging, + .iconSprite = gMonIcon_CramorantGorging, + .iconPalIndex = 0, }, #endif //P_FAMILY_CRAMORANT @@ -2515,17 +2765,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Arrokuda, 56, 32), + .frontPic = gMonFrontPic_Arrokuda, + .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Arrokuda, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Arrokuda, 48, 40), + .backPic = gMonBackPic_Arrokuda, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Arrokuda), - ICON(Arrokuda, 2), + .palette = gMonPalette_Arrokuda, + .shinyPalette = gMonShinyPalette_Arrokuda, + .iconSprite = gMonIcon_Arrokuda, + .iconPalIndex = 2, FOOTPRINT(Arrokuda) - LEARNSETS(Arrokuda), + .levelUpLearnset = sArrokudaLevelUpLearnset, + .teachableLearnset = sArrokudaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_BARRASKEWDA}), }, @@ -2563,17 +2818,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Barraskewda, 56, 48), + .frontPic = gMonFrontPic_Barraskewda, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Barraskewda, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Barraskewda, 64, 48), + .backPic = gMonBackPic_Barraskewda, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Barraskewda), - ICON(Barraskewda, 2), + .palette = gMonPalette_Barraskewda, + .shinyPalette = gMonShinyPalette_Barraskewda, + .iconSprite = gMonIcon_Barraskewda, + .iconPalIndex = 2, FOOTPRINT(Barraskewda) - LEARNSETS(Barraskewda), + .levelUpLearnset = sBarraskewdaLevelUpLearnset, + .teachableLearnset = sBarraskewdaTeachableLearnset, }, #endif //P_FAMILY_ARROKUDA @@ -2612,17 +2872,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toxel, 40, 48), + .frontPic = gMonFrontPic_Toxel, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Toxel, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Toxel, 48, 56), + .backPic = gMonBackPic_Toxel, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Toxel), - ICON(Toxel, 2), + .palette = gMonPalette_Toxel, + .shinyPalette = gMonShinyPalette_Toxel, + .iconSprite = gMonIcon_Toxel, + .iconPalIndex = 2, FOOTPRINT(Toxel) - LEARNSETS(Toxel), + .levelUpLearnset = sToxelLevelUpLearnset, + .teachableLearnset = sToxelTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_NATURE_AMPED, 30, SPECIES_TOXTRICITY_AMPED}, {EVO_LEVEL_NATURE_LOW_KEY, 30, SPECIES_TOXTRICITY_LOW_KEY}), }, @@ -2663,17 +2928,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(ToxtricityAmped, 48, 64), + .frontPic = gMonFrontPic_ToxtricityAmped, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Toxtricity, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ToxtricityAmped, 56, 64), + .backPic = gMonBackPic_ToxtricityAmped, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ToxtricityAmped), - ICON(ToxtricityAmped, 2), + .palette = gMonPalette_ToxtricityAmped, + .shinyPalette = gMonShinyPalette_ToxtricityAmped, + .iconSprite = gMonIcon_ToxtricityAmped, + .iconPalIndex = 2, FOOTPRINT(Toxtricity) - LEARNSETS(ToxtricityAmped), + .levelUpLearnset = sToxtricityAmpedLevelUpLearnset, + .teachableLearnset = sToxtricityAmpedTeachableLearnset, }, @@ -2710,17 +2980,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(ToxtricityGigantamax, 64, 64), + .frontPic = gMonFrontPic_ToxtricityGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ToxtricityGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ToxtricityGigantamax, 64, 64), + .backPic = gMonBackPic_ToxtricityGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ToxtricityGigantamax), - ICON(ToxtricityGigantamax, 0), + .palette = gMonPalette_ToxtricityGigantamax, + .shinyPalette = gMonShinyPalette_ToxtricityGigantamax, + .iconSprite = gMonIcon_ToxtricityGigantamax, + .iconPalIndex = 0, FOOTPRINT(Toxtricity) - LEARNSETS(ToxtricityAmped), + .levelUpLearnset = sToxtricityAmpedLevelUpLearnset, + .teachableLearnset = sToxtricityAmpedTeachableLearnset, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -2760,17 +3035,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(ToxtricityLowKey, 48, 64), + .frontPic = gMonFrontPic_ToxtricityLowKey, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Toxtricity, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ToxtricityLowKey, 48, 64), + .backPic = gMonBackPic_ToxtricityLowKey, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ToxtricityLowKey), - ICON(ToxtricityLowKey, 2), + .palette = gMonPalette_ToxtricityLowKey, + .shinyPalette = gMonShinyPalette_ToxtricityLowKey, + .iconSprite = gMonIcon_ToxtricityLowKey, + .iconPalIndex = 2, FOOTPRINT(Toxtricity) - LEARNSETS(ToxtricityLowKey), + .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, + .teachableLearnset = sToxtricityLowKeyTeachableLearnset, }, #if P_GIGANTAMAX_FORMS @@ -2806,17 +3086,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(ToxtricityGigantamax, 64, 64), + .frontPic = gMonFrontPic_ToxtricityGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_ToxtricityGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ToxtricityGigantamax, 64, 64), + .backPic = gMonBackPic_ToxtricityGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ToxtricityGigantamax), - ICON(ToxtricityGigantamax, 0), + .palette = gMonPalette_ToxtricityGigantamax, + .shinyPalette = gMonShinyPalette_ToxtricityGigantamax, + .iconSprite = gMonIcon_ToxtricityGigantamax, + .iconPalIndex = 0, FOOTPRINT(Toxtricity) - LEARNSETS(ToxtricityLowKey), + .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, + .teachableLearnset = sToxtricityLowKeyTeachableLearnset, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -2856,17 +3141,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sizzlipede, 48, 32), + .frontPic = gMonFrontPic_Sizzlipede, + .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sizzlipede, .frontAnimId = ANIM_H_VIBRATE, - BACK_PIC(Sizzlipede, 40, 32), + .backPic = gMonBackPic_Sizzlipede, + .backPicSize = MON_COORDS_SIZE(40, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sizzlipede), - ICON(Sizzlipede, 0), + .palette = gMonPalette_Sizzlipede, + .shinyPalette = gMonShinyPalette_Sizzlipede, + .iconSprite = gMonIcon_Sizzlipede, + .iconPalIndex = 0, FOOTPRINT(Sizzlipede) - LEARNSETS(Sizzlipede), + .levelUpLearnset = sSizzlipedeLevelUpLearnset, + .teachableLearnset = sSizzlipedeTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_CENTISKORCH}), }, @@ -2894,7 +3184,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CENTISKORCH, .categoryName = _("Radiator"), FOOTPRINT(Centiskorch) - LEARNSETS(Centiskorch), + .levelUpLearnset = sCentiskorchLevelUpLearnset, + .teachableLearnset = sCentiskorchTeachableLearnset, .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, .formChangeTable = sCentiskorchFormChangeTable, .height = 30, @@ -2908,15 +3199,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Centiskorch, 64, 56), + .frontPic = gMonFrontPic_Centiskorch, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Centiskorch, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Centiskorch, 56, 64), + .backPic = gMonBackPic_Centiskorch, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Centiskorch), - ICON(Centiskorch, 0), + .palette = gMonPalette_Centiskorch, + .shinyPalette = gMonShinyPalette_Centiskorch, + .iconSprite = gMonIcon_Centiskorch, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -2944,7 +3239,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_CENTISKORCH, .categoryName = _("Radiator"), FOOTPRINT(Centiskorch) - LEARNSETS(Centiskorch), + .levelUpLearnset = sCentiskorchLevelUpLearnset, + .teachableLearnset = sCentiskorchTeachableLearnset, .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, .formChangeTable = sCentiskorchFormChangeTable, .height = 750, @@ -2958,15 +3254,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CentiskorchGigantamax, 64, 64), + .frontPic = gMonFrontPic_CentiskorchGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_CentiskorchGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CentiskorchGigantamax, 64, 64), + .backPic = gMonBackPic_CentiskorchGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CentiskorchGigantamax), - ICON(CentiskorchGigantamax, 0), + .palette = gMonPalette_CentiskorchGigantamax, + .shinyPalette = gMonShinyPalette_CentiskorchGigantamax, + .iconSprite = gMonIcon_CentiskorchGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -3007,17 +3307,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Clobbopus, 48, 40), + .frontPic = gMonFrontPic_Clobbopus, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Clobbopus, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Clobbopus, 64, 40), + .backPic = gMonBackPic_Clobbopus, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Clobbopus), - ICON(Clobbopus, 0), + .palette = gMonPalette_Clobbopus, + .shinyPalette = gMonShinyPalette_Clobbopus, + .iconSprite = gMonIcon_Clobbopus, + .iconPalIndex = 0, FOOTPRINT(Clobbopus) - LEARNSETS(Clobbopus), + .levelUpLearnset = sClobbopusLevelUpLearnset, + .teachableLearnset = sClobbopusTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT}), }, @@ -3054,17 +3359,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - FRONT_PIC(Grapploct, 48, 56), + .frontPic = gMonFrontPic_Grapploct, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Grapploct, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Grapploct, 56, 56), + .backPic = gMonBackPic_Grapploct, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Grapploct), - ICON(Grapploct, 2), + .palette = gMonPalette_Grapploct, + .shinyPalette = gMonShinyPalette_Grapploct, + .iconSprite = gMonIcon_Grapploct, + .iconPalIndex = 2, FOOTPRINT(Grapploct) - LEARNSETS(Grapploct), + .levelUpLearnset = sGrapploctLevelUpLearnset, + .teachableLearnset = sGrapploctTeachableLearnset, }, #endif //P_FAMILY_CLOBBOPUS @@ -3098,17 +3408,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sinistea, 40, 32), + .frontPic = gMonFrontPic_Sinistea, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sinistea, 48, 32), + .backPic = gMonBackPic_Sinistea, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistea), - ICON(Sinistea, 2), + .palette = gMonPalette_Sinistea, + .shinyPalette = gMonShinyPalette_Sinistea, + .iconSprite = gMonIcon_Sinistea, + .iconPalIndex = 2, FOOTPRINT(Sinistea) - LEARNSETS(Sinistea), + .levelUpLearnset = sSinisteaLevelUpLearnset, + .teachableLearnset = sSinisteaTeachableLearnset, .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "This Pokémon is said to have been born\n" @@ -3147,17 +3462,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sinistea, 40, 32), + .frontPic = gMonFrontPic_Sinistea, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sinistea, 48, 32), + .backPic = gMonBackPic_Sinistea, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistea), - ICON(Sinistea, 2), + .palette = gMonPalette_Sinistea, + .shinyPalette = gMonShinyPalette_Sinistea, + .iconSprite = gMonIcon_Sinistea, + .iconPalIndex = 2, FOOTPRINT(Sinistea) - LEARNSETS(Sinistea), + .levelUpLearnset = sSinisteaLevelUpLearnset, + .teachableLearnset = sSinisteaTeachableLearnset, .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, .description = COMPOUND_STRING( "The swirl pattern in this Pokémon's\n" @@ -3197,17 +3517,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Polteageist, 48, 48), + .frontPic = gMonFrontPic_Polteageist, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Polteageist, 64, 40), + .backPic = gMonBackPic_Polteageist, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Polteageist), - ICON(Polteageist, 2), + .palette = gMonPalette_Polteageist, + .shinyPalette = gMonShinyPalette_Polteageist, + .iconSprite = gMonIcon_Polteageist, + .iconPalIndex = 2, FOOTPRINT(Polteageist) - LEARNSETS(Polteageist), + .levelUpLearnset = sPolteageistLevelUpLearnset, + .teachableLearnset = sPolteageistTeachableLearnset, .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "This species lives in antique teapots.\n" @@ -3245,17 +3570,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Polteageist, 48, 48), + .frontPic = gMonFrontPic_Polteageist, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Polteageist, 64, 40), + .backPic = gMonBackPic_Polteageist, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Polteageist), - ICON(Polteageist, 2), + .palette = gMonPalette_Polteageist, + .shinyPalette = gMonShinyPalette_Polteageist, + .iconSprite = gMonIcon_Polteageist, + .iconPalIndex = 2, FOOTPRINT(Polteageist) - LEARNSETS(Polteageist), + .levelUpLearnset = sPolteageistLevelUpLearnset, + .teachableLearnset = sPolteageistTeachableLearnset, .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, .description = COMPOUND_STRING( "Trainers Polteageist trusts will be\n" @@ -3301,17 +3631,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Hatenna, 48, 48), + .frontPic = gMonFrontPic_Hatenna, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Hatenna, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Hatenna, 40, 40), + .backPic = gMonBackPic_Hatenna, + .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Hatenna), - ICON(Hatenna, 0), + .palette = gMonPalette_Hatenna, + .shinyPalette = gMonShinyPalette_Hatenna, + .iconSprite = gMonIcon_Hatenna, + .iconPalIndex = 0, FOOTPRINT(Hatenna) - LEARNSETS(Hatenna), + .levelUpLearnset = sHatennaLevelUpLearnset, + .teachableLearnset = sHatennaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_HATTREM}), }, @@ -3348,17 +3683,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Hattrem, 56, 48), + .frontPic = gMonFrontPic_Hattrem, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Hattrem, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Hattrem, 56, 48), + .backPic = gMonBackPic_Hattrem, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Hattrem), - ICON(Hattrem, 0), + .palette = gMonPalette_Hattrem, + .shinyPalette = gMonShinyPalette_Hattrem, + .iconSprite = gMonIcon_Hattrem, + .iconPalIndex = 0, FOOTPRINT(Hattrem) - LEARNSETS(Hattrem), + .levelUpLearnset = sHattremLevelUpLearnset, + .teachableLearnset = sHattremTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_HATTERENE}), }, @@ -3386,7 +3726,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_HATTERENE, .categoryName = _("Silent"), FOOTPRINT(Hatterene) - LEARNSETS(Hatterene), + .levelUpLearnset = sHattereneLevelUpLearnset, + .teachableLearnset = sHattereneTeachableLearnset, .formSpeciesIdTable = sHattereneFormSpeciesIdTable, .formChangeTable = sHattereneFormChangeTable, .height = 21, @@ -3399,15 +3740,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Hatterene, 48, 64), + .frontPic = gMonFrontPic_Hatterene, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Hatterene, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Hatterene, 56, 64), + .backPic = gMonBackPic_Hatterene, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Hatterene), - ICON(Hatterene, 0), + .palette = gMonPalette_Hatterene, + .shinyPalette = gMonShinyPalette_Hatterene, + .iconSprite = gMonIcon_Hatterene, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -3435,7 +3780,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_HATTERENE, .categoryName = _("Silent"), FOOTPRINT(Hatterene) - LEARNSETS(Hatterene), + .levelUpLearnset = sHattereneLevelUpLearnset, + .teachableLearnset = sHattereneTeachableLearnset, .formSpeciesIdTable = sHattereneFormSpeciesIdTable, .formChangeTable = sHattereneFormChangeTable, .height = 260, @@ -3449,15 +3795,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(HattereneGigantamax, 64, 64), + .frontPic = gMonFrontPic_HattereneGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_HattereneGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(HattereneGigantamax, 64, 64), + .backPic = gMonBackPic_HattereneGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(HattereneGigantamax), - ICON(HattereneGigantamax, 0), + .palette = gMonPalette_HattereneGigantamax, + .shinyPalette = gMonShinyPalette_HattereneGigantamax, + .iconSprite = gMonIcon_HattereneGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -3498,17 +3848,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Impidimp, 48, 40), + .frontPic = gMonFrontPic_Impidimp, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Impidimp, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Impidimp, 48, 40), + .backPic = gMonBackPic_Impidimp, + .backPicSize = MON_COORDS_SIZE(48, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Impidimp), - ICON(Impidimp, 0), + .palette = gMonPalette_Impidimp, + .shinyPalette = gMonShinyPalette_Impidimp, + .iconSprite = gMonIcon_Impidimp, + .iconPalIndex = 0, FOOTPRINT(Impidimp) - LEARNSETS(Impidimp), + .levelUpLearnset = sImpidimpLevelUpLearnset, + .teachableLearnset = sImpidimpTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 32, SPECIES_MORGREM}), }, @@ -3546,17 +3901,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - FRONT_PIC(Morgrem, 48, 56), + .frontPic = gMonFrontPic_Morgrem, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Morgrem, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Morgrem, 56, 48), + .backPic = gMonBackPic_Morgrem, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Morgrem), - ICON(Morgrem, 0), + .palette = gMonPalette_Morgrem, + .shinyPalette = gMonShinyPalette_Morgrem, + .iconSprite = gMonIcon_Morgrem, + .iconPalIndex = 0, FOOTPRINT(Morgrem) - LEARNSETS(Morgrem), + .levelUpLearnset = sMorgremLevelUpLearnset, + .teachableLearnset = sMorgremTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GRIMMSNARL}), }, @@ -3585,7 +3945,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_GRIMMSNARL, .categoryName = _("Bulk Up"), FOOTPRINT(Grimmsnarl) - LEARNSETS(Grimmsnarl), + .levelUpLearnset = sGrimmsnarlLevelUpLearnset, + .teachableLearnset = sGrimmsnarlTeachableLearnset, .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, .formChangeTable = sGrimmsnarlFormChangeTable, .height = 15, @@ -3598,15 +3959,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(Grimmsnarl, 64, 64), + .frontPic = gMonFrontPic_Grimmsnarl, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Grimmsnarl, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Grimmsnarl, 64, 48), + .backPic = gMonBackPic_Grimmsnarl, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Grimmsnarl), - ICON(Grimmsnarl, 0), + .palette = gMonPalette_Grimmsnarl, + .shinyPalette = gMonShinyPalette_Grimmsnarl, + .iconSprite = gMonIcon_Grimmsnarl, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -3634,7 +3999,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_GRIMMSNARL, .categoryName = _("Bulk Up"), FOOTPRINT(Grimmsnarl) - LEARNSETS(Grimmsnarl), + .levelUpLearnset = sGrimmsnarlLevelUpLearnset, + .teachableLearnset = sGrimmsnarlTeachableLearnset, .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, .formChangeTable = sGrimmsnarlFormChangeTable, .height = 320, @@ -3648,15 +4014,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FRONT_PIC(GrimmsnarlGigantamax, 64, 64), + .frontPic = gMonFrontPic_GrimmsnarlGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_GrimmsnarlGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GrimmsnarlGigantamax, 64, 64), + .backPic = gMonBackPic_GrimmsnarlGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GrimmsnarlGigantamax), - ICON(GrimmsnarlGigantamax, 0), + .palette = gMonPalette_GrimmsnarlGigantamax, + .shinyPalette = gMonShinyPalette_GrimmsnarlGigantamax, + .iconSprite = gMonIcon_GrimmsnarlGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -3696,18 +4066,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Milcery, 40, 40), + .frontPic = gMonFrontPic_Milcery, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Milcery, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Milcery, 56, 48), + .backPic = gMonBackPic_Milcery, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Milcery), - ICON(Milcery, 1), + .palette = gMonPalette_Milcery, + .shinyPalette = gMonShinyPalette_Milcery, + .iconSprite = gMonIcon_Milcery, + .iconPalIndex = 1, FOOTPRINT(Milcery) - LEARNSETS(Milcery), + .levelUpLearnset = sMilceryLevelUpLearnset, + .teachableLearnset = sMilceryTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM}, {EVO_LEVEL, 0, SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM}, @@ -3738,34 +4113,38 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_SWEET_VEIL, ABILITY_NONE, ABILITY_AROMA_VEIL }, \ .bodyColor = color -#define ALCREMIE_REGULAR_SPECIES_INFO(sweet, cream, color) \ - { \ - ALCREMIE_MISC_INFO(color), \ - .speciesName = _("Alcremie"), \ - .cryId = CRY_ALCREMIE, \ - .natDexNum = NATIONAL_DEX_ALCREMIE, \ - .categoryName = _("Cream"), \ - .height = 3, \ - .weight = 5, \ - .description = gAlcremie ##cream##PokedexText, \ - .pokemonScale = 530, \ - .pokemonOffset = 13, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - FRONT_PIC(Alcremie ##sweet, 40, 56), \ - .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Alcremie, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - BACK_PIC(Alcremie ##sweet, 48, 56), \ - .backPicYOffset = 9, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - .palette = gMonPalette_Alcremie ##sweet##cream, \ - .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ - ICON(AlcremieStrawberryVanillaCream, 1),/*AlcremieStrawberry##cream##*/ \ - FOOTPRINT(Alcremie) \ - LEARNSETS(Alcremie), \ - .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, \ - .formChangeTable = sAlcremieFormChangeTable, \ +#define ALCREMIE_REGULAR_SPECIES_INFO(sweet, cream, color) \ + { \ + ALCREMIE_MISC_INFO(color), \ + .speciesName = _("Alcremie"), \ + .cryId = CRY_ALCREMIE, \ + .natDexNum = NATIONAL_DEX_ALCREMIE, \ + .categoryName = _("Cream"), \ + .height = 3, \ + .weight = 5, \ + .description = gAlcremie ##cream##PokedexText, \ + .pokemonScale = 530, \ + .pokemonOffset = 13, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPic = gMonFrontPic_Alcremie ##sweet, \ + .frontPicSize = MON_COORDS_SIZE(40, 56), \ + .frontPicYOffset = 7, \ + .frontAnimFrames = sAnims_Alcremie, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backPic = gMonBackPic_Alcremie ##sweet, \ + .backPicSize = MON_COORDS_SIZE(48, 56), \ + .backPicYOffset = 9, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + .palette = gMonPalette_Alcremie ##sweet##cream, \ + .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ + .iconSprite = gMonIcon_AlcremieStrawberryVanillaCream, /*AlcremieStrawberry##cream##*/ \ + .iconPalIndex = 1, \ + FOOTPRINT(Alcremie) \ + .levelUpLearnset = sAlcremieLevelUpLearnset, \ + .teachableLearnset = sAlcremieTeachableLearnset, \ + .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, \ + .formChangeTable = sAlcremieFormChangeTable, \ } [SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = ALCREMIE_REGULAR_SPECIES_INFO(Strawberry, VanillaCream, BODY_COLOR_WHITE), @@ -3851,17 +4230,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(AlcremieGigantamax, 64, 64), + .frontPic = gMonFrontPic_AlcremieGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_AlcremieGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(AlcremieGigantamax, 64, 64), + .backPic = gMonBackPic_AlcremieGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(AlcremieGigantamax), - ICON(AlcremieGigantamax, 1), + .palette = gMonPalette_AlcremieGigantamax, + .shinyPalette = gMonShinyPalette_AlcremieGigantamax, + .iconSprite = gMonIcon_AlcremieGigantamax, + .iconPalIndex = 1, FOOTPRINT(Alcremie) - LEARNSETS(Alcremie), + .levelUpLearnset = sAlcremieLevelUpLearnset, + .teachableLearnset = sAlcremieTeachableLearnset, .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, .formChangeTable = sAlcremieFormChangeTable, }, @@ -3902,17 +4286,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Falinks, 56, 48), + .frontPic = gMonFrontPic_Falinks, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Falinks, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Falinks, 64, 40), + .backPic = gMonBackPic_Falinks, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Falinks), - ICON(Falinks, 0), + .palette = gMonPalette_Falinks, + .shinyPalette = gMonShinyPalette_Falinks, + .iconSprite = gMonIcon_Falinks, + .iconPalIndex = 0, FOOTPRINT(Falinks) - LEARNSETS(Falinks), + .levelUpLearnset = sFalinksLevelUpLearnset, + .teachableLearnset = sFalinksTeachableLearnset, }, #endif //P_FAMILY_FALINKS @@ -3950,17 +4339,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pincurchin, 40, 40), + .frontPic = gMonFrontPic_Pincurchin, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Pincurchin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pincurchin, 56, 40), + .backPic = gMonBackPic_Pincurchin, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pincurchin), - ICON(Pincurchin, 0), + .palette = gMonPalette_Pincurchin, + .shinyPalette = gMonShinyPalette_Pincurchin, + .iconSprite = gMonIcon_Pincurchin, + .iconPalIndex = 0, FOOTPRINT(Pincurchin) - LEARNSETS(Pincurchin), + .levelUpLearnset = sPincurchinLevelUpLearnset, + .teachableLearnset = sPincurchinTeachableLearnset, }, #endif //P_FAMILY_PINCURCHIN @@ -4000,17 +4394,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Snom, 40, 32), + .frontPic = gMonFrontPic_Snom, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 20, .frontAnimFrames = sAnims_Snom, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Snom, 48, 32), + .backPic = gMonBackPic_Snom, + .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Snom), - ICON(Snom, 0), + .palette = gMonPalette_Snom, + .shinyPalette = gMonShinyPalette_Snom, + .iconSprite = gMonIcon_Snom, + .iconPalIndex = 0, FOOTPRINT(Snom) - LEARNSETS(Snom), + .levelUpLearnset = sSnomLevelUpLearnset, + .teachableLearnset = sSnomTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH}), }, @@ -4048,18 +4447,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Frosmoth, 64, 56), + .frontPic = gMonFrontPic_Frosmoth, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Frosmoth, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(Frosmoth, 64, 64), + .backPic = gMonBackPic_Frosmoth, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Frosmoth), - ICON(Frosmoth, 0), + .palette = gMonPalette_Frosmoth, + .shinyPalette = gMonShinyPalette_Frosmoth, + .iconSprite = gMonIcon_Frosmoth, + .iconPalIndex = 0, FOOTPRINT(Frosmoth) - LEARNSETS(Frosmoth), + .levelUpLearnset = sFrosmothLevelUpLearnset, + .teachableLearnset = sFrosmothTeachableLearnset, }, #endif //P_FAMILY_SNOM @@ -4098,17 +4502,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - FRONT_PIC(Stonjourner, 48, 64), + .frontPic = gMonFrontPic_Stonjourner, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Stonjourner, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Stonjourner, 64, 56), + .backPic = gMonBackPic_Stonjourner, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Stonjourner), - ICON(Stonjourner, 2), + .palette = gMonPalette_Stonjourner, + .shinyPalette = gMonShinyPalette_Stonjourner, + .iconSprite = gMonIcon_Stonjourner, + .iconPalIndex = 2, FOOTPRINT(Stonjourner) - LEARNSETS(Stonjourner), + .levelUpLearnset = sStonjournerLevelUpLearnset, + .teachableLearnset = sStonjournerTeachableLearnset, }, #endif //P_FAMILY_STONJOURNER @@ -4136,7 +4545,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 262, .trainerOffset = 0, FOOTPRINT(Eiscue) - LEARNSETS(Eiscue), + .levelUpLearnset = sEiscueLevelUpLearnset, + .teachableLearnset = sEiscueTeachableLearnset, .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, @@ -4151,15 +4561,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "from a frigid place. It keeps its head\n" "iced constantly to make sure it stays\n" "nice and cold."), - FRONT_PIC(EiscueIceFace, 40, 64), + .frontPic = gMonFrontPic_EiscueIceFace, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Eiscue, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(EiscueIceFace, 48, 64), + .backPic = gMonBackPic_EiscueIceFace, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EiscueIceFace), - ICON(EiscueIceFace, 0), + .palette = gMonPalette_EiscueIceFace, + .shinyPalette = gMonShinyPalette_EiscueIceFace, + .iconSprite = gMonIcon_EiscueIceFace, + .iconPalIndex = 0, }, [SPECIES_EISCUE_NOICE_FACE] = @@ -4185,7 +4599,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 262, .trainerOffset = 0, FOOTPRINT(Eiscue) - LEARNSETS(Eiscue), + .levelUpLearnset = sEiscueLevelUpLearnset, + .teachableLearnset = sEiscueTeachableLearnset, .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, .baseHP = 75, @@ -4200,15 +4615,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "the surface of its brain. When this\n" "Pokémon has something on its mind,\n" "its hair chills the air around it."), - FRONT_PIC(EiscueNoiceFace, 40, 64), + .frontPic = gMonFrontPic_EiscueNoiceFace, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Eiscue, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(EiscueNoiceFace, 40, 64), + .backPic = gMonBackPic_EiscueNoiceFace, + .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EiscueNoiceFace), - ICON(EiscueNoiceFace, 0), + .palette = gMonPalette_EiscueNoiceFace, + .shinyPalette = gMonShinyPalette_EiscueNoiceFace, + .iconSprite = gMonIcon_EiscueNoiceFace, + .iconPalIndex = 0, }, #endif //P_FAMILY_EISCUE @@ -4249,16 +4668,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "emotions of others. Males will act as\n" "valets for those they serve, looking\n" "after their every need."), - FRONT_PIC(IndeedeeMale, 40, 56), + .frontPic = gMonFrontPic_IndeedeeMale, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Indeedee, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IndeedeeMale, 56, 56), + .backPic = gMonBackPic_IndeedeeMale, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IndeedeeMale), - ICON(IndeedeeMale, 2), - LEARNSETS(IndeedeeMale), + .palette = gMonPalette_IndeedeeMale, + .shinyPalette = gMonShinyPalette_IndeedeeMale, + .iconSprite = gMonIcon_IndeedeeMale, + .iconPalIndex = 2, + .levelUpLearnset = sIndeedeeMaleLevelUpLearnset, + .teachableLearnset = sIndeedeeMaleTeachableLearnset, }, [SPECIES_INDEEDEE_FEMALE] = @@ -4297,16 +4721,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "Pokémon so they can gather feelings\n" "of gratitude. The females are\n" "particularly good at babysitting."), - FRONT_PIC(IndeedeeFemale, 40, 48), + .frontPic = gMonFrontPic_IndeedeeFemale, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Indeedee, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IndeedeeFemale, 64, 56), + .backPic = gMonBackPic_IndeedeeFemale, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IndeedeeFemale), - ICON(IndeedeeFemale, 2), - LEARNSETS(IndeedeeFemale), + .palette = gMonPalette_IndeedeeFemale, + .shinyPalette = gMonShinyPalette_IndeedeeFemale, + .iconSprite = gMonIcon_IndeedeeFemale, + .iconPalIndex = 2, + .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, + .teachableLearnset = sIndeedeeFemaleTeachableLearnset, }, #endif //P_FAMILY_INDEEDEE @@ -4340,7 +4769,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Morpeko) - LEARNSETS(Morpeko), + .levelUpLearnset = sMorpekoLevelUpLearnset, + .teachableLearnset = sMorpekoTeachableLearnset, .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_FULL_BELLY, @@ -4349,15 +4779,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "pocket-like pouches, this Pokémon is not\n" "just satisfying its constant hunger. It's\n" "also generating electricity."), - FRONT_PIC(MorpekoFullBelly, 32, 40), + .frontPic = gMonFrontPic_MorpekoFullBelly, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Morpeko, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MorpekoFullBelly, 48, 56), + .backPic = gMonBackPic_MorpekoFullBelly, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MorpekoFullBelly), - ICON(MorpekoFullBelly, 2), + .palette = gMonPalette_MorpekoFullBelly, + .shinyPalette = gMonShinyPalette_MorpekoFullBelly, + .iconSprite = gMonIcon_MorpekoFullBelly, + .iconPalIndex = 2, }, [SPECIES_MORPEKO_HANGRY] = @@ -4389,7 +4823,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Morpeko) - LEARNSETS(Morpeko), + .levelUpLearnset = sMorpekoLevelUpLearnset, + .teachableLearnset = sMorpekoTeachableLearnset, .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, .formChangeTable = sMorpekoFormChangeTable, .cryId = CRY_MORPEKO_HANGRY, @@ -4398,15 +4833,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "extremes of violence, and the electricity\n" "in its cheek sacs has converted into\n" "a Dark-type energy."), - FRONT_PIC(MorpekoHangry, 32, 40), + .frontPic = gMonFrontPic_MorpekoHangry, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Morpeko, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(MorpekoHangry, 48, 56), + .backPic = gMonBackPic_MorpekoHangry, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(MorpekoHangry), - ICON(MorpekoHangry, 2), + .palette = gMonPalette_MorpekoHangry, + .shinyPalette = gMonShinyPalette_MorpekoHangry, + .iconSprite = gMonIcon_MorpekoHangry, + .iconPalIndex = 2, }, #endif //P_FAMILY_MORPEKO @@ -4446,17 +4885,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cufant, 56, 48), + .frontPic = gMonFrontPic_Cufant, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Cufant, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cufant, 64, 48), + .backPic = gMonBackPic_Cufant, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cufant), - ICON(Cufant, 0), + .palette = gMonPalette_Cufant, + .shinyPalette = gMonShinyPalette_Cufant, + .iconSprite = gMonIcon_Cufant, + .iconPalIndex = 0, FOOTPRINT(Cufant) - LEARNSETS(Cufant), + .levelUpLearnset = sCufantLevelUpLearnset, + .teachableLearnset = sCufantTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COPPERAJAH}), }, @@ -4485,7 +4929,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_COPPERAJAH, .categoryName = _("Copperderm"), FOOTPRINT(Copperajah) - LEARNSETS(Copperajah), + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, .formChangeTable = sCopperajahFormChangeTable, .height = 30, @@ -4498,15 +4943,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Copperajah, 64, 56), + .frontPic = gMonFrontPic_Copperajah, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Copperajah, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Copperajah, 64, 32), + .backPic = gMonBackPic_Copperajah, + .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Copperajah), - ICON(Copperajah, 0), + .palette = gMonPalette_Copperajah, + .shinyPalette = gMonShinyPalette_Copperajah, + .iconSprite = gMonIcon_Copperajah, + .iconPalIndex = 0, }, #if P_GIGANTAMAX_FORMS @@ -4535,7 +4984,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_COPPERAJAH, .categoryName = _("Copperderm"), FOOTPRINT(Copperajah) - LEARNSETS(Copperajah), + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, .formChangeTable = sCopperajahFormChangeTable, .height = 230, @@ -4549,15 +4999,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CopperajahGigantamax, 64, 64), + .frontPic = gMonFrontPic_CopperajahGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_CopperajahGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CopperajahGigantamax, 64, 64), + .backPic = gMonBackPic_CopperajahGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CopperajahGigantamax), - ICON(CopperajahGigantamax, 0), + .palette = gMonPalette_CopperajahGigantamax, + .shinyPalette = gMonShinyPalette_CopperajahGigantamax, + .iconSprite = gMonIcon_CopperajahGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -4598,17 +5052,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Dracozolt, 64, 64), + .frontPic = gMonFrontPic_Dracozolt, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Dracozolt, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dracozolt, 64, 56), + .backPic = gMonBackPic_Dracozolt, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dracozolt), - ICON(Dracozolt, 1), + .palette = gMonPalette_Dracozolt, + .shinyPalette = gMonShinyPalette_Dracozolt, + .iconSprite = gMonIcon_Dracozolt, + .iconPalIndex = 1, FOOTPRINT(Dracozolt) - LEARNSETS(Dracozolt), + .levelUpLearnset = sDracozoltLevelUpLearnset, + .teachableLearnset = sDracozoltTeachableLearnset, }, #endif //P_FAMILY_DRACOZOLT @@ -4646,17 +5105,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 342, .trainerOffset = 7, - FRONT_PIC(Arctozolt, 56, 64), + .frontPic = gMonFrontPic_Arctozolt, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Arctozolt, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Arctozolt, 56, 48), + .backPic = gMonBackPic_Arctozolt, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Arctozolt), - ICON(Arctozolt, 2), + .palette = gMonPalette_Arctozolt, + .shinyPalette = gMonShinyPalette_Arctozolt, + .iconSprite = gMonIcon_Arctozolt, + .iconPalIndex = 2, FOOTPRINT(Arctozolt) - LEARNSETS(Arctozolt), + .levelUpLearnset = sArctozoltLevelUpLearnset, + .teachableLearnset = sArctozoltTeachableLearnset, }, #endif //P_FAMILY_ARCTOZOLT @@ -4695,17 +5159,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 342, .trainerOffset = 7, - FRONT_PIC(Dracovish, 48, 64), + .frontPic = gMonFrontPic_Dracovish, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dracovish, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dracovish, 64, 64), + .backPic = gMonBackPic_Dracovish, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dracovish), - ICON(Dracovish, 0), + .palette = gMonPalette_Dracovish, + .shinyPalette = gMonShinyPalette_Dracovish, + .iconSprite = gMonIcon_Dracovish, + .iconPalIndex = 0, FOOTPRINT(Dracovish) - LEARNSETS(Dracovish), + .levelUpLearnset = sDracovishLevelUpLearnset, + .teachableLearnset = sDracovishTeachableLearnset, }, #endif //P_FAMILY_DRACOVISH @@ -4744,17 +5213,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Arctovish, 64, 64), + .frontPic = gMonFrontPic_Arctovish, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Arctovish, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Arctovish, 64, 48), + .backPic = gMonBackPic_Arctovish, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Arctovish), - ICON(Arctovish, 0), + .palette = gMonPalette_Arctovish, + .shinyPalette = gMonShinyPalette_Arctovish, + .iconSprite = gMonIcon_Arctovish, + .iconPalIndex = 0, FOOTPRINT(Arctovish) - LEARNSETS(Arctovish), + .levelUpLearnset = sArctovishLevelUpLearnset, + .teachableLearnset = sArctovishTeachableLearnset, }, #endif //P_FAMILY_ARCTOVISH @@ -4783,7 +5257,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_DURALUDON, .categoryName = _("Alloy"), FOOTPRINT(Duraludon) - LEARNSETS(Duraludon), + .levelUpLearnset = sDuraludonLevelUpLearnset, + .teachableLearnset = sDuraludonTeachableLearnset, .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formChangeTable = sDuraludonFormChangeTable, .height = 18, @@ -4796,15 +5271,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Duraludon, 56, 64), + .frontPic = gMonFrontPic_Duraludon, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Duraludon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Duraludon, 64, 64), + .backPic = gMonBackPic_Duraludon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Duraludon), - ICON(Duraludon, 0), + .palette = gMonPalette_Duraludon, + .shinyPalette = gMonShinyPalette_Duraludon, + .iconSprite = gMonIcon_Duraludon, + .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}), }, @@ -4833,7 +5312,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_DURALUDON, .categoryName = _("Alloy"), FOOTPRINT(Duraludon) - LEARNSETS(Duraludon), + .levelUpLearnset = sDuraludonLevelUpLearnset, + .teachableLearnset = sDuraludonTeachableLearnset, .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, .formChangeTable = sDuraludonFormChangeTable, .height = 430, @@ -4847,15 +5327,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(DuraludonGigantamax, 64, 64), + .frontPic = gMonFrontPic_DuraludonGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DuraludonGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(DuraludonGigantamax, 64, 64), + .backPic = gMonBackPic_DuraludonGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(DuraludonGigantamax), - ICON(DuraludonGigantamax, 0), + .palette = gMonPalette_DuraludonGigantamax, + .shinyPalette = gMonShinyPalette_DuraludonGigantamax, + .iconSprite = gMonIcon_DuraludonGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -4895,17 +5379,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - FRONT_PIC(Archaludon, 64, 64), + .frontPic = gMonFrontPic_Archaludon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Archaludon, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Archaludon, 64, 64), + .backPic = gMonBackPic_Archaludon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, .backAnimId = BACK_ANIM_NONE, - PALETTES(Archaludon), - //ICON(Archaludon, 0), + .palette = gMonPalette_Archaludon, + .shinyPalette = gMonShinyPalette_Archaludon, + //.iconSprite = gMonIcon_Archaludon, + //.iconPalIndex = 0, //FOOTPRINT(Archaludon) - LEARNSETS(Archaludon), + .levelUpLearnset = sArchaludonLevelUpLearnset, + .teachableLearnset = sArchaludonTeachableLearnset, }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON @@ -4945,18 +5434,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dreepy, 48, 40), + .frontPic = gMonFrontPic_Dreepy, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Dreepy, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Dreepy, 56, 40), + .backPic = gMonBackPic_Dreepy, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dreepy), - ICON(Dreepy, 0), + .palette = gMonPalette_Dreepy, + .shinyPalette = gMonShinyPalette_Dreepy, + .iconSprite = gMonIcon_Dreepy, + .iconPalIndex = 0, FOOTPRINT(Dreepy) - LEARNSETS(Dreepy), + .levelUpLearnset = sDreepyLevelUpLearnset, + .teachableLearnset = sDreepyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 50, SPECIES_DRAKLOAK}), }, @@ -4993,18 +5487,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - FRONT_PIC(Drakloak, 64, 56), + .frontPic = gMonFrontPic_Drakloak, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Drakloak, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Drakloak, 64, 48), + .backPic = gMonBackPic_Drakloak, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Drakloak), - ICON(Drakloak, 0), + .palette = gMonPalette_Drakloak, + .shinyPalette = gMonShinyPalette_Drakloak, + .iconSprite = gMonIcon_Drakloak, + .iconPalIndex = 0, FOOTPRINT(Drakloak) - LEARNSETS(Drakloak), + .levelUpLearnset = sDrakloakLevelUpLearnset, + .teachableLearnset = sDrakloakTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 60, SPECIES_DRAGAPULT}), }, @@ -5042,18 +5541,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dragapult, 64, 64), + .frontPic = gMonFrontPic_Dragapult, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Dragapult, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, - BACK_PIC(Dragapult, 64, 56), + .backPic = gMonBackPic_Dragapult, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dragapult), - ICON(Dragapult, 0), + .palette = gMonPalette_Dragapult, + .shinyPalette = gMonShinyPalette_Dragapult, + .iconSprite = gMonIcon_Dragapult, + .iconPalIndex = 0, FOOTPRINT(Dragapult) - LEARNSETS(Dragapult), + .levelUpLearnset = sDragapultLevelUpLearnset, + .teachableLearnset = sDragapultTeachableLearnset, }, #endif //P_FAMILY_DREEPY @@ -5079,7 +5583,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Zacian) - LEARNSETS(Zacian), + .levelUpLearnset = sZacianLevelUpLearnset, + .teachableLearnset = sZacianTeachableLearnset, .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, .baseHP = 92, @@ -5096,15 +5601,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "Known as a legendary hero, this Pokémon\n" "absorbs metal particles, transforming them\n" "into a weapon it uses to battle."), - FRONT_PIC(ZacianHeroOfManyBattles, 64, 64), + .frontPic = gMonFrontPic_ZacianHeroOfManyBattles, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Zacian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZacianHeroOfManyBattles, 64, 56), + .backPic = gMonBackPic_ZacianHeroOfManyBattles, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZacianHeroOfManyBattles), - ICON(ZacianHeroOfManyBattles, 2), + .palette = gMonPalette_ZacianHeroOfManyBattles, + .shinyPalette = gMonShinyPalette_ZacianHeroOfManyBattles, + .iconSprite = gMonIcon_ZacianHeroOfManyBattles, + .iconPalIndex = 2, }, [SPECIES_ZACIAN_CROWNED_SWORD] = @@ -5128,7 +5637,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Zacian) - LEARNSETS(Zacian), + .levelUpLearnset = sZacianLevelUpLearnset, + .teachableLearnset = sZacianTeachableLearnset, .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, .baseHP = 92, @@ -5146,15 +5656,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "single strike, it became known as the\n" "Fairy King's Sword, and it inspired\n" "awe in friend and foe alike."), - FRONT_PIC(ZacianCrownedSword, 64, 64), + .frontPic = gMonFrontPic_ZacianCrownedSword, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zacian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZacianCrownedSword, 64, 56), + .backPic = gMonBackPic_ZacianCrownedSword, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZacianCrownedSword), - ICON(ZacianCrownedSword, 2), + .palette = gMonPalette_ZacianCrownedSword, + .shinyPalette = gMonShinyPalette_ZacianCrownedSword, + .iconSprite = gMonIcon_ZacianCrownedSword, + .iconPalIndex = 2, }, #endif //P_FAMILY_ZACIAN @@ -5180,7 +5694,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Zamazenta) - LEARNSETS(Zamazenta), + .levelUpLearnset = sZamazentaLevelUpLearnset, + .teachableLearnset = sZamazentaTeachableLearnset, .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, @@ -5198,15 +5713,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "king of the people to save the Galar\n" "region. It absorbs metal that it then\n" "uses in battle."), - FRONT_PIC(ZamazentaHeroOfManyBattles, 64, 64), + .frontPic = gMonFrontPic_ZamazentaHeroOfManyBattles, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zamazenta, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZamazentaHeroOfManyBattles, 64, 56), + .backPic = gMonBackPic_ZamazentaHeroOfManyBattles, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZamazentaHeroOfManyBattles), - ICON(ZamazentaHeroOfManyBattles, 2), + .palette = gMonPalette_ZamazentaHeroOfManyBattles, + .shinyPalette = gMonShinyPalette_ZamazentaHeroOfManyBattles, + .iconSprite = gMonIcon_ZamazentaHeroOfManyBattles, + .iconPalIndex = 2, }, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = @@ -5230,7 +5749,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Zamazenta) - LEARNSETS(Zamazenta), + .levelUpLearnset = sZamazentaLevelUpLearnset, + .teachableLearnset = sZamazentaTeachableLearnset, .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, .baseHP = 92, @@ -5248,15 +5768,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "led to it being known as the Fighting\n" "Master's Shield. It was feared and\n" "respected by all."), - FRONT_PIC(ZamazentaCrownedShield, 56, 64), + .frontPic = gMonFrontPic_ZamazentaCrownedShield, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zamazenta, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZamazentaCrownedShield, 64, 64), + .backPic = gMonBackPic_ZamazentaCrownedShield, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZamazentaCrownedShield), - ICON(ZamazentaCrownedShield, 2), + .palette = gMonPalette_ZamazentaCrownedShield, + .shinyPalette = gMonShinyPalette_ZamazentaCrownedShield, + .iconSprite = gMonIcon_ZamazentaCrownedShield, + .iconPalIndex = 2, }, #endif //P_FAMILY_ZAMAZENTA @@ -5278,7 +5802,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_ETERNATUS, .categoryName = _("Gigantic"), FOOTPRINT(Eternatus) - LEARNSETS(Eternatus), + .levelUpLearnset = sEternatusLevelUpLearnset, + .teachableLearnset = sEternatusTeachableLearnset, .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 140, .baseAttack = 85, @@ -5299,16 +5824,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "emanating from the lands of the Galar\n" "region. This energy is what allows\n" "Eternatus to stay active."), - FRONT_PIC(Eternatus, 64, 64), + .frontPic = gMonFrontPic_Eternatus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Eternatus, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - BACK_PIC(Eternatus, 64, 64), + .backPic = gMonBackPic_Eternatus, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Eternatus), - ICON(Eternatus, 0), + .palette = gMonPalette_Eternatus, + .shinyPalette = gMonShinyPalette_Eternatus, + .iconSprite = gMonIcon_Eternatus, + .iconPalIndex = 0, }, [SPECIES_ETERNATUS_ETERNAMAX] = @@ -5328,7 +5857,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .natDexNum = NATIONAL_DEX_ETERNATUS, .categoryName = _("Gigantic"), FOOTPRINT(Eternatus) - LEARNSETS(Eternatus), + .levelUpLearnset = sEternatusLevelUpLearnset, + .teachableLearnset = sEternatusTeachableLearnset, .formSpeciesIdTable = sEternatusFormSpeciesIdTable, .baseHP = 255, .baseAttack = 115, @@ -5349,16 +5879,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "Eternatus absorbed all the energy in\n" "the Galar region. It's now in a state\n" "of power overload."), - FRONT_PIC(EternatusEternamax, 64, 64), + .frontPic = gMonFrontPic_EternatusEternamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Eternatus, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 13, - BACK_PIC(EternatusEternamax, 64, 56), + .backPic = gMonBackPic_EternatusEternamax, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EternatusEternamax), - ICON(EternatusEternamax, 0), + .palette = gMonPalette_EternatusEternamax, + .shinyPalette = gMonShinyPalette_EternatusEternamax, + .iconSprite = gMonIcon_EternatusEternamax, + .iconPalIndex = 0, }, #endif //P_FAMILY_ETERNATUS @@ -5397,17 +5931,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kubfu, 40, 48), + .frontPic = gMonFrontPic_Kubfu, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Kubfu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kubfu, 56, 48), + .backPic = gMonBackPic_Kubfu, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Kubfu), - ICON(Kubfu, 1), + .palette = gMonPalette_Kubfu, + .shinyPalette = gMonShinyPalette_Kubfu, + .iconSprite = gMonIcon_Kubfu, + .iconPalIndex = 1, FOOTPRINT(Kubfu) - LEARNSETS(Kubfu), + .levelUpLearnset = sKubfuLevelUpLearnset, + .teachableLearnset = sKubfuTeachableLearnset, .evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, {EVO_ITEM, ITEM_SCROLL_OF_DARKNESS, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, {EVO_WATER_SCROLL, 0, SPECIES_URSHIFU_RAPID_STRIKE_STYLE}, @@ -5418,7 +5957,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = { .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - LEARNSETS(UrshifuSingleStrikeStyle), + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, @@ -5452,15 +5992,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "in the one-hit KO. Its strategy is to leap\n" "in close to foes and land a devastating\n" "blow with a hardened fist."), - FRONT_PIC(UrshifuSingleStrikeStyle, 56, 64), + .frontPic = gMonFrontPic_UrshifuSingleStrikeStyle, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Urshifu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(UrshifuSingleStrikeStyle, 64, 56), + .backPic = gMonBackPic_UrshifuSingleStrikeStyle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(UrshifuSingleStrikeStyle), - ICON(Urshifu, 2), + .palette = gMonPalette_UrshifuSingleStrikeStyle, + .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyle, + .iconSprite = gMonIcon_Urshifu, + .iconPalIndex = 2, .formChangeTable = sUrshifuSingleStrikeFormChangeTable, }, @@ -5469,7 +6013,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = { .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - LEARNSETS(UrshifuSingleStrikeStyle), + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, @@ -5503,15 +6048,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "rage. It's said that this Pokémon's\n" "terrifying expression and shout will\n" "rid the world of malevolence."), - FRONT_PIC(UrshifuSingleStrikeStyleGigantamax, 64, 64), + .frontPic = gMonFrontPic_UrshifuSingleStrikeStyleGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_UrshifuSingleStrikeStyleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(UrshifuSingleStrikeStyleGigantamax, 64, 64), + .backPic = gMonBackPic_UrshifuSingleStrikeStyleGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(UrshifuSingleStrikeStyleGigantamax), - ICON(UrshifuSingleStrikeStyleGigantamax, 0), + .palette = gMonPalette_UrshifuSingleStrikeStyleGigantamax, + .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax, + .iconSprite = gMonIcon_UrshifuSingleStrikeStyleGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -5520,7 +6069,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = { .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - LEARNSETS(UrshifuRapidStrikeStyle), + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, @@ -5554,15 +6104,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "believer in defeating foes by raining\n" "many blows down on them. Its\n" "strikes are nonstop, flowing like a river."), - FRONT_PIC(UrshifuRapidStrikeStyle, 56, 64), + .frontPic = gMonFrontPic_UrshifuRapidStrikeStyle, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Urshifu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(UrshifuRapidStrikeStyle, 64, 56), + .backPic = gMonBackPic_UrshifuRapidStrikeStyle, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(UrshifuRapidStrikeStyle), - ICON(Urshifu, 2), + .palette = gMonPalette_UrshifuRapidStrikeStyle, + .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyle, + .iconSprite = gMonIcon_Urshifu, + .iconPalIndex = 2, .formChangeTable = sUrshifuRapidStrikeFormChangeTable, }, @@ -5571,7 +6125,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = { .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - LEARNSETS(UrshifuRapidStrikeStyle), + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, @@ -5605,15 +6160,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "unleash its Gigantamax power, this\n" "Pokémon maintains a perfect one-\n" "legged stance. It won't even twitch."), - FRONT_PIC(UrshifuRapidStrikeStyleGigantamax, 64, 64), + .frontPic = gMonFrontPic_UrshifuRapidStrikeStyleGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_UrshifuRapidStrikeStyleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(UrshifuRapidStrikeStyleGigantamax, 64, 64), + .backPic = gMonBackPic_UrshifuRapidStrikeStyleGigantamax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(UrshifuRapidStrikeStyleGigantamax), - ICON(UrshifuRapidStrikeStyleGigantamax, 0), + .palette = gMonPalette_UrshifuRapidStrikeStyleGigantamax, + .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax, + .iconSprite = gMonIcon_UrshifuRapidStrikeStyleGigantamax, + .iconPalIndex = 0, .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS @@ -5652,22 +6211,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 286, .trainerOffset = 1, FOOTPRINT(Zarude) - LEARNSETS(Zarude), + .levelUpLearnset = sZarudeLevelUpLearnset, + .teachableLearnset = sZarudeTeachableLearnset, .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "Within dense forests, this Pokémon lives\n" "in a pack with others of its kind. It's\n" "incredibly aggressive, and the other\n" "Pokémon of the forest fear it."), - FRONT_PIC(Zarude, 64, 64), + .frontPic = gMonFrontPic_Zarude, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zarude, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Zarude, 64, 56), + .backPic = gMonBackPic_Zarude, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Zarude), - ICON(Zarude, 1), + .palette = gMonPalette_Zarude, + .shinyPalette = gMonShinyPalette_Zarude, + .iconSprite = gMonIcon_Zarude, + .iconPalIndex = 1, }, [SPECIES_ZARUDE_DADA] = { @@ -5700,22 +6264,27 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerScale = 286, .trainerOffset = 1, FOOTPRINT(Zarude) - LEARNSETS(Zarude), + .levelUpLearnset = sZarudeLevelUpLearnset, + .teachableLearnset = sZarudeTeachableLearnset, .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "This Zarude's special strength\n" "stems from its love and care for an\n" "orphaned human child that the Pokémon\n" "has raised."), - FRONT_PIC(ZarudeDada, 64, 64), + .frontPic = gMonFrontPic_ZarudeDada, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zarude, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ZarudeDada, 64, 56), + .backPic = gMonBackPic_ZarudeDada, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ZarudeDada), - ICON(ZarudeDada, 1), + .palette = gMonPalette_ZarudeDada, + .shinyPalette = gMonShinyPalette_ZarudeDada, + .iconSprite = gMonIcon_ZarudeDada, + .iconPalIndex = 1, }, #endif //P_FAMILY_ZARUDE @@ -5754,18 +6323,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Regieleki, 64, 56), + .frontPic = gMonFrontPic_Regieleki, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Regieleki, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Regieleki, 64, 48), + .backPic = gMonBackPic_Regieleki, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Regieleki), - ICON(Regieleki, 0), + .palette = gMonPalette_Regieleki, + .shinyPalette = gMonShinyPalette_Regieleki, + .iconSprite = gMonIcon_Regieleki, + .iconPalIndex = 0, FOOTPRINT(Regieleki) - LEARNSETS(Regieleki), + .levelUpLearnset = sRegielekiLevelUpLearnset, + .teachableLearnset = sRegielekiTeachableLearnset, .isLegendary = TRUE, }, #endif //P_FAMILY_REGIELEKI @@ -5806,18 +6380,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(Regidrago, 64, 64), + .frontPic = gMonFrontPic_Regidrago, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Regidrago, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Regidrago, 64, 56), + .backPic = gMonBackPic_Regidrago, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Regidrago), - ICON(Regidrago, 0), + .palette = gMonPalette_Regidrago, + .shinyPalette = gMonShinyPalette_Regidrago, + .iconSprite = gMonIcon_Regidrago, + .iconPalIndex = 0, FOOTPRINT(Regidrago) - LEARNSETS(Regidrago), + .levelUpLearnset = sRegidragoLevelUpLearnset, + .teachableLearnset = sRegidragoTeachableLearnset, }, #endif //P_FAMILY_REGIDRAGO @@ -5856,17 +6435,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - FRONT_PIC(Glastrier, 64, 64), + .frontPic = gMonFrontPic_Glastrier, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Glastrier, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Glastrier, 56, 64), + .backPic = gMonBackPic_Glastrier, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Glastrier), - ICON(Glastrier, 0), + .palette = gMonPalette_Glastrier, + .shinyPalette = gMonShinyPalette_Glastrier, + .iconSprite = gMonIcon_Glastrier, + .iconPalIndex = 0, FOOTPRINT(Glastrier) - LEARNSETS(Glastrier), + .levelUpLearnset = sGlastrierLevelUpLearnset, + .teachableLearnset = sGlastrierTeachableLearnset, }, #endif //P_FAMILY_GLASTRIER @@ -5906,17 +6490,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - FRONT_PIC(Spectrier, 64, 64), + .frontPic = gMonFrontPic_Spectrier, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Spectrier, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Spectrier, 56, 56), + .backPic = gMonBackPic_Spectrier, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Spectrier), - ICON(Spectrier, 0), + .palette = gMonPalette_Spectrier, + .shinyPalette = gMonShinyPalette_Spectrier, + .iconSprite = gMonIcon_Spectrier, + .iconPalIndex = 0, FOOTPRINT(Spectrier) - LEARNSETS(Spectrier), + .levelUpLearnset = sSpectrierLevelUpLearnset, + .teachableLearnset = sSpectrierTeachableLearnset, }, #endif //P_FAMILY_SPECTRIER @@ -5958,16 +6547,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Calyrex, 48, 64), + .frontPic = gMonFrontPic_Calyrex, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Calyrex, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Calyrex, 56, 48), + .backPic = gMonBackPic_Calyrex, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Calyrex), - ICON(Calyrex, 0), - LEARNSETS(Calyrex), + .palette = gMonPalette_Calyrex, + .shinyPalette = gMonShinyPalette_Calyrex, + .iconSprite = gMonIcon_Calyrex, + .iconPalIndex = 0, + .levelUpLearnset = sCalyrexLevelUpLearnset, + .teachableLearnset = sCalyrexTeachableLearnset, }, #if P_FUSION_FORMS @@ -6008,16 +6602,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CalyrexIceRider, 64, 64), + .frontPic = gMonFrontPic_CalyrexIceRider, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Calyrex, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CalyrexIceRider, 64, 64), + .backPic = gMonBackPic_CalyrexIceRider, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CalyrexIceRider), - ICON(CalyrexIceRider, 0), - LEARNSETS(CalyrexIceRider), + .palette = gMonPalette_CalyrexIceRider, + .shinyPalette = gMonShinyPalette_CalyrexIceRider, + .iconSprite = gMonIcon_CalyrexIceRider, + .iconPalIndex = 0, + .levelUpLearnset = sCalyrexIceRiderLevelUpLearnset, + .teachableLearnset = sCalyrexIceRiderTeachableLearnset, .cannotBeTraded = TRUE, }, @@ -6058,16 +6657,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(CalyrexShadowRider, 64, 64), + .frontPic = gMonFrontPic_CalyrexShadowRider, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Calyrex, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(CalyrexShadowRider, 64, 56), + .backPic = gMonBackPic_CalyrexShadowRider, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(CalyrexShadowRider), - ICON(CalyrexShadowRider, 0), - LEARNSETS(CalyrexShadowRider), + .palette = gMonPalette_CalyrexShadowRider, + .shinyPalette = gMonShinyPalette_CalyrexShadowRider, + .iconSprite = gMonIcon_CalyrexShadowRider, + .iconPalIndex = 0, + .levelUpLearnset = sCalyrexShadowRiderLevelUpLearnset, + .teachableLearnset = sCalyrexShadowRiderTeachableLearnset, .cannotBeTraded = TRUE, }, #endif //P_FUSION_FORMS @@ -6096,7 +6700,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - LEARNSETS(Enamorus), + .levelUpLearnset = sEnamorusLevelUpLearnset, + .teachableLearnset = sEnamorusTeachableLearnset, .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, @@ -6111,16 +6716,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "According to legend, this Pokémon's love\n" "gives rise to the budding of fresh life\n" "across the land."), - FRONT_PIC(EnamorusIncarnate, 64, 64), + .frontPic = gMonFrontPic_EnamorusIncarnate, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_EnamorusIncarnate, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(EnamorusIncarnate, 64, 64), + .backPic = gMonBackPic_EnamorusIncarnate, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EnamorusIncarnate), - ICON(EnamorusIncarnate, 1), + .palette = gMonPalette_EnamorusIncarnate, + .shinyPalette = gMonShinyPalette_EnamorusIncarnate, + .iconSprite = gMonIcon_EnamorusIncarnate, + .iconPalIndex = 1, //FOOTPRINT(EnamorusIncarnate) }, @@ -6146,7 +6755,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - LEARNSETS(Enamorus), + .levelUpLearnset = sEnamorusLevelUpLearnset, + .teachableLearnset = sEnamorusTeachableLearnset, .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, .baseHP = 74, .baseAttack = 115, @@ -6161,15 +6771,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "those who treat any form of life\n" "with disrespect and metes out\n" "wrathful, ruthless punishment."), - FRONT_PIC(EnamorusTherian, 64, 64), + .frontPic = gMonFrontPic_EnamorusTherian, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_EnamorusTherian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(EnamorusTherian, 64, 64), + .backPic = gMonBackPic_EnamorusTherian, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(EnamorusTherian), - ICON(EnamorusTherian, 1), + .palette = gMonPalette_EnamorusTherian, + .shinyPalette = gMonShinyPalette_EnamorusTherian, + .iconSprite = gMonIcon_EnamorusTherian, + .iconPalIndex = 1, //FOOTPRINT(Enamorus) }, #endif //P_FAMILY_ENAMORUS diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index 3d5987283ba4..cf2359f024d0 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -38,17 +38,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sprigatito, 64, 64), + .frontPic = gMonFrontPic_Sprigatito, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Sprigatito, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Sprigatito, 64, 64), + .backPic = gMonBackPic_Sprigatito, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sprigatito), - ICON(Sprigatito, 4), + .palette = gMonPalette_Sprigatito, + .shinyPalette = gMonShinyPalette_Sprigatito, + .iconSprite = gMonIcon_Sprigatito, + .iconPalIndex = 4, //FOOTPRINT(Sprigatito) - LEARNSETS(Sprigatito), + .levelUpLearnset = sSprigatitoLevelUpLearnset, + .teachableLearnset = sSprigatitoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_FLORAGATO}), }, @@ -86,17 +91,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Floragato, 64, 64), + .frontPic = gMonFrontPic_Floragato, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Floragato, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Floragato, 64, 64), + .backPic = gMonBackPic_Floragato, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Floragato), - ICON(Floragato, 1), + .palette = gMonPalette_Floragato, + .shinyPalette = gMonShinyPalette_Floragato, + .iconSprite = gMonIcon_Floragato, + .iconPalIndex = 1, //FOOTPRINT(Floragato) - LEARNSETS(Floragato), + .levelUpLearnset = sFloragatoLevelUpLearnset, + .teachableLearnset = sFloragatoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_MEOWSCARADA}), }, @@ -134,17 +144,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Meowscarada, 64, 64), + .frontPic = gMonFrontPic_Meowscarada, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Meowscarada, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Meowscarada, 64, 64), + .backPic = gMonBackPic_Meowscarada, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Meowscarada), - ICON(Meowscarada, 1), + .palette = gMonPalette_Meowscarada, + .shinyPalette = gMonShinyPalette_Meowscarada, + .iconSprite = gMonIcon_Meowscarada, + .iconPalIndex = 1, //FOOTPRINT(Meowscarada) - LEARNSETS(Meowscarada), + .levelUpLearnset = sMeowscaradaLevelUpLearnset, + .teachableLearnset = sMeowscaradaTeachableLearnset, }, #endif //P_FAMILY_SPRIGATITO @@ -183,17 +198,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fuecoco, 64, 64), + .frontPic = gMonFrontPic_Fuecoco, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Fuecoco, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Fuecoco, 64, 64), + .backPic = gMonBackPic_Fuecoco, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Fuecoco), - ICON(Fuecoco, 0), + .palette = gMonPalette_Fuecoco, + .shinyPalette = gMonShinyPalette_Fuecoco, + .iconSprite = gMonIcon_Fuecoco, + .iconPalIndex = 0, //FOOTPRINT(Fuecoco) - LEARNSETS(Fuecoco), + .levelUpLearnset = sFuecocoLevelUpLearnset, + .teachableLearnset = sFuecocoTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_CROCALOR}), }, @@ -231,17 +251,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Crocalor, 64, 64), + .frontPic = gMonFrontPic_Crocalor, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Crocalor, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Crocalor, 64, 64), + .backPic = gMonBackPic_Crocalor, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Crocalor), - ICON(Crocalor, 0), + .palette = gMonPalette_Crocalor, + .shinyPalette = gMonShinyPalette_Crocalor, + .iconSprite = gMonIcon_Crocalor, + .iconPalIndex = 0, //FOOTPRINT(Crocalor) - LEARNSETS(Crocalor), + .levelUpLearnset = sCrocalorLevelUpLearnset, + .teachableLearnset = sCrocalorTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_SKELEDIRGE}), }, @@ -279,17 +304,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Skeledirge, 64, 64), + .frontPic = gMonFrontPic_Skeledirge, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Skeledirge, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Skeledirge, 64, 64), + .backPic = gMonBackPic_Skeledirge, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Skeledirge), - ICON(Skeledirge, 0), + .palette = gMonPalette_Skeledirge, + .shinyPalette = gMonShinyPalette_Skeledirge, + .iconSprite = gMonIcon_Skeledirge, + .iconPalIndex = 0, //FOOTPRINT(Skeledirge) - LEARNSETS(Skeledirge), + .levelUpLearnset = sSkeledirgeLevelUpLearnset, + .teachableLearnset = sSkeledirgeTeachableLearnset, }, #endif //P_FAMILY_FUECOCO @@ -328,17 +358,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quaxly, 64, 64), + .frontPic = gMonFrontPic_Quaxly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Quaxly, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Quaxly, 64, 64), + .backPic = gMonBackPic_Quaxly, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Quaxly), - ICON(Quaxly, 2), + .palette = gMonPalette_Quaxly, + .shinyPalette = gMonShinyPalette_Quaxly, + .iconSprite = gMonIcon_Quaxly, + .iconPalIndex = 2, //FOOTPRINT(Quaxly) - LEARNSETS(Quaxly), + .levelUpLearnset = sQuaxlyLevelUpLearnset, + .teachableLearnset = sQuaxlyTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 16, SPECIES_QUAXWELL}), }, @@ -376,17 +411,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quaxwell, 64, 64), + .frontPic = gMonFrontPic_Quaxwell, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Quaxwell, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Quaxwell, 64, 64), + .backPic = gMonBackPic_Quaxwell, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Quaxwell), - ICON(Quaxwell, 0), + .palette = gMonPalette_Quaxwell, + .shinyPalette = gMonShinyPalette_Quaxwell, + .iconSprite = gMonIcon_Quaxwell, + .iconPalIndex = 0, //FOOTPRINT(Quaxwell) - LEARNSETS(Quaxwell), + .levelUpLearnset = sQuaxwellLevelUpLearnset, + .teachableLearnset = sQuaxwellTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 36, SPECIES_QUAQUAVAL}), }, @@ -424,17 +464,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Quaquaval, 64, 64), + .frontPic = gMonFrontPic_Quaquaval, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Quaquaval, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Quaquaval, 64, 64), + .backPic = gMonBackPic_Quaquaval, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Quaquaval), - ICON(Quaquaval, 0), + .palette = gMonPalette_Quaquaval, + .shinyPalette = gMonShinyPalette_Quaquaval, + .iconSprite = gMonIcon_Quaquaval, + .iconPalIndex = 0, //FOOTPRINT(Quaquaval) - LEARNSETS(Quaquaval), + .levelUpLearnset = sQuaquavalLevelUpLearnset, + .teachableLearnset = sQuaquavalTeachableLearnset, }, #endif //P_FAMILY_QUAXLY @@ -473,17 +518,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lechonk, 64, 64), + .frontPic = gMonFrontPic_Lechonk, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Lechonk, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lechonk, 64, 64), + .backPic = gMonBackPic_Lechonk, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Lechonk), - ICON(Lechonk, 1), + .palette = gMonPalette_Lechonk, + .shinyPalette = gMonShinyPalette_Lechonk, + .iconSprite = gMonIcon_Lechonk, + .iconPalIndex = 1, //FOOTPRINT(Lechonk) - LEARNSETS(Lechonk), + .levelUpLearnset = sLechonkLevelUpLearnset, + .teachableLearnset = sLechonkTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE}, {EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}), }, @@ -523,15 +573,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "Oinkologne is proud of its fine,\n" "glossy skin. It emits a concentrated\n" "scent from the tip of its tail."), - FRONT_PIC(OinkologneMale, 64, 64), + .frontPic = gMonFrontPic_OinkologneMale, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OinkologneMale, 64, 64), + .backPic = gMonBackPic_OinkologneMale, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(OinkologneMale), - ICON(OinkologneMale, 1), + .palette = gMonPalette_OinkologneMale, + .shinyPalette = gMonShinyPalette_OinkologneMale, + .iconSprite = gMonIcon_OinkologneMale, + .iconPalIndex = 1, //FOOTPRINT(Oinkologne) .levelUpLearnset = sOinkologneMaleLevelUpLearnset, }, @@ -572,15 +626,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "likes to keep things tidy. It\n" "shrouds itself in a floral aroma that\n" "soothes the Pokémon around it."), - FRONT_PIC(OinkologneFemale, 64, 64), + .frontPic = gMonFrontPic_OinkologneFemale, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(OinkologneFemale, 64, 64), + .backPic = gMonBackPic_OinkologneFemale, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(OinkologneFemale), - ICON(OinkologneFemale, 2), + .palette = gMonPalette_OinkologneFemale, + .shinyPalette = gMonShinyPalette_OinkologneFemale, + .iconSprite = gMonIcon_OinkologneFemale, + .iconPalIndex = 2, //FOOTPRINT(Oinkologne) .levelUpLearnset = sOinkologneFemaleLevelUpLearnset, }, @@ -621,17 +679,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tarountula, 64, 64), + .frontPic = gMonFrontPic_Tarountula, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Tarountula, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tarountula, 64, 64), + .backPic = gMonBackPic_Tarountula, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tarountula), - ICON(Tarountula, 1), + .palette = gMonPalette_Tarountula, + .shinyPalette = gMonShinyPalette_Tarountula, + .iconSprite = gMonIcon_Tarountula, + .iconPalIndex = 1, //FOOTPRINT(Tarountula) - LEARNSETS(Tarountula), + .levelUpLearnset = sTarountulaLevelUpLearnset, + .teachableLearnset = sTarountulaTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_SPIDOPS}), }, @@ -669,17 +732,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Spidops, 64, 64), + .frontPic = gMonFrontPic_Spidops, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Spidops, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Spidops, 64, 64), + .backPic = gMonBackPic_Spidops, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Spidops), - ICON(Spidops, 1), + .palette = gMonPalette_Spidops, + .shinyPalette = gMonShinyPalette_Spidops, + .iconSprite = gMonIcon_Spidops, + .iconPalIndex = 1, //FOOTPRINT(Spidops) - LEARNSETS(Spidops), + .levelUpLearnset = sSpidopsLevelUpLearnset, + .teachableLearnset = sSpidopsTeachableLearnset, }, #endif //P_FAMILY_TAROUNTULA @@ -718,17 +786,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nymble, 64, 64), + .frontPic = gMonFrontPic_Nymble, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Nymble, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Nymble, 64, 64), + .backPic = gMonBackPic_Nymble, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Nymble), - ICON(Nymble, 0), + .palette = gMonPalette_Nymble, + .shinyPalette = gMonShinyPalette_Nymble, + .iconSprite = gMonIcon_Nymble, + .iconPalIndex = 0, //FOOTPRINT(Nymble) - LEARNSETS(Nymble), + .levelUpLearnset = sNymbleLevelUpLearnset, + .teachableLearnset = sNymbleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_LOKIX}), }, @@ -766,17 +839,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Lokix, 64, 64), + .frontPic = gMonFrontPic_Lokix, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Lokix, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Lokix, 64, 64), + .backPic = gMonBackPic_Lokix, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Lokix), - ICON(Lokix, 0), + .palette = gMonPalette_Lokix, + .shinyPalette = gMonShinyPalette_Lokix, + .iconSprite = gMonIcon_Lokix, + .iconPalIndex = 0, //FOOTPRINT(Lokix) - LEARNSETS(Lokix), + .levelUpLearnset = sLokixLevelUpLearnset, + .teachableLearnset = sLokixTeachableLearnset, }, #endif //P_FAMILY_NYMBLE @@ -815,17 +893,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pawmi, 64, 64), + .frontPic = gMonFrontPic_Pawmi, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Pawmi, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pawmi, 64, 64), + .backPic = gMonBackPic_Pawmi, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pawmi), - ICON(Pawmi, 3), + .palette = gMonPalette_Pawmi, + .shinyPalette = gMonShinyPalette_Pawmi, + .iconSprite = gMonIcon_Pawmi, + .iconPalIndex = 3, //FOOTPRINT(Pawmi) - LEARNSETS(Pawmi), + .levelUpLearnset = sPawmiLevelUpLearnset, + .teachableLearnset = sPawmiTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 18, SPECIES_PAWMO}), }, @@ -863,17 +946,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pawmo, 64, 64), + .frontPic = gMonFrontPic_Pawmo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Pawmo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pawmo, 64, 64), + .backPic = gMonBackPic_Pawmo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pawmo), - ICON(Pawmo, 3), + .palette = gMonPalette_Pawmo, + .shinyPalette = gMonShinyPalette_Pawmo, + .iconSprite = gMonIcon_Pawmo, + .iconPalIndex = 3, //FOOTPRINT(Pawmo) - LEARNSETS(Pawmo), + .levelUpLearnset = sPawmoLevelUpLearnset, + .teachableLearnset = sPawmoTeachableLearnset, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_PAWMOT}), }, @@ -911,17 +999,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Pawmot, 64, 64), + .frontPic = gMonFrontPic_Pawmot, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Pawmot, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Pawmot, 64, 64), + .backPic = gMonBackPic_Pawmot, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Pawmot), - ICON(Pawmot, 3), + .palette = gMonPalette_Pawmot, + .shinyPalette = gMonShinyPalette_Pawmot, + .iconSprite = gMonIcon_Pawmot, + .iconPalIndex = 3, //FOOTPRINT(Pawmot) - LEARNSETS(Pawmot), + .levelUpLearnset = sPawmotLevelUpLearnset, + .teachableLearnset = sPawmotTeachableLearnset, }, #endif //P_FAMILY_PAWMI @@ -960,17 +1053,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tandemaus, 64, 64), + .frontPic = gMonFrontPic_Tandemaus, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Tandemaus, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tandemaus, 64, 64), + .backPic = gMonBackPic_Tandemaus, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tandemaus), - ICON(Tandemaus, 0), + .palette = gMonPalette_Tandemaus, + .shinyPalette = gMonShinyPalette_Tandemaus, + .iconSprite = gMonIcon_Tandemaus, + .iconPalIndex = 0, //FOOTPRINT(Tandemaus) - LEARNSETS(Tandemaus), + .levelUpLearnset = sTandemausLevelUpLearnset, + .teachableLearnset = sTandemausTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_FAMILY_OF_FOUR, 25, SPECIES_MAUSHOLD_FAMILY_OF_FOUR}, {EVO_LEVEL_FAMILY_OF_THREE, 25, SPECIES_MAUSHOLD_FAMILY_OF_THREE}), }, @@ -1007,9 +1105,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ - PALETTES(Maushold), + .palette = gMonPalette_Maushold, + .shinyPalette = gMonShinyPalette_Maushold, /*FOOTPRINT(Maushold)*/ - LEARNSETS(Maushold), + .levelUpLearnset = sMausholdLevelUpLearnset, + .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, .weight = 23, @@ -1018,9 +1118,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "day. They all live together like a\n" "family, but the relationship between\n" "the three is still unclear."), - FRONT_PIC(MausholdFamilyOfThree, 64, 64), - BACK_PIC(MausholdFamilyOfThree, 64, 64), - ICON(MausholdFamilyOfThree, 0), + .frontPic = gMonFrontPic_MausholdFamilyOfThree, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_MausholdFamilyOfThree, + .backPicSize = MON_COORDS_SIZE(64, 64), + .iconSprite = gMonIcon_MausholdFamilyOfThree, + .iconPalIndex = 0, }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { @@ -1054,9 +1157,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ - PALETTES(Maushold), + .palette = gMonPalette_Maushold, + .shinyPalette = gMonShinyPalette_Maushold, /*FOOTPRINT(Maushold)*/ - LEARNSETS(Maushold), + .levelUpLearnset = sMausholdLevelUpLearnset, + .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, .weight = 28, @@ -1065,9 +1170,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "ones during battles. When facing\n" "strong opponents, the whole group\n" "will join the fight."), - FRONT_PIC(MausholdFamilyOfFour, 64, 64), - BACK_PIC(MausholdFamilyOfFour, 64, 64), - ICON(MausholdFamilyOfFour, 0), + .frontPic = gMonFrontPic_MausholdFamilyOfFour, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_MausholdFamilyOfFour, + .backPicSize = MON_COORDS_SIZE(64, 64), + .iconSprite = gMonIcon_MausholdFamilyOfFour, + .iconPalIndex = 0, }, #endif //P_FAMILY_TANDEMAUS @@ -1106,17 +1214,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fidough, 64, 64), + .frontPic = gMonFrontPic_Fidough, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Fidough, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Fidough, 64, 64), + .backPic = gMonBackPic_Fidough, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Fidough), - ICON(Fidough, 1), + .palette = gMonPalette_Fidough, + .shinyPalette = gMonShinyPalette_Fidough, + .iconSprite = gMonIcon_Fidough, + .iconPalIndex = 1, //FOOTPRINT(Fidough) - LEARNSETS(Fidough), + .levelUpLearnset = sFidoughLevelUpLearnset, + .teachableLearnset = sFidoughTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DACHSBUN}), }, @@ -1154,17 +1267,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dachsbun, 64, 64), + .frontPic = gMonFrontPic_Dachsbun, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Dachsbun, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dachsbun, 64, 64), + .backPic = gMonBackPic_Dachsbun, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dachsbun), - ICON(Dachsbun, 0), // TODO + .palette = gMonPalette_Dachsbun, + .shinyPalette = gMonShinyPalette_Dachsbun, + .iconSprite = gMonIcon_Dachsbun, + .iconPalIndex = 0, // TODO //FOOTPRINT(Dachsbun) - LEARNSETS(Dachsbun), + .levelUpLearnset = sDachsbunLevelUpLearnset, + .teachableLearnset = sDachsbunTeachableLearnset, }, #endif //P_FAMILY_FIDOUGH @@ -1203,17 +1321,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Smoliv, 64, 64), + .frontPic = gMonFrontPic_Smoliv, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Smoliv, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Smoliv, 64, 64), + .backPic = gMonBackPic_Smoliv, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Smoliv), - ICON(Smoliv, 1), + .palette = gMonPalette_Smoliv, + .shinyPalette = gMonShinyPalette_Smoliv, + .iconSprite = gMonIcon_Smoliv, + .iconPalIndex = 1, //FOOTPRINT(Smoliv) - LEARNSETS(Smoliv), + .levelUpLearnset = sSmolivLevelUpLearnset, + .teachableLearnset = sSmolivTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_DOLLIV}), }, @@ -1251,17 +1374,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dolliv, 64, 64), + .frontPic = gMonFrontPic_Dolliv, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Dolliv, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Dolliv, 64, 64), + .backPic = gMonBackPic_Dolliv, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dolliv), - ICON(Dolliv, 1), + .palette = gMonPalette_Dolliv, + .shinyPalette = gMonShinyPalette_Dolliv, + .iconSprite = gMonIcon_Dolliv, + .iconPalIndex = 1, //FOOTPRINT(Dolliv) - LEARNSETS(Dolliv), + .levelUpLearnset = sDollivLevelUpLearnset, + .teachableLearnset = sDollivTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARBOLIVA}), }, @@ -1299,17 +1427,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Arboliva, 64, 64), + .frontPic = gMonFrontPic_Arboliva, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Arboliva, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Arboliva, 64, 64), + .backPic = gMonBackPic_Arboliva, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Arboliva), - ICON(Arboliva, 5), + .palette = gMonPalette_Arboliva, + .shinyPalette = gMonShinyPalette_Arboliva, + .iconSprite = gMonIcon_Arboliva, + .iconPalIndex = 5, //FOOTPRINT(Arboliva) - LEARNSETS(Arboliva), + .levelUpLearnset = sArbolivaLevelUpLearnset, + .teachableLearnset = sArbolivaTeachableLearnset, }, #endif //P_FAMILY_SMOLIV @@ -1341,15 +1474,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Squawkabilly, 64, 64), + .frontPic = gMonFrontPic_Squawkabilly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), + .backPic = gMonBackPic_Squawkabilly, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_GREEN, @@ -1358,8 +1494,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "most sway. When they're out\n" "searching for food in the mornings and\n" "evenings, it gets very noisy."), - PALETTES(SquawkabillyGreenPlumage), - ICON(SquawkabillyGreenPlumage, 1), + .palette = gMonPalette_SquawkabillyGreenPlumage, + .shinyPalette = gMonShinyPalette_SquawkabillyGreenPlumage, + .iconSprite = gMonIcon_SquawkabillyGreenPlumage, + .iconPalIndex = 1, }, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = @@ -1389,15 +1527,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Squawkabilly, 64, 64), + .frontPic = gMonFrontPic_Squawkabilly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), + .backPic = gMonBackPic_Squawkabilly, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, .bodyColor = BODY_COLOR_BLUE, @@ -1406,8 +1547,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "contain more than 50 individuals. They\n" "fly around towns and forests,\n" "searching for food and making a racket."), - PALETTES(SquawkabillyBluePlumage), - ICON(SquawkabillyBluePlumage, 2), + .palette = gMonPalette_SquawkabillyBluePlumage, + .shinyPalette = gMonShinyPalette_SquawkabillyBluePlumage, + .iconSprite = gMonIcon_SquawkabillyBluePlumage, + .iconPalIndex = 2, }, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = @@ -1437,15 +1580,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Squawkabilly, 64, 64), + .frontPic = gMonFrontPic_Squawkabilly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), + .backPic = gMonBackPic_Squawkabilly, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_YELLOW, @@ -1454,8 +1600,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "and their fighting style is vicious.\n" "They'll leap within reach of their\n" "foes to engage in close combat."), - PALETTES(SquawkabillyYellowPlumage), - ICON(SquawkabillyYellowPlumage, 1), + .palette = gMonPalette_SquawkabillyYellowPlumage, + .shinyPalette = gMonShinyPalette_SquawkabillyYellowPlumage, + .iconSprite = gMonIcon_SquawkabillyYellowPlumage, + .iconPalIndex = 1, }, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = @@ -1485,15 +1633,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Squawkabilly, 64, 64), + .frontPic = gMonFrontPic_Squawkabilly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Squawkabilly, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - BACK_PIC(Squawkabilly, 64, 64), + .backPic = gMonBackPic_Squawkabilly, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Squawkabilly)*/ - LEARNSETS(Squawkabilly), + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_WHITE, @@ -1502,8 +1653,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "fewest in number, they have no\n" "trouble living in towns since they blend\n" "in with the white buildings."), - PALETTES(SquawkabillyWhitePlumage), - ICON(SquawkabillyWhitePlumage, 1), + .palette = gMonPalette_SquawkabillyWhitePlumage, + .shinyPalette = gMonShinyPalette_SquawkabillyWhitePlumage, + .iconSprite = gMonIcon_SquawkabillyWhitePlumage, + .iconPalIndex = 1, }, #endif //P_FAMILY_SQUAWKABILLY @@ -1542,17 +1695,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Nacli, 64, 64), + .frontPic = gMonFrontPic_Nacli, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Nacli, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Nacli, 64, 64), + .backPic = gMonBackPic_Nacli, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Nacli), - ICON(Nacli, 2), + .palette = gMonPalette_Nacli, + .shinyPalette = gMonShinyPalette_Nacli, + .iconSprite = gMonIcon_Nacli, + .iconPalIndex = 2, //FOOTPRINT(Nacli) - LEARNSETS(Nacli), + .levelUpLearnset = sNacliLevelUpLearnset, + .teachableLearnset = sNacliTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_NACLSTACK}), }, @@ -1590,17 +1748,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Naclstack, 64, 64), + .frontPic = gMonFrontPic_Naclstack, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Naclstack, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Naclstack, 64, 64), + .backPic = gMonBackPic_Naclstack, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Naclstack), - ICON(Naclstack, 2), // TODO: recolor + .palette = gMonPalette_Naclstack, + .shinyPalette = gMonShinyPalette_Naclstack, + .iconSprite = gMonIcon_Naclstack, + .iconPalIndex = 2, // TODO: recolor //FOOTPRINT(Naclstack) - LEARNSETS(Naclstack), + .levelUpLearnset = sNaclstackLevelUpLearnset, + .teachableLearnset = sNaclstackTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_GARGANACL}), }, @@ -1638,17 +1801,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Garganacl, 64, 64), + .frontPic = gMonFrontPic_Garganacl, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Garganacl, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Garganacl, 64, 64), + .backPic = gMonBackPic_Garganacl, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Garganacl), - ICON(Garganacl, 2), + .palette = gMonPalette_Garganacl, + .shinyPalette = gMonShinyPalette_Garganacl, + .iconSprite = gMonIcon_Garganacl, + .iconPalIndex = 2, //FOOTPRINT(Garganacl) - LEARNSETS(Garganacl), + .levelUpLearnset = sGarganaclLevelUpLearnset, + .teachableLearnset = sGarganaclTeachableLearnset, }, #endif //P_FAMILY_NACLI @@ -1687,17 +1855,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Charcadet, 64, 64), + .frontPic = gMonFrontPic_Charcadet, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Charcadet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Charcadet, 64, 64), + .backPic = gMonBackPic_Charcadet, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Charcadet), - ICON(Charcadet, 1), + .palette = gMonPalette_Charcadet, + .shinyPalette = gMonShinyPalette_Charcadet, + .iconSprite = gMonIcon_Charcadet, + .iconPalIndex = 1, //FOOTPRINT(Charcadet) - LEARNSETS(Charcadet), + .levelUpLearnset = sCharcadetLevelUpLearnset, + .teachableLearnset = sCharcadetTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_AUSPICIOUS_ARMOR, SPECIES_ARMAROUGE}, {EVO_ITEM, ITEM_MALICIOUS_ARMOR, SPECIES_CERULEDGE}), }, @@ -1736,17 +1909,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Armarouge, 64, 64), + .frontPic = gMonFrontPic_Armarouge, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Armarouge, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Armarouge, 64, 64), + .backPic = gMonBackPic_Armarouge, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Armarouge), - ICON(Armarouge, 0), + .palette = gMonPalette_Armarouge, + .shinyPalette = gMonShinyPalette_Armarouge, + .iconSprite = gMonIcon_Armarouge, + .iconPalIndex = 0, //FOOTPRINT(Armarouge) - LEARNSETS(Armarouge), + .levelUpLearnset = sArmarougeLevelUpLearnset, + .teachableLearnset = sArmarougeTeachableLearnset, }, [SPECIES_CERULEDGE] = @@ -1783,17 +1961,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Ceruledge, 64, 64), + .frontPic = gMonFrontPic_Ceruledge, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ceruledge, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Ceruledge, 64, 64), + .backPic = gMonBackPic_Ceruledge, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Ceruledge), - ICON(Ceruledge, 2), + .palette = gMonPalette_Ceruledge, + .shinyPalette = gMonShinyPalette_Ceruledge, + .iconSprite = gMonIcon_Ceruledge, + .iconPalIndex = 2, //FOOTPRINT(Ceruledge) - LEARNSETS(Ceruledge), + .levelUpLearnset = sCeruledgeLevelUpLearnset, + .teachableLearnset = sCeruledgeTeachableLearnset, }, #endif //P_FAMILY_CHARCADET @@ -1832,18 +2015,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tadbulb, 64, 64), + .frontPic = gMonFrontPic_Tadbulb, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Tadbulb, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, - BACK_PIC(Tadbulb, 64, 64), + .backPic = gMonBackPic_Tadbulb, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tadbulb), - ICON(Tadbulb, 5), // TODO: Redo to 0 + .palette = gMonPalette_Tadbulb, + .shinyPalette = gMonShinyPalette_Tadbulb, + .iconSprite = gMonIcon_Tadbulb, + .iconPalIndex = 5, // TODO: Redo to 0 //FOOTPRINT(Tadbulb) - LEARNSETS(Tadbulb), + .levelUpLearnset = sTadbulbLevelUpLearnset, + .teachableLearnset = sTadbulbTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_BELLIBOLT}), }, @@ -1881,17 +2069,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bellibolt, 64, 64), + .frontPic = gMonFrontPic_Bellibolt, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Bellibolt, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Bellibolt, 64, 64), + .backPic = gMonBackPic_Bellibolt, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bellibolt), - ICON(Bellibolt, 0), + .palette = gMonPalette_Bellibolt, + .shinyPalette = gMonShinyPalette_Bellibolt, + .iconSprite = gMonIcon_Bellibolt, + .iconPalIndex = 0, //FOOTPRINT(Bellibolt) - LEARNSETS(Bellibolt), + .levelUpLearnset = sBelliboltLevelUpLearnset, + .teachableLearnset = sBelliboltTeachableLearnset, }, #endif //P_FAMILY_TADBULB @@ -1930,17 +2123,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wattrel, 64, 64), + .frontPic = gMonFrontPic_Wattrel, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Wattrel, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wattrel, 64, 64), + .backPic = gMonBackPic_Wattrel, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wattrel), - ICON(Wattrel, 3), + .palette = gMonPalette_Wattrel, + .shinyPalette = gMonShinyPalette_Wattrel, + .iconSprite = gMonIcon_Wattrel, + .iconPalIndex = 3, //FOOTPRINT(Wattrel) - LEARNSETS(Wattrel), + .levelUpLearnset = sWattrelLevelUpLearnset, + .teachableLearnset = sWattrelTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_KILOWATTREL}), }, @@ -1978,17 +2176,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Kilowattrel, 64, 64), + .frontPic = gMonFrontPic_Kilowattrel, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Kilowattrel, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Kilowattrel, 64, 64), + .backPic = gMonBackPic_Kilowattrel, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Kilowattrel), - ICON(Kilowattrel, 3), + .palette = gMonPalette_Kilowattrel, + .shinyPalette = gMonShinyPalette_Kilowattrel, + .iconSprite = gMonIcon_Kilowattrel, + .iconPalIndex = 3, //FOOTPRINT(Kilowattrel) - LEARNSETS(Kilowattrel), + .levelUpLearnset = sKilowattrelLevelUpLearnset, + .teachableLearnset = sKilowattrelTeachableLearnset, }, #endif //P_FAMILY_WATTREL @@ -2027,17 +2230,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Maschiff, 64, 64), + .frontPic = gMonFrontPic_Maschiff, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Maschiff, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Maschiff, 64, 64), + .backPic = gMonBackPic_Maschiff, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Maschiff), - ICON(Maschiff, 3), + .palette = gMonPalette_Maschiff, + .shinyPalette = gMonShinyPalette_Maschiff, + .iconSprite = gMonIcon_Maschiff, + .iconPalIndex = 3, //FOOTPRINT(Maschiff) - LEARNSETS(Maschiff), + .levelUpLearnset = sMaschiffLevelUpLearnset, + .teachableLearnset = sMaschiffTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_MABOSSTIFF}), }, @@ -2075,17 +2283,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Mabosstiff, 64, 64), + .frontPic = gMonFrontPic_Mabosstiff, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Mabosstiff, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Mabosstiff, 64, 64), + .backPic = gMonBackPic_Mabosstiff, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Mabosstiff), - ICON(Mabosstiff, 5), + .palette = gMonPalette_Mabosstiff, + .shinyPalette = gMonShinyPalette_Mabosstiff, + .iconSprite = gMonIcon_Mabosstiff, + .iconPalIndex = 5, //FOOTPRINT(Mabosstiff) - LEARNSETS(Mabosstiff), + .levelUpLearnset = sMabosstiffLevelUpLearnset, + .teachableLearnset = sMabosstiffTeachableLearnset, }, #endif //P_FAMILY_MASCHIFF @@ -2124,17 +2337,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Shroodle, 64, 64), + .frontPic = gMonFrontPic_Shroodle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Shroodle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Shroodle, 64, 64), + .backPic = gMonBackPic_Shroodle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Shroodle), - ICON(Shroodle, 0), + .palette = gMonPalette_Shroodle, + .shinyPalette = gMonShinyPalette_Shroodle, + .iconSprite = gMonIcon_Shroodle, + .iconPalIndex = 0, //FOOTPRINT(Shroodle) - LEARNSETS(Shroodle), + .levelUpLearnset = sShroodleLevelUpLearnset, + .teachableLearnset = sShroodleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_GRAFAIAI}), }, @@ -2172,17 +2390,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Grafaiai, 64, 64), + .frontPic = gMonFrontPic_Grafaiai, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Grafaiai, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Grafaiai, 64, 64), + .backPic = gMonBackPic_Grafaiai, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Grafaiai), - ICON(Grafaiai, 0), + .palette = gMonPalette_Grafaiai, + .shinyPalette = gMonShinyPalette_Grafaiai, + .iconSprite = gMonIcon_Grafaiai, + .iconPalIndex = 0, //FOOTPRINT(Grafaiai) - LEARNSETS(Grafaiai), + .levelUpLearnset = sGrafaiaiLevelUpLearnset, + .teachableLearnset = sGrafaiaiTeachableLearnset, }, #endif //P_FAMILY_SHROODLE @@ -2221,17 +2444,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bramblin, 64, 64), + .frontPic = gMonFrontPic_Bramblin, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Bramblin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Bramblin, 64, 64), + .backPic = gMonBackPic_Bramblin, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bramblin), - ICON(Bramblin, 3), + .palette = gMonPalette_Bramblin, + .shinyPalette = gMonShinyPalette_Bramblin, + .iconSprite = gMonIcon_Bramblin, + .iconPalIndex = 3, //FOOTPRINT(Bramblin) - LEARNSETS(Bramblin), + .levelUpLearnset = sBramblinLevelUpLearnset, + .teachableLearnset = sBramblinTeachableLearnset, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_BRAMBLEGHAST}), }, @@ -2269,17 +2497,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Brambleghast, 64, 64), + .frontPic = gMonFrontPic_Brambleghast, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Brambleghast, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Brambleghast, 64, 64), + .backPic = gMonBackPic_Brambleghast, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Brambleghast), - ICON(Brambleghast, 5), + .palette = gMonPalette_Brambleghast, + .shinyPalette = gMonShinyPalette_Brambleghast, + .iconSprite = gMonIcon_Brambleghast, + .iconPalIndex = 5, //FOOTPRINT(Brambleghast) - LEARNSETS(Brambleghast), + .levelUpLearnset = sBrambleghastLevelUpLearnset, + .teachableLearnset = sBrambleghastTeachableLearnset, }, #endif //P_FAMILY_BRAMBLIN @@ -2318,17 +2551,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toedscool, 64, 64), + .frontPic = gMonFrontPic_Toedscool, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Toedscool, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Toedscool, 64, 64), + .backPic = gMonBackPic_Toedscool, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Toedscool), - ICON(Toedscool, 0), + .palette = gMonPalette_Toedscool, + .shinyPalette = gMonShinyPalette_Toedscool, + .iconSprite = gMonIcon_Toedscool, + .iconPalIndex = 0, //FOOTPRINT(Toedscool) - LEARNSETS(Toedscool), + .levelUpLearnset = sToedscoolLevelUpLearnset, + .teachableLearnset = sToedscoolTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_TOEDSCRUEL}), }, @@ -2366,17 +2604,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Toedscruel, 64, 64), + .frontPic = gMonFrontPic_Toedscruel, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Toedscruel, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Toedscruel, 64, 64), + .backPic = gMonBackPic_Toedscruel, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Toedscruel), - ICON(Toedscruel, 0), + .palette = gMonPalette_Toedscruel, + .shinyPalette = gMonShinyPalette_Toedscruel, + .iconSprite = gMonIcon_Toedscruel, + .iconPalIndex = 0, //FOOTPRINT(Toedscruel) - LEARNSETS(Toedscruel), + .levelUpLearnset = sToedscruelLevelUpLearnset, + .teachableLearnset = sToedscruelTeachableLearnset, }, #endif //P_FAMILY_TOEDSCOOL @@ -2415,17 +2658,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Klawf, 64, 64), + .frontPic = gMonFrontPic_Klawf, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Klawf, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Klawf, 64, 64), + .backPic = gMonBackPic_Klawf, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 20, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Klawf), - ICON(Klawf, 0), + .palette = gMonPalette_Klawf, + .shinyPalette = gMonShinyPalette_Klawf, + .iconSprite = gMonIcon_Klawf, + .iconPalIndex = 0, //FOOTPRINT(Klawf) - LEARNSETS(Klawf), + .levelUpLearnset = sKlawfLevelUpLearnset, + .teachableLearnset = sKlawfTeachableLearnset, }, #endif //P_FAMILY_KLAWF @@ -2464,17 +2712,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Capsakid, 64, 64), + .frontPic = gMonFrontPic_Capsakid, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Capsakid, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Capsakid, 64, 64), + .backPic = gMonBackPic_Capsakid, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Capsakid), - ICON(Capsakid, 1), + .palette = gMonPalette_Capsakid, + .shinyPalette = gMonShinyPalette_Capsakid, + .iconSprite = gMonIcon_Capsakid, + .iconPalIndex = 1, //FOOTPRINT(Capsakid) - LEARNSETS(Capsakid), + .levelUpLearnset = sCapsakidLevelUpLearnset, + .teachableLearnset = sCapsakidTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_SCOVILLAIN}), }, @@ -2512,17 +2765,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Scovillain, 64, 64), + .frontPic = gMonFrontPic_Scovillain, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Scovillain, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Scovillain, 64, 64), + .backPic = gMonBackPic_Scovillain, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Scovillain), - ICON(Scovillain, 1), + .palette = gMonPalette_Scovillain, + .shinyPalette = gMonShinyPalette_Scovillain, + .iconSprite = gMonIcon_Scovillain, + .iconPalIndex = 1, //FOOTPRINT(Scovillain) - LEARNSETS(Scovillain), + .levelUpLearnset = sScovillainLevelUpLearnset, + .teachableLearnset = sScovillainTeachableLearnset, }, #endif //P_FAMILY_CAPSAKID @@ -2561,17 +2819,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rellor, 64, 64), + .frontPic = gMonFrontPic_Rellor, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 17, .frontAnimFrames = sAnims_Rellor, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Rellor, 64, 64), + .backPic = gMonBackPic_Rellor, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Rellor), - ICON(Rellor, 5), + .palette = gMonPalette_Rellor, + .shinyPalette = gMonShinyPalette_Rellor, + .iconSprite = gMonIcon_Rellor, + .iconPalIndex = 5, //FOOTPRINT(Rellor) - LEARNSETS(Rellor), + .levelUpLearnset = sRellorLevelUpLearnset, + .teachableLearnset = sRellorTeachableLearnset, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_RABSCA}), }, @@ -2609,17 +2872,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Rabsca, 64, 64), + .frontPic = gMonFrontPic_Rabsca, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Rabsca, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Rabsca, 64, 64), + .backPic = gMonBackPic_Rabsca, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Rabsca), - ICON(Rabsca, 0), + .palette = gMonPalette_Rabsca, + .shinyPalette = gMonShinyPalette_Rabsca, + .iconSprite = gMonIcon_Rabsca, + .iconPalIndex = 0, //FOOTPRINT(Rabsca) - LEARNSETS(Rabsca), + .levelUpLearnset = sRabscaLevelUpLearnset, + .teachableLearnset = sRabscaTeachableLearnset, }, #endif //P_FAMILY_RELLOR @@ -2658,17 +2926,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Flittle, 64, 64), + .frontPic = gMonFrontPic_Flittle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Flittle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Flittle, 64, 64), + .backPic = gMonBackPic_Flittle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Flittle), - ICON(Flittle, 3), + .palette = gMonPalette_Flittle, + .shinyPalette = gMonShinyPalette_Flittle, + .iconSprite = gMonIcon_Flittle, + .iconPalIndex = 3, //FOOTPRINT(Flittle) - LEARNSETS(Flittle), + .levelUpLearnset = sFlittleLevelUpLearnset, + .teachableLearnset = sFlittleTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ESPATHRA}), }, @@ -2706,17 +2979,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Espathra, 64, 64), + .frontPic = gMonFrontPic_Espathra, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Espathra, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Espathra, 64, 64), + .backPic = gMonBackPic_Espathra, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Espathra), - ICON(Espathra, 5), + .palette = gMonPalette_Espathra, + .shinyPalette = gMonShinyPalette_Espathra, + .iconSprite = gMonIcon_Espathra, + .iconPalIndex = 5, //FOOTPRINT(Espathra) - LEARNSETS(Espathra), + .levelUpLearnset = sEspathraLevelUpLearnset, + .teachableLearnset = sEspathraTeachableLearnset, }, #endif //P_FAMILY_FLITTLE @@ -2755,17 +3033,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tinkatink, 64, 64), + .frontPic = gMonFrontPic_Tinkatink, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Tinkatink, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tinkatink, 64, 64), + .backPic = gMonBackPic_Tinkatink, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tinkatink), - ICON(Tinkatink, 1), + .palette = gMonPalette_Tinkatink, + .shinyPalette = gMonShinyPalette_Tinkatink, + .iconSprite = gMonIcon_Tinkatink, + .iconPalIndex = 1, //FOOTPRINT(Tinkatink) - LEARNSETS(Tinkatink), + .levelUpLearnset = sTinkatinkLevelUpLearnset, + .teachableLearnset = sTinkatinkTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 24, SPECIES_TINKATUFF}), }, @@ -2803,17 +3086,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tinkatuff, 64, 64), + .frontPic = gMonFrontPic_Tinkatuff, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Tinkatuff, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tinkatuff, 64, 64), + .backPic = gMonBackPic_Tinkatuff, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tinkatuff), - ICON(Tinkatuff, 4), + .palette = gMonPalette_Tinkatuff, + .shinyPalette = gMonShinyPalette_Tinkatuff, + .iconSprite = gMonIcon_Tinkatuff, + .iconPalIndex = 4, //FOOTPRINT(Tinkatuff) - LEARNSETS(Tinkatuff), + .levelUpLearnset = sTinkatuffLevelUpLearnset, + .teachableLearnset = sTinkatuffTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_TINKATON}), }, @@ -2851,17 +3139,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Tinkaton, 64, 64), + .frontPic = gMonFrontPic_Tinkaton, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Tinkaton, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Tinkaton, 64, 64), + .backPic = gMonBackPic_Tinkaton, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Tinkaton), - ICON(Tinkaton, 4), + .palette = gMonPalette_Tinkaton, + .shinyPalette = gMonShinyPalette_Tinkaton, + .iconSprite = gMonIcon_Tinkaton, + .iconPalIndex = 4, //FOOTPRINT(Tinkaton) - LEARNSETS(Tinkaton), + .levelUpLearnset = sTinkatonLevelUpLearnset, + .teachableLearnset = sTinkatonTeachableLearnset, }, #endif //P_FAMILY_TINKATINK @@ -2899,17 +3192,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wiglett, 64, 64), + .frontPic = gMonFrontPic_Wiglett, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wiglett, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wiglett, 64, 64), + .backPic = gMonBackPic_Wiglett, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wiglett), - ICON(Wiglett, 0), + .palette = gMonPalette_Wiglett, + .shinyPalette = gMonShinyPalette_Wiglett, + .iconSprite = gMonIcon_Wiglett, + .iconPalIndex = 0, //FOOTPRINT(Wiglett) - LEARNSETS(Wiglett), + .levelUpLearnset = sWiglettLevelUpLearnset, + .teachableLearnset = sWiglettTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_WUGTRIO}), }, @@ -2946,17 +3244,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Wugtrio, 64, 64), + .frontPic = gMonFrontPic_Wugtrio, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Wugtrio, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Wugtrio, 64, 64), + .backPic = gMonBackPic_Wugtrio, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Wugtrio), - ICON(Wugtrio, 0), + .palette = gMonPalette_Wugtrio, + .shinyPalette = gMonShinyPalette_Wugtrio, + .iconSprite = gMonIcon_Wugtrio, + .iconPalIndex = 0, //FOOTPRINT(Wugtrio) - LEARNSETS(Wugtrio), + .levelUpLearnset = sWugtrioLevelUpLearnset, + .teachableLearnset = sWugtrioTeachableLearnset, }, #endif //P_FAMILY_WIGLETT @@ -2995,18 +3298,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Bombirdier, 64, 64), + .frontPic = gMonFrontPic_Bombirdier, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Bombirdier, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Bombirdier, 64, 64), + .backPic = gMonBackPic_Bombirdier, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Bombirdier), - ICON(Bombirdier, 0), + .palette = gMonPalette_Bombirdier, + .shinyPalette = gMonShinyPalette_Bombirdier, + .iconSprite = gMonIcon_Bombirdier, + .iconPalIndex = 0, //FOOTPRINT(Bombirdier) - LEARNSETS(Bombirdier), + .levelUpLearnset = sBombirdierLevelUpLearnset, + .teachableLearnset = sBombirdierTeachableLearnset, }, #endif //P_FAMILY_BOMBIRDIER @@ -3044,17 +3352,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Finizen, 64, 64), + .frontPic = gMonFrontPic_Finizen, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Finizen, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Finizen, 64, 64), + .backPic = gMonBackPic_Finizen, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Finizen), - ICON(Finizen, 0), + .palette = gMonPalette_Finizen, + .shinyPalette = gMonShinyPalette_Finizen, + .iconSprite = gMonIcon_Finizen, + .iconPalIndex = 0, //FOOTPRINT(Finizen) - LEARNSETS(Finizen), + .levelUpLearnset = sFinizenLevelUpLearnset, + .teachableLearnset = sFinizenTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_PALAFIN_ZERO}), }, @@ -3079,7 +3392,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ /*FOOTPRINT(Palafin)*/ - LEARNSETS(Palafin), + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, .formSpeciesIdTable = sPalafinFormSpeciesIdTable, .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, @@ -3098,13 +3412,17 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "appearance if it hears its allies calling for\n" "help. Palafin will never show\n" "anybody its moment of transformation."), - FRONT_PIC(PalafinZero, 64, 64), + .frontPic = gMonFrontPic_PalafinZero, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - BACK_PIC(PalafinZero, 64, 64), + .backPic = gMonBackPic_PalafinZero, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PalafinZero), - ICON(PalafinZero, 0), + .palette = gMonPalette_PalafinZero, + .shinyPalette = gMonShinyPalette_PalafinZero, + .iconSprite = gMonIcon_PalafinZero, + .iconPalIndex = 0, }, [SPECIES_PALAFIN_HERO] = @@ -3128,7 +3446,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ /*FOOTPRINT(Palafin)*/ - LEARNSETS(Palafin), + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, .formSpeciesIdTable = sPalafinFormSpeciesIdTable, .formChangeTable = sPalafinZeroFormChangeTable, .baseHP = 100, @@ -3147,13 +3466,17 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "awakened. It is now so\n" "extraordinarily strong that it can easily lift a\n" "cruise ship with one fin."), - FRONT_PIC(PalafinHero, 64, 64), + .frontPic = gMonFrontPic_PalafinHero, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - BACK_PIC(PalafinHero, 64, 64), + .backPic = gMonBackPic_PalafinHero, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(PalafinHero), - ICON(PalafinHero, 0), + .palette = gMonPalette_PalafinHero, + .shinyPalette = gMonShinyPalette_PalafinHero, + .iconSprite = gMonIcon_PalafinHero, + .iconPalIndex = 0, }, #endif //P_FAMILY_FINIZEN @@ -3192,17 +3515,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Varoom, 64, 64), + .frontPic = gMonFrontPic_Varoom, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Varoom, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Varoom, 64, 64), + .backPic = gMonBackPic_Varoom, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Varoom), - ICON(Varoom, 5), + .palette = gMonPalette_Varoom, + .shinyPalette = gMonShinyPalette_Varoom, + .iconSprite = gMonIcon_Varoom, + .iconPalIndex = 5, //FOOTPRINT(Varoom) - LEARNSETS(Varoom), + .levelUpLearnset = sVaroomLevelUpLearnset, + .teachableLearnset = sVaroomTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_REVAVROOM}), }, @@ -3240,17 +3568,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Revavroom, 64, 64), + .frontPic = gMonFrontPic_Revavroom, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Revavroom, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Revavroom, 64, 64), + .backPic = gMonBackPic_Revavroom, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Revavroom), - ICON(Revavroom, 5), + .palette = gMonPalette_Revavroom, + .shinyPalette = gMonShinyPalette_Revavroom, + .iconSprite = gMonIcon_Revavroom, + .iconPalIndex = 5, //FOOTPRINT(Revavroom) - LEARNSETS(Revavroom), + .levelUpLearnset = sRevavroomLevelUpLearnset, + .teachableLearnset = sRevavroomTeachableLearnset, }, #endif //P_FAMILY_VAROOM @@ -3289,17 +3622,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cyclizar, 64, 64), + .frontPic = gMonFrontPic_Cyclizar, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Cyclizar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cyclizar, 64, 64), + .backPic = gMonBackPic_Cyclizar, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cyclizar), - ICON(Cyclizar, 1), + .palette = gMonPalette_Cyclizar, + .shinyPalette = gMonShinyPalette_Cyclizar, + .iconSprite = gMonIcon_Cyclizar, + .iconPalIndex = 1, //FOOTPRINT(Cyclizar) - LEARNSETS(Cyclizar), + .levelUpLearnset = sCyclizarLevelUpLearnset, + .teachableLearnset = sCyclizarTeachableLearnset, }, #endif //P_FAMILY_CYCLIZAR @@ -3338,17 +3676,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Orthworm, 64, 64), + .frontPic = gMonFrontPic_Orthworm, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Orthworm, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Orthworm, 64, 64), + .backPic = gMonBackPic_Orthworm, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Orthworm), - ICON(Orthworm, 4), + .palette = gMonPalette_Orthworm, + .shinyPalette = gMonShinyPalette_Orthworm, + .iconSprite = gMonIcon_Orthworm, + .iconPalIndex = 4, //FOOTPRINT(Orthworm) - LEARNSETS(Orthworm), + .levelUpLearnset = sOrthwormLevelUpLearnset, + .teachableLearnset = sOrthwormTeachableLearnset, }, #endif //P_FAMILY_ORTHWORM @@ -3387,18 +3730,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Glimmet, 64, 64), + .frontPic = gMonFrontPic_Glimmet, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Glimmet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 11, - BACK_PIC(Glimmet, 64, 64), + .backPic = gMonBackPic_Glimmet, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Glimmet), - ICON(Glimmet, 0), + .palette = gMonPalette_Glimmet, + .shinyPalette = gMonShinyPalette_Glimmet, + .iconSprite = gMonIcon_Glimmet, + .iconPalIndex = 0, //FOOTPRINT(Glimmet) - LEARNSETS(Glimmet), + .levelUpLearnset = sGlimmetLevelUpLearnset, + .teachableLearnset = sGlimmetTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_GLIMMORA}), }, @@ -3436,18 +3784,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Glimmora, 64, 64), + .frontPic = gMonFrontPic_Glimmora, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Glimmora, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(Glimmora, 64, 64), + .backPic = gMonBackPic_Glimmora, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Glimmora), - ICON(Glimmora, 0), + .palette = gMonPalette_Glimmora, + .shinyPalette = gMonShinyPalette_Glimmora, + .iconSprite = gMonIcon_Glimmora, + .iconPalIndex = 0, //FOOTPRINT(Glimmora) - LEARNSETS(Glimmora), + .levelUpLearnset = sGlimmoraLevelUpLearnset, + .teachableLearnset = sGlimmoraTeachableLearnset, }, #endif //P_FAMILY_GLIMMET @@ -3486,17 +3839,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Greavard, 64, 64), + .frontPic = gMonFrontPic_Greavard, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Greavard, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Greavard, 64, 64), + .backPic = gMonBackPic_Greavard, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Greavard), - ICON(Greavard, 2), + .palette = gMonPalette_Greavard, + .shinyPalette = gMonShinyPalette_Greavard, + .iconSprite = gMonIcon_Greavard, + .iconPalIndex = 2, //FOOTPRINT(Greavard) - LEARNSETS(Greavard), + .levelUpLearnset = sGreavardLevelUpLearnset, + .teachableLearnset = sGreavardTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 30, SPECIES_HOUNDSTONE}), }, @@ -3534,17 +3892,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Houndstone, 64, 64), + .frontPic = gMonFrontPic_Houndstone, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Houndstone, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Houndstone, 64, 64), + .backPic = gMonBackPic_Houndstone, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Houndstone), - ICON(Houndstone, 5), + .palette = gMonPalette_Houndstone, + .shinyPalette = gMonShinyPalette_Houndstone, + .iconSprite = gMonIcon_Houndstone, + .iconPalIndex = 5, //FOOTPRINT(Houndstone) - LEARNSETS(Houndstone), + .levelUpLearnset = sHoundstoneLevelUpLearnset, + .teachableLearnset = sHoundstoneTeachableLearnset, }, #endif //P_FAMILY_GREAVARD @@ -3583,17 +3946,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Flamigo, 64, 64), + .frontPic = gMonFrontPic_Flamigo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Flamigo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Flamigo, 64, 64), + .backPic = gMonBackPic_Flamigo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Flamigo), - ICON(Flamigo, 4), + .palette = gMonPalette_Flamigo, + .shinyPalette = gMonShinyPalette_Flamigo, + .iconSprite = gMonIcon_Flamigo, + .iconPalIndex = 4, //FOOTPRINT(Flamigo) - LEARNSETS(Flamigo), + .levelUpLearnset = sFlamigoLevelUpLearnset, + .teachableLearnset = sFlamigoTeachableLearnset, }, #endif //P_FAMILY_FLAMIGO @@ -3632,17 +4000,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cetoddle, 64, 64), + .frontPic = gMonFrontPic_Cetoddle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Cetoddle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cetoddle, 64, 64), + .backPic = gMonBackPic_Cetoddle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cetoddle), - ICON(Cetoddle, 0), + .palette = gMonPalette_Cetoddle, + .shinyPalette = gMonShinyPalette_Cetoddle, + .iconSprite = gMonIcon_Cetoddle, + .iconPalIndex = 0, //FOOTPRINT(Cetoddle) - LEARNSETS(Cetoddle), + .levelUpLearnset = sCetoddleLevelUpLearnset, + .teachableLearnset = sCetoddleTeachableLearnset, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}), }, @@ -3680,17 +4053,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Cetitan, 64, 64), + .frontPic = gMonFrontPic_Cetitan, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Cetitan, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Cetitan, 64, 64), + .backPic = gMonBackPic_Cetitan, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Cetitan), - ICON(Cetitan, 0), + .palette = gMonPalette_Cetitan, + .shinyPalette = gMonShinyPalette_Cetitan, + .iconSprite = gMonIcon_Cetitan, + .iconPalIndex = 0, //FOOTPRINT(Cetitan) - LEARNSETS(Cetitan), + .levelUpLearnset = sCetitanLevelUpLearnset, + .teachableLearnset = sCetitanTeachableLearnset, }, #endif //P_FAMILY_CETODDLE @@ -3729,18 +4107,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Veluza, 64, 64), + .frontPic = gMonFrontPic_Veluza, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Veluza, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - BACK_PIC(Veluza, 64, 64), + .backPic = gMonBackPic_Veluza, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Veluza), - ICON(Veluza, 4), + .palette = gMonPalette_Veluza, + .shinyPalette = gMonShinyPalette_Veluza, + .iconSprite = gMonIcon_Veluza, + .iconPalIndex = 4, //FOOTPRINT(Veluza) - LEARNSETS(Veluza), + .levelUpLearnset = sVeluzaLevelUpLearnset, + .teachableLearnset = sVeluzaTeachableLearnset, }, #endif //P_FAMILY_VELUZA @@ -3779,18 +4162,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Dondozo, 64, 64), + .frontPic = gMonFrontPic_Dondozo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Dondozo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, - BACK_PIC(Dondozo, 64, 64), + .backPic = gMonBackPic_Dondozo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Dondozo), - ICON(Dondozo, 0), + .palette = gMonPalette_Dondozo, + .shinyPalette = gMonShinyPalette_Dondozo, + .iconSprite = gMonIcon_Dondozo, + .iconPalIndex = 0, //FOOTPRINT(Dondozo) - LEARNSETS(Dondozo), + .levelUpLearnset = sDondozoLevelUpLearnset, + .teachableLearnset = sDondozoTeachableLearnset, }, #endif //P_FAMILY_DONDOZO @@ -3828,7 +4216,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_RED, .cryId = CRY_TATSUGIRI_CURLY, @@ -3837,10 +4226,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "lives inside the mouth of Dondozo to\n" "protect itself from enemies on the\n" "outside."), - FRONT_PIC(TatsugiriCurly, 64, 64), - BACK_PIC(TatsugiriCurly, 64, 64), - PALETTES(TatsugiriCurly), - ICON(TatsugiriCurly, 0), + .frontPic = gMonFrontPic_TatsugiriCurly, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_TatsugiriCurly, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_TatsugiriCurly, + .shinyPalette = gMonShinyPalette_TatsugiriCurly, + .iconSprite = gMonIcon_TatsugiriCurly, + .iconPalIndex = 0, }, [SPECIES_TATSUGIRI_DROOPY] = @@ -3876,7 +4269,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_PINK, .cryId = CRY_TATSUGIRI_DROOPY, @@ -3884,10 +4278,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "This Pokémon tricks its opponents\n" "by playing dead. It is small and\n" "weak, but it uses its smarts to survive."), - FRONT_PIC(TatsugiriDroopy, 64, 64), - BACK_PIC(TatsugiriDroopy, 64, 64), - PALETTES(TatsugiriDroopy), - ICON(TatsugiriDroopy, 0), + .frontPic = gMonFrontPic_TatsugiriDroopy, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_TatsugiriDroopy, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_TatsugiriDroopy, + .shinyPalette = gMonShinyPalette_TatsugiriDroopy, + .iconSprite = gMonIcon_TatsugiriDroopy, + .iconPalIndex = 0, }, [SPECIES_TATSUGIRI_STRETCHY] = @@ -3923,7 +4321,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicYOffset = 17, /*.backAnimId = BACK_ANIM_NONE,*/ /*FOOTPRINT(Tatsugiri)*/ - LEARNSETS(Tatsugiri), + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .bodyColor = BODY_COLOR_YELLOW, .cryId = CRY_TATSUGIRI_STRETCHY, @@ -3931,10 +4330,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "It's one of the most intelligent\n" "dragon Pokémon. It camouflages itself\n" "by inflating its throat sac."), - FRONT_PIC(TatsugiriStretchy, 64, 64), - BACK_PIC(TatsugiriStretchy, 64, 64), - PALETTES(TatsugiriStretchy), - ICON(TatsugiriStretchy, 0), + .frontPic = gMonFrontPic_TatsugiriStretchy, + .frontPicSize = MON_COORDS_SIZE(64, 64), + .backPic = gMonBackPic_TatsugiriStretchy, + .backPicSize = MON_COORDS_SIZE(64, 64), + .palette = gMonPalette_TatsugiriStretchy, + .shinyPalette = gMonShinyPalette_TatsugiriStretchy, + .iconSprite = gMonIcon_TatsugiriStretchy, + .iconPalIndex = 0, }, #endif //P_FAMILY_TATSUGIRI @@ -3974,17 +4377,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GreatTusk, 64, 64), + .frontPic = gMonFrontPic_GreatTusk, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_GreatTusk, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GreatTusk, 64, 64), + .backPic = gMonBackPic_GreatTusk, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(GreatTusk), - ICON(GreatTusk, 0), + .palette = gMonPalette_GreatTusk, + .shinyPalette = gMonShinyPalette_GreatTusk, + .iconSprite = gMonIcon_GreatTusk, + .iconPalIndex = 0, //FOOTPRINT(GreatTusk) - LEARNSETS(GreatTusk), + .levelUpLearnset = sGreatTuskLevelUpLearnset, + .teachableLearnset = sGreatTuskTeachableLearnset, }, #endif //P_FAMILY_GREAT_TUSK @@ -4024,17 +4432,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ScreamTail, 64, 64), + .frontPic = gMonFrontPic_ScreamTail, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ScreamTail, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ScreamTail, 64, 64), + .backPic = gMonBackPic_ScreamTail, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ScreamTail), - ICON(ScreamTail, 0), + .palette = gMonPalette_ScreamTail, + .shinyPalette = gMonShinyPalette_ScreamTail, + .iconSprite = gMonIcon_ScreamTail, + .iconPalIndex = 0, //FOOTPRINT(ScreamTail) - LEARNSETS(ScreamTail), + .levelUpLearnset = sScreamTailLevelUpLearnset, + .teachableLearnset = sScreamTailTeachableLearnset, }, #endif //P_FAMILY_SCREAM_TAIL @@ -4074,17 +4487,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(BruteBonnet, 64, 64), + .frontPic = gMonFrontPic_BruteBonnet, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_BruteBonnet, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(BruteBonnet, 64, 64), + .backPic = gMonBackPic_BruteBonnet, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(BruteBonnet), - ICON(BruteBonnet, 1), + .palette = gMonPalette_BruteBonnet, + .shinyPalette = gMonShinyPalette_BruteBonnet, + .iconSprite = gMonIcon_BruteBonnet, + .iconPalIndex = 1, //FOOTPRINT(BruteBonnet) - LEARNSETS(BruteBonnet), + .levelUpLearnset = sBruteBonnetLevelUpLearnset, + .teachableLearnset = sBruteBonnetTeachableLearnset, }, #endif //P_FAMILY_BRUTE_BONNET @@ -4126,18 +4544,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(FlutterMane, 64, 64), + .frontPic = gMonFrontPic_FlutterMane, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_FlutterMane, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 18, - BACK_PIC(FlutterMane, 64, 64), + .backPic = gMonBackPic_FlutterMane, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - PALETTES(FlutterMane), - ICON(FlutterMane, 4), + .palette = gMonPalette_FlutterMane, + .shinyPalette = gMonShinyPalette_FlutterMane, + .iconSprite = gMonIcon_FlutterMane, + .iconPalIndex = 4, //FOOTPRINT(FlutterMane) - LEARNSETS(FlutterMane), + .levelUpLearnset = sFlutterManeLevelUpLearnset, + .teachableLearnset = sFlutterManeTeachableLearnset, }, #endif //P_FAMILY_FLUTTER_MANE @@ -4176,17 +4599,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SlitherWing, 64, 64), + .frontPic = gMonFrontPic_SlitherWing, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SlitherWing, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SlitherWing, 64, 64), + .backPic = gMonBackPic_SlitherWing, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SlitherWing), - ICON(SlitherWing, 3), + .palette = gMonPalette_SlitherWing, + .shinyPalette = gMonShinyPalette_SlitherWing, + .iconSprite = gMonIcon_SlitherWing, + .iconPalIndex = 3, //FOOTPRINT(SlitherWing) - LEARNSETS(SlitherWing), + .levelUpLearnset = sSlitherWingLevelUpLearnset, + .teachableLearnset = sSlitherWingTeachableLearnset, }, #endif //P_FAMILY_SLITHER_WING @@ -4226,17 +4654,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(SandyShocks, 64, 64), + .frontPic = gMonFrontPic_SandyShocks, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SandyShocks, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(SandyShocks, 64, 64), + .backPic = gMonBackPic_SandyShocks, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(SandyShocks), - ICON(SandyShocks, 0), + .palette = gMonPalette_SandyShocks, + .shinyPalette = gMonShinyPalette_SandyShocks, + .iconSprite = gMonIcon_SandyShocks, + .iconPalIndex = 0, //FOOTPRINT(SandyShocks) - LEARNSETS(SandyShocks), + .levelUpLearnset = sSandyShocksLevelUpLearnset, + .teachableLearnset = sSandyShocksTeachableLearnset, }, #endif //P_FAMILY_SANDY_SHOCKS @@ -4276,17 +4709,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronTreads, 64, 64), + .frontPic = gMonFrontPic_IronTreads, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_IronTreads, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronTreads, 64, 64), + .backPic = gMonBackPic_IronTreads, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronTreads), - ICON(IronTreads, 0), + .palette = gMonPalette_IronTreads, + .shinyPalette = gMonShinyPalette_IronTreads, + .iconSprite = gMonIcon_IronTreads, + .iconPalIndex = 0, //FOOTPRINT(IronTreads) - LEARNSETS(IronTreads), + .levelUpLearnset = sIronTreadsLevelUpLearnset, + .teachableLearnset = sIronTreadsTeachableLearnset, }, #endif //P_FAMILY_IRON_TREADS @@ -4326,17 +4764,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronBundle, 64, 64), + .frontPic = gMonFrontPic_IronBundle, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_IronBundle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronBundle, 64, 64), + .backPic = gMonBackPic_IronBundle, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronBundle), - ICON(IronBundle, 0), + .palette = gMonPalette_IronBundle, + .shinyPalette = gMonShinyPalette_IronBundle, + .iconSprite = gMonIcon_IronBundle, + .iconPalIndex = 0, //FOOTPRINT(IronBundle) - LEARNSETS(IronBundle), + .levelUpLearnset = sIronBundleLevelUpLearnset, + .teachableLearnset = sIronBundleTeachableLearnset, }, #endif //P_FAMILY_IRON_BUNDLE @@ -4376,17 +4819,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronHands, 64, 64), + .frontPic = gMonFrontPic_IronHands, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronHands, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronHands, 64, 64), + .backPic = gMonBackPic_IronHands, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronHands), - ICON(IronHands, 0), + .palette = gMonPalette_IronHands, + .shinyPalette = gMonShinyPalette_IronHands, + .iconSprite = gMonIcon_IronHands, + .iconPalIndex = 0, //FOOTPRINT(IronHands) - LEARNSETS(IronHands), + .levelUpLearnset = sIronHandsLevelUpLearnset, + .teachableLearnset = sIronHandsTeachableLearnset, }, #endif //P_FAMILY_IRON_HANDS @@ -4426,18 +4874,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronJugulis, 64, 64), + .frontPic = gMonFrontPic_IronJugulis, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_IronJugulis, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - BACK_PIC(IronJugulis, 64, 64), + .backPic = gMonBackPic_IronJugulis, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronJugulis), - ICON(IronJugulis, 2), + .palette = gMonPalette_IronJugulis, + .shinyPalette = gMonShinyPalette_IronJugulis, + .iconSprite = gMonIcon_IronJugulis, + .iconPalIndex = 2, //FOOTPRINT(IronJugulis) - LEARNSETS(IronJugulis), + .levelUpLearnset = sIronJugulisLevelUpLearnset, + .teachableLearnset = sIronJugulisTeachableLearnset, }, #endif //P_FAMILY_IRON_JUGULIS @@ -4477,18 +4930,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronMoth, 64, 64), + .frontPic = gMonFrontPic_IronMoth, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_IronMoth, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, - BACK_PIC(IronMoth, 64, 64), + .backPic = gMonBackPic_IronMoth, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronMoth), - ICON(IronMoth, 3), + .palette = gMonPalette_IronMoth, + .shinyPalette = gMonShinyPalette_IronMoth, + .iconSprite = gMonIcon_IronMoth, + .iconPalIndex = 3, //FOOTPRINT(IronMoth) - LEARNSETS(IronMoth), + .levelUpLearnset = sIronMothLevelUpLearnset, + .teachableLearnset = sIronMothTeachableLearnset, }, #endif //P_FAMILY_IRON_MOTH @@ -4528,17 +4986,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronThorns, 64, 64), + .frontPic = gMonFrontPic_IronThorns, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronThorns, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronThorns, 64, 64), + .backPic = gMonBackPic_IronThorns, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronThorns), - ICON(IronThorns, 1), + .palette = gMonPalette_IronThorns, + .shinyPalette = gMonShinyPalette_IronThorns, + .iconSprite = gMonIcon_IronThorns, + .iconPalIndex = 1, //FOOTPRINT(IronThorns) - LEARNSETS(IronThorns), + .levelUpLearnset = sIronThornsLevelUpLearnset, + .teachableLearnset = sIronThornsTeachableLearnset, }, #endif //P_FAMILY_IRON_THORNS @@ -4577,17 +5040,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Frigibax, 64, 64), + .frontPic = gMonFrontPic_Frigibax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Frigibax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Frigibax, 64, 64), + .backPic = gMonBackPic_Frigibax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Frigibax), - ICON(Frigibax, 3), + .palette = gMonPalette_Frigibax, + .shinyPalette = gMonShinyPalette_Frigibax, + .iconSprite = gMonIcon_Frigibax, + .iconPalIndex = 3, //FOOTPRINT(Frigibax) - LEARNSETS(Frigibax), + .levelUpLearnset = sFrigibaxLevelUpLearnset, + .teachableLearnset = sFrigibaxTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_ARCTIBAX}), }, @@ -4625,17 +5093,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Arctibax, 64, 64), + .frontPic = gMonFrontPic_Arctibax, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Arctibax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Arctibax, 64, 64), + .backPic = gMonBackPic_Arctibax, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Arctibax), - ICON(Arctibax, 0), + .palette = gMonPalette_Arctibax, + .shinyPalette = gMonShinyPalette_Arctibax, + .iconSprite = gMonIcon_Arctibax, + .iconPalIndex = 0, //FOOTPRINT(Arctibax) - LEARNSETS(Arctibax), + .levelUpLearnset = sArctibaxLevelUpLearnset, + .teachableLearnset = sArctibaxTeachableLearnset, .evolutions = EVOLUTION({EVO_LEVEL, 54, SPECIES_BAXCALIBUR}), }, @@ -4673,17 +5146,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Baxcalibur, 64, 64), + .frontPic = gMonFrontPic_Baxcalibur, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Baxcalibur, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Baxcalibur, 64, 64), + .backPic = gMonBackPic_Baxcalibur, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Baxcalibur), - ICON(Baxcalibur, 0), + .palette = gMonPalette_Baxcalibur, + .shinyPalette = gMonShinyPalette_Baxcalibur, + .iconSprite = gMonIcon_Baxcalibur, + .iconPalIndex = 0, //FOOTPRINT(Baxcalibur) - LEARNSETS(Baxcalibur), + .levelUpLearnset = sBaxcaliburLevelUpLearnset, + .teachableLearnset = sBaxcaliburTeachableLearnset, }, #endif //P_FAMILY_FRIGIBAX @@ -4706,7 +5184,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Gimmighoul) - LEARNSETS(Gimmighoul), + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, @@ -4729,12 +5208,16 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GimmighoulChest, 64, 64), + .frontPic = gMonFrontPic_GimmighoulChest, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - BACK_PIC(GimmighoulChest, 64, 64), + .backPic = gMonBackPic_GimmighoulChest, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, - PALETTES(GimmighoulChest), - ICON(GimmighoulChest, 0), + .palette = gMonPalette_GimmighoulChest, + .shinyPalette = gMonShinyPalette_GimmighoulChest, + .iconSprite = gMonIcon_GimmighoulChest, + .iconPalIndex = 0, }, [SPECIES_GIMMIGHOUL_ROAMING] = @@ -4755,7 +5238,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Gimmighoul) - LEARNSETS(Gimmighoul), + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .baseHP = 45, @@ -4778,12 +5262,16 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(GimmighoulRoaming, 64, 64), + .frontPic = gMonFrontPic_GimmighoulRoaming, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 11, - BACK_PIC(GimmighoulRoaming, 64, 64), + .backPic = gMonBackPic_GimmighoulRoaming, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, - PALETTES(GimmighoulRoaming), - ICON(GimmighoulRoaming, 0), + .palette = gMonPalette_GimmighoulRoaming, + .shinyPalette = gMonShinyPalette_GimmighoulRoaming, + .iconSprite = gMonIcon_GimmighoulRoaming, + .iconPalIndex = 0, }, [SPECIES_GHOLDENGO] = @@ -4820,17 +5308,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Gholdengo, 64, 64), + .frontPic = gMonFrontPic_Gholdengo, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Gholdengo, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Gholdengo, 64, 64), + .backPic = gMonBackPic_Gholdengo, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Gholdengo), - ICON(Gholdengo, 0), + .palette = gMonPalette_Gholdengo, + .shinyPalette = gMonShinyPalette_Gholdengo, + .iconSprite = gMonIcon_Gholdengo, + .iconPalIndex = 0, //FOOTPRINT(Gholdengo) - LEARNSETS(Gholdengo), + .levelUpLearnset = sGholdengoLevelUpLearnset, + .teachableLearnset = sGholdengoTeachableLearnset, }, #endif //P_FAMILY_GIMMIGHOUL @@ -4870,17 +5363,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(WoChien, 64, 64), + .frontPic = gMonFrontPic_WoChien, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WoChien, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(WoChien, 64, 64), + .backPic = gMonBackPic_WoChien, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - PALETTES(WoChien), - ICON(WoChien, 5), + .palette = gMonPalette_WoChien, + .shinyPalette = gMonShinyPalette_WoChien, + .iconSprite = gMonIcon_WoChien, + .iconPalIndex = 5, //FOOTPRINT(WoChien) - LEARNSETS(WoChien), + .levelUpLearnset = sWoChienLevelUpLearnset, + .teachableLearnset = sWoChienTeachableLearnset, }, #endif //P_FAMILY_WO_CHIEN @@ -4920,17 +5418,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ChienPao, 64, 64), + .frontPic = gMonFrontPic_ChienPao, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_ChienPao, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(ChienPao, 64, 64), + .backPic = gMonBackPic_ChienPao, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ChienPao), - ICON(ChienPao, 0), + .palette = gMonPalette_ChienPao, + .shinyPalette = gMonShinyPalette_ChienPao, + .iconSprite = gMonIcon_ChienPao, + .iconPalIndex = 0, //FOOTPRINT(ChienPao) - LEARNSETS(ChienPao), + .levelUpLearnset = sChienPaoLevelUpLearnset, + .teachableLearnset = sChienPaoTeachableLearnset, }, #endif //P_FAMILY_CHIEN_PAO @@ -4970,17 +5473,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(TingLu, 64, 64), + .frontPic = gMonFrontPic_TingLu, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_TingLu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(TingLu, 64, 64), + .backPic = gMonBackPic_TingLu, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(TingLu), - ICON(TingLu, 0), + .palette = gMonPalette_TingLu, + .shinyPalette = gMonShinyPalette_TingLu, + .iconSprite = gMonIcon_TingLu, + .iconPalIndex = 0, //FOOTPRINT(TingLu) - LEARNSETS(TingLu), + .levelUpLearnset = sTingLuLevelUpLearnset, + .teachableLearnset = sTingLuTeachableLearnset, }, #endif //P_FAMILY_TING_LU @@ -5020,18 +5528,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(ChiYu, 64, 64), + .frontPic = gMonFrontPic_ChiYu, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ChiYu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 15, - BACK_PIC(ChiYu, 64, 64), + .backPic = gMonBackPic_ChiYu, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - PALETTES(ChiYu), - ICON(ChiYu, 0), + .palette = gMonPalette_ChiYu, + .shinyPalette = gMonShinyPalette_ChiYu, + .iconSprite = gMonIcon_ChiYu, + .iconPalIndex = 0, //FOOTPRINT(ChiYu) - LEARNSETS(ChiYu), + .levelUpLearnset = sChiYuLevelUpLearnset, + .teachableLearnset = sChiYuTeachableLearnset, }, #endif //P_FAMILY_CHI_YU @@ -5071,18 +5584,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(RoaringMoon, 64, 64), + .frontPic = gMonFrontPic_RoaringMoon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RoaringMoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - BACK_PIC(RoaringMoon, 64, 64), + .backPic = gMonBackPic_RoaringMoon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - PALETTES(RoaringMoon), - ICON(RoaringMoon, 3), + .palette = gMonPalette_RoaringMoon, + .shinyPalette = gMonShinyPalette_RoaringMoon, + .iconSprite = gMonIcon_RoaringMoon, + .iconPalIndex = 3, //FOOTPRINT(RoaringMoon) - LEARNSETS(RoaringMoon), + .levelUpLearnset = sRoaringMoonLevelUpLearnset, + .teachableLearnset = sRoaringMoonTeachableLearnset, }, #endif //P_FAMILY_ROARING_MOON @@ -5121,17 +5639,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronValiant, 64, 64), + .frontPic = gMonFrontPic_IronValiant, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronValiant, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronValiant, 64, 64), + .backPic = gMonBackPic_IronValiant, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronValiant), - ICON(IronValiant, 4), + .palette = gMonPalette_IronValiant, + .shinyPalette = gMonShinyPalette_IronValiant, + .iconSprite = gMonIcon_IronValiant, + .iconPalIndex = 4, //FOOTPRINT(IronValiant) - LEARNSETS(IronValiant), + .levelUpLearnset = sIronValiantLevelUpLearnset, + .teachableLearnset = sIronValiantTeachableLearnset, }, #endif //P_FAMILY_IRON_VALIANT @@ -5172,17 +5695,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Koraidon, 64, 64), + .frontPic = gMonFrontPic_Koraidon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Koraidon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Koraidon, 64, 64), + .backPic = gMonBackPic_Koraidon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Koraidon), - ICON(Koraidon, 0), + .palette = gMonPalette_Koraidon, + .shinyPalette = gMonShinyPalette_Koraidon, + .iconSprite = gMonIcon_Koraidon, + .iconPalIndex = 0, //FOOTPRINT(Koraidon) - LEARNSETS(Koraidon), + .levelUpLearnset = sKoraidonLevelUpLearnset, + .teachableLearnset = sKoraidonTeachableLearnset, }, #endif //P_FAMILY_KORAIDON @@ -5223,17 +5751,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Miraidon, 64, 64), + .frontPic = gMonFrontPic_Miraidon, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Miraidon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Miraidon, 64, 64), + .backPic = gMonBackPic_Miraidon, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Miraidon), - ICON(Miraidon, 2), + .palette = gMonPalette_Miraidon, + .shinyPalette = gMonShinyPalette_Miraidon, + .iconSprite = gMonIcon_Miraidon, + .iconPalIndex = 2, //FOOTPRINT(Miraidon) - LEARNSETS(Miraidon), + .levelUpLearnset = sMiraidonLevelUpLearnset, + .teachableLearnset = sMiraidonTeachableLearnset, }, #endif //P_FAMILY_MIRAIDON @@ -5272,17 +5805,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(WalkingWake, 64, 64), + .frontPic = gMonFrontPic_WalkingWake, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WalkingWake, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(WalkingWake, 64, 64), + .backPic = gMonBackPic_WalkingWake, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - PALETTES(WalkingWake), - ICON(WalkingWake, 2), + .palette = gMonPalette_WalkingWake, + .shinyPalette = gMonShinyPalette_WalkingWake, + .iconSprite = gMonIcon_WalkingWake, + .iconPalIndex = 2, //FOOTPRINT(WalkingWake) - LEARNSETS(WalkingWake), + .levelUpLearnset = sWalkingWakeLevelUpLearnset, + .teachableLearnset = sWalkingWakeTeachableLearnset, }, #endif //P_FAMILY_WALKING_WAKE @@ -5321,17 +5859,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(IronLeaves, 64, 64), + .frontPic = gMonFrontPic_IronLeaves, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronLeaves, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronLeaves, 64, 64), + .backPic = gMonBackPic_IronLeaves, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - PALETTES(IronLeaves), - ICON(IronLeaves, 1), + .palette = gMonPalette_IronLeaves, + .shinyPalette = gMonShinyPalette_IronLeaves, + .iconSprite = gMonIcon_IronLeaves, + .iconPalIndex = 1, //FOOTPRINT(IronLeaves) - LEARNSETS(IronLeaves), + .levelUpLearnset = sIronLeavesLevelUpLearnset, + .teachableLearnset = sIronLeavesTeachableLearnset, }, #endif //P_FAMILY_IRON_LEAVES @@ -5365,18 +5908,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poltchageist, 64, 64), + .frontPic = gMonFrontPic_Poltchageist, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Poltchageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Poltchageist, 64, 64), + .backPic = gMonBackPic_Poltchageist, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Poltchageist), - ICON(Poltchageist, 4), + .palette = gMonPalette_Poltchageist, + .shinyPalette = gMonShinyPalette_Poltchageist, + .iconSprite = gMonIcon_Poltchageist, + .iconPalIndex = 4, //FOOTPRINT(Poltchageist) - LEARNSETS(Poltchageist), + .levelUpLearnset = sPoltchageistLevelUpLearnset, + .teachableLearnset = sPoltchageistTeachableLearnset, .description = COMPOUND_STRING( "Supposedly, the regrets of a tea\n" "ceremony master who died before\n" @@ -5413,18 +5961,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Poltchageist, 64, 64), + .frontPic = gMonFrontPic_Poltchageist, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Poltchageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Poltchageist, 64, 64), + .backPic = gMonBackPic_Poltchageist, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Poltchageist), - ICON(Poltchageist, 4), + .palette = gMonPalette_Poltchageist, + .shinyPalette = gMonShinyPalette_Poltchageist, + .iconSprite = gMonIcon_Poltchageist, + .iconPalIndex = 4, //FOOTPRINT(Poltchageist) - LEARNSETS(Poltchageist), + .levelUpLearnset = sPoltchageistLevelUpLearnset, + .teachableLearnset = sPoltchageistTeachableLearnset, .description = COMPOUND_STRING( "It has taken up residence in a very\n" "expensive tea caddy. It takes an\n" @@ -5462,18 +6015,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sinistcha, 64, 64), + .frontPic = gMonFrontPic_Sinistcha, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Sinistcha, 64, 64), + .backPic = gMonBackPic_Sinistcha, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistcha), - ICON(Sinistcha, 1), + .palette = gMonPalette_Sinistcha, + .shinyPalette = gMonShinyPalette_Sinistcha, + .iconSprite = gMonIcon_Sinistcha, + .iconPalIndex = 1, //FOOTPRINT(Sinistcha) - LEARNSETS(Sinistcha), + .levelUpLearnset = sSinistchaLevelUpLearnset, + .teachableLearnset = sSinistchaTeachableLearnset, .description = COMPOUND_STRING( "It pretends to be tea, trying to fool\n" "people into drinking it so it can\n" @@ -5509,18 +6067,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Sinistcha, 64, 64), + .frontPic = gMonFrontPic_Sinistcha, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sinistcha, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - BACK_PIC(Sinistcha, 64, 64), + .backPic = gMonBackPic_Sinistcha, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Sinistcha), - ICON(Sinistcha, 1), + .palette = gMonPalette_Sinistcha, + .shinyPalette = gMonShinyPalette_Sinistcha, + .iconSprite = gMonIcon_Sinistcha, + .iconPalIndex = 1, //FOOTPRINT(Sinistcha) - LEARNSETS(Sinistcha), + .levelUpLearnset = sSinistchaLevelUpLearnset, + .teachableLearnset = sSinistchaTeachableLearnset, .description = COMPOUND_STRING( "The more stirring it does with the\n" "tea whisk on its head, the more\n" @@ -5564,17 +6127,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Okidogi, 64, 64), + .frontPic = gMonFrontPic_Okidogi, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Okidogi, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Okidogi, 64, 64), + .backPic = gMonBackPic_Okidogi, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Okidogi), - ICON(Okidogi, 1), + .palette = gMonPalette_Okidogi, + .shinyPalette = gMonShinyPalette_Okidogi, + .iconSprite = gMonIcon_Okidogi, + .iconPalIndex = 1, //FOOTPRINT(Okidogi) - LEARNSETS(Okidogi), + .levelUpLearnset = sOkidogiLevelUpLearnset, + .teachableLearnset = sOkidogiTeachableLearnset, .isLegendary = TRUE, }, #endif //P_FAMILY_OKIDOGI @@ -5615,17 +6183,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Munkidori, 64, 64), + .frontPic = gMonFrontPic_Munkidori, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Munkidori, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Munkidori, 64, 64), + .backPic = gMonBackPic_Munkidori, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Munkidori), - ICON(Munkidori, 0), + .palette = gMonPalette_Munkidori, + .shinyPalette = gMonShinyPalette_Munkidori, + .iconSprite = gMonIcon_Munkidori, + .iconPalIndex = 0, //FOOTPRINT(Munkidori) - LEARNSETS(Munkidori), + .levelUpLearnset = sMunkidoriLevelUpLearnset, + .teachableLearnset = sMunkidoriTeachableLearnset, }, #endif //P_FAMILY_MUNKIDORI @@ -5665,17 +6238,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - FRONT_PIC(Fezandipiti, 64, 64), + .frontPic = gMonFrontPic_Fezandipiti, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Fezandipiti, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(Fezandipiti, 64, 64), + .backPic = gMonBackPic_Fezandipiti, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - PALETTES(Fezandipiti), - ICON(Fezandipiti, 0), + .palette = gMonPalette_Fezandipiti, + .shinyPalette = gMonShinyPalette_Fezandipiti, + .iconSprite = gMonIcon_Fezandipiti, + .iconPalIndex = 0, //FOOTPRINT(Fezandipiti) - LEARNSETS(Fezandipiti), + .levelUpLearnset = sFezandipitiLevelUpLearnset, + .teachableLearnset = sFezandipitiTeachableLearnset, }, #endif //P_FAMILY_FEZANDIPITI @@ -5710,18 +6288,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, \ .trainerScale = 256, \ .trainerOffset = 0, \ - FRONT_PIC(Ogerpon##Form, 64, 64), \ + .frontPic = gMonFrontPic_Ogerpon##Form, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Ogerpon, \ /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - BACK_PIC(Ogerpon##Form, 64, 64), \ + .backPic = gMonBackPic_Ogerpon##Form, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ .backPicYOffset = 16, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ .palette = gMonPalette_Ogerpon##Form, \ .shinyPalette = gMonShinyPalette_Ogerpon##Form, \ - ICON(OgerponTealMask, 1), /* Each form should have its own icon */ \ + .iconSprite = gMonIcon_OgerponTealMask,/* Each form should have its own icon */ \ + .iconPalIndex = 1, \ /*FOOTPRINT(Ogerpon)*/ \ - LEARNSETS(Ogerpon), \ + .levelUpLearnset = sOgerponLevelUpLearnset, \ + .teachableLearnset = sOgerponTeachableLearnset, \ .formSpeciesIdTable = sOgerponFormSpeciesIdTable, \ .formChangeTable = sOgerponFormChangeTable, \ .isLegendary = TRUE, \ @@ -5776,17 +6358,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(GougingFire, 64, 64), + .frontPic = gMonFrontPic_GougingFire, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_GougingFire, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(GougingFire, 64, 64), + .backPic = gMonBackPic_GougingFire, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_NONE, - PALETTES(GougingFire), - //ICON(GougingFire, 0), + .palette = gMonPalette_GougingFire, + .shinyPalette = gMonShinyPalette_GougingFire, + //.iconSprite = gMonIcon_GougingFire, + //.iconPalIndex = 0, //FOOTPRINT(GougingFire) - LEARNSETS(GougingFire), + .levelUpLearnset = sGougingFireLevelUpLearnset, + .teachableLearnset = sGougingFireTeachableLearnset, }, #endif //P_FAMILY_GOUGING_FIRE @@ -5826,17 +6413,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 345, .trainerOffset = 7, - FRONT_PIC(RagingBolt, 64, 64), + .frontPic = gMonFrontPic_RagingBolt, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RagingBolt, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(RagingBolt, 64, 64), + .backPic = gMonBackPic_RagingBolt, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_NONE, - PALETTES(RagingBolt), - //ICON(RagingBolt, 0), + .palette = gMonPalette_RagingBolt, + .shinyPalette = gMonShinyPalette_RagingBolt, + //.iconSprite = gMonIcon_RagingBolt, + //.iconPalIndex = 0, //FOOTPRINT(RagingBolt) - LEARNSETS(RagingBolt), + .levelUpLearnset = sRagingBoltLevelUpLearnset, + .teachableLearnset = sRagingBoltTeachableLearnset, }, #endif //P_FAMILY_RAGING_BOLT @@ -5875,17 +6467,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 1, .trainerScale = 336, .trainerOffset = 4, - FRONT_PIC(IronBoulder, 64, 64), + .frontPic = gMonFrontPic_IronBoulder, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronBoulder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronBoulder, 64, 64), + .backPic = gMonBackPic_IronBoulder, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, .backAnimId = BACK_ANIM_NONE, - PALETTES(IronBoulder), - //ICON(IronBoulder, 0), + .palette = gMonPalette_IronBoulder, + .shinyPalette = gMonShinyPalette_IronBoulder, + //.iconSprite = gMonIcon_IronBoulder, + //.iconPalIndex = 0, //FOOTPRINT(IronBoulder) - LEARNSETS(IronBoulder), + .levelUpLearnset = sIronBoulderLevelUpLearnset, + .teachableLearnset = sIronBoulderTeachableLearnset, }, #endif //P_FAMILY_IRON_BOULDER @@ -5925,17 +6522,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - FRONT_PIC(IronCrown, 64, 64), + .frontPic = gMonFrontPic_IronCrown, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronCrown, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - BACK_PIC(IronCrown, 64, 64), + .backPic = gMonBackPic_IronCrown, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_NONE, - PALETTES(IronCrown), - //ICON(IronCrown, 0), + .palette = gMonPalette_IronCrown, + .shinyPalette = gMonShinyPalette_IronCrown, + //.iconSprite = gMonIcon_IronCrown, + //.iconPalIndex = 0, //FOOTPRINT(IronCrown) - LEARNSETS(IronCrown), + .levelUpLearnset = sIronCrownLevelUpLearnset, + .teachableLearnset = sIronCrownTeachableLearnset, }, #endif //P_FAMILY_IRON_CROWN @@ -5954,7 +6556,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - LEARNSETS(Terapagos), + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, //FOOTPRINT(Terapagos) .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, .formChangeTable = sTerapagosFormChangeTable, @@ -5979,15 +6582,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //FRONT_PIC(TerapagosNormal, 64, 64), + //.frontPic = gMonFrontPic_TerapagosNormal, + //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TerapagosNormal, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(TerapagosNormal, 64, 64), + //.backPic = gMonBackPic_TerapagosNormal, + //.backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - //PALETTES(TerapagosNormal), - //ICON(TerapagosNormal, 0), + //.palette = gMonPalette_TerapagosNormal, + //.shinyPalette = gMonShinyPalette_TerapagosNormal, + //.iconSprite = gMonIcon_TerapagosNormal, + //.iconPalIndex = 0, }, [SPECIES_TERAPAGOS_TERASTAL] = @@ -6004,7 +6611,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - LEARNSETS(Terapagos), + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, //FOOTPRINT(Terapagos) .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, .formChangeTable = sTerapagosFormChangeTable, @@ -6030,15 +6638,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //FRONT_PIC(TerapagosTerastal, 64, 64), + //.frontPic = gMonFrontPic_TerapagosTerastal, + //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TerapagosTerastal, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(TerapagosTerastal, 64, 64), + //.backPic = gMonBackPic_TerapagosTerastal, + //.backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - //PALETTES(TerapagosTerastal), - //ICON(TerapagosTerastal, 0), + //.palette = gMonPalette_TerapagosTerastal, + //.shinyPalette = gMonShinyPalette_TerapagosTerastal, + //.iconSprite = gMonIcon_TerapagosTerastal, + //.iconPalIndex = 0, }, [SPECIES_TERAPAGOS_STELLAR] = @@ -6055,7 +6667,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - LEARNSETS(Terapagos), + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, //FOOTPRINT(Terapagos) .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, .formChangeTable = sTerapagosFormChangeTable, @@ -6080,15 +6693,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //FRONT_PIC(TerapagosStellar, 64, 64), + //.frontPic = gMonFrontPic_TerapagosStellar, + //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_TerapagosStellar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(TerapagosStellar, 64, 64), + //.backPic = gMonBackPic_TerapagosStellar, + //.backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - //PALETTES(TerapagosStellar), - //ICON(TerapagosStellar, 0), + //.palette = gMonPalette_TerapagosStellar, + //.shinyPalette = gMonShinyPalette_TerapagosStellar, + //.iconSprite = gMonIcon_TerapagosStellar, + //.iconPalIndex = 0, }, #endif //P_FAMILY_TERAPAGOS @@ -6128,17 +6745,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - //FRONT_PIC(Pecharunt, 64, 64), + //.frontPic = gMonFrontPic_Pecharunt, + //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Pecharunt, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //BACK_PIC(Pecharunt, 64, 64), + //.backPic = gMonBackPic_Pecharunt, + //.backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - //PALETTES(Pecharunt), - //ICON(Pecharunt, 0), + //.palette = gMonPalette_Pecharunt, + //.shinyPalette = gMonShinyPalette_Pecharunt, + //.iconSprite = gMonIcon_Pecharunt, + //.iconPalIndex = 0, //FOOTPRINT(Pecharunt) - LEARNSETS(Pecharunt), + .levelUpLearnset = sPecharuntLevelUpLearnset, + .teachableLearnset = sPecharuntTeachableLearnset, }, #endif //P_FAMILY_PECHARUNT From 6ed237018896d90ea8c84c2ef1bfa6cce2a0c88f Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 12 Mar 2024 15:23:08 -0300 Subject: [PATCH 14/23] AMEND ME --- src/data/pokemon/species_info.h | 1 - src/data/pokemon/species_info/gen_1.h | 2082 ++++++++++++------------- src/data/pokemon/species_info/gen_2.h | 490 +++--- src/data/pokemon/species_info/gen_3.h | 1368 ++++++++-------- src/data/pokemon/species_info/gen_4.h | 908 +++++------ src/data/pokemon/species_info/gen_5.h | 1278 +++++++-------- src/data/pokemon/species_info/gen_6.h | 879 ++++++----- src/data/pokemon/species_info/gen_7.h | 652 ++++---- src/data/pokemon/species_info/gen_8.h | 270 ++-- src/data/pokemon/species_info/gen_9.h | 544 +++---- 10 files changed, 4235 insertions(+), 4237 deletions(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index ac7e2c5d582e..4d70fa5da4bb 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -303,7 +303,6 @@ const struct SpeciesInfo gSpeciesInfo[] = .frontPicYOffset = 0, .frontAnimFrames = sAnims_None, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .enemyMonElevation = 0, .backPic = gMonBackPic_CircledQuestionMark, .backPicSize = MON_COORDS_SIZE(64, 64), //.backPicFemale = gMonBackPic_CircledQuestionMarkF, diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index c7c34126e601..bfdd91b3e217 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -2151,6 +2151,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, .speciesName = _("Pichu"), .cryId = CRY_PICHU, .natDexNum = NATIONAL_DEX_PICHU, @@ -2166,7 +2167,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .levelUpLearnset = sPichuLevelUpLearnset, .teachableLearnset = sPichuTeachableLearnset, .formSpeciesIdTable = sPichuFormSpeciesIdTable, - .noFlip = TRUE, .frontPic = gMonFrontPic_PichuSpikyEared, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, @@ -2204,27 +2204,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = PERCENT_FEMALE(50), - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .description = gPikachuPokedexText, .frontPic = gMonFrontPic_Pikachu, .frontPicSize = MON_COORDS_SIZE(48, 48), @@ -2267,27 +2267,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuCosplay, .frontPicSize = MON_COORDS_SIZE(48, 48), @@ -2317,27 +2317,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuRockStar, .frontPicSize = MON_COORDS_SIZE(48, 48), @@ -2367,29 +2367,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - .noFlip = TRUE, .frontPic = gMonFrontPic_PikachuBelle, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2418,29 +2418,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, - .noFlip = TRUE, .frontPic = gMonFrontPic_PikachuPopStar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2469,27 +2469,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuPhD, .frontPicSize = MON_COORDS_SIZE(48, 48), @@ -2519,27 +2519,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_FEMALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_FEMALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuLibre, .frontPicSize = MON_COORDS_SIZE(48, 48), @@ -2572,28 +2572,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2627,27 +2627,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2681,27 +2681,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2735,27 +2735,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2789,27 +2789,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2843,27 +2843,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2897,28 +2897,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -2952,27 +2952,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = MON_MALE, .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 4, + .weight = 60, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .height = 4, - .weight = 60, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" @@ -3009,23 +3009,23 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = PIKACHU_EXP_YIELD, .evYield_Speed = 2, .itemRare = ITEM_LIGHT_BALL, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Pikachu"), .cryId = CRY_PIKACHU, .natDexNum = NATIONAL_DEX_PIKACHU, .categoryName = _("Mouse"), + .height = 210, + .weight = 0, FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, .teachableLearnset = sPikachuTeachableLearnset, .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), - .height = 210, - .weight = 0, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, @@ -3067,6 +3067,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAICHU] = { + .baseHP = 60, + .baseAttack = 90, + .baseDefense = 55, + .baseSpeed = RAICHU_SPEED, + .baseSpAttack = 90, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 75, .expYield = RAICHU_EXP_YIELD, .evYield_Speed = 3, @@ -3075,23 +3082,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Raichu"), .cryId = CRY_RAICHU, .natDexNum = NATIONAL_DEX_RAICHU, .categoryName = _("Mouse"), - FOOTPRINT(Raichu) - .formSpeciesIdTable = sRaichuFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 90, - .baseDefense = 55, - .baseSpeed = RAICHU_SPEED, - .baseSpAttack = 90, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_ELECTRIC), - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, - .bodyColor = BODY_COLOR_YELLOW, .height = 8, .weight = 300, + FOOTPRINT(Raichu) + .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .description = COMPOUND_STRING( "If it stores too much electricity, its\n" "behavior turns aggressive. To avoid this,\n" @@ -3123,6 +3123,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_RAICHU_ALOLAN] = { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 50, + .baseSpeed = RAICHU_SPEED, + .baseSpAttack = 95, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_PSYCHIC), .catchRate = 75, .expYield = RAICHU_EXP_YIELD, .evYield_Speed = 3, @@ -3131,24 +3138,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_SURGE_SURFER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Raichu"), .cryId = CRY_RAICHU, .natDexNum = NATIONAL_DEX_RAICHU, .categoryName = _("Mouse"), + .height = 7, + .weight = 210, FOOTPRINT(Raichu) .formSpeciesIdTable = sRaichuFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 85, - .baseDefense = 50, - .baseSpeed = RAICHU_SPEED, - .baseSpAttack = 95, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_PSYCHIC), - .abilities = { ABILITY_SURGE_SURFER, ABILITY_NONE }, - .bodyColor = BODY_COLOR_BROWN, .isAlolanForm = TRUE, - .height = 7, - .weight = 210, .description = COMPOUND_STRING( "It uses psychokinesis to control\n" "electricity. It focuses psychic energy\n" @@ -3181,32 +3181,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_SANDSHREW [SPECIES_SANDSHREW] = { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 85, + .baseSpeed = 40, + .baseSpAttack = 20, + .baseSpDefense = 30, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, .evYield_Defense = 1, - .speciesName = _("Sandshrew"), - .cryId = CRY_SANDSHREW, - .natDexNum = NATIONAL_DEX_SANDSHREW, - .categoryName = _("Mouse"), - FOOTPRINT(Sandshrew) - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .itemRare = ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 50, - .baseAttack = 75, - .baseDefense = 85, - .baseSpeed = 40, - .baseSpAttack = 20, - .baseSpDefense = 30, - .types = MON_TYPES(TYPE_GROUND), .abilities = { ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_SAND_RUSH }, .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Sandshrew"), + .cryId = CRY_SANDSHREW, + .natDexNum = NATIONAL_DEX_SANDSHREW, + .categoryName = _("Mouse"), .height = 6, .weight = 120, + FOOTPRINT(Sandshrew) + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .description = COMPOUND_STRING( "When it curls up in a ball, it can make any\n" "attack bounce off harmlessly. Its hide has\n" @@ -3236,32 +3236,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH] = { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 110, + .baseSpeed = 65, + .baseSpAttack = 45, + .baseSpDefense = 55, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, .evYield_Defense = 2, - .speciesName = _("Sandslash"), - .cryId = CRY_SANDSLASH, - .natDexNum = NATIONAL_DEX_SANDSLASH, - .categoryName = _("Mouse"), - FOOTPRINT(Sandslash) - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .itemRare = ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 75, - .baseAttack = 100, - .baseDefense = 110, - .baseSpeed = 65, - .baseSpAttack = 45, - .baseSpDefense = 55, - .types = MON_TYPES(TYPE_GROUND), .abilities = { ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_SAND_RUSH }, .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Sandslash"), + .cryId = CRY_SANDSLASH, + .natDexNum = NATIONAL_DEX_SANDSLASH, + .categoryName = _("Mouse"), .height = 10, .weight = 295, + FOOTPRINT(Sandslash) + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .description = COMPOUND_STRING( "It curls up in a ball to protect itself from\n" "enemy attacks. It also curls up to prevent\n" @@ -3291,32 +3291,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_SANDSHREW_ALOLAN] = { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 90, + .baseSpeed = 40, + .baseSpAttack = 10, + .baseSpDefense = 35, + .types = MON_TYPES(TYPE_ICE, TYPE_STEEL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 93, .evYield_Defense = 1, - .speciesName = _("Sandshrew"), - .cryId = CRY_SANDSHREW, - .natDexNum = NATIONAL_DEX_SANDSHREW, - .categoryName = _("Mouse"), - FOOTPRINT(Sandshrew) - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .itemRare = ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 50, - .baseAttack = 75, - .baseDefense = 90, - .baseSpeed = 40, - .baseSpAttack = 10, - .baseSpDefense = 35, - .types = MON_TYPES(TYPE_ICE, TYPE_STEEL), .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SLUSH_RUSH }, .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Sandshrew"), + .cryId = CRY_SANDSHREW, + .natDexNum = NATIONAL_DEX_SANDSHREW, + .categoryName = _("Mouse"), .height = 7, .weight = 400, + FOOTPRINT(Sandshrew) + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .description = COMPOUND_STRING( "Life on mountains covered with deep snow\n" "has granted this Pokémon a body of ice\n" @@ -3347,32 +3347,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SANDSLASH_ALOLAN] = { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 65, + .baseSpAttack = 25, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_ICE, TYPE_STEEL), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 163, .evYield_Defense = 2, - .speciesName = _("Sandslash"), - .cryId = CRY_SANDSLASH, - .natDexNum = NATIONAL_DEX_SANDSLASH, - .categoryName = _("Mouse"), - FOOTPRINT(Sandslash) - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .itemRare = ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 75, - .baseAttack = 100, - .baseDefense = 120, - .baseSpeed = 65, - .baseSpAttack = 25, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_ICE, TYPE_STEEL), .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SLUSH_RUSH }, .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Sandslash"), + .cryId = CRY_SANDSLASH, + .natDexNum = NATIONAL_DEX_SANDSLASH, + .categoryName = _("Mouse"), .height = 12, .weight = 550, + FOOTPRINT(Sandslash) + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .description = COMPOUND_STRING( "It uses large, hooked claws to cut a path\n" "through deep snow as it runs.\n" @@ -3929,9 +3929,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 65, .baseSpAttack = 50, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, .evYield_Speed = 1, + .itemRare = ITEM_CHARCOAL, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_DROUGHT }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Vulpix"), .cryId = CRY_VULPIX, .natDexNum = NATIONAL_DEX_VULPIX, @@ -3944,15 +3953,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Vulpix) .formSpeciesIdTable = sVulpixFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(75), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .types = MON_TYPES(TYPE_FIRE), - .itemRare = ITEM_CHARCOAL, - .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_DROUGHT }, - .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( "It can freely control fire, making fiery\n" "orbs fly like will-o'-the-wisps. Just\n" @@ -3978,10 +3978,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES] = { + .baseHP = 73, + .baseAttack = 76, + .baseDefense = 75, + .baseSpeed = 100, + .baseSpAttack = 81, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, .evYield_Speed = 1, .evYield_SpDefense = 1, + .itemRare = ITEM_CHARCOAL, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_DROUGHT }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Ninetales"), .cryId = CRY_NINETALES, .natDexNum = NATIONAL_DEX_NINETALES, @@ -3994,21 +4009,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Ninetales) .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(75), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 73, - .baseAttack = 76, - .baseDefense = 75, - .baseSpeed = 100, - .baseSpAttack = 81, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_FIRE), - .itemRare = ITEM_CHARCOAL, - .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_DROUGHT }, - .bodyColor = BODY_COLOR_YELLOW, .description = COMPOUND_STRING( "It has long been said that each of the\n" "nine tails embody an enchanted power.\n" @@ -4040,9 +4040,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 65, .baseSpAttack = 50, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_ICE), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, .evYield_Speed = 1, + .itemRare = ITEM_SNOWBALL, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SNOW_WARNING }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Vulpix"), .cryId = CRY_VULPIX, .natDexNum = NATIONAL_DEX_VULPIX, @@ -4055,15 +4064,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Vulpix) .formSpeciesIdTable = sVulpixFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(75), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .types = MON_TYPES(TYPE_ICE), - .itemRare = ITEM_SNOWBALL, - .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SNOW_WARNING }, - .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( "They live together in a skulk, helping\n" "one another. In hot weather, this Pokémon\n" @@ -4090,10 +4090,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_NINETALES_ALOLAN] = { + .baseHP = 73, + .baseAttack = 67, + .baseDefense = 75, + .baseSpeed = 109, + .baseSpAttack = 81, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_ICE, TYPE_FAIRY), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 177 : 178, .evYield_Speed = 1, .evYield_SpDefense = 1, + .itemRare = ITEM_SNOWBALL, + .genderRatio = PERCENT_FEMALE(75), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SNOW_WARNING }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Ninetales"), .cryId = CRY_NINETALES, .natDexNum = NATIONAL_DEX_NINETALES, @@ -4106,21 +4121,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Ninetales) .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(75), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .baseHP = 73, - .baseAttack = 67, - .baseDefense = 75, - .baseSpeed = 109, - .baseSpAttack = 81, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_ICE, TYPE_FAIRY), - .itemRare = ITEM_SNOWBALL, - .abilities = { ABILITY_SNOW_CLOAK, ABILITY_NONE, ABILITY_SNOW_WARNING }, - .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( "While it will guide travelers who get lost\n" "on a snowy mountain down to the\n" @@ -4988,36 +4988,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DIGLETT] = { + .baseHP = 10, + .baseAttack = 55, + .baseDefense = 25, + .baseSpeed = 95, + .baseSpAttack = 35, + .baseSpDefense = 45, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, .evYield_Speed = 1, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SAND_VEIL, ABILITY_ARENA_TRAP, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Diglett"), .cryId = CRY_DIGLETT, .natDexNum = NATIONAL_DEX_DIGLETT, .categoryName = _("Mole"), .height = 2, + .weight = 8, .pokemonScale = 833, .pokemonOffset = 25, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Diglett) .formSpeciesIdTable = sDiglettFormSpeciesIdTable, - .itemRare = ITEM_SOFT_SAND, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 10, - .baseAttack = 55, - .baseDefense = 25, - .baseSpeed = 95, - .baseSpAttack = 35, - .baseSpDefense = 45, - .types = MON_TYPES(TYPE_GROUND), - .abilities = { ABILITY_SAND_VEIL, ABILITY_ARENA_TRAP, ABILITY_SAND_FORCE }, - .weight = 8, .description = COMPOUND_STRING( "Diglett are raised in most farms.\n" "The reason is simple--wherever they\n" @@ -5044,36 +5044,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO] = { + .baseHP = 35, + .baseAttack = DUGTRIO_ATTACK, + .baseDefense = 50, + .baseSpeed = 120, + .baseSpAttack = 50, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 50, .expYield = DUGTRIO_EXP_YIELD, .evYield_Speed = 2, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SAND_VEIL, ABILITY_ARENA_TRAP, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Dugtrio"), .cryId = CRY_DUGTRIO, .natDexNum = NATIONAL_DEX_DUGTRIO, .categoryName = _("Mole"), .height = 7, + .weight = 333, .pokemonScale = 406, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Dugtrio) .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, - .itemRare = ITEM_SOFT_SAND, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 35, - .baseAttack = DUGTRIO_ATTACK, - .baseDefense = 50, - .baseSpeed = 120, - .baseSpAttack = 50, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_GROUND), - .abilities = { ABILITY_SAND_VEIL, ABILITY_ARENA_TRAP, ABILITY_SAND_FORCE }, - .weight = 333, .description = COMPOUND_STRING( "Because the triplets originally split from\n" "one body, they think exactly alike.\n" @@ -5100,36 +5100,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_DIGLETT_ALOLAN] = { + .baseHP = 10, + .baseAttack = 55, + .baseDefense = 30, + .baseSpeed = 90, + .baseSpAttack = 35, + .baseSpDefense = 45, + .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 53 : 81, .evYield_Speed = 1, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Diglett"), .cryId = CRY_DIGLETT, .natDexNum = NATIONAL_DEX_DIGLETT, .categoryName = _("Mole"), .height = 2, + .weight = 10, .pokemonScale = 833, .pokemonOffset = 25, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Diglett) .formSpeciesIdTable = sDiglettFormSpeciesIdTable, - .itemRare = ITEM_SOFT_SAND, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 10, - .baseAttack = 55, - .baseDefense = 30, - .baseSpeed = 90, - .baseSpAttack = 35, - .baseSpDefense = 45, - .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), - .abilities = { ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR, ABILITY_SAND_FORCE }, - .weight = 10, .description = COMPOUND_STRING( "The metal-rich geology of its habitat\n" "caused it to develop steel whiskers on its\n" @@ -5156,37 +5156,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO_ALOLAN] = { + .baseHP = 35, + .baseAttack = DUGTRIO_ATTACK, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 50, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), .catchRate = 50, .expYield = DUGTRIO_EXP_YIELD, .evYield_Speed = 2, + .itemRare = ITEM_SOFT_SAND, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = TRUE, .speciesName = _("Dugtrio"), .cryId = CRY_DUGTRIO, .natDexNum = NATIONAL_DEX_DUGTRIO, .categoryName = _("Mole"), .height = 7, + .weight = 666, .pokemonScale = 406, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Dugtrio) .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, - .itemRare = ITEM_SOFT_SAND, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 35, - .baseAttack = DUGTRIO_ATTACK, - .baseDefense = 60, - .baseSpeed = 110, - .baseSpAttack = 50, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), - .abilities = { ABILITY_SAND_VEIL, ABILITY_TANGLING_HAIR, ABILITY_SAND_FORCE }, - .noFlip = TRUE, - .weight = 666, .description = COMPOUND_STRING( "Their beautiful, metallic whiskers create\n" "a sort of protective helmet on\n" @@ -5215,32 +5215,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MEOWTH [SPECIES_MEOWTH] = { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .evYield_Speed = 1, + .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Meowth"), .cryId = CRY_MEOWTH, .natDexNum = NATIONAL_DEX_MEOWTH, .categoryName = _("Scratch Cat"), - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, - .baseHP = 40, - .baseAttack = 45, - .baseDefense = 35, - .baseSpeed = 90, - .baseSpAttack = 40, - .baseSpDefense = 40, - .evYield_Speed = 1, - .types = MON_TYPES(TYPE_NORMAL), - .itemRare = ITEM_QUICK_CLAW, - .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, - .bodyColor = BODY_COLOR_YELLOW, .height = 4, .weight = 42, + FOOTPRINT(Meowth) + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "Meowth withdraw their sharp claws into\n" "their paws to silently sneak about.\n" @@ -5272,6 +5272,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN] = { + .baseHP = 65, + .baseAttack = 70, + .baseDefense = 60, + .baseSpeed = 115, + .baseSpAttack = 65, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, .evYield_Speed = 2, @@ -5281,23 +5288,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_LIMBER, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Persian"), .cryId = CRY_PERSIAN, .natDexNum = NATIONAL_DEX_PERSIAN, .categoryName = _("Classy Cat"), - FOOTPRINT(Persian) - .formSpeciesIdTable = sPersianFormSpeciesIdTable, - .baseHP = 65, - .baseAttack = 70, - .baseDefense = 60, - .baseSpeed = 115, - .baseSpAttack = 65, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_NORMAL), - .abilities = { ABILITY_LIMBER, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, - .bodyColor = BODY_COLOR_YELLOW, .height = 10, .weight = 320, + FOOTPRINT(Persian) + .formSpeciesIdTable = sPersianFormSpeciesIdTable, .description = COMPOUND_STRING( "A Persian's six bold whiskers sense air\n" "movements to determine what is in its\n" @@ -5328,32 +5328,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_MEOWTH_ALOLAN] = { + .baseHP = 40, + .baseAttack = 35, + .baseDefense = 35, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_DARK), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .evYield_Speed = 1, + .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_RATTLED }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Meowth"), .cryId = CRY_MEOWTH, .natDexNum = NATIONAL_DEX_MEOWTH, .categoryName = _("Scratch Cat"), - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, - .baseHP = 40, - .baseAttack = 35, - .baseDefense = 35, - .baseSpeed = 90, - .baseSpAttack = 50, - .baseSpDefense = 40, - .evYield_Speed = 1, - .types = MON_TYPES(TYPE_DARK), - .itemRare = ITEM_QUICK_CLAW, - .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_RATTLED }, - .bodyColor = BODY_COLOR_GRAY, .height = 4, .weight = 42, + FOOTPRINT(Meowth) + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "It's accustomed to luxury because it used\n" "to live with Alolan royalty. Highly smart\n" @@ -5384,6 +5384,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_PERSIAN_ALOLAN] = { + .baseHP = 65, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 115, + .baseSpAttack = 75, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_DARK), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 148, .evYield_Speed = 2, @@ -5393,23 +5400,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_FUR_COAT, ABILITY_TECHNICIAN, ABILITY_RATTLED }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Persian"), .cryId = CRY_PERSIAN, .natDexNum = NATIONAL_DEX_PERSIAN, .categoryName = _("Classy Cat"), - FOOTPRINT(Persian) - .formSpeciesIdTable = sPersianFormSpeciesIdTable, - .baseHP = 65, - .baseAttack = 60, - .baseDefense = 60, - .baseSpeed = 115, - .baseSpAttack = 75, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_DARK), - .abilities = { ABILITY_FUR_COAT, ABILITY_TECHNICIAN, ABILITY_RATTLED }, - .bodyColor = BODY_COLOR_GRAY, .height = 11, .weight = 330, + FOOTPRINT(Persian) + .formSpeciesIdTable = sPersianFormSpeciesIdTable, .description = COMPOUND_STRING( "It looks down on everyone other than\n" "itself. In contrast to its lovely face, it\n" @@ -5441,31 +5441,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MEOWTH_GALARIAN] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 55, + .baseSpeed = 40, + .baseSpAttack = 40, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_STEEL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .evYield_Attack = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_TOUGH_CLAWS, ABILITY_UNNERVE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Meowth"), .cryId = CRY_MEOWTH, .natDexNum = NATIONAL_DEX_MEOWTH, .categoryName = _("Scratch Cat"), - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 55, - .baseSpeed = 40, - .baseSpAttack = 40, - .baseSpDefense = 40, - .evYield_Attack = 1, - .types = MON_TYPES(TYPE_STEEL), - .abilities = { ABILITY_PICKUP, ABILITY_TOUGH_CLAWS, ABILITY_UNNERVE }, - .bodyColor = BODY_COLOR_BROWN, .height = 4, .weight = 75, + FOOTPRINT(Meowth) + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "Living with a savage, seafaring people has\n" "hardened its body so much that parts of it\n" @@ -5549,32 +5549,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_MEOWTH_GIGANTAMAX] = { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 69, + .evYield_Speed = 1, + .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Meowth"), .cryId = CRY_MEOWTH, .natDexNum = NATIONAL_DEX_MEOWTH, .categoryName = _("Scratch Cat"), - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, - .baseHP = 40, - .baseAttack = 45, - .baseDefense = 35, - .baseSpeed = 90, - .baseSpAttack = 40, - .baseSpDefense = 40, - .evYield_Speed = 1, - .types = MON_TYPES(TYPE_NORMAL), - .itemRare = ITEM_QUICK_CLAW, - .abilities = { ABILITY_PICKUP, ABILITY_TECHNICIAN, ABILITY_UNNERVE }, - .bodyColor = BODY_COLOR_YELLOW, .height = 330, .weight = 0, + FOOTPRINT(Meowth) + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "The pattern that has appeared on\n" "its giant coin is thought to be the\n" @@ -5878,31 +5878,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_GROWLITHE [SPECIES_GROWLITHE] = { + .baseHP = 55, + .baseAttack = 70, + .baseDefense = 45, + .baseSpeed = 60, + .baseSpAttack = 70, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, .evYield_Attack = 1, - .speciesName = _("Growlithe"), - .cryId = CRY_GROWLITHE, - .natDexNum = NATIONAL_DEX_GROWLITHE, - FOOTPRINT(Growlithe) - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 55, - .baseAttack = 70, - .baseDefense = 45, - .baseSpeed = 60, - .baseSpAttack = 70, - .baseSpDefense = 50, - .types = MON_TYPES(TYPE_FIRE), .abilities = { ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Growlithe"), + .cryId = CRY_GROWLITHE, + .natDexNum = NATIONAL_DEX_GROWLITHE, .categoryName = _("Puppy"), .height = 7, .weight = 190, + FOOTPRINT(Growlithe) + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .description = COMPOUND_STRING( "Its superb sense of smell ensures that\n" "this Pokémon won't forget any scent,\n" @@ -5933,31 +5933,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE] = { + .baseHP = 90, + .baseAttack = 110, + .baseDefense = 80, + .baseSpeed = 95, + .baseSpAttack = 100, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, .evYield_Attack = 2, - .speciesName = _("Arcanine"), - .cryId = CRY_ARCANINE, - .natDexNum = NATIONAL_DEX_ARCANINE, - .categoryName = _("Legendary"), - FOOTPRINT(Arcanine) - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 90, - .baseAttack = 110, - .baseDefense = 80, - .baseSpeed = 95, - .baseSpAttack = 100, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_FIRE), .abilities = { ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Arcanine"), + .cryId = CRY_ARCANINE, + .natDexNum = NATIONAL_DEX_ARCANINE, + .categoryName = _("Legendary"), .height = 19, .weight = 1550, + FOOTPRINT(Arcanine) + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .description = COMPOUND_STRING( "This fleet-footed Pokémon is said to run\n" "over 6,200 miles in a single day and night.\n" @@ -5988,31 +5988,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_HISUIAN_FORMS [SPECIES_GROWLITHE_HISUIAN] = { + .baseHP = 60, + .baseAttack = 75, + .baseDefense = 45, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 50, + .types = MON_TYPES(TYPE_FIRE, TYPE_ROCK), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 70 : 91, .evYield_Attack = 1, - .speciesName = _("Growlithe"), - .cryId = CRY_GROWLITHE, - .natDexNum = NATIONAL_DEX_GROWLITHE, - FOOTPRINT(Growlithe) - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 60, - .baseAttack = 75, - .baseDefense = 45, - .baseSpeed = 55, - .baseSpAttack = 65, - .baseSpDefense = 50, - .types = MON_TYPES(TYPE_FIRE, TYPE_ROCK), .abilities = { ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_ROCK_HEAD }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Growlithe"), + .cryId = CRY_GROWLITHE, + .natDexNum = NATIONAL_DEX_GROWLITHE, .categoryName = _("Scout"), .height = 8, .weight = 227, + FOOTPRINT(Growlithe) + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .description = COMPOUND_STRING( "They patrol their territory in pairs.\n" "It's believed the igneous rock components\n" @@ -6043,31 +6043,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ARCANINE_HISUIAN] = { + .baseHP = 95, + .baseAttack = 115, + .baseDefense = 80, + .baseSpeed = 90, + .baseSpAttack = 95, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_FIRE, TYPE_ROCK), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 194 : 213, .evYield_Attack = 2, - .speciesName = _("Arcanine"), - .cryId = CRY_ARCANINE, - .natDexNum = NATIONAL_DEX_ARCANINE, - .categoryName = _("Legendary"), - FOOTPRINT(Arcanine) - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .baseHP = 95, - .baseAttack = 115, - .baseDefense = 80, - .baseSpeed = 90, - .baseSpAttack = 95, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_FIRE, TYPE_ROCK), .abilities = { ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_ROCK_HEAD }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Arcanine"), + .cryId = CRY_ARCANINE, + .natDexNum = NATIONAL_DEX_ARCANINE, + .categoryName = _("Legendary"), .height = 20, .weight = 1680, + FOOTPRINT(Arcanine) + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .description = COMPOUND_STRING( "Snaps at its foes with fangs cloaked in\n" "blazing flame. Despite its bulk, it deftly\n" @@ -6465,6 +6465,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_ALAKAZAM] = { + .baseHP = 55, + .baseAttack = 50, + .baseDefense = 45, + .baseSpeed = 120, + .baseSpAttack = 135, + .baseSpDefense = ALAKAZAM_SP_DEF, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 50, .evYield_SpAttack = 3, @@ -6483,12 +6489,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sAlakazamTeachableLearnset, .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, .formChangeTable = sAlakazamFormChangeTable, - .baseHP = 55, - .baseAttack = 50, - .baseDefense = 45, - .baseSpeed = 120, - .baseSpAttack = 135, - .baseSpDefense = ALAKAZAM_SP_DEF, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 250, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -6533,8 +6533,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALAKAZAM_MEGA] = { + .baseHP = 55, + .baseAttack = 50, + .baseDefense = 65, + .baseSpeed = 150, + .baseSpAttack = 175, + .baseSpDefense = ALAKAZAM_SP_DEF + 10, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 50, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpAttack = 3, .itemRare = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), @@ -6542,26 +6549,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_TRACE, ABILITY_TRACE, ABILITY_TRACE }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Alakazam"), + .cryId = CRY_ALAKAZAM_MEGA, .natDexNum = NATIONAL_DEX_ALAKAZAM, .categoryName = _("Psi"), + .height = 12, + .weight = 480, FOOTPRINT(Alakazam) .levelUpLearnset = sAlakazamLevelUpLearnset, .teachableLearnset = sAlakazamTeachableLearnset, - .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, - .formChangeTable = sAlakazamFormChangeTable, - .baseHP = 55, - .baseAttack = 50, - .baseDefense = 65, - .baseSpeed = 150, - .baseSpAttack = 175, - .baseSpDefense = ALAKAZAM_SP_DEF + 10, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, - .abilities = { ABILITY_TRACE, ABILITY_TRACE, ABILITY_TRACE }, - .cryId = CRY_ALAKAZAM_MEGA, - .height = 12, - .weight = 480, + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, + .formChangeTable = sAlakazamFormChangeTable, .description = COMPOUND_STRING( "Having traded away its muscles, Alakazam's\n" "true power has been unleashed. With its\n" @@ -6738,13 +6738,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MACHAMP, .natDexNum = NATIONAL_DEX_MACHAMP, .categoryName = _("Superpower"), + .height = 16, + .weight = 1300, FOOTPRINT(Machamp) .levelUpLearnset = sMachampLevelUpLearnset, .teachableLearnset = sMachampTeachableLearnset, .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, - .height = 16, - .weight = 1300, .description = COMPOUND_STRING( "It is impossible to defend against punches\n" "and chops doled out by its four arms.\n" @@ -6794,13 +6794,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_MACHAMP, .natDexNum = NATIONAL_DEX_MACHAMP, .categoryName = _("Superpower"), + .height = 250, + .weight = 0, FOOTPRINT(Machamp) .levelUpLearnset = sMachampLevelUpLearnset, .teachableLearnset = sMachampTeachableLearnset, .formSpeciesIdTable = sMachampFormSpeciesIdTable, .formChangeTable = sMachampFormChangeTable, - .height = 250, - .weight = 0, .description = COMPOUND_STRING( "One of these Pokémon once used\n" "its immeasurable strength to lift a\n" @@ -7130,36 +7130,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GEODUDE] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), - .itemRare = ITEM_EVERSTONE, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, .baseHP = 40, .baseAttack = 80, .baseDefense = 100, .baseSpeed = 20, .baseSpAttack = 30, .baseSpDefense = 30, + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), .catchRate = 255, .expYield = GEODUDE_EXP_YIELD, .evYield_Defense = 1, + .itemRare = ITEM_EVERSTONE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Geodude"), .cryId = CRY_GEODUDE, .natDexNum = NATIONAL_DEX_GEODUDE, .categoryName = _("Rock"), .height = 4, + .weight = 200, .pokemonScale = 347, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Geodude) .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .bodyColor = BODY_COLOR_BROWN, - .weight = 200, .description = COMPOUND_STRING( "It climbs mountain paths using only the\n" "power of its arms. Because they look just\n" @@ -7186,36 +7186,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), - .itemRare = ITEM_EVERSTONE, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, .baseHP = 55, .baseAttack = 95, .baseDefense = 115, .baseSpeed = 35, .baseSpAttack = 45, .baseSpDefense = 45, + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), .catchRate = 120, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, .evYield_Defense = 2, + .itemRare = ITEM_EVERSTONE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Graveler"), .cryId = CRY_GRAVELER, .natDexNum = NATIONAL_DEX_GRAVELER, .categoryName = _("Rock"), .height = 10, + .weight = 1050, .pokemonScale = 256, .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Graveler) .formSpeciesIdTable = sGravelerFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .bodyColor = BODY_COLOR_BROWN, - .weight = 1050, .description = COMPOUND_STRING( "They descend from mountains by tumbling\n" "down steep slopes. They are so brutal,\n" @@ -7242,32 +7242,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), - .itemRare = ITEM_EVERSTONE, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, .baseHP = 80, .baseAttack = GOLEM_ATTACK, .baseDefense = 130, .baseSpeed = 45, .baseSpAttack = 55, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), .catchRate = 45, .expYield = GOLEM_EXP_YIELD, .evYield_Defense = 3, - .speciesName = _("Golem"), - .cryId = CRY_GOLEM, - .natDexNum = NATIONAL_DEX_GOLEM, - .categoryName = _("Megaton"), - FOOTPRINT(Golem) - .formSpeciesIdTable = sGolemFormSpeciesIdTable, + .itemRare = ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SAND_VEIL }, .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Golem"), + .cryId = CRY_GOLEM, + .natDexNum = NATIONAL_DEX_GOLEM, + .categoryName = _("Megaton"), .height = 14, .weight = 3000, + FOOTPRINT(Golem) + .formSpeciesIdTable = sGolemFormSpeciesIdTable, .description = COMPOUND_STRING( "It is said to live in volcanic craters\n" "on mountain peaks. Once a year, it sheds\n" @@ -7297,37 +7297,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_GEODUDE_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, - .isAlolanForm = TRUE, .baseHP = 40, .baseAttack = 80, .baseDefense = 100, .baseSpeed = 20, .baseSpAttack = 30, .baseSpDefense = 30, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), .catchRate = 255, .expYield = GEODUDE_EXP_YIELD, .evYield_Defense = 1, + .itemRare = ITEM_CELL_BATTERY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Geodude"), .cryId = CRY_GEODUDE, .natDexNum = NATIONAL_DEX_GEODUDE, .categoryName = _("Rock"), .height = 4, + .weight = 203, + .isAlolanForm = TRUE, .pokemonScale = 347, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Geodude) .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .bodyColor = BODY_COLOR_BROWN, - .itemRare = ITEM_CELL_BATTERY, - .weight = 203, .description = COMPOUND_STRING( "Its body is a magnetic stone. Iron sand\n" "attach to parts of its body with stronger\n" @@ -7354,37 +7354,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GRAVELER_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, - .isAlolanForm = TRUE, .baseHP = 55, .baseAttack = 95, .baseDefense = 115, .baseSpeed = 35, .baseSpAttack = 45, .baseSpDefense = 45, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), .catchRate = 120, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 134, .evYield_Defense = 2, + .itemRare = ITEM_CELL_BATTERY, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 15, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Graveler"), .cryId = CRY_GRAVELER, .natDexNum = NATIONAL_DEX_GRAVELER, .categoryName = _("Rock"), .height = 10, + .weight = 1100, + .isAlolanForm = TRUE, .pokemonScale = 256, .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Graveler) .formSpeciesIdTable = sGravelerFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 15, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .bodyColor = BODY_COLOR_BROWN, - .itemRare = ITEM_CELL_BATTERY, - .weight = 1100, .description = COMPOUND_STRING( "When two Graveler smash each other over\n" "dravite, their favorite food, they cause\n" @@ -7411,33 +7411,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GOLEM_ALOLAN] = { - .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), - .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, - .isAlolanForm = TRUE, .baseHP = 80, .baseAttack = GOLEM_ATTACK, .baseDefense = 130, .baseSpeed = 45, .baseSpAttack = 55, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_ROCK, TYPE_ELECTRIC), .catchRate = 45, .expYield = GOLEM_EXP_YIELD, .evYield_Defense = 3, - .speciesName = _("Golem"), - .cryId = CRY_GOLEM, - .natDexNum = NATIONAL_DEX_GOLEM, - .categoryName = _("Megaton"), - FOOTPRINT(Golem) - .formSpeciesIdTable = sGolemFormSpeciesIdTable, + .itemCommon = ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_MAGNET_PULL, ABILITY_STURDY, ABILITY_GALVANIZE }, .bodyColor = BODY_COLOR_BROWN, - .itemCommon = ITEM_CELL_BATTERY, + .speciesName = _("Golem"), + .cryId = CRY_GOLEM, + .natDexNum = NATIONAL_DEX_GOLEM, + .categoryName = _("Megaton"), .height = 17, .weight = 3160, + .isAlolanForm = TRUE, + FOOTPRINT(Golem) + .formSpeciesIdTable = sGolemFormSpeciesIdTable, .description = COMPOUND_STRING( "It fires rocks charged with electricity.\n" "Even if the rock isn't fired that\n" @@ -7469,31 +7469,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_PONYTA [SPECIES_PONYTA] = { - .types = MON_TYPES(TYPE_FIRE), - .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, - .bodyColor = BODY_COLOR_YELLOW, .baseHP = 50, .baseAttack = 85, .baseDefense = 55, .baseSpeed = 90, .baseSpAttack = 65, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, .evYield_Speed = 1, - .speciesName = _("Ponyta"), - .cryId = CRY_PONYTA, - .natDexNum = NATIONAL_DEX_PONYTA, - FOOTPRINT(Ponyta) - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Ponyta"), + .cryId = CRY_PONYTA, + .natDexNum = NATIONAL_DEX_PONYTA, .categoryName = _("Fire Horse"), .height = 10, .weight = 300, + FOOTPRINT(Ponyta) + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .description = COMPOUND_STRING( "A Ponyta is very weak at birth. It can\n" "barely stand up. Its legs become stronger\n" @@ -7524,35 +7524,35 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH] = { - .types = MON_TYPES(TYPE_FIRE), - .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, - .bodyColor = BODY_COLOR_YELLOW, .baseHP = 65, .baseAttack = 100, .baseDefense = 70, .baseSpeed = 105, .baseSpAttack = 80, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_RUN_AWAY, ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Rapidash"), .cryId = CRY_RAPIDASH, .natDexNum = NATIONAL_DEX_RAPIDASH, + .categoryName = _("Fire Horse"), .height = 17, + .weight = 950, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 289, .trainerOffset = 1, FOOTPRINT(Rapidash) .formSpeciesIdTable = sRapidashFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .categoryName = _("Fire Horse"), - .weight = 950, .description = COMPOUND_STRING( "It usually canters casually in the fields\n" "and plains. But once a Rapidash turns\n" @@ -7578,32 +7578,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_PONYTA_GALARIAN] = { - .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, - .bodyColor = BODY_COLOR_WHITE, - .isGalarianForm = TRUE, .baseHP = 50, .baseAttack = 85, .baseDefense = 55, .baseSpeed = 90, .baseSpAttack = 65, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 82 : 152, .evYield_Speed = 1, - .speciesName = _("Ponyta"), - .cryId = CRY_PONYTA, - .natDexNum = NATIONAL_DEX_PONYTA, - FOOTPRINT(Ponyta) - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .types = MON_TYPES(TYPE_PSYCHIC), + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Ponyta"), + .cryId = CRY_PONYTA, + .natDexNum = NATIONAL_DEX_PONYTA, .categoryName = _("Unique Horn"), .height = 8, .weight = 240, + .isGalarianForm = TRUE, + FOOTPRINT(Ponyta) + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .description = COMPOUND_STRING( "Its small horn hides a healing power.\n" "This Pokémon will look into your eyes and\n" @@ -7633,36 +7633,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_RAPIDASH_GALARIAN] = { - .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, - .bodyColor = BODY_COLOR_WHITE, - .isGalarianForm = TRUE, .baseHP = 65, .baseAttack = 100, .baseDefense = 70, .baseSpeed = 105, .baseSpAttack = 80, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 192, .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_RUN_AWAY, ABILITY_PASTEL_VEIL, ABILITY_ANTICIPATION }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Rapidash"), .cryId = CRY_RAPIDASH, .natDexNum = NATIONAL_DEX_RAPIDASH, + .categoryName = _("Unique Horn"), .height = 17, + .weight = 800, + .isGalarianForm = TRUE, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 289, .trainerOffset = 1, FOOTPRINT(Rapidash) .formSpeciesIdTable = sRapidashFormSpeciesIdTable, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), - .categoryName = _("Unique Horn"), - .weight = 800, .description = COMPOUND_STRING( "Little can stand up to its psycho cut.\n" "Unleashed from this Pokémon's horn,\n" @@ -7696,16 +7696,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 15, .baseSpAttack = 40, .baseSpDefense = 40, + .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, .evYield_HP = 1, + .itemRare = ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowpoke"), + .cryId = CRY_SLOWPOKE, .natDexNum = NATIONAL_DEX_SLOWPOKE, .categoryName = _("Dopey"), .height = 12, @@ -7716,10 +7720,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Slowpoke) .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, - .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), - .itemRare = ITEM_LAGGING_TAIL, - .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, - .cryId = CRY_SLOWPOKE, .description = COMPOUND_STRING( "It catches prey by dipping its tail in\n" "water at the side of a river. But it often\n" @@ -7747,32 +7747,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO] = { + .baseHP = 95, + .baseAttack = 75, + .baseDefense = 110, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, + .evYield_Defense = (P_UPDATED_EVS >= GEN_8) ? 2 : 3, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowbro"), .cryId = CRY_SLOWBRO, .natDexNum = NATIONAL_DEX_SLOWBRO, .categoryName = _("Hermit Crab"), - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 75, - .baseDefense = 110, - .baseSpeed = 30, - .baseSpAttack = 100, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, - .evYield_Defense = (P_UPDATED_EVS >= GEN_8) ? 2 : 3, - .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .height = 16, .weight = 785, + FOOTPRINT(Slowbro) + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "Its tail has a Shellder firmly attached\n" "with a bite. As a result, the tail can't be\n" @@ -7803,20 +7803,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING] = { - .catchRate = 70, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), - .bodyColor = BODY_COLOR_PINK, - .speciesName = _("Slowking"), - .cryId = CRY_SLOWKING, - .natDexNum = NATIONAL_DEX_SLOWKING, - .weight = 795, - FOOTPRINT(Slowking) - .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .baseHP = 95, .baseAttack = 75, .baseDefense = 80, @@ -7824,11 +7810,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 100, .baseSpDefense = 110, .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), + .catchRate = 70, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, .evYield_SpDefense = 3, .itemRare = ITEM_KINGS_ROCK, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), .abilities = { ABILITY_OBLIVIOUS, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, + .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Slowking"), + .cryId = CRY_SLOWKING, + .natDexNum = NATIONAL_DEX_SLOWKING, .categoryName = _("Royal"), .height = 20, + .weight = 795, + FOOTPRINT(Slowking) + .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .description = COMPOUND_STRING( "It undertakes research every day to\n" "solve the mysteries of the world.\n" @@ -7859,32 +7859,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SLOWBRO_MEGA] = { + .baseHP = 95, + .baseAttack = 75, + .baseDefense = 180, + .baseSpeed = 30, + .baseSpAttack = 130, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .catchRate = 75, + .expYield = 207, + .evYield_Defense = 2, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowbro"), .cryId = CRY_SLOWBRO, .natDexNum = NATIONAL_DEX_SLOWBRO, .categoryName = _("Hermit Crab"), - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 75, - .baseDefense = 180, - .baseSpeed = 30, - .baseSpAttack = 130, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), - .expYield = 207, - .evYield_Defense = 2, - .abilities = { ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR, ABILITY_SHELL_ARMOR }, .height = 20, .weight = 1200, + FOOTPRINT(Slowbro) + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "When bathed in the energy of Mega\n" "Evolution, Shellder converts into\n" @@ -7923,6 +7923,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 15, .baseSpAttack = 40, .baseSpDefense = 40, + .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 99, .evYield_HP = 1, @@ -7931,8 +7932,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_GLUTTONY, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowpoke"), + .cryId = CRY_SLOWPOKE_GALARIAN, .natDexNum = NATIONAL_DEX_SLOWPOKE, .categoryName = _("Dopey"), .height = 12, @@ -7943,9 +7946,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerOffset = 0, FOOTPRINT(Slowpoke) .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, - .types = MON_TYPES(TYPE_PSYCHIC), - .abilities = { ABILITY_GLUTTONY, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, - .cryId = CRY_SLOWPOKE_GALARIAN, .description = COMPOUND_STRING( "Although it is normally zoned out, its\n" "expression abruptly sharpens on occasion.\n" @@ -7973,32 +7973,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_SLOWBRO_GALARIAN] = { + .baseHP = 95, + .baseAttack = 100, + .baseDefense = 95, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_POISON, TYPE_PSYCHIC), .catchRate = 75, + .expYield = 172, + .evYield_Attack = 2, .itemRare = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_QUICK_DRAW, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowbro"), .cryId = CRY_SLOWBRO, .natDexNum = NATIONAL_DEX_SLOWBRO, .categoryName = _("Hermit Crab"), - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 100, - .baseDefense = 95, - .baseSpeed = 30, - .baseSpAttack = 100, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_POISON, TYPE_PSYCHIC), - .expYield = 172, - .evYield_Attack = 2, - .abilities = { ABILITY_QUICK_DRAW, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .height = 16, .weight = 705, + FOOTPRINT(Slowbro) + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "A Shellder bite set off a chemical reaction\n" "with the spices inside Slowbro's body,\n" @@ -8029,31 +8029,31 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SLOWKING_GALARIAN] = { + .baseHP = 95, + .baseAttack = 65, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 110, + .baseSpDefense = 110, + .types = MON_TYPES(TYPE_POISON, TYPE_PSYCHIC), .catchRate = 70, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 164, + .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_CURIOUS_MEDICINE, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowking"), .cryId = CRY_SLOWKING, .natDexNum = NATIONAL_DEX_SLOWKING, + .categoryName = _("Hexpert"), + .height = 18, .weight = 795, FOOTPRINT(Slowking) .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 65, - .baseDefense = 80, - .baseSpeed = 30, - .baseSpAttack = 110, - .baseSpDefense = 110, - .types = MON_TYPES(TYPE_POISON, TYPE_PSYCHIC), - .evYield_SpDefense = 2, - .abilities = { ABILITY_CURIOUS_MEDICINE, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, - .categoryName = _("Hexpert"), - .height = 18, .description = COMPOUND_STRING( "A combination of toxins and the shock of\n" "evolving has increased Shellder's\n" @@ -8272,32 +8272,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_FARFETCHD] = { + .baseHP = 52, + .baseAttack = FARFETCHD_ATTACK, + .baseDefense = 55, + .baseSpeed = 60, + .baseSpAttack = 58, + .baseSpDefense = 62, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), .catchRate = 45, .expYield = FARFETCHD_EXP_YIELD, .evYield_Attack = 1, + .itemRare = ITEM_LEEK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD), + .abilities = { ABILITY_KEEN_EYE, ABILITY_INNER_FOCUS, ABILITY_DEFIANT }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Farfetch'd"), .cryId = CRY_FARFETCHD, .natDexNum = NATIONAL_DEX_FARFETCHD, .categoryName = _("Wild Duck"), - FOOTPRINT(Farfetchd) - .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, - .baseHP = 52, - .baseDefense = 55, - .baseSpeed = 60, - .baseSpAttack = 58, - .baseSpDefense = 62, - .baseAttack = FARFETCHD_ATTACK, - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), - .itemRare = ITEM_LEEK, - .abilities = { ABILITY_KEEN_EYE, ABILITY_INNER_FOCUS, ABILITY_DEFIANT }, .height = 8, .weight = 150, + FOOTPRINT(Farfetchd) + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .description = COMPOUND_STRING( "It is always seen with a stick from a plant.\n" "Apparently, there are good sticks and bad\n" @@ -8327,32 +8327,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_FARFETCHD_GALARIAN] = { + .baseHP = 52, + .baseAttack = FARFETCHD_ATTACK + 5, + .baseDefense = 55, + .baseSpeed = 55, + .baseSpAttack = 58, + .baseSpDefense = 62, + .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = FARFETCHD_EXP_YIELD, .evYield_Attack = 1, + .itemCommon = ITEM_LEEK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_FIELD), + .abilities = { ABILITY_STEADFAST, ABILITY_NONE, ABILITY_SCRAPPY }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Farfetch'd"), .cryId = CRY_FARFETCHD, .natDexNum = NATIONAL_DEX_FARFETCHD, .categoryName = _("Wild Duck"), - FOOTPRINT(Farfetchd) - .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, - .baseHP = 52, - .baseAttack = FARFETCHD_ATTACK + 5, - .baseDefense = 55, - .baseSpeed = 55, - .baseSpAttack = 58, - .baseSpDefense = 62, - .types = MON_TYPES(TYPE_FIGHTING), - .itemCommon = ITEM_LEEK, - .abilities = { ABILITY_STEADFAST, ABILITY_NONE, ABILITY_SCRAPPY }, .height = 8, .weight = 420, + FOOTPRINT(Farfetchd) + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .description = COMPOUND_STRING( "The stalks of leeks are thicker and longer\n" "in the Galar region. Brave Farfetch'd\n" @@ -8669,32 +8669,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_GRIMER [SPECIES_GRIMER] = { - .types = MON_TYPES(TYPE_POISON), - .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, - .bodyColor = BODY_COLOR_PURPLE, .baseHP = 80, .baseAttack = 80, .baseDefense = 50, .baseSpeed = 25, .baseSpAttack = 40, .baseSpDefense = 50, + .types = MON_TYPES(TYPE_POISON), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, .evYield_HP = 1, - .speciesName = _("Grimer"), - .cryId = CRY_GRIMER, - .natDexNum = NATIONAL_DEX_GRIMER, - .categoryName = _("Sludge"), - FOOTPRINT(Grimer) - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Grimer"), + .cryId = CRY_GRIMER, + .natDexNum = NATIONAL_DEX_GRIMER, + .categoryName = _("Sludge"), .height = 9, .weight = 300, + FOOTPRINT(Grimer) + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .description = COMPOUND_STRING( "Born from polluted sludge in the sea,\n" "Grimer's favorite food is anything filthy.\n" @@ -8724,33 +8724,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MUK] = { - .types = MON_TYPES(TYPE_POISON), - .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, - .bodyColor = BODY_COLOR_PURPLE, .baseHP = 105, .baseAttack = 105, .baseDefense = 75, .baseSpeed = 50, .baseSpAttack = 65, .baseSpDefense = 100, + .types = MON_TYPES(TYPE_POISON), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157, .evYield_HP = 1, .evYield_Attack = 1, - .speciesName = _("Muk"), - .cryId = CRY_MUK, - .natDexNum = NATIONAL_DEX_MUK, - .categoryName = _("Sludge"), - FOOTPRINT(Muk) - .formSpeciesIdTable = sMukFormSpeciesIdTable, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STENCH, ABILITY_STICKY_HOLD, ABILITY_POISON_TOUCH }, + .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Muk"), + .cryId = CRY_MUK, + .natDexNum = NATIONAL_DEX_MUK, + .categoryName = _("Sludge"), .height = 12, .weight = 300, + FOOTPRINT(Muk) + .formSpeciesIdTable = sMukFormSpeciesIdTable, .description = COMPOUND_STRING( "It prefers warm and humid habitats.\n" "In the summertime, the toxic substances\n" @@ -8781,33 +8781,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_GRIMER_ALOLAN] = { - .types = MON_TYPES(TYPE_POISON, TYPE_DARK), - .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, - .bodyColor = BODY_COLOR_GREEN, - .isAlolanForm = TRUE, .baseHP = 80, .baseAttack = 80, .baseDefense = 50, .baseSpeed = 25, .baseSpAttack = 40, .baseSpDefense = 50, + .types = MON_TYPES(TYPE_POISON, TYPE_DARK), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, .evYield_HP = 1, - .speciesName = _("Grimer"), - .cryId = CRY_GRIMER, - .natDexNum = NATIONAL_DEX_GRIMER, - .categoryName = _("Sludge"), - FOOTPRINT(Grimer) - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, + .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Grimer"), + .cryId = CRY_GRIMER, + .natDexNum = NATIONAL_DEX_GRIMER, + .categoryName = _("Sludge"), .height = 7, .weight = 420, + .isAlolanForm = TRUE, + FOOTPRINT(Grimer) + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .description = COMPOUND_STRING( "There are a hundred or so of them living\n" "in Alola's waste-disposal site. They're all\n" @@ -8843,29 +8843,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 50, .baseSpAttack = 65, .baseSpDefense = 100, + .types = MON_TYPES(TYPE_POISON, TYPE_DARK), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157, .evYield_HP = 1, .evYield_Attack = 1, - .speciesName = _("Muk"), - .cryId = CRY_MUK, - .natDexNum = NATIONAL_DEX_MUK, - .categoryName = _("Sludge"), - FOOTPRINT(Muk) - .formSpeciesIdTable = sMukFormSpeciesIdTable, .itemRare = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - .types = MON_TYPES(TYPE_POISON, TYPE_DARK), .abilities = { ABILITY_POISON_TOUCH, ABILITY_GLUTTONY, ABILITY_POWER_OF_ALCHEMY }, .bodyColor = BODY_COLOR_GREEN, - .isAlolanForm = TRUE, .noFlip = TRUE, + .speciesName = _("Muk"), + .cryId = CRY_MUK, + .natDexNum = NATIONAL_DEX_MUK, + .categoryName = _("Sludge"), .height = 10, .weight = 520, + FOOTPRINT(Muk) + .formSpeciesIdTable = sMukFormSpeciesIdTable, + .isAlolanForm = TRUE, .description = COMPOUND_STRING( "While it's unexpectedly quiet and friendly,\n" "if it's not fed any trash for a while,,\n" @@ -9125,6 +9125,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GENGAR] = { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 45, .evYield_SpAttack = 3, @@ -9142,12 +9148,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, - .baseHP = 60, - .baseAttack = 65, - .baseDefense = 60, - .baseSpeed = 110, - .baseSpAttack = 130, - .baseSpDefense = 75, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 250, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9185,14 +9185,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GENGAR_MEGA] = { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 80, + .baseSpeed = 130, + .baseSpAttack = 170, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_SHADOW_TAG, ABILITY_SHADOW_TAG, ABILITY_SHADOW_TAG }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Gengar"), .natDexNum = NATIONAL_DEX_GENGAR, @@ -9202,14 +9210,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, - .baseHP = 60, - .baseAttack = 65, - .baseDefense = 80, - .baseSpeed = 130, - .baseSpAttack = 170, - .baseSpDefense = 95, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, - .abilities = { ABILITY_SHADOW_TAG, ABILITY_SHADOW_TAG, ABILITY_SHADOW_TAG }, .isMegaEvolution = TRUE, .height = 14, .weight = 405, @@ -9241,14 +9241,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GIGANTAMAX_FORMS [SPECIES_GENGAR_GIGANTAMAX] = { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 75, .types = MON_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 = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = GENGAR_ABILITIES, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Gengar"), .natDexNum = NATIONAL_DEX_GENGAR, @@ -9258,14 +9266,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sGengarTeachableLearnset, .formSpeciesIdTable = sGengarFormSpeciesIdTable, .formChangeTable = sGengarFormChangeTable, - .baseHP = 60, - .baseAttack = 65, - .baseDefense = 60, - .baseSpeed = 110, - .baseSpAttack = 130, - .baseSpDefense = 75, - .expYield = 225, - .abilities = GENGAR_ABILITIES, .isGigantamax = TRUE, .height = 200, .weight = 0, @@ -9353,8 +9353,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_STEELIX] = { + .baseHP = 75, + .baseAttack = 85, + .baseDefense = 200, + .baseSpeed = 30, + .baseSpAttack = 55, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), .catchRate = 25, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 179 : 196, .evYield_Defense = 2, .itemRare = ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), @@ -9362,26 +9369,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Steelix"), + .cryId = CRY_STEELIX, .natDexNum = NATIONAL_DEX_STEELIX, .categoryName = _("Iron Snake"), + .height = 92, + .weight = 4000, FOOTPRINT(Steelix) .levelUpLearnset = sSteelixLevelUpLearnset, .teachableLearnset = sSteelixTeachableLearnset, .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, - .baseHP = 75, - .baseAttack = 85, - .baseDefense = 200, - .baseSpeed = 30, - .baseSpAttack = 55, - .baseSpDefense = 65, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 179 : 196, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_STURDY, ABILITY_SHEER_FORCE }, - .cryId = CRY_STEELIX, - .height = 92, - .weight = 4000, .description = COMPOUND_STRING( "Steelix live even further underground\n" "than Onix. This Pokémon is known to dig\n" @@ -9414,8 +9414,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_STEELIX_MEGA] = { + .baseHP = 75, + .baseAttack = 125, + .baseDefense = 230, + .baseSpeed = 30, + .baseSpAttack = 55, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_STEEL, TYPE_GROUND), .catchRate = 25, + .expYield = 214, .evYield_Defense = 2, .itemRare = ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), @@ -9423,26 +9430,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SAND_FORCE, ABILITY_SAND_FORCE, ABILITY_SAND_FORCE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Steelix"), + .cryId = CRY_STEELIX_MEGA, .natDexNum = NATIONAL_DEX_STEELIX, .categoryName = _("Iron Snake"), + .height = 105, + .weight = 7400, FOOTPRINT(Steelix) .levelUpLearnset = sSteelixLevelUpLearnset, .teachableLearnset = sSteelixTeachableLearnset, .formSpeciesIdTable = sSteelixFormSpeciesIdTable, .formChangeTable = sSteelixFormChangeTable, - .baseHP = 75, - .baseAttack = 125, - .baseDefense = 230, - .baseSpeed = 30, - .baseSpAttack = 55, - .baseSpDefense = 95, - .expYield = 214, - .abilities = { ABILITY_SAND_FORCE, ABILITY_SAND_FORCE, ABILITY_SAND_FORCE }, - .cryId = CRY_STEELIX_MEGA, - .height = 105, - .weight = 7400, .description = COMPOUND_STRING( "The cells within its body, crystallized by\n" "the energy produced from Mega Evolution,\n" @@ -9662,13 +9662,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_KINGLER, .natDexNum = NATIONAL_DEX_KINGLER, .categoryName = _("Pincer"), + .height = 13, + .weight = 600, FOOTPRINT(Kingler) .levelUpLearnset = sKinglerLevelUpLearnset, .teachableLearnset = sKinglerTeachableLearnset, .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, - .height = 13, - .weight = 600, .description = COMPOUND_STRING( "It waves its huge, oversized claw in the\n" "air to communicate with others.\n" @@ -9719,13 +9719,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_KINGLER, .natDexNum = NATIONAL_DEX_KINGLER, .categoryName = _("Pincer"), + .height = 190, + .weight = 0, FOOTPRINT(Kingler) .levelUpLearnset = sKinglerLevelUpLearnset, .teachableLearnset = sKinglerTeachableLearnset, .formSpeciesIdTable = sKinglerFormSpeciesIdTable, .formChangeTable = sKinglerFormChangeTable, - .height = 190, - .weight = 0, .description = COMPOUND_STRING( "The flow of Gigantamax energy has\n" "spurred this Pokémon's left pincer\n" @@ -9770,29 +9770,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 100, .baseSpAttack = 55, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, .evYield_Speed = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Voltorb"), .cryId = CRY_VOLTORB, .natDexNum = NATIONAL_DEX_VOLTORB, + .categoryName = _("Ball"), .height = 5, + .weight = 104, .pokemonScale = 364, .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Voltorb) .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, - .genderRatio = MON_GENDERLESS, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, - .bodyColor = BODY_COLOR_RED, - .types = MON_TYPES(TYPE_ELECTRIC), - .categoryName = _("Ball"), - .weight = 104, .description = COMPOUND_STRING( "It bears an uncanny and unexplained\n" "resemblance to a Poké Ball. Because it\n" @@ -9821,32 +9821,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseHP = 60, .baseAttack = 50, .baseDefense = 70, + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, .baseSpAttack = 80, .baseSpDefense = 80, - .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, + .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 60, .expYield = ELECTRODE_EXP_YIELD, .evYield_Speed = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Electrode"), .cryId = CRY_ELECTRODE, .natDexNum = NATIONAL_DEX_ELECTRODE, + .categoryName = _("Ball"), .height = 12, + .weight = 666, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Electrode) .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, - .genderRatio = MON_GENDERLESS, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, - .bodyColor = BODY_COLOR_RED, - .types = MON_TYPES(TYPE_ELECTRIC), - .categoryName = _("Ball"), - .weight = 666, .description = COMPOUND_STRING( "They appear in great numbers at electric\n" "power plants. Because they feed on\n" @@ -9878,29 +9878,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 100, .baseSpAttack = 55, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 103, .evYield_Speed = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Voltorb"), .cryId = CRY_VOLTORB, .natDexNum = NATIONAL_DEX_VOLTORB, + .categoryName = _("Sphere"), .height = 5, + .weight = 130, .pokemonScale = 364, .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Voltorb) .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, - .genderRatio = MON_GENDERLESS, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, - .bodyColor = BODY_COLOR_RED, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), - .categoryName = _("Sphere"), - .weight = 130, .description = COMPOUND_STRING( "It esembles an ancient Poké Ball design.\n" "When excited, it discharges the electric\n" @@ -9930,32 +9930,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseHP = 60, .baseAttack = 50, .baseDefense = 70, + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, .baseSpAttack = 80, .baseSpDefense = 80, - .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 150 : 140, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .catchRate = 60, .expYield = ELECTRODE_EXP_YIELD, .evYield_Speed = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Electrode"), .cryId = CRY_ELECTRODE, .natDexNum = NATIONAL_DEX_ELECTRODE, + .categoryName = _("Sphere"), .height = 12, + .weight = 710, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Electrode) .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, - .genderRatio = MON_GENDERLESS, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), - .abilities = { ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH }, - .bodyColor = BODY_COLOR_RED, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), - .categoryName = _("Sphere"), - .weight = 710, .description = COMPOUND_STRING( "The tissue on the surface of its body is\n" "similar in composition to an Apricorn.\n" @@ -10049,6 +10049,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_EXEGGUTOR] = { + .baseHP = 95, + .baseAttack = 95, + .baseDefense = 85, + .baseSpeed = 55, + .baseSpAttack = 125, + .baseSpDefense = EXEGGUTOR_SP_DEF, + .types = MON_TYPES(TYPE_GRASS, TYPE_PSYCHIC), .catchRate = 45, .expYield = EXEGGUTOR_EXP_YIELD, .evYield_SpAttack = 2, @@ -10057,23 +10064,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_NONE, ABILITY_HARVEST }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Exeggutor"), .cryId = CRY_EXEGGUTOR, .natDexNum = NATIONAL_DEX_EXEGGUTOR, .categoryName = _("Coconut"), - FOOTPRINT(Exeggutor) - .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 95, - .baseDefense = 85, - .baseSpeed = 55, - .baseSpAttack = 125, - .baseSpDefense = EXEGGUTOR_SP_DEF, - .types = MON_TYPES(TYPE_GRASS, TYPE_PSYCHIC), - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_NONE, ABILITY_HARVEST }, .height = 20, .weight = 1200, + FOOTPRINT(Exeggutor) + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .description = COMPOUND_STRING( "Originally from the tropics, Exeggutor's\n" "heads grow larger from exposure to strong\n" @@ -10103,6 +10103,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_ALOLAN_FORMS [SPECIES_EXEGGUTOR_ALOLAN] = { + .baseHP = 95, + .baseAttack = 105, + .baseDefense = 85, + .baseSpeed = 45, + .baseSpAttack = 125, + .baseSpDefense = EXEGGUTOR_SP_DEF, + .types = MON_TYPES(TYPE_GRASS, TYPE_DRAGON), .catchRate = 45, .expYield = EXEGGUTOR_EXP_YIELD, .evYield_SpAttack = 2, @@ -10111,23 +10118,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .abilities = { ABILITY_FRISK, ABILITY_NONE, ABILITY_HARVEST }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Exeggutor"), .cryId = CRY_EXEGGUTOR, .natDexNum = NATIONAL_DEX_EXEGGUTOR, .categoryName = _("Coconut"), - FOOTPRINT(Exeggutor) - .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 105, - .baseDefense = 85, - .baseSpeed = 45, - .baseSpAttack = 125, - .baseSpDefense = EXEGGUTOR_SP_DEF, - .types = MON_TYPES(TYPE_GRASS, TYPE_DRAGON), - .abilities = { ABILITY_FRISK, ABILITY_NONE, ABILITY_HARVEST }, .height = 109, .weight = 4156, + FOOTPRINT(Exeggutor) + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .description = COMPOUND_STRING( "Alola is the best environment for\n" "this Pokémon. Local people take pride\n" @@ -10222,6 +10222,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 45, .baseSpAttack = 50, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124, .evYield_Defense = 2, @@ -10231,21 +10232,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_LIGHTNING_ROD, ABILITY_BATTLE_ARMOR }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Marowak"), .cryId = CRY_MAROWAK, .natDexNum = NATIONAL_DEX_MAROWAK, .categoryName = _("Bone Keeper"), .height = 10, + .weight = 450, .pokemonScale = 293, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Marowak) .formSpeciesIdTable = sMarowakFormSpeciesIdTable, - .types = MON_TYPES(TYPE_GROUND), - .abilities = { ABILITY_ROCK_HEAD, ABILITY_LIGHTNING_ROD, ABILITY_BATTLE_ARMOR }, - .bodyColor = BODY_COLOR_BROWN, - .weight = 450, .description = COMPOUND_STRING( "A Marowak is the evolved form of a Cubone\n" "that has grown tough by overcoming the\n" @@ -10277,6 +10277,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 45, .baseSpAttack = 50, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124, .evYield_Defense = 2, @@ -10286,21 +10287,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_CURSED_BODY, ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Marowak"), .cryId = CRY_MAROWAK, .natDexNum = NATIONAL_DEX_MAROWAK, .categoryName = _("Bone Keeper"), .height = 10, + .weight = 340, .pokemonScale = 293, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Marowak) .formSpeciesIdTable = sMarowakFormSpeciesIdTable, - .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), - .abilities = { ABILITY_CURSED_BODY, ABILITY_LIGHTNING_ROD, ABILITY_ROCK_HEAD }, - .bodyColor = BODY_COLOR_PURPLE, - .weight = 340, .description = COMPOUND_STRING( "The cursed flames that light up the bone\n" "carried by this Pokémon are said\n" @@ -10723,9 +10723,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 60, .baseSpAttack = 85, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_POISON), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, .evYield_Defense = 2, + .itemRare = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -10738,8 +10740,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Poison Gas"), FOOTPRINT(Weezing) .formSpeciesIdTable = sWeezingFormSpeciesIdTable, - .types = MON_TYPES(TYPE_POISON), - .itemRare = ITEM_SMOKE_BALL, #if P_UPDATED_ABILITIES >= GEN_8 .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH }, #else @@ -10784,28 +10784,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 60, .baseSpAttack = 85, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_POISON, TYPE_FAIRY), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, .evYield_Defense = 2, + .itemRare = ITEM_MISTY_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_MISTY_SURGE }, + .bodyColor = BODY_COLOR_GRAY, .noFlip = TRUE, .speciesName = _("Weezing"), .cryId = CRY_WEEZING, .natDexNum = NATIONAL_DEX_WEEZING, .categoryName = _("Poison Gas"), + .height = 30, + .weight = 160, FOOTPRINT(Weezing) .formSpeciesIdTable = sWeezingFormSpeciesIdTable, - .types = MON_TYPES(TYPE_POISON, TYPE_FAIRY), - .itemRare = ITEM_MISTY_SEED, - .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_MISTY_SURGE }, - .bodyColor = BODY_COLOR_GRAY, .isGalarianForm = TRUE, - .height = 30, - .weight = 160, .description = COMPOUND_STRING( "Long ago, when droves of factories fouled\n" "the air with pollution, it changed into this\n" @@ -11298,19 +11298,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_KANGASKHAN [SPECIES_KANGASKHAN] = { + .baseHP = 105, + .baseAttack = 95, + .baseDefense = 80, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 175, .evYield_HP = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_EARLY_BIRD, ABILITY_SCRAPPY, ABILITY_INNER_FOCUS }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Kangaskhan"), + .cryId = CRY_KANGASKHAN, .natDexNum = NATIONAL_DEX_KANGASKHAN, .categoryName = _("Parent"), .height = 22, + .weight = 800, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 387, @@ -11320,16 +11330,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sKangaskhanTeachableLearnset, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, - .baseHP = 105, - .baseAttack = 95, - .baseDefense = 80, - .baseSpeed = 90, - .baseSpAttack = 40, - .baseSpDefense = 80, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 175, - .abilities = { ABILITY_EARLY_BIRD, ABILITY_SCRAPPY, ABILITY_INNER_FOCUS }, - .cryId = CRY_KANGASKHAN, - .weight = 800, .description = COMPOUND_STRING( "If you come across a young Kangaskhan\n" "playing by itself, never try to catch it.\n" @@ -11353,19 +11353,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_KANGASKHAN_MEGA] = { + .baseHP = 105, + .baseAttack = 125, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 60, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, + .expYield = 207, .evYield_HP = 2, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_PARENTAL_BOND, ABILITY_PARENTAL_BOND, ABILITY_PARENTAL_BOND }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Kangaskhan"), + .cryId = CRY_KANGASKHAN_MEGA, .natDexNum = NATIONAL_DEX_KANGASKHAN, .categoryName = _("Parent"), .height = 22, + .weight = 1000, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 387, @@ -11375,17 +11385,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sKangaskhanTeachableLearnset, .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, .formChangeTable = sKangaskhanFormChangeTable, - .baseHP = 105, - .baseAttack = 125, - .baseDefense = 100, - .baseSpeed = 100, - .baseSpAttack = 60, - .baseSpDefense = 100, - .expYield = 207, - .abilities = { ABILITY_PARENTAL_BOND, ABILITY_PARENTAL_BOND, ABILITY_PARENTAL_BOND }, .isMegaEvolution = TRUE, - .cryId = CRY_KANGASKHAN_MEGA, - .weight = 1000, .description = COMPOUND_STRING( "When the mother sees the back of her\n" "Mega-Evolved child, it makes her think\n" @@ -11875,6 +11875,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MR_MIME] = { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 65, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 120, .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, .genderRatio = PERCENT_FEMALE(50), @@ -11883,16 +11889,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), .speciesName = _("Mr. Mime"), - .cryId = CRY_MR_MIME, - .natDexNum = NATIONAL_DEX_MR_MIME, - FOOTPRINT(MrMime) - .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, - .baseHP = 40, - .baseAttack = 45, - .baseDefense = 65, - .baseSpeed = 90, - .baseSpAttack = 100, - .baseSpDefense = 120, + .cryId = CRY_MR_MIME, + .natDexNum = NATIONAL_DEX_MR_MIME, + FOOTPRINT(MrMime) + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, #if P_UPDATED_TYPES >= GEN_6 .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), #else @@ -11933,18 +11933,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MR_MIME_GALARIAN] = { - .catchRate = 45, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 25, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), - .speciesName = _("Mr. Mime"), - .cryId = CRY_MR_MIME, - .natDexNum = NATIONAL_DEX_MR_MIME, - FOOTPRINT(MrMime) - .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .baseHP = 50, .baseAttack = 65, .baseDefense = 65, @@ -11952,12 +11940,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpAttack = 90, .baseSpDefense = 90, .types = MON_TYPES(TYPE_ICE, TYPE_PSYCHIC), + .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, .evYield_Speed = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), .abilities = { ABILITY_VITAL_SPIRIT, ABILITY_SCREEN_CLEANER, ABILITY_ICE_BODY }, .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Mr. Mime"), + .cryId = CRY_MR_MIME, + .natDexNum = NATIONAL_DEX_MR_MIME, .categoryName = _("Dancing"), .height = 14, .weight = 568, + FOOTPRINT(MrMime) + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .description = COMPOUND_STRING( "Its talent is tap-dancing. It can radiate\n" "chilliness from the bottoms of its feet to\n" @@ -12101,34 +12101,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GEN_2_CROSS_EVOS [SPECIES_SCIZOR] = { + .baseHP = 70, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 65, + .baseSpAttack = 55, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), .catchRate = 25, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SWARM, ABILITY_TECHNICIAN, ABILITY_LIGHT_METAL }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Scizor"), + .cryId = CRY_SCIZOR, .natDexNum = NATIONAL_DEX_SCIZOR, .categoryName = _("Pincer"), + .height = 18, + .weight = 1180, FOOTPRINT(Scizor) .levelUpLearnset = sScizorLevelUpLearnset, .teachableLearnset = sScizorTeachableLearnset, .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, - .baseHP = 70, - .baseAttack = 130, - .baseDefense = 100, - .baseSpeed = 65, - .baseSpAttack = 55, - .baseSpDefense = 80, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, - .abilities = { ABILITY_SWARM, ABILITY_TECHNICIAN, ABILITY_LIGHT_METAL }, - .cryId = CRY_SCIZOR, - .height = 18, - .weight = 1180, .description = COMPOUND_STRING( "A Scizor has a body with the hardness of\n" "steel. It is not easily fazed by ordinary\n" @@ -12159,35 +12159,35 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCIZOR_MEGA] = { + .baseHP = 70, + .baseAttack = 150, + .baseDefense = 140, + .baseSpeed = 75, + .baseSpAttack = 65, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), .catchRate = 25, + .expYield = 210, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_TECHNICIAN, ABILITY_TECHNICIAN, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Scizor"), + .cryId = CRY_SCIZOR_MEGA, .natDexNum = NATIONAL_DEX_SCIZOR, .categoryName = _("Pincer"), + .height = 20, + .weight = 1250, FOOTPRINT(Scizor) .levelUpLearnset = sScizorLevelUpLearnset, .teachableLearnset = sScizorTeachableLearnset, .formSpeciesIdTable = sScizorFormSpeciesIdTable, .formChangeTable = sScizorFormChangeTable, - .baseHP = 70, - .baseAttack = 150, - .baseDefense = 140, - .baseSpeed = 75, - .baseSpAttack = 65, - .baseSpDefense = 100, - .expYield = 210, - .abilities = { ABILITY_TECHNICIAN, ABILITY_TECHNICIAN, ABILITY_TECHNICIAN }, .isMegaEvolution = TRUE, - .cryId = CRY_SCIZOR_MEGA, - .height = 20, - .weight = 1250, .description = COMPOUND_STRING( "The excess energy that bathes this\n" "Pokémon keeps it in constant danger of\n" @@ -12734,34 +12734,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_PINSIR [SPECIES_PINSIR] = { + .baseHP = 65, + .baseAttack = 125, + .baseDefense = 100, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_BUG), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_HYPER_CUTTER, ABILITY_MOLD_BREAKER, ABILITY_MOXIE }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pinsir"), + .cryId = CRY_PINSIR, .natDexNum = NATIONAL_DEX_PINSIR, .categoryName = _("Stag Beetle"), + .height = 15, + .weight = 550, FOOTPRINT(Pinsir) .levelUpLearnset = sPinsirLevelUpLearnset, .teachableLearnset = sPinsirTeachableLearnset, .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, - .baseHP = 65, - .baseAttack = 125, - .baseDefense = 100, - .baseSpeed = 85, - .baseSpAttack = 55, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_BUG), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, - .abilities = { ABILITY_HYPER_CUTTER, ABILITY_MOLD_BREAKER, ABILITY_MOXIE }, - .cryId = CRY_PINSIR, - .height = 15, - .weight = 550, .description = COMPOUND_STRING( "Their pincers are strong enough to\n" "shatter thick logs. Because they dislike\n" @@ -12789,34 +12789,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_PINSIR_MEGA] = { + .baseHP = 65, + .baseAttack = 155, + .baseDefense = 120, + .baseSpeed = 105, + .baseSpAttack = 65, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), .catchRate = 45, + .expYield = 210, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_AERILATE, ABILITY_AERILATE, ABILITY_AERILATE }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pinsir"), + .cryId = CRY_PINSIR_MEGA, .natDexNum = NATIONAL_DEX_PINSIR, .categoryName = _("Stag Beetle"), + .height = 17, + .weight = 590, FOOTPRINT(Pinsir) .levelUpLearnset = sPinsirLevelUpLearnset, .teachableLearnset = sPinsirTeachableLearnset, .formSpeciesIdTable = sPinsirFormSpeciesIdTable, .formChangeTable = sPinsirFormChangeTable, - .baseHP = 65, - .baseAttack = 155, - .baseDefense = 120, - .baseSpeed = 105, - .baseSpAttack = 65, - .baseSpDefense = 90, - .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), - .expYield = 210, - .abilities = { ABILITY_AERILATE, ABILITY_AERILATE, ABILITY_AERILATE }, - .cryId = CRY_PINSIR_MEGA, - .height = 17, - .weight = 590, .description = COMPOUND_STRING( "The influence of Mega Evolution leaves it\n" "in a state of constant excitement.\n" @@ -12848,36 +12848,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_TAUROS [SPECIES_TAUROS] = { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 95, + .baseSpeed = 110, + .baseSpAttack = 40, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .evYield_Attack = 1, + .evYield_Speed = 1, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_SHEER_FORCE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Tauros"), .cryId = CRY_TAUROS, .natDexNum = NATIONAL_DEX_TAUROS, .categoryName = _("Wild Bull"), .height = 14, + .weight = 884, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 100, - .baseDefense = 95, - .baseSpeed = 110, - .baseSpAttack = 40, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_NORMAL), - .evYield_Attack = 1, - .evYield_Speed = 1, - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_SHEER_FORCE }, - .bodyColor = BODY_COLOR_BROWN, - .weight = 884, .description = COMPOUND_STRING( "It is not satisfied unless it is rampaging\n" "at all times. If there is no opponent for\n" @@ -12904,39 +12904,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_PALDEAN_FORMS [SPECIES_TAUROS_PALDEAN_COMBAT_BREED] = { + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .evYield_Attack = 2, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Tauros"), .cryId = CRY_TAUROS, .natDexNum = NATIONAL_DEX_TAUROS, .categoryName = _("Wild Bull"), .height = 14, + .weight = 1150, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 110, - .baseDefense = 105, - .baseSpeed = 100, - .baseSpAttack = 30, - .baseSpDefense = 70, - .evYield_Attack = 2, - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, - .bodyColor = BODY_COLOR_BLACK, .frontAnimFrames = sAnims_TaurosPaldean, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, - .types = MON_TYPES(TYPE_FIGHTING), - .weight = 1150, .description = COMPOUND_STRING( "This Pokémon has a muscular body\n" "and excels at close-quarters combat.\n" @@ -12958,39 +12958,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = { + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_FIRE), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .evYield_Attack = 2, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Tauros"), .cryId = CRY_TAUROS, .natDexNum = NATIONAL_DEX_TAUROS, .categoryName = _("Wild Bull"), .height = 14, + .weight = 850, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 110, - .baseDefense = 105, - .baseSpeed = 100, - .baseSpAttack = 30, - .baseSpDefense = 70, - .evYield_Attack = 2, - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, - .bodyColor = BODY_COLOR_BLACK, .frontAnimFrames = sAnims_TaurosPaldean, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, - .types = MON_TYPES(TYPE_FIGHTING, TYPE_FIRE), - .weight = 850, .description = COMPOUND_STRING( "When heated by fire energy, its horns can\n" "get hotter than 1,800 degrees Fahrenheit.\n" @@ -13012,39 +13012,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = { + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 30, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 211, + .evYield_Attack = 2, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, + .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Tauros"), .cryId = CRY_TAUROS, .natDexNum = NATIONAL_DEX_TAUROS, .categoryName = _("Wild Bull"), .height = 14, + .weight = 1100, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, FOOTPRINT(Tauros) .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 110, - .baseDefense = 105, - .baseSpeed = 100, - .baseSpAttack = 30, - .baseSpDefense = 70, - .evYield_Attack = 2, - .abilities = { ABILITY_INTIMIDATE, ABILITY_ANGER_POINT, ABILITY_CUD_CHEW }, - .bodyColor = BODY_COLOR_BLACK, .frontAnimFrames = sAnims_TaurosPaldean, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backAnimId = BACK_ANIM_V_SHAKE_LOW, .isPaldeanForm = TRUE, - .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), - .weight = 1100, .description = COMPOUND_STRING( "This Pokémon blasts water from holes on\n" "the tips of its horns--the high-pressure\n" @@ -13127,18 +13127,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_GYARADOS] = { + .baseHP = 95, + .baseAttack = 125, + .baseDefense = 79, + .baseSpeed = 81, + .baseSpAttack = 60, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_WATER, TYPE_FLYING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 214, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON), + .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE, ABILITY_MOXIE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Gyarados"), + .cryId = CRY_GYARADOS, .natDexNum = NATIONAL_DEX_GYARADOS, .categoryName = _("Atrocious"), .height = 65, + .weight = 2350, .pokemonScale = 256, .pokemonOffset = 6, .trainerScale = 481, @@ -13148,17 +13159,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .teachableLearnset = sGyaradosTeachableLearnset, .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, .formChangeTable = sGyaradosFormChangeTable, - .baseHP = 95, - .baseAttack = 125, - .baseDefense = 79, - .baseSpeed = 81, - .baseSpAttack = 60, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_WATER, TYPE_FLYING), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 214, - .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE, ABILITY_MOXIE }, - .cryId = CRY_GYARADOS, - .weight = 2350, .description = COMPOUND_STRING( "It is an extremely vicious and violent\n" "Pokémon. When humans begin to fight,\n" @@ -13186,18 +13186,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_GYARADOS_MEGA] = { + .baseHP = 95, + .baseAttack = 155, + .baseDefense = 109, + .baseSpeed = 81, + .baseSpAttack = 70, + .baseSpDefense = 130, + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 45, + .expYield = 224, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2, EGG_GROUP_DRAGON), + .abilities = { ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Gyarados"), + .cryId = CRY_GYARADOS_MEGA, .natDexNum = NATIONAL_DEX_GYARADOS, .categoryName = _("Atrocious"), .height = 65, + .weight = 3050, .pokemonScale = 256, .pokemonOffset = 6, .trainerScale = 481, @@ -13205,19 +13216,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Gyarados) .levelUpLearnset = sGyaradosLevelUpLearnset, .teachableLearnset = sGyaradosTeachableLearnset, - .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, - .formChangeTable = sGyaradosFormChangeTable, - .baseHP = 95, - .baseAttack = 155, - .baseDefense = 109, - .baseSpeed = 81, - .baseSpAttack = 70, - .baseSpDefense = 130, - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), - .expYield = 224, - .abilities = { ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER }, - .cryId = CRY_GYARADOS_MEGA, - .weight = 3050, + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, + .formChangeTable = sGyaradosFormChangeTable, .description = COMPOUND_STRING( "Although it obeys its instinctive drive to\n" "destroy everything within its reach, it\n" @@ -13268,13 +13268,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_LAPRAS, .natDexNum = NATIONAL_DEX_LAPRAS, .categoryName = _("Transport"), + .height = 25, + .weight = 2200, FOOTPRINT(Lapras) .levelUpLearnset = sLaprasLevelUpLearnset, .teachableLearnset = sLaprasTeachableLearnset, .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, - .height = 25, - .weight = 2200, .description = COMPOUND_STRING( "People have driven Lapras almost to the\n" "point of extinction. In the evenings,\n" @@ -13325,13 +13325,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_LAPRAS, .natDexNum = NATIONAL_DEX_LAPRAS, .categoryName = _("Transport"), + .height = 240, + .weight = 0, FOOTPRINT(Lapras) .levelUpLearnset = sLaprasLevelUpLearnset, .teachableLearnset = sLaprasTeachableLearnset, .formSpeciesIdTable = sLaprasFormSpeciesIdTable, .formChangeTable = sLaprasFormChangeTable, - .height = 240, - .weight = 0, .description = COMPOUND_STRING( "Over 5,000 people can ride on its\n" "shell at once. And it's a very\n" @@ -13440,13 +13440,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EEVEE, .natDexNum = NATIONAL_DEX_EEVEE, .categoryName = _("Evolution"), + .height = 3, + .weight = 65, FOOTPRINT(Eevee) .levelUpLearnset = sEeveeLevelUpLearnset, .teachableLearnset = sEeveeTeachableLearnset, .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, - .height = 3, - .weight = 65, .description = COMPOUND_STRING( "An Eevee has an unstable genetic makeup\n" "that suddenly mutates due to its\n" @@ -13509,13 +13509,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_EEVEE, .natDexNum = NATIONAL_DEX_EEVEE, .categoryName = _("Evolution"), + .height = 180, + .weight = 0, FOOTPRINT(Eevee) .levelUpLearnset = sEeveeLevelUpLearnset, .teachableLearnset = sEeveeTeachableLearnset, .formSpeciesIdTable = sEeveeFormSpeciesIdTable, .formChangeTable = sEeveeFormChangeTable, - .height = 180, - .weight = 0, .description = COMPOUND_STRING( "Having gotten even friendlier and\n" "more innocent, Eevee tries to play\n" @@ -14375,34 +14375,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_AERODACTYL [SPECIES_AERODACTYL] = { + .baseHP = 80, + .baseAttack = 105, + .baseDefense = 65, + .baseSpeed = 130, + .baseSpAttack = 60, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 180 : 202, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_PRESSURE, ABILITY_UNNERVE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Aerodactyl"), + .cryId = CRY_AERODACTYL, .natDexNum = NATIONAL_DEX_AERODACTYL, .categoryName = _("Fossil"), + .height = 18, + .weight = 590, FOOTPRINT(Aerodactyl) .levelUpLearnset = sAerodactylLevelUpLearnset, .teachableLearnset = sAerodactylTeachableLearnset, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, - .baseHP = 80, - .baseAttack = 105, - .baseDefense = 65, - .baseSpeed = 130, - .baseSpAttack = 60, - .baseSpDefense = 75, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 180 : 202, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_PRESSURE, ABILITY_UNNERVE }, - .cryId = CRY_AERODACTYL, - .height = 18, - .weight = 590, .description = COMPOUND_STRING( "Aerodactyl is a Pokémon from the age\n" "of dinosaurs. It was regenerated from DNA\n" @@ -14431,34 +14431,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_AERODACTYL_MEGA] = { + .baseHP = 80, + .baseAttack = 135, + .baseDefense = 85, + .baseSpeed = 150, + .baseSpAttack = 70, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), .catchRate = 45, + .expYield = 215, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Aerodactyl"), + .cryId = CRY_AERODACTYL_MEGA, .natDexNum = NATIONAL_DEX_AERODACTYL, .categoryName = _("Fossil"), + .height = 21, + .weight = 790, FOOTPRINT(Aerodactyl) .levelUpLearnset = sAerodactylLevelUpLearnset, .teachableLearnset = sAerodactylTeachableLearnset, .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, .formChangeTable = sAerodactylFormChangeTable, - .baseHP = 80, - .baseAttack = 135, - .baseDefense = 85, - .baseSpeed = 150, - .baseSpAttack = 70, - .baseSpDefense = 95, - .expYield = 215, - .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS }, - .cryId = CRY_AERODACTYL_MEGA, - .height = 21, - .weight = 790, .description = COMPOUND_STRING( "The power of Mega Evolution has\n" "completely restored its genes. The rocks\n" @@ -14569,13 +14569,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SNORLAX, .natDexNum = NATIONAL_DEX_SNORLAX, .categoryName = _("Sleeping"), + .height = 21, + .weight = 4600, FOOTPRINT(Snorlax) .levelUpLearnset = sSnorlaxLevelUpLearnset, .teachableLearnset = sSnorlaxTeachableLearnset, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, - .height = 21, - .weight = 4600, .description = COMPOUND_STRING( "Snorlax's typical day consists of nothing\n" "more than eating and sleeping. It is such\n" @@ -14626,13 +14626,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .cryId = CRY_SNORLAX, .natDexNum = NATIONAL_DEX_SNORLAX, .categoryName = _("Sleeping"), + .height = 350, + .weight = 0, FOOTPRINT(Snorlax) .levelUpLearnset = sSnorlaxLevelUpLearnset, .teachableLearnset = sSnorlaxTeachableLearnset, .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, .formChangeTable = sSnorlaxFormChangeTable, - .height = 350, - .weight = 0, .description = COMPOUND_STRING( "Gigantamax energy has affected\n" "stray seeds and even pebbles that\n" @@ -14663,6 +14663,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_ARTICUNO [SPECIES_ARTICUNO] = { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 100, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 125, + .types = MON_TYPES(TYPE_ICE, TYPE_FLYING), .catchRate = 3, .genderRatio = MON_GENDERLESS, .friendship = 35, @@ -14679,13 +14686,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Articuno) .formSpeciesIdTable = sArticunoFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 85, - .baseDefense = 100, - .baseSpeed = 85, - .baseSpAttack = 95, - .baseSpDefense = 125, - .types = MON_TYPES(TYPE_ICE, TYPE_FLYING), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14724,15 +14724,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ARTICUNO_GALARIAN] = { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 85, + .baseSpeed = 95, + .baseSpAttack = 125, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), .catchRate = 3, + .expYield = 290, + .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_COMPETITIVE, ABILITY_NONE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Articuno"), .cryId = CRY_ARTICUNO, .natDexNum = NATIONAL_DEX_ARTICUNO, + .categoryName = _("Cruel"), .height = 17, + .weight = 509, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 309, @@ -14740,20 +14754,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Articuno) .formSpeciesIdTable = sArticunoFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 85, - .baseDefense = 85, - .baseSpeed = 95, - .baseSpAttack = 125, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), - .expYield = 290, - .evYield_SpAttack = 3, - .eggCycles = 120, - .abilities = { ABILITY_COMPETITIVE, ABILITY_NONE, ABILITY_NONE }, - .bodyColor = BODY_COLOR_PURPLE, - .categoryName = _("Cruel"), - .weight = 509, .description = COMPOUND_STRING( "It fires beams that immobilize opponents\n" "as if they had been frozen solid.\n" @@ -14783,6 +14783,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_ZAPDOS [SPECIES_ZAPDOS] = { + .baseHP = 90, + .baseAttack = 90, + .baseDefense = 85, + .baseSpeed = 100, + .baseSpAttack = 125, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 3, .genderRatio = MON_GENDERLESS, .friendship = 35, @@ -14800,13 +14807,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Zapdos) .formSpeciesIdTable = sZapdosFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 90, - .baseDefense = 85, - .baseSpeed = 100, - .baseSpAttack = 125, - .baseSpDefense = 90, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14849,16 +14849,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_ZAPDOS_GALARIAN] = { + .baseHP = 90, + .baseAttack = 125, + .baseDefense = 90, + .baseSpeed = 100, + .baseSpAttack = 85, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_FLYING), .catchRate = 3, + .expYield = 290, + .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DEFIANT, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Zapdos"), .cryId = CRY_ZAPDOS, .natDexNum = NATIONAL_DEX_ZAPDOS, + .categoryName = _("Strong Legs"), .height = 16, + .weight = 582, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 318, @@ -14866,19 +14879,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Zapdos) .formSpeciesIdTable = sZapdosFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 125, - .baseDefense = 90, - .baseSpeed = 100, - .baseSpAttack = 85, - .baseSpDefense = 90, - .types = MON_TYPES(TYPE_FIGHTING, TYPE_FLYING), - .expYield = 290, - .evYield_Attack = 3, - .eggCycles = 120, - .abilities = { ABILITY_DEFIANT, ABILITY_NONE, ABILITY_NONE }, - .categoryName = _("Strong Legs"), - .weight = 582, .description = COMPOUND_STRING( "When its feathers rub together, they\n" "produce a crackling sound like the\n" @@ -14907,6 +14907,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MOLTRES [SPECIES_MOLTRES] = { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 125, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 3, .genderRatio = MON_GENDERLESS, .friendship = 35, @@ -14923,13 +14930,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Moltres) .formSpeciesIdTable = sMoltresFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 100, - .baseDefense = 90, - .baseSpeed = 90, - .baseSpAttack = 125, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14968,15 +14968,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_GALARIAN_FORMS [SPECIES_MOLTRES_GALARIAN] = { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 125, + .types = MON_TYPES(TYPE_DARK, TYPE_FLYING), .catchRate = 3, + .expYield = 290, + .evYield_SpDefense = 3, .genderRatio = MON_GENDERLESS, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_BERSERK, ABILITY_NONE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Moltres"), .cryId = CRY_MOLTRES, .natDexNum = NATIONAL_DEX_MOLTRES, + .categoryName = _("Malevolent"), .height = 20, + .weight = 660, .pokemonScale = 270, .pokemonOffset = 0, .trainerScale = 387, @@ -14984,20 +14998,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = FOOTPRINT(Moltres) .formSpeciesIdTable = sMoltresFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 85, - .baseDefense = 90, - .baseSpeed = 90, - .baseSpAttack = 100, - .baseSpDefense = 125, - .types = MON_TYPES(TYPE_DARK, TYPE_FLYING), - .expYield = 290, - .evYield_SpDefense = 3, - .eggCycles = 120, - .abilities = { ABILITY_BERSERK, ABILITY_NONE, ABILITY_NONE }, - .bodyColor = BODY_COLOR_RED, - .categoryName = _("Malevolent"), - .weight = 660, .description = COMPOUND_STRING( "This Pokémon's sinister, flame-like aura\n" "will consume the spirit of any creature\n" @@ -15195,6 +15195,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_FAMILY_MEWTWO [SPECIES_MEWTWO] = { + .baseHP = 106, + .baseAttack = 110, + .baseDefense = 90, + .baseSpeed = 130, + .baseSpAttack = 154, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, @@ -15212,13 +15219,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, - .baseHP = 106, - .baseAttack = 110, - .baseDefense = 90, - .baseSpeed = 130, - .baseSpAttack = 154, - .baseSpDefense = 90, - .types = MON_TYPES(TYPE_PSYCHIC), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 340, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -15257,36 +15257,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEWTWO_MEGA_X] = { + .baseHP = 106, + .baseAttack = 190, + .baseDefense = 100, + .baseSpeed = 130, + .baseSpAttack = 154, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_STEADFAST, ABILITY_STEADFAST, ABILITY_STEADFAST }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Mewtwo"), + .cryId = CRY_MEWTWO_MEGA_X, .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), + .height = 23, + .weight = 1270, FOOTPRINT(Mewtwo) .levelUpLearnset = sMewtwoLevelUpLearnset, .teachableLearnset = sMewtwoTeachableLearnset, .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, - .baseHP = 106, - .baseAttack = 190, - .baseDefense = 100, - .baseSpeed = 130, - .baseSpAttack = 154, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, - .abilities = { ABILITY_STEADFAST, ABILITY_STEADFAST, ABILITY_STEADFAST }, .isMegaEvolution = TRUE, - .cryId = CRY_MEWTWO_MEGA_X, - .height = 23, - .weight = 1270, .description = COMPOUND_STRING( "Psychic power has augmented its muscles.\n" "It has a grip strength of one ton and can\n" @@ -15313,36 +15313,36 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_MEWTWO_MEGA_Y] = { + .baseHP = 106, + .baseAttack = 150, + .baseDefense = 70, + .baseSpeed = 140, + .baseSpAttack = 194, + .baseSpDefense = 120, + .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_INSOMNIA, ABILITY_INSOMNIA, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Mewtwo"), + .cryId = CRY_MEWTWO_MEGA_Y, .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), + .height = 15, + .weight = 330, FOOTPRINT(Mewtwo) .levelUpLearnset = sMewtwoLevelUpLearnset, .teachableLearnset = sMewtwoTeachableLearnset, .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, .formChangeTable = sMewtwoFormChangeTable, .isLegendary = TRUE, - .baseHP = 106, - .baseAttack = 150, - .baseDefense = 70, - .baseSpeed = 140, - .baseSpAttack = 194, - .baseSpDefense = 120, - .types = MON_TYPES(TYPE_PSYCHIC), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, - .abilities = { ABILITY_INSOMNIA, ABILITY_INSOMNIA, ABILITY_INSOMNIA }, .isMegaEvolution = TRUE, - .cryId = CRY_MEWTWO_MEGA_Y, - .height = 15, - .weight = 330, .description = COMPOUND_STRING( "Despite its diminished size, its mental\n" "power has grown phenomenally. With a mere\n" diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index 1a352500865b..a8ae91d97f1f 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -294,6 +294,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_TYPHLOSION] = { + .baseHP = 78, + .baseAttack = 84, + .baseDefense = 78, + .baseSpeed = 100, + .baseSpAttack = 109, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, .expYield = TYPHLOSION_EXP_YIELD, .evYield_SpAttack = 3, @@ -302,20 +309,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_FLASH_FIRE }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Typhlosion"), .cryId = CRY_TYPHLOSION, .natDexNum = NATIONAL_DEX_TYPHLOSION, - FOOTPRINT(Typhlosion) - .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, - .baseHP = 78, - .baseAttack = 84, - .baseDefense = 78, - .baseSpeed = 100, - .baseSpAttack = 109, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_FIRE), - .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_FLASH_FIRE }, .categoryName = _("Volcano"), .height = 17, .weight = 795, @@ -330,6 +328,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 1, .frontPic = gMonFrontPic_Typhlosion, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Typhlosion) + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Typhlosion, .frontAnimId = ANIM_V_SHAKE, @@ -349,6 +349,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_HISUIAN_FORMS [SPECIES_TYPHLOSION_HISUIAN] = { + .baseHP = 73, + .baseAttack = 84, + .baseDefense = 78, + .baseSpeed = 95, + .baseSpAttack = 119, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), .catchRate = 45, .expYield = TYPHLOSION_EXP_YIELD, .evYield_SpAttack = 3, @@ -357,20 +364,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_FRISK }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Typhlosion"), .cryId = CRY_TYPHLOSION, .natDexNum = NATIONAL_DEX_TYPHLOSION, - FOOTPRINT(Typhlosion) - .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, - .baseHP = 73, - .baseAttack = 84, - .baseDefense = 78, - .baseSpeed = 95, - .baseSpAttack = 119, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_FIRE, TYPE_GHOST), - .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_FRISK }, .categoryName = _("Ghost Flame"), .height = 16, .weight = 698, @@ -385,6 +383,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 1, .frontPic = gMonFrontPic_TyphlosionHisuian, .frontPicSize = MON_COORDS_SIZE(48, 64), + FOOTPRINT(Typhlosion) + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyphlosionHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1531,6 +1531,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_AMPHAROS] = { + .baseHP = 90, + .baseAttack = 75, + .baseDefense = AMPHAROS_DEFENSE, + .baseSpeed = 55, + .baseSpAttack = 115, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), @@ -1553,13 +1560,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .teachableLearnset = sAmpharosTeachableLearnset, .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, - .baseHP = 90, - .baseAttack = 75, - .baseDefense = AMPHAROS_DEFENSE, - .baseSpeed = 55, - .baseSpAttack = 115, - .baseSpDefense = 90, - .types = MON_TYPES(TYPE_ELECTRIC), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 255, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -1595,45 +1595,45 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_AMPHAROS_MEGA] = { + .baseHP = 90, + .baseAttack = 95, + .baseDefense = AMPHAROS_DEFENSE + 20, + .baseSpeed = 45, + .baseSpAttack = 165, + .baseSpDefense = 110, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DRAGON), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 305 : 275, .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD), + .abilities = { ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Ampharos"), + .cryId = CRY_AMPHAROS_MEGA, .natDexNum = NATIONAL_DEX_AMPHAROS, .categoryName = _("Light"), .height = 14, .weight = 615, + .description = COMPOUND_STRING( + "Massive amounts of energy intensely\n" + "stimulated Ampharos's cells, apparently\n" + "awakening its long-sleeping dragon's\n" + "blood."), .pokemonScale = 256, .pokemonOffset = 4, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_AmpharosMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Ampharos) .levelUpLearnset = sAmpharosLevelUpLearnset, .teachableLearnset = sAmpharosTeachableLearnset, .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, .formChangeTable = sAmpharosFormChangeTable, - .baseHP = 90, - .baseAttack = 95, - .baseDefense = AMPHAROS_DEFENSE + 20, - .baseSpeed = 45, - .baseSpAttack = 165, - .baseSpDefense = 110, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_DRAGON), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 305 : 275, - .abilities = { ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER, ABILITY_MOLD_BREAKER }, - .cryId = CRY_AMPHAROS_MEGA, - .description = COMPOUND_STRING( - "Massive amounts of energy intensely\n" - "stimulated Ampharos's cells, apparently\n" - "awakening its long-sleeping dragon's\n" - "blood."), - .frontPic = gMonFrontPic_AmpharosMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AmpharosMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2462,6 +2462,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 15, .baseSpAttack = 25, .baseSpDefense = 25, + .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, .evYield_HP = 1, @@ -2470,26 +2471,23 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Wooper"), .cryId = CRY_WOOPER, .natDexNum = NATIONAL_DEX_WOOPER, - .height = 4, - .pokemonScale = 479, - .pokemonOffset = 21, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Wooper) - .formSpeciesIdTable = sWooperFormSpeciesIdTable, - .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), - .abilities = { ABILITY_DAMP, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, - .bodyColor = BODY_COLOR_BLUE, .categoryName = _("Water Fish"), + .height = 4, .weight = 85, .description = COMPOUND_STRING( "Wooper usually live in water but come\n" "out onto land seeking food occasionally.\n" "On land, they coat their bodies with a\n" "gooey, toxic film."), + .pokemonScale = 479, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Wooper, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicFemale = gMonFrontPic_WooperF, @@ -2499,6 +2497,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wooper, .backPicSize = MON_COORDS_SIZE(64, 40), + FOOTPRINT(Wooper) + .formSpeciesIdTable = sWooperFormSpeciesIdTable, .backPicFemale = gMonBackPic_WooperF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, @@ -2577,6 +2577,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 15, .baseSpAttack = 25, .baseSpDefense = 25, + .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 42 : 52, .evYield_HP = 1, @@ -2585,29 +2586,28 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), + .abilities = { ABILITY_POISON_POINT, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Wooper"), .cryId = CRY_WOOPER, .natDexNum = NATIONAL_DEX_WOOPER, - .height = 4, - .pokemonScale = 479, - .pokemonOffset = 21, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Wooper) - .formSpeciesIdTable = sWooperFormSpeciesIdTable, - .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), - .abilities = { ABILITY_POISON_POINT, ABILITY_WATER_ABSORB, ABILITY_UNAWARE }, - .bodyColor = BODY_COLOR_BROWN, - .isPaldeanForm = TRUE, .categoryName = _("Poison Fish"), + .height = 4, .weight = 110, .description = COMPOUND_STRING( "After losing a territorial struggle,\n" "Wooper began living on land.\n" "The Pokémon changed over time, developing\n" "a poisonous film to protect its body."), + .pokemonScale = 479, + .pokemonOffset = 21, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_WooperPaldean, .frontPicSize = MON_COORDS_SIZE(40, 32), + FOOTPRINT(Wooper) + .formSpeciesIdTable = sWooperFormSpeciesIdTable, + .isPaldeanForm = TRUE, .frontPicYOffset = 16, .frontAnimFrames = sAnims_WooperPaldean, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3415,6 +3415,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .cryId = CRY_DUDUNSPARCE, .natDexNum = NATIONAL_DEX_DUDUNSPARCE, .categoryName = _("Land Snake"), + .height = 36, + .weight = 392, + .description = COMPOUND_STRING( + "This Pokémon uses its hard tail to\n" + "make its nest by boring holes into\n" + "bedrock deep underground. The nest\n" + "can reach lengths of over six miles."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -3436,13 +3443,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Dudunsparce), - .height = 36, - .weight = 392, - .description = COMPOUND_STRING( - "This Pokémon uses its hard tail to\n" - "make its nest by boring holes into\n" - "bedrock deep underground. The nest\n" - "can reach lengths of over six miles."), }, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = @@ -3468,6 +3468,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .cryId = CRY_DUDUNSPARCE, .natDexNum = NATIONAL_DEX_DUDUNSPARCE, .categoryName = _("Land Snake"), + .height = 45, + .weight = 474, + .description = COMPOUND_STRING( + "A recent study uncovered that the\n" + "number of segments a\n" + "Dudunsparce's body has is determined by the\n" + "Pokémon's genes."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -3489,13 +3496,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Dudunsparce), - .height = 45, - .weight = 474, - .description = COMPOUND_STRING( - "A recent study uncovered that the\n" - "number of segments a\n" - "Dudunsparce's body has is determined by the\n" - "Pokémon's genes."), }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DUNSPARCE @@ -3749,6 +3749,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 85, .baseSpAttack = 55, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_WATER, TYPE_POISON), .catchRate = 45, .expYield = QWILFISH_EXP_YIELD, .evYield_Attack = 1, @@ -3759,27 +3760,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Qwilfish"), .cryId = CRY_QWILFISH, .natDexNum = NATIONAL_DEX_QWILFISH, .categoryName = _("Balloon"), .height = 5, .weight = 39, - .pokemonScale = 430, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Qwilfish) - .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, - .types = MON_TYPES(TYPE_WATER, TYPE_POISON), - .bodyColor = BODY_COLOR_GRAY, .description = COMPOUND_STRING( "A Qwilfish uses the pressure of water\n" "it swallows to shoot toxic quills all at\n" "once from all over its body. It finds\n" "swimming to be somewhat challenging."), + .pokemonScale = 430, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Qwilfish, .frontPicSize = MON_COORDS_SIZE(40, 48), + FOOTPRINT(Qwilfish) + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Qwilfish, .frontAnimId = ANIM_GROW_IN_STAGES, @@ -3805,6 +3805,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 85, .baseSpAttack = 55, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_DARK, TYPE_POISON), .catchRate = 45, .expYield = QWILFISH_EXP_YIELD, .evYield_Attack = 1, @@ -3815,27 +3816,26 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), .abilities = { ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE }, + .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Qwilfish"), .cryId = CRY_QWILFISH, .natDexNum = NATIONAL_DEX_QWILFISH, .categoryName = _("Balloon"), .height = 5, .weight = 39, - .pokemonScale = 430, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Qwilfish) - .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, - .types = MON_TYPES(TYPE_DARK, TYPE_POISON), - .bodyColor = BODY_COLOR_BLACK, .description = COMPOUND_STRING( "A form of Qwilfish from the distant past.\n" "Fishers detest this troublesome Pokémon\n" "because it sprays poison from its spines,\n" "getting it everywhere."), + .pokemonScale = 430, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_QwilfishHisuian, .frontPicSize = MON_COORDS_SIZE(48, 40), + FOOTPRINT(Qwilfish) + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .frontPicYOffset = 16, .frontAnimFrames = sAnims_QwilfishHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3968,32 +3968,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_FAMILY_HERACROSS [SPECIES_HERACROSS] = { + .baseHP = 80, + .baseAttack = 125, + .baseDefense = 75, + .baseSpeed = 85, + .baseSpAttack = 40, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SWARM, ABILITY_GUTS, ABILITY_MOXIE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Heracross"), + .cryId = CRY_HERACROSS, .natDexNum = NATIONAL_DEX_HERACROSS, .categoryName = _("Single Horn"), - FOOTPRINT(Heracross) - .levelUpLearnset = sHeracrossLevelUpLearnset, - .teachableLearnset = sHeracrossTeachableLearnset, - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, - .formChangeTable = sHeracrossFormChangeTable, - .baseHP = 80, - .baseAttack = 125, - .baseDefense = 75, - .baseSpeed = 85, - .baseSpAttack = 40, - .baseSpDefense = 95, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, - .abilities = { ABILITY_SWARM, ABILITY_GUTS, ABILITY_MOXIE }, - .cryId = CRY_HERACROSS, .height = 15, .weight = 540, .description = COMPOUND_STRING( @@ -4014,6 +4009,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Heracross, .backPicSize = MON_COORDS_SIZE(48, 64), + FOOTPRINT(Heracross) + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, + .formChangeTable = sHeracrossFormChangeTable, .backPicFemale = gMonBackPic_HeracrossF, .backPicSizeFemale = MON_COORDS_SIZE(48, 64), .backPicYOffset = 2, @@ -4027,32 +4027,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HERACROSS_MEGA] = { + .baseHP = 80, + .baseAttack = 185, + .baseDefense = 115, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 105, .types = MON_TYPES(TYPE_BUG, TYPE_FIGHTING), .catchRate = 45, + .expYield = 210, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + .abilities = { ABILITY_SKILL_LINK, ABILITY_SKILL_LINK, ABILITY_SKILL_LINK }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Heracross"), + .cryId = CRY_HERACROSS_MEGA, .natDexNum = NATIONAL_DEX_HERACROSS, .categoryName = _("Single Horn"), - FOOTPRINT(Heracross) - .levelUpLearnset = sHeracrossLevelUpLearnset, - .teachableLearnset = sHeracrossTeachableLearnset, - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, - .formChangeTable = sHeracrossFormChangeTable, - .baseHP = 80, - .baseAttack = 185, - .baseDefense = 115, - .baseSpeed = 75, - .baseSpAttack = 40, - .baseSpDefense = 105, - .expYield = 210, - .abilities = { ABILITY_SKILL_LINK, ABILITY_SKILL_LINK, ABILITY_SKILL_LINK }, - .cryId = CRY_HERACROSS_MEGA, .height = 17, .weight = 625, .description = COMPOUND_STRING( @@ -4066,6 +4061,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HeracrossMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Heracross) + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, + .formChangeTable = sHeracrossFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_HeracrossMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4091,6 +4091,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 115, .baseSpAttack = 35, .baseSpDefense = 75, + .types = MON_TYPES(TYPE_DARK, TYPE_ICE), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, .evYield_Speed = 1, @@ -4100,27 +4101,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, + .bodyColor = BODY_COLOR_BLACK, .noFlip = TRUE, .speciesName = _("Sneasel"), .cryId = CRY_SNEASEL, .natDexNum = NATIONAL_DEX_SNEASEL, .categoryName = _("Sharp Claw"), .height = 9, - .pokemonScale = 413, - .pokemonOffset = -3, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Sneasel) - .formSpeciesIdTable = sSneaselFormSpeciesIdTable, - .types = MON_TYPES(TYPE_DARK, TYPE_ICE), - .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, - .bodyColor = BODY_COLOR_BLACK, .weight = 280, .description = COMPOUND_STRING( "A Sneasel scales trees by punching its\n" "hooked claws into the bark. It seeks out\n" "unguarded nests and steals eggs for food\n" "while the parents are away."), + .pokemonScale = 413, + .pokemonOffset = -3, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Sneasel, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_SneaselF, @@ -4130,6 +4128,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Sneasel, .backPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Sneasel) + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .backPicFemale = gMonBackPic_SneaselF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, @@ -4213,6 +4213,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 115, .baseSpAttack = 35, .baseSpDefense = 75, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_POISON), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 86 : 132, .evYield_Speed = 1, @@ -4222,33 +4223,32 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, + .bodyColor = BODY_COLOR_GRAY, .noFlip = TRUE, .speciesName = _("Sneasel"), .cryId = CRY_SNEASEL, .natDexNum = NATIONAL_DEX_SNEASEL, .categoryName = _("Sharp Claw"), .height = 9, - .pokemonScale = 413, - .pokemonOffset = -3, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Sneasel) - .formSpeciesIdTable = sSneaselFormSpeciesIdTable, - .types = MON_TYPES(TYPE_FIGHTING, TYPE_POISON), - .abilities = { ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_PICKPOCKET }, - .bodyColor = BODY_COLOR_GRAY, .weight = 270, .description = COMPOUND_STRING( "Its sturdy, curved claws are ideal for\n" "traversing precipitous cliffs. From the\n" "tips of these claws drips a venom that\n" "infiltrates the nerves of any prey caught."), + .pokemonScale = 413, + .pokemonOffset = -3, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_SneaselHisuian, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_SneaselHisuianF, .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_SneaselHisuian, + FOOTPRINT(Sneasel) + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SneaselHisuian, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -4437,28 +4437,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GEN_8_CROSS_EVOS [SPECIES_URSALUNA] = { - .expYield = 275, - .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .speciesName = _("Ursaluna"), - .cryId = CRY_URSALUNA, - .natDexNum = NATIONAL_DEX_URSALUNA, - .categoryName = _("Peat"), - .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 130, .baseAttack = 140, .baseDefense = 105, .baseSpeed = 50, .baseSpAttack = 45, .baseSpDefense = 80, + .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), .catchRate = 20, + .expYield = 275, .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_GUTS, ABILITY_BULLETPROOF, ABILITY_UNNERVE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Ursaluna"), + .cryId = CRY_URSALUNA, + .natDexNum = NATIONAL_DEX_URSALUNA, + .categoryName = _("Peat"), .height = 24, .weight = 2900, .description = COMPOUND_STRING( @@ -4473,6 +4472,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Ursaluna, + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Ursaluna, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -4489,28 +4489,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_URSALUNA_BLOODMOON] = { - .expYield = 275, - .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .bodyColor = BODY_COLOR_BROWN, - .speciesName = _("Ursaluna"), - .cryId = CRY_URSALUNA, - .natDexNum = NATIONAL_DEX_URSALUNA, - .categoryName = _("Peat"), - .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, .baseHP = 113, .baseAttack = 70, .baseDefense = 120, .baseSpeed = 52, .baseSpAttack = 135, .baseSpDefense = 65, + .types = MON_TYPES(TYPE_GROUND, TYPE_NORMAL), .catchRate = 5, + .expYield = 275, .evYield_SpAttack = 3, .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_MINDS_EYE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Ursaluna"), + .cryId = CRY_URSALUNA, + .natDexNum = NATIONAL_DEX_URSALUNA, + .categoryName = _("Peat"), .height = 27, .weight = 3330, .description = COMPOUND_STRING( @@ -4524,6 +4523,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 7, .frontPic = gMonFrontPic_UrsalunaBloodmoon, .frontPicSize = MON_COORDS_SIZE(64, 64), + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, //.frontPicYOffset = 0, .frontAnimFrames = sAnims_UrsalunaBloodmoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4844,44 +4844,44 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_CORSOLA] = { + .baseHP = CORSOLA_HP, + .baseAttack = 55, + .baseDefense = CORSOLA_DEFENSES, + .baseSpeed = 35, + .baseSpAttack = 65, + .baseSpDefense = CORSOLA_DEFENSES, + .types = MON_TYPES(TYPE_WATER, TYPE_ROCK), .catchRate = 60, .expYield = CORSOLA_EXP_YIELD, + .evYield_Defense = 1, .evYield_SpDefense = 1, + .itemRare = ITEM_LUMINOUS_MOSS, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3), + .abilities = { ABILITY_HUSTLE, ABILITY_NATURAL_CURE, ABILITY_REGENERATOR }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Corsola"), .cryId = CRY_CORSOLA, .natDexNum = NATIONAL_DEX_CORSOLA, .categoryName = _("Coral"), .height = 6, - .pokemonScale = 410, - .pokemonOffset = 15, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Corsola) - .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, - .baseHP = CORSOLA_HP, - .baseAttack = 55, - .baseDefense = CORSOLA_DEFENSES, - .baseSpeed = 35, - .baseSpAttack = 65, - .baseSpDefense = CORSOLA_DEFENSES, - .types = MON_TYPES(TYPE_WATER, TYPE_ROCK), - .evYield_Defense = 1, - .itemRare = ITEM_LUMINOUS_MOSS, - .abilities = { ABILITY_HUSTLE, ABILITY_NATURAL_CURE, ABILITY_REGENERATOR }, - .bodyColor = BODY_COLOR_PINK, .weight = 50, .description = COMPOUND_STRING( "Corsola live in warm southern seas.\n" "If the sea becomes polluted, the beautiful\n" "coral stalks become discolored and crumble\n" "away in tatters."), + .pokemonScale = 410, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Corsola, .frontPicSize = MON_COORDS_SIZE(48, 40), + FOOTPRINT(Corsola) + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_Corsola, .frontAnimId = ANIM_H_SLIDE, @@ -4900,6 +4900,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_GALARIAN_FORMS [SPECIES_CORSOLA_GALARIAN] = { + .baseHP = CORSOLA_HP - 5, + .baseAttack = 55, + .baseDefense = CORSOLA_DEFENSES + 5, + .baseSpeed = 30, + .baseSpAttack = 65, + .baseSpDefense = CORSOLA_DEFENSES + 5, + .types = MON_TYPES(TYPE_GHOST), .catchRate = 60, .expYield = CORSOLA_EXP_YIELD, .evYield_SpDefense = 1, @@ -4908,34 +4915,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_WATER_3), + .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Corsola"), .cryId = CRY_CORSOLA, .natDexNum = NATIONAL_DEX_CORSOLA, .categoryName = _("Coral"), .height = 6, - .pokemonScale = 410, - .pokemonOffset = 15, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Corsola) - .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, - .baseHP = CORSOLA_HP - 5, - .baseAttack = 55, - .baseDefense = CORSOLA_DEFENSES + 5, - .baseSpeed = 30, - .baseSpAttack = 65, - .baseSpDefense = CORSOLA_DEFENSES + 5, - .types = MON_TYPES(TYPE_GHOST), - .abilities = { ABILITY_WEAK_ARMOR, ABILITY_NONE, ABILITY_CURSED_BODY }, - .bodyColor = BODY_COLOR_WHITE, .weight = 5, .description = COMPOUND_STRING( "Sudden climate change wiped out this\n" "ancient kind of Corsola. With its branches,\n" "it absorbs others' life-force. It curses\n" "those unaware that kick it by accident."), + .pokemonScale = 410, + .pokemonOffset = 15, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_CorsolaGalarian, .frontPicSize = MON_COORDS_SIZE(48, 48), + FOOTPRINT(Corsola) + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .frontPicYOffset = 11, .frontAnimFrames = sAnims_CorsolaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5401,32 +5401,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_HOUNDOOM] = { + .baseHP = 75, + .baseAttack = 90, + .baseDefense = 50, + .baseSpeed = 95, + .baseSpAttack = 110, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 204, .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_EARLY_BIRD, ABILITY_FLASH_FIRE, ABILITY_UNNERVE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Houndoom"), + .cryId = CRY_HOUNDOOM, .natDexNum = NATIONAL_DEX_HOUNDOOM, .categoryName = _("Dark"), - FOOTPRINT(Houndoom) - .levelUpLearnset = sHoundoomLevelUpLearnset, - .teachableLearnset = sHoundoomTeachableLearnset, - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, - .formChangeTable = sHoundoomFormChangeTable, - .baseHP = 75, - .baseAttack = 90, - .baseDefense = 50, - .baseSpeed = 95, - .baseSpAttack = 110, - .baseSpDefense = 80, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 204, - .abilities = { ABILITY_EARLY_BIRD, ABILITY_FLASH_FIRE, ABILITY_UNNERVE }, - .cryId = CRY_HOUNDOOM, .height = 14, .weight = 350, .description = COMPOUND_STRING( @@ -5447,6 +5442,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Houndoom, .backPicSize = MON_COORDS_SIZE(64, 56), + FOOTPRINT(Houndoom) + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, + .formChangeTable = sHoundoomFormChangeTable, .backPicFemale = gMonBackPic_HoundoomF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, @@ -5460,38 +5460,38 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_HOUNDOOM_MEGA] = { + .baseHP = 75, + .baseAttack = 90, + .baseDefense = 90, + .baseSpeed = 115, + .baseSpAttack = 140, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_DARK, TYPE_FIRE), .catchRate = 45, + .expYield = 210, .evYield_SpAttack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SOLAR_POWER, ABILITY_SOLAR_POWER, ABILITY_SOLAR_POWER }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Houndoom"), + .cryId = CRY_HOUNDOOM_MEGA, .natDexNum = NATIONAL_DEX_HOUNDOOM, .categoryName = _("Dark"), - FOOTPRINT(Houndoom) - .levelUpLearnset = sHoundoomLevelUpLearnset, - .teachableLearnset = sHoundoomTeachableLearnset, - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, - .formChangeTable = sHoundoomFormChangeTable, - .baseHP = 75, - .baseAttack = 90, - .baseDefense = 90, - .baseSpeed = 115, - .baseSpAttack = 140, - .baseSpDefense = 90, - .expYield = 210, - .abilities = { ABILITY_SOLAR_POWER, ABILITY_SOLAR_POWER, ABILITY_SOLAR_POWER }, - .cryId = CRY_HOUNDOOM_MEGA, .height = 19, .weight = 495, .description = COMPOUND_STRING( "Its red claws and the tips of its tail are\n" "melting from high internal temperatures\n" "that are painful to Houndoom itself.\n"), + FOOTPRINT(Houndoom) + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, + .formChangeTable = sHoundoomFormChangeTable, .pokemonScale = 256, .pokemonOffset = 4, .trainerScale = 256, @@ -6154,6 +6154,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = [SPECIES_TYRANITAR] = { + .baseHP = 100, + .baseAttack = 134, + .baseDefense = 110, + .baseSpeed = 61, + .baseSpAttack = 95, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), .catchRate = 45, .evYield_Attack = 3, @@ -6171,12 +6177,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .teachableLearnset = sTyranitarTeachableLearnset, .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, .formChangeTable = sTyranitarFormChangeTable, - .baseHP = 100, - .baseAttack = 134, - .baseDefense = 110, - .baseSpeed = 61, - .baseSpAttack = 95, - .baseSpDefense = 100, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -6216,32 +6216,27 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = #if P_MEGA_EVOLUTIONS [SPECIES_TYRANITAR_MEGA] = { + .baseHP = 100, + .baseAttack = 164, + .baseDefense = 150, + .baseSpeed = 71, + .baseSpAttack = 95, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_SAND_STREAM, ABILITY_SAND_STREAM, ABILITY_SAND_STREAM }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Tyranitar"), + .cryId = CRY_TYRANITAR_MEGA, .natDexNum = NATIONAL_DEX_TYRANITAR, .categoryName = _("Armor"), - FOOTPRINT(Tyranitar) - .levelUpLearnset = sTyranitarLevelUpLearnset, - .teachableLearnset = sTyranitarTeachableLearnset, - .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, - .formChangeTable = sTyranitarFormChangeTable, - .baseHP = 100, - .baseAttack = 164, - .baseDefense = 150, - .baseSpeed = 71, - .baseSpAttack = 95, - .baseSpDefense = 120, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, - .abilities = { ABILITY_SAND_STREAM, ABILITY_SAND_STREAM, ABILITY_SAND_STREAM }, - .cryId = CRY_TYRANITAR_MEGA, .height = 25, .weight = 2550, .description = COMPOUND_STRING( @@ -6255,6 +6250,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 7, .frontPic = gMonFrontPic_TyranitarMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Tyranitar) + .levelUpLearnset = sTyranitarLevelUpLearnset, + .teachableLearnset = sTyranitarTeachableLearnset, + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, + .formChangeTable = sTyranitarFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyranitarMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 0d300641b54e..746cbdb6bd19 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -112,6 +112,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SCEPTILE] = { + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 65, + .baseSpeed = 120, + .baseSpAttack = 105, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_GRASS), .catchRate = 45, .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(12.5), @@ -128,13 +135,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sSceptileTeachableLearnset, .formSpeciesIdTable = sSceptileFormSpeciesIdTable, .formChangeTable = sSceptileFormChangeTable, - .baseHP = 70, - .baseAttack = 85, - .baseDefense = 65, - .baseSpeed = 120, - .baseSpAttack = 105, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_GRASS), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 265, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -173,32 +173,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SCEPTILE_MEGA] = { + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 75, + .baseSpeed = 145, + .baseSpAttack = 145, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_GRASS, TYPE_DRAGON), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .abilities = { ABILITY_LIGHTNING_ROD, ABILITY_LIGHTNING_ROD, ABILITY_LIGHTNING_ROD }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Sceptile"), + .cryId = CRY_SCEPTILE_MEGA, .natDexNum = NATIONAL_DEX_SCEPTILE, .categoryName = _("Forest"), - FOOTPRINT(Sceptile) - .levelUpLearnset = sSceptileLevelUpLearnset, - .teachableLearnset = sSceptileTeachableLearnset, - .formSpeciesIdTable = sSceptileFormSpeciesIdTable, - .formChangeTable = sSceptileFormChangeTable, - .baseHP = 70, - .baseAttack = 110, - .baseDefense = 75, - .baseSpeed = 145, - .baseSpAttack = 145, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_GRASS, TYPE_DRAGON), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, - .abilities = { ABILITY_LIGHTNING_ROD, ABILITY_LIGHTNING_ROD, ABILITY_LIGHTNING_ROD }, - .cryId = CRY_SCEPTILE_MEGA, .height = 19, .weight = 552, .description = COMPOUND_STRING( @@ -212,6 +207,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, .frontPic = gMonFrontPic_SceptileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Sceptile) + .levelUpLearnset = sSceptileLevelUpLearnset, + .teachableLearnset = sSceptileTeachableLearnset, + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, + .formChangeTable = sSceptileFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SceptileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -344,6 +344,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_BLAZIKEN] = { + .baseHP = 80, + .baseAttack = 120, + .baseDefense = 70, + .baseSpeed = 80, + .baseSpAttack = 110, + .baseSpDefense = 70, .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), .catchRate = 45, .evYield_Attack = 3, @@ -367,12 +373,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sBlazikenTeachableLearnset, .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, - .baseHP = 80, - .baseAttack = 120, - .baseDefense = 70, - .baseSpeed = 80, - .baseSpAttack = 110, - .baseSpDefense = 70, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 265, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -409,45 +409,45 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BLAZIKEN_MEGA] = { + .baseHP = 80, + .baseAttack = 160, + .baseDefense = 80, + .baseSpeed = 100, + .baseSpAttack = 130, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SPEED_BOOST, ABILITY_SPEED_BOOST, ABILITY_SPEED_BOOST }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Blaziken"), + .cryId = CRY_BLAZIKEN_MEGA, .natDexNum = NATIONAL_DEX_BLAZIKEN, .categoryName = _("Blaze"), .height = 19, .weight = 520, + .description = COMPOUND_STRING( + "As it unleashes a flurry of savage kicks,\n" + "its legs can begin to burn from the\n" + "friction of the surrounding atmosphere.\n" + "They're always a source of pride to it."), .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 301, .trainerOffset = 4, + .frontPic = gMonFrontPic_BlazikenMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Blaziken) .levelUpLearnset = sBlazikenLevelUpLearnset, .teachableLearnset = sBlazikenTeachableLearnset, .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, .formChangeTable = sBlazikenFormChangeTable, - .baseHP = 80, - .baseAttack = 160, - .baseDefense = 80, - .baseSpeed = 100, - .baseSpAttack = 130, - .baseSpDefense = 80, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, - .abilities = { ABILITY_SPEED_BOOST, ABILITY_SPEED_BOOST, ABILITY_SPEED_BOOST }, - .cryId = CRY_BLAZIKEN_MEGA, - .description = COMPOUND_STRING( - "As it unleashes a flurry of savage kicks,\n" - "its legs can begin to burn from the\n" - "friction of the surrounding atmosphere.\n" - "They're always a source of pride to it."), - .frontPic = gMonFrontPic_BlazikenMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_BlazikenMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -573,6 +573,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SWAMPERT] = { + .baseHP = 100, + .baseAttack = 110, + .baseDefense = 90, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .catchRate = 45, .evYield_Attack = 3, @@ -590,12 +596,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sSwampertTeachableLearnset, .formSpeciesIdTable = sSwampertFormSpeciesIdTable, .formChangeTable = sSwampertFormChangeTable, - .baseHP = 100, - .baseAttack = 110, - .baseDefense = 90, - .baseSpeed = 60, - .baseSpAttack = 85, - .baseSpDefense = 90, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 268, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -634,32 +634,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SWAMPERT_MEGA] = { + .baseHP = 100, + .baseAttack = 150, + .baseDefense = 110, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 318 : 286, .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_SWIFT_SWIM, ABILITY_SWIFT_SWIM, ABILITY_SWIFT_SWIM }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Swampert"), + .cryId = CRY_SWAMPERT_MEGA, .natDexNum = NATIONAL_DEX_SWAMPERT, .categoryName = _("Mud Fish"), - FOOTPRINT(Swampert) - .levelUpLearnset = sSwampertLevelUpLearnset, - .teachableLearnset = sSwampertTeachableLearnset, - .formSpeciesIdTable = sSwampertFormSpeciesIdTable, - .formChangeTable = sSwampertFormChangeTable, - .baseHP = 100, - .baseAttack = 150, - .baseDefense = 110, - .baseSpeed = 70, - .baseSpAttack = 95, - .baseSpDefense = 110, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 318 : 286, - .abilities = { ABILITY_SWIFT_SWIM, ABILITY_SWIFT_SWIM, ABILITY_SWIFT_SWIM }, - .cryId = CRY_SWAMPERT_MEGA, .height = 19, .weight = 1020, .description = COMPOUND_STRING( @@ -673,6 +668,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SwampertMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Swampert) + .levelUpLearnset = sSwampertLevelUpLearnset, + .teachableLearnset = sSwampertTeachableLearnset, + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, + .formChangeTable = sSwampertFormChangeTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_SwampertMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -819,38 +819,38 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 60, .baseSpAttack = 30, .baseSpDefense = 41, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, .expYield = ZIGZAGOON_EXP_YIELD, .evYield_Speed = 1, + .itemCommon = ITEM_POTION, + .itemRare = ITEM_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Zigzagoon"), .cryId = CRY_ZIGZAGOON, .natDexNum = NATIONAL_DEX_ZIGZAGOON, .categoryName = _("Tiny Raccoon"), .height = 4, .weight = 175, - .pokemonScale = 560, - .pokemonOffset = 22, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zigzagoon) - .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, - .types = MON_TYPES(TYPE_NORMAL), - .itemCommon = ITEM_POTION, - .itemRare = ITEM_REVIVE, - .bodyColor = BODY_COLOR_BROWN, .description = COMPOUND_STRING( "Rubbing its nose against the ground, it\n" "always wanders about back and forth in\n" "search of something. It is distinguished\n" "by the zigzag footprints it leaves."), + .pokemonScale = 560, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Zigzagoon, .frontPicSize = MON_COORDS_SIZE(56, 40), + FOOTPRINT(Zigzagoon) + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_Zigzagoon, .frontAnimId = ANIM_H_SLIDE, @@ -875,9 +875,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 100, .baseSpAttack = 50, .baseSpDefense = 61, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, .evYield_Speed = 2, + .itemCommon = ITEM_POTION, + .itemRare = ITEM_MAX_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, @@ -891,22 +894,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("Rushing"), .height = 5, .weight = 325, - .pokemonScale = 321, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Linoone) - .formSpeciesIdTable = sLinooneFormSpeciesIdTable, - .types = MON_TYPES(TYPE_NORMAL), - .itemCommon = ITEM_POTION, - .itemRare = ITEM_MAX_REVIVE, .description = COMPOUND_STRING( "It is exceedingly fast if it only has to run\n" "in a straight line. When it spots pond-\n" "dwelling prey underwater, it quickly leaps\n" "in and catches it with its sharp claws."), + .pokemonScale = 321, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Linoone, .frontPicSize = MON_COORDS_SIZE(64, 40), + FOOTPRINT(Linoone) + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_Linoone, .frontAnimId = ANIM_GROW_VIBRATE, @@ -931,6 +931,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 60, .baseSpAttack = 30, .baseSpDefense = 41, + .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .catchRate = 255, .expYield = ZIGZAGOON_EXP_YIELD, .evYield_Speed = 1, @@ -940,27 +941,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_PICKUP, ABILITY_GLUTTONY, ABILITY_QUICK_FEET }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Zigzagoon"), .cryId = CRY_ZIGZAGOON, .natDexNum = NATIONAL_DEX_ZIGZAGOON, .categoryName = _("Tiny Raccoon"), .height = 4, .weight = 175, - .pokemonScale = 560, - .pokemonOffset = 22, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zigzagoon) - .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, - .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), - .bodyColor = BODY_COLOR_WHITE, .description = COMPOUND_STRING( "Its restlessness has it constantly moving\n" "in zigzags. It will purposely run into other\n" "Pokémon to start fights. It's thought to\n" "be the oldest form of Zigzagoon."), + .pokemonScale = 560, + .pokemonOffset = 22, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZigzagoonGalarian, .frontPicSize = MON_COORDS_SIZE(56, 40), + FOOTPRINT(Zigzagoon) + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_ZigzagoonGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -986,6 +986,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 100, .baseSpAttack = 50, .baseSpDefense = 61, + .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 128, .evYield_Speed = 2, @@ -1002,20 +1003,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("Rushing"), .height = 5, .weight = 325, - .pokemonScale = 321, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Linoone) - .formSpeciesIdTable = sLinooneFormSpeciesIdTable, - .types = MON_TYPES(TYPE_DARK, TYPE_NORMAL), .description = COMPOUND_STRING( "This very aggressive Pokémon will\n" "recklessly challenge opponents stronger\n" "than itself. It uses its long tongue to\n" "taunt them to then tackle forcefully."), + .pokemonScale = 321, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_LinooneGalarian, .frontPicSize = MON_COORDS_SIZE(64, 40), + FOOTPRINT(Linoone) + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_LinooneGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2102,6 +2102,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_GARDEVOIR] = { + .baseHP = 68, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 80, + .baseSpAttack = 125, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), .catchRate = 45, .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), @@ -2109,7 +2116,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = RALTS_FAMILY_EGG_GROUPS, - .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Gardevoir"), .natDexNum = NATIONAL_DEX_GARDEVOIR, @@ -2125,12 +2131,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sGardevoirTeachableLearnset, .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, - .baseHP = 68, - .baseAttack = 65, - .baseDefense = 65, - .baseSpeed = 80, - .baseSpAttack = 125, - .baseSpDefense = 115, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 259, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -2163,45 +2163,45 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARDEVOIR_MEGA] = { + .baseHP = 68, + .baseAttack = 85, + .baseDefense = 65, + .baseSpeed = 100, + .baseSpAttack = 165, + .baseSpDefense = 135, + .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 309 : 278, .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = RALTS_FAMILY_EGG_GROUPS, - .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), + .abilities = { ABILITY_PIXILATE, ABILITY_PIXILATE, ABILITY_PIXILATE }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Gardevoir"), + .cryId = CRY_GARDEVOIR_MEGA, .natDexNum = NATIONAL_DEX_GARDEVOIR, .categoryName = _("Embrace"), .height = 16, .weight = 484, + .description = COMPOUND_STRING( + "By opening its heart, Mega Gardevoir\n" + "becomes able to use tremendous psychic\n" + "power. The red plate in its chest is said to\n" + "be a physical manifestation of its heart."), .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_GardevoirMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Gardevoir) .levelUpLearnset = sGardevoirLevelUpLearnset, .teachableLearnset = sGardevoirTeachableLearnset, .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, .formChangeTable = sGardevoirFormChangeTable, - .baseHP = 68, - .baseAttack = 85, - .baseDefense = 65, - .baseSpeed = 100, - .baseSpAttack = 165, - .baseSpDefense = 135, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 309 : 278, - .abilities = { ABILITY_PIXILATE, ABILITY_PIXILATE, ABILITY_PIXILATE }, - .cryId = CRY_GARDEVOIR_MEGA, - .description = COMPOUND_STRING( - "By opening its heart, Mega Gardevoir\n" - "becomes able to use tremendous psychic\n" - "power. The red plate in its chest is said to\n" - "be a physical manifestation of its heart."), - .frontPic = gMonFrontPic_GardevoirMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GardevoirMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2220,6 +2220,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_GEN_4_CROSS_EVOS [SPECIES_GALLADE] = { + .baseHP = 68, + .baseAttack = 125, + .baseDefense = 65, + .baseSpeed = 80, + .baseSpAttack = 65, + .baseSpDefense = 115, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), .catchRate = 45, .evYield_Attack = 3, @@ -2242,12 +2248,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sGalladeTeachableLearnset, .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, - .baseHP = 68, - .baseAttack = 125, - .baseDefense = 65, - .baseSpeed = 80, - .baseSpAttack = 65, - .baseSpDefense = 115, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 259, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -2285,45 +2285,45 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GALLADE_MEGA] = { + .baseHP = 68, + .baseAttack = 165, + .baseDefense = 95, + .baseSpeed = 110, + .baseSpAttack = 65, + .baseSpDefense = 115, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 309 : 278, .evYield_Attack = 3, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .abilities = { ABILITY_INNER_FOCUS, ABILITY_INNER_FOCUS, ABILITY_INNER_FOCUS }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Gallade"), + .cryId = CRY_GALLADE_MEGA, .natDexNum = NATIONAL_DEX_GALLADE, .categoryName = _("Blade"), .height = 16, + .weight = 564, + .description = COMPOUND_STRING( + "Mega Gallade has a knightly appearance.\n" + "It can use its psychic power to reshape\n" + "both arms into blades simultaneously and\n" + "fight using a dual-wielding style."), .pokemonScale = 259, .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, + .frontPic = gMonFrontPic_GalladeMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Gallade) .levelUpLearnset = sGalladeLevelUpLearnset, .teachableLearnset = sGalladeTeachableLearnset, .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, - .baseHP = 68, - .baseAttack = 165, - .baseDefense = 95, - .baseSpeed = 110, - .baseSpAttack = 65, - .baseSpDefense = 115, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 309 : 278, - .abilities = { ABILITY_INNER_FOCUS, ABILITY_INNER_FOCUS, ABILITY_INNER_FOCUS }, - .cryId = CRY_GALLADE_MEGA, - .weight = 564, - .description = COMPOUND_STRING( - "Mega Gallade has a knightly appearance.\n" - "It can use its psychic power to reshape\n" - "both arms into blades simultaneously and\n" - "fight using a dual-wielding style."), - .frontPic = gMonFrontPic_GalladeMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_GalladeMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3411,35 +3411,30 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_SABLEYE [SPECIES_SABLEYE] = { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 133 : 98, .evYield_Attack = 1, .evYield_Defense = 1, + .itemRare = ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_KEEN_EYE, ABILITY_STALL, ABILITY_PRANKSTER }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Sableye"), + .cryId = CRY_SABLEYE, .natDexNum = NATIONAL_DEX_SABLEYE, .categoryName = _("Darkness"), .height = 5, - FOOTPRINT(Sableye) - .levelUpLearnset = sSableyeLevelUpLearnset, - .teachableLearnset = sSableyeTeachableLearnset, - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, - .formChangeTable = sSableyeFormChangeTable, - .baseHP = 50, - .baseAttack = 75, - .baseDefense = 75, - .baseSpeed = 50, - .baseSpAttack = 65, - .baseSpDefense = 65, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 133 : 98, - .itemRare = ITEM_WIDE_LENS, - .abilities = { ABILITY_KEEN_EYE, ABILITY_STALL, ABILITY_PRANKSTER }, - .cryId = CRY_SABLEYE, .weight = 110, .description = COMPOUND_STRING( "It digs branching holes in caves using its\n" @@ -3452,6 +3447,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sableye, .frontPicSize = MON_COORDS_SIZE(48, 48), + FOOTPRINT(Sableye) + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, + .formChangeTable = sSableyeFormChangeTable, .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sableye, .frontAnimId = ANIM_GLOW_BLACK, @@ -3468,8 +3468,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SABLEYE_MEGA] = { + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 125, + .baseSpeed = 20, + .baseSpAttack = 85, + .baseSpDefense = 115, .types = MON_TYPES(TYPE_DARK, TYPE_GHOST), .catchRate = 45, + .expYield = 168, .evYield_Attack = 1, .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), @@ -3477,30 +3484,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Sableye"), + .cryId = CRY_SABLEYE_MEGA, .natDexNum = NATIONAL_DEX_SABLEYE, .categoryName = _("Darkness"), .height = 5, - FOOTPRINT(Sableye) - .levelUpLearnset = sSableyeLevelUpLearnset, - .teachableLearnset = sSableyeTeachableLearnset, - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, - .formChangeTable = sSableyeFormChangeTable, - .baseHP = 50, - .baseAttack = 85, - .baseDefense = 125, - .baseSpeed = 20, - .baseSpAttack = 85, - .baseSpDefense = 115, - .expYield = 168, - .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, - .cryId = CRY_SABLEYE_MEGA, .weight = 1610, .description = COMPOUND_STRING( "Bathed in the energy of Mega Evolution,\n" "the gemstone on its chest expands, rips\n" "through its skin, and falls out."), + FOOTPRINT(Sableye) + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, + .formChangeTable = sSableyeFormChangeTable, .pokemonScale = 451, .pokemonOffset = 17, .trainerScale = 256, @@ -3532,34 +3532,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MAWILE] = { + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 85, + .baseSpeed = 50, + .baseSpAttack = 55, + .baseSpDefense = 55, .types = MAWILE_TYPES, .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 133 : 98, .evYield_Attack = 1, .evYield_Defense = 1, + .itemRare = ITEM_IRON_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_HYPER_CUTTER, ABILITY_INTIMIDATE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Mawile"), + .cryId = CRY_MAWILE, .natDexNum = NATIONAL_DEX_MAWILE, .categoryName = _("Deceiver"), - FOOTPRINT(Mawile) - .levelUpLearnset = sMawileLevelUpLearnset, - .teachableLearnset = sMawileTeachableLearnset, - .formSpeciesIdTable = sMawileFormSpeciesIdTable, - .formChangeTable = sMawileFormChangeTable, - .baseHP = 50, - .baseAttack = 85, - .baseDefense = 85, - .baseSpeed = 50, - .baseSpAttack = 55, - .baseSpDefense = 55, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 133 : 98, - .itemRare = ITEM_IRON_BALL, - .abilities = { ABILITY_HYPER_CUTTER, ABILITY_INTIMIDATE, ABILITY_SHEER_FORCE }, - .cryId = CRY_MAWILE, .height = 6, .weight = 115, .description = COMPOUND_STRING( @@ -3573,6 +3568,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Mawile, .frontPicSize = MON_COORDS_SIZE(64, 48), + FOOTPRINT(Mawile) + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, + .formSpeciesIdTable = sMawileFormSpeciesIdTable, + .formChangeTable = sMawileFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Mawile, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3589,8 +3589,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MAWILE_MEGA] = { + .baseHP = 50, + .baseAttack = 105, + .baseDefense = 125, + .baseSpeed = 50, + .baseSpAttack = 55, + .baseSpDefense = 95, .types = MAWILE_TYPES, .catchRate = 45, + .expYield = 168, .evYield_Attack = 1, .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), @@ -3598,24 +3605,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_FAIRY), + .abilities = { ABILITY_HUGE_POWER, ABILITY_HUGE_POWER, ABILITY_HUGE_POWER }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Mawile"), + .cryId = CRY_MAWILE_MEGA, .natDexNum = NATIONAL_DEX_MAWILE, .categoryName = _("Deceiver"), - FOOTPRINT(Mawile) - .levelUpLearnset = sMawileLevelUpLearnset, - .teachableLearnset = sMawileTeachableLearnset, - .formSpeciesIdTable = sMawileFormSpeciesIdTable, - .formChangeTable = sMawileFormChangeTable, - .baseHP = 50, - .baseAttack = 105, - .baseDefense = 125, - .baseSpeed = 50, - .baseSpAttack = 55, - .baseSpDefense = 95, - .expYield = 168, - .abilities = { ABILITY_HUGE_POWER, ABILITY_HUGE_POWER, ABILITY_HUGE_POWER }, - .cryId = CRY_MAWILE_MEGA, .height = 10, .weight = 235, .description = COMPOUND_STRING( @@ -3629,6 +3624,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_MawileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Mawile) + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, + .formSpeciesIdTable = sMawileFormSpeciesIdTable, + .formChangeTable = sMawileFormChangeTable, .frontPicYOffset = 5, .frontAnimFrames = sAnims_MawileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3756,6 +3756,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_AGGRON] = { + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 180, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 60, + .types = MON_TYPES(TYPE_STEEL, TYPE_ROCK), .catchRate = 45, .evYield_Defense = 3, .itemRare = ITEM_HARD_STONE, @@ -3773,13 +3780,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sAggronTeachableLearnset, .formSpeciesIdTable = sAggronFormSpeciesIdTable, .formChangeTable = sAggronFormChangeTable, - .baseHP = 70, - .baseAttack = 110, - .baseDefense = 180, - .baseSpeed = 50, - .baseSpAttack = 60, - .baseSpDefense = 60, - .types = MON_TYPES(TYPE_STEEL, TYPE_ROCK), #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 265, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -3818,7 +3818,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_AGGRON_MEGA] = { + .baseHP = 70, + .baseAttack = 140, + .baseDefense = 230, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 80, + .types = MON_TYPES(TYPE_STEEL), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, .evYield_Defense = 3, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), @@ -3826,25 +3834,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_FILTER, ABILITY_FILTER, ABILITY_FILTER }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Aggron"), + .cryId = CRY_AGGRON_MEGA, .natDexNum = NATIONAL_DEX_AGGRON, .categoryName = _("Iron Armor"), - FOOTPRINT(Aggron) - .levelUpLearnset = sAggronLevelUpLearnset, - .teachableLearnset = sAggronTeachableLearnset, - .formSpeciesIdTable = sAggronFormSpeciesIdTable, - .formChangeTable = sAggronFormChangeTable, - .baseHP = 70, - .baseAttack = 140, - .baseDefense = 230, - .baseSpeed = 50, - .baseSpAttack = 60, - .baseSpDefense = 80, - .types = MON_TYPES(TYPE_STEEL), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 315 : 284, - .abilities = { ABILITY_FILTER, ABILITY_FILTER, ABILITY_FILTER }, - .cryId = CRY_AGGRON_MEGA, .height = 22, .weight = 3950, .description = COMPOUND_STRING( @@ -3858,6 +3853,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 6, .frontPic = gMonFrontPic_AggronMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Aggron) + .levelUpLearnset = sAggronLevelUpLearnset, + .teachableLearnset = sAggronTeachableLearnset, + .formSpeciesIdTable = sAggronFormSpeciesIdTable, + .formChangeTable = sAggronFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AggronMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3934,43 +3934,38 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MEDICHAM] = { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 75, + .baseSpeed = 80, + .baseSpAttack = 60, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), .catchRate = 90, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 144 : 153, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Medicham"), + .cryId = CRY_MEDICHAM, .natDexNum = NATIONAL_DEX_MEDICHAM, .categoryName = _("Meditate"), .height = 13, .weight = 315, - .pokemonScale = 298, - .pokemonOffset = 5, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Medicham) - .levelUpLearnset = sMedichamLevelUpLearnset, - .teachableLearnset = sMedichamTeachableLearnset, - .formSpeciesIdTable = sMedichamFormSpeciesIdTable, - .formChangeTable = sMedichamFormChangeTable, - .baseHP = 60, - .baseAttack = 60, - .baseDefense = 75, - .baseSpeed = 80, - .baseSpAttack = 60, - .baseSpDefense = 75, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 144 : 153, - .abilities = { ABILITY_PURE_POWER, ABILITY_NONE, ABILITY_TELEPATHY }, - .cryId = CRY_MEDICHAM, .description = COMPOUND_STRING( "Through crushingly harsh yoga training, it\n" "gained the power to foretell its foe's\n" "actions. It battles with elegant, dance-\n" "like movement."), + .pokemonScale = 298, + .pokemonOffset = 5, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Medicham, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicFemale = gMonFrontPic_MedichamF, @@ -3980,6 +3975,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Medicham, .backPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Medicham) + .levelUpLearnset = sMedichamLevelUpLearnset, + .teachableLearnset = sMedichamTeachableLearnset, + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, + .formChangeTable = sMedichamFormChangeTable, .backPicFemale = gMonBackPic_MedichamF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, @@ -3993,45 +3993,45 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MEDICHAM_MEGA] = { + .baseHP = 60, + .baseAttack = 100, + .baseDefense = 85, + .baseSpeed = 100, + .baseSpAttack = 80, + .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIGHTING, TYPE_PSYCHIC), .catchRate = 90, + .expYield = 179, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PURE_POWER, ABILITY_PURE_POWER, ABILITY_PURE_POWER }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Medicham"), + .cryId = CRY_MEDICHAM_MEGA, .natDexNum = NATIONAL_DEX_MEDICHAM, .categoryName = _("Meditate"), .height = 13, .weight = 315, + .description = COMPOUND_STRING( + "It uses its amped-up willpower to create\n" + "additional arms for itself. The more it has\n" + "trained its spirit, the more realistic and\n" + "dexterous these self-created arms become."), .pokemonScale = 298, .pokemonOffset = 5, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_MedichamMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Medicham) .levelUpLearnset = sMedichamLevelUpLearnset, .teachableLearnset = sMedichamTeachableLearnset, .formSpeciesIdTable = sMedichamFormSpeciesIdTable, .formChangeTable = sMedichamFormChangeTable, - .baseHP = 60, - .baseAttack = 100, - .baseDefense = 85, - .baseSpeed = 100, - .baseSpAttack = 80, - .baseSpDefense = 85, - .expYield = 179, - .abilities = { ABILITY_PURE_POWER, ABILITY_PURE_POWER, ABILITY_PURE_POWER }, - .cryId = CRY_MEDICHAM_MEGA, - .description = COMPOUND_STRING( - "It uses its amped-up willpower to create\n" - "additional arms for itself. The more it has\n" - "trained its spirit, the more realistic and\n" - "dexterous these self-created arms become."), - .frontPic = gMonFrontPic_MedichamMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_MedichamMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4104,32 +4104,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_MANECTRIC] = { + .baseHP = 70, + .baseAttack = 75, + .baseDefense = 60, + .baseSpeed = 105, + .baseSpAttack = 105, + .baseSpDefense = 60, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 168, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_STATIC, ABILITY_LIGHTNING_ROD, ABILITY_MINUS }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Manectric"), + .cryId = CRY_MANECTRIC, .natDexNum = NATIONAL_DEX_MANECTRIC, .categoryName = _("Discharge"), - FOOTPRINT(Manectric) - .levelUpLearnset = sManectricLevelUpLearnset, - .teachableLearnset = sManectricTeachableLearnset, - .formSpeciesIdTable = sManectricFormSpeciesIdTable, - .formChangeTable = sManectricFormChangeTable, - .baseHP = 70, - .baseAttack = 75, - .baseDefense = 60, - .baseSpeed = 105, - .baseSpAttack = 105, - .baseSpDefense = 60, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 166 : 168, - .abilities = { ABILITY_STATIC, ABILITY_LIGHTNING_ROD, ABILITY_MINUS }, - .cryId = CRY_MANECTRIC, .height = 15, .weight = 402, .description = COMPOUND_STRING( @@ -4143,6 +4138,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Manectric, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Manectric) + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, + .formSpeciesIdTable = sManectricFormSpeciesIdTable, + .formChangeTable = sManectricFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Manectric, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4159,38 +4159,38 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_MANECTRIC_MEGA] = { + .baseHP = 70, + .baseAttack = 75, + .baseDefense = 80, + .baseSpeed = 135, + .baseSpAttack = 135, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, + .expYield = 201, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_INTIMIDATE, ABILITY_INTIMIDATE, ABILITY_INTIMIDATE }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Manectric"), + .cryId = CRY_MANECTRIC_MEGA, .natDexNum = NATIONAL_DEX_MANECTRIC, .categoryName = _("Discharge"), - FOOTPRINT(Manectric) - .levelUpLearnset = sManectricLevelUpLearnset, - .teachableLearnset = sManectricTeachableLearnset, - .formSpeciesIdTable = sManectricFormSpeciesIdTable, - .formChangeTable = sManectricFormChangeTable, - .baseHP = 70, - .baseAttack = 75, - .baseDefense = 80, - .baseSpeed = 135, - .baseSpAttack = 135, - .baseSpDefense = 80, - .expYield = 201, - .abilities = { ABILITY_INTIMIDATE, ABILITY_INTIMIDATE, ABILITY_INTIMIDATE }, - .cryId = CRY_MANECTRIC_MEGA, .height = 18, .weight = 440, .description = COMPOUND_STRING( "Too much electricity has built up in its\n" "body, irritating Manectric. Its explosive\n" "speed is equal to that of a lightning bolt."), + FOOTPRINT(Manectric) + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, + .formSpeciesIdTable = sManectricFormSpeciesIdTable, + .formChangeTable = sManectricFormChangeTable, .pokemonScale = 256, .pokemonOffset = 3, .trainerScale = 257, @@ -4815,8 +4815,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SHARPEDO] = { + .baseHP = 70, + .baseAttack = 120, + .baseDefense = 40, + .baseSpeed = 95, + .baseSpAttack = 95, + .baseSpDefense = 40, .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 175, .evYield_Attack = 2, .itemRare = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), @@ -4824,24 +4831,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_ROUGH_SKIN, ABILITY_NONE, ABILITY_SPEED_BOOST }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Sharpedo"), + .cryId = CRY_SHARPEDO, .natDexNum = NATIONAL_DEX_SHARPEDO, .categoryName = _("Brutal"), - FOOTPRINT(Sharpedo) - .levelUpLearnset = sSharpedoLevelUpLearnset, - .teachableLearnset = sSharpedoTeachableLearnset, - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, - .formChangeTable = sSharpedoFormChangeTable, - .baseHP = 70, - .baseAttack = 120, - .baseDefense = 40, - .baseSpeed = 95, - .baseSpAttack = 95, - .baseSpDefense = 40, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 175, - .abilities = { ABILITY_ROUGH_SKIN, ABILITY_NONE, ABILITY_SPEED_BOOST }, - .cryId = CRY_SHARPEDO, .height = 18, .weight = 888, .description = COMPOUND_STRING( @@ -4855,6 +4850,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 3, .frontPic = gMonFrontPic_Sharpedo, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Sharpedo) + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, + .formChangeTable = sSharpedoFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sharpedo, .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, @@ -4871,8 +4871,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SHARPEDO_MEGA] = { + .baseHP = 70, + .baseAttack = 140, + .baseDefense = 70, + .baseSpeed = 105, + .baseSpAttack = 110, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 60, + .expYield = 196, .evYield_Attack = 2, .itemRare = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), @@ -4880,24 +4887,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_STRONG_JAW, ABILITY_STRONG_JAW, ABILITY_STRONG_JAW }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Sharpedo"), + .cryId = CRY_SHARPEDO_MEGA, .natDexNum = NATIONAL_DEX_SHARPEDO, .categoryName = _("Brutal"), - FOOTPRINT(Sharpedo) - .levelUpLearnset = sSharpedoLevelUpLearnset, - .teachableLearnset = sSharpedoTeachableLearnset, - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, - .formChangeTable = sSharpedoFormChangeTable, - .baseHP = 70, - .baseAttack = 140, - .baseDefense = 70, - .baseSpeed = 105, - .baseSpAttack = 110, - .baseSpDefense = 65, - .expYield = 196, - .abilities = { ABILITY_STRONG_JAW, ABILITY_STRONG_JAW, ABILITY_STRONG_JAW }, - .cryId = CRY_SHARPEDO_MEGA, .height = 25, .weight = 1303, .description = COMPOUND_STRING( @@ -4911,6 +4906,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 3, .frontPic = gMonFrontPic_SharpedoMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Sharpedo) + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, + .formChangeTable = sSharpedoFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SharpedoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5096,8 +5096,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CAMERUPT] = { + .baseHP = 70, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 105, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), .catchRate = 150, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 175, .evYield_Attack = 1, .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), @@ -5105,24 +5112,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_MAGMA_ARMOR, ABILITY_SOLID_ROCK, ABILITY_ANGER_POINT }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Camerupt"), + .cryId = CRY_CAMERUPT, .natDexNum = NATIONAL_DEX_CAMERUPT, .categoryName = _("Eruption"), - FOOTPRINT(Camerupt) - .levelUpLearnset = sCameruptLevelUpLearnset, - .teachableLearnset = sCameruptTeachableLearnset, - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, - .formChangeTable = sCameruptFormChangeTable, - .baseHP = 70, - .baseAttack = 100, - .baseDefense = 70, - .baseSpeed = 40, - .baseSpAttack = 105, - .baseSpDefense = 75, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 175, - .abilities = { ABILITY_MAGMA_ARMOR, ABILITY_SOLID_ROCK, ABILITY_ANGER_POINT }, - .cryId = CRY_CAMERUPT, .height = 19, .weight = 2200, .description = COMPOUND_STRING( @@ -5143,6 +5138,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Camerupt, .backPicSize = MON_COORDS_SIZE(64, 40), + FOOTPRINT(Camerupt) + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, + .formChangeTable = sCameruptFormChangeTable, .backPicFemale = gMonBackPic_CameruptF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, @@ -5156,8 +5156,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_CAMERUPT_MEGA] = { + .baseHP = 70, + .baseAttack = 120, + .baseDefense = 100, + .baseSpeed = 20, + .baseSpAttack = 145, + .baseSpDefense = 105, .types = MON_TYPES(TYPE_FIRE, TYPE_GROUND), .catchRate = 150, + .expYield = 196, .evYield_Attack = 1, .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(50), @@ -5165,24 +5172,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SHEER_FORCE, ABILITY_SHEER_FORCE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Camerupt"), + .cryId = CRY_CAMERUPT_MEGA, .natDexNum = NATIONAL_DEX_CAMERUPT, .categoryName = _("Eruption"), - FOOTPRINT(Camerupt) - .levelUpLearnset = sCameruptLevelUpLearnset, - .teachableLearnset = sCameruptTeachableLearnset, - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, - .formChangeTable = sCameruptFormChangeTable, - .baseHP = 70, - .baseAttack = 120, - .baseDefense = 100, - .baseSpeed = 20, - .baseSpAttack = 145, - .baseSpDefense = 105, - .expYield = 196, - .abilities = { ABILITY_SHEER_FORCE, ABILITY_SHEER_FORCE, ABILITY_SHEER_FORCE }, - .cryId = CRY_CAMERUPT_MEGA, .height = 25, .weight = 3205, .description = COMPOUND_STRING( @@ -5196,6 +5191,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 6, .frontPic = gMonFrontPic_CameruptMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Camerupt) + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, + .formChangeTable = sCameruptFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_CameruptMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5780,32 +5780,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_ALTARIA] = { + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 90, + .baseSpeed = 80, + .baseSpAttack = 70, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 188, .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE, ABILITY_CLOUD_NINE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Altaria"), + .cryId = CRY_ALTARIA, .natDexNum = NATIONAL_DEX_ALTARIA, .categoryName = _("Humming"), - FOOTPRINT(Altaria) - .levelUpLearnset = sAltariaLevelUpLearnset, - .teachableLearnset = sAltariaTeachableLearnset, - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, - .formChangeTable = sAltariaFormChangeTable, - .baseHP = 75, - .baseAttack = 70, - .baseDefense = 90, - .baseSpeed = 80, - .baseSpAttack = 70, - .baseSpDefense = 105, - .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 188, - .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE, ABILITY_CLOUD_NINE }, - .cryId = CRY_ALTARIA, .height = 11, .weight = 206, .description = COMPOUND_STRING( @@ -5819,6 +5814,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Altaria, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Altaria) + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, + .formChangeTable = sAltariaFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Altaria, .frontAnimId = ANIM_V_STRETCH, @@ -5835,32 +5835,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ALTARIA_MEGA] = { + .baseHP = 75, + .baseAttack = 110, + .baseDefense = 110, + .baseSpeed = 80, + .baseSpAttack = 110, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_DRAGON, TYPE_FAIRY), .catchRate = 45, + .expYield = 207, .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + .abilities = { ABILITY_PIXILATE, ABILITY_PIXILATE, ABILITY_PIXILATE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Altaria"), + .cryId = CRY_ALTARIA_MEGA, .natDexNum = NATIONAL_DEX_ALTARIA, .categoryName = _("Humming"), - FOOTPRINT(Altaria) - .levelUpLearnset = sAltariaLevelUpLearnset, - .teachableLearnset = sAltariaTeachableLearnset, - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, - .formChangeTable = sAltariaFormChangeTable, - .baseHP = 75, - .baseAttack = 110, - .baseDefense = 110, - .baseSpeed = 80, - .baseSpAttack = 110, - .baseSpDefense = 105, - .types = MON_TYPES(TYPE_DRAGON, TYPE_FAIRY), - .expYield = 207, - .abilities = { ABILITY_PIXILATE, ABILITY_PIXILATE, ABILITY_PIXILATE }, - .cryId = CRY_ALTARIA_MEGA, .height = 15, .weight = 206, .description = COMPOUND_STRING( @@ -5874,6 +5869,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AltariaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Altaria) + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, + .formChangeTable = sAltariaFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AltariaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -6819,6 +6819,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 70, .baseSpAttack = 70, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, .evYield_HP = 1, @@ -6830,30 +6831,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Castform"), .cryId = CRY_CASTFORM, .natDexNum = NATIONAL_DEX_CASTFORM, .categoryName = _("Weather"), .height = 3, .weight = 8, + .description = COMPOUND_STRING( + "It alters its form depending on the\n" + "weather. Changes in the climate such as\n" + "the temperature and humidity appear to\n" + "affect its cellular structure."), .pokemonScale = 435, .pokemonOffset = -5, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_CastformNormal, + .frontPicSize = MON_COORDS_SIZE(24, 32), FOOTPRINT(Castform) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, - .types = MON_TYPES(TYPE_NORMAL), - .bodyColor = BODY_COLOR_GRAY, - .description = COMPOUND_STRING( - "It alters its form depending on the\n" - "weather. Changes in the climate such as\n" - "the temperature and humidity appear to\n" - "affect its cellular structure."), - .frontPic = gMonFrontPic_CastformNormal, - .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = 17, .frontAnimFrames = sAnims_CastformNormal, .frontAnimId = ANIM_H_SLIDE_WOBBLE, @@ -6876,6 +6876,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 70, .baseSpAttack = 70, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, .evYield_HP = 1, @@ -6887,30 +6888,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Castform"), .cryId = CRY_CASTFORM, .natDexNum = NATIONAL_DEX_CASTFORM, .categoryName = _("Weather"), .height = 3, .weight = 8, - .pokemonScale = 435, - .pokemonOffset = -5, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Castform) - .levelUpLearnset = sCastformLevelUpLearnset, - .teachableLearnset = sCastformTeachableLearnset, - .formSpeciesIdTable = sCastformFormSpeciesIdTable, - .formChangeTable = sCastformFormChangeTable, - .types = MON_TYPES(TYPE_FIRE), - .bodyColor = BODY_COLOR_RED, .description = COMPOUND_STRING( "Castform takes this form on bright days.\n" "In an experiment where is was placed in\n" "front of a heater, it didn't change to this\n" "form. Its body is warm and toasty."), + .pokemonScale = 435, + .pokemonOffset = -5, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_CastformSunny, .frontPicSize = MON_COORDS_SIZE(40, 48), + FOOTPRINT(Castform) + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, + .formSpeciesIdTable = sCastformFormSpeciesIdTable, + .formChangeTable = sCastformFormChangeTable, .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformSunny, .frontAnimId = ANIM_GROW_VIBRATE, @@ -6933,6 +6933,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 70, .baseSpAttack = 70, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, .evYield_HP = 1, @@ -6944,30 +6945,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Castform"), .cryId = CRY_CASTFORM, .natDexNum = NATIONAL_DEX_CASTFORM, .categoryName = _("Weather"), .height = 3, .weight = 8, + .description = COMPOUND_STRING( + "This is Castform's form while it's raining.\n" + "In an experiment where it was placed in a\n" + "shower, it didn't change to this form. Its\n" + "body is soft, slightly swollen with water."), .pokemonScale = 435, .pokemonOffset = -5, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_CastformRainy, + .frontPicSize = MON_COORDS_SIZE(32, 48), FOOTPRINT(Castform) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, - .types = MON_TYPES(TYPE_WATER), - .bodyColor = BODY_COLOR_BLUE, - .description = COMPOUND_STRING( - "This is Castform's form while it's raining.\n" - "In an experiment where it was placed in a\n" - "shower, it didn't change to this form. Its\n" - "body is soft, slightly swollen with water."), - .frontPic = gMonFrontPic_CastformRainy, - .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformRainy, .frontAnimId = ANIM_SWING_CONVEX_FAST, @@ -6990,6 +6990,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 70, .baseSpAttack = 70, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_ICE), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 147 : 145, .evYield_HP = 1, @@ -7001,30 +7002,29 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_FORECAST, ABILITY_NONE }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Castform"), .cryId = CRY_CASTFORM, .natDexNum = NATIONAL_DEX_CASTFORM, .categoryName = _("Weather"), .height = 3, .weight = 8, + .description = COMPOUND_STRING( + "This is Castform's form in a hailstorm.\n" + "In an experiment where it was placed\n" + "in a freezer, it didn't change to this form.\n" + "Its cold skin is as smooth as ice."), .pokemonScale = 435, .pokemonOffset = -5, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_CastformSnowy, + .frontPicSize = MON_COORDS_SIZE(40, 56), FOOTPRINT(Castform) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, .formSpeciesIdTable = sCastformFormSpeciesIdTable, .formChangeTable = sCastformFormChangeTable, - .types = MON_TYPES(TYPE_ICE), - .bodyColor = BODY_COLOR_WHITE, - .description = COMPOUND_STRING( - "This is Castform's form in a hailstorm.\n" - "In an experiment where it was placed\n" - "in a freezer, it didn't change to this form.\n" - "Its cold skin is as smooth as ice."), - .frontPic = gMonFrontPic_CastformSnowy, - .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_CastformSnowy, .frontAnimId = ANIM_V_STRETCH, @@ -7153,8 +7153,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_BANETTE] = { + .baseHP = 64, + .baseAttack = 115, + .baseDefense = 65, + .baseSpeed = 65, + .baseSpAttack = 83, + .baseSpDefense = 63, .types = MON_TYPES(TYPE_GHOST), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 159 : 179, .evYield_Attack = 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -7162,24 +7169,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_INSOMNIA, ABILITY_FRISK, ABILITY_CURSED_BODY }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Banette"), + .cryId = CRY_BANETTE, .natDexNum = NATIONAL_DEX_BANETTE, .categoryName = _("Marionette"), - FOOTPRINT(Banette) - .levelUpLearnset = sBanetteLevelUpLearnset, - .teachableLearnset = sBanetteTeachableLearnset, - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, - .formChangeTable = sBanetteFormChangeTable, - .baseHP = 64, - .baseAttack = 115, - .baseDefense = 65, - .baseSpeed = 65, - .baseSpAttack = 83, - .baseSpDefense = 63, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 159 : 179, - .abilities = { ABILITY_INSOMNIA, ABILITY_FRISK, ABILITY_CURSED_BODY }, - .cryId = CRY_BANETTE, .height = 11, .weight = 125, .description = COMPOUND_STRING( @@ -7193,6 +7188,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Banette, .frontPicSize = MON_COORDS_SIZE(56, 56), + FOOTPRINT(Banette) + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, + .formChangeTable = sBanetteFormChangeTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_Banette, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, @@ -7209,8 +7209,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_BANETTE_MEGA] = { + .baseHP = 64, + .baseAttack = 165, + .baseDefense = 75, + .baseSpeed = 75, + .baseSpAttack = 93, + .baseSpDefense = 83, .types = MON_TYPES(TYPE_GHOST), .catchRate = 45, + .expYield = 194, .evYield_Attack = 2, .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), @@ -7218,30 +7225,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PRANKSTER, ABILITY_PRANKSTER, ABILITY_PRANKSTER }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Banette"), + .cryId = CRY_BANETTE_MEGA, .natDexNum = NATIONAL_DEX_BANETTE, .categoryName = _("Marionette"), - FOOTPRINT(Banette) - .levelUpLearnset = sBanetteLevelUpLearnset, - .teachableLearnset = sBanetteTeachableLearnset, - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, - .formChangeTable = sBanetteFormChangeTable, - .baseHP = 64, - .baseAttack = 165, - .baseDefense = 75, - .baseSpeed = 75, - .baseSpAttack = 93, - .baseSpDefense = 83, - .expYield = 194, - .abilities = { ABILITY_PRANKSTER, ABILITY_PRANKSTER, ABILITY_PRANKSTER }, - .cryId = CRY_BANETTE_MEGA, .height = 12, .weight = 130, .description = COMPOUND_STRING( "Extraordinary energy amplifies its\n" "cursing power to such an extent that it\n" "can't help but curse its own Trainer."), + FOOTPRINT(Banette) + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, + .formChangeTable = sBanetteFormChangeTable, .pokemonScale = 262, .pokemonOffset = 9, .trainerScale = 256, @@ -7625,46 +7625,46 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_ABSOL [SPECIES_ABSOL] = { + .baseHP = 65, + .baseAttack = 130, + .baseDefense = 60, + .baseSpeed = 75, + .baseSpAttack = 75, + .baseSpDefense = 60, .types = MON_TYPES(TYPE_DARK), .catchRate = 30, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 163 : 174, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_PRESSURE, ABILITY_SUPER_LUCK, ABILITY_JUSTIFIED }, .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, .speciesName = _("Absol"), + .cryId = CRY_ABSOL, .natDexNum = NATIONAL_DEX_ABSOL, .categoryName = _("Disaster"), .height = 12, + .weight = 470, + .description = COMPOUND_STRING( + "It sharply senses even subtle changes in\n" + "the sky and the land to predict natural\n" + "disasters. It is a long-lived Pokémon that\n" + "has a life-span of 100 years."), .pokemonScale = 301, .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_Absol, + .frontPicSize = MON_COORDS_SIZE(56, 64), FOOTPRINT(Absol) .levelUpLearnset = sAbsolLevelUpLearnset, .teachableLearnset = sAbsolTeachableLearnset, .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, - .baseHP = 65, - .baseAttack = 130, - .baseDefense = 60, - .baseSpeed = 75, - .baseSpAttack = 75, - .baseSpDefense = 60, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 163 : 174, - .abilities = { ABILITY_PRESSURE, ABILITY_SUPER_LUCK, ABILITY_JUSTIFIED }, - .cryId = CRY_ABSOL, - .weight = 470, - .description = COMPOUND_STRING( - "It sharply senses even subtle changes in\n" - "the sky and the land to predict natural\n" - "disasters. It is a long-lived Pokémon that\n" - "has a life-span of 100 years."), - .frontPic = gMonFrontPic_Absol, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Absol, .frontAnimId = ANIM_CIRCULAR_VIBRATE, @@ -7682,46 +7682,46 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABSOL_MEGA] = { + .baseHP = 65, + .baseAttack = 150, + .baseDefense = 60, + .baseSpeed = 115, + .baseSpAttack = 115, + .baseSpDefense = 60, .types = MON_TYPES(TYPE_DARK), .catchRate = 30, + .expYield = 198, .evYield_Attack = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, .speciesName = _("Absol"), + .cryId = CRY_ABSOL_MEGA, .natDexNum = NATIONAL_DEX_ABSOL, .categoryName = _("Disaster"), .height = 12, + .weight = 490, + .description = COMPOUND_STRING( + "As the energy of Mega Evolution fills it,\n" + "its fur bristles. What you see on its back\n" + "are not true wings, and this Pokémon isn't\n" + "able to fly."), .pokemonScale = 301, .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_AbsolMega, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Absol) .levelUpLearnset = sAbsolLevelUpLearnset, .teachableLearnset = sAbsolTeachableLearnset, .formSpeciesIdTable = sAbsolFormSpeciesIdTable, .formChangeTable = sAbsolFormChangeTable, - .baseHP = 65, - .baseAttack = 150, - .baseDefense = 60, - .baseSpeed = 115, - .baseSpAttack = 115, - .baseSpDefense = 60, - .expYield = 198, - .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, - .cryId = CRY_ABSOL_MEGA, - .weight = 490, - .description = COMPOUND_STRING( - "As the energy of Mega Evolution fills it,\n" - "its fur bristles. What you see on its back\n" - "are not true wings, and this Pokémon isn't\n" - "able to fly."), - .frontPic = gMonFrontPic_AbsolMega, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_AbsolMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -7797,32 +7797,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_GLALIE] = { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 80, + .baseSpeed = 80, + .baseSpAttack = 80, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_ICE), .catchRate = 75, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 168 : 187, .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL), + .abilities = { ABILITY_INNER_FOCUS, ABILITY_ICE_BODY, ABILITY_MOODY }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Glalie"), + .cryId = CRY_GLALIE, .natDexNum = NATIONAL_DEX_GLALIE, .categoryName = _("Face"), - FOOTPRINT(Glalie) - .levelUpLearnset = sGlalieLevelUpLearnset, - .teachableLearnset = sGlalieTeachableLearnset, - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, - .formChangeTable = sGlalieFormChangeTable, - .baseHP = 80, - .baseAttack = 80, - .baseDefense = 80, - .baseSpeed = 80, - .baseSpAttack = 80, - .baseSpDefense = 80, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 168 : 187, - .abilities = { ABILITY_INNER_FOCUS, ABILITY_ICE_BODY, ABILITY_MOODY }, - .cryId = CRY_GLALIE, .height = 15, .weight = 2565, .description = COMPOUND_STRING( @@ -7836,6 +7831,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Glalie, .frontPicSize = MON_COORDS_SIZE(56, 56), + FOOTPRINT(Glalie) + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, + .formChangeTable = sGlalieFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Glalie, .frontAnimId = ANIM_ZIGZAG_FAST, @@ -7853,38 +7853,38 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_GLALIE_MEGA] = { + .baseHP = 80, + .baseAttack = 120, + .baseDefense = 80, + .baseSpeed = 100, + .baseSpAttack = 120, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_ICE), .catchRate = 75, + .expYield = 203, .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_MINERAL), + .abilities = { ABILITY_REFRIGERATE, ABILITY_REFRIGERATE, ABILITY_REFRIGERATE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Glalie"), + .cryId = CRY_GLALIE_MEGA, .natDexNum = NATIONAL_DEX_GLALIE, .categoryName = _("Face"), - FOOTPRINT(Glalie) - .levelUpLearnset = sGlalieLevelUpLearnset, - .teachableLearnset = sGlalieTeachableLearnset, - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, - .formChangeTable = sGlalieFormChangeTable, - .baseHP = 80, - .baseAttack = 120, - .baseDefense = 80, - .baseSpeed = 100, - .baseSpAttack = 120, - .baseSpDefense = 80, - .expYield = 203, - .abilities = { ABILITY_REFRIGERATE, ABILITY_REFRIGERATE, ABILITY_REFRIGERATE }, - .cryId = CRY_GLALIE_MEGA, .height = 21, .weight = 3502, .description = COMPOUND_STRING( "The power of Mega Evolution was so strong\n" "that it smashed Glalie's jaw. Its inability\n" "to eat very well leaves Glalie irritated."), + FOOTPRINT(Glalie) + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, + .formChangeTable = sGlalieFormChangeTable, .pokemonScale = 256, .pokemonOffset = 3, .trainerScale = 344, @@ -8523,6 +8523,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_SALAMENCE] = { + .baseHP = 95, + .baseAttack = 135, + .baseDefense = 80, + .baseSpeed = 100, + .baseSpAttack = 110, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, .evYield_Attack = 3, @@ -8541,12 +8547,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sSalamenceTeachableLearnset, .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, .formChangeTable = sSalamenceFormChangeTable, - .baseHP = 95, - .baseAttack = 135, - .baseDefense = 80, - .baseSpeed = 100, - .baseSpAttack = 110, - .baseSpDefense = 80, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -8586,8 +8586,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_SALAMENCE_MEGA] = { + .baseHP = 95, + .baseAttack = 145, + .baseDefense = 130, + .baseSpeed = 120, + .baseSpAttack = 120, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .evYield_Attack = 3, .itemRare = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), @@ -8595,24 +8602,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_AERILATE, ABILITY_AERILATE, ABILITY_AERILATE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Salamence"), + .cryId = CRY_SALAMENCE_MEGA, .natDexNum = NATIONAL_DEX_SALAMENCE, .categoryName = _("Dragon"), - FOOTPRINT(Salamence) - .levelUpLearnset = sSalamenceLevelUpLearnset, - .teachableLearnset = sSalamenceTeachableLearnset, - .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, - .formChangeTable = sSalamenceFormChangeTable, - .baseHP = 95, - .baseAttack = 145, - .baseDefense = 130, - .baseSpeed = 120, - .baseSpAttack = 120, - .baseSpDefense = 90, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, - .abilities = { ABILITY_AERILATE, ABILITY_AERILATE, ABILITY_AERILATE }, - .cryId = CRY_SALAMENCE_MEGA, .height = 18, .weight = 1126, .description = COMPOUND_STRING( @@ -8626,6 +8621,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SalamenceMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Salamence) + .levelUpLearnset = sSalamenceLevelUpLearnset, + .teachableLearnset = sSalamenceTeachableLearnset, + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, + .formChangeTable = sSalamenceFormChangeTable, .frontPicYOffset = 3, .frontAnimFrames = sAnims_SalamenceMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8755,6 +8755,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_METAGROSS] = { + .baseHP = 80, + .baseAttack = 135, + .baseDefense = 130, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), .catchRate = 3, .evYield_Defense = 3, @@ -8773,12 +8779,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sMetagrossTeachableLearnset, .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, .formChangeTable = sMetagrossFormChangeTable, - .baseHP = 80, - .baseAttack = 135, - .baseDefense = 130, - .baseSpeed = 70, - .baseSpAttack = 95, - .baseSpDefense = 90, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -8817,8 +8817,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_METAGROSS_MEGA] = { + .baseHP = 80, + .baseAttack = 145, + .baseDefense = 150, + .baseSpeed = 110, + .baseSpAttack = 105, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .evYield_Defense = 3, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, @@ -8826,30 +8833,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Metagross"), + .cryId = CRY_METAGROSS_MEGA, .natDexNum = NATIONAL_DEX_METAGROSS, .categoryName = _("Iron Leg"), - FOOTPRINT(Metagross) - .levelUpLearnset = sMetagrossLevelUpLearnset, - .teachableLearnset = sMetagrossTeachableLearnset, - .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, - .formChangeTable = sMetagrossFormChangeTable, - .baseHP = 80, - .baseAttack = 145, - .baseDefense = 150, - .baseSpeed = 110, - .baseSpAttack = 105, - .baseSpDefense = 110, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, - .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS, ABILITY_TOUGH_CLAWS }, - .cryId = CRY_METAGROSS_MEGA, .height = 25, .weight = 9429, .description = COMPOUND_STRING( "When it knows it can't win, it digs the\n" "claws on its legs into its opponent and\n" "starts the countdown to a big explosion."), + FOOTPRINT(Metagross) + .levelUpLearnset = sMetagrossLevelUpLearnset, + .teachableLearnset = sMetagrossTeachableLearnset, + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, + .formChangeTable = sMetagrossFormChangeTable, .pokemonScale = 256, .pokemonOffset = 4, .trainerScale = 447, @@ -9061,6 +9061,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_LATIAS [SPECIES_LATIAS] = { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 90, + .baseSpeed = 110, + .baseSpAttack = 110, + .baseSpDefense = 130, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, .evYield_SpDefense = 3, @@ -9078,12 +9084,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .formSpeciesIdTable = sLatiasFormSpeciesIdTable, .formChangeTable = sLatiasFormChangeTable, .isLegendary = TRUE, - .baseHP = 80, - .baseAttack = 80, - .baseDefense = 90, - .baseSpeed = 110, - .baseSpAttack = 110, - .baseSpDefense = 130, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9124,33 +9124,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIAS_MEGA] = { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 110, + .baseSpAttack = 140, + .baseSpDefense = 150, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .evYield_SpDefense = 3, .genderRatio = MON_FEMALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .speciesName = _("Latias"), - .natDexNum = NATIONAL_DEX_LATIAS, - .categoryName = _("Eon"), - FOOTPRINT(Latias) - .levelUpLearnset = sLatiasLevelUpLearnset, - .teachableLearnset = sLatiasTeachableLearnset, - .formSpeciesIdTable = sLatiasFormSpeciesIdTable, - .formChangeTable = sLatiasFormChangeTable, - .isLegendary = TRUE, - .baseHP = 80, - .baseAttack = 100, - .baseDefense = 120, - .baseSpeed = 110, - .baseSpAttack = 140, - .baseSpDefense = 150, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE }, .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Latias"), .cryId = CRY_LATIAS_MEGA, + .natDexNum = NATIONAL_DEX_LATIAS, + .categoryName = _("Eon"), .height = 18, .weight = 520, .description = COMPOUND_STRING( @@ -9164,6 +9158,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LatiasMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Latias) + .levelUpLearnset = sLatiasLevelUpLearnset, + .teachableLearnset = sLatiasTeachableLearnset, + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, + .formChangeTable = sLatiasFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiasMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9184,6 +9184,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_LATIOS [SPECIES_LATIOS] = { + .baseHP = 80, + .baseAttack = 90, + .baseDefense = 80, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, .evYield_SpAttack = 3, @@ -9201,12 +9207,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sLatiosTeachableLearnset, .formSpeciesIdTable = sLatiosFormSpeciesIdTable, .formChangeTable = sLatiosFormChangeTable, - .baseHP = 80, - .baseAttack = 90, - .baseDefense = 80, - .baseSpeed = 110, - .baseSpAttack = 130, - .baseSpDefense = 110, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9247,33 +9247,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_LATIOS_MEGA] = { + .baseHP = 80, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 110, + .baseSpAttack = 160, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .evYield_SpAttack = 3, .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .isLegendary = TRUE, - .speciesName = _("Latios"), - .natDexNum = NATIONAL_DEX_LATIOS, - .categoryName = _("Eon"), - FOOTPRINT(Latios) - .levelUpLearnset = sLatiosLevelUpLearnset, - .teachableLearnset = sLatiosTeachableLearnset, - .formSpeciesIdTable = sLatiosFormSpeciesIdTable, - .formChangeTable = sLatiosFormChangeTable, - .baseHP = 80, - .baseAttack = 130, - .baseDefense = 100, - .baseSpeed = 110, - .baseSpAttack = 160, - .baseSpDefense = 120, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, .abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE }, .bodyColor = BODY_COLOR_PURPLE, + .speciesName = _("Latios"), .cryId = CRY_LATIOS_MEGA, + .natDexNum = NATIONAL_DEX_LATIOS, + .categoryName = _("Eon"), .height = 23, .weight = 700, .description = COMPOUND_STRING( @@ -9289,6 +9283,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiosMega, + .isLegendary = TRUE, + FOOTPRINT(Latios) + .levelUpLearnset = sLatiosLevelUpLearnset, + .teachableLearnset = sLatiosTeachableLearnset, + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, + .formChangeTable = sLatiosFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_LatiosMega, @@ -9307,6 +9307,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_KYOGRE [SPECIES_KYOGRE] = { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 140, .types = MON_TYPES(TYPE_WATER), .catchRate = 3, .evYield_SpAttack = 3, @@ -9325,12 +9331,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sKyogreTeachableLearnset, .formSpeciesIdTable = sKyogreFormSpeciesIdTable, .formChangeTable = sKyogreFormChangeTable, - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 90, - .baseSpeed = 90, - .baseSpAttack = 150, - .baseSpDefense = 140, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 335, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9369,33 +9369,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_KYOGRE_PRIMAL] = { + .baseHP = 100, + .baseAttack = 150, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 180, + .baseSpDefense = 160, .types = MON_TYPES(TYPE_WATER), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 385 : 347, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRIMORDIAL_SEA, ABILITY_PRIMORDIAL_SEA }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Kyogre"), + .cryId = CRY_KYOGRE_PRIMAL, .natDexNum = NATIONAL_DEX_KYOGRE, .categoryName = _("Sea Basin"), - FOOTPRINT(Kyogre) - .levelUpLearnset = sKyogreLevelUpLearnset, - .teachableLearnset = sKyogreTeachableLearnset, - .formSpeciesIdTable = sKyogreFormSpeciesIdTable, - .formChangeTable = sKyogreFormChangeTable, - .baseHP = 100, - .baseAttack = 150, - .baseDefense = 90, - .baseSpeed = 90, - .baseSpAttack = 180, - .baseSpDefense = 160, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 385 : 347, - .abilities = { ABILITY_PRIMORDIAL_SEA, ABILITY_PRIMORDIAL_SEA }, - .cryId = CRY_KYOGRE_PRIMAL, .height = 98, .weight = 4300, .description = COMPOUND_STRING( @@ -9411,6 +9405,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KyogrePrimal, + .isLegendary = TRUE, + FOOTPRINT(Kyogre) + .levelUpLearnset = sKyogreLevelUpLearnset, + .teachableLearnset = sKyogreTeachableLearnset, + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, + .formChangeTable = sKyogreFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KyogrePrimal, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -9428,6 +9428,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_GROUDON [SPECIES_GROUDON] = { + .baseHP = 100, + .baseAttack = 150, + .baseDefense = 140, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 90, .catchRate = 3, .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, @@ -9446,12 +9452,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .teachableLearnset = sGroudonTeachableLearnset, .formSpeciesIdTable = sGroudonFormSpeciesIdTable, .formChangeTable = sGroudonFormChangeTable, - .baseHP = 100, - .baseAttack = 150, - .baseDefense = 140, - .baseSpeed = 90, - .baseSpAttack = 100, - .baseSpDefense = 90, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 335, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9490,33 +9490,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_PRIMAL_REVERSIONS [SPECIES_GROUDON_PRIMAL] = { + .baseHP = 100, + .baseAttack = 180, + .baseDefense = 160, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 90, + .types = MON_TYPES(TYPE_GROUND, TYPE_FIRE), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 385 : 347, .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DESOLATE_LAND, ABILITY_DESOLATE_LAND }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Groudon"), .cryId = CRY_GROUDON, .natDexNum = NATIONAL_DEX_GROUDON, .categoryName = _("Continent"), - FOOTPRINT(Groudon) - .levelUpLearnset = sGroudonLevelUpLearnset, - .teachableLearnset = sGroudonTeachableLearnset, - .formSpeciesIdTable = sGroudonFormSpeciesIdTable, - .formChangeTable = sGroudonFormChangeTable, - .baseHP = 100, - .baseAttack = 180, - .baseDefense = 160, - .baseSpeed = 90, - .baseSpAttack = 150, - .baseSpDefense = 90, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 385 : 347, - .types = MON_TYPES(TYPE_GROUND, TYPE_FIRE), - .abilities = { ABILITY_DESOLATE_LAND, ABILITY_DESOLATE_LAND }, .height = 50, .weight = 9997, .description = COMPOUND_STRING( @@ -9532,6 +9526,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GroudonPrimal, + .isLegendary = TRUE, + FOOTPRINT(Groudon) + .levelUpLearnset = sGroudonLevelUpLearnset, + .teachableLearnset = sGroudonTeachableLearnset, + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, + .formChangeTable = sGroudonFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GroudonPrimal, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9549,6 +9549,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_FAMILY_RAYQUAZA [SPECIES_RAYQUAZA] = { + .baseHP = 105, + .baseAttack = 150, + .baseDefense = 90, + .baseSpeed = 95, + .baseSpAttack = 150, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, .evYield_Attack = 2, @@ -9569,12 +9575,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, .formChangeTable = sRayquazaFormChangeTable, .isLegendary = TRUE, - .baseHP = 105, - .baseAttack = 150, - .baseDefense = 90, - .baseSpeed = 95, - .baseSpAttack = 150, - .baseSpDefense = 90, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 340, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9614,8 +9614,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #if P_MEGA_EVOLUTIONS [SPECIES_RAYQUAZA_MEGA] = { + .baseHP = 105, + .baseAttack = 180, + .baseDefense = 100, + .baseSpeed = 115, + .baseSpAttack = 180, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, .evYield_Attack = 2, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -9623,25 +9630,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DELTA_STREAM, ABILITY_DELTA_STREAM, ABILITY_DELTA_STREAM }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Rayquaza"), .cryId = CRY_RAYQUAZA, .natDexNum = NATIONAL_DEX_RAYQUAZA, .categoryName = _("Sky High"), - FOOTPRINT(Rayquaza) - .levelUpLearnset = sRayquazaLevelUpLearnset, - .teachableLearnset = sRayquazaTeachableLearnset, - .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, - .formChangeTable = sRayquazaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 105, - .baseAttack = 180, - .baseDefense = 100, - .baseSpeed = 115, - .baseSpAttack = 180, - .baseSpDefense = 100, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 390 : 351, - .abilities = { ABILITY_DELTA_STREAM, ABILITY_DELTA_STREAM, ABILITY_DELTA_STREAM }, .height = 108, .weight = 3920, .description = COMPOUND_STRING( @@ -9655,6 +9649,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 12, .frontPic = gMonFrontPic_RayquazaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Rayquaza) + .levelUpLearnset = sRayquazaLevelUpLearnset, + .teachableLearnset = sRayquazaTeachableLearnset, + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, + .formChangeTable = sRayquazaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_RayquazaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9747,9 +9747,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_NORMAL] = { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, .expYield = DEOXYS_EXP_YIELD, + .evYield_Attack = 1, + .evYield_Speed = 1, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -9757,13 +9766,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isMythical = TRUE, .speciesName = _("Deoxys"), .cryId = CRY_DEOXYS, .natDexNum = NATIONAL_DEX_DEOXYS, .categoryName = _("DNA"), .height = 17, .weight = 608, + .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, @@ -9771,15 +9780,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, - .baseHP = 50, - .baseAttack = 150, - .baseDefense = 50, - .baseSpeed = 150, - .baseSpAttack = 150, - .baseSpDefense = 50, - .evYield_Attack = 1, - .evYield_Speed = 1, - .evYield_SpAttack = 1, .frontPic = gMonFrontPic_DeoxysNormal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -9800,9 +9800,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_ATTACK] = { + .baseHP = 50, + .baseAttack = 180, + .baseDefense = 20, + .baseSpeed = 150, + .baseSpAttack = 180, + .baseSpDefense = 20, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, .expYield = DEOXYS_EXP_YIELD, + .evYield_Attack = 2, + .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -9810,13 +9818,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isMythical = TRUE, .speciesName = _("Deoxys"), .cryId = CRY_DEOXYS, .natDexNum = NATIONAL_DEX_DEOXYS, .categoryName = _("DNA"), .height = 17, .weight = 608, + .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, @@ -9824,14 +9832,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, - .baseHP = 50, - .baseAttack = 180, - .baseDefense = 20, - .baseSpeed = 150, - .baseSpAttack = 180, - .baseSpDefense = 20, - .evYield_Attack = 2, - .evYield_SpAttack = 1, .frontPic = gMonFrontPic_DeoxysAttack, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -9852,9 +9852,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_DEFENSE] = { + .baseHP = 50, + .baseAttack = 70, + .baseDefense = 160, + .baseSpeed = 90, + .baseSpAttack = 70, + .baseSpDefense = 160, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, .expYield = DEOXYS_EXP_YIELD, + .evYield_Defense = 2, + .evYield_SpDefense = 1, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -9862,13 +9870,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isMythical = TRUE, .speciesName = _("Deoxys"), .cryId = CRY_DEOXYS, .natDexNum = NATIONAL_DEX_DEOXYS, .categoryName = _("DNA"), .height = 17, .weight = 608, + .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, @@ -9876,14 +9884,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, - .baseHP = 50, - .baseAttack = 70, - .baseDefense = 160, - .baseSpeed = 90, - .baseSpAttack = 70, - .baseSpDefense = 160, - .evYield_Defense = 2, - .evYield_SpDefense = 1, .frontPic = gMonFrontPic_DeoxysDefense, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, @@ -9904,9 +9904,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_DEOXYS_SPEED] = { + .baseHP = 50, + .baseAttack = 95, + .baseDefense = 90, + .baseSpeed = 180, + .baseSpAttack = 95, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, .expYield = DEOXYS_EXP_YIELD, + .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -9914,13 +9921,14 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isMythical = TRUE, + .noFlip = TRUE, .speciesName = _("Deoxys"), .cryId = CRY_DEOXYS, .natDexNum = NATIONAL_DEX_DEOXYS, .categoryName = _("DNA"), .height = 17, .weight = 608, + .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, @@ -9928,14 +9936,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, FOOTPRINT(Deoxys) .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, - .baseHP = 50, - .baseAttack = 95, - .baseDefense = 90, - .baseSpeed = 180, - .baseSpAttack = 95, - .baseSpDefense = 90, - .evYield_Speed = 3, - .noFlip = TRUE, .frontPic = gMonFrontPic_DeoxysSpeed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index 93e744b225a3..887986e1a87c 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -1341,19 +1341,31 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Burmy"), .cryId = CRY_BURMY, .natDexNum = NATIONAL_DEX_BURMY, .categoryName = _("Bagworm"), .height = 2, .weight = 34, + .description = COMPOUND_STRING( + "If its cloak is even slightly damaged, it\n" + "will immediately repair it with whatever is\n" + "near at hand. The Pokémon within the cloak\n" + "is scrawny and vulnerable to the cold."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_BurmyPlantCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), + .frontPicYOffset = 13, .frontAnimFrames = sAnims_Burmy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 10, + .backPic = gMonBackPic_BurmyPlantCloak, + .backPicSize = MON_COORDS_SIZE(40, 56), + .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1361,18 +1373,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .bodyColor = BODY_COLOR_GREEN, - .description = COMPOUND_STRING( - "If its cloak is even slightly damaged, it\n" - "will immediately repair it with whatever is\n" - "near at hand. The Pokémon within the cloak\n" - "is scrawny and vulnerable to the cold."), - .frontPic = gMonFrontPic_BurmyPlantCloak, - .frontPicSize = MON_COORDS_SIZE(32, 56), - .frontPicYOffset = 13, - .backPic = gMonBackPic_BurmyPlantCloak, - .backPicSize = MON_COORDS_SIZE(40, 56), - .backPicYOffset = 6, .palette = gMonPalette_BurmyPlantCloak, .shinyPalette = gMonShinyPalette_BurmyPlantCloak, .iconSprite = gMonIcon_BurmyPlantCloak, @@ -1399,19 +1399,31 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Burmy"), .cryId = CRY_BURMY, .natDexNum = NATIONAL_DEX_BURMY, .categoryName = _("Bagworm"), .height = 2, .weight = 34, + .description = COMPOUND_STRING( + "It weaves a cloak together with sand, mud,\n" + "and silk it spits out. This earthen cloak\n" + "is ruined by wind and rain, so the Pokémon\n" + "hides away in caves and other such places."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_BurmySandyCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), + .frontPicYOffset = 12, .frontAnimFrames = sAnims_Burmy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 10, + .backPic = gMonBackPic_BurmySandyCloak, + .backPicSize = MON_COORDS_SIZE(32, 56), + .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1419,18 +1431,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .bodyColor = BODY_COLOR_BROWN, - .description = COMPOUND_STRING( - "It weaves a cloak together with sand, mud,\n" - "and silk it spits out. This earthen cloak\n" - "is ruined by wind and rain, so the Pokémon\n" - "hides away in caves and other such places."), - .frontPic = gMonFrontPic_BurmySandyCloak, - .frontPicSize = MON_COORDS_SIZE(32, 56), - .frontPicYOffset = 12, - .backPic = gMonBackPic_BurmySandyCloak, - .backPicSize = MON_COORDS_SIZE(32, 56), - .backPicYOffset = 7, .palette = gMonPalette_BurmySandyCloak, .shinyPalette = gMonShinyPalette_BurmySandyCloak, .iconSprite = gMonIcon_BurmySandyCloak, @@ -1457,19 +1457,31 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_SHED_SKIN, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Burmy"), .cryId = CRY_BURMY, .natDexNum = NATIONAL_DEX_BURMY, .categoryName = _("Bagworm"), .height = 2, .weight = 34, + .description = COMPOUND_STRING( + "When confronted by a lack of other\n" + "materials, Burmy will create its cloak\n" + "using dust and refuse. The cloak seems to\n" + "be more comfortable than one would think."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_BurmyTrashCloak, + .frontPicSize = MON_COORDS_SIZE(32, 56), + .frontPicYOffset = 8, .frontAnimFrames = sAnims_Burmy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 10, + .backPic = gMonBackPic_BurmyTrashCloak, + .backPicSize = MON_COORDS_SIZE(40, 64), + .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_SHAKE, FOOTPRINT(Burmy) .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1477,18 +1489,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .bodyColor = BODY_COLOR_RED, - .description = COMPOUND_STRING( - "When confronted by a lack of other\n" - "materials, Burmy will create its cloak\n" - "using dust and refuse. The cloak seems to\n" - "be more comfortable than one would think."), - .frontPic = gMonFrontPic_BurmyTrashCloak, - .frontPicSize = MON_COORDS_SIZE(32, 56), - .frontPicYOffset = 8, - .backPic = gMonBackPic_BurmyTrashCloak, - .backPicSize = MON_COORDS_SIZE(40, 64), - .backPicYOffset = 0, .palette = gMonPalette_BurmyTrashCloak, .shinyPalette = gMonShinyPalette_BurmyTrashCloak, .iconSprite = gMonIcon_BurmyTrashCloak, @@ -1499,8 +1499,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_PLANT_CLOAK] = { + .baseHP = 60, + .baseAttack = 59, + .baseDefense = 85, + .baseSpeed = 36, + .baseSpAttack = 79, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_BUG, TYPE_GRASS), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .evYield_SpDefense = 2, .itemRare = ITEM_SILVER_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, @@ -1508,42 +1516,34 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Wormadam"), .cryId = CRY_WORMADAM, .natDexNum = NATIONAL_DEX_WORMADAM, .categoryName = _("Bagworm"), .height = 5, .weight = 65, + .description = COMPOUND_STRING( + "Its appearance changes depending\n" + "on where Burmy evolved. The materials\n" + "on hand become a part of its body.\n" + "The cloak is never shed."), .pokemonScale = 432, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_WormadamPlantCloak, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wormadam, .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, .enemyMonElevation = 8, + .backPic = gMonBackPic_WormadamPlantCloak, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 59, - .baseDefense = 85, - .baseSpeed = 36, - .baseSpAttack = 79, - .baseSpDefense = 105, - .types = MON_TYPES(TYPE_BUG, TYPE_GRASS), - .evYield_SpDefense = 2, - .bodyColor = BODY_COLOR_GREEN, - .description = COMPOUND_STRING( - "Its appearance changes depending\n" - "on where Burmy evolved. The materials\n" - "on hand become a part of its body.\n" - "The cloak is never shed."), - .frontPic = gMonFrontPic_WormadamPlantCloak, - .frontPicSize = MON_COORDS_SIZE(48, 56), - .backPic = gMonBackPic_WormadamPlantCloak, - .backPicSize = MON_COORDS_SIZE(56, 64), .palette = gMonPalette_WormadamPlantCloak, .shinyPalette = gMonShinyPalette_WormadamPlantCloak, .iconSprite = gMonIcon_WormadamPlantCloak, @@ -1554,8 +1554,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_SANDY_CLOAK] = { + .baseHP = 60, + .baseAttack = 79, + .baseDefense = 105, + .baseSpeed = 36, + .baseSpAttack = 59, + .baseSpDefense = 85, + .types = MON_TYPES(TYPE_BUG, TYPE_GROUND), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .evYield_Defense = 2, .itemRare = ITEM_SILVER_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, @@ -1563,42 +1571,34 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Wormadam"), .cryId = CRY_WORMADAM, .natDexNum = NATIONAL_DEX_WORMADAM, .categoryName = _("Bagworm"), .height = 5, .weight = 65, + .description = COMPOUND_STRING( + "Its earthen skin is reasonably hard, it has\n" + "no problem repelling a Starly's pecking.\n" + "It is said that a Wormadam that evolves\n" + "on a cold day will have a thicker cloak."), .pokemonScale = 432, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_WormadamSandyCloak, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wormadam, .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, .enemyMonElevation = 8, + .backPic = gMonBackPic_WormadamSandyCloak, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 79, - .baseDefense = 105, - .baseSpeed = 36, - .baseSpAttack = 59, - .baseSpDefense = 85, - .types = MON_TYPES(TYPE_BUG, TYPE_GROUND), - .evYield_Defense = 2, - .bodyColor = BODY_COLOR_BROWN, - .description = COMPOUND_STRING( - "Its earthen skin is reasonably hard, it has\n" - "no problem repelling a Starly's pecking.\n" - "It is said that a Wormadam that evolves\n" - "on a cold day will have a thicker cloak."), - .frontPic = gMonFrontPic_WormadamSandyCloak, - .frontPicSize = MON_COORDS_SIZE(40, 56), - .backPic = gMonBackPic_WormadamSandyCloak, - .backPicSize = MON_COORDS_SIZE(56, 64), .palette = gMonPalette_WormadamSandyCloak, .shinyPalette = gMonShinyPalette_WormadamSandyCloak, .iconSprite = gMonIcon_WormadamSandyCloak, @@ -1609,8 +1609,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_WORMADAM_TRASH_CLOAK] = { + .baseHP = 60, + .baseAttack = 69, + .baseDefense = 95, + .baseSpeed = 36, + .baseSpAttack = 69, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 148 : 159, + .evYield_Defense = 1, + .evYield_SpDefense = 1, .itemRare = ITEM_SILVER_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, @@ -1618,43 +1627,34 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), .abilities = { ABILITY_ANTICIPATION, ABILITY_NONE, ABILITY_OVERCOAT }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Wormadam"), .cryId = CRY_WORMADAM, .natDexNum = NATIONAL_DEX_WORMADAM, .categoryName = _("Bagworm"), .height = 5, .weight = 65, + .description = COMPOUND_STRING( + "Its body, composed of refuse, blends in to\n" + "the scenery enough to be inconspicuous.\n" + "This seems to be the perfect way for it to\n" + "evade the detection of predators."), .pokemonScale = 432, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_WormadamTrashCloak, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wormadam, .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, .enemyMonElevation = 8, + .backPic = gMonBackPic_WormadamTrashCloak, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, FOOTPRINT(Wormadam) .formSpeciesIdTable = sWormadamFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 69, - .baseDefense = 95, - .baseSpeed = 36, - .baseSpAttack = 69, - .baseSpDefense = 95, - .types = MON_TYPES(TYPE_BUG, TYPE_STEEL), - .evYield_Defense = 1, - .evYield_SpDefense = 1, - .bodyColor = BODY_COLOR_RED, - .description = COMPOUND_STRING( - "Its body, composed of refuse, blends in to\n" - "the scenery enough to be inconspicuous.\n" - "This seems to be the perfect way for it to\n" - "evade the detection of predators."), - .frontPic = gMonFrontPic_WormadamTrashCloak, - .frontPicSize = MON_COORDS_SIZE(48, 56), - .backPic = gMonBackPic_WormadamTrashCloak, - .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_WormadamTrashCloak, .shinyPalette = gMonShinyPalette_WormadamTrashCloak, .iconSprite = gMonIcon_WormadamTrashCloak, @@ -2075,29 +2075,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS), .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Cherrim"), .cryId = CRY_CHERRIM, .natDexNum = NATIONAL_DEX_CHERRIM, .categoryName = _("Blossom"), .height = 5, .weight = 93, + .description = COMPOUND_STRING( + "It's motionless, save for the occasional\n" + "quiver. A rich array of Pokémon can be\n" + "found gathered around it, drawn by the\n" + "scent exuded from Cherrim's folded petals."), .pokemonScale = 432, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_CherrimOvercast, + .frontPicSize = MON_COORDS_SIZE(32, 48), FOOTPRINT(Cherrim) .levelUpLearnset = sCherrimLevelUpLearnset, .teachableLearnset = sCherrimTeachableLearnset, .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, - .bodyColor = BODY_COLOR_PURPLE, - .description = COMPOUND_STRING( - "It's motionless, save for the occasional\n" - "quiver. A rich array of Pokémon can be\n" - "found gathered around it, drawn by the\n" - "scent exuded from Cherrim's folded petals."), - .frontPic = gMonFrontPic_CherrimOvercast, - .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_CherrimOvercast, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -2130,29 +2130,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY, EGG_GROUP_GRASS), .abilities = { ABILITY_FLOWER_GIFT, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Cherrim"), .cryId = CRY_CHERRIM, .natDexNum = NATIONAL_DEX_CHERRIM, .categoryName = _("Blossom"), .height = 5, .weight = 93, + .description = COMPOUND_STRING( + "Cherrim takes this form on sunny days.\n" + "Its faint scent entices bug Pokémon to it.\n" + "It immediately closes its petals and\n" + "becomes immobile once the sun hides."), .pokemonScale = 432, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_CherrimSunshine, + .frontPicSize = MON_COORDS_SIZE(48, 40), FOOTPRINT(Cherrim) .levelUpLearnset = sCherrimLevelUpLearnset, .teachableLearnset = sCherrimTeachableLearnset, .formSpeciesIdTable = sCherrimFormSpeciesIdTable, .formChangeTable = sCherrimFormChangeTable, - .bodyColor = BODY_COLOR_PINK, - .description = COMPOUND_STRING( - "Cherrim takes this form on sunny days.\n" - "Its faint scent entices bug Pokémon to it.\n" - "It immediately closes its petals and\n" - "becomes immobile once the sun hides."), - .frontPic = gMonFrontPic_CherrimSunshine, - .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_CherrimSunshine, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, @@ -2186,35 +2186,35 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Shellos"), .cryId = CRY_SHELLOS, .natDexNum = NATIONAL_DEX_SHELLOS, .categoryName = _("Sea Slug"), .height = 3, .weight = 63, + .description = COMPOUND_STRING( + "It oozes a purple fluid to deter enemies.\n" + "While harmless, the fluid is awfully sticky.\n" + "Apparently, there are more West Sea\n" + "Shellos now than there were in the past."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_ShellosWestSea, + .frontPicSize = MON_COORDS_SIZE(40, 40), + .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shellos, .frontAnimId = ANIM_V_STRETCH, + .backPic = gMonBackPic_ShellosWestSea, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, FOOTPRINT(Shellos) .levelUpLearnset = sShellosLevelUpLearnset, .teachableLearnset = sShellosTeachableLearnset, .formSpeciesIdTable = sShellosFormSpeciesIdTable, - .bodyColor = BODY_COLOR_PURPLE, - .description = COMPOUND_STRING( - "It oozes a purple fluid to deter enemies.\n" - "While harmless, the fluid is awfully sticky.\n" - "Apparently, there are more West Sea\n" - "Shellos now than there were in the past."), - .frontPic = gMonFrontPic_ShellosWestSea, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 13, - .backPic = gMonBackPic_ShellosWestSea, - .backPicSize = MON_COORDS_SIZE(40, 56), .palette = gMonPalette_ShellosWestSea, .shinyPalette = gMonShinyPalette_ShellosWestSea, .iconSprite = gMonIcon_ShellosWestSea, @@ -2240,35 +2240,35 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Shellos"), .cryId = CRY_SHELLOS, .natDexNum = NATIONAL_DEX_SHELLOS, .categoryName = _("Sea Slug"), .height = 3, .weight = 63, + .description = COMPOUND_STRING( + "It's capable of spending a limited amount\n" + "of time on land until their skin dries out.\n" + "One theory suggests that living in cold\n" + "seas causes Shellos to take on this form."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_ShellosEastSea, + .frontPicSize = MON_COORDS_SIZE(40, 40), + .frontPicYOffset = 14, .frontAnimFrames = sAnims_Shellos, .frontAnimId = ANIM_V_STRETCH, + .backPic = gMonBackPic_ShellosEastSea, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, FOOTPRINT(Shellos) .levelUpLearnset = sShellosLevelUpLearnset, .teachableLearnset = sShellosTeachableLearnset, .formSpeciesIdTable = sShellosFormSpeciesIdTable, - .bodyColor = BODY_COLOR_BLUE, - .description = COMPOUND_STRING( - "It's capable of spending a limited amount\n" - "of time on land until their skin dries out.\n" - "One theory suggests that living in cold\n" - "seas causes Shellos to take on this form."), - .frontPic = gMonFrontPic_ShellosEastSea, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 14, - .backPic = gMonBackPic_ShellosEastSea, - .backPicSize = MON_COORDS_SIZE(56, 48), .palette = gMonPalette_ShellosEastSea, .shinyPalette = gMonShinyPalette_ShellosEastSea, .iconSprite = gMonIcon_ShellosEastSea, @@ -2294,35 +2294,35 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Gastrodon"), .cryId = CRY_GASTRODON, .natDexNum = NATIONAL_DEX_GASTRODON, .categoryName = _("Sea Slug"), .height = 9, .weight = 299, + .description = COMPOUND_STRING( + "It appears on shallow-water beaches to\n" + "eat sand for nourishment. Should one\n" + "Gastrodon encounter another of a\n" + "different color, a fierce battle will ensue."), .pokemonScale = 338, .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_GastrodonWestSea, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Gastrodon, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, + .backPic = gMonBackPic_GastrodonWestSea, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, FOOTPRINT(Gastrodon) .levelUpLearnset = sGastrodonLevelUpLearnset, .teachableLearnset = sGastrodonTeachableLearnset, .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, - .bodyColor = BODY_COLOR_PURPLE, - .description = COMPOUND_STRING( - "It appears on shallow-water beaches to\n" - "eat sand for nourishment. Should one\n" - "Gastrodon encounter another of a\n" - "different color, a fierce battle will ensue."), - .frontPic = gMonFrontPic_GastrodonWestSea, - .frontPicSize = MON_COORDS_SIZE(48, 48), - .backPic = gMonBackPic_GastrodonWestSea, - .backPicSize = MON_COORDS_SIZE(56, 64), .palette = gMonPalette_GastrodonWestSea, .shinyPalette = gMonShinyPalette_GastrodonWestSea, .iconSprite = gMonIcon_GastrodonWestSea, @@ -2347,35 +2347,35 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_STICKY_HOLD, ABILITY_STORM_DRAIN, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Gastrodon"), .cryId = CRY_GASTRODON, .natDexNum = NATIONAL_DEX_GASTRODON, .categoryName = _("Sea Slug"), .height = 9, .weight = 299, + .description = COMPOUND_STRING( + "Found more often on land than in the sea.\n" + "They normally live in rocky seashores, but\n" + "when cloudy or rainy, they can sometimes\n" + "be found on mountains, far from the sea."), .pokemonScale = 338, .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_GastrodonEastSea, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Gastrodon, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, + .backPic = gMonBackPic_GastrodonEastSea, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, FOOTPRINT(Gastrodon) .levelUpLearnset = sGastrodonLevelUpLearnset, .teachableLearnset = sGastrodonTeachableLearnset, .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, - .bodyColor = BODY_COLOR_BLUE, - .description = COMPOUND_STRING( - "Found more often on land than in the sea.\n" - "They normally live in rocky seashores, but\n" - "when cloudy or rainy, they can sometimes\n" - "be found on mountains, far from the sea."), - .frontPic = gMonFrontPic_GastrodonEastSea, - .frontPicSize = MON_COORDS_SIZE(56, 48), - .backPic = gMonBackPic_GastrodonEastSea, - .backPicSize = MON_COORDS_SIZE(56, 64), .palette = gMonPalette_GastrodonEastSea, .shinyPalette = gMonShinyPalette_GastrodonEastSea, .iconSprite = gMonIcon_GastrodonEastSea, @@ -2548,32 +2548,27 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_LOPUNNY] = { + .baseHP = 65, + .baseAttack = 76, + .baseDefense = 84, + .baseSpeed = 105, + .baseSpAttack = 54, + .baseSpDefense = 96, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 168 : 178, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 140, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_CUTE_CHARM, ABILITY_KLUTZ, ABILITY_LIMBER }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Lopunny"), + .cryId = CRY_LOPUNNY, .natDexNum = NATIONAL_DEX_LOPUNNY, .categoryName = _("Rabbit"), - FOOTPRINT(Lopunny) - .levelUpLearnset = sLopunnyLevelUpLearnset, - .teachableLearnset = sLopunnyTeachableLearnset, - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, - .formChangeTable = sLopunnyFormChangeTable, - .baseHP = 65, - .baseAttack = 76, - .baseDefense = 84, - .baseSpeed = 105, - .baseSpAttack = 54, - .baseSpDefense = 96, - .types = MON_TYPES(TYPE_NORMAL), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 168 : 178, - .abilities = { ABILITY_CUTE_CHARM, ABILITY_KLUTZ, ABILITY_LIMBER }, - .cryId = CRY_LOPUNNY, .height = 12, .weight = 333, .description = COMPOUND_STRING( @@ -2587,6 +2582,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lopunny, .frontPicSize = MON_COORDS_SIZE(56, 56), + FOOTPRINT(Lopunny) + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, + .formChangeTable = sLopunnyFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Lopunny, .frontAnimId = ANIM_SHRINK_GROW, @@ -2603,32 +2603,27 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LOPUNNY_MEGA] = { + .baseHP = 65, + .baseAttack = 136, + .baseDefense = 94, + .baseSpeed = 135, + .baseSpAttack = 54, + .baseSpDefense = 96, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FIGHTING), .catchRate = 60, + .expYield = 203, .evYield_Speed = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 140, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_SCRAPPY, ABILITY_SCRAPPY, ABILITY_SCRAPPY }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Lopunny"), + .cryId = CRY_LOPUNNY_MEGA, .natDexNum = NATIONAL_DEX_LOPUNNY, .categoryName = _("Rabbit"), - FOOTPRINT(Lopunny) - .levelUpLearnset = sLopunnyLevelUpLearnset, - .teachableLearnset = sLopunnyTeachableLearnset, - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, - .formChangeTable = sLopunnyFormChangeTable, - .baseHP = 65, - .baseAttack = 136, - .baseDefense = 94, - .baseSpeed = 135, - .baseSpAttack = 54, - .baseSpDefense = 96, - .types = MON_TYPES(TYPE_NORMAL, TYPE_FIGHTING), - .expYield = 203, - .abilities = { ABILITY_SCRAPPY, ABILITY_SCRAPPY, ABILITY_SCRAPPY }, - .cryId = CRY_LOPUNNY_MEGA, .height = 13, .weight = 283, .description = COMPOUND_STRING( @@ -2642,6 +2637,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LopunnyMega, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Lopunny) + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, + .formChangeTable = sLopunnyFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_LopunnyMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3211,6 +3211,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GARCHOMP] = { + .baseHP = 108, + .baseAttack = 130, + .baseDefense = 95, + .baseSpeed = 102, + .baseSpAttack = 80, + .baseSpDefense = 85, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 45, .evYield_Attack = 3, @@ -3234,12 +3240,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .teachableLearnset = sGarchompTeachableLearnset, .formSpeciesIdTable = sGarchompFormSpeciesIdTable, .formChangeTable = sGarchompFormChangeTable, - .baseHP = 108, - .baseAttack = 130, - .baseDefense = 95, - .baseSpeed = 102, - .baseSpAttack = 80, - .baseSpDefense = 85, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -3274,45 +3274,45 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_GARCHOMP_MEGA] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), - .catchRate = 45, - .evYield_Attack = 3, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 40, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), - .bodyColor = BODY_COLOR_BLUE, - .speciesName = _("Garchomp"), - .natDexNum = NATIONAL_DEX_GARCHOMP, - .categoryName = _("Mach"), - .height = 19, - .weight = 950, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, - FOOTPRINT(Garchomp) - .levelUpLearnset = sGarchompLevelUpLearnset, - .teachableLearnset = sGarchompTeachableLearnset, - .formSpeciesIdTable = sGarchompFormSpeciesIdTable, - .formChangeTable = sGarchompFormChangeTable, .baseHP = 108, .baseAttack = 170, .baseDefense = 115, .baseSpeed = 92, .baseSpAttack = 120, .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 350 : 315, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), .abilities = { ABILITY_SAND_FORCE, ABILITY_SAND_FORCE, ABILITY_SAND_FORCE }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Garchomp"), .cryId = CRY_GARCHOMP_MEGA, + .natDexNum = NATIONAL_DEX_GARCHOMP, + .categoryName = _("Mach"), + .height = 19, + .weight = 950, .description = COMPOUND_STRING( "Excess energy melted its arms and wings\n" "into giant scythes, sending it mad with\n" "rage. It swings its scythes wildly and\n" "slices the ground to pieces."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_GarchompMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Garchomp) + .levelUpLearnset = sGarchompLevelUpLearnset, + .teachableLearnset = sGarchompTeachableLearnset, + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, + .formChangeTable = sGarchompFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GarchompMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3385,8 +3385,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_LUCARIO] = { + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 70, + .baseSpeed = 90, + .baseSpAttack = 115, + .baseSpDefense = 70, .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 184 : 204, .evYield_Attack = 1, .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), @@ -3394,24 +3401,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_STEADFAST, ABILITY_INNER_FOCUS, ABILITY_JUSTIFIED }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Lucario"), + .cryId = CRY_LUCARIO, .natDexNum = NATIONAL_DEX_LUCARIO, .categoryName = _("Aura"), - FOOTPRINT(Lucario) - .levelUpLearnset = sLucarioLevelUpLearnset, - .teachableLearnset = sLucarioTeachableLearnset, - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, - .formChangeTable = sLucarioFormChangeTable, - .baseHP = 70, - .baseAttack = 110, - .baseDefense = 70, - .baseSpeed = 90, - .baseSpAttack = 115, - .baseSpDefense = 70, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 184 : 204, - .abilities = { ABILITY_STEADFAST, ABILITY_INNER_FOCUS, ABILITY_JUSTIFIED }, - .cryId = CRY_LUCARIO, .height = 12, .weight = 540, .description = COMPOUND_STRING( @@ -3425,6 +3420,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lucario, .frontPicSize = MON_COORDS_SIZE(48, 56), + FOOTPRINT(Lucario) + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, + .formChangeTable = sLucarioFormChangeTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_Lucario, .frontAnimId = ANIM_V_STRETCH, @@ -3441,8 +3441,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_LUCARIO_MEGA] = { + .baseHP = 70, + .baseAttack = 145, + .baseDefense = 88, + .baseSpeed = 112, + .baseSpAttack = 140, + .baseSpDefense = 70, .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), .catchRate = 45, + .expYield = 219, .evYield_Attack = 1, .evYield_SpAttack = 1, .genderRatio = PERCENT_FEMALE(12.5), @@ -3450,24 +3457,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Lucario"), + .cryId = CRY_LUCARIO_MEGA, .natDexNum = NATIONAL_DEX_LUCARIO, .categoryName = _("Aura"), - FOOTPRINT(Lucario) - .levelUpLearnset = sLucarioLevelUpLearnset, - .teachableLearnset = sLucarioTeachableLearnset, - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, - .formChangeTable = sLucarioFormChangeTable, - .baseHP = 70, - .baseAttack = 145, - .baseDefense = 88, - .baseSpeed = 112, - .baseSpAttack = 140, - .baseSpDefense = 70, - .expYield = 219, - .abilities = { ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY, ABILITY_ADAPTABILITY }, - .cryId = CRY_LUCARIO_MEGA, .height = 13, .weight = 575, .description = COMPOUND_STRING( @@ -3481,6 +3476,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LucarioMega, .frontPicSize = MON_COORDS_SIZE(48, 64), + FOOTPRINT(Lucario) + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, + .formChangeTable = sLucarioFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_LucarioMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4073,8 +4073,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ABOMASNOW] = { + .baseHP = 90, + .baseAttack = 92, + .baseDefense = 75, + .baseSpeed = 60, + .baseSpAttack = 92, + .baseSpDefense = 85, .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), .catchRate = 60, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 173 : 214, .evYield_Attack = 1, .evYield_SpAttack = 1, .itemRare = ITEM_NEVER_MELT_ICE, @@ -4083,24 +4090,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), + .abilities = { ABILITY_SNOW_WARNING, ABILITY_NONE, ABILITY_SOUNDPROOF }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Abomasnow"), + .cryId = CRY_ABOMASNOW, .natDexNum = NATIONAL_DEX_ABOMASNOW, .categoryName = _("Frost Tree"), - FOOTPRINT(Abomasnow) - .levelUpLearnset = sAbomasnowLevelUpLearnset, - .teachableLearnset = sAbomasnowTeachableLearnset, - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, - .formChangeTable = sAbomasnowFormChangeTable, - .baseHP = 90, - .baseAttack = 92, - .baseDefense = 75, - .baseSpeed = 60, - .baseSpAttack = 92, - .baseSpDefense = 85, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 173 : 214, - .abilities = { ABILITY_SNOW_WARNING, ABILITY_NONE, ABILITY_SOUNDPROOF }, - .cryId = CRY_ABOMASNOW, .height = 22, .weight = 1355, .description = COMPOUND_STRING( @@ -4121,6 +4116,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Abomasnow, .backPicSize = MON_COORDS_SIZE(64, 56), + FOOTPRINT(Abomasnow) + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, + .formChangeTable = sAbomasnowFormChangeTable, .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Abomasnow, @@ -4132,8 +4132,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_MEGA_EVOLUTIONS [SPECIES_ABOMASNOW_MEGA] = { + .baseHP = 90, + .baseAttack = 132, + .baseDefense = 105, + .baseSpeed = 30, + .baseSpAttack = 132, + .baseSpDefense = 105, .types = MON_TYPES(TYPE_GRASS, TYPE_ICE), .catchRate = 60, + .expYield = 208, .evYield_Attack = 1, .evYield_SpAttack = 1, .itemRare = ITEM_NEVER_MELT_ICE, @@ -4142,24 +4149,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_GRASS), + .abilities = { ABILITY_SNOW_WARNING, ABILITY_SNOW_WARNING, ABILITY_SNOW_WARNING }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Abomasnow"), + .cryId = CRY_ABOMASNOW_MEGA, .natDexNum = NATIONAL_DEX_ABOMASNOW, .categoryName = _("Frost Tree"), - FOOTPRINT(Abomasnow) - .levelUpLearnset = sAbomasnowLevelUpLearnset, - .teachableLearnset = sAbomasnowTeachableLearnset, - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, - .formChangeTable = sAbomasnowFormChangeTable, - .baseHP = 90, - .baseAttack = 132, - .baseDefense = 105, - .baseSpeed = 30, - .baseSpAttack = 132, - .baseSpDefense = 105, - .expYield = 208, - .abilities = { ABILITY_SNOW_WARNING, ABILITY_SNOW_WARNING, ABILITY_SNOW_WARNING }, - .cryId = CRY_ABOMASNOW_MEGA, .height = 27, .weight = 1850, .description = COMPOUND_STRING( @@ -4173,6 +4168,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 6, .frontPic = gMonFrontPic_AbomasnowMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Abomasnow) + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, + .formChangeTable = sAbomasnowFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_AbomasnowMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4192,7 +4192,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = #if P_FAMILY_ROTOM [SPECIES_ROTOM] = { + .baseHP = 50, + .baseAttack = 50, + .baseDefense = 77, + .baseSpeed = 91, + .baseSpAttack = 95, + .baseSpDefense = 77, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GHOST), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 132, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4208,30 +4216,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "Its body is composed of plasma and loves\n" + "to surprise others. One boy's invention led\n" + "to the development of many machines that\n" + "can use of Rotom's unique capabilities."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_Rotom, + .frontPicSize = MON_COORDS_SIZE(56, 48), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .baseHP = 50, - .baseAttack = 50, - .baseDefense = 77, - .baseSpeed = 91, - .baseSpAttack = 95, - .baseSpDefense = 77, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GHOST), - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 132, - .description = COMPOUND_STRING( - "Its body is composed of plasma and loves\n" - "to surprise others. One boy's invention led\n" - "to the development of many machines that\n" - "can use of Rotom's unique capabilities."), - .frontPic = gMonFrontPic_Rotom, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Rotom, .frontAnimId = ANIM_GLOW_YELLOW, @@ -4256,7 +4256,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_HEAT] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), .catchRate = 45, + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4272,30 +4280,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "If the convection microwave oven is not\n" + "working properly, then the Rotom inhabiting\n" + "it will become lethargic. It will gleefully\n" + "burn your favorite outfit in mischief."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_RotomHeat, + .frontPicSize = MON_COORDS_SIZE(56, 48), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FIRE), - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 107, - .baseSpeed = 86, - .baseSpAttack = 105, - .baseSpDefense = 107, - .expYield = ROTOM_APPLIANCE_EXP_YIELD, - .description = COMPOUND_STRING( - "If the convection microwave oven is not\n" - "working properly, then the Rotom inhabiting\n" - "it will become lethargic. It will gleefully\n" - "burn your favorite outfit in mischief."), - .frontPic = gMonFrontPic_RotomHeat, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_RotomHeat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4312,7 +4312,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_WASH] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER), .catchRate = 45, + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4322,37 +4330,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, + .noFlip = TRUE, .speciesName = _("Rotom"), .cryId = CRY_ROTOM, .natDexNum = NATIONAL_DEX_ROTOM, .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "It enjoys coming up with water-based\n" + "pranks. The model of washing machine that\n" + "Rotom can inspirit has been discontinued,\n" + "so they are now traded at high prices."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_RotomWash, + .frontPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_WATER), - .noFlip = TRUE, - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 107, - .baseSpeed = 86, - .baseSpAttack = 105, - .baseSpDefense = 107, - .expYield = ROTOM_APPLIANCE_EXP_YIELD, - .description = COMPOUND_STRING( - "It enjoys coming up with water-based\n" - "pranks. The model of washing machine that\n" - "Rotom can inspirit has been discontinued,\n" - "so they are now traded at high prices."), - .frontPic = gMonFrontPic_RotomWash, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_RotomWash, .frontAnimId = ANIM_V_JUMPS_SMALL, @@ -4369,7 +4369,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FROST] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE), .catchRate = 45, + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4385,30 +4393,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "In this form, Rotom likes to play freezing\n" + "cold pranks. You may find it's turned the\n" + "bath you just filled to solid ice!\n" + "It battles by spewing cold air."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_RotomFrost, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_ICE), - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 107, - .baseSpeed = 86, - .baseSpAttack = 105, - .baseSpDefense = 107, - .expYield = ROTOM_APPLIANCE_EXP_YIELD, - .description = COMPOUND_STRING( - "In this form, Rotom likes to play freezing\n" - "cold pranks. You may find it's turned the\n" - "bath you just filled to solid ice!\n" - "It battles by spewing cold air."), - .frontPic = gMonFrontPic_RotomFrost, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, .frontAnimFrames = sAnims_RotomFrost, .frontAnimId = ANIM_H_STRETCH, @@ -4425,7 +4425,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_FAN] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 45, + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4441,30 +4449,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "The first appliance developed that Rotom\n" + "coud inspirit was the electric fan. It uses\n" + "its power over wind in its pranks, happily\n" + "blowing any important documents it finds."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_RotomFan, + .frontPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 107, - .baseSpeed = 86, - .baseSpAttack = 105, - .baseSpDefense = 107, - .expYield = ROTOM_APPLIANCE_EXP_YIELD, - .description = COMPOUND_STRING( - "The first appliance developed that Rotom\n" - "coud inspirit was the electric fan. It uses\n" - "its power over wind in its pranks, happily\n" - "blowing any important documents it finds."), - .frontPic = gMonFrontPic_RotomFan, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_RotomFan, .frontAnimId = ANIM_H_SLIDE_WOBBLE, @@ -4482,7 +4482,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_ROTOM_MOW] = { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 107, + .baseSpeed = 86, + .baseSpAttack = 105, + .baseSpDefense = 107, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), .catchRate = 45, + .expYield = ROTOM_APPLIANCE_EXP_YIELD, .evYield_Speed = 1, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -4498,30 +4506,22 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .categoryName = _("Plasma"), .height = 3, .weight = 3, + .description = COMPOUND_STRING( + "The lawn mower is an appliance that led to\n" + "the development of the Rotom Dex. It will\n" + "mow down grass and flowers, then swagger\n" + "around with pride at its accomplishments."), .pokemonScale = 530, .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_RotomMow, + .frontPicSize = MON_COORDS_SIZE(56, 64), FOOTPRINT(Rotom) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, .formSpeciesIdTable = sRotomFormSpeciesIdTable, .formChangeTable = sRotomFormChangeTable, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_GRASS), - .baseHP = 50, - .baseAttack = 65, - .baseDefense = 107, - .baseSpeed = 86, - .baseSpAttack = 105, - .baseSpDefense = 107, - .expYield = ROTOM_APPLIANCE_EXP_YIELD, - .description = COMPOUND_STRING( - "The lawn mower is an appliance that led to\n" - "the development of the Rotom Dex. It will\n" - "mow down grass and flowers, then swagger\n" - "around with pride at its accomplishments."), - .frontPic = gMonFrontPic_RotomMow, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_RotomMow, .frontAnimId = ANIM_TIP_MOVE_FORWARD, @@ -4738,6 +4738,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_DIALGA] = { + .baseHP = 100, + .baseAttack = 120, + .baseDefense = 120, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), .catchRate = 3, .expYield = DIALGA_EXP_YIELD, @@ -4753,18 +4759,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_DIALGA, .natDexNum = NATIONAL_DEX_DIALGA, .categoryName = _("Temporal"), - FOOTPRINT(Dialga) - .levelUpLearnset = sDialgaLevelUpLearnset, - .teachableLearnset = sDialgaTeachableLearnset, - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, - .formChangeTable = sDialgaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 100, - .baseAttack = 120, - .baseDefense = 120, - .baseSpeed = 90, - .baseSpAttack = 150, - .baseSpDefense = 100, .height = 54, .weight = 6830, .description = COMPOUND_STRING( @@ -4778,6 +4772,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 19, .frontPic = gMonFrontPic_Dialga, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Dialga) + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dialga, .frontAnimId = ANIM_H_SHAKE, @@ -4793,6 +4793,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_DIALGA_ORIGIN] = { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_STEEL, TYPE_DRAGON), .catchRate = 3, .expYield = DIALGA_EXP_YIELD, @@ -4808,18 +4814,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_DIALGA, .natDexNum = NATIONAL_DEX_DIALGA, .categoryName = _("Temporal"), - FOOTPRINT(Dialga) - .levelUpLearnset = sDialgaLevelUpLearnset, - .teachableLearnset = sDialgaTeachableLearnset, - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, - .formChangeTable = sDialgaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 120, - .baseSpeed = 90, - .baseSpAttack = 150, - .baseSpDefense = 120, .height = 70, .weight = 8500, .description = COMPOUND_STRING( @@ -4833,6 +4827,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 19, .frontPic = gMonFrontPic_DialgaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Dialga) + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DialgaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4858,6 +4858,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_PALKIA] = { + .baseHP = 90, + .baseAttack = 120, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 150, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), .catchRate = 3, .expYield = PALKIA_EXP_YIELD, @@ -4873,18 +4879,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_PALKIA, .natDexNum = NATIONAL_DEX_PALKIA, .categoryName = _("Spatial"), - FOOTPRINT(Palkia) - .levelUpLearnset = sPalkiaLevelUpLearnset, - .teachableLearnset = sPalkiaTeachableLearnset, - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, - .formChangeTable = sPalkiaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 120, - .baseDefense = 100, - .baseSpeed = 100, - .baseSpAttack = 150, - .baseSpDefense = 120, .height = 42, .weight = 3360, .description = COMPOUND_STRING( @@ -4898,6 +4892,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 16, .frontPic = gMonFrontPic_Palkia, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Palkia) + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Palkia, .frontAnimId = ANIM_V_SHAKE, @@ -4913,6 +4913,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_PALKIA_ORIGIN] = { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 120, + .baseSpAttack = 150, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_WATER, TYPE_DRAGON), .catchRate = 3, .expYield = PALKIA_EXP_YIELD, @@ -4928,18 +4934,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .cryId = CRY_PALKIA, .natDexNum = NATIONAL_DEX_PALKIA, .categoryName = _("Spatial"), - FOOTPRINT(Palkia) - .levelUpLearnset = sPalkiaLevelUpLearnset, - .teachableLearnset = sPalkiaTeachableLearnset, - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, - .formChangeTable = sPalkiaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 100, - .baseDefense = 100, - .baseSpeed = 120, - .baseSpAttack = 150, - .baseSpDefense = 120, .height = 63, .weight = 6600, .description = COMPOUND_STRING( @@ -4953,6 +4947,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 16, .frontPic = gMonFrontPic_PalkiaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Palkia) + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_PalkiaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5100,6 +5100,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GIRATINA_ALTERED] = { + .baseHP = 150, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 120, .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), .catchRate = 3, .expYield = GIRATINA_EXP_YIELD, @@ -5109,24 +5115,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Giratina"), .cryId = CRY_GIRATINA, .natDexNum = NATIONAL_DEX_GIRATINA, .categoryName = _("Renegade"), - FOOTPRINT(Giratina) - .levelUpLearnset = sGiratinaLevelUpLearnset, - .teachableLearnset = sGiratinaTeachableLearnset, - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, - .formChangeTable = sGiratinaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 150, - .baseAttack = 100, - .baseDefense = 120, - .baseSpeed = 90, - .baseSpAttack = 100, - .baseSpDefense = 120, - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY }, .height = 45, .weight = 7500, .description = COMPOUND_STRING( @@ -5140,6 +5134,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 13, .frontPic = gMonFrontPic_GiratinaAltered, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Giratina) + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaAltered, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5155,6 +5155,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_GIRATINA_ORIGIN] = { + .baseHP = 150, + .baseAttack = 120, + .baseDefense = 100, + .baseSpeed = 90, + .baseSpAttack = 120, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_GHOST, TYPE_DRAGON), .catchRate = 3, .expYield = GIRATINA_EXP_YIELD, @@ -5164,24 +5170,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_LEVITATE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Giratina"), .cryId = CRY_GIRATINA, .natDexNum = NATIONAL_DEX_GIRATINA, .categoryName = _("Renegade"), - FOOTPRINT(Giratina) - .levelUpLearnset = sGiratinaLevelUpLearnset, - .teachableLearnset = sGiratinaTeachableLearnset, - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, - .formChangeTable = sGiratinaFormChangeTable, - .isLegendary = TRUE, - .baseHP = 150, - .baseAttack = 120, - .baseDefense = 100, - .baseSpeed = 90, - .baseSpAttack = 120, - .baseSpDefense = 100, - .abilities = { ABILITY_LEVITATE, ABILITY_NONE, ABILITY_NONE }, .height = 69, .weight = 6500, .description = COMPOUND_STRING( @@ -5195,6 +5189,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 13, .frontPic = gMonFrontPic_GiratinaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Giratina) + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaOrigin, .frontAnimId = ANIM_LUNGE_GROW, @@ -5468,8 +5468,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHAYMIN_LAND] = { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 100, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_GRASS), .catchRate = 45, .expYield = SHAYMIN_EXP_YIELD, + .evYield_HP = 3, .itemCommon = ITEM_LUM_BERRY, .itemRare = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, @@ -5477,24 +5485,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = 100, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Shaymin"), + .cryId = CRY_SHAYMIN_LAND, .natDexNum = NATIONAL_DEX_SHAYMIN, .categoryName = _("Gratitude"), - FOOTPRINT(Shaymin) - .formSpeciesIdTable = sShayminFormSpeciesIdTable, - .formChangeTable = sShayminFormChangeTable, - .isMythical = TRUE, - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 100, - .baseSpeed = 100, - .baseSpAttack = 100, - .baseSpDefense = 100, - .evYield_HP = 3, - .types = MON_TYPES(TYPE_GRASS), - .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE }, - .cryId = CRY_SHAYMIN_LAND, .height = 2, .weight = 21, .description = COMPOUND_STRING( @@ -5508,6 +5504,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_ShayminLand, .frontPicSize = MON_COORDS_SIZE(40, 32), + FOOTPRINT(Shaymin) + .formSpeciesIdTable = sShayminFormSpeciesIdTable, + .formChangeTable = sShayminFormChangeTable, + .isMythical = TRUE, .frontPicYOffset = 16, .frontAnimFrames = sAnims_ShayminLand, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5525,8 +5525,19 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = [SPECIES_SHAYMIN_SKY] = { + .baseHP = 100, + .baseAttack = 103, + .baseDefense = 75, + .baseSpeed = 127, + .baseSpAttack = 120, + .baseSpDefense = 75, .catchRate = 45, .expYield = SHAYMIN_EXP_YIELD, + #if P_UPDATED_EVS >= GEN_5 + .evYield_Speed = 3, + #else + .evYield_HP = 3, + #endif .itemCommon = ITEM_LUM_BERRY, .itemRare = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, @@ -5542,17 +5553,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .formSpeciesIdTable = sShayminFormSpeciesIdTable, .formChangeTable = sShayminFormChangeTable, .isMythical = TRUE, - .baseHP = 100, - .baseAttack = 103, - .baseDefense = 75, - .baseSpeed = 127, - .baseSpAttack = 120, - .baseSpDefense = 75, - #if P_UPDATED_EVS >= GEN_5 - .evYield_Speed = 3, - #else - .evYield_HP = 3, - #endif .types = MON_TYPES(TYPE_GRASS, TYPE_FLYING), .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .noFlip = TRUE, diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index 4e4444fa1bf8..6df37aa45502 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -23,7 +23,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_VICTORY_STAR, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isMythical = TRUE, .speciesName = _("Victini"), .cryId = CRY_VICTINI, .natDexNum = NATIONAL_DEX_VICTINI, @@ -46,7 +45,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Victini, .backPicSize = MON_COORDS_SIZE(40, 64), - .backPicYOffset = 7, + .backPicYOffset = 7, + .isMythical = TRUE, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Victini, .shinyPalette = gMonShinyPalette_Victini, @@ -489,42 +489,42 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_SAMUROTT] = { + .baseHP = 95, + .baseAttack = 100, + .baseDefense = 85, + .baseSpeed = 70, + .baseSpAttack = 108, + .baseSpDefense = 70, + .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, + .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHELL_ARMOR }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Samurott"), .cryId = CRY_SAMUROTT, .natDexNum = NATIONAL_DEX_SAMUROTT, .categoryName = _("Formidable"), .height = 15, - .pokemonScale = 268, - .pokemonOffset = 2, - .trainerScale = 271, - .trainerOffset = 0, - FOOTPRINT(Samurott) - .formSpeciesIdTable = sSamurottFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 100, - .baseDefense = 85, - .baseSpeed = 70, - .baseSpAttack = 108, - .baseSpDefense = 70, - .types = MON_TYPES(TYPE_WATER), - .evYield_SpAttack = 3, - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHELL_ARMOR }, .weight = 946, .description = COMPOUND_STRING( "One swing of the seamitars attached\n" "to its armor can fell an opponent.\n" "A simple glare from one of them is\n" "enough to intimidate most enemies."), + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, .frontPic = gMonFrontPic_Samurott, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Samurott) + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Samurott, .frontAnimId = ANIM_V_SHAKE, @@ -543,42 +543,42 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_SAMUROTT_HISUIAN] = { + .baseHP = 90, + .baseAttack = 108, + .baseDefense = 80, + .baseSpeed = 85, + .baseSpAttack = 100, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 264 : 238, + .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHARPNESS }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Samurott"), .cryId = CRY_SAMUROTT, .natDexNum = NATIONAL_DEX_SAMUROTT, .categoryName = _("Formidable"), .height = 15, - .pokemonScale = 268, - .pokemonOffset = 2, - .trainerScale = 271, - .trainerOffset = 0, - FOOTPRINT(Samurott) - .formSpeciesIdTable = sSamurottFormSpeciesIdTable, - .baseHP = 90, - .baseAttack = 108, - .baseDefense = 80, - .baseSpeed = 85, - .baseSpAttack = 100, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_WATER, TYPE_DARK), - .evYield_Attack = 3, - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHARPNESS }, .weight = 582, .description = COMPOUND_STRING( "Hard of heart and deft of blade,\n" "this rare form of Samurott is a\n" "product of the Pokémon's evolution in the\n" "region of Hisui."), + .pokemonScale = 268, + .pokemonOffset = 2, + .trainerScale = 271, + .trainerOffset = 0, .frontPic = gMonFrontPic_SamurottHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Samurott) + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SamurottHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2085,7 +2085,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_AUDINO [SPECIES_AUDINO] = { + .baseHP = 103, + .baseAttack = 60, + .baseDefense = 86, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 86, + .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, + .expYield = 390, .evYield_HP = 2, .itemCommon = ITEM_ORAN_BERRY, .itemRare = ITEM_SITRUS_BERRY, @@ -2094,25 +2102,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), - .speciesName = _("Audino"), - .natDexNum = NATIONAL_DEX_AUDINO, - .categoryName = _("Hearing"), - FOOTPRINT(Audino) - .levelUpLearnset = sAudinoLevelUpLearnset, - .teachableLearnset = sAudinoTeachableLearnset, - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, - .formChangeTable = sAudinoFormChangeTable, - .baseHP = 103, - .baseAttack = 60, - .baseDefense = 86, - .baseSpeed = 50, - .baseSpAttack = 60, - .baseSpDefense = 86, - .types = MON_TYPES(TYPE_NORMAL), - .expYield = 390, .abilities = { ABILITY_HEALER, ABILITY_REGENERATOR, ABILITY_KLUTZ }, .bodyColor = BODY_COLOR_PINK, + .speciesName = _("Audino"), .cryId = CRY_AUDINO, + .natDexNum = NATIONAL_DEX_AUDINO, + .categoryName = _("Hearing"), .height = 11, .weight = 310, .description = COMPOUND_STRING( @@ -2126,6 +2121,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Audino, .frontPicSize = MON_COORDS_SIZE(40, 48), + FOOTPRINT(Audino) + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, + .formChangeTable = sAudinoFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Audino, .frontAnimId = ANIM_V_STRETCH, @@ -2142,7 +2142,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_MEGA_EVOLUTIONS [SPECIES_AUDINO_MEGA] = { + .baseHP = 103, + .baseAttack = 60, + .baseDefense = 126, + .baseSpeed = 50, + .baseSpAttack = 80, + .baseSpDefense = 126, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FAIRY), .catchRate = 255, + .expYield = 425, .evYield_HP = 2, .itemCommon = ITEM_ORAN_BERRY, .itemRare = ITEM_SITRUS_BERRY, @@ -2151,25 +2159,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), - .speciesName = _("Audino"), - .natDexNum = NATIONAL_DEX_AUDINO, - .categoryName = _("Hearing"), - FOOTPRINT(Audino) - .levelUpLearnset = sAudinoLevelUpLearnset, - .teachableLearnset = sAudinoTeachableLearnset, - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, - .formChangeTable = sAudinoFormChangeTable, - .baseHP = 103, - .baseAttack = 60, - .baseDefense = 126, - .baseSpeed = 50, - .baseSpAttack = 80, - .baseSpDefense = 126, - .types = MON_TYPES(TYPE_NORMAL, TYPE_FAIRY), - .expYield = 425, .abilities = { ABILITY_HEALER, ABILITY_HEALER, ABILITY_HEALER }, .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Audino"), .cryId = CRY_AUDINO_MEGA, + .natDexNum = NATIONAL_DEX_AUDINO, + .categoryName = _("Hearing"), .height = 15, .weight = 320, .description = COMPOUND_STRING( @@ -2183,6 +2178,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AudinoMega, .frontPicSize = MON_COORDS_SIZE(48, 64), + FOOTPRINT(Audino) + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, + .formChangeTable = sAudinoFormChangeTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_AudinoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3161,30 +3161,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_LILLIGANT] = { + .baseHP = 70, + .baseAttack = 60, + .baseDefense = 75, + .baseSpeed = 90, + .baseSpAttack = 110, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_GRASS), .catchRate = 75, .expYield = 168, + .evYield_SpAttack = 2, .itemRare = ITEM_ABSORB_BULB, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_OWN_TEMPO, ABILITY_LEAF_GUARD }, .bodyColor = BODY_COLOR_GREEN, .noFlip = TRUE, .speciesName = _("Lilligant"), .cryId = CRY_LILLIGANT, .natDexNum = NATIONAL_DEX_LILLIGANT, - FOOTPRINT(Lilligant) - .formSpeciesIdTable = sLilligantFormSpeciesIdTable, - .baseHP = 70, - .baseAttack = 60, - .baseDefense = 75, - .baseSpeed = 90, - .baseSpAttack = 110, - .baseSpDefense = 75, - .types = MON_TYPES(TYPE_GRASS), - .evYield_SpAttack = 2, - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_OWN_TEMPO, ABILITY_LEAF_GUARD }, .categoryName = _("Flowering"), .height = 11, .weight = 163, @@ -3199,6 +3197,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lilligant, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Lilligant) + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Lilligant, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3217,31 +3217,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_LILLIGANT_HISUIAN] = { + .baseHP = 70, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 105, + .baseSpAttack = 50, + .baseSpDefense = 75, + .types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING), .catchRate = 75, .expYield = 168, + .evYield_Attack = 1, + .evYield_Speed = 1, .itemRare = ITEM_ABSORB_BULB, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_GRASS), + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_HUSTLE, ABILITY_LEAF_GUARD }, .bodyColor = BODY_COLOR_GREEN, .noFlip = TRUE, .speciesName = _("Lilligant"), .cryId = CRY_LILLIGANT, .natDexNum = NATIONAL_DEX_LILLIGANT, - FOOTPRINT(Lilligant) - .formSpeciesIdTable = sLilligantFormSpeciesIdTable, - .baseHP = 70, - .baseAttack = 105, - .baseDefense = 75, - .baseSpeed = 105, - .baseSpAttack = 50, - .baseSpDefense = 75, - .types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING), - .evYield_Attack = 1, - .evYield_Speed = 1, - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_HUSTLE, ABILITY_LEAF_GUARD }, .categoryName = _("Spinning"), .height = 12, .weight = 192, @@ -3256,6 +3254,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LilligantHisuian, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Lilligant) + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_LilligantHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3287,39 +3287,39 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .catchRate = 190, .expYield = 161, .evYield_Speed = 2, + .itemRare = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_RECKLESS, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Basculin"), .cryId = CRY_BASCULIN, .natDexNum = NATIONAL_DEX_BASCULIN, + .categoryName = _("Hostile"), .height = 10, .weight = 180, - .pokemonScale = 316, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - .enemyMonElevation = 6, - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, - .itemRare = ITEM_DEEP_SEA_TOOTH, - .abilities = { ABILITY_RECKLESS, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, - .categoryName = _("Hostile"), .description = COMPOUND_STRING( "It used to be a common food source. The\n" "meat of red Basculin is on the fatty side\n" "and it's more popular with the youth.\n" "Its temperament is vicious and aggressive."), + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_BasculinRedStriped, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, + .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinRedStriped, .backPicSize = MON_COORDS_SIZE(64, 48), + FOOTPRINT(Basculin) + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinRedStriped, @@ -3342,39 +3342,39 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .catchRate = 190, .expYield = 161, .evYield_Speed = 2, + .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_ROCK_HEAD, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Basculin"), .cryId = CRY_BASCULIN, .natDexNum = NATIONAL_DEX_BASCULIN, + .categoryName = _("Hostile"), .height = 10, .weight = 180, - .pokemonScale = 316, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - .enemyMonElevation = 6, - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, - .itemRare = ITEM_DEEP_SEA_SCALE, - .abilities = { ABILITY_ROCK_HEAD, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, - .categoryName = _("Hostile"), .description = COMPOUND_STRING( "They form schools with others of the same\n" "color. The greatest foe of a school of blue\n" "Basculin is a school of red Basculin.\n" "Its flavor is light and inoffensive."), + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_BasculinBlueStriped, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, + .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinBlueStriped, .backPicSize = MON_COORDS_SIZE(64, 48), + FOOTPRINT(Basculin) + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinBlueStriped, @@ -3398,39 +3398,39 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .catchRate = 190, .expYield = 161, .evYield_Speed = 2, + .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), + .abilities = { ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Basculin"), .cryId = CRY_BASCULIN, .natDexNum = NATIONAL_DEX_BASCULIN, + .categoryName = _("Mellow"), .height = 10, .weight = 180, - .pokemonScale = 316, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - .enemyMonElevation = 6, - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, - .itemRare = ITEM_DEEP_SEA_SCALE, - .abilities = { ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER }, - .categoryName = _("Mellow"), .description = COMPOUND_STRING( "While this ancient form of Basculin shares\n" "a vast array of qualities with other forms,\n" "it differs in several respects, including\n" "demeanor, being much gentler than others."), + .pokemonScale = 316, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_BasculinWhiteStriped, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Basculin, .frontAnimId = ANIM_TIP_MOVE_FORWARD, + .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinWhiteStriped, .backPicSize = MON_COORDS_SIZE(64, 40), + FOOTPRINT(Basculin) + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinWhiteStriped, @@ -3445,10 +3445,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULEGION_MALE] = { + .baseHP = 120, + .baseAttack = 112, + .baseDefense = 65, + .baseSpeed = 78, + .baseSpAttack = 80, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), .catchRate = 45, .expYield = 265, .evYield_HP = 3, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, @@ -3461,12 +3468,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Big Fish"), .height = 30, .weight = 1100, + .description = COMPOUND_STRING( + "Clads itself in the souls of comrades that\n" + "perished before fulfilling their goals of\n" + "journeying upstream. No other species in\n" + "all Hisui's rivers is Basculegion's equal."), .pokemonScale = 275, .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontAnimFrames = sAnims_Basculegion, + .frontPic = gMonFrontPic_BasculegionMale, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Basculegion, .enemyMonElevation = 5, .backPicYOffset = 8, .levelUpLearnset = sBasculegionLevelUpLearnset, @@ -3475,20 +3489,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Basculegion), - .baseHP = 120, - .baseAttack = 112, - .baseDefense = 65, - .baseSpeed = 78, - .baseSpAttack = 80, - .baseSpDefense = 75, - .genderRatio = MON_MALE, - .description = COMPOUND_STRING( - "Clads itself in the souls of comrades that\n" - "perished before fulfilling their goals of\n" - "journeying upstream. No other species in\n" - "all Hisui's rivers is Basculegion's equal."), - .frontPic = gMonFrontPic_BasculegionMale, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_BasculegionMale, .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_BasculegionMale, @@ -3499,10 +3499,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BASCULEGION_FEMALE] = { + .baseHP = 120, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 78, + .baseSpAttack = 100, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_WATER, TYPE_GHOST), .catchRate = 45, .expYield = 265, .evYield_HP = 3, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, @@ -3515,12 +3522,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Big Fish"), .height = 30, .weight = 1100, + .description = COMPOUND_STRING( + "The souls of its comrades cloak its\n" + "body and propel it effortlessly\n" + "through even raging rapids."), .pokemonScale = 275, .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontAnimFrames = sAnims_Basculegion, + .frontPic = gMonFrontPic_BasculegionFemale, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Basculegion, .enemyMonElevation = 5, .backPicYOffset = 8, .levelUpLearnset = sBasculegionLevelUpLearnset, @@ -3529,19 +3542,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //.backAnimId = BACK_ANIM_NONE, //FOOTPRINT(Basculegion), - .baseHP = 120, - .baseAttack = 92, - .baseDefense = 65, - .baseSpeed = 78, - .baseSpAttack = 100, - .baseSpDefense = 75, - .genderRatio = MON_FEMALE, - .description = COMPOUND_STRING( - "The souls of its comrades cloak its\n" - "body and propel it effortlessly\n" - "through even raging rapids."), - .frontPic = gMonFrontPic_BasculegionFemale, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_BasculegionFemale, .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_BasculegionFemale, @@ -3730,6 +3730,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpeed = 50, .baseSpAttack = 15, .baseSpDefense = 45, + .types = MON_TYPES(TYPE_FIRE), .catchRate = 120, .expYield = 63, .evYield_Attack = 1, @@ -3739,14 +3740,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Darumaka"), .cryId = CRY_DARUMAKA, .natDexNum = NATIONAL_DEX_DARUMAKA, .categoryName = _("Zen Charm"), - FOOTPRINT(Darumaka) - .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, - .types = MON_TYPES(TYPE_FIRE), - .bodyColor = BODY_COLOR_RED, .height = 6, .weight = 375, .description = COMPOUND_STRING( @@ -3760,6 +3758,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Darumaka, .frontPicSize = MON_COORDS_SIZE(40, 40), + FOOTPRINT(Darumaka) + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_Darumaka, .frontAnimId = ANIM_SWING_CONCAVE, @@ -3784,39 +3784,39 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpeed = 95, .baseSpAttack = 30, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_FIRE), + .catchRate = 60, .expYield = 168, .evYield_Attack = 2, - .catchRate = 60, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Darmanitan"), .cryId = CRY_DARMANITAN, .natDexNum = NATIONAL_DEX_DARMANITAN, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .categoryName = _("Blazing"), .height = 13, .weight = 929, - .pokemonScale = 272, - .pokemonOffset = 3, - .trainerScale = 256, - .trainerOffset = 0, - .levelUpLearnset = sDarmanitanLevelUpLearnset, - .teachableLearnset = sDarmanitanTeachableLearnset, - .formChangeTable = sDarmanitanFormChangeTable, - .types = MON_TYPES(TYPE_FIRE), - .bodyColor = BODY_COLOR_RED, - .categoryName = _("Blazing"), .description = COMPOUND_STRING( "When one is injured in a fierce battle,\n" "it transforms into a stone statue.\n" "Then it meditates and sharpens its\n" "mind and fights on mentally."), + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_DarmanitanStandardMode, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Darmanitan) + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .levelUpLearnset = sDarmanitanLevelUpLearnset, + .teachableLearnset = sDarmanitanTeachableLearnset, + .formChangeTable = sDarmanitanFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanStandardMode, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, @@ -3832,23 +3832,35 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_ZEN_MODE] = { + .baseHP = 105, + .baseAttack = 30, + .baseDefense = 105, + .baseSpeed = 55, + .baseSpAttack = 140, + .baseSpDefense = 105, + .types = MON_TYPES(TYPE_FIRE, TYPE_PSYCHIC), + .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168, .evYield_SpAttack = 2, - .categoryName = _("Blazing"), - .catchRate = 60, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Darmanitan"), .cryId = CRY_DARMANITAN, .natDexNum = NATIONAL_DEX_DARMANITAN, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .abilities = { ABILITY_SHEER_FORCE, ABILITY_NONE, ABILITY_ZEN_MODE }, + .categoryName = _("Blazing"), .height = 13, .weight = 929, + .description = COMPOUND_STRING( + "When wounded, it stops moving. It\n" + "goes as still as stone to meditate,\n" + "sharpening its mind and spirit."), + FOOTPRINT(Darmanitan) + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .pokemonScale = 272, .pokemonOffset = 3, .trainerScale = 256, @@ -3856,18 +3868,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .levelUpLearnset = sDarmanitanLevelUpLearnset, .teachableLearnset = sDarmanitanTeachableLearnset, .formChangeTable = sDarmanitanFormChangeTable, - .baseHP = 105, - .baseAttack = 30, - .baseDefense = 105, - .baseSpeed = 55, - .baseSpAttack = 140, - .baseSpDefense = 105, - .types = MON_TYPES(TYPE_FIRE, TYPE_PSYCHIC), - .bodyColor = BODY_COLOR_BLUE, - .description = COMPOUND_STRING( - "When wounded, it stops moving. It\n" - "goes as still as stone to meditate,\n" - "sharpening its mind and spirit."), .frontPic = gMonFrontPic_DarmanitanZenMode, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, @@ -3892,6 +3892,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpeed = 50, .baseSpAttack = 15, .baseSpDefense = 45, + .types = MON_TYPES(TYPE_ICE), .catchRate = 120, .expYield = 63, .evYield_Attack = 1, @@ -3901,14 +3902,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_HUSTLE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Darumaka"), .cryId = CRY_DARUMAKA, .natDexNum = NATIONAL_DEX_DARUMAKA, .categoryName = _("Zen Charm"), - FOOTPRINT(Darumaka) - .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, - .types = MON_TYPES(TYPE_ICE), - .bodyColor = BODY_COLOR_WHITE, .height = 7, .weight = 400, .description = COMPOUND_STRING( @@ -3922,6 +3920,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_DarumakaGalarian, .frontPicSize = MON_COORDS_SIZE(40, 40), + FOOTPRINT(Darumaka) + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .frontPicYOffset = 15, .frontAnimFrames = sAnims_DarumakaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3941,48 +3941,48 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE] = { - .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, - .bodyColor = BODY_COLOR_WHITE, - .height = 17, - .weight = 1200, - .pokemonScale = 272, - .pokemonOffset = 3, - .trainerScale = 256, - .trainerOffset = 0, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, - .formChangeTable = sDarmanitanGalarianFormChangeTable, - .isGalarianForm = TRUE, .baseHP = 105, .baseAttack = 140, .baseDefense = 55, .baseSpeed = 95, .baseSpAttack = 30, .baseSpDefense = 55, + .types = MON_TYPES(TYPE_ICE), + .catchRate = 60, .expYield = 168, .evYield_Attack = 2, - .catchRate = 60, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Darmanitan"), .cryId = CRY_DARMANITAN, .natDexNum = NATIONAL_DEX_DARMANITAN, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .types = MON_TYPES(TYPE_ICE), .categoryName = _("Zen Charm"), + .height = 17, + .weight = 1200, .description = COMPOUND_STRING( "On days when blizzards blow\n" "through, it comes down to where people\n" "live. It stashes food in the snowball on\n" "its head, taking it home for later."), + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_DarmanitanGalarianStandardMode, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DarmanitanGalarianStandardMode, + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .formChangeTable = sDarmanitanGalarianFormChangeTable, + .isGalarianForm = TRUE, + FOOTPRINT(Darmanitan) + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarianStandardMode, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3996,48 +3996,48 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = { - .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, - .bodyColor = BODY_COLOR_WHITE, - .height = 17, - .weight = 1200, - .pokemonScale = 272, - .pokemonOffset = 3, - .trainerScale = 256, - .trainerOffset = 0, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, - .formChangeTable = sDarmanitanGalarianFormChangeTable, - .isGalarianForm = TRUE, + .baseHP = 105, + .baseAttack = 160, + .baseDefense = 55, + .baseSpeed = 135, + .baseSpAttack = 30, + .baseSpDefense = 55, + .types = MON_TYPES(TYPE_ICE, TYPE_FIRE), + .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 189 : 168, .evYield_SpAttack = 2, - .categoryName = _("Blazing"), - .catchRate = 60, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_GORILLA_TACTICS, ABILITY_NONE, ABILITY_ZEN_MODE }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Darmanitan"), .cryId = CRY_DARMANITAN, .natDexNum = NATIONAL_DEX_DARMANITAN, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .baseHP = 105, - .baseAttack = 160, - .baseDefense = 55, - .baseSpeed = 135, - .baseSpAttack = 30, - .baseSpDefense = 55, - .types = MON_TYPES(TYPE_ICE, TYPE_FIRE), + .categoryName = _("Blazing"), + .height = 17, + .weight = 1200, .description = COMPOUND_STRING( "Darmanitan takes this form when\n" "enraged. It won't stop spewing flames\n" "until its rage has settled, even if\n" "its body starts to melt."), + .pokemonScale = 272, + .pokemonOffset = 3, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_DarmanitanGalarianZenMode, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanGalarianZenMode, + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .formChangeTable = sDarmanitanGalarianFormChangeTable, + .isGalarianForm = TRUE, + FOOTPRINT(Darmanitan) + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarianZenMode, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4383,14 +4383,23 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_YAMASK [SPECIES_YAMASK] = { + .baseHP = 38, + .baseAttack = 30, + .baseDefense = 85, + .baseSpeed = 30, + .baseSpAttack = 55, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_GHOST), .catchRate = 190, .expYield = 61, .evYield_Defense = 1, + .itemRare = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_MUMMY, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Yamask"), .cryId = CRY_YAMASK, @@ -4398,28 +4407,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Spirit"), .height = 5, .weight = 15, - .pokemonScale = 432, - .pokemonOffset = 13, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Yamask) - .formSpeciesIdTable = sYamaskFormSpeciesIdTable, - .baseHP = 38, - .baseAttack = 30, - .baseDefense = 85, - .baseSpeed = 30, - .baseSpAttack = 55, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_GHOST), - .itemRare = ITEM_SPELL_TAG, - .abilities = { ABILITY_MUMMY, ABILITY_NONE }, .description = COMPOUND_STRING( "These Pokémon arose from the spirits\n" "of people interred in graves in past ages.\n" "Each of them carries a mask that used\n" "to be its face when it was human."), + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Yamask, .frontPicSize = MON_COORDS_SIZE(48, 40), + FOOTPRINT(Yamask) + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .frontPicYOffset = 15, .frontAnimFrames = sAnims_Yamask, .frontAnimId = ANIM_V_SLIDE_WOBBLE, @@ -4493,6 +4493,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_YAMASK_GALARIAN] = { + .baseHP = 38, + .baseAttack = 55, + .baseDefense = 85, + .baseSpeed = 30, + .baseSpAttack = 30, + .baseSpDefense = 65, + .types = MON_TYPES(TYPE_GROUND, TYPE_GHOST), .catchRate = 190, .expYield = 61, .evYield_Defense = 1, @@ -4501,6 +4508,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_WANDERING_SPIRIT, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Yamask"), .cryId = CRY_YAMASK, @@ -4508,27 +4516,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Spirit"), .height = 5, .weight = 15, - .pokemonScale = 432, - .pokemonOffset = 13, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Yamask) - .formSpeciesIdTable = sYamaskFormSpeciesIdTable, - .baseHP = 38, - .baseAttack = 55, - .baseDefense = 85, - .baseSpeed = 30, - .baseSpAttack = 30, - .baseSpDefense = 65, - .types = MON_TYPES(TYPE_GROUND, TYPE_GHOST), - .abilities = { ABILITY_WANDERING_SPIRIT, ABILITY_NONE }, .description = COMPOUND_STRING( "A clay slab with cursed engravings\n" "took possession of a Yamask. The\n" "slab is said to be absorbing the\n" "Yamask's dark power."), + .pokemonScale = 432, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_YamaskGalarian, .frontPicSize = MON_COORDS_SIZE(48, 40), + FOOTPRINT(Yamask) + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_YamaskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4897,11 +4897,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_GARBODOR, .natDexNum = NATIONAL_DEX_GARBODOR, .categoryName = _("Trash Heap"), - FOOTPRINT(Garbodor) - .levelUpLearnset = sGarbodorLevelUpLearnset, - .teachableLearnset = sGarbodorTeachableLearnset, - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, - .formChangeTable = sGarbodorFormChangeTable, .height = 19, .weight = 1073, .description = COMPOUND_STRING( @@ -4915,8 +4910,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 4, .frontPic = gMonFrontPic_Garbodor, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Garbodor, + FOOTPRINT(Garbodor) + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, + .formChangeTable = sGarbodorFormChangeTable, + .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Garbodor, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Garbodor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4955,11 +4955,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .cryId = CRY_GARBODOR, .natDexNum = NATIONAL_DEX_GARBODOR, .categoryName = _("Trash Heap"), - FOOTPRINT(Garbodor) - .levelUpLearnset = sGarbodorLevelUpLearnset, - .teachableLearnset = sGarbodorTeachableLearnset, - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, - .formChangeTable = sGarbodorFormChangeTable, .height = 210, .weight = 0, .description = COMPOUND_STRING( @@ -4973,6 +4968,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 4, .frontPic = gMonFrontPic_GarbodorGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Garbodor) + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, + .formChangeTable = sGarbodorFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_GarbodorGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4992,6 +4992,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_ZORUA [SPECIES_ZORUA] = { + .baseHP = 40, + .baseAttack = 65, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 80, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_DARK), .catchRate = 75, .expYield = 66, .evYield_SpAttack = 1, @@ -5005,29 +5012,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Zorua"), .cryId = CRY_ZORUA, .natDexNum = NATIONAL_DEX_ZORUA, + .categoryName = _("Tricky Fox"), .height = 7, .weight = 125, - .pokemonScale = 365, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zorua) - .formSpeciesIdTable = sZoruaFormSpeciesIdTable, - .baseHP = 40, - .baseAttack = 65, - .baseDefense = 40, - .baseSpeed = 65, - .baseSpAttack = 80, - .baseSpDefense = 40, - .types = MON_TYPES(TYPE_DARK), - .categoryName = _("Tricky Fox"), .description = COMPOUND_STRING( "To protect themselves from danger, they\n" "hide their true identities by transforming\n" "into people and Pokémon. Apparently, it\n" "often transforms into a silent child."), + .pokemonScale = 365, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Zorua, .frontPicSize = MON_COORDS_SIZE(40, 48), + FOOTPRINT(Zorua) + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .frontPicYOffset = 11, .frontAnimFrames = sAnims_Zorua, .frontAnimId = ANIM_CIRCULAR_VIBRATE, @@ -5046,6 +5046,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK] = { + .baseHP = 60, + .baseAttack = 105, + .baseDefense = 60, + .baseSpeed = 105, + .baseSpAttack = 120, + .baseSpDefense = 60, + .types = MON_TYPES(TYPE_DARK), .catchRate = 45, .expYield = 179, .evYield_SpAttack = 2, @@ -5059,29 +5066,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Zoroark"), .cryId = CRY_ZOROARK, .natDexNum = NATIONAL_DEX_ZOROARK, - .height = 16, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - FOOTPRINT(Zoroark) - .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 105, - .baseDefense = 60, - .baseSpeed = 105, - .baseSpAttack = 120, - .baseSpDefense = 60, - .types = MON_TYPES(TYPE_DARK), .categoryName = _("Illusion Fox"), + .height = 16, .weight = 811, .description = COMPOUND_STRING( "Bonds between these Pokémon are very\n" "strong. It protects the safety of its\n" "pack by tricking its opponents. They\n" "defend their lair with illusory scenery."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_Zoroark, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Zoroark) + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zoroark, .frontAnimId = ANIM_FLICKER_INCREASING, @@ -5100,6 +5100,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_ZORUA_HISUIAN] = { + .baseHP = 35, + .baseAttack = 60, + .baseDefense = 40, + .baseSpeed = 70, + .baseSpAttack = 85, + .baseSpDefense = 40, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GHOST), .catchRate = 75, .expYield = 66, .evYield_SpAttack = 1, @@ -5113,29 +5120,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Zorua"), .cryId = CRY_ZORUA, .natDexNum = NATIONAL_DEX_ZORUA, + .categoryName = _("Spiteful Fox"), .height = 7, .weight = 125, - .pokemonScale = 365, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zorua) - .formSpeciesIdTable = sZoruaFormSpeciesIdTable, - .baseHP = 35, - .baseAttack = 60, - .baseDefense = 40, - .baseSpeed = 70, - .baseSpAttack = 85, - .baseSpDefense = 40, - .types = MON_TYPES(TYPE_NORMAL, TYPE_GHOST), - .categoryName = _("Spiteful Fox"), .description = COMPOUND_STRING( "Derives power from resentment,\n" "which rises as energy atop its head and\n" "takes on the forms of foes. In this\n" "way, Zorua vents lingering malice."), + .pokemonScale = 365, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZoruaHisuian, .frontPicSize = MON_COORDS_SIZE(48, 64), + FOOTPRINT(Zorua) + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_ZoruaHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5155,6 +5155,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_ZOROARK_HISUIAN] = { + .baseHP = 55, + .baseAttack = 100, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 125, + .baseSpDefense = 60, + .types = MON_TYPES(TYPE_NORMAL, TYPE_GHOST), .catchRate = 45, .expYield = 179, .evYield_SpAttack = 2, @@ -5168,29 +5175,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .speciesName = _("Zoroark"), .cryId = CRY_ZOROARK, .natDexNum = NATIONAL_DEX_ZOROARK, - .height = 16, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - FOOTPRINT(Zoroark) - .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, - .baseHP = 55, - .baseAttack = 100, - .baseDefense = 60, - .baseSpeed = 110, - .baseSpAttack = 125, - .baseSpDefense = 60, - .types = MON_TYPES(TYPE_NORMAL, TYPE_GHOST), .categoryName = _("Baneful Fox"), + .height = 16, .weight = 730, .description = COMPOUND_STRING( "Heedless of its own safety,\n" "Zoroark attacks its nemeses with a bitter\n" "energy so intense, it lacerates\n" "Zoroark's own body."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_ZoroarkHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Zoroark) + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZoroarkHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5930,12 +5930,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Deerling"), .cryId = CRY_DEERLING, .natDexNum = NATIONAL_DEX_DEERLING, .categoryName = _("Season"), .height = 6, .weight = 195, + .description = COMPOUND_STRING( + "Deerling have different scents\n" + "depending on the season. In early\n" + "spring, these Pokémon give off a\n" + "delicate, sweet, and calming scent."), .pokemonScale = 422, .pokemonOffset = 14, .trainerScale = 256, @@ -5953,12 +5959,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, - .bodyColor = BODY_COLOR_PINK, - .description = COMPOUND_STRING( - "Deerling have different scents\n" - "depending on the season. In early\n" - "spring, these Pokémon give off a\n" - "delicate, sweet, and calming scent."), .palette = gMonPalette_DeerlingSpring, .shinyPalette = gMonShinyPalette_DeerlingSpring, .iconSprite = gMonIcon_DeerlingSpring, @@ -5984,12 +5984,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Deerling"), .cryId = CRY_DEERLING, .natDexNum = NATIONAL_DEX_DEERLING, .categoryName = _("Season"), .height = 6, .weight = 195, + .description = COMPOUND_STRING( + "To prevent Deerling from entering\n" + "their fields, many farmers will have\n" + "several Lycanroc stand guard, as\n" + "they are its natural enemy."), .pokemonScale = 422, .pokemonOffset = 14, .trainerScale = 256, @@ -6007,12 +6013,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, - .bodyColor = BODY_COLOR_GREEN, - .description = COMPOUND_STRING( - "To prevent Deerling from entering\n" - "their fields, many farmers will have\n" - "several Lycanroc stand guard, as\n" - "they are its natural enemy."), .palette = gMonPalette_DeerlingSummer, .shinyPalette = gMonShinyPalette_DeerlingSummer, .iconSprite = gMonIcon_DeerlingSummer, @@ -6038,12 +6038,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Deerling"), .cryId = CRY_DEERLING, .natDexNum = NATIONAL_DEX_DEERLING, .categoryName = _("Season"), .height = 6, .weight = 195, + .description = COMPOUND_STRING( + "Deerling have different scents\n" + "depending on the season. In this form,\n" + "Deerling have a softly sweet scent\n" + "that lingers in the nose."), .pokemonScale = 422, .pokemonOffset = 14, .trainerScale = 256, @@ -6061,12 +6067,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, - .bodyColor = BODY_COLOR_RED, - .description = COMPOUND_STRING( - "Deerling have different scents\n" - "depending on the season. In this form,\n" - "Deerling have a softly sweet scent\n" - "that lingers in the nose."), .palette = gMonPalette_DeerlingAutumn, .shinyPalette = gMonShinyPalette_DeerlingAutumn, .iconSprite = gMonIcon_DeerlingAutumn, @@ -6092,12 +6092,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), .abilities = { ABILITY_CHLOROPHYLL, ABILITY_SAP_SIPPER, ABILITY_SERENE_GRACE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Deerling"), .cryId = CRY_DEERLING, .natDexNum = NATIONAL_DEX_DEERLING, .categoryName = _("Season"), .height = 6, .weight = 195, + .description = COMPOUND_STRING( + "Deerling's scent changes with the\n" + "seasons, but when the Pokémon is in\n" + "its Winter Form, it has hardly any\n" + "scent at all."), .pokemonScale = 422, .pokemonOffset = 14, .trainerScale = 256, @@ -6115,12 +6121,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, - .bodyColor = BODY_COLOR_BROWN, - .description = COMPOUND_STRING( - "Deerling's scent changes with the\n" - "seasons, but when the Pokémon is in\n" - "its Winter Form, it has hardly any\n" - "scent at all."), .palette = gMonPalette_DeerlingWinter, .shinyPalette = gMonShinyPalette_DeerlingWinter, .iconSprite = gMonIcon_DeerlingWinter, @@ -6153,28 +6153,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Season"), .height = 19, .weight = 925, + .description = COMPOUND_STRING( + "Some people call Sawsbuck the harbingers\n" + "of spring because the plants growing on\n" + "its horns change according to the season.\n" + "The leader possesses magnificent horns."), .pokemonScale = 256, .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, + .frontPic = gMonFrontPic_SawsbuckSpring, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sawsbuck, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPic = gMonBackPic_SawsbuckSpring, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, - .description = COMPOUND_STRING( - "Some people call Sawsbuck the harbingers\n" - "of spring because the plants growing on\n" - "its horns change according to the season.\n" - "The leader possesses magnificent horns."), - .frontPic = gMonFrontPic_SawsbuckSpring, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .backPic = gMonBackPic_SawsbuckSpring, - .backPicSize = MON_COORDS_SIZE(48, 64), .palette = gMonPalette_SawsbuckSpring, .shinyPalette = gMonShinyPalette_SawsbuckSpring, .iconSprite = gMonIcon_SawsbuckSpring, @@ -6206,28 +6206,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Season"), .height = 19, .weight = 925, + .description = COMPOUND_STRING( + "The thicker and larger the\n" + "branches and leaves on its antlers, the\n" + "more majestic the Sawsbuck is thought\n" + "to be."), .pokemonScale = 256, .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, + .frontPic = gMonFrontPic_SawsbuckSummer, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sawsbuck, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPic = gMonBackPic_SawsbuckSummer, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, - .description = COMPOUND_STRING( - "The thicker and larger the\n" - "branches and leaves on its antlers, the\n" - "more majestic the Sawsbuck is thought\n" - "to be."), - .frontPic = gMonFrontPic_SawsbuckSummer, - .frontPicSize = MON_COORDS_SIZE(64, 64), - .backPic = gMonBackPic_SawsbuckSummer, - .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_SawsbuckSummer, .shinyPalette = gMonShinyPalette_SawsbuckSummer, .iconSprite = gMonIcon_SawsbuckSummer, @@ -6259,28 +6259,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Season"), .height = 19, .weight = 925, + .description = COMPOUND_STRING( + "Sawsbuck in their Autumn Form are\n" + "known for having very short\n" + "tempers. The males fight each other\n" + "incessantly."), .pokemonScale = 256, .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, + .frontPic = gMonFrontPic_SawsbuckAutumn, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sawsbuck, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPic = gMonBackPic_SawsbuckAutumn, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, - .description = COMPOUND_STRING( - "Sawsbuck in their Autumn Form are\n" - "known for having very short\n" - "tempers. The males fight each other\n" - "incessantly."), - .frontPic = gMonFrontPic_SawsbuckAutumn, - .frontPicSize = MON_COORDS_SIZE(64, 64), - .backPic = gMonBackPic_SawsbuckAutumn, - .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_SawsbuckAutumn, .shinyPalette = gMonShinyPalette_SawsbuckAutumn, .iconSprite = gMonIcon_SawsbuckAutumn, @@ -6312,28 +6312,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .categoryName = _("Season"), .height = 19, .weight = 925, + .description = COMPOUND_STRING( + "Though there are many enthusiasts\n" + "for Sawsbuck as a species, this\n" + "seasonal form in particular is not\n" + "very popular."), .pokemonScale = 256, .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, + .frontPic = gMonFrontPic_SawsbuckWinter, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sawsbuck, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .backPic = gMonBackPic_SawsbuckWinter, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, FOOTPRINT(Sawsbuck) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, - .description = COMPOUND_STRING( - "Though there are many enthusiasts\n" - "for Sawsbuck as a species, this\n" - "seasonal form in particular is not\n" - "very popular."), - .frontPic = gMonFrontPic_SawsbuckWinter, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .backPic = gMonBackPic_SawsbuckWinter, - .backPicSize = MON_COORDS_SIZE(48, 64), .palette = gMonPalette_SawsbuckWinter, .shinyPalette = gMonShinyPalette_SawsbuckWinter, .iconSprite = gMonIcon_SawsbuckWinter, @@ -8060,43 +8060,43 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_STUNFISK [SPECIES_STUNFISK] = { + .baseHP = 109, + .baseAttack = 66, + .baseDefense = 84, + .baseSpeed = 32, + .baseSpAttack = 81, + .baseSpDefense = 99, + .types = MON_TYPES(TYPE_GROUND, TYPE_ELECTRIC), .catchRate = 75, .expYield = 165, .evYield_HP = 2, + .itemRare = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, + .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_STATIC, ABILITY_LIMBER, ABILITY_SAND_VEIL }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Stunfisk"), .cryId = CRY_STUNFISK, .natDexNum = NATIONAL_DEX_STUNFISK, .categoryName = _("Trap"), .height = 7, - .pokemonScale = 365, - .pokemonOffset = 14, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Stunfisk) - .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, - .baseHP = 109, - .baseAttack = 66, - .baseDefense = 84, - .baseSpeed = 32, - .baseSpAttack = 81, - .baseSpDefense = 99, - .types = MON_TYPES(TYPE_GROUND, TYPE_ELECTRIC), - .itemRare = ITEM_SOFT_SAND, - .friendship = 70, - .abilities = { ABILITY_STATIC, ABILITY_LIMBER, ABILITY_SAND_VEIL }, - .bodyColor = BODY_COLOR_BROWN, .weight = 110, .description = COMPOUND_STRING( "It conceals itself in the mud of the\n" "seashore. Then it waits. When prey touch\n" "it, it delivers a jolt of electricity.\n" "It smiles when transmitting electricity."), + .pokemonScale = 365, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Stunfisk, .frontPicSize = MON_COORDS_SIZE(56, 48), + FOOTPRINT(Stunfisk) + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .frontPicYOffset = 14, .frontAnimFrames = sAnims_Stunfisk, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8115,42 +8115,42 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_GALARIAN_FORMS [SPECIES_STUNFISK_GALARIAN] = { + .baseHP = 109, + .baseAttack = 81, + .baseDefense = 99, + .baseSpeed = 32, + .baseSpAttack = 66, + .baseSpDefense = 84, + .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), .catchRate = 75, .expYield = 165, .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_MIMICRY, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Stunfisk"), .cryId = CRY_STUNFISK, .natDexNum = NATIONAL_DEX_STUNFISK, .categoryName = _("Trap"), .height = 7, - .pokemonScale = 365, - .pokemonOffset = 14, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Stunfisk) - .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, - .baseHP = 109, - .baseAttack = 81, - .baseDefense = 99, - .baseSpeed = 32, - .baseSpAttack = 66, - .baseSpDefense = 84, - .types = MON_TYPES(TYPE_GROUND, TYPE_STEEL), - .friendship = STANDARD_FRIENDSHIP, - .abilities = { ABILITY_MIMICRY, ABILITY_NONE }, - .bodyColor = BODY_COLOR_GREEN, .weight = 205, .description = COMPOUND_STRING( "Its conspicuous lips lure prey in\n" "as it lies in wait in the mud. When\n" "prey gets close, Stunfisk clamps its\n" "jagged steel fins down on them."), + .pokemonScale = 365, + .pokemonOffset = 14, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_StunfiskGalarian, .frontPicSize = MON_COORDS_SIZE(48, 40), + FOOTPRINT(Stunfisk) + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .frontPicYOffset = 14, .frontAnimFrames = sAnims_StunfiskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8715,18 +8715,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_BRAVIARY] = { - .catchRate = 60, - .expYield = 179, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), - .speciesName = _("Braviary"), - .cryId = CRY_BRAVIARY, - .natDexNum = NATIONAL_DEX_BRAVIARY, - FOOTPRINT(Braviary) - .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 100, .baseAttack = 123, .baseDefense = 75, @@ -8734,9 +8722,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpAttack = 57, .baseSpDefense = 75, .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), + .catchRate = 60, + .expYield = 179, .evYield_Attack = 2, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_DEFIANT }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Braviary"), + .cryId = CRY_BRAVIARY, + .natDexNum = NATIONAL_DEX_BRAVIARY, .categoryName = _("Valiant"), .height = 15, .weight = 410, @@ -8751,6 +8749,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Braviary, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Braviary) + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Braviary, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8770,18 +8770,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_HISUIAN_FORMS [SPECIES_BRAVIARY_HISUIAN] = { - .catchRate = 60, - .expYield = 179, - .genderRatio = MON_MALE, - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), - .speciesName = _("Braviary"), - .cryId = CRY_BRAVIARY, - .natDexNum = NATIONAL_DEX_BRAVIARY, - FOOTPRINT(Braviary) - .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .baseHP = 110, .baseAttack = 83, .baseDefense = 70, @@ -8789,9 +8777,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpAttack = 112, .baseSpDefense = 70, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), + .catchRate = 60, + .expYield = 179, .evYield_SpAttack = 2, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_TINTED_LENS }, .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Braviary"), + .cryId = CRY_BRAVIARY, + .natDexNum = NATIONAL_DEX_BRAVIARY, .categoryName = _("Battle Cry"), .height = 17, .weight = 434, @@ -8799,6 +8797,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "Screaming a bloodcurdling battle\n" "cry, this huge and ferocious bird\n" "Pokémon goes out on the hunt."), + FOOTPRINT(Braviary) + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .pokemonScale = 268, .pokemonOffset = 2, .trainerScale = 271, @@ -9330,7 +9330,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Cobalion"), .cryId = CRY_COBALION, .natDexNum = NATIONAL_DEX_COBALION, @@ -9353,7 +9352,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Cobalion, .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 6, + .backPicYOffset = 6, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Cobalion, .shinyPalette = gMonShinyPalette_Cobalion, @@ -9385,7 +9385,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Terrakion"), .cryId = CRY_TERRAKION, .natDexNum = NATIONAL_DEX_TERRAKION, @@ -9408,7 +9407,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Terrakion, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 8, + .backPicYOffset = 8, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Terrakion, .shinyPalette = gMonShinyPalette_Terrakion, @@ -9440,7 +9440,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isLegendary = TRUE, .speciesName = _("Virizion"), .cryId = CRY_VIRIZION, .natDexNum = NATIONAL_DEX_VIRIZION, @@ -9463,7 +9462,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Virizion, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 8, + .backPicYOffset = 8, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Virizion, .shinyPalette = gMonShinyPalette_Virizion, @@ -9478,6 +9478,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_TORNADUS [SPECIES_TORNADUS_INCARNATE] = { + .baseHP = 79, + .baseAttack = 115, + .baseDefense = 70, + .baseSpeed = 111, + .baseSpAttack = 125, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, @@ -9487,26 +9493,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT }, .bodyColor = BODY_COLOR_GREEN, - .isLegendary = TRUE, .speciesName = _("Tornadus"), + .cryId = CRY_TORNADUS_INCARNATE, .natDexNum = NATIONAL_DEX_TORNADUS, .categoryName = _("Cyclone"), - .weight = 630, - FOOTPRINT(Tornadus) - .levelUpLearnset = sTornadusLevelUpLearnset, - .teachableLearnset = sTornadusTeachableLearnset, - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, - .formChangeTable = sTornadusFormChangeTable, - .baseHP = 79, - .baseAttack = 115, - .baseDefense = 70, - .baseSpeed = 111, - .baseSpAttack = 125, - .baseSpDefense = 80, - .abilities = { ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT }, - .cryId = CRY_TORNADUS_INCARNATE, .height = 15, + .weight = 630, .description = COMPOUND_STRING( "Tornadus expels massive energy from\n" "its tail, causing severe storms.\n" @@ -9524,7 +9518,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_TornadusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isLegendary = TRUE, + FOOTPRINT(Tornadus) + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, + .formChangeTable = sTornadusFormChangeTable, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_TornadusIncarnate, .shinyPalette = gMonShinyPalette_TornadusIncarnate, @@ -9534,6 +9534,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_TORNADUS_THERIAN] = { + .baseHP = 79, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 121, + .baseSpAttack = 110, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, @@ -9543,26 +9549,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_REGENERATOR, ABILITY_NONE, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_GREEN, - .isLegendary = TRUE, .speciesName = _("Tornadus"), + .cryId = CRY_TORNADUS_THERIAN, .natDexNum = NATIONAL_DEX_TORNADUS, .categoryName = _("Cyclone"), - .weight = 630, - FOOTPRINT(Tornadus) - .levelUpLearnset = sTornadusLevelUpLearnset, - .teachableLearnset = sTornadusTeachableLearnset, - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, - .formChangeTable = sTornadusFormChangeTable, - .baseHP = 79, - .baseAttack = 100, - .baseDefense = 80, - .baseSpeed = 121, - .baseSpAttack = 110, - .baseSpDefense = 90, - .abilities = { ABILITY_REGENERATOR, ABILITY_NONE, ABILITY_REGENERATOR }, - .cryId = CRY_TORNADUS_THERIAN, .height = 14, + .weight = 630, .description = COMPOUND_STRING( "An example of what is known as a\n" "“form change”. Tornadus has been\n" @@ -9579,7 +9573,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_TornadusTherian, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isLegendary = TRUE, + FOOTPRINT(Tornadus) + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, + .formChangeTable = sTornadusFormChangeTable, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_TornadusTherian, .shinyPalette = gMonShinyPalette_TornadusTherian, @@ -9591,35 +9591,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_THUNDURUS [SPECIES_THUNDURUS_INCARNATE] = { + .baseHP = 79, + .baseAttack = 115, + .baseDefense = 70, + .baseSpeed = 111, + .baseSpAttack = 125, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_Attack = 3, .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Thundurus"), + .cryId = CRY_THUNDURUS_INCARNATE, .natDexNum = NATIONAL_DEX_THUNDURUS, .categoryName = _("Bolt Strike"), - .weight = 610, - FOOTPRINT(Thundurus) - .levelUpLearnset = sThundurusLevelUpLearnset, - .teachableLearnset = sThundurusTeachableLearnset, - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, - .formChangeTable = sThundurusFormChangeTable, - .baseHP = 79, - .baseAttack = 115, - .baseDefense = 70, - .baseSpeed = 111, - .baseSpAttack = 125, - .baseSpDefense = 80, - .evYield_Attack = 3, - .abilities = { ABILITY_PRANKSTER, ABILITY_NONE, ABILITY_DEFIANT }, - .cryId = CRY_THUNDURUS_INCARNATE, .height = 15, + .weight = 610, .description = COMPOUND_STRING( "The spikes on its tail discharge immense\n" "bolts of lightning. Countless charred\n" @@ -9637,7 +9631,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isLegendary = TRUE, + FOOTPRINT(Thundurus) + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, + .formChangeTable = sThundurusFormChangeTable, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_ThundurusIncarnate, .shinyPalette = gMonShinyPalette_ThundurusIncarnate, @@ -9647,35 +9647,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_THUNDURUS_THERIAN] = { + .baseHP = 79, + .baseAttack = 105, + .baseDefense = 70, + .baseSpeed = 101, + .baseSpAttack = 145, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 290 : 261, + .evYield_SpAttack = 3, .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_VOLT_ABSORB, ABILITY_NONE, ABILITY_VOLT_ABSORB }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Thundurus"), + .cryId = CRY_THUNDURUS_THERIAN, .natDexNum = NATIONAL_DEX_THUNDURUS, .categoryName = _("Bolt Strike"), - .weight = 610, - FOOTPRINT(Thundurus) - .levelUpLearnset = sThundurusLevelUpLearnset, - .teachableLearnset = sThundurusTeachableLearnset, - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, - .formChangeTable = sThundurusFormChangeTable, - .baseHP = 79, - .baseAttack = 105, - .baseDefense = 70, - .baseSpeed = 101, - .baseSpAttack = 145, - .baseSpDefense = 80, - .evYield_SpAttack = 3, - .abilities = { ABILITY_VOLT_ABSORB, ABILITY_NONE, ABILITY_VOLT_ABSORB }, - .cryId = CRY_THUNDURUS_THERIAN, .height = 30, + .weight = 610, .description = COMPOUND_STRING( "It pulverizes foes into\n" "nothingness with showers of devastatingly\n" @@ -9693,7 +9687,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusTherian, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 5, + .backPicYOffset = 5, + .isLegendary = TRUE, + FOOTPRINT(Thundurus) + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, + .formChangeTable = sThundurusFormChangeTable, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_ThundurusTherian, .shinyPalette = gMonShinyPalette_ThundurusTherian, @@ -9722,7 +9722,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TURBOBLAZE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Reshiram"), .cryId = CRY_RESHIRAM, .natDexNum = NATIONAL_DEX_RESHIRAM, @@ -9745,7 +9744,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Reshiram, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 7, + .backPicYOffset = 7, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Reshiram, .shinyPalette = gMonShinyPalette_Reshiram, @@ -9777,7 +9777,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TERAVOLT, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, - .isLegendary = TRUE, .speciesName = _("Zekrom"), .cryId = CRY_ZEKROM, .natDexNum = NATIONAL_DEX_ZEKROM, @@ -9800,7 +9799,8 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Zekrom, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, .palette = gMonPalette_Zekrom, .shinyPalette = gMonShinyPalette_Zekrom, @@ -9815,35 +9815,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_LANDORUS [SPECIES_LANDORUS_INCARNATE] = { + .baseHP = 89, + .baseAttack = 125, + .baseDefense = 90, + .baseSpeed = 101, + .baseSpAttack = 115, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_SpAttack = 3, .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SAND_FORCE, ABILITY_NONE, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Landorus"), + .cryId = CRY_LANDORUS_INCARNATE, .natDexNum = NATIONAL_DEX_LANDORUS, .categoryName = _("Abundance"), - .weight = 680, - FOOTPRINT(Landorus) - .levelUpLearnset = sLandorusLevelUpLearnset, - .teachableLearnset = sLandorusTeachableLearnset, - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, - .formChangeTable = sLandorusFormChangeTable, - .baseHP = 89, - .baseAttack = 125, - .baseDefense = 90, - .baseSpeed = 101, - .baseSpAttack = 115, - .baseSpDefense = 80, - .evYield_SpAttack = 3, - .abilities = { ABILITY_SAND_FORCE, ABILITY_NONE, ABILITY_SHEER_FORCE }, - .cryId = CRY_LANDORUS_INCARNATE, .height = 15, + .weight = 680, .description = COMPOUND_STRING( "The energy that comes pouring from its tail\n" "increases the nutrition in the soil, making\n" @@ -9861,7 +9855,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_LandorusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isLegendary = TRUE, + FOOTPRINT(Landorus) + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, + .formChangeTable = sLandorusFormChangeTable, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LandorusIncarnate, .shinyPalette = gMonShinyPalette_LandorusIncarnate, @@ -9871,35 +9871,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_LANDORUS_THERIAN] = { + .baseHP = 89, + .baseAttack = 145, + .baseDefense = 90, + .baseSpeed = 91, + .baseSpAttack = 105, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_GROUND, TYPE_FLYING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Attack = 3, .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Landorus"), + .cryId = CRY_LANDORUS_THERIAN, .natDexNum = NATIONAL_DEX_LANDORUS, .categoryName = _("Abundance"), - .weight = 680, - FOOTPRINT(Landorus) - .levelUpLearnset = sLandorusLevelUpLearnset, - .teachableLearnset = sLandorusTeachableLearnset, - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, - .formChangeTable = sLandorusFormChangeTable, - .baseHP = 89, - .baseAttack = 145, - .baseDefense = 90, - .baseSpeed = 91, - .baseSpAttack = 105, - .baseSpDefense = 80, - .evYield_Attack = 3, - .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE }, - .cryId = CRY_LANDORUS_THERIAN, .height = 13, + .weight = 680, .description = COMPOUND_STRING( "Landorus soars through the sky in\n" "this form, bestowing plentiful\n" @@ -9916,7 +9910,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_CIRCULAR_VIBRATE, .backPic = gMonBackPic_LandorusTherian, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 7, + .backPicYOffset = 7, + .isLegendary = TRUE, + FOOTPRINT(Landorus) + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, + .formChangeTable = sLandorusFormChangeTable, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_LandorusTherian, .shinyPalette = gMonShinyPalette_LandorusTherian, @@ -9928,35 +9928,32 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_KYUREM [SPECIES_KYUREM] = { - .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), - .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .bodyColor = BODY_COLOR_GRAY, - .noFlip = TRUE, - .speciesName = _("Kyurem"), - .natDexNum = NATIONAL_DEX_KYUREM, - .categoryName = _("Boundary"), - .weight = 3250, - FOOTPRINT(Kyurem) - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 125, .baseAttack = 130, .baseDefense = 90, .baseSpeed = 95, .baseSpAttack = 130, .baseSpDefense = 90, + .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), + .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 330 : 297, .evYield_HP = 1, .evYield_Attack = 1, .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), .cryId = CRY_KYUREM, + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), .height = 30, + .weight = 3250, .description = COMPOUND_STRING( "This legendary ice Pokémon waits for a\n" "hero to fill in the missing parts of its\n" @@ -9968,6 +9965,9 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Kyurem, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Kyurem) + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 6, .frontAnimFrames = sAnims_Kyurem, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9986,6 +9986,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FUSION_FORMS [SPECIES_KYUREM_WHITE] = { + .baseHP = 125, + .baseAttack = 120, + .baseDefense = 90, + .baseSpeed = 95, + .baseSpAttack = 170, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), .catchRate = 3, .genderRatio = MON_GENDERLESS, @@ -10002,12 +10008,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Kyurem) .formSpeciesIdTable = sKyuremFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 125, - .baseAttack = 120, - .baseDefense = 90, - .baseSpeed = 95, - .baseSpAttack = 170, - .baseSpDefense = 100, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 350, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -10048,6 +10048,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_KYUREM_BLACK] = { + .baseHP = 125, + .baseAttack = 170, + .baseDefense = 100, + .baseSpeed = 95, + .baseSpAttack = 120, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), .catchRate = 3, .genderRatio = MON_GENDERLESS, @@ -10064,12 +10070,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = FOOTPRINT(Kyurem) .formSpeciesIdTable = sKyuremFormSpeciesIdTable, .isLegendary = TRUE, - .baseHP = 125, - .baseAttack = 170, - .baseDefense = 100, - .baseSpeed = 95, - .baseSpAttack = 120, - .baseSpDefense = 90, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 350, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -10130,27 +10130,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isMythical = TRUE, .speciesName = _("Keldeo"), .cryId = CRY_KELDEO, .natDexNum = NATIONAL_DEX_KELDEO, .categoryName = _("Colt"), .height = 14, .weight = 485, - .pokemonScale = 265, - .pokemonOffset = 2, - .trainerScale = 262, - .trainerOffset = 0, - FOOTPRINT(Keldeo) - .levelUpLearnset = sKeldeoLevelUpLearnset, - .teachableLearnset = sKeldeoTeachableLearnset, - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, - .formChangeTable = sKeldeoFormChangeTable, .description = COMPOUND_STRING( "When it is resolute, its body fills with\n" "power and it becomes swifter. It crosses\n" "the world, running over the surfaces of\n" "oceans and rivers."), + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, .frontPic = gMonFrontPic_KeldeoOrdinary, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, @@ -10158,7 +10152,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KeldeoOrdinary, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 4, + .backPicYOffset = 4, + .isMythical = TRUE, + FOOTPRINT(Keldeo) + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, + .formChangeTable = sKeldeoFormChangeTable, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_KeldeoOrdinary, .shinyPalette = gMonShinyPalette_KeldeoOrdinary, @@ -10185,28 +10185,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_JUSTIFIED, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isMythical = TRUE, + .noFlip = TRUE, .speciesName = _("Keldeo"), .cryId = CRY_KELDEO, .natDexNum = NATIONAL_DEX_KELDEO, .categoryName = _("Colt"), .height = 14, .weight = 485, - .pokemonScale = 265, - .pokemonOffset = 2, - .trainerScale = 262, - .trainerOffset = 0, - FOOTPRINT(Keldeo) - .levelUpLearnset = sKeldeoLevelUpLearnset, - .teachableLearnset = sKeldeoTeachableLearnset, - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, - .formChangeTable = sKeldeoFormChangeTable, - .noFlip = TRUE, .description = COMPOUND_STRING( "The power that lay hidden in its\n" "body now covers its horn, turning it\n" "into a sword that can slice through\n" "anything."), + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, .frontPic = gMonFrontPic_KeldeoResolute, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -10214,7 +10208,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_KeldeoResolute, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, + .isMythical = TRUE, + FOOTPRINT(Keldeo) + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, + .formChangeTable = sKeldeoFormChangeTable, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_KeldeoResolute, .shinyPalette = gMonShinyPalette_KeldeoResolute, @@ -10226,9 +10226,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_MELOETTA [SPECIES_MELOETTA_ARIA] = { + .baseHP = 100, + .baseAttack = 77, + .baseDefense = 77, + .baseSpeed = 90, + .baseSpAttack = 128, + .baseSpDefense = 128, + .types = MON_TYPES(TYPE_NORMAL, TYPE_PSYCHIC), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, .itemCommon = ITEM_STAR_PIECE, .itemRare = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, @@ -10239,36 +10248,21 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, - .isMythical = TRUE, .speciesName = _("Meloetta"), .cryId = CRY_MELOETTA, .natDexNum = NATIONAL_DEX_MELOETTA, .categoryName = _("Melody"), .height = 6, .weight = 65, - .pokemonScale = 422, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Meloetta) - .levelUpLearnset = sMeloettaLevelUpLearnset, - .teachableLearnset = sMeloettaTeachableLearnset, - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, - .formChangeTable = sMeloettaFormChangeTable, - .baseHP = 100, - .baseAttack = 77, - .baseDefense = 77, - .baseSpeed = 90, - .baseSpAttack = 128, - .baseSpDefense = 128, - .types = MON_TYPES(TYPE_NORMAL, TYPE_PSYCHIC), - .evYield_SpAttack = 1, - .evYield_SpDefense = 1, .description = COMPOUND_STRING( "The melodies sung by Meloetta have the\n" "power to make Pokémon that hear them\n" "happy or sad. Many famous songs have been\n" "inspired by the tunes that Meloetta plays."), + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MeloettaAria, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, @@ -10277,7 +10271,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 8, .backPic = gMonBackPic_MeloettaAria, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 7, + .backPicYOffset = 7, + .isMythical = TRUE, + FOOTPRINT(Meloetta) + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, + .formChangeTable = sMeloettaFormChangeTable, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_MeloettaAria, .shinyPalette = gMonShinyPalette_MeloettaAria, @@ -10287,8 +10287,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = [SPECIES_MELOETTA_PIROUETTE] = { + .baseHP = 100, + .baseAttack = 128, + .baseDefense = 90, + .baseSpeed = 128, + .baseSpAttack = 77, + .baseSpDefense = 77, + .types = MON_TYPES(TYPE_NORMAL, TYPE_FIGHTING), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_Attack = 1, + .evYield_Defense = 1, .evYield_Speed = 1, .itemCommon = ITEM_STAR_PIECE, .itemRare = ITEM_STAR_PIECE, @@ -10300,35 +10309,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, - .isMythical = TRUE, .speciesName = _("Meloetta"), .cryId = CRY_MELOETTA, .natDexNum = NATIONAL_DEX_MELOETTA, .categoryName = _("Melody"), .height = 6, .weight = 65, - .pokemonScale = 422, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Meloetta) - .levelUpLearnset = sMeloettaLevelUpLearnset, - .teachableLearnset = sMeloettaTeachableLearnset, - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, - .formChangeTable = sMeloettaFormChangeTable, - .baseHP = 100, - .baseAttack = 128, - .baseDefense = 90, - .baseSpeed = 128, - .baseSpAttack = 77, - .baseSpDefense = 77, - .types = MON_TYPES(TYPE_NORMAL, TYPE_FIGHTING), - .evYield_Attack = 1, - .evYield_Defense = 1, .description = COMPOUND_STRING( "Meloetta's melodies are sung with\n" "a special vocalization method that can\n" "control the feelings of those who hear it."), + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MeloettaPirouette, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 2, @@ -10337,7 +10331,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 5, .backPic = gMonBackPic_MeloettaPirouette, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 4, + .backPicYOffset = 4, + .isMythical = TRUE, + FOOTPRINT(Meloetta) + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, + .formChangeTable = sMeloettaFormChangeTable, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_MeloettaPirouette, .shinyPalette = gMonShinyPalette_MeloettaPirouette, diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index ff48866e10c6..e0a278d723eb 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -432,12 +432,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA] = { + .baseHP = 72, + .baseAttack = 95, + .baseDefense = 67, + .baseSpeed = 122, + .baseSpAttack = 103, + .baseSpDefense = 71, .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .evYield_Speed = 3, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN }, .bodyColor = BODY_COLOR_BLUE, .noFlip = TRUE, .speciesName = _("Greninja"), @@ -454,13 +464,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .baseHP = 72, - .baseAttack = 95, - .baseDefense = 67, - .baseSpeed = 122, - .baseSpAttack = 103, - .baseSpDefense = 71, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .description = gGreninjaPokedexText, .frontPic = gMonFrontPic_Greninja, .frontPicSize = MON_COORDS_SIZE(64, 56), @@ -473,21 +476,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, - .genderRatio = PERCENT_FEMALE(12.5), - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1), - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_PROTEAN }, .frontAnimId = ANIM_V_STRETCH, .backAnimId = BACK_ANIM_JOLT_RIGHT, }, [SPECIES_GRENINJA_BATTLE_BOND] = { + .baseHP = 72, + .baseAttack = 95, + .baseDefense = 67, + .baseSpeed = 122, + .baseSpAttack = 103, + .baseSpDefense = 71, .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 45, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .evYield_Speed = 3, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .noFlip = TRUE, .speciesName = _("Greninja"), @@ -504,13 +514,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .baseHP = 72, - .baseAttack = 95, - .baseDefense = 67, - .baseSpeed = 122, - .baseSpAttack = 103, - .baseSpDefense = 71, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .description = gGreninjaPokedexText, .frontPic = gMonFrontPic_Greninja, .frontPicSize = MON_COORDS_SIZE(64, 56), @@ -523,9 +526,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, .frontAnimId = ANIM_V_STRETCH, .backAnimId = BACK_ANIM_JOLT_RIGHT, .formChangeTable = sGreninjaBattleBondFormChangeTable, @@ -533,12 +533,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GRENINJA_ASH] = { + .baseHP = 72, + .baseAttack = 145, + .baseDefense = 67, + .baseSpeed = 132, + .baseSpAttack = 153, + .baseSpDefense = 71, .types = MON_TYPES(TYPE_WATER, TYPE_DARK), .catchRate = 45, + .expYield = 288, .evYield_Speed = 3, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .noFlip = TRUE, .speciesName = _("Greninja"), @@ -547,31 +557,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .categoryName = _("Ninja"), .height = 15, .weight = 400, + .description = COMPOUND_STRING( + "It appears and vanishes with a ninja's\n" + "grace. It toys with its enemies using swift\n" + "movements, while slicing them with throwing\n" + "stars made of compressed water."), .pokemonScale = 268, .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, + .frontPic = gMonFrontPic_GreninjaAsh, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Greninja) .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .baseHP = 72, - .baseAttack = 145, - .baseDefense = 67, - .baseSpeed = 132, - .baseSpAttack = 153, - .baseSpDefense = 71, - .expYield = 288, - .genderRatio = MON_MALE, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_BATTLE_BOND, ABILITY_NONE, ABILITY_NONE }, - .description = COMPOUND_STRING( - "It appears and vanishes with a ninja's\n" - "grace. It toys with its enemies using swift\n" - "movements, while slicing them with throwing\n" - "stars made of compressed water."), - .frontPic = gMonFrontPic_GreninjaAsh, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GreninjaAsh, .backPic = gMonBackPic_GreninjaAsh, @@ -1502,13 +1502,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = }, [SPECIES_FLOETTE_ETERNAL_FLOWER] = { - FLOETTE_MISC_INFO(Eternal, ETERNAL, 0), .baseHP = 74, .baseAttack = 65, .baseDefense = 67, .baseSpeed = 92, .baseSpAttack = 125, .baseSpDefense = 128, + FLOETTE_MISC_INFO(Eternal, ETERNAL, 0), .expYield = 243, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .description = COMPOUND_STRING( @@ -1966,39 +1966,39 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .catchRate = 75, .expYield = 163, .evYield_Speed = 2, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_PRANKSTER }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Meowstic"), .cryId = CRY_MEOWSTIC, .natDexNum = NATIONAL_DEX_MEOWSTIC, .categoryName = _("Constraint"), .height = 6, .weight = 85, - .pokemonScale = 422, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - .frontAnimFrames = sAnims_Meowstic, - .frontAnimId = ANIM_GROW_VIBRATE, - .backPicYOffset = 9, - .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - FOOTPRINT(Meowstic) - .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, - .genderRatio = MON_MALE, - .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_PRANKSTER }, - .bodyColor = BODY_COLOR_BLUE, .description = COMPOUND_STRING( "The defensive instinct of the\n" "males is strong. It's when they're\n" "protecting themselves or their partners\n" "that they unleash their full power."), + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MeowsticMale, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, + .frontAnimFrames = sAnims_Meowstic, + .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_MeowsticMale, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, + FOOTPRINT(Meowstic) + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .palette = gMonPalette_MeowsticMale, .shinyPalette = gMonShinyPalette_MeowsticMale, .iconSprite = gMonIcon_MeowsticMale, @@ -2019,39 +2019,39 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .catchRate = 75, .expYield = 163, .evYield_Speed = 2, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_COMPETITIVE }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Meowstic"), .cryId = CRY_MEOWSTIC, .natDexNum = NATIONAL_DEX_MEOWSTIC, .categoryName = _("Constraint"), .height = 6, .weight = 85, - .pokemonScale = 422, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - .frontAnimFrames = sAnims_Meowstic, - .frontAnimId = ANIM_GROW_VIBRATE, - .backPicYOffset = 9, - .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - FOOTPRINT(Meowstic) - .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, - .genderRatio = MON_FEMALE, - .abilities = { ABILITY_KEEN_EYE, ABILITY_INFILTRATOR, ABILITY_COMPETITIVE }, - .bodyColor = BODY_COLOR_WHITE, .description = COMPOUND_STRING( "Females are a bit more selfish and\n" "aggressive than males. If they\n" "don't get what they want, they will\n" "torment you with their psychic abilities."), + .pokemonScale = 422, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MeowsticFemale, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, + .frontAnimFrames = sAnims_Meowstic, + .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_MeowsticFemale, .backPicSize = MON_COORDS_SIZE(48, 64), + .backPicYOffset = 9, + .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, + FOOTPRINT(Meowstic) + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .palette = gMonPalette_MeowsticFemale, .shinyPalette = gMonShinyPalette_MeowsticFemale, .iconSprite = gMonIcon_MeowsticFemale, @@ -2174,9 +2174,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AEGISLASH_SHIELD] = { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = AEGISLASH_MAIN_STAT, + .baseSpeed = 60, + .baseSpAttack = 50, + .baseSpDefense = AEGISLASH_MAIN_STAT, .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234, + .evYield_Defense = 2, + .evYield_SpDefense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2190,30 +2198,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .categoryName = _("Royal Sword"), .height = 17, .weight = 530, + .description = COMPOUND_STRING( + "In this defensive stance,\n" + "Aegislash uses its steel body and a force\n" + "field of spectral power to reduce the\n" + "damage of any attack."), .pokemonScale = 259, .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 1, + .frontPic = gMonFrontPic_AegislashShield, + .frontPicSize = MON_COORDS_SIZE(56, 64), FOOTPRINT(Aegislash) .levelUpLearnset = sAegislashLevelUpLearnset, .teachableLearnset = sAegislashTeachableLearnset, .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, - .baseHP = 60, - .baseAttack = 50, - .baseDefense = AEGISLASH_MAIN_STAT, - .baseSpeed = 60, - .baseSpAttack = 50, - .baseSpDefense = AEGISLASH_MAIN_STAT, - .evYield_Defense = 2, - .evYield_SpDefense = 1, - .description = COMPOUND_STRING( - "In this defensive stance,\n" - "Aegislash uses its steel body and a force\n" - "field of spectral power to reduce the\n" - "damage of any attack."), - .frontPic = gMonFrontPic_AegislashShield, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_AegislashShield, .frontAnimId = ANIM_H_VIBRATE, @@ -2230,9 +2230,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AEGISLASH_BLADE] = { + .baseHP = 60, + .baseAttack = AEGISLASH_MAIN_STAT, + .baseDefense = 50, + .baseSpeed = 60, + .baseSpAttack = AEGISLASH_MAIN_STAT, + .baseSpDefense = 50, .types = MON_TYPES(TYPE_STEEL, TYPE_GHOST), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 250 : 234, + #if P_UPDATED_EVS >= GEN_7 + .evYield_Attack = 2, + .evYield_SpAttack = 1, + #else + .evYield_Defense = 2, + .evYield_SpDefense = 1, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2255,19 +2268,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .teachableLearnset = sAegislashTeachableLearnset, .formSpeciesIdTable = sAegislashFormSpeciesIdTable, .formChangeTable = sAegislashFormChangeTable, - .baseHP = 60, - .baseAttack = AEGISLASH_MAIN_STAT, - .baseDefense = 50, - .baseSpeed = 60, - .baseSpAttack = AEGISLASH_MAIN_STAT, - .baseSpDefense = 50, - #if P_UPDATED_EVS >= GEN_7 - .evYield_Attack = 2, - .evYield_SpAttack = 1, - #else - .evYield_Defense = 2, - .evYield_SpDefense = 1, - #endif .description = COMPOUND_STRING( "Once upon a time, a king with an\n" "Aegislash reigned over the land. His\n" @@ -3488,6 +3488,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_SLIGGOO] = { + .baseHP = 68, + .baseAttack = 75, + .baseDefense = 53, + .baseSpeed = 60, + .baseSpAttack = 83, + .baseSpDefense = 113, + .types = MON_TYPES(TYPE_DRAGON), .catchRate = 45, .expYield = 158, .evYield_SpDefense = 2, @@ -3497,20 +3504,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAP_SIPPER, ABILITY_HYDRATION, ABILITY_GOOEY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Sliggoo"), .cryId = CRY_SLIGGOO, .natDexNum = NATIONAL_DEX_SLIGGOO, - FOOTPRINT(Sliggoo) - .formSpeciesIdTable = sSliggooFormSpeciesIdTable, - .baseHP = 68, - .baseAttack = 75, - .baseDefense = 53, - .baseSpeed = 60, - .baseSpAttack = 83, - .baseSpDefense = 113, - .types = MON_TYPES(TYPE_DRAGON), - .abilities = { ABILITY_SAP_SIPPER, ABILITY_HYDRATION, ABILITY_GOOEY }, .categoryName = _("Soft Tissue"), .height = 8, .weight = 175, @@ -3525,6 +3523,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sliggoo, .frontPicSize = MON_COORDS_SIZE(32, 64), + FOOTPRINT(Sliggoo) + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_Sliggoo, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3544,6 +3544,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOODRA] = { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 80, + .baseSpAttack = 110, + .baseSpDefense = 150, + .types = MON_TYPES(TYPE_DRAGON), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpDefense = 3, @@ -3552,20 +3559,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAP_SIPPER, ABILITY_HYDRATION, ABILITY_GOOEY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Goodra"), .cryId = CRY_GOODRA, .natDexNum = NATIONAL_DEX_GOODRA, - FOOTPRINT(Goodra) - .formSpeciesIdTable = sGoodraFormSpeciesIdTable, - .baseHP = 90, - .baseAttack = 100, - .baseDefense = 70, - .baseSpeed = 80, - .baseSpAttack = 110, - .baseSpDefense = 150, - .types = MON_TYPES(TYPE_DRAGON), - .abilities = { ABILITY_SAP_SIPPER, ABILITY_HYDRATION, ABILITY_GOOEY }, .categoryName = _("Dragon"), .height = 20, .weight = 1505, @@ -3580,6 +3578,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 4, .frontPic = gMonFrontPic_Goodra, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Goodra) + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Goodra, .frontAnimId = ANIM_V_SHAKE, @@ -3598,6 +3598,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_SLIGGOO_HISUIAN] = { + .baseHP = 58, + .baseAttack = 75, + .baseDefense = 83, + .baseSpeed = 40, + .baseSpAttack = 83, + .baseSpDefense = 113, + .types = MON_TYPES(TYPE_DRAGON, TYPE_STEEL), .catchRate = 45, .expYield = 158, .evYield_SpDefense = 2, @@ -3607,20 +3614,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAP_SIPPER, ABILITY_SHELL_ARMOR, ABILITY_GOOEY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Sliggoo"), .cryId = CRY_SLIGGOO, .natDexNum = NATIONAL_DEX_SLIGGOO, - FOOTPRINT(Sliggoo) - .formSpeciesIdTable = sSliggooFormSpeciesIdTable, - .baseHP = 58, - .baseAttack = 75, - .baseDefense = 83, - .baseSpeed = 40, - .baseSpAttack = 83, - .baseSpDefense = 113, - .types = MON_TYPES(TYPE_DRAGON, TYPE_STEEL), - .abilities = { ABILITY_SAP_SIPPER, ABILITY_SHELL_ARMOR, ABILITY_GOOEY }, .categoryName = _("Snail"), .height = 7, .weight = 685, @@ -3635,6 +3633,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SliggooHisuian, .frontPicSize = MON_COORDS_SIZE(48, 56), + FOOTPRINT(Sliggoo) + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_SliggooHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3655,6 +3655,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_GOODRA_HISUIAN] = { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 60, + .baseSpAttack = 110, + .baseSpDefense = 150, + .types = MON_TYPES(TYPE_DRAGON, TYPE_STEEL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpDefense = 3, @@ -3663,20 +3670,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAP_SIPPER, ABILITY_SHELL_ARMOR, ABILITY_GOOEY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Goodra"), .cryId = CRY_GOODRA, .natDexNum = NATIONAL_DEX_GOODRA, - FOOTPRINT(Goodra) - .formSpeciesIdTable = sGoodraFormSpeciesIdTable, - .baseHP = 80, - .baseAttack = 100, - .baseDefense = 100, - .baseSpeed = 60, - .baseSpAttack = 110, - .baseSpDefense = 150, - .types = MON_TYPES(TYPE_DRAGON, TYPE_STEEL), - .abilities = { ABILITY_SAP_SIPPER, ABILITY_SHELL_ARMOR, ABILITY_GOOEY }, .categoryName = _("Shell Bunker"), .height = 17, .weight = 3341, @@ -3691,6 +3689,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 4, .frontPic = gMonFrontPic_GoodraHisuian, .frontPicSize = MON_COORDS_SIZE(56, 64), + FOOTPRINT(Goodra) + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_GoodraHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3877,6 +3877,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_PUMPKABOO [SPECIES_PUMPKABOO_AVERAGE] = { + .baseHP = 49, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 51, + .baseSpAttack = 44, + .baseSpDefense = 55, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 120, .expYield = 67, @@ -3889,26 +3895,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pumpkaboo"), + .cryId = CRY_PUMPKABOO, .natDexNum = NATIONAL_DEX_PUMPKABOO, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Pumpkaboo, - .frontAnimId = ANIM_V_SLIDE_WOBBLE, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - .palette = gMonPalette_Pumpkaboo, - .shinyPalette = gMonShinyPalette_Pumpkaboo, - .iconSprite = gMonIcon_Pumpkaboo, - .iconPalIndex = 2, - FOOTPRINT(Pumpkaboo) - .levelUpLearnset = sPumpkabooLevelUpLearnset, - .teachableLearnset = sPumpkabooTeachableLearnset, - .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, - .baseHP = 49, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 51, - .baseSpAttack = 44, - .baseSpDefense = 55, - .cryId = CRY_PUMPKABOO, .height = 4, .weight = 50, .description = COMPOUND_STRING( @@ -3923,15 +3912,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_PumpkabooAverage, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooAverage, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 13, + .backPicYOffset = 13, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, + FOOTPRINT(Pumpkaboo) + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_AVERAGE}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_AVERAGE}), }, [SPECIES_PUMPKABOO_SMALL] = { + .baseHP = 44, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 56, + .baseSpAttack = 44, + .baseSpDefense = 55, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 120, .expYield = 67, @@ -3944,26 +3950,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pumpkaboo"), + .cryId = CRY_PUMPKABOO, .natDexNum = NATIONAL_DEX_PUMPKABOO, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Pumpkaboo, - .frontAnimId = ANIM_V_SLIDE_WOBBLE, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - .palette = gMonPalette_Pumpkaboo, - .shinyPalette = gMonShinyPalette_Pumpkaboo, - .iconSprite = gMonIcon_Pumpkaboo, - .iconPalIndex = 2, - FOOTPRINT(Pumpkaboo) - .levelUpLearnset = sPumpkabooLevelUpLearnset, - .teachableLearnset = sPumpkabooTeachableLearnset, - .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, - .baseHP = 44, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 56, - .baseSpAttack = 44, - .baseSpDefense = 55, - .cryId = CRY_PUMPKABOO, .height = 3, .weight = 35, .description = COMPOUND_STRING( @@ -3977,15 +3966,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_PumpkabooSmall, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooSmall, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 14, + .backPicYOffset = 14, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, + FOOTPRINT(Pumpkaboo) + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SMALL}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SMALL}), }, [SPECIES_PUMPKABOO_LARGE] = { + .baseHP = 54, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 46, + .baseSpAttack = 44, + .baseSpDefense = 55, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 120, .expYield = 67, @@ -3998,26 +4004,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pumpkaboo"), + .cryId = CRY_PUMPKABOO, .natDexNum = NATIONAL_DEX_PUMPKABOO, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Pumpkaboo, - .frontAnimId = ANIM_V_SLIDE_WOBBLE, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - .palette = gMonPalette_Pumpkaboo, - .shinyPalette = gMonShinyPalette_Pumpkaboo, - .iconSprite = gMonIcon_Pumpkaboo, - .iconPalIndex = 2, - FOOTPRINT(Pumpkaboo) - .levelUpLearnset = sPumpkabooLevelUpLearnset, - .teachableLearnset = sPumpkabooTeachableLearnset, - .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, - .baseHP = 54, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 46, - .baseSpAttack = 44, - .baseSpDefense = 55, - .cryId = CRY_PUMPKABOO, .height = 5, .weight = 75, .description = COMPOUND_STRING( @@ -4031,19 +4020,38 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_PumpkabooLarge, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooLarge, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 13, + .backPicYOffset = 13, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, + FOOTPRINT(Pumpkaboo) + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_LARGE}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_LARGE}), }, [SPECIES_PUMPKABOO_SUPER] = { + .baseHP = 59, + .baseAttack = 66, + .baseDefense = 70, + .baseSpeed = 41, + .baseSpAttack = 44, + .baseSpDefense = 55, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 120, .expYield = 67, .evYield_Defense = 1, + .itemCommon = ITEM_MIRACLE_SEED, + .itemRare = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4052,28 +4060,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Pumpkaboo"), + .cryId = CRY_PUMPKABOO_SUPER, .natDexNum = NATIONAL_DEX_PUMPKABOO, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Pumpkaboo, - .frontAnimId = ANIM_V_SLIDE_WOBBLE, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, - .palette = gMonPalette_Pumpkaboo, - .shinyPalette = gMonShinyPalette_Pumpkaboo, - .iconSprite = gMonIcon_Pumpkaboo, - .iconPalIndex = 2, - FOOTPRINT(Pumpkaboo) - .levelUpLearnset = sPumpkabooLevelUpLearnset, - .teachableLearnset = sPumpkabooTeachableLearnset, - .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, - .baseHP = 59, - .baseAttack = 66, - .baseDefense = 70, - .baseSpeed = 41, - .baseSpAttack = 44, - .baseSpDefense = 55, - .itemCommon = ITEM_MIRACLE_SEED, - .itemRare = ITEM_MIRACLE_SEED, - .cryId = CRY_PUMPKABOO_SUPER, .height = 8, .weight = 150, .description = COMPOUND_STRING( @@ -4087,15 +4076,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_PumpkabooSuper, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, + .frontAnimFrames = sAnims_Pumpkaboo, + .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooSuper, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 12, + .backPicYOffset = 12, + .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .palette = gMonPalette_Pumpkaboo, + .shinyPalette = gMonShinyPalette_Pumpkaboo, + .iconSprite = gMonIcon_Pumpkaboo, + .iconPalIndex = 2, + FOOTPRINT(Pumpkaboo) + .levelUpLearnset = sPumpkabooLevelUpLearnset, + .teachableLearnset = sPumpkabooTeachableLearnset, + .formSpeciesIdTable = sPumpkabooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOURGEIST_SUPER}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOURGEIST_SUPER}), }, [SPECIES_GOURGEIST_AVERAGE] = { + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 122, + .baseSpeed = 84, + .baseSpAttack = 58, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 60, .expYield = 173, @@ -4108,26 +4114,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Gourgeist"), + .cryId = CRY_GOURGEIST, .natDexNum = NATIONAL_DEX_GOURGEIST, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Gourgeist, - .frontAnimId = ANIM_SHRINK_GROW, - .backAnimId = BACK_ANIM_V_STRETCH, - .palette = gMonPalette_Gourgeist, - .shinyPalette = gMonShinyPalette_Gourgeist, - .iconSprite = gMonIcon_Gourgeist, - .iconPalIndex = 2, - FOOTPRINT(Gourgeist) - .levelUpLearnset = sGourgeistLevelUpLearnset, - .teachableLearnset = sGourgeistTeachableLearnset, - .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, - .baseHP = 65, - .baseAttack = 90, - .baseDefense = 122, - .baseSpeed = 84, - .baseSpAttack = 58, - .baseSpDefense = 75, - .cryId = CRY_GOURGEIST, .height = 9, .weight = 125, .description = COMPOUND_STRING( @@ -4142,13 +4131,30 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_GourgeistAverage, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistAverage, .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, + .backAnimId = BACK_ANIM_V_STRETCH, + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, + FOOTPRINT(Gourgeist) + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, }, [SPECIES_GOURGEIST_SMALL] = { + .baseHP = 55, + .baseAttack = 85, + .baseDefense = 122, + .baseSpeed = 99, + .baseSpAttack = 58, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 60, .expYield = 173, @@ -4161,26 +4167,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Gourgeist"), + .cryId = CRY_GOURGEIST, .natDexNum = NATIONAL_DEX_GOURGEIST, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Gourgeist, - .frontAnimId = ANIM_SHRINK_GROW, - .backAnimId = BACK_ANIM_V_STRETCH, - .palette = gMonPalette_Gourgeist, - .shinyPalette = gMonShinyPalette_Gourgeist, - .iconSprite = gMonIcon_Gourgeist, - .iconPalIndex = 2, - FOOTPRINT(Gourgeist) - .levelUpLearnset = sGourgeistLevelUpLearnset, - .teachableLearnset = sGourgeistTeachableLearnset, - .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, - .baseHP = 55, - .baseAttack = 85, - .baseDefense = 122, - .baseSpeed = 99, - .baseSpAttack = 58, - .baseSpDefense = 75, - .cryId = CRY_GOURGEIST, .height = 7, .weight = 95, .description = COMPOUND_STRING( @@ -4195,13 +4184,30 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_GourgeistSmall, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 5, + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistSmall, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 4, + .backPicYOffset = 4, + .backAnimId = BACK_ANIM_V_STRETCH, + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, + FOOTPRINT(Gourgeist) + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, }, [SPECIES_GOURGEIST_LARGE] = { + .baseHP = 75, + .baseAttack = 95, + .baseDefense = 122, + .baseSpeed = 69, + .baseSpAttack = 58, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), .catchRate = 60, .expYield = 173, @@ -4214,26 +4220,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Gourgeist"), + .cryId = CRY_GOURGEIST, .natDexNum = NATIONAL_DEX_GOURGEIST, .categoryName = _("Pumpkin"), - .frontAnimFrames = sAnims_Gourgeist, - .frontAnimId = ANIM_SHRINK_GROW, - .backAnimId = BACK_ANIM_V_STRETCH, - .palette = gMonPalette_Gourgeist, - .shinyPalette = gMonShinyPalette_Gourgeist, - .iconSprite = gMonIcon_Gourgeist, - .iconPalIndex = 2, - FOOTPRINT(Gourgeist) - .levelUpLearnset = sGourgeistLevelUpLearnset, - .teachableLearnset = sGourgeistTeachableLearnset, - .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 95, - .baseDefense = 122, - .baseSpeed = 69, - .baseSpAttack = 58, - .baseSpDefense = 75, - .cryId = CRY_GOURGEIST, .height = 11, .weight = 140, .description = COMPOUND_STRING( @@ -4248,29 +4237,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_GourgeistLarge, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .backPic = gMonBackPic_GourgeistLarge, - .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 2, - }, - - [SPECIES_GOURGEIST_SUPER] = - { - .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), - .catchRate = 60, - .expYield = 173, - .evYield_Defense = 2, - .genderRatio = PERCENT_FEMALE(50), - .eggCycles = 20, - .friendship = STANDARD_FRIENDSHIP, - .growthRate = GROWTH_MEDIUM_FAST, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, - .bodyColor = BODY_COLOR_BROWN, - .speciesName = _("Gourgeist"), - .natDexNum = NATIONAL_DEX_GOURGEIST, - .categoryName = _("Pumpkin"), .frontAnimFrames = sAnims_Gourgeist, .frontAnimId = ANIM_SHRINK_GROW, + .backPic = gMonBackPic_GourgeistLarge, + .backPicSize = MON_COORDS_SIZE(48, 64), + .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gourgeist, .shinyPalette = gMonShinyPalette_Gourgeist, @@ -4280,15 +4251,33 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .levelUpLearnset = sGourgeistLevelUpLearnset, .teachableLearnset = sGourgeistTeachableLearnset, .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, + }, + + [SPECIES_GOURGEIST_SUPER] = + { .baseHP = 85, .baseAttack = 100, .baseDefense = 122, .baseSpeed = 54, .baseSpAttack = 58, .baseSpDefense = 75, + .types = MON_TYPES(TYPE_GHOST, TYPE_GRASS), + .catchRate = 60, + .expYield = 173, + .evYield_Defense = 2, .itemCommon = ITEM_MIRACLE_SEED, .itemRare = ITEM_MIRACLE_SEED, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = STANDARD_FRIENDSHIP, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = { ABILITY_PICKUP, ABILITY_FRISK, ABILITY_INSOMNIA }, + .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Gourgeist"), .cryId = CRY_GOURGEIST_SUPER, + .natDexNum = NATIONAL_DEX_GOURGEIST, + .categoryName = _("Pumpkin"), .height = 17, .weight = 390, .description = COMPOUND_STRING( @@ -4303,9 +4292,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPic = gMonFrontPic_GourgeistSuper, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Gourgeist, + .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistSuper, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 1, + .backPicYOffset = 1, + .backAnimId = BACK_ANIM_V_STRETCH, + .palette = gMonPalette_Gourgeist, + .shinyPalette = gMonShinyPalette_Gourgeist, + .iconSprite = gMonIcon_Gourgeist, + .iconPalIndex = 2, + FOOTPRINT(Gourgeist) + .levelUpLearnset = sGourgeistLevelUpLearnset, + .teachableLearnset = sGourgeistTeachableLearnset, + .formSpeciesIdTable = sGourgeistFormSpeciesIdTable, }, #endif //P_FAMILY_PUMPKABOO @@ -4372,6 +4372,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_AVALUGG] = { + .baseHP = 95, + .baseAttack = 117, + .baseDefense = 184, + .baseSpeed = 28, + .baseSpAttack = 44, + .baseSpDefense = 46, + .types = MON_TYPES(TYPE_ICE), .catchRate = 55, .expYield = 180, .evYield_Defense = 2, @@ -4380,35 +4387,27 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = BERGMITE_EGG_GROUPS, + .abilities = { ABILITY_OWN_TEMPO, ABILITY_ICE_BODY, ABILITY_STURDY }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Avalugg"), .cryId = CRY_AVALUGG, .natDexNum = NATIONAL_DEX_AVALUGG, .categoryName = _("Iceberg"), - FOOTPRINT(Avalugg) - .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 117, - .baseDefense = 184, - .baseSpeed = 28, - .baseSpAttack = 44, - .baseSpDefense = 46, - .types = MON_TYPES(TYPE_ICE), - .abilities = { ABILITY_OWN_TEMPO, ABILITY_ICE_BODY, ABILITY_STURDY }, .height = 20, .weight = 5050, .description = COMPOUND_STRING( "The way several Bergmite huddle on its\n" "back make it look like an aircraft carrier\n" "made of ice. Its cumbersome frame crushes\n" - "anything that stands in its way.") -, + "anything that stands in its way."), .pokemonScale = 261, .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, .frontPic = gMonFrontPic_Avalugg, .frontPicSize = MON_COORDS_SIZE(64, 56), + FOOTPRINT(Avalugg) + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Avalugg, .frontAnimId = ANIM_V_SHAKE, @@ -4427,6 +4426,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_HISUIAN_FORMS [SPECIES_AVALUGG_HISUIAN] = { + .baseHP = 95, + .baseAttack = 127, + .baseDefense = 184, + .baseSpeed = 38, + .baseSpAttack = 34, + .baseSpDefense = 36, + .types = MON_TYPES(TYPE_ICE, TYPE_ROCK), .catchRate = 55, .expYield = 180, .evYield_Defense = 2, @@ -4435,27 +4441,20 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = BERGMITE_EGG_GROUPS, - .bodyColor = BODY_COLOR_BLUE, - .speciesName = _("Avalugg"), - .cryId = CRY_AVALUGG, - .natDexNum = NATIONAL_DEX_AVALUGG, - .categoryName = _("Iceberg"), - FOOTPRINT(Avalugg) - .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, - .baseHP = 95, - .baseAttack = 127, - .baseDefense = 184, - .baseSpeed = 38, - .baseSpAttack = 34, - .baseSpDefense = 36, - .types = MON_TYPES(TYPE_ICE, TYPE_ROCK), .abilities = { ABILITY_STRONG_JAW, ABILITY_ICE_BODY, ABILITY_STURDY }, + .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Avalugg"), + .cryId = CRY_AVALUGG, + .natDexNum = NATIONAL_DEX_AVALUGG, + .categoryName = _("Iceberg"), .height = 14, .weight = 2624, .description = COMPOUND_STRING( "The armor of ice covering its lower\n" "jaw puts steel to shame and can\n" "shatter rocks with ease."), + FOOTPRINT(Avalugg) + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .pokemonScale = 261, .pokemonOffset = 1, .trainerScale = 334, @@ -4720,7 +4719,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_DARK_AURA, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Yveltal"), .cryId = CRY_YVELTAL, .natDexNum = NATIONAL_DEX_YVELTAL, @@ -4744,7 +4742,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .enemyMonElevation = 5, .backPic = gMonBackPic_Yveltal, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 10, + .backPicYOffset = 10, + .isLegendary = TRUE, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Yveltal, .shinyPalette = gMonShinyPalette_Yveltal, @@ -4765,9 +4764,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpeed = 95, .baseSpAttack = 81, .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Zygarde"), .cryId = CRY_ZYGARDE_50, + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), .height = 50, .weight = 3050, .description = gZygarde50PokedexText, @@ -4789,19 +4801,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, .formChangeTable = sZygarde50AuraBreakFormChangeTable, - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), - .catchRate = 3, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, - .noFlip = TRUE, - .speciesName = _("Zygarde"), - .natDexNum = NATIONAL_DEX_ZYGARDE, - .categoryName = _("Order"), FOOTPRINT(Zygarde) .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, @@ -4816,9 +4815,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpeed = 95, .baseSpAttack = 81, .baseSpDefense = 95, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .speciesName = _("Zygarde"), .cryId = CRY_ZYGARDE_50, + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), .height = 50, .weight = 3050, .description = gZygarde50PokedexText, @@ -4840,19 +4852,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, .formChangeTable = sZygarde50PowerConstructFormChangeTable, - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), - .catchRate = 3, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, - .noFlip = TRUE, - .speciesName = _("Zygarde"), - .natDexNum = NATIONAL_DEX_ZYGARDE, - .categoryName = _("Order"), FOOTPRINT(Zygarde) .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, @@ -4867,9 +4866,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpeed = 115, .baseSpAttack = 61, .baseSpDefense = 85, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + .speciesName = _("Zygarde"), .cryId = CRY_ZYGARDE_10, + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), .height = 12, .weight = 335, .description = gZygarde10PokedexText, @@ -4890,19 +4902,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, .formChangeTable = sZygarde10AuraBreakFormChangeTable, - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), - .catchRate = 3, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_AURA_BREAK, ABILITY_NONE }, - .noFlip = TRUE, - .speciesName = _("Zygarde"), - .natDexNum = NATIONAL_DEX_ZYGARDE, - .categoryName = _("Order"), FOOTPRINT(Zygarde) .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, @@ -4919,9 +4918,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .baseSpeed = 115, .baseSpAttack = 61, .baseSpDefense = 85, + .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), + .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 243 : 219, + .evYield_HP = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + .speciesName = _("Zygarde"), .cryId = CRY_ZYGARDE_10, + .natDexNum = NATIONAL_DEX_ZYGARDE, + .categoryName = _("Order"), .height = 12, .weight = 335, .description = gZygarde10PokedexText, @@ -4942,19 +4954,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, .formChangeTable = sZygarde10PowerConstructFormChangeTable, - .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), - .catchRate = 3, - .evYield_HP = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, - .noFlip = TRUE, - .speciesName = _("Zygarde"), - .natDexNum = NATIONAL_DEX_ZYGARDE, - .categoryName = _("Order"), FOOTPRINT(Zygarde) .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, @@ -4965,8 +4964,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_ZYGARDE_COMPLETE] = { + .baseHP = 216, + .baseAttack = 100, + .baseDefense = 121, + .baseSpeed = 85, + .baseSpAttack = 91, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 354 : 319, .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -4974,24 +4980,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_POWER_CONSTRUCT, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BLACK, .noFlip = TRUE, .speciesName = _("Zygarde"), + .cryId = CRY_ZYGARDE_COMPLETE, .natDexNum = NATIONAL_DEX_ZYGARDE, .categoryName = _("Order"), - FOOTPRINT(Zygarde) - .levelUpLearnset = sZygardeLevelUpLearnset, - .teachableLearnset = sZygardeTeachableLearnset, - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, - .baseHP = 216, - .baseAttack = 100, - .baseDefense = 121, - .baseSpeed = 85, - .baseSpAttack = 91, - .baseSpDefense = 95, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 354 : 319, - .bodyColor = BODY_COLOR_BLACK, - .cryId = CRY_ZYGARDE_COMPLETE, .height = 45, .weight = 6100, .description = COMPOUND_STRING( @@ -5005,6 +4999,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 19, .frontPic = gMonFrontPic_ZygardeComplete, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Zygarde) + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZygardeComplete, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5023,8 +5022,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_DIANCIE [SPECIES_DIANCIE] = { + .baseHP = 50, + .baseAttack = 100, + .baseDefense = 150, + .baseSpeed = 50, + .baseSpAttack = 100, + .baseSpDefense = 150, .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), .catchRate = 3, + .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_Defense = 1, .evYield_SpDefense = 2, .genderRatio = MON_GENDERLESS, @@ -5032,25 +5038,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Diancie"), + .cryId = CRY_DIANCIE, .natDexNum = NATIONAL_DEX_DIANCIE, .categoryName = _("Jewel"), - FOOTPRINT(Diancie) - .levelUpLearnset = sDiancieLevelUpLearnset, - .teachableLearnset = sDiancieTeachableLearnset, - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, - .formChangeTable = sDiancieFormChangeTable, - .isMythical = TRUE, - .baseHP = 50, - .baseAttack = 100, - .baseDefense = 150, - .baseSpeed = 50, - .baseSpAttack = 100, - .baseSpDefense = 150, - .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, - .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE }, - .cryId = CRY_DIANCIE, .height = 7, .weight = 88, .description = COMPOUND_STRING( @@ -5064,6 +5057,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Diancie, .frontPicSize = MON_COORDS_SIZE(40, 64), + FOOTPRINT(Diancie) + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, + .isMythical = TRUE, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Diancie, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5080,8 +5079,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_MEGA_EVOLUTIONS [SPECIES_DIANCIE_MEGA] = { + .baseHP = 50, + .baseAttack = 160, + .baseDefense = 110, + .baseSpeed = 110, + .baseSpAttack = 160, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_ROCK, TYPE_FAIRY), .catchRate = 3, + .expYield = 315, .evYield_Defense = 1, .evYield_SpDefense = 2, .genderRatio = MON_GENDERLESS, @@ -5089,25 +5095,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Diancie"), + .cryId = CRY_DIANCIE_MEGA, .natDexNum = NATIONAL_DEX_DIANCIE, .categoryName = _("Jewel"), - FOOTPRINT(Diancie) - .levelUpLearnset = sDiancieLevelUpLearnset, - .teachableLearnset = sDiancieTeachableLearnset, - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, - .formChangeTable = sDiancieFormChangeTable, - .isMythical = TRUE, - .baseHP = 50, - .baseAttack = 160, - .baseDefense = 110, - .baseSpeed = 110, - .baseSpAttack = 160, - .baseSpDefense = 110, - .expYield = 315, - .abilities = { ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE, ABILITY_MAGIC_BOUNCE }, - .cryId = CRY_DIANCIE_MEGA, .height = 11, .weight = 278, .description = COMPOUND_STRING( @@ -5121,6 +5114,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_DiancieMega, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Diancie) + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, + .isMythical = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DiancieMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5140,30 +5139,26 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = #if P_FAMILY_HOOPA [SPECIES_HOOPA_CONFINED] = { + .baseHP = 80, + .baseAttack = 110, + .baseDefense = 60, + .baseSpeed = 70, + .baseSpAttack = 150, + .baseSpDefense = 130, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_GHOST), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, + .friendship = 100, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Hoopa"), - .natDexNum = NATIONAL_DEX_HOOPA, - FOOTPRINT(Hoopa) - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, - .formChangeTable = sHoopaFormChangeTable, - .isMythical = TRUE, - .baseHP = 80, - .baseAttack = 110, - .baseDefense = 60, - .baseSpeed = 70, - .baseSpAttack = 150, - .baseSpDefense = 130, - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_GHOST), - .friendship = 100, .cryId = CRY_HOOPA_CONFINED, + .natDexNum = NATIONAL_DEX_HOOPA, .categoryName = _("Mischief"), .height = 5, .weight = 90, @@ -5178,6 +5173,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HoopaConfined, .frontPicSize = MON_COORDS_SIZE(48, 48), + FOOTPRINT(Hoopa) + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, + .isMythical = TRUE, .frontPicYOffset = 11, .frontAnimFrames = sAnims_HoopaConfined, .frontAnimId = ANIM_ZIGZAG_SLOW, @@ -5196,30 +5195,26 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = [SPECIES_HOOPA_UNBOUND] = { + .baseHP = 80, + .baseAttack = 160, + .baseDefense = 60, + .baseSpeed = 80, + .baseSpAttack = 170, + .baseSpDefense = 130, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_DARK), .catchRate = 3, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, + .friendship = P_UPDATED_FRIENDSHIP >= GEN_8 ? STANDARD_FRIENDSHIP : 100, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_MAGICIAN, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Hoopa"), - .natDexNum = NATIONAL_DEX_HOOPA, - FOOTPRINT(Hoopa) - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, - .formChangeTable = sHoopaFormChangeTable, - .isMythical = TRUE, - .baseHP = 80, - .baseAttack = 160, - .baseDefense = 60, - .baseSpeed = 80, - .baseSpAttack = 170, - .baseSpDefense = 130, - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_DARK), - .friendship = P_UPDATED_FRIENDSHIP >= GEN_8 ? STANDARD_FRIENDSHIP : 100, .cryId = CRY_HOOPA_UNBOUND, + .natDexNum = NATIONAL_DEX_HOOPA, .categoryName = _("Djinn"), .height = 65, .weight = 490, @@ -5234,6 +5229,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HoopaUnbound, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Hoopa) + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, + .isMythical = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_HoopaUnbound, .frontAnimId = ANIM_GROW_IN_STAGES, @@ -5271,7 +5270,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_WATER_ABSORB, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, - .isMythical = TRUE, .speciesName = _("Volcanion"), .cryId = CRY_VOLCANION, .natDexNum = NATIONAL_DEX_VOLCANION, @@ -5294,7 +5292,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Volcanion, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, + .isMythical = TRUE, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Volcanion, .shinyPalette = gMonShinyPalette_Volcanion, diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index ad742ce156fc..e91a16ae1aa9 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -114,6 +114,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_DECIDUEYE] = { + .baseHP = 78, + .baseAttack = 107, + .baseDefense = 75, + .baseSpeed = 70, + .baseSpAttack = 100, + .baseSpDefense = 100, + .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .evYield_Attack = 3, @@ -122,34 +129,27 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_LONG_REACH }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Decidueye"), .cryId = CRY_DECIDUEYE, .natDexNum = NATIONAL_DEX_DECIDUEYE, .categoryName = _("Arrow Quill"), .height = 16, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - FOOTPRINT(Decidueye) - .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, - .baseHP = 78, - .baseAttack = 107, - .baseDefense = 75, - .baseSpeed = 70, - .baseSpAttack = 100, - .baseSpDefense = 100, - .types = MON_TYPES(TYPE_GRASS, TYPE_GHOST), - .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_LONG_REACH }, .weight = 366, .description = COMPOUND_STRING( "Decidueye is cool and cautious.\n" "It fires arrow quills from its wings with\n" "such precision, they can pierce a pebble\n" "at distances of over a hundred yards."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_Decidueye, .frontPicSize = MON_COORDS_SIZE(45, 64), + FOOTPRINT(Decidueye) + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Decidueye, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, @@ -168,6 +168,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_HISUIAN_FORMS [SPECIES_DECIDUEYE_HISUIAN] = { + .baseHP = 88, + .baseAttack = 112, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 95, + .baseSpDefense = 95, + .types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 265 : 239, .evYield_Attack = 3, @@ -176,34 +183,27 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_SCRAPPY }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Decidueye"), .cryId = CRY_DECIDUEYE, .natDexNum = NATIONAL_DEX_DECIDUEYE, .categoryName = _("Arrow Quill"), .height = 16, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - FOOTPRINT(Decidueye) - .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, - .baseHP = 88, - .baseAttack = 112, - .baseDefense = 80, - .baseSpeed = 60, - .baseSpAttack = 95, - .baseSpDefense = 95, - .types = MON_TYPES(TYPE_GRASS, TYPE_FIGHTING), - .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_SCRAPPY }, .weight = 370, .description = COMPOUND_STRING( "The air stored inside the rachises\n" "of Decidueye's feathers insulates\n" "the Pokémon against Hisui's extreme\n" "cold."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_DecidueyeHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Decidueye) + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DecidueyeHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1096,6 +1096,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpeed = 93, .baseSpAttack = 98, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, @@ -1106,16 +1107,29 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Oricorio"), + .cryId = CRY_ORICORIO_BAILE, .natDexNum = NATIONAL_DEX_ORICORIO, .categoryName = _("Dancing"), .height = 6, .weight = 34, + .description = COMPOUND_STRING( + "It wins the hearts of its enemies\n" + "with its passionate dancing and then\n" + "uses the opening it creates to\n" + "burn them up with blazing flames."), .pokemonScale = 422, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_OricorioBaile, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicYOffset = 2, .frontAnimFrames = sAnims_Oricorio, + .frontAnimId = ANIM_CONCAVE_ARC_SMALL, + .backPic = gMonBackPic_OricorioBaile, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, FOOTPRINT(Oricorio) .levelUpLearnset = sOricorioLevelUpLearnset, @@ -1123,20 +1137,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, - .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), - .bodyColor = BODY_COLOR_RED, - .cryId = CRY_ORICORIO_BAILE, - .description = COMPOUND_STRING( - "It wins the hearts of its enemies\n" - "with its passionate dancing and then\n" - "uses the opening it creates to\n" - "burn them up with blazing flames."), - .frontPic = gMonFrontPic_OricorioBaile, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicYOffset = 2, - .frontAnimId = ANIM_CONCAVE_ARC_SMALL, - .backPic = gMonBackPic_OricorioBaile, - .backPicSize = MON_COORDS_SIZE(64, 64), //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_OricorioBaile, .shinyPalette = gMonShinyPalette_OricorioBaile, @@ -1152,6 +1152,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpeed = 93, .baseSpAttack = 98, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, @@ -1162,15 +1163,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Oricorio"), + .cryId = CRY_ORICORIO_POM_POM, .natDexNum = NATIONAL_DEX_ORICORIO, .categoryName = _("Dancing"), .height = 6, .weight = 34, + .description = COMPOUND_STRING( + "This form of Oricorio has sipped\n" + "yellow nectar. It uses nimble steps to\n" + "approach opponents, then knocks\n" + "them out with electric punches."), .pokemonScale = 422, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_OricorioPomPom, + .frontPicSize = MON_COORDS_SIZE(56, 56), + .frontPicYOffset = 5, .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) @@ -1179,17 +1190,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, - .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), - .bodyColor = BODY_COLOR_YELLOW, - .cryId = CRY_ORICORIO_POM_POM, - .description = COMPOUND_STRING( - "This form of Oricorio has sipped\n" - "yellow nectar. It uses nimble steps to\n" - "approach opponents, then knocks\n" - "them out with electric punches."), - .frontPic = gMonFrontPic_OricorioPomPom, - .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicYOffset = 5, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioPomPom, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1208,6 +1208,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpeed = 93, .baseSpAttack = 98, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, @@ -1218,15 +1219,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Oricorio"), + .cryId = CRY_ORICORIO_PAU, .natDexNum = NATIONAL_DEX_ORICORIO, .categoryName = _("Dancing"), .height = 6, .weight = 34, + .description = COMPOUND_STRING( + "This form of Oricorio has sipped\n" + "pink nectar. It elevates its mind with\n" + "the gentle steps of its dance, then\n" + "unleashes its psychic energy."), .pokemonScale = 422, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_OricorioPau, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicYOffset = 3, .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) @@ -1235,17 +1246,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FLYING), - .bodyColor = BODY_COLOR_PINK, - .cryId = CRY_ORICORIO_PAU, - .description = COMPOUND_STRING( - "This form of Oricorio has sipped\n" - "pink nectar. It elevates its mind with\n" - "the gentle steps of its dance, then\n" - "unleashes its psychic energy."), - .frontPic = gMonFrontPic_OricorioPau, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicYOffset = 3, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioPau, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1264,6 +1264,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .baseSpeed = 93, .baseSpAttack = 98, .baseSpDefense = 70, + .types = MON_TYPES(TYPE_GHOST, TYPE_FLYING), .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, @@ -1274,15 +1275,25 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), .abilities = { ABILITY_DANCER, ABILITY_NONE }, + .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Oricorio"), + .cryId = CRY_ORICORIO_SENSU, .natDexNum = NATIONAL_DEX_ORICORIO, .categoryName = _("Dancing"), .height = 6, .weight = 34, + .description = COMPOUND_STRING( + "It charms its opponents with its\n" + "refined dancing. When they let their\n" + "guard down, it places a curse on\n" + "them that will bring on their demise."), .pokemonScale = 422, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_OricorioSensu, + .frontPicSize = MON_COORDS_SIZE(64, 56), + .frontPicYOffset = 4, .frontAnimFrames = sAnims_Oricorio, .backPicYOffset = 0, FOOTPRINT(Oricorio) @@ -1291,17 +1302,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .formSpeciesIdTable = sOricorioFormSpeciesIdTable, .formChangeTable = sOricorioFormChangeTable, //.backAnimId = BACK_ANIM_NONE, \, - .types = MON_TYPES(TYPE_GHOST, TYPE_FLYING), - .bodyColor = BODY_COLOR_PURPLE, - .cryId = CRY_ORICORIO_SENSU, - .description = COMPOUND_STRING( - "It charms its opponents with its\n" - "refined dancing. When they let their\n" - "guard down, it places a curse on\n" - "them that will bring on their demise."), - .frontPic = gMonFrontPic_OricorioSensu, - .frontPicSize = MON_COORDS_SIZE(64, 56), - .frontPicYOffset = 4, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioSensu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1442,6 +1442,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Rockruff"), .cryId = CRY_ROCKRUFF, @@ -1466,7 +1467,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, - .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_STEADFAST }, .frontPic = gMonFrontPic_Rockruff, .frontPicSize = MON_COORDS_SIZE(37, 39), .backPic = gMonBackPic_Rockruff, @@ -1493,6 +1493,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Rockruff"), .cryId = CRY_ROCKRUFF, @@ -1517,7 +1518,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, - .abilities = { ABILITY_OWN_TEMPO, ABILITY_NONE, ABILITY_NONE }, .frontPic = gMonFrontPic_Rockruff, .frontPicSize = MON_COORDS_SIZE(40, 48), .backPic = gMonBackPic_Rockruff, @@ -1528,6 +1528,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_MIDDAY] = { + .baseHP = 75, + .baseAttack = 115, + .baseDefense = 65, + .baseSpeed = 112, + .baseSpAttack = 55, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_ROCK), .catchRate = 90, .expYield = 170, @@ -1537,38 +1543,32 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .speciesName = _("Lycanroc"), - .natDexNum = NATIONAL_DEX_LYCANROC, - .categoryName = _("Wolf"), - .weight = 250, - .pokemonScale = 366, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - .backPic = gMonBackPic_LycanrocMidday, - .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Lycanroc) - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 115, - .baseDefense = 65, - .baseSpeed = 112, - .baseSpAttack = 55, - .baseSpDefense = 65, .abilities = { ABILITY_KEEN_EYE, ABILITY_SAND_RUSH, ABILITY_STEADFAST }, .bodyColor = BODY_COLOR_BROWN, + .speciesName = _("Lycanroc"), .cryId = CRY_LYCANROC_MIDDAY, + .natDexNum = NATIONAL_DEX_LYCANROC, + .categoryName = _("Wolf"), .height = 8, + .weight = 250, .description = COMPOUND_STRING( "It has a calm and collected\n" "demeanor. It swiftly closes in on its prey,\n" "then slices them with the rocks in\n" "its mane."), + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_LycanrocMidday, .frontPicSize = MON_COORDS_SIZE(57, 53), .frontPicYOffset = 5, .frontAnimFrames = sAnims_LycanrocMidday, .frontAnimId = ANIM_V_SHAKE, + .backPic = gMonBackPic_LycanrocMidday, + .backPicSize = MON_COORDS_SIZE(64, 56), + FOOTPRINT(Lycanroc) + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LycanrocMidday, @@ -1581,6 +1581,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_MIDNIGHT] = { + .baseHP = 85, + .baseAttack = 115, + .baseDefense = 75, + .baseSpeed = 82, + .baseSpAttack = 55, + .baseSpDefense = 75, .types = MON_TYPES(TYPE_ROCK), .catchRate = 90, .expYield = 170, @@ -1590,38 +1596,32 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), - .speciesName = _("Lycanroc"), - .natDexNum = NATIONAL_DEX_LYCANROC, - .categoryName = _("Wolf"), - .weight = 250, - .pokemonScale = 366, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - .backPic = gMonBackPic_LycanrocMidday, - .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Lycanroc) - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, - .baseHP = 85, - .baseAttack = 115, - .baseDefense = 75, - .baseSpeed = 82, - .baseSpAttack = 55, - .baseSpDefense = 75, .abilities = { ABILITY_KEEN_EYE, ABILITY_VITAL_SPIRIT, ABILITY_NO_GUARD }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Lycanroc"), .cryId = CRY_LYCANROC_MIDNIGHT, + .natDexNum = NATIONAL_DEX_LYCANROC, + .categoryName = _("Wolf"), .height = 11, + .weight = 250, .description = COMPOUND_STRING( "This Pokémon uses its rocky mane\n" "to slash any who approach. It will\n" "even disobey its Trainer if it dislikes\n" "the orders it was given."), + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_LycanrocMidnight, .frontPicSize = MON_COORDS_SIZE(56, 61), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LycanrocMidnight, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_SLOW, + .backPic = gMonBackPic_LycanrocMidday, + .backPicSize = MON_COORDS_SIZE(64, 56), + FOOTPRINT(Lycanroc) + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_LycanrocMidnight, @@ -1634,6 +1634,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_LYCANROC_DUSK] = { + .baseHP = 75, + .baseAttack = 117, + .baseDefense = 65, + .baseSpeed = 110, + .baseSpAttack = 55, + .baseSpDefense = 65, .types = MON_TYPES(TYPE_ROCK), .catchRate = 90, .expYield = 170, @@ -1643,38 +1649,32 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_NONE }, + .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Lycanroc"), + .cryId = CRY_LYCANROC_DUSK, .natDexNum = NATIONAL_DEX_LYCANROC, .categoryName = _("Wolf"), + .height = 8, .weight = 250, + .description = COMPOUND_STRING( + "These Pokémon have both calm and\n" + "ferocious qualities. It's said that\n" + "this form of Lycanroc is the most\n" + "troublesome to raise."), .pokemonScale = 366, .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, + .frontPic = gMonFrontPic_LycanrocDusk, + .frontPicSize = MON_COORDS_SIZE(57, 58), + .frontPicYOffset = 6, + .frontAnimFrames = sAnims_LycanrocDusk, + .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_LycanrocMidday, .backPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Lycanroc) .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, - .baseHP = 75, - .baseAttack = 117, - .baseDefense = 65, - .baseSpeed = 110, - .baseSpAttack = 55, - .baseSpDefense = 65, - .abilities = { ABILITY_TOUGH_CLAWS, ABILITY_NONE }, - .bodyColor = BODY_COLOR_BROWN, - .cryId = CRY_LYCANROC_DUSK, - .height = 8, - .description = COMPOUND_STRING( - "These Pokémon have both calm and\n" - "ferocious qualities. It's said that\n" - "this form of Lycanroc is the most\n" - "troublesome to raise."), - .frontPic = gMonFrontPic_LycanrocDusk, - .frontPicSize = MON_COORDS_SIZE(57, 58), - .frontPicYOffset = 6, - .frontAnimFrames = sAnims_LycanrocDusk, - .frontAnimId = ANIM_V_SHAKE, .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LycanrocDusk, @@ -1689,8 +1689,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_WISHIWASHI [SPECIES_WISHIWASHI_SOLO] = { + .baseHP = 45, + .baseAttack = 20, + .baseDefense = 20, + .baseSpeed = 40, + .baseSpAttack = 25, + .baseSpDefense = 25, .types = MON_TYPES(TYPE_WATER), .catchRate = 60, + .expYield = 61, .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -1700,25 +1707,9 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Wishiwashi"), + .cryId = CRY_WISHIWASHI_SOLO, .natDexNum = NATIONAL_DEX_WISHIWASHI, .categoryName = _("Small Fry"), - .pokemonScale = 682, - .pokemonOffset = 24, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Wishiwashi) - .levelUpLearnset = sWishiwashiLevelUpLearnset, - .teachableLearnset = sWishiwashiTeachableLearnset, - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, - .formChangeTable = sWishiwashiFormChangeTable, - .baseHP = 45, - .baseAttack = 20, - .baseDefense = 20, - .baseSpeed = 40, - .baseSpAttack = 25, - .baseSpDefense = 25, - .expYield = 61, - .cryId = CRY_WISHIWASHI_SOLO, .height = 2, .weight = 3, .description = COMPOUND_STRING( @@ -1726,8 +1717,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "weak. It's by gathering up into\n" "schools that they're able to confront\n" "opponents."), + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_WishiwashiSolo, .frontPicSize = MON_COORDS_SIZE(40, 24), + FOOTPRINT(Wishiwashi) + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, + .formChangeTable = sWishiwashiFormChangeTable, .frontPicYOffset = 20, .frontAnimFrames = sAnims_WishiwashiSolo, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, @@ -1744,8 +1744,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_WISHIWASHI_SCHOOL] = { + .baseHP = 45, + .baseAttack = 140, + .baseDefense = 130, + .baseSpeed = 30, + .baseSpAttack = 140, + .baseSpDefense = 135, .types = MON_TYPES(TYPE_WATER), .catchRate = 60, + .expYield = 217, .evYield_HP = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, @@ -1755,25 +1762,9 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .abilities = { ABILITY_SCHOOLING, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Wishiwashi"), + .cryId = CRY_WISHIWASHI_SCHOOL, .natDexNum = NATIONAL_DEX_WISHIWASHI, .categoryName = _("Small Fry"), - .pokemonScale = 682, - .pokemonOffset = 24, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Wishiwashi) - .levelUpLearnset = sWishiwashiLevelUpLearnset, - .teachableLearnset = sWishiwashiTeachableLearnset, - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, - .formChangeTable = sWishiwashiFormChangeTable, - .baseHP = 45, - .baseAttack = 140, - .baseDefense = 130, - .baseSpeed = 30, - .baseSpAttack = 140, - .baseSpDefense = 135, - .expYield = 217, - .cryId = CRY_WISHIWASHI_SCHOOL, .height = 82, .weight = 786, .description = COMPOUND_STRING( @@ -1781,8 +1772,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "get into formation. But if they get\n" "wounded in battle, they'll scatter\n" "and become solitary again."), + .pokemonScale = 682, + .pokemonOffset = 24, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_WishiwashiSchool, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Wishiwashi) + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, + .formChangeTable = sWishiwashiFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_WishiwashiSchool, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //Todo @@ -3180,7 +3180,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BATTLE_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Type: Null"), .cryId = CRY_TYPE_NULL, .natDexNum = NATIONAL_DEX_TYPE_NULL, @@ -3203,7 +3202,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_TypeNull, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 1, + .backPicYOffset = 1, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TypeNull, .shinyPalette = gMonShinyPalette_TypeNull, @@ -3580,22 +3580,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .categoryName = _("Disguise"), .height = 2, .weight = 7, + .description = COMPOUND_STRING( + "A lonely Pokémon, it hides its terrifying\n" + "appearance beneath an old rag so it can\n" + "get closer to people and other Pokémon.\n" + "Its actual appearance is unknown."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_MimikyuDisguised, + .frontPicSize = MON_COORDS_SIZE(48, 40), FOOTPRINT(Mimikyu) .levelUpLearnset = sMimikyuLevelUpLearnset, .teachableLearnset = sMimikyuTeachableLearnset, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, - .description = COMPOUND_STRING( - "A lonely Pokémon, it hides its terrifying\n" - "appearance beneath an old rag so it can\n" - "get closer to people and other Pokémon.\n" - "Its actual appearance is unknown."), - .frontPic = gMonFrontPic_MimikyuDisguised, - .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuDisguised, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -3635,22 +3635,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .categoryName = _("Disguise"), .height = 2, .weight = 7, + .description = COMPOUND_STRING( + "After going to all the effort of\n" + "disguising itself, its neck was\n" + "broken. Whatever is inside is probably\n" + "unharmed, but it's still feeling sad."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_MimikyuBusted, + .frontPicSize = MON_COORDS_SIZE(48, 40), FOOTPRINT(Mimikyu) .levelUpLearnset = sMimikyuLevelUpLearnset, .teachableLearnset = sMimikyuTeachableLearnset, .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, .formChangeTable = sMimikyuFormChangeTable, - .description = COMPOUND_STRING( - "After going to all the effort of\n" - "disguising itself, its neck was\n" - "broken. Whatever is inside is probably\n" - "unharmed, but it's still feeling sad."), - .frontPic = gMonFrontPic_MimikyuBusted, - .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuBusted, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -4014,7 +4014,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_ELECTRIC_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_YELLOW, - .isLegendary = TRUE, .speciesName = _("Tapu Koko"), .cryId = CRY_TAPU_KOKO, .natDexNum = NATIONAL_DEX_TAPU_KOKO, @@ -4038,7 +4037,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 9, .backPic = gMonBackPic_TapuKoko, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuKoko, .shinyPalette = gMonShinyPalette_TapuKoko, @@ -4070,7 +4070,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PSYCHIC_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PINK, - .isLegendary = TRUE, .speciesName = _("Tapu Lele"), .cryId = CRY_TAPU_LELE, .natDexNum = NATIONAL_DEX_TAPU_LELE, @@ -4094,7 +4093,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 8, .backPic = gMonBackPic_TapuLele, .backPicSize = MON_COORDS_SIZE(56, 56), - .backPicYOffset = 6, + .backPicYOffset = 6, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuLele, .shinyPalette = gMonShinyPalette_TapuLele, @@ -4126,7 +4126,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_GRASSY_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Tapu Bulu"), .cryId = CRY_TAPU_BULU, .natDexNum = NATIONAL_DEX_TAPU_BULU, @@ -4150,7 +4149,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 5, .backPic = gMonBackPic_TapuBulu, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 1, + .backPicYOffset = 1, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuBulu, .shinyPalette = gMonShinyPalette_TapuBulu, @@ -4182,7 +4182,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_MISTY_SURGE, ABILITY_NONE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PURPLE, - .isLegendary = TRUE, .speciesName = _("Tapu Fini"), .cryId = CRY_TAPU_FINI, .natDexNum = NATIONAL_DEX_TAPU_FINI, @@ -4207,7 +4206,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_TapuFini, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 4, + .backPicYOffset = 4, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuFini, .shinyPalette = gMonShinyPalette_TapuFini, @@ -4239,7 +4239,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNAWARE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Cosmog"), .cryId = CRY_COSMOG, .natDexNum = NATIONAL_DEX_COSMOG, @@ -4263,7 +4262,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 7, .backPic = gMonBackPic_Cosmog, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 10, + .backPicYOffset = 10, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Cosmog, .shinyPalette = gMonShinyPalette_Cosmog, @@ -4296,7 +4296,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_STURDY, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Cosmoem"), .cryId = CRY_COSMOEM, .natDexNum = NATIONAL_DEX_COSMOEM, @@ -4320,7 +4319,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 3, .backPic = gMonBackPic_Cosmoem, .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicYOffset = 17, + .backPicYOffset = 17, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Cosmoem, .shinyPalette = gMonShinyPalette_Cosmoem, @@ -4353,7 +4353,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_FULL_METAL_BODY, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Solgaleo"), .cryId = CRY_SOLGALEO, .natDexNum = NATIONAL_DEX_SOLGALEO, @@ -4376,7 +4375,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Solgaleo, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Solgaleo, .shinyPalette = gMonShinyPalette_Solgaleo, @@ -4406,7 +4406,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SHADOW_SHIELD, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isLegendary = TRUE, .speciesName = _("Lunala"), .cryId = CRY_LUNALA, .natDexNum = NATIONAL_DEX_LUNALA, @@ -4430,7 +4429,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_Lunala, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, + .isLegendary = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Lunala, .shinyPalette = gMonShinyPalette_Lunala, @@ -4462,7 +4462,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isUltraBeast = TRUE, .speciesName = _("Nihilego"), .cryId = CRY_NIHILEGO, .natDexNum = NATIONAL_DEX_NIHILEGO, @@ -4486,7 +4485,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_Nihilego, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 9, + .backPicYOffset = 9, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Nihilego, .shinyPalette = gMonShinyPalette_Nihilego, @@ -4519,7 +4519,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isUltraBeast = TRUE, .speciesName = _("Buzzwole"), .cryId = CRY_BUZZWOLE, .natDexNum = NATIONAL_DEX_BUZZWOLE, @@ -4542,7 +4541,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, .backPic = gMonBackPic_Buzzwole, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 14, + .backPicYOffset = 14, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Buzzwole, .shinyPalette = gMonShinyPalette_Buzzwole, @@ -4574,7 +4574,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isUltraBeast = TRUE, .speciesName = _("Pheromosa"), .cryId = CRY_PHEROMOSA, .natDexNum = NATIONAL_DEX_PHEROMOSA, @@ -4597,7 +4596,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Pheromosa, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Pheromosa, .shinyPalette = gMonShinyPalette_Pheromosa, @@ -4629,7 +4629,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, - .isUltraBeast = TRUE, .speciesName = _("Xurkitree"), .cryId = CRY_XURKITREE, .natDexNum = NATIONAL_DEX_XURKITREE, @@ -4652,7 +4651,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST, .backPic = gMonBackPic_Xurkitree, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Xurkitree, .shinyPalette = gMonShinyPalette_Xurkitree, @@ -4686,7 +4686,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isUltraBeast = TRUE, .speciesName = _("Celesteela"), .cryId = CRY_CELESTEELA, .natDexNum = NATIONAL_DEX_CELESTEELA, @@ -4709,7 +4708,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_STUTTER_SLOW, .backPic = gMonBackPic_Celesteela, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Celesteela, .shinyPalette = gMonShinyPalette_Celesteela, @@ -4741,7 +4741,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isUltraBeast = TRUE, .speciesName = _("Kartana"), .cryId = CRY_KARTANA, .natDexNum = NATIONAL_DEX_KARTANA, @@ -4765,7 +4764,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 3, .backPic = gMonBackPic_Kartana, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 11, + .backPicYOffset = 11, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Kartana, .shinyPalette = gMonShinyPalette_Kartana, @@ -4797,7 +4797,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, - .isUltraBeast = TRUE, .speciesName = _("Guzzlord"), .cryId = CRY_GUZZLORD, .natDexNum = NATIONAL_DEX_GUZZLORD, @@ -4820,7 +4819,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, .backPic = gMonBackPic_Guzzlord, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 10, + .backPicYOffset = 10, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Guzzlord, .shinyPalette = gMonShinyPalette_Guzzlord, @@ -4835,24 +4835,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FAMILY_NECROZMA [SPECIES_NECROZMA] = { - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, - .speciesName = _("Necrozma"), - .natDexNum = NATIONAL_DEX_NECROZMA, - .categoryName = _("Prism"), - .pokemonScale = 256, - .pokemonOffset = 3, - .trainerScale = 369, - .trainerOffset = 7, - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 97, .baseAttack = 107, .baseDefense = 101, @@ -4864,9 +4846,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, .evYield_Attack = 1, .evYield_SpAttack = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + .speciesName = _("Necrozma"), .cryId = CRY_NECROZMA, + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), .height = 24, .weight = 2300, .description = COMPOUND_STRING( @@ -4874,8 +4865,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "life-form, apparently asleep underground,\n" "is thought to have come from another\n" "world in ancient times."), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, .frontPic = gMonFrontPic_Necrozma, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Necrozma) + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Necrozma, .frontAnimId = ANIM_GROW_VIBRATE, @@ -4893,24 +4893,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_FUSION_FORMS [SPECIES_NECROZMA_DUSK_MANE] = { - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, - .speciesName = _("Necrozma"), - .natDexNum = NATIONAL_DEX_NECROZMA, - .categoryName = _("Prism"), - .pokemonScale = 256, - .pokemonOffset = 3, - .trainerScale = 369, - .trainerOffset = 7, - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 97, .baseAttack = 157, .baseDefense = 127, @@ -4921,9 +4903,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + .speciesName = _("Necrozma"), .cryId = CRY_NECROZMA_DUSK_MANE, + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), .height = 38, .weight = 4600, .description = COMPOUND_STRING( @@ -4931,8 +4922,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "devouring the light of Solgaleo. It pounces\n" "on foes and then slashes them with\n" "the claws on its four limbs and back."), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaDuskMane, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Necrozma) + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4950,24 +4950,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = [SPECIES_NECROZMA_DAWN_WINGS] = { - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, - .speciesName = _("Necrozma"), - .natDexNum = NATIONAL_DEX_NECROZMA, - .categoryName = _("Prism"), - .pokemonScale = 256, - .pokemonOffset = 3, - .trainerScale = 369, - .trainerOffset = 7, - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 97, .baseAttack = 113, .baseDefense = 109, @@ -4978,9 +4960,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 340 : 306, .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRISM_ARMOR, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + .speciesName = _("Necrozma"), .cryId = CRY_NECROZMA_DAWN_WINGS, + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), .height = 42, .weight = 3500, .description = COMPOUND_STRING( @@ -4988,8 +4979,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "devouring the light of Lunala. It grasps\n" "foes in its giant claws and rips them\n" "apart with brute force."), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaDawnWings, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Necrozma) + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5009,24 +5009,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = #if P_ULTRA_BURST_FORMS [SPECIES_NECROZMA_ULTRA] = { - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .noFlip = TRUE, - .speciesName = _("Necrozma"), - .natDexNum = NATIONAL_DEX_NECROZMA, - .categoryName = _("Prism"), - .pokemonScale = 256, - .pokemonOffset = 3, - .trainerScale = 369, - .trainerOffset = 7, - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 97, .baseAttack = 167, .baseDefense = 97, @@ -5039,9 +5021,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .evYield_Attack = 1, .evYield_Speed = 1, .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_NEUROFORCE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + .speciesName = _("Necrozma"), .cryId = CRY_NECROZMA_ULTRA, + .natDexNum = NATIONAL_DEX_NECROZMA, + .categoryName = _("Prism"), .height = 75, .weight = 2300, .description = COMPOUND_STRING( @@ -5049,8 +5040,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "its body affects living things and\n" "nature, impacting them in various\n" "ways."), + .pokemonScale = 256, + .pokemonOffset = 3, + .trainerScale = 369, + .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaUltra, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Necrozma) + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, + .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5089,12 +5089,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Magearna"), .cryId = CRY_MAGEARNA, .natDexNum = NATIONAL_DEX_MAGEARNA, .categoryName = _("Artificial"), .height = 10, .weight = 805, + .description = COMPOUND_STRING( + "This artificial Pokémon, constructed more\n" + "than 500 years ago, can understand human\n" + "speech but cannot itself speak. Its true\n" + "self is its Soul-Heart, an artificial soul."), .pokemonScale = 305, .pokemonOffset = 7, .trainerScale = 257, @@ -5117,12 +5123,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, - .bodyColor = BODY_COLOR_GRAY, - .description = COMPOUND_STRING( - "This artificial Pokémon, constructed more\n" - "than 500 years ago, can understand human\n" - "speech but cannot itself speak. Its true\n" - "self is its Soul-Heart, an artificial soul."), }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { @@ -5142,12 +5142,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SOUL_HEART, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Magearna"), .cryId = CRY_MAGEARNA, .natDexNum = NATIONAL_DEX_MAGEARNA, .categoryName = _("Artificial"), .height = 10, .weight = 805, + .description = COMPOUND_STRING( + "This is its form from almost 500\n" + "years ago. Its body is nothing more\n" + "than a container-its artificial heart\n" + "is the actual life-form."), .pokemonScale = 305, .pokemonOffset = 7, .trainerScale = 257, @@ -5170,12 +5176,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, .isMythical = TRUE, - .bodyColor = BODY_COLOR_RED, - .description = COMPOUND_STRING( - "This is its form from almost 500\n" - "years ago. Its body is nothing more\n" - "than a container-its artificial heart\n" - "is the actual life-form."), }, #endif //P_FAMILY_MAGEARNA @@ -5256,7 +5256,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isUltraBeast = TRUE, .speciesName = _("Poipole"), .cryId = CRY_POIPOLE, .natDexNum = NATIONAL_DEX_POIPOLE, @@ -5279,7 +5278,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 9, .backPic = gMonBackPic_Poipole, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 6, + .backPicYOffset = 6, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Poipole, .shinyPalette = gMonShinyPalette_Poipole, @@ -5310,7 +5310,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isUltraBeast = TRUE, .speciesName = _("Naganadel"), .cryId = CRY_NAGANADEL, .natDexNum = NATIONAL_DEX_NAGANADEL, @@ -5333,7 +5332,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 7, .backPic = gMonBackPic_Naganadel, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 6, + .backPicYOffset = 6, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Naganadel, .shinyPalette = gMonShinyPalette_Naganadel, @@ -5366,7 +5366,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, .noFlip = TRUE, - .isUltraBeast = TRUE, .speciesName = _("Stakataka"), .cryId = CRY_STAKATAKA, .natDexNum = NATIONAL_DEX_STAKATAKA, @@ -5388,7 +5387,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Stakataka, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 12, + .backPicYOffset = 12, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Stakataka, .shinyPalette = gMonShinyPalette_Stakataka, @@ -5421,7 +5421,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .abilities = { ABILITY_BEAST_BOOST, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, - .isUltraBeast = TRUE, .speciesName = _("Blacephaln"), .cryId = CRY_BLACEPHALON, .natDexNum = NATIONAL_DEX_BLACEPHALON, @@ -5443,7 +5442,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHAKE_GLOW_RED, .backPic = gMonBackPic_Blacephalon, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 9, + .backPicYOffset = 9, + .isUltraBeast = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Blacephalon, .shinyPalette = gMonShinyPalette_Blacephalon, @@ -5475,7 +5475,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_VOLT_ABSORB, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isMythical = TRUE, .speciesName = _("Zeraora"), .cryId = CRY_ZERAORA, .natDexNum = NATIONAL_DEX_ZERAORA, @@ -5497,7 +5496,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Zeraora, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 11, + .backPicYOffset = 11, + .isMythical = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Zeraora, .shinyPalette = gMonShinyPalette_Zeraora, @@ -5529,7 +5529,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_MAGNET_PULL, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isMythical = TRUE, .speciesName = _("Meltan"), .cryId = CRY_MELTAN, .natDexNum = NATIONAL_DEX_MELTAN, @@ -5551,7 +5550,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_STUTTER_SLOW, .backPic = gMonBackPic_Meltan, .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, + .backPicYOffset = 12, + .isMythical = TRUE, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Meltan, .shinyPalette = gMonShinyPalette_Meltan, @@ -5585,24 +5585,24 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .cryId = CRY_MELMETAL, .natDexNum = NATIONAL_DEX_MELMETAL, .categoryName = _("Hex Nut"), + .height = 25, + .weight = 800, + .description = COMPOUND_STRING( + "Revered long ago for its capacity to create\n" + "iron from nothing, for some reason it has\n" + "come back to life after 3,000 years."), .pokemonScale = 257, .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, + .frontPic = gMonFrontPic_Melmetal, + .frontPicSize = MON_COORDS_SIZE(64, 56), FOOTPRINT(Melmetal) .levelUpLearnset = sMelmetalLevelUpLearnset, .teachableLearnset = sMelmetalTeachableLearnset, .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, - .height = 25, - .weight = 800, - .description = COMPOUND_STRING( - "Revered long ago for its capacity to create\n" - "iron from nothing, for some reason it has\n" - "come back to life after 3,000 years."), - .frontPic = gMonFrontPic_Melmetal, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Melmetal, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5640,10 +5640,19 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .cryId = CRY_MELMETAL, .natDexNum = NATIONAL_DEX_MELMETAL, .categoryName = _("Hex Nut"), + .height = 250, + .weight = 0, + .description = COMPOUND_STRING( + "In a distant land, there are\n" + "legends about a cyclopean giant. In fact,\n" + "the giant was a Melmetal that was\n" + "flooded with Gigantamax energy."), .pokemonScale = 257, .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, + .frontPic = gMonFrontPic_MelmetalGigantamax, + .frontPicSize = MON_COORDS_SIZE(64, 64), FOOTPRINT(Melmetal) .levelUpLearnset = sMelmetalLevelUpLearnset, .teachableLearnset = sMelmetalTeachableLearnset, @@ -5651,15 +5660,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .formChangeTable = sMelmetalFormChangeTable, .isMythical = TRUE, .isGigantamax = TRUE, - .height = 250, - .weight = 0, - .description = COMPOUND_STRING( - "In a distant land, there are\n" - "legends about a cyclopean giant. In fact,\n" - "the giant was a Melmetal that was\n" - "flooded with Gigantamax energy."), - .frontPic = gMonFrontPic_MelmetalGigantamax, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_MelmetalGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index 6efafbdc880a..f4d3c0ebfd7a 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -1116,11 +1116,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_ORBEETLE, .natDexNum = NATIONAL_DEX_ORBEETLE, .categoryName = _("Seven Spot"), - FOOTPRINT(Orbeetle) - .levelUpLearnset = sOrbeetleLevelUpLearnset, - .teachableLearnset = sOrbeetleTeachableLearnset, - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, - .formChangeTable = sOrbeetleFormChangeTable, .height = 4, .weight = 408, .description = COMPOUND_STRING( @@ -1134,6 +1129,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Orbeetle, .frontPicSize = MON_COORDS_SIZE(48, 56), + FOOTPRINT(Orbeetle) + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, + .formChangeTable = sOrbeetleFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Orbeetle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1173,11 +1173,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_ORBEETLE, .natDexNum = NATIONAL_DEX_ORBEETLE, .categoryName = _("Seven Spot"), - FOOTPRINT(Orbeetle) - .levelUpLearnset = sOrbeetleLevelUpLearnset, - .teachableLearnset = sOrbeetleTeachableLearnset, - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, - .formChangeTable = sOrbeetleFormChangeTable, .height = 140, .weight = 0, .description = COMPOUND_STRING( @@ -1191,6 +1186,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_OrbeetleGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Orbeetle) + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, + .formChangeTable = sOrbeetleFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_OrbeetleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4524,6 +4524,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_EISCUE [SPECIES_EISCUE_ICE_FACE] = { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_ICE), .catchRate = 60, .expYield = 165, @@ -4549,12 +4555,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sEiscueTeachableLearnset, .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, - .baseHP = 75, - .baseAttack = 80, - .baseDefense = 110, - .baseSpeed = 50, - .baseSpAttack = 65, - .baseSpDefense = 90, .cryId = CRY_EISCUE_ICE_FACE, .description = COMPOUND_STRING( "It drifted in on the flow of ocean waters\n" @@ -4578,6 +4578,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_EISCUE_NOICE_FACE] = { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 70, + .baseSpeed = 130, + .baseSpAttack = 65, + .baseSpDefense = 50, .types = MON_TYPES(TYPE_ICE), .catchRate = 60, .expYield = 165, @@ -4603,12 +4609,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sEiscueTeachableLearnset, .formSpeciesIdTable = sEiscueFormSpeciesIdTable, .formChangeTable = sEiscueFormChangeTable, - .baseHP = 75, - .baseAttack = 80, - .baseDefense = 70, - .baseSpeed = 130, - .baseSpAttack = 65, - .baseSpDefense = 50, .cryId = CRY_EISCUE_NOICE_FACE, .description = COMPOUND_STRING( "The hair on its head connects to\n" @@ -4634,9 +4634,16 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_INDEEDEE [SPECIES_INDEEDEE_MALE] = { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 55, + .baseSpeed = 95, + .baseSpAttack = 105, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), .catchRate = 30, .expYield = 166, + .evYield_SpAttack = 2, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, @@ -4653,13 +4660,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, FOOTPRINT(Indeedee) .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, - .baseHP = 60, - .baseAttack = 65, - .baseDefense = 55, - .baseSpeed = 95, - .baseSpAttack = 105, - .baseSpDefense = 95, - .evYield_SpAttack = 2, .genderRatio = MON_MALE, .abilities = { ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, .cryId = CRY_INDEEDEE_MALE, @@ -4687,9 +4687,16 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_INDEEDEE_FEMALE] = { + .baseHP = 70, + .baseAttack = 55, + .baseDefense = 65, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 105, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_NORMAL), .catchRate = 30, .expYield = 166, + .evYield_SpDefense = 2, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, @@ -4706,13 +4713,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, FOOTPRINT(Indeedee) .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, - .baseHP = 70, - .baseAttack = 55, - .baseDefense = 65, - .baseSpeed = 85, - .baseSpAttack = 95, - .baseSpDefense = 105, - .evYield_SpDefense = 2, .genderRatio = MON_FEMALE, .abilities = { ABILITY_OWN_TEMPO, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, .cryId = CRY_INDEEDEE_FEMALE, @@ -4928,17 +4928,17 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COPPERAJAH, .natDexNum = NATIONAL_DEX_COPPERAJAH, .categoryName = _("Copperderm"), - FOOTPRINT(Copperajah) - .levelUpLearnset = sCopperajahLevelUpLearnset, - .teachableLearnset = sCopperajahTeachableLearnset, - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, - .formChangeTable = sCopperajahFormChangeTable, .height = 30, .weight = 6500, .description = COMPOUND_STRING( "They came over from another region long\n" "ago and worked together with humans.\n" "Their green skin is resistant to water."), + FOOTPRINT(Copperajah) + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, + .formChangeTable = sCopperajahFormChangeTable, .pokemonScale = 275, .pokemonOffset = 7, .trainerScale = 256, @@ -4983,11 +4983,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COPPERAJAH, .natDexNum = NATIONAL_DEX_COPPERAJAH, .categoryName = _("Copperderm"), - FOOTPRINT(Copperajah) - .levelUpLearnset = sCopperajahLevelUpLearnset, - .teachableLearnset = sCopperajahTeachableLearnset, - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, - .formChangeTable = sCopperajahFormChangeTable, .height = 230, .weight = 0, .description = COMPOUND_STRING( @@ -5001,6 +4996,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CopperajahGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), + FOOTPRINT(Copperajah) + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, + .formChangeTable = sCopperajahFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_CopperajahGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5564,7 +5564,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZACIAN [SPECIES_ZACIAN_HERO_OF_MANY_BATTLES] = { + .baseHP = 92, + .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, + .baseDefense = 115, + .baseSpeed = 138, + .baseSpAttack = 80, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_FAIRY), .catchRate = 10, + .expYield = 335, .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5587,14 +5595,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sZacianTeachableLearnset, .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, - .baseHP = 92, - .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, - .baseDefense = 115, - .baseSpeed = 138, - .baseSpAttack = 80, - .baseSpDefense = 115, - .types = MON_TYPES(TYPE_FAIRY), - .expYield = 335, .cryId = CRY_ZACIAN_HERO_OF_MANY_BATTLES, .weight = 1100, .description = COMPOUND_STRING( @@ -5618,7 +5618,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZACIAN_CROWNED_SWORD] = { + .baseHP = 92, + .baseAttack = P_UPDATED_STATS >= GEN_9 ? 150 : 170, + .baseDefense = 115, + .baseSpeed = 148, + .baseSpAttack = 80, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_FAIRY, TYPE_STEEL), .catchRate = 10, + .expYield = 360, .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5641,14 +5649,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sZacianTeachableLearnset, .formSpeciesIdTable = sZacianFormSpeciesIdTable, .formChangeTable = sZacianFormChangeTable, - .baseHP = 92, - .baseAttack = P_UPDATED_STATS >= GEN_9 ? 150 : 170, - .baseDefense = 115, - .baseSpeed = 148, - .baseSpAttack = 80, - .baseSpDefense = 115, - .types = MON_TYPES(TYPE_FAIRY, TYPE_STEEL), - .expYield = 360, .cryId = CRY_ZACIAN_CROWNED_SWORD, .weight = 3550, .description = COMPOUND_STRING( @@ -5675,7 +5675,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ZAMAZENTA [SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES] = { + .baseHP = 92, + .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, + .baseDefense = 115, + .baseSpeed = 138, + .baseSpAttack = 80, + .baseSpDefense = 115, + .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 10, + .expYield = 335, .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5698,14 +5706,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sZamazentaTeachableLearnset, .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, - .baseHP = 92, - .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, - .baseDefense = 115, - .baseSpeed = 138, - .baseSpAttack = 80, - .baseSpDefense = 115, - .types = MON_TYPES(TYPE_FIGHTING), - .expYield = 335, .cryId = CRY_ZAMAZENTA_HERO_OF_MANY_BATTLES, .weight = 2100, .description = COMPOUND_STRING( @@ -5730,7 +5730,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = { + .baseHP = 92, + .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, + .baseDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145, + .baseSpeed = 128, + .baseSpAttack = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), .catchRate = 10, + .expYield = 360, .evYield_Speed = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5753,14 +5761,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .teachableLearnset = sZamazentaTeachableLearnset, .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, .formChangeTable = sZamazentaFormChangeTable, - .baseHP = 92, - .baseAttack = P_UPDATED_STATS >= GEN_9 ? 120 : 130, - .baseDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145, - .baseSpeed = 128, - .baseSpAttack = 80, - .baseSpDefense = P_UPDATED_STATS >= GEN_9 ? 140 : 145, - .types = MON_TYPES(TYPE_FIGHTING, TYPE_STEEL), - .expYield = 360, .cryId = CRY_ZAMAZENTA_CROWNED_SHIELD, .weight = 7850, .description = COMPOUND_STRING( @@ -5787,8 +5787,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ETERNATUS [SPECIES_ETERNATUS] = { + .baseHP = 140, + .baseAttack = 85, + .baseDefense = 95, + .baseSpeed = 130, + .baseSpAttack = 145, + .baseSpDefense = 95, .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), .catchRate = 255, + .expYield = 345, .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5805,13 +5812,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sEternatusLevelUpLearnset, .teachableLearnset = sEternatusTeachableLearnset, .formSpeciesIdTable = sEternatusFormSpeciesIdTable, - .baseHP = 140, - .baseAttack = 85, - .baseDefense = 95, - .baseSpeed = 130, - .baseSpAttack = 145, - .baseSpDefense = 95, - .expYield = 345, .cryId = CRY_ETERNATUS, .height = 200, .weight = 9500, @@ -5842,8 +5842,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ETERNATUS_ETERNAMAX] = { + .baseHP = 255, + .baseAttack = 115, + .baseDefense = 250, + .baseSpeed = 130, + .baseSpAttack = 125, + .baseSpDefense = 250, .types = MON_TYPES(TYPE_POISON, TYPE_DRAGON), .catchRate = 255, + .expYield = 563, .evYield_HP = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, @@ -5860,13 +5867,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sEternatusLevelUpLearnset, .teachableLearnset = sEternatusTeachableLearnset, .formSpeciesIdTable = sEternatusFormSpeciesIdTable, - .baseHP = 255, - .baseAttack = 115, - .baseDefense = 250, - .baseSpeed = 130, - .baseSpAttack = 125, - .baseSpDefense = 250, - .expYield = 563, .cryId = CRY_ETERNATUS_ETERNAMAX, .height = 1000, .weight = 0, @@ -5955,19 +5955,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, .baseSpeed = 97, .baseSpAttack = 63, .baseSpDefense = 60, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), .catchRate = 3, .expYield = 275, .evYield_Attack = 3, + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6011,19 +6011,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, .baseSpeed = 97, .baseSpAttack = 63, .baseSpDefense = 60, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_DARK), .catchRate = 3, .expYield = 275, .evYield_Attack = 3, + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6067,19 +6067,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, .baseSpeed = 97, .baseSpAttack = 63, .baseSpDefense = 60, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .catchRate = 3, .expYield = 275, .evYield_Attack = 3, + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6123,19 +6123,19 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_GIGANTAMAX_FORMS [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = { - .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .baseHP = 100, .baseAttack = 130, .baseDefense = 100, .baseSpeed = 97, .baseSpAttack = 63, .baseSpDefense = 60, + .types = MON_TYPES(TYPE_FIGHTING, TYPE_WATER), .catchRate = 3, .expYield = 275, .evYield_Attack = 3, + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6512,11 +6512,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_CALYREX [SPECIES_CALYREX] = { - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 100, .baseAttack = 80, .baseDefense = 80, @@ -6527,6 +6522,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 250, .evYield_HP = 3, + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, + .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6567,11 +6567,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FUSION_FORMS [SPECIES_CALYREX_ICE_RIDER] = { - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 100, .baseAttack = 165, .baseDefense = 150, @@ -6582,6 +6577,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 340, .evYield_Attack = 3, + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, + .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6622,11 +6622,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_CALYREX_SHADOW_RIDER] = { - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .baseHP = 100, .baseAttack = 85, .baseDefense = 80, @@ -6637,6 +6632,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 340, .evYield_SpAttack = 3, + .speciesName = _("Calyrex"), + .natDexNum = NATIONAL_DEX_CALYREX, + FOOTPRINT(Calyrex) + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, + .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6680,6 +6680,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = #if P_FAMILY_ENAMORUS [SPECIES_ENAMORUS_INCARNATE] = { + .baseHP = 74, + .baseAttack = 115, + .baseDefense = 70, + .baseSpeed = 106, + .baseSpAttack = 135, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), .catchRate = 3, .expYield = 116, @@ -6703,12 +6709,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sEnamorusLevelUpLearnset, .teachableLearnset = sEnamorusTeachableLearnset, .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, - .baseHP = 74, - .baseAttack = 115, - .baseDefense = 70, - .baseSpeed = 106, - .baseSpAttack = 135, - .baseSpDefense = 80, .abilities = { ABILITY_CUTE_CHARM, ABILITY_NONE, ABILITY_CONTRARY }, .cryId = CRY_ENAMORUS_INCARNATE, .description = COMPOUND_STRING( @@ -6735,6 +6735,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ENAMORUS_THERIAN] = { + .baseHP = 74, + .baseAttack = 115, + .baseDefense = 110, + .baseSpeed = 46, + .baseSpAttack = 135, + .baseSpDefense = 100, .types = MON_TYPES(TYPE_FAIRY, TYPE_FLYING), .catchRate = 3, .expYield = 116, @@ -6758,12 +6764,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sEnamorusLevelUpLearnset, .teachableLearnset = sEnamorusTeachableLearnset, .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, - .baseHP = 74, - .baseAttack = 115, - .baseDefense = 110, - .baseSpeed = 46, - .baseSpAttack = 135, - .baseSpDefense = 100, .abilities = { ABILITY_OVERCOAT, ABILITY_NONE, ABILITY_NONE }, .cryId = CRY_ENAMORUS_THERIAN, .description = COMPOUND_STRING( diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index cf2359f024d0..b63659f3a365 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -540,43 +540,43 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_OINKOLOGNE_MALE] = { + .baseHP = 110, + .baseAttack = 100, + .baseDefense = 75, + .baseSpeed = 65, + .baseSpAttack = 59, + .baseSpDefense = 80, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 100, .expYield = 171, .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(0), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_LINGERING_AROMA, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Oinkologne"), + .cryId = CRY_OINKOLOGNE_MALE, .natDexNum = NATIONAL_DEX_OINKOLOGNE, .categoryName = _("Hog"), .height = 10, .weight = 1200, - .pokemonScale = 356, - .pokemonOffset = 17, - .trainerScale = 256, - .trainerOffset = 0, - .teachableLearnset = sOinkologneTeachableLearnset, - .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, - .baseHP = 110, - .baseAttack = 100, - .baseDefense = 75, - .baseSpeed = 65, - .baseSpAttack = 59, - .baseSpDefense = 80, - .genderRatio = PERCENT_FEMALE(0), - .abilities = { ABILITY_LINGERING_AROMA, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, - .cryId = CRY_OINKOLOGNE_MALE, .description = COMPOUND_STRING( "Oinkologne is proud of its fine,\n" "glossy skin. It emits a concentrated\n" "scent from the tip of its tail."), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_OinkologneMale, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, + .teachableLearnset = sOinkologneTeachableLearnset, + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneMale, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -592,44 +592,44 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_OINKOLOGNE_FEMALE] = { + .baseHP = 115, + .baseAttack = 90, + .baseDefense = 70, + .baseSpeed = 65, + .baseSpAttack = 59, + .baseSpDefense = 90, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 100, .expYield = 171, .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(100), .eggCycles = 15, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_AROMA_VEIL, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Oinkologne"), + .cryId = CRY_OINKOLOGNE_FEMALE, .natDexNum = NATIONAL_DEX_OINKOLOGNE, .categoryName = _("Hog"), .height = 10, .weight = 1200, - .pokemonScale = 356, - .pokemonOffset = 17, - .trainerScale = 256, - .trainerOffset = 0, - .teachableLearnset = sOinkologneTeachableLearnset, - .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, - .baseHP = 115, - .baseAttack = 90, - .baseDefense = 70, - .baseSpeed = 65, - .baseSpAttack = 59, - .baseSpDefense = 90, - .genderRatio = PERCENT_FEMALE(100), - .abilities = { ABILITY_AROMA_VEIL, ABILITY_GLUTTONY, ABILITY_THICK_FAT }, - .cryId = CRY_OINKOLOGNE_FEMALE, .description = COMPOUND_STRING( "This is a meticulous Pokémon that\n" "likes to keep things tidy. It\n" "shrouds itself in a floral aroma that\n" "soothes the Pokémon around it."), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_OinkologneFemale, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, + .teachableLearnset = sOinkologneTeachableLearnset, + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneFemale, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1093,13 +1093,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Maushold"), + .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, .natDexNum = NATIONAL_DEX_MAUSHOLD, .categoryName = _("Family"), .height = 3, + .weight = 23, + .description = COMPOUND_STRING( + "The little one just appeared one\n" + "day. They all live together like a\n" + "family, but the relationship between\n" + "the three is still unclear."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_MausholdFamilyOfThree, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ @@ -1111,15 +1120,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, - .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, - .weight = 23, - .description = COMPOUND_STRING( - "The little one just appeared one\n" - "day. They all live together like a\n" - "family, but the relationship between\n" - "the three is still unclear."), - .frontPic = gMonFrontPic_MausholdFamilyOfThree, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_MausholdFamilyOfThree, .backPicSize = MON_COORDS_SIZE(64, 64), .iconSprite = gMonIcon_MausholdFamilyOfThree, @@ -1145,13 +1145,22 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Maushold"), + .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, .natDexNum = NATIONAL_DEX_MAUSHOLD, .categoryName = _("Family"), .height = 3, + .weight = 28, + .description = COMPOUND_STRING( + "The larger pair protects the little\n" + "ones during battles. When facing\n" + "strong opponents, the whole group\n" + "will join the fight."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_MausholdFamilyOfFour, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ @@ -1163,15 +1172,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, - .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, - .weight = 28, - .description = COMPOUND_STRING( - "The larger pair protects the little\n" - "ones during battles. When facing\n" - "strong opponents, the whole group\n" - "will join the fight."), - .frontPic = gMonFrontPic_MausholdFamilyOfFour, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_MausholdFamilyOfFour, .backPicSize = MON_COORDS_SIZE(64, 64), .iconSprite = gMonIcon_MausholdFamilyOfFour, @@ -1464,12 +1464,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, + .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Sqawkabily"), .cryId = CRY_SQUAWKABILLY, .natDexNum = NATIONAL_DEX_SQUAWKABILLY, .categoryName = _("Parrot"), .height = 6, .weight = 24, + .description = COMPOUND_STRING( + "Green-feathered flocks hold the\n" + "most sway. When they're out\n" + "searching for food in the mornings and\n" + "evenings, it gets very noisy."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -1487,13 +1494,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, - .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, - .bodyColor = BODY_COLOR_GREEN, - .description = COMPOUND_STRING( - "Green-feathered flocks hold the\n" - "most sway. When they're out\n" - "searching for food in the mornings and\n" - "evenings, it gets very noisy."), .palette = gMonPalette_SquawkabillyGreenPlumage, .shinyPalette = gMonShinyPalette_SquawkabillyGreenPlumage, .iconSprite = gMonIcon_SquawkabillyGreenPlumage, @@ -1517,12 +1517,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, + .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Sqawkabily"), .cryId = CRY_SQUAWKABILLY, .natDexNum = NATIONAL_DEX_SQUAWKABILLY, .categoryName = _("Parrot"), .height = 6, .weight = 24, + .description = COMPOUND_STRING( + "The largest of their flocks can\n" + "contain more than 50 individuals. They\n" + "fly around towns and forests,\n" + "searching for food and making a racket."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -1540,13 +1547,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, - .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_GUTS }, - .bodyColor = BODY_COLOR_BLUE, - .description = COMPOUND_STRING( - "The largest of their flocks can\n" - "contain more than 50 individuals. They\n" - "fly around towns and forests,\n" - "searching for food and making a racket."), .palette = gMonPalette_SquawkabillyBluePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyBluePlumage, .iconSprite = gMonIcon_SquawkabillyBluePlumage, @@ -1570,12 +1570,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Sqawkabily"), .cryId = CRY_SQUAWKABILLY, .natDexNum = NATIONAL_DEX_SQUAWKABILLY, .categoryName = _("Parrot"), .height = 6, .weight = 24, + .description = COMPOUND_STRING( + "These Squawkabilly are hotheaded,\n" + "and their fighting style is vicious.\n" + "They'll leap within reach of their\n" + "foes to engage in close combat."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -1593,13 +1600,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, - .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, - .bodyColor = BODY_COLOR_YELLOW, - .description = COMPOUND_STRING( - "These Squawkabilly are hotheaded,\n" - "and their fighting style is vicious.\n" - "They'll leap within reach of their\n" - "foes to engage in close combat."), .palette = gMonPalette_SquawkabillyYellowPlumage, .shinyPalette = gMonShinyPalette_SquawkabillyYellowPlumage, .iconSprite = gMonIcon_SquawkabillyYellowPlumage, @@ -1623,12 +1623,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_ERRATIC, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, + .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Sqawkabily"), .cryId = CRY_SQUAWKABILLY, .natDexNum = NATIONAL_DEX_SQUAWKABILLY, .categoryName = _("Parrot"), .height = 6, .weight = 24, + .description = COMPOUND_STRING( + "Though these Squawkabilly are the\n" + "fewest in number, they have no\n" + "trouble living in towns since they blend\n" + "in with the white buildings."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -1646,13 +1653,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, - .abilities = { ABILITY_INTIMIDATE, ABILITY_HUSTLE, ABILITY_SHEER_FORCE }, - .bodyColor = BODY_COLOR_WHITE, - .description = COMPOUND_STRING( - "Though these Squawkabilly are the\n" - "fewest in number, they have no\n" - "trouble living in towns since they blend\n" - "in with the white buildings."), .palette = gMonPalette_SquawkabillyWhitePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyWhitePlumage, .iconSprite = gMonIcon_SquawkabillyWhitePlumage, @@ -3373,8 +3373,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_PALAFIN_ZERO] = { + .baseHP = 100, + .baseAttack = 70, + .baseDefense = 72, + .baseSpeed = 100, + .baseSpAttack = 53, + .baseSpDefense = 62, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, + .expYield = 160, .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -3384,26 +3391,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Palafin"), - .natDexNum = NATIONAL_DEX_PALAFIN, - .pokemonScale = 356, - .pokemonOffset = 17, - .trainerScale = 256, - .trainerOffset = 0, - .frontAnimFrames = sAnims_Palafin, - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - /*FOOTPRINT(Palafin)*/ - .levelUpLearnset = sPalafinLevelUpLearnset, - .teachableLearnset = sPalafinTeachableLearnset, - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, - .formChangeTable = sPalafinZeroFormChangeTable, - .baseHP = 100, - .baseAttack = 70, - .baseDefense = 72, - .baseSpeed = 100, - .baseSpAttack = 53, - .baseSpDefense = 62, - .expYield = 160, .cryId = CRY_PALAFIN_ZERO, + .natDexNum = NATIONAL_DEX_PALAFIN, .categoryName = _("Dolphin"), .height = 13, .weight = 602, @@ -3412,9 +3401,20 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "appearance if it hears its allies calling for\n" "help. Palafin will never show\n" "anybody its moment of transformation."), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PalafinZero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, + .frontAnimFrames = sAnims_Palafin, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + /*FOOTPRINT(Palafin)*/ + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, + .formChangeTable = sPalafinZeroFormChangeTable, .backPic = gMonBackPic_PalafinZero, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, @@ -3427,8 +3427,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_PALAFIN_HERO] = { + .baseHP = 100, + .baseAttack = 160, + .baseDefense = 97, + .baseSpeed = 100, + .baseSpAttack = 106, + .baseSpDefense = 87, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, + .expYield = 228, .evYield_HP = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -3438,26 +3445,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_ZERO_TO_HERO, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Palafin"), - .natDexNum = NATIONAL_DEX_PALAFIN, - .pokemonScale = 356, - .pokemonOffset = 17, - .trainerScale = 256, - .trainerOffset = 0, - .frontAnimFrames = sAnims_Palafin, - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - /*FOOTPRINT(Palafin)*/ - .levelUpLearnset = sPalafinLevelUpLearnset, - .teachableLearnset = sPalafinTeachableLearnset, - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, - .formChangeTable = sPalafinZeroFormChangeTable, - .baseHP = 100, - .baseAttack = 160, - .baseDefense = 97, - .baseSpeed = 100, - .baseSpAttack = 106, - .baseSpDefense = 87, - .expYield = 228, .cryId = CRY_PALAFIN_HERO, + .natDexNum = NATIONAL_DEX_PALAFIN, .categoryName = _("Hero"), .height = 18, .weight = 974, @@ -3466,9 +3455,20 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = "awakened. It is now so\n" "extraordinarily strong that it can easily lift a\n" "cruise ship with one fin."), + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PalafinHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, + .frontAnimFrames = sAnims_Palafin, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + /*FOOTPRINT(Palafin)*/ + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, + .formChangeTable = sPalafinZeroFormChangeTable, .backPic = gMonBackPic_PalafinHero, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, @@ -4201,15 +4201,24 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Tatsugiri"), + .cryId = CRY_TATSUGIRI_CURLY, .natDexNum = NATIONAL_DEX_TATSUGIRI, .categoryName = _("Mimicry"), .height = 3, .weight = 80, + .description = COMPOUND_STRING( + "This is a small dragon Pokémon. It\n" + "lives inside the mouth of Dondozo to\n" + "protect itself from enemies on the\n" + "outside."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_TatsugiriCurly, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ @@ -4219,15 +4228,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sTatsugiriLevelUpLearnset, .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, - .bodyColor = BODY_COLOR_RED, - .cryId = CRY_TATSUGIRI_CURLY, - .description = COMPOUND_STRING( - "This is a small dragon Pokémon. It\n" - "lives inside the mouth of Dondozo to\n" - "protect itself from enemies on the\n" - "outside."), - .frontPic = gMonFrontPic_TatsugiriCurly, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_TatsugiriCurly, .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_TatsugiriCurly, @@ -4254,15 +4254,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Tatsugiri"), + .cryId = CRY_TATSUGIRI_DROOPY, .natDexNum = NATIONAL_DEX_TATSUGIRI, .categoryName = _("Mimicry"), .height = 3, .weight = 80, + .description = COMPOUND_STRING( + "This Pokémon tricks its opponents\n" + "by playing dead. It is small and\n" + "weak, but it uses its smarts to survive."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_TatsugiriDroopy, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ @@ -4272,14 +4280,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sTatsugiriLevelUpLearnset, .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, - .bodyColor = BODY_COLOR_PINK, - .cryId = CRY_TATSUGIRI_DROOPY, - .description = COMPOUND_STRING( - "This Pokémon tricks its opponents\n" - "by playing dead. It is small and\n" - "weak, but it uses its smarts to survive."), - .frontPic = gMonFrontPic_TatsugiriDroopy, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_TatsugiriDroopy, .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_TatsugiriDroopy, @@ -4306,15 +4306,23 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_2), .abilities = { ABILITY_COMMANDER, ABILITY_NONE, ABILITY_STORM_DRAIN }, + .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Tatsugiri"), + .cryId = CRY_TATSUGIRI_STRETCHY, .natDexNum = NATIONAL_DEX_TATSUGIRI, .categoryName = _("Mimicry"), .height = 3, .weight = 80, + .description = COMPOUND_STRING( + "It's one of the most intelligent\n" + "dragon Pokémon. It camouflages itself\n" + "by inflating its throat sac."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_TatsugiriStretchy, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ @@ -4324,14 +4332,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .levelUpLearnset = sTatsugiriLevelUpLearnset, .teachableLearnset = sTatsugiriTeachableLearnset, .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, - .bodyColor = BODY_COLOR_YELLOW, - .cryId = CRY_TATSUGIRI_STRETCHY, - .description = COMPOUND_STRING( - "It's one of the most intelligent\n" - "dragon Pokémon. It camouflages itself\n" - "by inflating its throat sac."), - .frontPic = gMonFrontPic_TatsugiriStretchy, - .frontPicSize = MON_COORDS_SIZE(64, 64), .backPic = gMonBackPic_TatsugiriStretchy, .backPicSize = MON_COORDS_SIZE(64, 64), .palette = gMonPalette_TatsugiriStretchy, @@ -4361,7 +4361,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isParadoxForm = TRUE, .speciesName = _("Great Tusk"), .cryId = CRY_GREAT_TUSK, .natDexNum = NATIONAL_DEX_GREAT_TUSK, @@ -4381,6 +4380,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_GreatTusk, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GreatTusk, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4416,7 +4416,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_PINK, - .isParadoxForm = TRUE, .speciesName = _("ScreamTail"), .cryId = CRY_SCREAM_TAIL, .natDexNum = NATIONAL_DEX_SCREAM_TAIL, @@ -4436,6 +4435,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ScreamTail, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ScreamTail, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4471,7 +4471,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isParadoxForm = TRUE, .speciesName = _("BruteBonet"), .cryId = CRY_BRUTE_BONNET, .natDexNum = NATIONAL_DEX_BRUTE_BONNET, @@ -4491,6 +4490,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_BruteBonnet, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BruteBonnet, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4528,7 +4528,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isParadoxForm = TRUE, .speciesName = _("FluttrMane"), .cryId = CRY_FLUTTER_MANE, .natDexNum = NATIONAL_DEX_FLUTTER_MANE, @@ -4548,6 +4547,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_FlutterMane, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 18, .backPic = gMonBackPic_FlutterMane, @@ -4584,7 +4584,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isParadoxForm = TRUE, .speciesName = _("SlithrWing"), .cryId = CRY_SLITHER_WING, .natDexNum = NATIONAL_DEX_SLITHER_WING, @@ -4603,6 +4602,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SlitherWing, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlitherWing, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4638,7 +4638,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isParadoxForm = TRUE, .speciesName = _("SndyShocks"), .cryId = CRY_SANDY_SHOCKS, .natDexNum = NATIONAL_DEX_SANDY_SHOCKS, @@ -4658,6 +4657,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SandyShocks, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandyShocks, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4693,7 +4693,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isParadoxForm = TRUE, .speciesName = _("IronTreads"), .cryId = CRY_IRON_TREADS, .natDexNum = NATIONAL_DEX_IRON_TREADS, @@ -4713,6 +4712,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_IronTreads, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronTreads, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4748,7 +4748,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isParadoxForm = TRUE, .speciesName = _("IronBundle"), .cryId = CRY_IRON_BUNDLE, .natDexNum = NATIONAL_DEX_IRON_BUNDLE, @@ -4768,6 +4767,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_IronBundle, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBundle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4803,7 +4803,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isParadoxForm = TRUE, .speciesName = _("Iron Hands"), .cryId = CRY_IRON_HANDS, .natDexNum = NATIONAL_DEX_IRON_HANDS, @@ -4823,6 +4822,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronHands, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronHands, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4858,7 +4858,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isParadoxForm = TRUE, .speciesName = _("IronJuguls"), .cryId = CRY_IRON_JUGULIS, .natDexNum = NATIONAL_DEX_IRON_JUGULIS, @@ -4878,6 +4877,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_IronJugulis, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_IronJugulis, @@ -4914,7 +4914,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isParadoxForm = TRUE, .speciesName = _("Iron Moth"), .cryId = CRY_IRON_MOTH, .natDexNum = NATIONAL_DEX_IRON_MOTH, @@ -4934,6 +4933,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_IronMoth, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_IronMoth, @@ -4970,7 +4970,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isParadoxForm = TRUE, .speciesName = _("IronThorns"), .cryId = CRY_IRON_THORNS, .natDexNum = NATIONAL_DEX_IRON_THORNS, @@ -4990,6 +4989,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronThorns, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronThorns, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5168,6 +5168,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_GIMMIGHOUL [SPECIES_GIMMIGHOUL_CHEST] = { + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 70, + .baseSpeed = 10, + .baseSpAttack = 75, + .baseSpDefense = 70, .types = MON_TYPES(TYPE_GHOST), .catchRate = 45, .expYield = 60, @@ -5177,25 +5183,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_RATTLED, ABILITY_NONE }, + .bodyColor = BODY_COLOR_RED, .speciesName = _("Gimmighoul"), .cryId = CRY_GIMMIGHOUL, .natDexNum = NATIONAL_DEX_GIMMIGHOUL, - .frontAnimFrames = sAnims_Gimmighoul, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Gimmighoul) - .levelUpLearnset = sGimmighoulLevelUpLearnset, - .teachableLearnset = sGimmighoulTeachableLearnset, - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, - .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), - .baseHP = 45, - .baseAttack = 30, - .baseDefense = 70, - .baseSpeed = 10, - .baseSpAttack = 75, - .baseSpDefense = 70, - .abilities = { ABILITY_RATTLED, ABILITY_NONE }, - .bodyColor = BODY_COLOR_RED, .categoryName = _("Coin Chest"), .height = 3, .weight = 50, @@ -5211,6 +5203,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GimmighoulChest, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, + .frontAnimFrames = sAnims_Gimmighoul, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backAnimId = BACK_ANIM_NONE, + //FOOTPRINT(Gimmighoul) + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .backPic = gMonBackPic_GimmighoulChest, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, @@ -5222,6 +5222,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_GIMMIGHOUL_ROAMING] = { + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 25, + .baseSpeed = 80, + .baseSpAttack = 75, + .baseSpDefense = 45, .types = MON_TYPES(TYPE_GHOST), .catchRate = 45, .expYield = 60, @@ -5231,25 +5237,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_RUN_AWAY, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Gimmighoul"), .cryId = CRY_GIMMIGHOUL, .natDexNum = NATIONAL_DEX_GIMMIGHOUL, - .frontAnimFrames = sAnims_Gimmighoul, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Gimmighoul) - .levelUpLearnset = sGimmighoulLevelUpLearnset, - .teachableLearnset = sGimmighoulTeachableLearnset, - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, - .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), - .baseHP = 45, - .baseAttack = 30, - .baseDefense = 25, - .baseSpeed = 80, - .baseSpAttack = 75, - .baseSpDefense = 45, - .abilities = { ABILITY_RUN_AWAY, ABILITY_NONE }, - .bodyColor = BODY_COLOR_GRAY, .categoryName = _("Coin Hunter"), .height = 1, .weight = 1, @@ -5265,6 +5257,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GimmighoulRoaming, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 11, + .frontAnimFrames = sAnims_Gimmighoul, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backAnimId = BACK_ANIM_NONE, + //FOOTPRINT(Gimmighoul) + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .backPic = gMonBackPic_GimmighoulRoaming, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, @@ -5347,7 +5347,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TABLETS_OF_RUIN, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Wo-Chien"), .cryId = CRY_WO_CHIEN, .natDexNum = NATIONAL_DEX_WO_CHIEN, @@ -5367,6 +5366,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WoChien, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WoChien, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5402,7 +5402,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SWORD_OF_RUIN, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Chien-Pao"), .cryId = CRY_CHIEN_PAO, .natDexNum = NATIONAL_DEX_CHIEN_PAO, @@ -5422,6 +5421,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_ChienPao, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ChienPao, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5457,7 +5457,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_VESSEL_OF_RUIN, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Ting-Lu"), .cryId = CRY_TING_LU, .natDexNum = NATIONAL_DEX_TING_LU, @@ -5477,6 +5476,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_TingLu, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_TingLu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5512,7 +5512,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BEADS_OF_RUIN, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Chi-Yu"), .cryId = CRY_CHI_YU, .natDexNum = NATIONAL_DEX_CHI_YU, @@ -5532,6 +5531,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ChiYu, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 15, .backPic = gMonBackPic_ChiYu, @@ -5568,7 +5568,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isParadoxForm = TRUE, .speciesName = _("RoarngMoon"), .cryId = CRY_ROARING_MOON, .natDexNum = NATIONAL_DEX_ROARING_MOON, @@ -5588,6 +5587,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RoaringMoon, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_RoaringMoon, @@ -5624,7 +5624,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isParadoxForm = TRUE, .speciesName = _("IronVliant"), .cryId = CRY_IRON_VALIANT, .natDexNum = NATIONAL_DEX_IRON_VALIANT, @@ -5643,6 +5642,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronValiant, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronValiant, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5678,8 +5678,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_ORICHALCUM_PULSE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, - .isParadoxForm = TRUE, .speciesName = _("Koraidon"), .cryId = CRY_KORAIDON, .natDexNum = NATIONAL_DEX_KORAIDON, @@ -5699,6 +5697,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Koraidon, + .isLegendary = TRUE, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Koraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5734,8 +5734,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_HADRON_ENGINE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isLegendary = TRUE, - .isParadoxForm = TRUE, .speciesName = _("Miraidon"), .cryId = CRY_MIRAIDON, .natDexNum = NATIONAL_DEX_MIRAIDON, @@ -5755,6 +5753,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Miraidon, + .isLegendary = TRUE, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Miraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5790,7 +5790,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isParadoxForm = TRUE, .speciesName = _("WalkngWake"), .cryId = CRY_WALKING_WAKE, .natDexNum = NATIONAL_DEX_WALKING_WAKE, @@ -5809,6 +5808,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WalkingWake, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WalkingWake, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5844,7 +5844,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isParadoxForm = TRUE, .speciesName = _("IronLeaves"), .cryId = CRY_IRON_LEAVES, .natDexNum = NATIONAL_DEX_IRON_LEAVES, @@ -5863,6 +5862,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronLeaves, + .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronLeaves, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5904,6 +5904,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .categoryName = _("Matcha"), .height = 1, .weight = 11, + .description = COMPOUND_STRING( + "Supposedly, the regrets of a tea\n" + "ceremony master who died before\n" + "perfecting his craft lingered in some\n" + "matcha and became a Pokémon."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -5925,11 +5930,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //FOOTPRINT(Poltchageist) .levelUpLearnset = sPoltchageistLevelUpLearnset, .teachableLearnset = sPoltchageistTeachableLearnset, - .description = COMPOUND_STRING( - "Supposedly, the regrets of a tea\n" - "ceremony master who died before\n" - "perfecting his craft lingered in some\n" - "matcha and became a Pokémon."), .evolutions = EVOLUTION({EVO_ITEM, ITEM_UNREMARKABLE_TEACUP, SPECIES_SINISTCHA_UNREMARKABLE}), }, [SPECIES_POLTCHAGEIST_ARTISAN] = @@ -5957,6 +5957,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .categoryName = _("Matcha"), .height = 1, .weight = 11, + .description = COMPOUND_STRING( + "It has taken up residence in a very\n" + "expensive tea caddy. It takes an\n" + "expert to distinguish the expensive\n" + "tea caddies from the cheap ones."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -5978,11 +5983,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //FOOTPRINT(Poltchageist) .levelUpLearnset = sPoltchageistLevelUpLearnset, .teachableLearnset = sPoltchageistTeachableLearnset, - .description = COMPOUND_STRING( - "It has taken up residence in a very\n" - "expensive tea caddy. It takes an\n" - "expert to distinguish the expensive\n" - "tea caddies from the cheap ones."), .evolutions = EVOLUTION({EVO_ITEM, ITEM_MASTERPIECE_TEACUP, SPECIES_SINISTCHA_MASTERPIECE}), }, @@ -6011,6 +6011,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .categoryName = _("Matcha"), .height = 2, .weight = 22, + .description = COMPOUND_STRING( + "It pretends to be tea, trying to fool\n" + "people into drinking it so it can\n" + "drain their life-force. Its ruse is\n" + "generally unsuccessful."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -6032,11 +6037,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //FOOTPRINT(Sinistcha) .levelUpLearnset = sSinistchaLevelUpLearnset, .teachableLearnset = sSinistchaTeachableLearnset, - .description = COMPOUND_STRING( - "It pretends to be tea, trying to fool\n" - "people into drinking it so it can\n" - "drain their life-force. Its ruse is\n" - "generally unsuccessful."), }, [SPECIES_SINISTCHA_MASTERPIECE] = { @@ -6063,6 +6063,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .categoryName = _("Matcha"), .height = 2, .weight = 22, + .description = COMPOUND_STRING( + "The more stirring it does with the\n" + "tea whisk on its head, the more\n" + "energy it builds up. It does this to\n" + "prepare for battle."), .pokemonScale = 356, .pokemonOffset = 17, .trainerScale = 256, @@ -6084,11 +6089,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //FOOTPRINT(Sinistcha) .levelUpLearnset = sSinistchaLevelUpLearnset, .teachableLearnset = sSinistchaTeachableLearnset, - .description = COMPOUND_STRING( - "The more stirring it does with the\n" - "tea whisk on its head, the more\n" - "energy it builds up. It does this to\n" - "prepare for battle."), }, #endif //P_FAMILY_POLTCHAGEIST @@ -6167,7 +6167,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_FRISK }, .bodyColor = BODY_COLOR_BLACK, - .isLegendary = TRUE, .speciesName = _("Munkidori"), .cryId = CRY_MUNKIDORI, .natDexNum = NATIONAL_DEX_MUNKIDORI, @@ -6187,6 +6186,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Munkidori, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Munkidori, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6222,7 +6222,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_BLACK, - .isLegendary = TRUE, .speciesName = _("Fezndipiti"), .cryId = CRY_FEZANDIPITI, .natDexNum = NATIONAL_DEX_FEZANDIPITI, @@ -6242,6 +6241,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Fezandipiti, + .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fezandipiti, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6342,7 +6342,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_BROWN, - .isParadoxForm = TRUE, .speciesName = _("GouginFire"), .cryId = CRY_GOUGING_FIRE, .natDexNum = NATIONAL_DEX_GOUGING_FIRE, @@ -6365,7 +6364,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GougingFire, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 6, + .backPicYOffset = 6, + .isParadoxForm = TRUE, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GougingFire, .shinyPalette = gMonShinyPalette_GougingFire, @@ -6397,7 +6397,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PROTOSYNTHESIS, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isParadoxForm = TRUE, .speciesName = _("RagingBolt"), .cryId = CRY_RAGING_BOLT, .natDexNum = NATIONAL_DEX_RAGING_BOLT, @@ -6420,7 +6419,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RagingBolt, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, + .isParadoxForm = TRUE, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_RagingBolt, .shinyPalette = gMonShinyPalette_RagingBolt, @@ -6452,7 +6452,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isParadoxForm = TRUE, .speciesName = _("IronBouldr"), .cryId = CRY_IRON_BOULDER, .natDexNum = NATIONAL_DEX_IRON_BOULDER, @@ -6474,7 +6473,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBoulder, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 12, + .backPicYOffset = 12, + .isParadoxForm = TRUE, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronBoulder, .shinyPalette = gMonShinyPalette_IronBoulder, @@ -6506,7 +6506,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_QUARK_DRIVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isParadoxForm = TRUE, .speciesName = _("Iron Crown"), .cryId = CRY_IRON_CROWN, .natDexNum = NATIONAL_DEX_IRON_CROWN, @@ -6529,7 +6528,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronCrown, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, + .isParadoxForm = TRUE, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronCrown, .shinyPalette = gMonShinyPalette_IronCrown, @@ -6544,33 +6544,27 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #if P_FAMILY_TERAPAGOS [SPECIES_TERAPAGOS_NORMAL] = { + .baseHP = 90, + .baseAttack = 65, + .baseDefense = 85, + .baseSpeed = 60, + .baseSpAttack = 65, + .baseSpDefense = 85, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, + .expYield = 90, + .evYield_Defense = 1, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_TERA_SHIFT, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Terapagos"), .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, - .baseHP = 90, - .baseAttack = 65, - .baseDefense = 85, - .baseSpeed = 60, - .baseSpAttack = 65, - .baseSpDefense = 85, - .expYield = 90, - .evYield_Defense = 1, - .abilities = { ABILITY_TERA_SHIFT, ABILITY_NONE }, .height = 2, .weight = 65, .description = COMPOUND_STRING( @@ -6582,6 +6576,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + //FOOTPRINT(Terapagos) + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, + .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosNormal, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6599,34 +6599,28 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_TERASTAL] = { + .baseHP = 95, + .baseAttack = 95, + .baseDefense = 110, + .baseSpeed = 85, + .baseSpAttack = 105, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, + .expYield = 120, + .evYield_Defense = 2, + .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_TERA_SHELL, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Terapagos"), .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, - .baseHP = 95, - .baseAttack = 95, - .baseDefense = 110, - .baseSpeed = 85, - .baseSpAttack = 105, - .baseSpDefense = 110, - .expYield = 120, - .evYield_Defense = 2, - .evYield_SpDefense = 2, - .abilities = { ABILITY_TERA_SHELL, ABILITY_NONE }, .height = 3, .weight = 160, .description = COMPOUND_STRING( @@ -6638,6 +6632,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + //FOOTPRINT(Terapagos) + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, + .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosTerastal, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6655,33 +6655,27 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = [SPECIES_TERAPAGOS_STELLAR] = { + .baseHP = 160, + .baseAttack = 105, + .baseDefense = 110, + .baseSpeed = 85, + .baseSpAttack = 130, + .baseSpDefense = 110, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, + .expYield = 140, + .evYield_HP = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_TERAFORM_ZERO, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Terapagos"), .cryId = CRY_TERAPAGOS, .natDexNum = NATIONAL_DEX_TERAPAGOS, .categoryName = _("Tera"), - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, - .baseHP = 160, - .baseAttack = 105, - .baseDefense = 110, - .baseSpeed = 85, - .baseSpAttack = 130, - .baseSpDefense = 110, - .expYield = 140, - .evYield_HP = 3, - .abilities = { ABILITY_TERAFORM_ZERO, ABILITY_NONE }, .height = 17, .weight = 770, .description = COMPOUND_STRING( @@ -6693,6 +6687,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + //FOOTPRINT(Terapagos) + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, + .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosStellar, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6729,7 +6729,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_POISON_PUPPETEER, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isMythical = TRUE, .speciesName = _("Pecharunt"), .cryId = CRY_PECHARUNT, .natDexNum = NATIONAL_DEX_PECHARUNT, @@ -6745,6 +6744,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, + .isMythical = TRUE, //.frontPic = gMonFrontPic_Pecharunt, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, From a00fbef0d0d1cb4209f30a6e963dcd6421065558 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 14:23:58 -0300 Subject: [PATCH 15/23] Gen 1 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_1.h | 1520 ++++++++++++------------- 1 file changed, 758 insertions(+), 762 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1.h b/src/data/pokemon/species_info/gen_1.h index bfdd91b3e217..0a948d27f81c 100644 --- a/src/data/pokemon/species_info/gen_1.h +++ b/src/data/pokemon/species_info/gen_1.h @@ -153,15 +153,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 388, .trainerOffset = 6, .frontPic = gMonFrontPic_Venusaur, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_VenusaurF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Venusaur, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Venusaur, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_VenusaurF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_H_SHAKE, @@ -225,11 +225,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_VenusaurMega, .iconPalIndex = 4, FOOTPRINT(Venusaur) + .isMegaEvolution = TRUE, .levelUpLearnset = sVenusaurLevelUpLearnset, .teachableLearnset = sVenusaurTeachableLearnset, .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, .formChangeTable = sVenusaurFormChangeTable, - .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -283,11 +283,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_VenusaurGigantamax, .iconPalIndex = 0, FOOTPRINT(Venusaur) + .isGigantamax = TRUE, .levelUpLearnset = sVenusaurLevelUpLearnset, .teachableLearnset = sVenusaurTeachableLearnset, .formSpeciesIdTable = sVenusaurFormSpeciesIdTable, .formChangeTable = sVenusaurFormChangeTable, - .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR @@ -508,11 +508,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_CharizardMegaX, .iconPalIndex = 0, FOOTPRINT(Charizard) + .isMegaEvolution = TRUE, .levelUpLearnset = sCharizardLevelUpLearnset, .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, - .isMegaEvolution = TRUE, }, [SPECIES_CHARIZARD_MEGA_Y] = @@ -563,11 +563,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_CharizardMegaY, .iconPalIndex = 0, FOOTPRINT(Charizard) + .isMegaEvolution = TRUE, .levelUpLearnset = sCharizardLevelUpLearnset, .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, - .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -620,11 +620,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_CharizardGigantamax, .iconPalIndex = 0, FOOTPRINT(Charizard) + .isGigantamax = TRUE, .levelUpLearnset = sCharizardLevelUpLearnset, .teachableLearnset = sCharizardTeachableLearnset, .formSpeciesIdTable = sCharizardFormSpeciesIdTable, .formChangeTable = sCharizardFormChangeTable, - .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER @@ -847,11 +847,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_BlastoiseMega, .iconPalIndex = 2, FOOTPRINT(Blastoise) + .isMegaEvolution = TRUE, .levelUpLearnset = sBlastoiseLevelUpLearnset, .teachableLearnset = sBlastoiseTeachableLearnset, .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, .formChangeTable = sBlastoiseFormChangeTable, - .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -904,11 +904,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_BlastoiseGigantamax, .iconPalIndex = 0, FOOTPRINT(Blastoise) + .isGigantamax = TRUE, .levelUpLearnset = sBlastoiseLevelUpLearnset, .teachableLearnset = sBlastoiseTeachableLearnset, .formSpeciesIdTable = sBlastoiseFormSpeciesIdTable, .formChangeTable = sBlastoiseFormChangeTable, - .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE @@ -962,9 +962,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Caterpie, .iconPalIndex = 1, FOOTPRINT(Caterpie) + .tmIlliterate = TRUE, .levelUpLearnset = sCaterpieLevelUpLearnset, .teachableLearnset = sCaterpieTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_METAPOD}), }, @@ -1016,9 +1016,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Metapod, .iconPalIndex = 1, FOOTPRINT(Metapod) + .tmIlliterate = TRUE, .levelUpLearnset = sMetapodLevelUpLearnset, .teachableLearnset = sMetapodTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BUTTERFREE}), }, @@ -1069,16 +1069,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Butterfree, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_ButterfreeF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Butterfree, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 12, .backPic = gMonBackPic_Butterfree, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_ButterfreeF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -1145,11 +1145,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ButterfreeGigantamax, .iconPalIndex = 0, FOOTPRINT(Butterfree) + .isGigantamax = TRUE, .levelUpLearnset = sButterfreeLevelUpLearnset, .teachableLearnset = sButterfreeTeachableLearnset, .formSpeciesIdTable = sButterfreeFormSpeciesIdTable, .formChangeTable = sButterfreeFormChangeTable, - .isGigantamax = TRUE, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE @@ -1204,9 +1204,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Weedle, .iconPalIndex = 2, FOOTPRINT(Weedle) + .tmIlliterate = TRUE, .levelUpLearnset = sWeedleLevelUpLearnset, .teachableLearnset = sWeedleTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 7, SPECIES_KAKUNA}), }, @@ -1259,9 +1259,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kakuna, .iconPalIndex = 2, FOOTPRINT(Kakuna) + .tmIlliterate = TRUE, .levelUpLearnset = sKakunaLevelUpLearnset, .teachableLearnset = sKakunaTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEEDRILL}), }, @@ -1384,11 +1384,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_BeedrillMega, .iconPalIndex = 2, FOOTPRINT(Beedrill) + .isMegaEvolution = TRUE, .levelUpLearnset = sBeedrillLevelUpLearnset, .teachableLearnset = sBeedrillTeachableLearnset, .formSpeciesIdTable = sBeedrillFormSpeciesIdTable, .formChangeTable = sBeedrillFormChangeTable, - .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE @@ -1615,11 +1615,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_PidgeotMega, .iconPalIndex = 0, FOOTPRINT(Pidgeot) + .isMegaEvolution = TRUE, .levelUpLearnset = sPidgeotLevelUpLearnset, .teachableLearnset = sPidgeotTeachableLearnset, .formSpeciesIdTable = sPidgeotFormSpeciesIdTable, .formChangeTable = sPidgeotFormChangeTable, - .isMegaEvolution = TRUE, }, #endif #endif //P_FAMILY_PIDGEY @@ -1660,15 +1660,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Rattata, - .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicFemale = gMonFrontPic_RattataF, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Rattata, .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Rattata, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_RattataF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, @@ -1718,15 +1718,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Raticate, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_RaticateF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Raticate, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Raticate, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_RaticateF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, @@ -1790,9 +1790,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RattataAlolan, .iconPalIndex = 2, FOOTPRINT(Rattata) + .isAlolanForm = TRUE, .levelUpLearnset = sRattataAlolanLevelUpLearnset, .teachableLearnset = sRattataAlolanTeachableLearnset, - .isAlolanForm = TRUE, .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}), }, @@ -1846,10 +1846,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RaticateAlolan, .iconPalIndex = 2, FOOTPRINT(Raticate) + .isAlolanForm = TRUE, .levelUpLearnset = sRaticateAlolanLevelUpLearnset, .teachableLearnset = sRaticateAlolanTeachableLearnset, .formSpeciesIdTable = sRaticateFormSpeciesIdTable, - .isAlolanForm = TRUE, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA @@ -2112,10 +2112,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FOOTPRINT(Pichu) - .levelUpLearnset = sPichuLevelUpLearnset, - .teachableLearnset = sPichuTeachableLearnset, - .formSpeciesIdTable = sPichuFormSpeciesIdTable, .frontPic = gMonFrontPic_Pichu, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, @@ -2129,6 +2125,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pichu, .iconSprite = gMonIcon_Pichu, .iconPalIndex = 1, + FOOTPRINT(Pichu) + .levelUpLearnset = sPichuLevelUpLearnset, + .teachableLearnset = sPichuTeachableLearnset, + .formSpeciesIdTable = sPichuFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}), }, @@ -2163,10 +2163,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 20, .trainerScale = 256, .trainerOffset = 0, - FOOTPRINT(Pichu) - .levelUpLearnset = sPichuLevelUpLearnset, - .teachableLearnset = sPichuTeachableLearnset, - .formSpeciesIdTable = sPichuFormSpeciesIdTable, .frontPic = gMonFrontPic_PichuSpikyEared, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, @@ -2180,6 +2176,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PichuSpikyEared, .iconSprite = gMonIcon_PichuSpikyEared, .iconPalIndex = 1, + FOOTPRINT(Pichu) + .levelUpLearnset = sPichuLevelUpLearnset, + .teachableLearnset = sPichuTeachableLearnset, + .formSpeciesIdTable = sPichuFormSpeciesIdTable, }, #endif //P_GEN_2_CROSS_EVOS @@ -2217,26 +2217,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_Pikachu, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_PikachuF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Pikachu, .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 25, .backPic = gMonBackPic_Pikachu, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_PikachuF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, @@ -2248,6 +2244,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSpriteFemale = gMonIcon_PikachuF, .iconPalIndexFemale = 2, #endif + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, .formChangeTable = sPikachuFormChangeTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}, {EVO_NONE, 0, SPECIES_RAICHU_ALOLAN}), @@ -2280,15 +2280,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuCosplay, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2302,6 +2298,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuCosplay, .iconSprite = gMonIcon_PikachuCosplay, .iconPalIndex = 2, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_ROCK_STAR] = @@ -2330,15 +2330,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuRockStar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2352,6 +2348,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuRockStar, .iconSprite = gMonIcon_PikachuRockStar, .iconPalIndex = 1, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_BELLE] = @@ -2381,15 +2381,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuBelle, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2403,6 +2399,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuBelle, .iconSprite = gMonIcon_PikachuBelle, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_POP_STAR] = @@ -2432,15 +2432,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuPopStar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2454,6 +2450,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPopStar, .iconSprite = gMonIcon_PikachuPopStar, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_PH_D] = @@ -2482,15 +2482,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuPhD, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2504,6 +2500,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPhD, .iconSprite = gMonIcon_PikachuPhD, .iconPalIndex = 1, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_LIBRE] = @@ -2532,15 +2532,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .description = gPikachuPokedexText, .pokemonScale = 479, .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .description = gPikachuPokedexText, .frontPic = gMonFrontPic_PikachuLibre, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2554,6 +2550,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuLibre, .iconSprite = gMonIcon_PikachuLibre, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, #endif //P_COSPLAY_PIKACHU_FORMS @@ -2586,19 +2586,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across many different regions."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuOriginalCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2612,6 +2608,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuOriginalCap, .iconSprite = gMonIcon_PikachuOriginalCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_HOENN_CAP] = @@ -2640,19 +2640,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Hoenn region together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuHoennCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2666,6 +2662,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuHoennCap, .iconSprite = gMonIcon_PikachuHoennCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_SINNOH_CAP] = @@ -2694,19 +2694,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Sinnoh region together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuSinnohCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2720,6 +2716,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuSinnohCap, .iconSprite = gMonIcon_PikachuSinnohCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_UNOVA_CAP] = @@ -2748,19 +2748,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Unova region together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuUnovaCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2774,6 +2770,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuUnovaCap, .iconSprite = gMonIcon_PikachuUnovaCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_KALOS_CAP] = @@ -2802,19 +2802,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Kalos region together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuKalosCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2828,6 +2824,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuKalosCap, .iconSprite = gMonIcon_PikachuKalosCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_ALOLA_CAP] = @@ -2856,19 +2856,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the Alola region together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuAlolaCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2882,6 +2878,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuAlolaCap, .iconSprite = gMonIcon_PikachuAlolaCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_PARTNER_CAP] = @@ -2911,19 +2911,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed as the two overcame\n" "many hardships together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuPartnerCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2937,6 +2933,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPartnerCap, .iconSprite = gMonIcon_PikachuPartnerCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, [SPECIES_PIKACHU_WORLD_CAP] = @@ -2965,19 +2965,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 4, .weight = 60, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "This Pikachu wears its partner's cap, which\n" "is proof of the strong bond Pikachu and\n" "its partner formed during adventures\n" "across the world together."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuWorldCap, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -2991,6 +2987,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuWorldCap, .iconSprite = gMonIcon_PikachuWorldCap, .iconPalIndex = 0, + FOOTPRINT(Pikachu) + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, #endif //P_CAP_PIKACHU_FORMS @@ -3022,19 +3022,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 210, .weight = 0, - FOOTPRINT(Pikachu) - .levelUpLearnset = sPikachuLevelUpLearnset, - .teachableLearnset = sPikachuTeachableLearnset, - .formSpeciesIdTable = sPikachuFormSpeciesIdTable, - .pokemonScale = 479, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, .description = COMPOUND_STRING( "When it smashes its opponents with\n" "its bolt-shaped tail, it delivers a\n" "surge of electricity equivalent to a\n" "lightning strike."), + .pokemonScale = 479, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_PikachuGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -3048,8 +3044,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuGigantamax, .iconSprite = gMonIcon_PikachuGigantamax, .iconPalIndex = 2, - .formChangeTable = sPikachuFormChangeTable, + FOOTPRINT(Pikachu) .isGigantamax = TRUE, + .levelUpLearnset = sPikachuLevelUpLearnset, + .teachableLearnset = sPikachuTeachableLearnset, + .formSpeciesIdTable = sPikachuFormSpeciesIdTable, + .formChangeTable = sPikachuFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -3090,8 +3090,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 8, .weight = 300, - FOOTPRINT(Raichu) - .formSpeciesIdTable = sRaichuFormSpeciesIdTable, .description = COMPOUND_STRING( "If it stores too much electricity, its\n" "behavior turns aggressive. To avoid this,\n" @@ -3102,8 +3100,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Raichu, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_RaichuF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Raichu, @@ -3116,8 +3114,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Raichu, .iconSprite = gMonIcon_Raichu, .iconPalIndex = 0, + FOOTPRINT(Raichu) .levelUpLearnset = sRaichuLevelUpLearnset, .teachableLearnset = sRaichuTeachableLearnset, + .formSpeciesIdTable = sRaichuFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -3146,9 +3146,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 7, .weight = 210, - FOOTPRINT(Raichu) - .formSpeciesIdTable = sRaichuFormSpeciesIdTable, - .isAlolanForm = TRUE, .description = COMPOUND_STRING( "It uses psychokinesis to control\n" "electricity. It focuses psychic energy\n" @@ -3172,8 +3169,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RaichuAlolan, .iconSprite = gMonIcon_RaichuAlolan, .iconPalIndex = 2, + FOOTPRINT(Raichu) + .isAlolanForm = TRUE, .levelUpLearnset = sRaichuAlolanLevelUpLearnset, .teachableLearnset = sRaichuAlolanTeachableLearnset, + .formSpeciesIdTable = sRaichuFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU @@ -3205,8 +3205,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 6, .weight = 120, - FOOTPRINT(Sandshrew) - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .description = COMPOUND_STRING( "When it curls up in a ball, it can make any\n" "attack bounce off harmlessly. Its hide has\n" @@ -3229,8 +3227,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sandshrew, .iconSprite = gMonIcon_Sandshrew, .iconPalIndex = 2, + FOOTPRINT(Sandshrew) .levelUpLearnset = sSandshrewLevelUpLearnset, .teachableLearnset = sSandshrewTeachableLearnset, + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 22, SPECIES_SANDSLASH}), }, @@ -3260,8 +3260,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 10, .weight = 295, - FOOTPRINT(Sandslash) - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .description = COMPOUND_STRING( "It curls up in a ball to protect itself from\n" "enemy attacks. It also curls up to prevent\n" @@ -3284,8 +3282,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sandslash, .iconSprite = gMonIcon_Sandslash, .iconPalIndex = 2, + FOOTPRINT(Sandslash) .levelUpLearnset = sSandslashLevelUpLearnset, .teachableLearnset = sSandslashTeachableLearnset, + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -3315,8 +3315,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 7, .weight = 400, - FOOTPRINT(Sandshrew) - .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .description = COMPOUND_STRING( "Life on mountains covered with deep snow\n" "has granted this Pokémon a body of ice\n" @@ -3339,9 +3337,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SandshrewAlolan, .iconSprite = gMonIcon_SandshrewAlolan, .iconPalIndex = 0, + FOOTPRINT(Sandshrew) + .isAlolanForm = TRUE, .levelUpLearnset = sSandshrewAlolanLevelUpLearnset, .teachableLearnset = sSandshrewAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}), }, @@ -3371,8 +3371,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 12, .weight = 550, - FOOTPRINT(Sandslash) - .formSpeciesIdTable = sSandslashFormSpeciesIdTable, .description = COMPOUND_STRING( "It uses large, hooked claws to cut a path\n" "through deep snow as it runs.\n" @@ -3395,9 +3393,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SandslashAlolan, .iconSprite = gMonIcon_SandslashAlolan, .iconPalIndex = 0, + FOOTPRINT(Sandslash) + .isAlolanForm = TRUE, .levelUpLearnset = sSandslashAlolanLevelUpLearnset, .teachableLearnset = sSandslashAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sSandslashFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW @@ -3947,17 +3947,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fox"), .height = 6, .weight = 99, - .pokemonScale = 542, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Vulpix) - .formSpeciesIdTable = sVulpixFormSpeciesIdTable, .description = COMPOUND_STRING( "It can freely control fire, making fiery\n" "orbs fly like will-o'-the-wisps. Just\n" "before evolution, its six tails grow hot \n" "as if on fire."), + .pokemonScale = 542, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Vulpix, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, @@ -3971,8 +3969,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Vulpix, .iconSprite = gMonIcon_Vulpix, .iconPalIndex = 5, + FOOTPRINT(Vulpix) .levelUpLearnset = sVulpixLevelUpLearnset, .teachableLearnset = sVulpixTeachableLearnset, + .formSpeciesIdTable = sVulpixFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}), }, @@ -4003,17 +4003,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fox"), .height = 11, .weight = 199, - .pokemonScale = 339, - .pokemonOffset = 10, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Ninetales) - .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, .description = COMPOUND_STRING( "It has long been said that each of the\n" "nine tails embody an enchanted power.\n" "A long-lived Ninetales will have fur that\n" "shines like gold."), + .pokemonScale = 339, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Ninetales, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -4027,8 +4025,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ninetales, .iconSprite = gMonIcon_Ninetales, .iconPalIndex = 3, + FOOTPRINT(Ninetales) .levelUpLearnset = sNinetalesLevelUpLearnset, .teachableLearnset = sNinetalesTeachableLearnset, + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -4058,17 +4058,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fox"), .height = 6, .weight = 99, - .pokemonScale = 542, - .pokemonOffset = 19, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Vulpix) - .formSpeciesIdTable = sVulpixFormSpeciesIdTable, .description = COMPOUND_STRING( "They live together in a skulk, helping\n" "one another. In hot weather, this Pokémon\n" "makes ice shards with its six tails and\n" "sprays them around to cool itself off."), + .pokemonScale = 542, + .pokemonOffset = 19, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_VulpixAlolan, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, @@ -4082,10 +4080,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VulpixAlolan, .iconSprite = gMonIcon_VulpixAlolan, .iconPalIndex = 2, + FOOTPRINT(Vulpix) + .isAlolanForm = TRUE, .levelUpLearnset = sVulpixAlolanLevelUpLearnset, .teachableLearnset = sVulpixAlolanTeachableLearnset, + .formSpeciesIdTable = sVulpixFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}), - .isAlolanForm = TRUE, }, [SPECIES_NINETALES_ALOLAN] = @@ -4115,17 +4115,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fox"), .height = 11, .weight = 199, - .pokemonScale = 339, - .pokemonOffset = 10, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Ninetales) - .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, .description = COMPOUND_STRING( "While it will guide travelers who get lost\n" "on a snowy mountain down to the\n" "mountain's base, it won't forgive anyone\n" "who harms nature."), + .pokemonScale = 339, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_NinetalesAlolan, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -4139,9 +4137,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_NinetalesAlolan, .iconSprite = gMonIcon_NinetalesAlolan, .iconPalIndex = 2, + FOOTPRINT(Ninetales) + .isAlolanForm = TRUE, .levelUpLearnset = sNinetalesAlolanLevelUpLearnset, .teachableLearnset = sNinetalesAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX @@ -4363,16 +4363,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Zubat, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_ZubatF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Zubat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 16, .backPic = gMonBackPic_Zubat, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_ZubatF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -4421,16 +4421,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Golbat, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_GolbatF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Golbat, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 10, .backPic = gMonBackPic_Golbat, - .backPicSize = MON_COORDS_SIZE(56, 40), .backPicFemale = gMonBackPic_GolbatF, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE, @@ -4597,15 +4597,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gloom, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_GloomF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Gloom, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Gloom, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_GloomF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SLIDE, @@ -4664,15 +4664,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Vileplume, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_VileplumeF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Vileplume, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Vileplume, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_VileplumeF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -5012,17 +5012,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mole"), .height = 2, .weight = 8, - .pokemonScale = 833, - .pokemonOffset = 25, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Diglett) - .formSpeciesIdTable = sDiglettFormSpeciesIdTable, .description = COMPOUND_STRING( "Diglett are raised in most farms.\n" "The reason is simple--wherever they\n" "burrow, the soil is left perfectly tilled\n" "for growing delicious crops."), + .pokemonScale = 833, + .pokemonOffset = 25, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Diglett, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, @@ -5037,8 +5035,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Diglett, .iconSprite = gMonIcon_Diglett, .iconPalIndex = 2, + FOOTPRINT(Diglett) .levelUpLearnset = sDiglettLevelUpLearnset, .teachableLearnset = sDiglettTeachableLearnset, + .formSpeciesIdTable = sDiglettFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO}), }, @@ -5068,17 +5068,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mole"), .height = 7, .weight = 333, - .pokemonScale = 406, - .pokemonOffset = 18, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Dugtrio) - .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, .description = COMPOUND_STRING( "Because the triplets originally split from\n" "one body, they think exactly alike.\n" "They work cooperatively to burrow\n" "endlessly through the ground."), + .pokemonScale = 406, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Dugtrio, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, @@ -5093,8 +5091,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dugtrio, .iconSprite = gMonIcon_Dugtrio, .iconPalIndex = 2, + FOOTPRINT(Dugtrio) .levelUpLearnset = sDugtrioLevelUpLearnset, .teachableLearnset = sDugtrioTeachableLearnset, + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -5124,17 +5124,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mole"), .height = 2, .weight = 10, - .pokemonScale = 833, - .pokemonOffset = 25, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Diglett) - .formSpeciesIdTable = sDiglettFormSpeciesIdTable, .description = COMPOUND_STRING( "The metal-rich geology of its habitat\n" "caused it to develop steel whiskers on its\n" "head that change shape depending on its\n" "mood and when communicating with others."), + .pokemonScale = 833, + .pokemonOffset = 25, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_DiglettAlolan, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 19, @@ -5148,9 +5146,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_DiglettAlolan, .iconSprite = gMonIcon_DiglettAlolan, .iconPalIndex = 2, + FOOTPRINT(Diglett) + .isAlolanForm = TRUE, .levelUpLearnset = sDiglettAlolanLevelUpLearnset, .teachableLearnset = sDiglettAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sDiglettFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}), }, @@ -5181,17 +5181,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mole"), .height = 7, .weight = 666, - .pokemonScale = 406, - .pokemonOffset = 18, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Dugtrio) - .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, .description = COMPOUND_STRING( "Their beautiful, metallic whiskers create\n" "a sort of protective helmet on\n" "heir heads, and they also function\n" "as highly precise sensors."), + .pokemonScale = 406, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_DugtrioAlolan, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, @@ -5205,9 +5203,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_DugtrioAlolan, .iconSprite = gMonIcon_DugtrioAlolan, .iconPalIndex = 2, + FOOTPRINT(Dugtrio) + .isAlolanForm = TRUE, .levelUpLearnset = sDugtrioAlolanLevelUpLearnset, .teachableLearnset = sDugtrioAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT @@ -5239,8 +5239,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Scratch Cat"), .height = 4, .weight = 42, - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "Meowth withdraw their sharp claws into\n" "their paws to silently sneak about.\n" @@ -5264,8 +5262,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Meowth, .iconSprite = gMonIcon_Meowth, .iconPalIndex = 1, + FOOTPRINT(Meowth) .levelUpLearnset = sMeowthLevelUpLearnset, .teachableLearnset = sMeowthTeachableLearnset, + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formChangeTable = sMeowthFormChangeTable, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERSIAN}), }, @@ -5296,8 +5296,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Classy Cat"), .height = 10, .weight = 320, - FOOTPRINT(Persian) - .formSpeciesIdTable = sPersianFormSpeciesIdTable, .description = COMPOUND_STRING( "A Persian's six bold whiskers sense air\n" "movements to determine what is in its\n" @@ -5321,8 +5319,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Persian, .iconSprite = gMonIcon_Persian, .iconPalIndex = 1, + FOOTPRINT(Persian) .levelUpLearnset = sPersianLevelUpLearnset, .teachableLearnset = sPersianTeachableLearnset, + .formSpeciesIdTable = sPersianFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -5352,8 +5352,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Scratch Cat"), .height = 4, .weight = 42, - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "It's accustomed to luxury because it used\n" "to live with Alolan royalty. Highly smart\n" @@ -5376,9 +5374,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthAlolan, .iconSprite = gMonIcon_MeowthAlolan, .iconPalIndex = 2, + FOOTPRINT(Meowth) + .isAlolanForm = TRUE, .levelUpLearnset = sMeowthAlolanLevelUpLearnset, .teachableLearnset = sMeowthAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}), }, @@ -5408,8 +5408,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Classy Cat"), .height = 11, .weight = 330, - FOOTPRINT(Persian) - .formSpeciesIdTable = sPersianFormSpeciesIdTable, .description = COMPOUND_STRING( "It looks down on everyone other than\n" "itself. In contrast to its lovely face, it\n" @@ -5432,9 +5430,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PersianAlolan, .iconSprite = gMonIcon_PersianAlolan, .iconPalIndex = 2, + FOOTPRINT(Persian) + .isAlolanForm = TRUE, .levelUpLearnset = sPersianAlolanLevelUpLearnset, .teachableLearnset = sPersianAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sPersianFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -5464,8 +5464,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Scratch Cat"), .height = 4, .weight = 75, - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "Living with a savage, seafaring people has\n" "hardened its body so much that parts of it\n" @@ -5488,9 +5486,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthGalarian, .iconSprite = gMonIcon_MeowthGalarian, .iconPalIndex = 0, + FOOTPRINT(Meowth) + .isGalarianForm = TRUE, .levelUpLearnset = sMeowthGalarianLevelUpLearnset, .teachableLearnset = sMeowthGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERRSERKER}), }, @@ -5573,8 +5573,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Scratch Cat"), .height = 330, .weight = 0, - FOOTPRINT(Meowth) - .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .description = COMPOUND_STRING( "The pattern that has appeared on\n" "its giant coin is thought to be the\n" @@ -5597,9 +5595,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthGigantamax, .iconSprite = gMonIcon_MeowthGigantamax, .iconPalIndex = 1, + FOOTPRINT(Meowth) + .isGigantamax = TRUE, .levelUpLearnset = sMeowthLevelUpLearnset, .teachableLearnset = sMeowthTeachableLearnset, - .isGigantamax = TRUE, + .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .formChangeTable = sMeowthFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -5901,8 +5901,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Puppy"), .height = 7, .weight = 190, - FOOTPRINT(Growlithe) - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .description = COMPOUND_STRING( "Its superb sense of smell ensures that\n" "this Pokémon won't forget any scent,\n" @@ -5926,8 +5924,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Growlithe, .iconSprite = gMonIcon_Growlithe, .iconPalIndex = 3, + FOOTPRINT(Growlithe) .levelUpLearnset = sGrowlitheLevelUpLearnset, .teachableLearnset = sGrowlitheTeachableLearnset, + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}), }, @@ -5956,8 +5956,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Legendary"), .height = 19, .weight = 1550, - FOOTPRINT(Arcanine) - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .description = COMPOUND_STRING( "This fleet-footed Pokémon is said to run\n" "over 6,200 miles in a single day and night.\n" @@ -5981,8 +5979,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Arcanine, .iconSprite = gMonIcon_Arcanine, .iconPalIndex = 3, + FOOTPRINT(Arcanine) .levelUpLearnset = sArcanineLevelUpLearnset, .teachableLearnset = sArcanineTeachableLearnset, + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -6011,8 +6011,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Scout"), .height = 8, .weight = 227, - FOOTPRINT(Growlithe) - .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .description = COMPOUND_STRING( "They patrol their territory in pairs.\n" "It's believed the igneous rock components\n" @@ -6035,9 +6033,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GrowlitheHisuian, .iconSprite = gMonIcon_GrowlitheHisuian, .iconPalIndex = 0, + FOOTPRINT(Growlithe) + .isHisuianForm = TRUE, .levelUpLearnset = sGrowlitheHisuianLevelUpLearnset, .teachableLearnset = sGrowlitheHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUIAN}), }, @@ -6066,8 +6066,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Legendary"), .height = 20, .weight = 1680, - FOOTPRINT(Arcanine) - .formSpeciesIdTable = sArcanineFormSpeciesIdTable, .description = COMPOUND_STRING( "Snaps at its foes with fangs cloaked in\n" "blazing flame. Despite its bulk, it deftly\n" @@ -6090,9 +6088,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ArcanineHisuian, .iconSprite = gMonIcon_ArcanineHisuian, .iconPalIndex = 0, + FOOTPRINT(Arcanine) + .isHisuianForm = TRUE, .levelUpLearnset = sArcanineHisuianLevelUpLearnset, .teachableLearnset = sArcanineHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sArcanineFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE @@ -6316,16 +6316,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Politoed, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_PolitoedF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Politoed, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 40, .backPic = gMonBackPic_Politoed, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_PolitoedF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -6438,15 +6438,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Kadabra, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_KadabraF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Kadabra, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Kadabra, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_KadabraF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -6473,6 +6473,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = ALAKAZAM_SP_DEF, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 50, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 250, + #elif P_UPDATED_EXP_YIELDS >= GEN_7 + .expYield = 225, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 221, + #else + .expYield = 186, + #endif .evYield_SpAttack = 3, .itemRare = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), @@ -6480,26 +6489,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS, ABILITY_MAGIC_GUARD }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Alakazam"), + .cryId = CRY_ALAKAZAM, .natDexNum = NATIONAL_DEX_ALAKAZAM, .categoryName = _("Psi"), - FOOTPRINT(Alakazam) - .levelUpLearnset = sAlakazamLevelUpLearnset, - .teachableLearnset = sAlakazamTeachableLearnset, - .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, - .formChangeTable = sAlakazamFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 250, - #elif P_UPDATED_EXP_YIELDS >= GEN_7 - .expYield = 225, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 221, - #else - .expYield = 186, - #endif - .abilities = { ABILITY_SYNCHRONIZE, ABILITY_INNER_FOCUS, ABILITY_MAGIC_GUARD }, - .cryId = CRY_ALAKAZAM, .height = 15, .weight = 480, .description = COMPOUND_STRING( @@ -6512,15 +6507,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Alakazam, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_AlakazamF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Alakazam, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Alakazam, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_AlakazamF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW_STUTTER, @@ -6528,6 +6523,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Alakazam, .iconSprite = gMonIcon_Alakazam, .iconPalIndex = 2, + FOOTPRINT(Alakazam) + .levelUpLearnset = sAlakazamLevelUpLearnset, + .teachableLearnset = sAlakazamTeachableLearnset, + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, + .formChangeTable = sAlakazamFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -6557,11 +6557,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Psi"), .height = 12, .weight = 480, - FOOTPRINT(Alakazam) - .levelUpLearnset = sAlakazamLevelUpLearnset, - .teachableLearnset = sAlakazamTeachableLearnset, - .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, - .formChangeTable = sAlakazamFormChangeTable, .description = COMPOUND_STRING( "Having traded away its muscles, Alakazam's\n" "true power has been unleashed. With its\n" @@ -6584,7 +6579,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_AlakazamMega, .iconSprite = gMonIcon_AlakazamMega, .iconPalIndex = 2, + FOOTPRINT(Alakazam) .isMegaEvolution = TRUE, + .levelUpLearnset = sAlakazamLevelUpLearnset, + .teachableLearnset = sAlakazamTeachableLearnset, + .formSpeciesIdTable = sAlakazamFormSpeciesIdTable, + .formChangeTable = sAlakazamFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA @@ -6740,11 +6740,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Superpower"), .height = 16, .weight = 1300, - FOOTPRINT(Machamp) - .levelUpLearnset = sMachampLevelUpLearnset, - .teachableLearnset = sMachampTeachableLearnset, - .formSpeciesIdTable = sMachampFormSpeciesIdTable, - .formChangeTable = sMachampFormChangeTable, .description = COMPOUND_STRING( "It is impossible to defend against punches\n" "and chops doled out by its four arms.\n" @@ -6767,6 +6762,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Machamp, .iconSprite = gMonIcon_Machamp, .iconPalIndex = 0, + FOOTPRINT(Machamp) + .levelUpLearnset = sMachampLevelUpLearnset, + .teachableLearnset = sMachampTeachableLearnset, + .formSpeciesIdTable = sMachampFormSpeciesIdTable, + .formChangeTable = sMachampFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -6796,11 +6796,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Superpower"), .height = 250, .weight = 0, - FOOTPRINT(Machamp) - .levelUpLearnset = sMachampLevelUpLearnset, - .teachableLearnset = sMachampTeachableLearnset, - .formSpeciesIdTable = sMachampFormSpeciesIdTable, - .formChangeTable = sMachampFormChangeTable, .description = COMPOUND_STRING( "One of these Pokémon once used\n" "its immeasurable strength to lift a\n" @@ -6823,7 +6818,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MachampGigantamax, .iconSprite = gMonIcon_MachampGigantamax, .iconPalIndex = 0, + FOOTPRINT(Machamp) .isGigantamax = TRUE, + .levelUpLearnset = sMachampLevelUpLearnset, + .teachableLearnset = sMachampTeachableLearnset, + .formSpeciesIdTable = sMachampFormSpeciesIdTable, + .formChangeTable = sMachampFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP @@ -7154,17 +7154,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Rock"), .height = 4, .weight = 200, - .pokemonScale = 347, - .pokemonOffset = 18, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Geodude) - .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .description = COMPOUND_STRING( "It climbs mountain paths using only the\n" "power of its arms. Because they look just\n" "like boulders lining paths, hikers may step\n" "on them without noticing."), + .pokemonScale = 347, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Geodude, .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 19, @@ -7179,8 +7177,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Geodude, .iconSprite = gMonIcon_Geodude, .iconPalIndex = 1, + FOOTPRINT(Geodude) .levelUpLearnset = sGeodudeLevelUpLearnset, .teachableLearnset = sGeodudeTeachableLearnset, + .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER}), }, @@ -7210,17 +7210,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Rock"), .height = 10, .weight = 1050, - .pokemonScale = 256, - .pokemonOffset = 2, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Graveler) - .formSpeciesIdTable = sGravelerFormSpeciesIdTable, .description = COMPOUND_STRING( "They descend from mountains by tumbling\n" "down steep slopes. They are so brutal,\n" "they smash aside obstructing trees and\n" "massive boulders with thunderous tackles."), + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Graveler, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, @@ -7234,8 +7232,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Graveler, .iconSprite = gMonIcon_Graveler, .iconPalIndex = 1, + FOOTPRINT(Graveler) .levelUpLearnset = sGravelerLevelUpLearnset, .teachableLearnset = sGravelerTeachableLearnset, + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM}), }, @@ -7266,8 +7266,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Megaton"), .height = 14, .weight = 3000, - FOOTPRINT(Golem) - .formSpeciesIdTable = sGolemFormSpeciesIdTable, .description = COMPOUND_STRING( "It is said to live in volcanic craters\n" "on mountain peaks. Once a year, it sheds\n" @@ -7290,8 +7288,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Golem, .iconSprite = gMonIcon_Golem, .iconPalIndex = 2, + FOOTPRINT(Golem) .levelUpLearnset = sGolemLevelUpLearnset, .teachableLearnset = sGolemTeachableLearnset, + .formSpeciesIdTable = sGolemFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -7321,18 +7321,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Rock"), .height = 4, .weight = 203, - .isAlolanForm = TRUE, - .pokemonScale = 347, - .pokemonOffset = 18, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Geodude) - .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .description = COMPOUND_STRING( "Its body is a magnetic stone. Iron sand\n" "attach to parts of its body with stronger\n" "magnetism. If you carelessly step on one,\n" "it will headbutt and shock you in anger."), + .pokemonScale = 347, + .pokemonOffset = 18, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_GeodudeAlolan, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, @@ -7347,8 +7344,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GeodudeAlolan, .iconSprite = gMonIcon_GeodudeAlolan, .iconPalIndex = 2, + FOOTPRINT(Geodude) + .isAlolanForm = TRUE, .levelUpLearnset = sGeodudeAlolanLevelUpLearnset, .teachableLearnset = sGeodudeAlolanTeachableLearnset, + .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}), }, @@ -7378,18 +7378,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Rock"), .height = 10, .weight = 1100, - .isAlolanForm = TRUE, - .pokemonScale = 256, - .pokemonOffset = 2, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Graveler) - .formSpeciesIdTable = sGravelerFormSpeciesIdTable, .description = COMPOUND_STRING( "When two Graveler smash each other over\n" "dravite, their favorite food, they cause\n" "flashes of light and booming noises.\n" "People call them “fireworks of the earth.”"), + .pokemonScale = 256, + .pokemonOffset = 2, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_GravelerAlolan, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, @@ -7403,8 +7400,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GravelerAlolan, .iconSprite = gMonIcon_GravelerAlolan, .iconPalIndex = 2, + FOOTPRINT(Graveler) + .isAlolanForm = TRUE, .levelUpLearnset = sGravelerAlolanLevelUpLearnset, .teachableLearnset = sGravelerAlolanTeachableLearnset, + .formSpeciesIdTable = sGravelerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLAN}), }, @@ -7435,9 +7435,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Megaton"), .height = 17, .weight = 3160, - .isAlolanForm = TRUE, - FOOTPRINT(Golem) - .formSpeciesIdTable = sGolemFormSpeciesIdTable, .description = COMPOUND_STRING( "It fires rocks charged with electricity.\n" "Even if the rock isn't fired that\n" @@ -7460,8 +7457,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GolemAlolan, .iconSprite = gMonIcon_GolemAlolan, .iconPalIndex = 2, + FOOTPRINT(Golem) + .isAlolanForm = TRUE, .levelUpLearnset = sGolemAlolanLevelUpLearnset, .teachableLearnset = sGolemAlolanTeachableLearnset, + .formSpeciesIdTable = sGolemFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE @@ -7492,8 +7492,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fire Horse"), .height = 10, .weight = 300, - FOOTPRINT(Ponyta) - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .description = COMPOUND_STRING( "A Ponyta is very weak at birth. It can\n" "barely stand up. Its legs become stronger\n" @@ -7517,8 +7515,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ponyta, .iconSprite = gMonIcon_Ponyta, .iconPalIndex = 3, + FOOTPRINT(Ponyta) .levelUpLearnset = sPonytaLevelUpLearnset, .teachableLearnset = sPonytaTeachableLearnset, + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH}), }, @@ -7547,17 +7547,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fire Horse"), .height = 17, .weight = 950, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 289, - .trainerOffset = 1, - FOOTPRINT(Rapidash) - .formSpeciesIdTable = sRapidashFormSpeciesIdTable, .description = COMPOUND_STRING( "It usually canters casually in the fields\n" "and plains. But once a Rapidash turns\n" "serious, its fiery manes flare and blaze\n" "as it gallops its way up to 150 mph."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 289, + .trainerOffset = 1, .frontPic = gMonFrontPic_Rapidash, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -7571,8 +7569,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Rapidash, .iconSprite = gMonIcon_Rapidash, .iconPalIndex = 3, + FOOTPRINT(Rapidash) .levelUpLearnset = sRapidashLevelUpLearnset, .teachableLearnset = sRapidashTeachableLearnset, + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -7601,9 +7601,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Unique Horn"), .height = 8, .weight = 240, - .isGalarianForm = TRUE, - FOOTPRINT(Ponyta) - .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .description = COMPOUND_STRING( "Its small horn hides a healing power.\n" "This Pokémon will look into your eyes and\n" @@ -7626,8 +7623,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PonytaGalarian, .iconSprite = gMonIcon_PonytaGalarian, .iconPalIndex = 2, + FOOTPRINT(Ponyta) + .isGalarianForm = TRUE, .levelUpLearnset = sPonytaGalarianLevelUpLearnset, .teachableLearnset = sPonytaGalarianTeachableLearnset, + .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALARIAN}), }, @@ -7656,18 +7656,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Unique Horn"), .height = 17, .weight = 800, - .isGalarianForm = TRUE, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 289, - .trainerOffset = 1, - FOOTPRINT(Rapidash) - .formSpeciesIdTable = sRapidashFormSpeciesIdTable, .description = COMPOUND_STRING( "Little can stand up to its psycho cut.\n" "Unleashed from this Pokémon's horn,\n" "the move will punch a hole right\n" "through a thick metal sheet."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 289, + .trainerOffset = 1, .frontPic = gMonFrontPic_RapidashGalarian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -7681,8 +7678,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RapidashGalarian, .iconSprite = gMonIcon_RapidashGalarian, .iconPalIndex = 2, + FOOTPRINT(Rapidash) + .isGalarianForm = TRUE, .levelUpLearnset = sRapidashGalarianLevelUpLearnset, .teachableLearnset = sRapidashGalarianTeachableLearnset, + .formSpeciesIdTable = sRapidashFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA @@ -7714,17 +7714,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Dopey"), .height = 12, .weight = 360, - .pokemonScale = 256, - .pokemonOffset = 10, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Slowpoke) - .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .description = COMPOUND_STRING( "It catches prey by dipping its tail in\n" "water at the side of a river. But it often\n" "forgets what it is doing and spends entire\n" "days just loafing at water's edge."), + .pokemonScale = 256, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Slowpoke, .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 16, @@ -7738,8 +7736,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowpoke, .iconSprite = gMonIcon_Slowpoke, .iconPalIndex = 0, + FOOTPRINT(Slowpoke) .levelUpLearnset = sSlowpokeLevelUpLearnset, .teachableLearnset = sSlowpokeTeachableLearnset, + .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO}, {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}, {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}), @@ -7771,8 +7771,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Hermit Crab"), .height = 16, .weight = 785, - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "Its tail has a Shellder firmly attached\n" "with a bite. As a result, the tail can't be\n" @@ -7795,8 +7793,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowbro, .iconSprite = gMonIcon_Slowbro, .iconPalIndex = 0, + FOOTPRINT(Slowbro) .levelUpLearnset = sSlowbroLevelUpLearnset, .teachableLearnset = sSlowbroTeachableLearnset, + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .formChangeTable = sSlowbroFormChangeTable, }, @@ -7827,8 +7827,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Royal"), .height = 20, .weight = 795, - FOOTPRINT(Slowking) - .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .description = COMPOUND_STRING( "It undertakes research every day to\n" "solve the mysteries of the world.\n" @@ -7851,8 +7849,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowking, .iconSprite = gMonIcon_Slowking, .iconPalIndex = 0, + FOOTPRINT(Slowking) .levelUpLearnset = sSlowkingLevelUpLearnset, .teachableLearnset = sSlowkingTeachableLearnset, + .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, }, #endif //P_GEN_2_CROSS_EVOS @@ -7883,8 +7883,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Hermit Crab"), .height = 20, .weight = 1200, - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "When bathed in the energy of Mega\n" "Evolution, Shellder converts into\n" @@ -7907,10 +7905,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowbroMega, .iconSprite = gMonIcon_SlowbroMega, .iconPalIndex = 0, + FOOTPRINT(Slowbro) + .isMegaEvolution = TRUE, .levelUpLearnset = sSlowbroLevelUpLearnset, .teachableLearnset = sSlowbroTeachableLearnset, + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .formChangeTable = sSlowbroFormChangeTable, - .isMegaEvolution = TRUE, }, #endif //P_MEGA_EVOLUTIONS @@ -7940,17 +7940,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Dopey"), .height = 12, .weight = 360, - .pokemonScale = 256, - .pokemonOffset = 10, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Slowpoke) - .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .description = COMPOUND_STRING( "Although it is normally zoned out, its\n" "expression abruptly sharpens on occasion.\n" "The cause seems to lie in Slowpoke's diet,\n" "which also give their tails a spicy flavor."), + .pokemonScale = 256, + .pokemonOffset = 10, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_SlowpokeGalarian, .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 19, @@ -7964,9 +7962,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowpokeGalarian, .iconSprite = gMonIcon_SlowpokeGalarian, .iconPalIndex = 1, + FOOTPRINT(Slowpoke) + .isGalarianForm = TRUE, .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, .teachableLearnset = sSlowpokeGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALARIAN}, {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALARIAN}), }, @@ -7997,8 +7997,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Hermit Crab"), .height = 16, .weight = 705, - FOOTPRINT(Slowbro) - .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, .description = COMPOUND_STRING( "A Shellder bite set off a chemical reaction\n" "with the spices inside Slowbro's body,\n" @@ -8021,9 +8019,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowbroGalarian, .iconSprite = gMonIcon_SlowbroGalarian, .iconPalIndex = 0, + FOOTPRINT(Slowbro) + .isGalarianForm = TRUE, .levelUpLearnset = sSlowbroGalarianLevelUpLearnset, .teachableLearnset = sSlowbroGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, }, #if P_GEN_2_CROSS_EVOS @@ -8052,8 +8052,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Hexpert"), .height = 18, .weight = 795, - FOOTPRINT(Slowking) - .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, .description = COMPOUND_STRING( "A combination of toxins and the shock of\n" "evolving has increased Shellder's\n" @@ -8076,9 +8074,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowkingGalarian, .iconSprite = gMonIcon_SlowkingGalarian, .iconPalIndex = 2, + FOOTPRINT(Slowking) + .isGalarianForm = TRUE, .levelUpLearnset = sSlowkingGalarianLevelUpLearnset, .teachableLearnset = sSlowkingGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, }, #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS @@ -8296,8 +8296,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Duck"), .height = 8, .weight = 150, - FOOTPRINT(Farfetchd) - .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .description = COMPOUND_STRING( "It is always seen with a stick from a plant.\n" "Apparently, there are good sticks and bad\n" @@ -8320,8 +8318,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Farfetchd, .iconSprite = gMonIcon_Farfetchd, .iconPalIndex = 1, + FOOTPRINT(Farfetchd) .levelUpLearnset = sFarfetchdLevelUpLearnset, .teachableLearnset = sFarfetchdTeachableLearnset, + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -8351,8 +8351,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Duck"), .height = 8, .weight = 420, - FOOTPRINT(Farfetchd) - .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .description = COMPOUND_STRING( "The stalks of leeks are thicker and longer\n" "in the Galar region. Brave Farfetch'd\n" @@ -8375,9 +8373,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_FarfetchdGalarian, .iconSprite = gMonIcon_FarfetchdGalarian, .iconPalIndex = 1, + FOOTPRINT(Farfetchd) + .isGalarianForm = TRUE, .levelUpLearnset = sFarfetchdGalarianLevelUpLearnset, .teachableLearnset = sFarfetchdGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}), }, @@ -8473,15 +8473,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 257, .trainerOffset = -1, .frontPic = gMonFrontPic_Doduo, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_DoduoF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Doduo, .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Doduo, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_DoduoF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, @@ -8537,15 +8537,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 268, .trainerOffset = 0, .frontPic = gMonFrontPic_Dodrio, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_DodrioF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dodrio, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Dodrio, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_DodrioF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, @@ -8693,8 +8693,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sludge"), .height = 9, .weight = 300, - FOOTPRINT(Grimer) - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .description = COMPOUND_STRING( "Born from polluted sludge in the sea,\n" "Grimer's favorite food is anything filthy.\n" @@ -8717,8 +8715,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Grimer, .iconSprite = gMonIcon_Grimer, .iconPalIndex = 2, + FOOTPRINT(Grimer) .levelUpLearnset = sGrimerLevelUpLearnset, .teachableLearnset = sGrimerTeachableLearnset, + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK}), }, @@ -8749,8 +8749,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sludge"), .height = 12, .weight = 300, - FOOTPRINT(Muk) - .formSpeciesIdTable = sMukFormSpeciesIdTable, .description = COMPOUND_STRING( "It prefers warm and humid habitats.\n" "In the summertime, the toxic substances\n" @@ -8774,8 +8772,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Muk, .iconSprite = gMonIcon_Muk, .iconPalIndex = 2, + FOOTPRINT(Muk) .levelUpLearnset = sMukLevelUpLearnset, .teachableLearnset = sMukTeachableLearnset, + .formSpeciesIdTable = sMukFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -8805,9 +8805,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sludge"), .height = 7, .weight = 420, - .isAlolanForm = TRUE, - FOOTPRINT(Grimer) - .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .description = COMPOUND_STRING( "There are a hundred or so of them living\n" "in Alola's waste-disposal site. They're all\n" @@ -8830,8 +8827,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GrimerAlolan, .iconSprite = gMonIcon_GrimerAlolan, .iconPalIndex = 1, + FOOTPRINT(Grimer) + .isAlolanForm = TRUE, .levelUpLearnset = sGrimerAlolanLevelUpLearnset, .teachableLearnset = sGrimerAlolanTeachableLearnset, + .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLAN}), }, @@ -8863,9 +8863,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sludge"), .height = 10, .weight = 520, - FOOTPRINT(Muk) - .formSpeciesIdTable = sMukFormSpeciesIdTable, - .isAlolanForm = TRUE, .description = COMPOUND_STRING( "While it's unexpectedly quiet and friendly,\n" "if it's not fed any trash for a while,,\n" @@ -8888,8 +8885,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MukAlolan, .iconSprite = gMonIcon_MukAlolan, .iconPalIndex = 0, + FOOTPRINT(Muk) + .isAlolanForm = TRUE, .levelUpLearnset = sMukAlolanLevelUpLearnset, .teachableLearnset = sMukAlolanTeachableLearnset, + .formSpeciesIdTable = sMukFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER @@ -9133,29 +9133,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 75, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 250, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 225, + #else + .expYield = 190, + #endif .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + .abilities = GENGAR_ABILITIES, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Gengar"), .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), - FOOTPRINT(Gengar) - .levelUpLearnset = sGengarLevelUpLearnset, - .teachableLearnset = sGengarTeachableLearnset, - .formSpeciesIdTable = sGengarFormSpeciesIdTable, - .formChangeTable = sGengarFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 250, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 225, - #else - .expYield = 190, - #endif - .abilities = GENGAR_ABILITIES, .height = 15, .weight = 405, .description = COMPOUND_STRING( @@ -9180,6 +9175,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Gengar, .iconSprite = gMonIcon_Gengar, .iconPalIndex = 2, + FOOTPRINT(Gengar) + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, + .formSpeciesIdTable = sGengarFormSpeciesIdTable, + .formChangeTable = sGengarFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -9205,12 +9205,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Gengar"), .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), - FOOTPRINT(Gengar) - .levelUpLearnset = sGengarLevelUpLearnset, - .teachableLearnset = sGengarTeachableLearnset, - .formSpeciesIdTable = sGengarFormSpeciesIdTable, - .formChangeTable = sGengarFormChangeTable, - .isMegaEvolution = TRUE, .height = 14, .weight = 405, .description = COMPOUND_STRING( @@ -9235,6 +9229,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GengarMega, .iconSprite = gMonIcon_GengarMega, .iconPalIndex = 2, + FOOTPRINT(Gengar) + .isMegaEvolution = TRUE, + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, + .formSpeciesIdTable = sGengarFormSpeciesIdTable, + .formChangeTable = sGengarFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS @@ -9261,12 +9261,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .speciesName = _("Gengar"), .natDexNum = NATIONAL_DEX_GENGAR, .categoryName = _("Shadow"), - FOOTPRINT(Gengar) - .levelUpLearnset = sGengarLevelUpLearnset, - .teachableLearnset = sGengarTeachableLearnset, - .formSpeciesIdTable = sGengarFormSpeciesIdTable, - .formChangeTable = sGengarFormChangeTable, - .isGigantamax = TRUE, .height = 200, .weight = 0, .description = COMPOUND_STRING( @@ -9291,6 +9285,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GengarGigantamax, .iconSprite = gMonIcon_GengarGigantamax, .iconPalIndex = 2, + FOOTPRINT(Gengar) + .isGigantamax = TRUE, + .levelUpLearnset = sGengarLevelUpLearnset, + .teachableLearnset = sGengarTeachableLearnset, + .formSpeciesIdTable = sGengarFormSpeciesIdTable, + .formChangeTable = sGengarFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY @@ -9377,11 +9377,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Iron Snake"), .height = 92, .weight = 4000, - FOOTPRINT(Steelix) - .levelUpLearnset = sSteelixLevelUpLearnset, - .teachableLearnset = sSteelixTeachableLearnset, - .formSpeciesIdTable = sSteelixFormSpeciesIdTable, - .formChangeTable = sSteelixFormChangeTable, .description = COMPOUND_STRING( "Steelix live even further underground\n" "than Onix. This Pokémon is known to dig\n" @@ -9392,16 +9387,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 516, .trainerOffset = 13, .frontPic = gMonFrontPic_Steelix, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_SteelixF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Steelix, .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 45, .backPic = gMonBackPic_Steelix, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_SteelixF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, @@ -9409,6 +9404,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Steelix, .iconSprite = gMonIcon_Steelix, .iconPalIndex = 0, + FOOTPRINT(Steelix) + .levelUpLearnset = sSteelixLevelUpLearnset, + .teachableLearnset = sSteelixTeachableLearnset, + .formSpeciesIdTable = sSteelixFormSpeciesIdTable, + .formChangeTable = sSteelixFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -9438,11 +9438,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Iron Snake"), .height = 105, .weight = 7400, - FOOTPRINT(Steelix) - .levelUpLearnset = sSteelixLevelUpLearnset, - .teachableLearnset = sSteelixTeachableLearnset, - .formSpeciesIdTable = sSteelixFormSpeciesIdTable, - .formChangeTable = sSteelixFormChangeTable, .description = COMPOUND_STRING( "The cells within its body, crystallized by\n" "the energy produced from Mega Evolution,\n" @@ -9465,7 +9460,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SteelixMega, .iconSprite = gMonIcon_SteelixMega, .iconPalIndex = 0, + FOOTPRINT(Steelix) .isMegaEvolution = TRUE, + .levelUpLearnset = sSteelixLevelUpLearnset, + .teachableLearnset = sSteelixTeachableLearnset, + .formSpeciesIdTable = sSteelixFormSpeciesIdTable, + .formChangeTable = sSteelixFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS @@ -9561,16 +9561,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Hypno, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_HypnoF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Hypno, .frontAnimId = ANIM_GROW_VIBRATE, .frontAnimDelay = 40, .backPic = gMonBackPic_Hypno, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_HypnoF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -9664,11 +9664,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Pincer"), .height = 13, .weight = 600, - FOOTPRINT(Kingler) - .levelUpLearnset = sKinglerLevelUpLearnset, - .teachableLearnset = sKinglerTeachableLearnset, - .formSpeciesIdTable = sKinglerFormSpeciesIdTable, - .formChangeTable = sKinglerFormChangeTable, .description = COMPOUND_STRING( "It waves its huge, oversized claw in the\n" "air to communicate with others.\n" @@ -9692,6 +9687,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kingler, .iconSprite = gMonIcon_Kingler, .iconPalIndex = 0, + FOOTPRINT(Kingler) + .levelUpLearnset = sKinglerLevelUpLearnset, + .teachableLearnset = sKinglerTeachableLearnset, + .formSpeciesIdTable = sKinglerFormSpeciesIdTable, + .formChangeTable = sKinglerFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -9721,11 +9721,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Pincer"), .height = 190, .weight = 0, - FOOTPRINT(Kingler) - .levelUpLearnset = sKinglerLevelUpLearnset, - .teachableLearnset = sKinglerTeachableLearnset, - .formSpeciesIdTable = sKinglerFormSpeciesIdTable, - .formChangeTable = sKinglerFormChangeTable, .description = COMPOUND_STRING( "The flow of Gigantamax energy has\n" "spurred this Pokémon's left pincer\n" @@ -9748,7 +9743,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_KinglerGigantamax, .iconSprite = gMonIcon_KinglerGigantamax, .iconPalIndex = 0, + FOOTPRINT(Kingler) .isGigantamax = TRUE, + .levelUpLearnset = sKinglerLevelUpLearnset, + .teachableLearnset = sKinglerTeachableLearnset, + .formSpeciesIdTable = sKinglerFormSpeciesIdTable, + .formChangeTable = sKinglerFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY @@ -9787,17 +9787,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Ball"), .height = 5, .weight = 104, - .pokemonScale = 364, - .pokemonOffset = -8, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Voltorb) - .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, .description = COMPOUND_STRING( "It bears an uncanny and unexplained\n" "resemblance to a Poké Ball. Because it\n" "explodes at the slightest shock, even\n" "veteran Trainers treat it with caution."), + .pokemonScale = 364, + .pokemonOffset = -8, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Voltorb, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 15, @@ -9811,8 +9809,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Voltorb, .iconSprite = gMonIcon_Voltorb, .iconPalIndex = 0, + FOOTPRINT(Voltorb) .levelUpLearnset = sVoltorbLevelUpLearnset, .teachableLearnset = sVoltorbTeachableLearnset, + .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ELECTRODE}), }, @@ -9841,17 +9841,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Ball"), .height = 12, .weight = 666, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Electrode) - .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, .description = COMPOUND_STRING( "They appear in great numbers at electric\n" "power plants. Because they feed on\n" "electricity, they cause massive and\n" "chaotic blackouts in nearby cities."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Electrode, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, @@ -9865,8 +9863,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Electrode, .iconSprite = gMonIcon_Electrode, .iconPalIndex = 0, + FOOTPRINT(Electrode) .levelUpLearnset = sElectrodeLevelUpLearnset, .teachableLearnset = sElectrodeTeachableLearnset, + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -9895,17 +9895,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sphere"), .height = 5, .weight = 130, - .pokemonScale = 364, - .pokemonOffset = -8, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Voltorb) - .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, .description = COMPOUND_STRING( "It esembles an ancient Poké Ball design.\n" "When excited, it discharges the electric\n" "current it has stored in its belly, then\n" "lets out a great, uproarious laugh."), + .pokemonScale = 364, + .pokemonOffset = -8, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_VoltorbHisuian, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, @@ -9919,9 +9917,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VoltorbHisuian, .iconSprite = gMonIcon_VoltorbHisuian, .iconPalIndex = 0, + FOOTPRINT(Voltorb) + .isHisuianForm = TRUE, .levelUpLearnset = sVoltorbHisuianLevelUpLearnset, .teachableLearnset = sVoltorbHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUIAN}), }, @@ -9950,17 +9950,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sphere"), .height = 12, .weight = 710, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Electrode) - .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, .description = COMPOUND_STRING( "The tissue on the surface of its body is\n" "similar in composition to an Apricorn.\n" "When irritated, it lets loose an electric\n" "current equal to 20 lightning bolts."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ElectrodeHisuian, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, @@ -9974,9 +9972,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ElectrodeHisuian, .iconSprite = gMonIcon_ElectrodeHisuian, .iconPalIndex = 1, + FOOTPRINT(Electrode) + .isHisuianForm = TRUE, .levelUpLearnset = sElectrodeHisuianLevelUpLearnset, .teachableLearnset = sElectrodeHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB @@ -10072,8 +10072,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Coconut"), .height = 20, .weight = 1200, - FOOTPRINT(Exeggutor) - .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .description = COMPOUND_STRING( "Originally from the tropics, Exeggutor's\n" "heads grow larger from exposure to strong\n" @@ -10096,8 +10094,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Exeggutor, .iconSprite = gMonIcon_Exeggutor, .iconPalIndex = 1, + FOOTPRINT(Exeggutor) .levelUpLearnset = sExeggutorLevelUpLearnset, .teachableLearnset = sExeggutorTeachableLearnset, + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -10126,8 +10126,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Coconut"), .height = 109, .weight = 4156, - FOOTPRINT(Exeggutor) - .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, .description = COMPOUND_STRING( "Alola is the best environment for\n" "this Pokémon. Local people take pride\n" @@ -10150,9 +10148,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ExeggutorAlolan, .iconSprite = gMonIcon_ExeggutorAlolan, .iconPalIndex = 1, + FOOTPRINT(Exeggutor) + .isAlolanForm = TRUE, .levelUpLearnset = sExeggutorAlolanLevelUpLearnset, .teachableLearnset = sExeggutorAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE @@ -10240,17 +10240,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Bone Keeper"), .height = 10, .weight = 450, - .pokemonScale = 293, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Marowak) - .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .description = COMPOUND_STRING( "A Marowak is the evolved form of a Cubone\n" "that has grown tough by overcoming the\n" "grief of losing its mother. Its tempered\n" "and hardened spirit is not easily broken."), + .pokemonScale = 293, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Marowak, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 8, @@ -10264,8 +10262,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Marowak, .iconSprite = gMonIcon_Marowak, .iconPalIndex = 2, + FOOTPRINT(Marowak) .levelUpLearnset = sMarowakLevelUpLearnset, .teachableLearnset = sMarowakTeachableLearnset, + .formSpeciesIdTable = sMarowakFormSpeciesIdTable, }, #if P_ALOLAN_FORMS @@ -10295,17 +10295,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Bone Keeper"), .height = 10, .weight = 340, - .pokemonScale = 293, - .pokemonOffset = 12, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Marowak) - .formSpeciesIdTable = sMarowakFormSpeciesIdTable, .description = COMPOUND_STRING( "The cursed flames that light up the bone\n" "carried by this Pokémon are said\n" "to cause both mental and physical\n" "pain that will never fade."), + .pokemonScale = 293, + .pokemonOffset = 12, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MarowakAlolan, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -10319,9 +10317,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MarowakAlolan, .iconSprite = gMonIcon_MarowakAlolan, .iconPalIndex = 1, + FOOTPRINT(Marowak) + .isAlolanForm = TRUE, .levelUpLearnset = sMarowakAlolanLevelUpLearnset, .teachableLearnset = sMarowakAlolanTeachableLearnset, - .isAlolanForm = TRUE, + .formSpeciesIdTable = sMarowakFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE @@ -10673,11 +10673,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - #if P_UPDATED_ABILITIES >= GEN_8 - .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH }, - #else - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, - #endif + #if P_UPDATED_ABILITIES >= GEN_8 + .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH }, + #else + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + #endif .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Koffing"), .cryId = CRY_KOFFING, @@ -10733,19 +10733,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), + #if P_UPDATED_ABILITIES >= GEN_8 + .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH }, + #else + .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, + #endif + .bodyColor = BODY_COLOR_PURPLE, .noFlip = TRUE, .speciesName = _("Weezing"), .cryId = CRY_WEEZING, .natDexNum = NATIONAL_DEX_WEEZING, .categoryName = _("Poison Gas"), - FOOTPRINT(Weezing) - .formSpeciesIdTable = sWeezingFormSpeciesIdTable, - #if P_UPDATED_ABILITIES >= GEN_8 - .abilities = { ABILITY_LEVITATE, ABILITY_NEUTRALIZING_GAS, ABILITY_STENCH }, - #else - .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, - #endif - .bodyColor = BODY_COLOR_PURPLE, .height = 12, .weight = 95, .description = COMPOUND_STRING( @@ -10771,8 +10769,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Weezing, .iconSprite = gMonIcon_Weezing, .iconPalIndex = 2, + FOOTPRINT(Weezing) .levelUpLearnset = sWeezingLevelUpLearnset, .teachableLearnset = sWeezingTeachableLearnset, + .formSpeciesIdTable = sWeezingFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -10803,9 +10803,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Poison Gas"), .height = 30, .weight = 160, - FOOTPRINT(Weezing) - .formSpeciesIdTable = sWeezingFormSpeciesIdTable, - .isGalarianForm = TRUE, .description = COMPOUND_STRING( "Long ago, when droves of factories fouled\n" "the air with pollution, it changed into this\n" @@ -10829,8 +10826,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_WeezingGalarian, .iconSprite = gMonIcon_WeezingGalarian, .iconPalIndex = 1, + FOOTPRINT(Weezing) + .isGalarianForm = TRUE, .levelUpLearnset = sWeezingGalarianLevelUpLearnset, .teachableLearnset = sWeezingGalarianTeachableLearnset, + .formSpeciesIdTable = sWeezingFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING @@ -10871,15 +10871,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Rhyhorn, - .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicFemale = gMonFrontPic_RhyhornF, + .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicSizeFemale = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Rhyhorn, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Rhyhorn, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_RhyhornF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, @@ -10928,15 +10928,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 299, .trainerOffset = 2, .frontPic = gMonFrontPic_Rhydon, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_RhydonF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Rhydon, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Rhydon, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_RhydonF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE_LOW, @@ -10993,15 +10993,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 369, .trainerOffset = 7, .frontPic = gMonFrontPic_Rhyperior, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_RhyperiorF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Rhyperior, .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Rhyperior, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_RhyperiorF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, @@ -11274,8 +11274,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 334, .trainerOffset = 4, .frontPic = gMonFrontPic_Tangrowth, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_TangrowthF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Tangrowth, @@ -11321,20 +11321,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Parent"), .height = 22, .weight = 800, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 387, - .trainerOffset = 8, - FOOTPRINT(Kangaskhan) - .levelUpLearnset = sKangaskhanLevelUpLearnset, - .teachableLearnset = sKangaskhanTeachableLearnset, - .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, - .formChangeTable = sKangaskhanFormChangeTable, .description = COMPOUND_STRING( "If you come across a young Kangaskhan\n" "playing by itself, never try to catch it.\n" "The baby's parent is sure to be in the area,\n" "and it will become violently enraged."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, .frontPic = gMonFrontPic_Kangaskhan, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -11348,6 +11343,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kangaskhan, .iconSprite = gMonIcon_Kangaskhan, .iconPalIndex = 2, + FOOTPRINT(Kangaskhan) + .levelUpLearnset = sKangaskhanLevelUpLearnset, + .teachableLearnset = sKangaskhanTeachableLearnset, + .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, + .formChangeTable = sKangaskhanFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -11376,21 +11376,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Parent"), .height = 22, .weight = 1000, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 387, - .trainerOffset = 8, - FOOTPRINT(Kangaskhan) - .levelUpLearnset = sKangaskhanLevelUpLearnset, - .teachableLearnset = sKangaskhanTeachableLearnset, - .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, - .formChangeTable = sKangaskhanFormChangeTable, - .isMegaEvolution = TRUE, .description = COMPOUND_STRING( "When the mother sees the back of her\n" "Mega-Evolved child, it makes her think\n" "of the day when her child will inevitably\n" "leave her."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, .frontPic = gMonFrontPic_KangaskhanMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -11404,6 +11398,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_KangaskhanMega, .iconSprite = gMonIcon_KangaskhanMega, .iconPalIndex = 2, + FOOTPRINT(Kangaskhan) + .isMegaEvolution = TRUE, + .levelUpLearnset = sKangaskhanLevelUpLearnset, + .teachableLearnset = sKangaskhanTeachableLearnset, + .formSpeciesIdTable = sKangaskhanFormSpeciesIdTable, + .formChangeTable = sKangaskhanFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN @@ -11620,15 +11620,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Goldeen, - .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicFemale = gMonFrontPic_GoldeenF, + .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicSizeFemale = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Goldeen, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Goldeen, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_GoldeenF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -11678,15 +11678,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Seaking, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_SeakingF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Seaking, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_Seaking, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_SeakingF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -11822,11 +11822,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 60, .baseSpAttack = 70, .baseSpDefense = 90, - #if P_UPDATED_TYPES >= GEN_6 - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), - #else - .types = MON_TYPES(TYPE_PSYCHIC), - #endif + #if P_UPDATED_TYPES >= GEN_6 + .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), + #else + .types = MON_TYPES(TYPE_PSYCHIC), + #endif .catchRate = 145, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 62 : 78, .evYield_SpDefense = 1, @@ -11881,26 +11881,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpeed = 90, .baseSpAttack = 100, .baseSpDefense = 120, + .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 161 : 136, + .evYield_SpDefense = 2, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_SOUNDPROOF, ABILITY_FILTER, ABILITY_TECHNICIAN }, + .bodyColor = BODY_COLOR_PINK, .speciesName = _("Mr. Mime"), .cryId = CRY_MR_MIME, .natDexNum = NATIONAL_DEX_MR_MIME, - FOOTPRINT(MrMime) - .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, - #if P_UPDATED_TYPES >= GEN_6 - .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), - #else - .types = MON_TYPES(TYPE_PSYCHIC), - #endif - .evYield_SpDefense = 2, - .abilities = { ABILITY_SOUNDPROOF, ABILITY_FILTER, ABILITY_TECHNICIAN }, - .bodyColor = BODY_COLOR_PINK, .categoryName = _("Barrier"), .height = 13, .weight = 545, @@ -11926,8 +11920,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MrMime, .iconSprite = gMonIcon_MrMime, .iconPalIndex = 0, + FOOTPRINT(MrMime) .levelUpLearnset = sMrMimeLevelUpLearnset, .teachableLearnset = sMrMimeTeachableLearnset, + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -11956,8 +11952,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Dancing"), .height = 14, .weight = 568, - FOOTPRINT(MrMime) - .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .description = COMPOUND_STRING( "Its talent is tap-dancing. It can radiate\n" "chilliness from the bottoms of its feet to\n" @@ -11980,9 +11974,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MrMimeGalarian, .iconSprite = gMonIcon_MrMimeGalarian, .iconPalIndex = 0, + FOOTPRINT(MrMime) + .isGalarianForm = TRUE, .levelUpLearnset = sMrMimeGalarianLevelUpLearnset, .teachableLearnset = sMrMimeGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_MR_RIME}), }, @@ -12075,8 +12071,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 293, .trainerOffset = 2, .frontPic = gMonFrontPic_Scyther, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_ScytherF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Scyther, @@ -12124,11 +12120,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Pincer"), .height = 18, .weight = 1180, - FOOTPRINT(Scizor) - .levelUpLearnset = sScizorLevelUpLearnset, - .teachableLearnset = sScizorTeachableLearnset, - .formSpeciesIdTable = sScizorFormSpeciesIdTable, - .formChangeTable = sScizorFormChangeTable, .description = COMPOUND_STRING( "A Scizor has a body with the hardness of\n" "steel. It is not easily fazed by ordinary\n" @@ -12139,8 +12130,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Scizor, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_ScizorF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Scizor, @@ -12154,6 +12145,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Scizor, .iconSprite = gMonIcon_Scizor, .iconPalIndex = 0, + FOOTPRINT(Scizor) + .levelUpLearnset = sScizorLevelUpLearnset, + .teachableLearnset = sScizorTeachableLearnset, + .formSpeciesIdTable = sScizorFormSpeciesIdTable, + .formChangeTable = sScizorFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -12182,12 +12178,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Pincer"), .height = 20, .weight = 1250, - FOOTPRINT(Scizor) - .levelUpLearnset = sScizorLevelUpLearnset, - .teachableLearnset = sScizorTeachableLearnset, - .formSpeciesIdTable = sScizorFormSpeciesIdTable, - .formChangeTable = sScizorFormChangeTable, - .isMegaEvolution = TRUE, .description = COMPOUND_STRING( "The excess energy that bathes this\n" "Pokémon keeps it in constant danger of\n" @@ -12210,6 +12200,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ScizorMega, .iconSprite = gMonIcon_ScizorMega, .iconPalIndex = 0, + FOOTPRINT(Scizor) + .isMegaEvolution = TRUE, + .levelUpLearnset = sScizorLevelUpLearnset, + .teachableLearnset = sScizorTeachableLearnset, + .formSpeciesIdTable = sScizorFormSpeciesIdTable, + .formChangeTable = sScizorFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS @@ -12757,11 +12753,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Stag Beetle"), .height = 15, .weight = 550, - FOOTPRINT(Pinsir) - .levelUpLearnset = sPinsirLevelUpLearnset, - .teachableLearnset = sPinsirTeachableLearnset, - .formSpeciesIdTable = sPinsirFormSpeciesIdTable, - .formChangeTable = sPinsirFormChangeTable, .description = COMPOUND_STRING( "Their pincers are strong enough to\n" "shatter thick logs. Because they dislike\n" @@ -12784,6 +12775,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pinsir, .iconSprite = gMonIcon_Pinsir, .iconPalIndex = 2, + FOOTPRINT(Pinsir) + .levelUpLearnset = sPinsirLevelUpLearnset, + .teachableLearnset = sPinsirTeachableLearnset, + .formSpeciesIdTable = sPinsirFormSpeciesIdTable, + .formChangeTable = sPinsirFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -12812,11 +12808,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Stag Beetle"), .height = 17, .weight = 590, - FOOTPRINT(Pinsir) - .levelUpLearnset = sPinsirLevelUpLearnset, - .teachableLearnset = sPinsirTeachableLearnset, - .formSpeciesIdTable = sPinsirFormSpeciesIdTable, - .formChangeTable = sPinsirFormChangeTable, .description = COMPOUND_STRING( "The influence of Mega Evolution leaves it\n" "in a state of constant excitement.\n" @@ -12840,7 +12831,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PinsirMega, .iconSprite = gMonIcon_PinsirMega, .iconPalIndex = 2, + FOOTPRINT(Pinsir) .isMegaEvolution = TRUE, + .levelUpLearnset = sPinsirLevelUpLearnset, + .teachableLearnset = sPinsirTeachableLearnset, + .formSpeciesIdTable = sPinsirFormSpeciesIdTable, + .formChangeTable = sPinsirFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR @@ -12872,17 +12868,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Bull"), .height = 14, .weight = 884, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Tauros) - .formSpeciesIdTable = sTaurosFormSpeciesIdTable, .description = COMPOUND_STRING( "It is not satisfied unless it is rampaging\n" "at all times. If there is no opponent for\n" "Tauros to battle, it will charge at thick\n" "trees and knock them down to calm itself."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Tauros, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, @@ -12897,8 +12891,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tauros, .iconSprite = gMonIcon_Tauros, .iconPalIndex = 2, + FOOTPRINT(Tauros) .levelUpLearnset = sTaurosLevelUpLearnset, .teachableLearnset = sTaurosTeachableLearnset, + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, #if P_PALDEAN_FORMS @@ -12927,33 +12923,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Bull"), .height = 14, .weight = 1150, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Tauros) - .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .frontAnimFrames = sAnims_TaurosPaldean, - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .isPaldeanForm = TRUE, .description = COMPOUND_STRING( "This Pokémon has a muscular body\n" "and excels at close-quarters combat.\n" "It uses its short horns to strike\n" "the opponent’s weak spots."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_TaurosPaldeanCombatBreed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeanCombatBreed, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_TaurosPaldeanCombatBreed, .shinyPalette = gMonShinyPalette_TaurosPaldeanCombatBreed, .iconSprite = gMonIcon_TaurosPaldeanCombatBreed, .iconPalIndex = 0, + FOOTPRINT(Tauros) + .isPaldeanForm = TRUE, .levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset, .teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset, + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = @@ -12981,33 +12977,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Bull"), .height = 14, .weight = 850, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Tauros) - .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .frontAnimFrames = sAnims_TaurosPaldean, - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .isPaldeanForm = TRUE, .description = COMPOUND_STRING( "When heated by fire energy, its horns can\n" "get hotter than 1,800 degrees Fahrenheit.\n" "Those gored by them will suffer\n" "both wounds and burns."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_TaurosPaldeanBlazeBreed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeanBlazeBreed, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_TaurosPaldeanBlazeBreed, .shinyPalette = gMonShinyPalette_TaurosPaldeanBlazeBreed, .iconSprite = gMonIcon_TaurosPaldeanBlazeBreed, .iconPalIndex = 0, + FOOTPRINT(Tauros) + .isPaldeanForm = TRUE, .levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset, .teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset, + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = @@ -13035,33 +13031,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Wild Bull"), .height = 14, .weight = 1100, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Tauros) - .formSpeciesIdTable = sTaurosFormSpeciesIdTable, - .frontAnimFrames = sAnims_TaurosPaldean, - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .isPaldeanForm = TRUE, .description = COMPOUND_STRING( "This Pokémon blasts water from holes on\n" "the tips of its horns--the high-pressure\n" "jets pierce right through\n" "Tauros’s enemies."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_TaurosPaldeanAquaBreed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, + .frontAnimFrames = sAnims_TaurosPaldean, + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeanAquaBreed, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, + .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_TaurosPaldeanAquaBreed, .shinyPalette = gMonShinyPalette_TaurosPaldeanAquaBreed, .iconSprite = gMonIcon_TaurosPaldeanAquaBreed, .iconPalIndex = 0, + FOOTPRINT(Tauros) + .isPaldeanForm = TRUE, .levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset, .teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset, + .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS @@ -13102,15 +13098,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Magikarp, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_MagikarpF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Magikarp, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Magikarp, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_MagikarpF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -13119,9 +13115,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magikarp, .iconPalIndex = 0, FOOTPRINT(Magikarp) + .tmIlliterate = TRUE, .levelUpLearnset = sMagikarpLevelUpLearnset, .teachableLearnset = sMagikarpTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_GYARADOS}), }, @@ -13150,30 +13146,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Atrocious"), .height = 65, .weight = 2350, - .pokemonScale = 256, - .pokemonOffset = 6, - .trainerScale = 481, - .trainerOffset = 13, - FOOTPRINT(Gyarados) - .levelUpLearnset = sGyaradosLevelUpLearnset, - .teachableLearnset = sGyaradosTeachableLearnset, - .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, - .formChangeTable = sGyaradosFormChangeTable, .description = COMPOUND_STRING( "It is an extremely vicious and violent\n" "Pokémon. When humans begin to fight,\n" "it will appear and burn everything to the\n" "ground with intensely hot flames."), + .pokemonScale = 256, + .pokemonOffset = 6, + .trainerScale = 481, + .trainerOffset = 13, .frontPic = gMonFrontPic_Gyarados, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_GyaradosF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gyarados, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Gyarados, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_GyaradosF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, @@ -13181,6 +13172,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Gyarados, .iconSprite = gMonIcon_Gyarados, .iconPalIndex = 0, + FOOTPRINT(Gyarados) + .levelUpLearnset = sGyaradosLevelUpLearnset, + .teachableLearnset = sGyaradosTeachableLearnset, + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, + .formChangeTable = sGyaradosFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -13209,20 +13205,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Atrocious"), .height = 65, .weight = 3050, - .pokemonScale = 256, - .pokemonOffset = 6, - .trainerScale = 481, - .trainerOffset = 13, - FOOTPRINT(Gyarados) - .levelUpLearnset = sGyaradosLevelUpLearnset, - .teachableLearnset = sGyaradosTeachableLearnset, - .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, - .formChangeTable = sGyaradosFormChangeTable, .description = COMPOUND_STRING( "Although it obeys its instinctive drive to\n" "destroy everything within its reach, it\n" "will respond to orders from a Trainer it\n" "truly trusts."), + .pokemonScale = 256, + .pokemonOffset = 6, + .trainerScale = 481, + .trainerOffset = 13, .frontPic = gMonFrontPic_GyaradosMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -13237,7 +13228,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GyaradosMega, .iconSprite = gMonIcon_GyaradosMega, .iconPalIndex = 0, + FOOTPRINT(Gyarados) .isMegaEvolution = TRUE, + .levelUpLearnset = sGyaradosLevelUpLearnset, + .teachableLearnset = sGyaradosTeachableLearnset, + .formSpeciesIdTable = sGyaradosFormSpeciesIdTable, + .formChangeTable = sGyaradosFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP @@ -13270,11 +13266,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Transport"), .height = 25, .weight = 2200, - FOOTPRINT(Lapras) - .levelUpLearnset = sLaprasLevelUpLearnset, - .teachableLearnset = sLaprasTeachableLearnset, - .formSpeciesIdTable = sLaprasFormSpeciesIdTable, - .formChangeTable = sLaprasFormChangeTable, .description = COMPOUND_STRING( "People have driven Lapras almost to the\n" "point of extinction. In the evenings,\n" @@ -13297,6 +13288,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Lapras, .iconSprite = gMonIcon_Lapras, .iconPalIndex = 2, + FOOTPRINT(Lapras) + .levelUpLearnset = sLaprasLevelUpLearnset, + .teachableLearnset = sLaprasTeachableLearnset, + .formSpeciesIdTable = sLaprasFormSpeciesIdTable, + .formChangeTable = sLaprasFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -13327,11 +13323,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Transport"), .height = 240, .weight = 0, - FOOTPRINT(Lapras) - .levelUpLearnset = sLaprasLevelUpLearnset, - .teachableLearnset = sLaprasTeachableLearnset, - .formSpeciesIdTable = sLaprasFormSpeciesIdTable, - .formChangeTable = sLaprasFormChangeTable, .description = COMPOUND_STRING( "Over 5,000 people can ride on its\n" "shell at once. And it's a very\n" @@ -13354,7 +13345,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_LaprasGigantamax, .iconSprite = gMonIcon_LaprasGigantamax, .iconPalIndex = 2, + FOOTPRINT(Lapras) .isGigantamax = TRUE, + .levelUpLearnset = sLaprasLevelUpLearnset, + .teachableLearnset = sLaprasTeachableLearnset, + .formSpeciesIdTable = sLaprasFormSpeciesIdTable, + .formChangeTable = sLaprasFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS @@ -13410,9 +13406,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ditto, .iconPalIndex = 2, FOOTPRINT(Ditto) + .tmIlliterate = TRUE, .levelUpLearnset = sDittoLevelUpLearnset, .teachableLearnset = sDittoTeachableLearnset, - .tmIlliterate = TRUE, }, #endif //P_FAMILY_DITTO @@ -13442,11 +13438,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Evolution"), .height = 3, .weight = 65, - FOOTPRINT(Eevee) - .levelUpLearnset = sEeveeLevelUpLearnset, - .teachableLearnset = sEeveeTeachableLearnset, - .formSpeciesIdTable = sEeveeFormSpeciesIdTable, - .formChangeTable = sEeveeFormChangeTable, .description = COMPOUND_STRING( "An Eevee has an unstable genetic makeup\n" "that suddenly mutates due to its\n" @@ -13457,15 +13448,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Eevee, - .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicFemale = gMonFrontPic_EeveeF, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Eevee, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Eevee, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_EeveeF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, @@ -13473,6 +13464,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Eevee, .iconSprite = gMonIcon_Eevee, .iconPalIndex = 2, + FOOTPRINT(Eevee) + .levelUpLearnset = sEeveeLevelUpLearnset, + .teachableLearnset = sEeveeTeachableLearnset, + .formSpeciesIdTable = sEeveeFormSpeciesIdTable, + .formChangeTable = sEeveeFormChangeTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, @@ -13511,11 +13507,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Evolution"), .height = 180, .weight = 0, - FOOTPRINT(Eevee) - .levelUpLearnset = sEeveeLevelUpLearnset, - .teachableLearnset = sEeveeTeachableLearnset, - .formSpeciesIdTable = sEeveeFormSpeciesIdTable, - .formChangeTable = sEeveeFormChangeTable, .description = COMPOUND_STRING( "Having gotten even friendlier and\n" "more innocent, Eevee tries to play\n" @@ -13538,7 +13529,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_EeveeGigantamax, .iconSprite = gMonIcon_EeveeGigantamax, .iconPalIndex = 2, + FOOTPRINT(Eevee) .isGigantamax = TRUE, + .levelUpLearnset = sEeveeLevelUpLearnset, + .teachableLearnset = sEeveeTeachableLearnset, + .formSpeciesIdTable = sEeveeFormSpeciesIdTable, + .formChangeTable = sEeveeFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -14398,11 +14394,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fossil"), .height = 18, .weight = 590, - FOOTPRINT(Aerodactyl) - .levelUpLearnset = sAerodactylLevelUpLearnset, - .teachableLearnset = sAerodactylTeachableLearnset, - .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, - .formChangeTable = sAerodactylFormChangeTable, .description = COMPOUND_STRING( "Aerodactyl is a Pokémon from the age\n" "of dinosaurs. It was regenerated from DNA\n" @@ -14426,6 +14417,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Aerodactyl, .iconSprite = gMonIcon_Aerodactyl, .iconPalIndex = 2, + FOOTPRINT(Aerodactyl) + .levelUpLearnset = sAerodactylLevelUpLearnset, + .teachableLearnset = sAerodactylTeachableLearnset, + .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, + .formChangeTable = sAerodactylFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -14454,11 +14450,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Fossil"), .height = 21, .weight = 790, - FOOTPRINT(Aerodactyl) - .levelUpLearnset = sAerodactylLevelUpLearnset, - .teachableLearnset = sAerodactylTeachableLearnset, - .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, - .formChangeTable = sAerodactylFormChangeTable, .description = COMPOUND_STRING( "The power of Mega Evolution has\n" "completely restored its genes. The rocks\n" @@ -14481,7 +14472,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_AerodactylMega, .iconSprite = gMonIcon_AerodactylMega, .iconPalIndex = 2, + FOOTPRINT(Aerodactyl) .isMegaEvolution = TRUE, + .levelUpLearnset = sAerodactylLevelUpLearnset, + .teachableLearnset = sAerodactylTeachableLearnset, + .formSpeciesIdTable = sAerodactylFormSpeciesIdTable, + .formChangeTable = sAerodactylFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL @@ -14571,11 +14567,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sleeping"), .height = 21, .weight = 4600, - FOOTPRINT(Snorlax) - .levelUpLearnset = sSnorlaxLevelUpLearnset, - .teachableLearnset = sSnorlaxTeachableLearnset, - .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, - .formChangeTable = sSnorlaxFormChangeTable, .description = COMPOUND_STRING( "Snorlax's typical day consists of nothing\n" "more than eating and sleeping. It is such\n" @@ -14598,6 +14589,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Snorlax, .iconSprite = gMonIcon_Snorlax, .iconPalIndex = 3, + FOOTPRINT(Snorlax) + .levelUpLearnset = sSnorlaxLevelUpLearnset, + .teachableLearnset = sSnorlaxTeachableLearnset, + .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, + .formChangeTable = sSnorlaxFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -14628,11 +14624,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Sleeping"), .height = 350, .weight = 0, - FOOTPRINT(Snorlax) - .levelUpLearnset = sSnorlaxLevelUpLearnset, - .teachableLearnset = sSnorlaxTeachableLearnset, - .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, - .formChangeTable = sSnorlaxFormChangeTable, .description = COMPOUND_STRING( "Gigantamax energy has affected\n" "stray seeds and even pebbles that\n" @@ -14655,7 +14646,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SnorlaxGigantamax, .iconSprite = gMonIcon_SnorlaxGigantamax, .iconPalIndex = 3, + FOOTPRINT(Snorlax) .isGigantamax = TRUE, + .levelUpLearnset = sSnorlaxLevelUpLearnset, + .teachableLearnset = sSnorlaxTeachableLearnset, + .formSpeciesIdTable = sSnorlaxFormSpeciesIdTable, + .formChangeTable = sSnorlaxFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX @@ -14671,21 +14667,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 125, .types = MON_TYPES(TYPE_ICE, TYPE_FLYING), .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .friendship = 35, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .speciesName = _("Articuno"), - .cryId = CRY_ARTICUNO, - .natDexNum = NATIONAL_DEX_ARTICUNO, - .height = 17, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 309, - .trainerOffset = 2, - FOOTPRINT(Articuno) - .formSpeciesIdTable = sArticunoFormSpeciesIdTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14694,16 +14675,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = 215, #endif .evYield_SpDefense = 3, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_SNOW_CLOAK }, .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Articuno"), + .cryId = CRY_ARTICUNO, + .natDexNum = NATIONAL_DEX_ARTICUNO, .categoryName = _("Freeze"), + .height = 17, .weight = 554, .description = COMPOUND_STRING( "Articuno is a legendary bird Pokémon that\n" "can control ice. The flapping of its wings\n" "chills the air. As a result, it is said that\n" "when this Pokémon flies, snow will fall."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 309, + .trainerOffset = 2, .frontPic = gMonFrontPic_Articuno, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -14717,8 +14710,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Articuno, .iconSprite = gMonIcon_Articuno, .iconPalIndex = 2, + FOOTPRINT(Articuno) + .isLegendary = TRUE, .levelUpLearnset = sArticunoLevelUpLearnset, .teachableLearnset = sArticunoTeachableLearnset, + .formSpeciesIdTable = sArticunoFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -14747,18 +14743,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Cruel"), .height = 17, .weight = 509, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 309, - .trainerOffset = 2, - FOOTPRINT(Articuno) - .formSpeciesIdTable = sArticunoFormSpeciesIdTable, - .isLegendary = TRUE, .description = COMPOUND_STRING( "It fires beams that immobilize opponents\n" "as if they had been frozen solid.\n" "Its feather-like blades of psychic energy\n" "rip through thick iron sheets like paper."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 309, + .trainerOffset = 2, .frontPic = gMonFrontPic_ArticunoGalarian, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, @@ -14773,9 +14766,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ArticunoGalarian, .iconSprite = gMonIcon_ArticunoGalarian, .iconPalIndex = 2, + FOOTPRINT(Articuno) + .isLegendary = TRUE, + .isGalarianForm = TRUE, .levelUpLearnset = sArticunoGalarianLevelUpLearnset, .teachableLearnset = sArticunoGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sArticunoFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO @@ -14791,22 +14787,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .friendship = 35, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .bodyColor = BODY_COLOR_YELLOW, - .speciesName = _("Zapdos"), - .cryId = CRY_ZAPDOS, - .natDexNum = NATIONAL_DEX_ZAPDOS, - .height = 16, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 318, - .trainerOffset = 3, - FOOTPRINT(Zapdos) - .formSpeciesIdTable = sZapdosFormSpeciesIdTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14815,19 +14795,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = 216, #endif .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_STATIC }, - #else - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, - #endif + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_STATIC }, + #else + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_LIGHTNING_ROD }, + #endif + .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Zapdos"), + .cryId = CRY_ZAPDOS, + .natDexNum = NATIONAL_DEX_ZAPDOS, .categoryName = _("Electric"), + .height = 16, .weight = 526, .description = COMPOUND_STRING( "Zapdos is a legendary bird Pokémon that\n" "has the ability to control electricity.\n" "It usually lives in thunderclouds. It gains\n" "power if it is stricken by lightning bolts."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 318, + .trainerOffset = 3, .frontPic = gMonFrontPic_Zapdos, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, @@ -14842,8 +14835,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Zapdos, .iconSprite = gMonIcon_Zapdos, .iconPalIndex = 0, + FOOTPRINT(Zapdos) + .isLegendary = TRUE, .levelUpLearnset = sZapdosLevelUpLearnset, .teachableLearnset = sZapdosTeachableLearnset, + .formSpeciesIdTable = sZapdosFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -14872,18 +14868,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Strong Legs"), .height = 16, .weight = 582, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 318, - .trainerOffset = 3, - FOOTPRINT(Zapdos) - .formSpeciesIdTable = sZapdosFormSpeciesIdTable, - .isLegendary = TRUE, .description = COMPOUND_STRING( "When its feathers rub together, they\n" "produce a crackling sound like the\n" "zapping of electricity. Apparently, it runs\n" "through the mountains at over 180 mph."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 318, + .trainerOffset = 3, .frontPic = gMonFrontPic_ZapdosGalarian, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, @@ -14897,9 +14890,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ZapdosGalarian, .iconSprite = gMonIcon_ZapdosGalarian, .iconPalIndex = 0, + FOOTPRINT(Zapdos) + .isLegendary = TRUE, + .isGalarianForm = TRUE, .levelUpLearnset = sZapdosGalarianLevelUpLearnset, .teachableLearnset = sZapdosGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sZapdosFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS @@ -14915,21 +14911,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .friendship = 35, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .speciesName = _("Moltres"), - .cryId = CRY_MOLTRES, - .natDexNum = NATIONAL_DEX_MOLTRES, - .height = 20, - .pokemonScale = 270, - .pokemonOffset = 0, - .trainerScale = 387, - .trainerOffset = 8, - FOOTPRINT(Moltres) - .formSpeciesIdTable = sMoltresFormSpeciesIdTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 290, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -14938,16 +14919,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .expYield = 217, #endif .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_FLAME_BODY }, .bodyColor = BODY_COLOR_YELLOW, + .speciesName = _("Moltres"), + .cryId = CRY_MOLTRES, + .natDexNum = NATIONAL_DEX_MOLTRES, .categoryName = _("Flame"), + .height = 20, .weight = 600, .description = COMPOUND_STRING( "Moltres is a legendary bird Pokémon\n" "that can control fire. If injured, it is said\n" "to dip its body in the molten magma of\n" "a volcano to burn and heal itself."), + .pokemonScale = 270, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, .frontPic = gMonFrontPic_Moltres, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -14961,8 +14954,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Moltres, .iconSprite = gMonIcon_Moltres, .iconPalIndex = 0, + FOOTPRINT(Moltres) + .isLegendary = TRUE, .levelUpLearnset = sMoltresLevelUpLearnset, .teachableLearnset = sMoltresTeachableLearnset, + .formSpeciesIdTable = sMoltresFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -14991,18 +14987,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Malevolent"), .height = 20, .weight = 660, - .pokemonScale = 270, - .pokemonOffset = 0, - .trainerScale = 387, - .trainerOffset = 8, - FOOTPRINT(Moltres) - .formSpeciesIdTable = sMoltresFormSpeciesIdTable, - .isLegendary = TRUE, .description = COMPOUND_STRING( "This Pokémon's sinister, flame-like aura\n" "will consume the spirit of any creature\n" "it hits. Victims become burned-out\n" "shadows of themselves."), + .pokemonScale = 270, + .pokemonOffset = 0, + .trainerScale = 387, + .trainerOffset = 8, .frontPic = gMonFrontPic_MoltresGalarian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -15016,9 +15009,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MoltresGalarian, .iconSprite = gMonIcon_MoltresGalarian, .iconPalIndex = 0, + FOOTPRINT(Moltres) + .isLegendary = TRUE, + .isGalarianForm = TRUE, .levelUpLearnset = sMoltresGalarianLevelUpLearnset, .teachableLearnset = sMoltresGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sMoltresFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES @@ -15203,31 +15199,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 340, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 306, + #else + .expYield = 220, + #endif .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_UNNERVE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Mewtwo"), + .cryId = CRY_MEWTWO, .natDexNum = NATIONAL_DEX_MEWTWO, .categoryName = _("Genetic"), - FOOTPRINT(Mewtwo) - .levelUpLearnset = sMewtwoLevelUpLearnset, - .teachableLearnset = sMewtwoTeachableLearnset, - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, - .formChangeTable = sMewtwoFormChangeTable, - .isLegendary = TRUE, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 340, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 306, - #else - .expYield = 220, - #endif - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_UNNERVE }, - .cryId = CRY_MEWTWO, .height = 20, .weight = 1220, .description = COMPOUND_STRING( @@ -15252,6 +15242,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Mewtwo, .iconSprite = gMonIcon_Mewtwo, .iconPalIndex = 2, + FOOTPRINT(Mewtwo) + .isLegendary = TRUE, + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -15280,13 +15276,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Genetic"), .height = 23, .weight = 1270, - FOOTPRINT(Mewtwo) - .levelUpLearnset = sMewtwoLevelUpLearnset, - .teachableLearnset = sMewtwoTeachableLearnset, - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, - .formChangeTable = sMewtwoFormChangeTable, - .isLegendary = TRUE, - .isMegaEvolution = TRUE, .description = COMPOUND_STRING( "Psychic power has augmented its muscles.\n" "It has a grip strength of one ton and can\n" @@ -15309,6 +15298,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MewtwoMegaX, .iconSprite = gMonIcon_MewtwoMegaX, .iconPalIndex = 2, + FOOTPRINT(Mewtwo) + .isLegendary = TRUE, + .isMegaEvolution = TRUE, + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, }, [SPECIES_MEWTWO_MEGA_Y] = @@ -15336,13 +15332,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Genetic"), .height = 15, .weight = 330, - FOOTPRINT(Mewtwo) - .levelUpLearnset = sMewtwoLevelUpLearnset, - .teachableLearnset = sMewtwoTeachableLearnset, - .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, - .formChangeTable = sMewtwoFormChangeTable, - .isLegendary = TRUE, - .isMegaEvolution = TRUE, .description = COMPOUND_STRING( "Despite its diminished size, its mental\n" "power has grown phenomenally. With a mere\n" @@ -15366,6 +15355,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MewtwoMegaY, .iconSprite = gMonIcon_MewtwoMegaY, .iconPalIndex = 2, + FOOTPRINT(Mewtwo) + .isLegendary = TRUE, + .isMegaEvolution = TRUE, + .levelUpLearnset = sMewtwoLevelUpLearnset, + .teachableLearnset = sMewtwoTeachableLearnset, + .formSpeciesIdTable = sMewtwoFormSpeciesIdTable, + .formChangeTable = sMewtwoFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO @@ -15398,7 +15394,6 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SYNCHRONIZE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PINK, - .isMythical = TRUE, .speciesName = _("Mew"), .cryId = CRY_MEW, .natDexNum = NATIONAL_DEX_MEW, @@ -15429,6 +15424,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Mew, .iconPalIndex = 0, FOOTPRINT(Mew) + .isMythical = TRUE, .levelUpLearnset = sMewLevelUpLearnset, .teachableLearnset = sMewTeachableLearnset, }, From 9c1239c75d4ae0deeb573f11d54d78c8a6eb3822 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 14:29:28 -0300 Subject: [PATCH 16/23] Gen 2 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_2.h | 356 +++++++++++++------------- 1 file changed, 176 insertions(+), 180 deletions(-) diff --git a/src/data/pokemon/species_info/gen_2.h b/src/data/pokemon/species_info/gen_2.h index a8ae91d97f1f..5a2065021f93 100644 --- a/src/data/pokemon/species_info/gen_2.h +++ b/src/data/pokemon/species_info/gen_2.h @@ -153,15 +153,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 277, .trainerOffset = 1, .frontPic = gMonFrontPic_Meganium, - .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicFemale = gMonFrontPic_MeganiumF, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Meganium, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Meganium, - .backPicSize = MON_COORDS_SIZE(56, 64), .backPicFemale = gMonBackPic_MeganiumF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, @@ -328,8 +328,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 1, .frontPic = gMonFrontPic_Typhlosion, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Typhlosion) - .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Typhlosion, .frontAnimId = ANIM_V_SHAKE, @@ -342,8 +340,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Typhlosion, .iconSprite = gMonIcon_Typhlosion, .iconPalIndex = 3, + FOOTPRINT(Typhlosion) .levelUpLearnset = sTyphlosionLevelUpLearnset, .teachableLearnset = sTyphlosionTeachableLearnset, + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -383,8 +383,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 1, .frontPic = gMonFrontPic_TyphlosionHisuian, .frontPicSize = MON_COORDS_SIZE(48, 64), - FOOTPRINT(Typhlosion) - .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyphlosionHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -396,9 +394,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_TyphlosionHisuian, .iconSprite = gMonIcon_TyphlosionHisuian, .iconPalIndex = 1, + FOOTPRINT(Typhlosion) + .isHisuianForm = TRUE, .levelUpLearnset = sTyphlosionHisuianLevelUpLearnset, .teachableLearnset = sTyphlosionHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL @@ -829,15 +829,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ledyba, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_LedybaF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Ledyba, .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Ledyba, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_LedybaF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, @@ -886,16 +886,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ledian, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_LedianF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Ledian, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 10, .backPic = gMonBackPic_Ledian, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_LedianF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -1249,11 +1249,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 80, .baseSpAttack = 120, .baseSpDefense = 115, - #if P_UPDATED_TYPES >= GEN_6 - .types = MON_TYPES(TOGEPI_FAMILY_TYPE, TYPE_FLYING), - #else - .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), - #endif + .types = MON_TYPES(TOGEPI_FAMILY_TYPE, TYPE_FLYING), .catchRate = 30, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 273, @@ -1399,8 +1395,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 318, .trainerOffset = 4, .frontPic = gMonFrontPic_Xatu, - .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicFemale = gMonFrontPic_XatuF, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Xatu, @@ -1539,43 +1535,38 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 255, + #elif P_UPDATED_EXP_YIELDS >= GEN_7 + .expYield = 230, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 225, + #else + .expYield = 194, + #endif .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_FIELD), + .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_PLUS }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Ampharos"), + .cryId = CRY_AMPHAROS, .natDexNum = NATIONAL_DEX_AMPHAROS, .categoryName = _("Light"), .height = 14, .weight = 615, - .pokemonScale = 256, - .pokemonOffset = 4, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Ampharos) - .levelUpLearnset = sAmpharosLevelUpLearnset, - .teachableLearnset = sAmpharosTeachableLearnset, - .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, - .formChangeTable = sAmpharosFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 255, - #elif P_UPDATED_EXP_YIELDS >= GEN_7 - .expYield = 230, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 225, - #else - .expYield = 194, - #endif - .abilities = { ABILITY_STATIC, ABILITY_NONE, ABILITY_PLUS }, - .cryId = CRY_AMPHAROS, .description = COMPOUND_STRING( "It gives off so much light that it can be\n" "seen even from space. People in the old\n" "days used its light to send signals back\n" "and forth with others far away."), + .pokemonScale = 256, + .pokemonOffset = 4, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Ampharos, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, @@ -1590,6 +1581,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Ampharos, .iconSprite = gMonIcon_Ampharos, .iconPalIndex = 0, + FOOTPRINT(Ampharos) + .levelUpLearnset = sAmpharosLevelUpLearnset, + .teachableLearnset = sAmpharosTeachableLearnset, + .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, + .formChangeTable = sAmpharosFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -1629,11 +1625,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AmpharosMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Ampharos) - .levelUpLearnset = sAmpharosLevelUpLearnset, - .teachableLearnset = sAmpharosTeachableLearnset, - .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, - .formChangeTable = sAmpharosFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AmpharosMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1645,7 +1636,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_AmpharosMega, .iconSprite = gMonIcon_AmpharosMega, .iconPalIndex = 0, + FOOTPRINT(Ampharos) .isMegaEvolution = TRUE, + .levelUpLearnset = sAmpharosLevelUpLearnset, + .teachableLearnset = sAmpharosTeachableLearnset, + .formSpeciesIdTable = sAmpharosFormSpeciesIdTable, + .formChangeTable = sAmpharosFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP @@ -1923,15 +1919,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Sudowoodo, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_SudowoodoF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Sudowoodo, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Sudowoodo, - .backPicSize = MON_COORDS_SIZE(48, 56), .backPicFemale = gMonBackPic_SudowoodoF, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, @@ -2152,15 +2148,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Aipom, - .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicFemale = gMonFrontPic_AipomF, + .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicSizeFemale = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Aipom, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Aipom, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_AipomF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -2210,15 +2206,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ambipom, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_AmbipomF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Ambipom, .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Ambipom, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_AmbipomF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -2489,17 +2485,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Wooper, - .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicFemale = gMonFrontPic_WooperF, + .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicSizeFemale = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Wooper, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wooper, - .backPicSize = MON_COORDS_SIZE(64, 40), - FOOTPRINT(Wooper) - .formSpeciesIdTable = sWooperFormSpeciesIdTable, .backPicFemale = gMonBackPic_WooperF, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, @@ -2507,8 +2501,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Wooper, .iconSprite = gMonIcon_Wooper, .iconPalIndex = 0, + FOOTPRINT(Wooper) .levelUpLearnset = sWooperLevelUpLearnset, .teachableLearnset = sWooperTeachableLearnset, + .formSpeciesIdTable = sWooperFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_QUAGSIRE}), }, @@ -2547,15 +2543,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Quagsire, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_QuagsireF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Quagsire, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Quagsire, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_QuagsireF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, .backAnimId = BACK_ANIM_H_SLIDE, @@ -2605,9 +2601,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_WooperPaldean, .frontPicSize = MON_COORDS_SIZE(40, 32), - FOOTPRINT(Wooper) - .formSpeciesIdTable = sWooperFormSpeciesIdTable, - .isPaldeanForm = TRUE, .frontPicYOffset = 16, .frontAnimFrames = sAnims_WooperPaldean, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2619,8 +2612,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_WooperPaldean, .iconSprite = gMonIcon_WooperPaldean, .iconPalIndex = 2, + FOOTPRINT(Wooper) + .isPaldeanForm = TRUE, .levelUpLearnset = sWooperPaldeanLevelUpLearnset, .teachableLearnset = sWooperPaldeanTeachableLearnset, + .formSpeciesIdTable = sWooperFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CLODSIRE}), }, @@ -2714,16 +2710,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 1, .frontPic = gMonFrontPic_Murkrow, - .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicFemale = gMonFrontPic_MurkrowF, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Murkrow, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, .backPic = gMonBackPic_Murkrow, - .backPicSize = MON_COORDS_SIZE(40, 56), .backPicFemale = gMonBackPic_MurkrowF, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, @@ -3040,9 +3036,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Wynaut, .iconPalIndex = 0, FOOTPRINT(Wynaut) + .tmIlliterate = TRUE, .levelUpLearnset = sWynautLevelUpLearnset, .teachableLearnset = sWynautTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 15, SPECIES_WOBBUFFET}), }, #endif //P_GEN_3_CROSS_EVOS @@ -3082,15 +3078,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Wobbuffet, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_WobbuffetF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Wobbuffet, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Wobbuffet, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_WobbuffetF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 10, .backAnimId = BACK_ANIM_V_STRETCH, @@ -3103,9 +3099,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconPalIndexFemale = 0, #endif FOOTPRINT(Wobbuffet) + .tmIlliterate = TRUE, .levelUpLearnset = sWobbuffetLevelUpLearnset, .teachableLearnset = sWobbuffetTeachableLearnset, - .tmIlliterate = TRUE, }, #endif //P_FAMILY_WOBBUFFET @@ -3145,15 +3141,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Girafarig, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_GirafarigF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Girafarig, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Girafarig, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_GirafarigF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -3430,19 +3426,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Dudunsparce, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DudunsparceTwoSegment, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Dudunsparce, .shinyPalette = gMonShinyPalette_Dudunsparce, .iconSprite = gMonIcon_Dudunsparce, .iconPalIndex = 0, + //FOOTPRINT(Dudunsparce), .levelUpLearnset = sDudunsparceLevelUpLearnset, .teachableLearnset = sDudunsparceTeachableLearnset, .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Dudunsparce), }, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = @@ -3483,19 +3479,19 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Dudunsparce, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DudunsparceThreeSegment, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Dudunsparce, .shinyPalette = gMonShinyPalette_Dudunsparce, .iconSprite = gMonIcon_Dudunsparce, .iconPalIndex = 0, + //FOOTPRINT(Dudunsparce), .levelUpLearnset = sDudunsparceLevelUpLearnset, .teachableLearnset = sDudunsparceTeachableLearnset, .formSpeciesIdTable = sDudunsparceFormSpeciesIdTable, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Dudunsparce), }, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DUNSPARCE @@ -3536,16 +3532,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gligar, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_GligarF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Gligar, .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = 8, .backPic = gMonBackPic_Gligar, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_GligarF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_SHRINK_GROW, @@ -3625,11 +3621,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 30, .baseSpAttack = 40, .baseSpDefense = 40, - #if P_UPDATED_TYPES >= GEN_6 - .types = MON_TYPES(TYPE_FAIRY), - #else - .types = MON_TYPES(TYPE_NORMAL), - #endif + #if P_UPDATED_TYPES >= GEN_6 + .types = MON_TYPES(TYPE_FAIRY), + #else + .types = MON_TYPES(TYPE_NORMAL), + #endif .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 63, .evYield_Attack = 1, @@ -3682,11 +3678,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpeed = 45, .baseSpAttack = 60, .baseSpDefense = 60, - #if P_UPDATED_TYPES >= GEN_6 - .types = MON_TYPES(TYPE_FAIRY), - #else - .types = MON_TYPES(TYPE_NORMAL), - #endif + #if P_UPDATED_TYPES >= GEN_6 + .types = MON_TYPES(TYPE_FAIRY), + #else + .types = MON_TYPES(TYPE_NORMAL), + #endif .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 178, .evYield_Attack = 2, @@ -3778,8 +3774,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Qwilfish, .frontPicSize = MON_COORDS_SIZE(40, 48), - FOOTPRINT(Qwilfish) - .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Qwilfish, .frontAnimId = ANIM_GROW_IN_STAGES, @@ -3792,8 +3786,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Qwilfish, .iconSprite = gMonIcon_Qwilfish, .iconPalIndex = 0, + FOOTPRINT(Qwilfish) .levelUpLearnset = sQwilfishLevelUpLearnset, .teachableLearnset = sQwilfishTeachableLearnset, + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -3834,8 +3830,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_QwilfishHisuian, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Qwilfish) - .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .frontPicYOffset = 16, .frontAnimFrames = sAnims_QwilfishHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3848,9 +3842,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_QwilfishHisuian, .iconSprite = gMonIcon_QwilfishHisuian, .iconPalIndex = 0, + FOOTPRINT(Qwilfish) + .isHisuianForm = TRUE, .levelUpLearnset = sQwilfishHisuianLevelUpLearnset, .teachableLearnset = sQwilfishHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_MOVE, MOVE_BARB_BARRAGE, SPECIES_OVERQWIL}), }, @@ -4001,20 +3997,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Heracross, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_HeracrossF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Heracross, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Heracross, - .backPicSize = MON_COORDS_SIZE(48, 64), - FOOTPRINT(Heracross) - .levelUpLearnset = sHeracrossLevelUpLearnset, - .teachableLearnset = sHeracrossTeachableLearnset, - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, - .formChangeTable = sHeracrossFormChangeTable, .backPicFemale = gMonBackPic_HeracrossF, + .backPicSize = MON_COORDS_SIZE(48, 64), .backPicSizeFemale = MON_COORDS_SIZE(48, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_JOLT_RIGHT, @@ -4022,6 +4013,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Heracross, .iconSprite = gMonIcon_Heracross, .iconPalIndex = 0, + FOOTPRINT(Heracross) + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, + .formChangeTable = sHeracrossFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -4061,11 +4057,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HeracrossMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Heracross) - .levelUpLearnset = sHeracrossLevelUpLearnset, - .teachableLearnset = sHeracrossTeachableLearnset, - .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, - .formChangeTable = sHeracrossFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_HeracrossMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4077,7 +4068,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_HeracrossMega, .iconSprite = gMonIcon_HeracrossMega, .iconPalIndex = 0, + FOOTPRINT(Heracross) .isMegaEvolution = TRUE, + .levelUpLearnset = sHeracrossLevelUpLearnset, + .teachableLearnset = sHeracrossTeachableLearnset, + .formSpeciesIdTable = sHeracrossFormSpeciesIdTable, + .formChangeTable = sHeracrossFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS @@ -4120,17 +4116,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Sneasel, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_SneaselF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Sneasel, .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Sneasel, - .backPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Sneasel) - .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .backPicFemale = gMonBackPic_SneaselF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, @@ -4138,8 +4132,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Sneasel, .iconSprite = gMonIcon_Sneasel, .iconPalIndex = 0, + FOOTPRINT(Sneasel) .levelUpLearnset = sSneaselLevelUpLearnset, .teachableLearnset = sSneaselTeachableLearnset, + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}, {EVO_ITEM_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE}), }, @@ -4182,15 +4178,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Weavile, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_WeavileF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Weavile, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Weavile, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_WeavileF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, @@ -4242,17 +4238,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_SneaselHisuian, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_SneaselHisuianF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_SneaselHisuian, - FOOTPRINT(Sneasel) - .formSpeciesIdTable = sSneaselFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SneaselHisuian, - .backPicSize = MON_COORDS_SIZE(56, 64), .backPicFemale = gMonBackPic_SneaselHisuianF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, @@ -4260,9 +4254,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_SneaselHisuian, .iconSprite = gMonIcon_SneaselHisuian, .iconPalIndex = 2, + FOOTPRINT(Sneasel) + .isHisuianForm = TRUE, .levelUpLearnset = sSneaselHisuianLevelUpLearnset, .teachableLearnset = sSneaselHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}, {EVO_ITEM_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}), }, @@ -4411,15 +4407,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ursaring, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_UrsaringF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ursaring, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Ursaring, - .backPicSize = MON_COORDS_SIZE(56, 64), .backPicFemale = gMonBackPic_UrsaringF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, @@ -4472,7 +4468,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Ursaluna, - .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Ursaluna, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -4485,6 +4480,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //FOOTPRINT(Ursaluna) .levelUpLearnset = sUrsalunaLevelUpLearnset, .teachableLearnset = sUrsalunaTeachableLearnset, + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, }, [SPECIES_URSALUNA_BLOODMOON] = @@ -4523,7 +4519,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 7, .frontPic = gMonFrontPic_UrsalunaBloodmoon, .frontPicSize = MON_COORDS_SIZE(64, 64), - .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, //.frontPicYOffset = 0, .frontAnimFrames = sAnims_UrsalunaBloodmoon, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4538,6 +4533,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = //FOOTPRINT(UrsalunaBloodmoon) .levelUpLearnset = sUrsalunaBloodmoonLevelUpLearnset, .teachableLearnset = sUrsalunaBloodmoonTeachableLearnset, + .formSpeciesIdTable = sUrsalunaFormSpeciesIdTable, }, #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA @@ -4746,15 +4742,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Piloswine, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_PiloswineF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Piloswine, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Piloswine, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_PiloswineF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SHAKE, @@ -4810,8 +4806,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 423, .trainerOffset = 8, .frontPic = gMonFrontPic_Mamoswine, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_MamoswineF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Mamoswine, @@ -4880,8 +4876,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Corsola, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Corsola) - .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_Corsola, .frontAnimId = ANIM_H_SLIDE, @@ -4893,8 +4887,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Corsola, .iconSprite = gMonIcon_Corsola, .iconPalIndex = 0, + FOOTPRINT(Corsola) .levelUpLearnset = sCorsolaLevelUpLearnset, .teachableLearnset = sCorsolaTeachableLearnset, + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -4934,8 +4930,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CorsolaGalarian, .frontPicSize = MON_COORDS_SIZE(48, 48), - FOOTPRINT(Corsola) - .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .frontPicYOffset = 11, .frontAnimFrames = sAnims_CorsolaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4947,9 +4941,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_CorsolaGalarian, .iconSprite = gMonIcon_CorsolaGalarian, .iconPalIndex = 0, + FOOTPRINT(Corsola) + .isGalarianForm = TRUE, .levelUpLearnset = sCorsolaGalarianLevelUpLearnset, .teachableLearnset = sCorsolaGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CURSOLA}), }, @@ -5097,16 +5093,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Octillery, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_OctilleryF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Octillery, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, .backPic = gMonBackPic_Octillery, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_OctilleryF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW, @@ -5434,20 +5430,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Houndoom, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_HoundoomF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Houndoom, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Houndoom, - .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Houndoom) - .levelUpLearnset = sHoundoomLevelUpLearnset, - .teachableLearnset = sHoundoomTeachableLearnset, - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, - .formChangeTable = sHoundoomFormChangeTable, .backPicFemale = gMonBackPic_HoundoomF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE, @@ -5455,6 +5446,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Houndoom, .iconSprite = gMonIcon_Houndoom, .iconPalIndex = 0, + FOOTPRINT(Houndoom) + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, + .formChangeTable = sHoundoomFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -5487,11 +5483,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "Its red claws and the tips of its tail are\n" "melting from high internal temperatures\n" "that are painful to Houndoom itself.\n"), - FOOTPRINT(Houndoom) - .levelUpLearnset = sHoundoomLevelUpLearnset, - .teachableLearnset = sHoundoomTeachableLearnset, - .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, - .formChangeTable = sHoundoomFormChangeTable, .pokemonScale = 256, .pokemonOffset = 4, .trainerScale = 256, @@ -5509,7 +5500,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_HoundoomMega, .iconSprite = gMonIcon_HoundoomMega, .iconPalIndex = 0, + FOOTPRINT(Houndoom) .isMegaEvolution = TRUE, + .levelUpLearnset = sHoundoomLevelUpLearnset, + .teachableLearnset = sHoundoomTeachableLearnset, + .formSpeciesIdTable = sHoundoomFormSpeciesIdTable, + .formChangeTable = sHoundoomFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR @@ -5604,15 +5600,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Donphan, - .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicFemale = gMonFrontPic_DonphanF, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Donphan, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Donphan, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_DonphanF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, @@ -5785,9 +5781,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Smeargle, .iconPalIndex = 1, FOOTPRINT(Smeargle) + .tmIlliterate = TRUE, .levelUpLearnset = sSmeargleLevelUpLearnset, .teachableLearnset = sSmeargleTeachableLearnset, - .tmIlliterate = TRUE, }, #endif //P_FAMILY_SMEARGLE @@ -5872,13 +5868,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - #if P_UPDATED_ABILITIES >= GEN_7 - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, - #else - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_VOLT_ABSORB }, - #endif + #if P_UPDATED_ABILITIES >= GEN_7 + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + #else + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_VOLT_ABSORB }, + #endif .bodyColor = BODY_COLOR_YELLOW, - .isLegendary = TRUE, .speciesName = _("Raikou"), .cryId = CRY_RAIKOU, .natDexNum = NATIONAL_DEX_RAIKOU, @@ -5908,6 +5903,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Raikou, .iconPalIndex = 2, FOOTPRINT(Raikou) + .isLegendary = TRUE, .levelUpLearnset = sRaikouLevelUpLearnset, .teachableLearnset = sRaikouTeachableLearnset, }, @@ -5938,13 +5934,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - #if P_UPDATED_ABILITIES >= GEN_7 - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, - #else - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_FLASH_FIRE }, - #endif + #if P_UPDATED_ABILITIES >= GEN_7 + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + #else + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_FLASH_FIRE }, + #endif .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Entei"), .cryId = CRY_ENTEI, .natDexNum = NATIONAL_DEX_ENTEI, @@ -5974,6 +5969,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Entei, .iconPalIndex = 2, FOOTPRINT(Entei) + .isLegendary = TRUE, .levelUpLearnset = sEnteiLevelUpLearnset, .teachableLearnset = sEnteiTeachableLearnset, }, @@ -6004,13 +6000,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - #if P_UPDATED_ABILITIES >= GEN_7 - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, - #else - .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_WATER_ABSORB }, - #endif + #if P_UPDATED_ABILITIES >= GEN_7 + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_INNER_FOCUS }, + #else + .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_WATER_ABSORB }, + #endif .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Suicune"), .cryId = CRY_SUICUNE, .natDexNum = NATIONAL_DEX_SUICUNE, @@ -6040,6 +6035,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Suicune, .iconPalIndex = 2, FOOTPRINT(Suicune) + .isLegendary = TRUE, .levelUpLearnset = sSuicuneLevelUpLearnset, .teachableLearnset = sSuicuneTeachableLearnset, }, @@ -6162,30 +6158,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .baseSpDefense = 100, .types = MON_TYPES(TYPE_ROCK, TYPE_DARK), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 300, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 270, + #else + .expYield = 218, + #endif .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_SAND_STREAM, ABILITY_NONE, ABILITY_UNNERVE }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Tyranitar"), + .cryId = CRY_TYRANITAR, .natDexNum = NATIONAL_DEX_TYRANITAR, .categoryName = _("Armor"), - FOOTPRINT(Tyranitar) - .levelUpLearnset = sTyranitarLevelUpLearnset, - .teachableLearnset = sTyranitarTeachableLearnset, - .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, - .formChangeTable = sTyranitarFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 300, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 270, - #else - .expYield = 218, - #endif - .abilities = { ABILITY_SAND_STREAM, ABILITY_NONE, ABILITY_UNNERVE }, - .cryId = CRY_TYRANITAR, .height = 20, .weight = 2020, .description = COMPOUND_STRING( @@ -6211,6 +6202,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Tyranitar, .iconSprite = gMonIcon_Tyranitar, .iconPalIndex = 4, + FOOTPRINT(Tyranitar) + .levelUpLearnset = sTyranitarLevelUpLearnset, + .teachableLearnset = sTyranitarTeachableLearnset, + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, + .formChangeTable = sTyranitarFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -6250,11 +6246,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerOffset = 7, .frontPic = gMonFrontPic_TyranitarMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Tyranitar) - .levelUpLearnset = sTyranitarLevelUpLearnset, - .teachableLearnset = sTyranitarTeachableLearnset, - .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, - .formChangeTable = sTyranitarFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_TyranitarMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -6266,7 +6257,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_TyranitarMega, .iconSprite = gMonIcon_TyranitarMega, .iconPalIndex = 1, + FOOTPRINT(Tyranitar) .isMegaEvolution = TRUE, + .levelUpLearnset = sTyranitarLevelUpLearnset, + .teachableLearnset = sTyranitarTeachableLearnset, + .formSpeciesIdTable = sTyranitarFormSpeciesIdTable, + .formChangeTable = sTyranitarFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR @@ -6297,7 +6293,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_MULTISCALE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Lugia"), .cryId = CRY_LUGIA, .natDexNum = NATIONAL_DEX_LUGIA, @@ -6329,6 +6324,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Lugia, .iconPalIndex = 0, FOOTPRINT(Lugia) + .isLegendary = TRUE, .levelUpLearnset = sLugiaLevelUpLearnset, .teachableLearnset = sLugiaTeachableLearnset, }, @@ -6362,7 +6358,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Ho-Oh"), .cryId = CRY_HO_OH, .natDexNum = NATIONAL_DEX_HO_OH, @@ -6393,6 +6388,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_HoOh, .iconPalIndex = 1, FOOTPRINT(HoOh) + .isLegendary = TRUE, .levelUpLearnset = sHoOhLevelUpLearnset, .teachableLearnset = sHoOhTeachableLearnset, }, @@ -6426,7 +6422,6 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_NATURAL_CURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isMythical = TRUE, .speciesName = _("Celebi"), .cryId = CRY_CELEBI, .natDexNum = NATIONAL_DEX_CELEBI, @@ -6457,6 +6452,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Celebi, .iconPalIndex = 1, FOOTPRINT(Celebi) + .isMythical = TRUE, .levelUpLearnset = sCelebiLevelUpLearnset, .teachableLearnset = sCelebiTeachableLearnset, }, From 23ec824c0f086b8351e3bd7aee3e478ddb575b4a Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 14:53:18 -0300 Subject: [PATCH 17/23] Gen 3 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_3.h | 1019 ++++++++++++------------- 1 file changed, 499 insertions(+), 520 deletions(-) diff --git a/src/data/pokemon/species_info/gen_3.h b/src/data/pokemon/species_info/gen_3.h index 746cbdb6bd19..6664a61899d9 100644 --- a/src/data/pokemon/species_info/gen_3.h +++ b/src/data/pokemon/species_info/gen_3.h @@ -120,30 +120,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 85, .types = MON_TYPES(TYPE_GRASS), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 265, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 239, + #else + .expYield = 208, + #endif .evYield_Speed = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_UNBURDEN }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Sceptile"), + .cryId = CRY_SCEPTILE, .natDexNum = NATIONAL_DEX_SCEPTILE, .categoryName = _("Forest"), - FOOTPRINT(Sceptile) - .levelUpLearnset = sSceptileLevelUpLearnset, - .teachableLearnset = sSceptileTeachableLearnset, - .formSpeciesIdTable = sSceptileFormSpeciesIdTable, - .formChangeTable = sSceptileFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 265, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 239, - #else - .expYield = 208, - #endif - .abilities = { ABILITY_OVERGROW, ABILITY_NONE, ABILITY_UNBURDEN }, - .cryId = CRY_SCEPTILE, .height = 17, .weight = 522, .description = COMPOUND_STRING( @@ -168,6 +163,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sceptile, .iconSprite = gMonIcon_Sceptile, .iconPalIndex = 1, + FOOTPRINT(Sceptile) + .levelUpLearnset = sSceptileLevelUpLearnset, + .teachableLearnset = sSceptileTeachableLearnset, + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, + .formChangeTable = sSceptileFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -207,11 +207,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, .frontPic = gMonFrontPic_SceptileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Sceptile) - .levelUpLearnset = sSceptileLevelUpLearnset, - .teachableLearnset = sSceptileTeachableLearnset, - .formSpeciesIdTable = sSceptileFormSpeciesIdTable, - .formChangeTable = sSceptileFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SceptileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -223,7 +218,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SceptileMega, .iconSprite = gMonIcon_SceptileMega, .iconPalIndex = 1, + FOOTPRINT(Sceptile) .isMegaEvolution = TRUE, + .levelUpLearnset = sSceptileLevelUpLearnset, + .teachableLearnset = sSceptileTeachableLearnset, + .formSpeciesIdTable = sSceptileFormSpeciesIdTable, + .formChangeTable = sSceptileFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO @@ -269,8 +269,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontAnimFrames = sAnims_Torchic, .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Torchic, - .backPicSize = MON_COORDS_SIZE(40, 48), .backPicFemale = gMonBackPic_TorchicF, + .backPicSize = MON_COORDS_SIZE(40, 48), .backPicSizeFemale = MON_COORDS_SIZE(40, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, @@ -320,15 +320,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Combusken, - .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicFemale = gMonFrontPic_CombuskenF, + .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Combusken, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Combusken, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_CombuskenF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -352,51 +352,46 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 70, .types = MON_TYPES(TYPE_FIRE, TYPE_FIGHTING), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 265, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 239, + #else + .expYield = 209, + #endif .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD), + .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_SPEED_BOOST }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Blaziken"), + .cryId = CRY_BLAZIKEN, .natDexNum = NATIONAL_DEX_BLAZIKEN, .categoryName = _("Blaze"), .height = 19, .weight = 520, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 301, - .trainerOffset = 4, - FOOTPRINT(Blaziken) - .levelUpLearnset = sBlazikenLevelUpLearnset, - .teachableLearnset = sBlazikenTeachableLearnset, - .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, - .formChangeTable = sBlazikenFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 265, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 239, - #else - .expYield = 209, - #endif - .abilities = { ABILITY_BLAZE, ABILITY_NONE, ABILITY_SPEED_BOOST }, - .cryId = CRY_BLAZIKEN, .description = COMPOUND_STRING( "It learns martial arts that use punches\n" "and kicks. Every several years, its old\n" "feathers burn off, and new, supple\n" "feathers grow back in their place."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 301, + .trainerOffset = 4, .frontPic = gMonFrontPic_Blaziken, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_BlazikenF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Blaziken, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Blaziken, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_BlazikenF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, @@ -404,6 +399,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Blaziken, .iconSprite = gMonIcon_Blaziken, .iconPalIndex = 0, + FOOTPRINT(Blaziken) + .levelUpLearnset = sBlazikenLevelUpLearnset, + .teachableLearnset = sBlazikenTeachableLearnset, + .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, + .formChangeTable = sBlazikenFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -443,11 +443,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 4, .frontPic = gMonFrontPic_BlazikenMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Blaziken) - .levelUpLearnset = sBlazikenLevelUpLearnset, - .teachableLearnset = sBlazikenTeachableLearnset, - .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, - .formChangeTable = sBlazikenFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_BlazikenMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -459,7 +454,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_BlazikenMega, .iconSprite = gMonIcon_BlazikenMega, .iconPalIndex = 0, + FOOTPRINT(Blaziken) .isMegaEvolution = TRUE, + .levelUpLearnset = sBlazikenLevelUpLearnset, + .teachableLearnset = sBlazikenTeachableLearnset, + .formSpeciesIdTable = sBlazikenFormSpeciesIdTable, + .formChangeTable = sBlazikenFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC @@ -581,30 +581,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_WATER, TYPE_GROUND), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 268, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 241, + #else + .expYield = 210, + #endif .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_WATER_1), + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DAMP }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Swampert"), + .cryId = CRY_SWAMPERT, .natDexNum = NATIONAL_DEX_SWAMPERT, .categoryName = _("Mud Fish"), - FOOTPRINT(Swampert) - .levelUpLearnset = sSwampertLevelUpLearnset, - .teachableLearnset = sSwampertTeachableLearnset, - .formSpeciesIdTable = sSwampertFormSpeciesIdTable, - .formChangeTable = sSwampertFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 268, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 241, - #else - .expYield = 210, - #endif - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DAMP }, - .cryId = CRY_SWAMPERT, .height = 15, .weight = 819, .description = COMPOUND_STRING( @@ -629,6 +624,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Swampert, .iconSprite = gMonIcon_Swampert, .iconPalIndex = 0, + FOOTPRINT(Swampert) + .levelUpLearnset = sSwampertLevelUpLearnset, + .teachableLearnset = sSwampertTeachableLearnset, + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, + .formChangeTable = sSwampertFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -668,11 +668,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SwampertMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Swampert) - .levelUpLearnset = sSwampertLevelUpLearnset, - .teachableLearnset = sSwampertTeachableLearnset, - .formSpeciesIdTable = sSwampertFormSpeciesIdTable, - .formChangeTable = sSwampertFormChangeTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_SwampertMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -684,7 +679,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SwampertMega, .iconSprite = gMonIcon_SwampertMega, .iconPalIndex = 0, + FOOTPRINT(Swampert) .isMegaEvolution = TRUE, + .levelUpLearnset = sSwampertLevelUpLearnset, + .teachableLearnset = sSwampertTeachableLearnset, + .formSpeciesIdTable = sSwampertFormSpeciesIdTable, + .formChangeTable = sSwampertFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP @@ -849,8 +849,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Zigzagoon, .frontPicSize = MON_COORDS_SIZE(56, 40), - FOOTPRINT(Zigzagoon) - .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_Zigzagoon, .frontAnimId = ANIM_H_SLIDE, @@ -862,8 +860,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Zigzagoon, .iconSprite = gMonIcon_Zigzagoon, .iconPalIndex = 2, + FOOTPRINT(Zigzagoon) .levelUpLearnset = sZigzagoonLevelUpLearnset, .teachableLearnset = sZigzagoonTeachableLearnset, + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE}), }, @@ -905,8 +905,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Linoone, .frontPicSize = MON_COORDS_SIZE(64, 40), - FOOTPRINT(Linoone) - .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_Linoone, .frontAnimId = ANIM_GROW_VIBRATE, @@ -918,8 +916,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Linoone, .iconSprite = gMonIcon_Linoone, .iconPalIndex = 2, + FOOTPRINT(Linoone) .levelUpLearnset = sLinooneLevelUpLearnset, .teachableLearnset = sLinooneTeachableLearnset, + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -959,8 +959,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_ZigzagoonGalarian, .frontPicSize = MON_COORDS_SIZE(56, 40), - FOOTPRINT(Zigzagoon) - .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_ZigzagoonGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -972,9 +970,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_ZigzagoonGalarian, .iconSprite = gMonIcon_ZigzagoonGalarian, .iconPalIndex = 0, + FOOTPRINT(Zigzagoon) + .isGalarianForm = TRUE, .levelUpLearnset = sZigzagoonGalarianLevelUpLearnset, .teachableLearnset = sZigzagoonGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALARIAN}), }, @@ -1014,8 +1014,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LinooneGalarian, .frontPicSize = MON_COORDS_SIZE(64, 40), - FOOTPRINT(Linoone) - .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_LinooneGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1027,9 +1025,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LinooneGalarian, .iconSprite = gMonIcon_LinooneGalarian, .iconPalIndex = 0, + FOOTPRINT(Linoone) + .isGalarianForm = TRUE, .levelUpLearnset = sLinooneGalarianLevelUpLearnset, .teachableLearnset = sLinooneGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}), }, @@ -1144,9 +1144,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Wurmple, .iconPalIndex = 0, FOOTPRINT(Wurmple) + .tmIlliterate = TRUE, .levelUpLearnset = sWurmpleLevelUpLearnset, .teachableLearnset = sWurmpleTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}), }, @@ -1199,9 +1199,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Silcoon, .iconPalIndex = 2, FOOTPRINT(Silcoon) + .tmIlliterate = TRUE, .levelUpLearnset = sSilcoonLevelUpLearnset, .teachableLearnset = sSilcoonTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_BEAUTIFLY}), }, @@ -1249,16 +1249,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Beautifly, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_BeautiflyF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Beautifly, .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = 10, .backPic = gMonBackPic_Beautifly, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_BeautiflyF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -1325,9 +1325,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Cascoon, .iconPalIndex = 2, FOOTPRINT(Cascoon) + .tmIlliterate = TRUE, .levelUpLearnset = sCascoonLevelUpLearnset, .teachableLearnset = sCascoonTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DUSTOX}), }, @@ -1377,16 +1377,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Dustox, - .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicFemale = gMonFrontPic_DustoxF, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Dustox, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .enemyMonElevation = 12, .backPic = gMonBackPic_Dustox, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_DustoxF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, @@ -1551,15 +1551,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 268, .trainerOffset = -1, .frontPic = gMonFrontPic_Ludicolo, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_LudicoloF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ludicolo, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Ludicolo, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_LudicoloF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, @@ -1664,15 +1664,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Nuzleaf, - .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicFemale = gMonFrontPic_NuzleafF, + .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Nuzleaf, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nuzleaf, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_NuzleafF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE, @@ -1710,11 +1710,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_GRASS), - #if P_UPDATED_ABILITIES >= GEN_9 - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_WIND_RIDER, ABILITY_PICKPOCKET }, - #else - .abilities = { ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET }, - #endif + #if P_UPDATED_ABILITIES >= GEN_9 + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_WIND_RIDER, ABILITY_PICKPOCKET }, + #else + .abilities = { ABILITY_CHLOROPHYLL, ABILITY_EARLY_BIRD, ABILITY_PICKPOCKET }, + #endif .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Shiftry"), .cryId = CRY_SHIFTRY, @@ -1732,15 +1732,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Shiftry, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_ShiftryF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Shiftry, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Shiftry, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_ShiftryF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -2110,41 +2110,36 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 115, .types = MON_TYPES(TYPE_PSYCHIC, RALTS_FAMILY_TYPE2), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 259, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 233, + #else + .expYield = 208, + #endif .evYield_SpAttack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = RALTS_FAMILY_EGG_GROUPS, + .abilities = { ABILITY_SYNCHRONIZE, ABILITY_TRACE, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Gardevoir"), + .cryId = CRY_GARDEVOIR, .natDexNum = NATIONAL_DEX_GARDEVOIR, .categoryName = _("Embrace"), .height = 16, .weight = 484, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Gardevoir) - .levelUpLearnset = sGardevoirLevelUpLearnset, - .teachableLearnset = sGardevoirTeachableLearnset, - .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, - .formChangeTable = sGardevoirFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 259, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 233, - #else - .expYield = 208, - #endif - .abilities = { ABILITY_SYNCHRONIZE, ABILITY_TRACE, ABILITY_TELEPATHY }, - .cryId = CRY_GARDEVOIR, .description = COMPOUND_STRING( "It apparently does not feel the pull of\n" "gravity because it supports itself with\n" "psychic power. It will give its life to\n" "protect its Trainer."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_Gardevoir, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -2158,6 +2153,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Gardevoir, .iconSprite = gMonIcon_Gardevoir, .iconPalIndex = 1, + FOOTPRINT(Gardevoir) + .levelUpLearnset = sGardevoirLevelUpLearnset, + .teachableLearnset = sGardevoirTeachableLearnset, + .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, + .formChangeTable = sGardevoirFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -2197,11 +2197,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_GardevoirMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Gardevoir) - .levelUpLearnset = sGardevoirLevelUpLearnset, - .teachableLearnset = sGardevoirTeachableLearnset, - .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, - .formChangeTable = sGardevoirFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GardevoirMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2213,7 +2208,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GardevoirMega, .iconSprite = gMonIcon_GardevoirMega, .iconPalIndex = 1, + FOOTPRINT(Gardevoir) .isMegaEvolution = TRUE, + .levelUpLearnset = sGardevoirLevelUpLearnset, + .teachableLearnset = sGardevoirTeachableLearnset, + .formSpeciesIdTable = sGardevoirFormSpeciesIdTable, + .formChangeTable = sGardevoirFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS @@ -2228,58 +2228,58 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 115, .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FIGHTING), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 259, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 233, + #else + .expYield = 208, + #endif .evYield_Attack = 3, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = RALTS_FAMILY_EGG_GROUPS, + #if P_UPDATED_ABILITIES >= GEN_9 + .abilities = { ABILITY_STEADFAST, ABILITY_SHARPNESS, ABILITY_JUSTIFIED }, + #else + .abilities = { ABILITY_STEADFAST, ABILITY_NONE, ABILITY_JUSTIFIED }, + #endif .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Gallade"), + .cryId = CRY_GALLADE, .natDexNum = NATIONAL_DEX_GALLADE, .categoryName = _("Blade"), .height = 16, + .weight = 520, + .description = COMPOUND_STRING( + "A master of courtesy and swordsmanship,\n" + "it fights using extending swords on its\n" + "elbows when trying to protect someone.\n" + "It can sense what its foe is thinking."), .pokemonScale = 259, .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, + .frontPic = gMonFrontPic_Gallade, + .frontPicSize = MON_COORDS_SIZE(56, 64), + .frontPicYOffset = 1, + .frontAnimFrames = sAnims_Gallade, + .frontAnimId = ANIM_H_VIBRATE, + .backPic = gMonBackPic_Gallade, + .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 5, + .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, + .palette = gMonPalette_Gallade, + .shinyPalette = gMonShinyPalette_Gallade, + .iconSprite = gMonIcon_Gallade, + .iconPalIndex = 1, FOOTPRINT(Gallade) .levelUpLearnset = sGalladeLevelUpLearnset, .teachableLearnset = sGalladeTeachableLearnset, .formSpeciesIdTable = sGalladeFormSpeciesIdTable, .formChangeTable = sGalladeFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 259, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 233, - #else - .expYield = 208, - #endif - #if P_UPDATED_ABILITIES >= GEN_9 - .abilities = { ABILITY_STEADFAST, ABILITY_SHARPNESS, ABILITY_JUSTIFIED }, - #else - .abilities = { ABILITY_STEADFAST, ABILITY_NONE, ABILITY_JUSTIFIED }, - #endif - .cryId = CRY_GALLADE, - .weight = 520, - .description = COMPOUND_STRING( - "A master of courtesy and swordsmanship,\n" - "it fights using extending swords on its\n" - "elbows when trying to protect someone.\n" - "It can sense what its foe is thinking."), - .frontPic = gMonFrontPic_Gallade, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Gallade, - .frontAnimId = ANIM_H_VIBRATE, - .backPic = gMonBackPic_Gallade, - .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 5, - .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - .palette = gMonPalette_Gallade, - .shinyPalette = gMonShinyPalette_Gallade, - .iconSprite = gMonIcon_Gallade, - .iconPalIndex = 1, }, #if P_MEGA_EVOLUTIONS @@ -2319,11 +2319,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 1, .frontPic = gMonFrontPic_GalladeMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Gallade) - .levelUpLearnset = sGalladeLevelUpLearnset, - .teachableLearnset = sGalladeTeachableLearnset, - .formSpeciesIdTable = sGalladeFormSpeciesIdTable, - .formChangeTable = sGalladeFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_GalladeMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2335,7 +2330,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GalladeMega, .iconSprite = gMonIcon_GalladeMega, .iconPalIndex = 1, + FOOTPRINT(Gallade) .isMegaEvolution = TRUE, + .levelUpLearnset = sGalladeLevelUpLearnset, + .teachableLearnset = sGalladeTeachableLearnset, + .formSpeciesIdTable = sGalladeFormSpeciesIdTable, + .formChangeTable = sGalladeFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS @@ -2401,14 +2401,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseHP = 70, .baseAttack = 60, .baseDefense = 62, + .baseSpeed = P_UPDATED_STATS >= GEN_7 ? 80 : 60, + .baseSpAttack = P_UPDATED_STATS >= GEN_7 ? 100 : 80, .baseSpDefense = 82, - #if P_UPDATED_STATS >= GEN_7 - .baseSpeed = 80, - .baseSpAttack = 100, - #else - .baseSpeed = 60, - .baseSpAttack = 80, - #endif .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), .catchRate = 75, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -3447,11 +3442,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sableye, .frontPicSize = MON_COORDS_SIZE(48, 48), - FOOTPRINT(Sableye) - .levelUpLearnset = sSableyeLevelUpLearnset, - .teachableLearnset = sSableyeTeachableLearnset, - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, - .formChangeTable = sSableyeFormChangeTable, .frontPicYOffset = 10, .frontAnimFrames = sAnims_Sableye, .frontAnimId = ANIM_GLOW_BLACK, @@ -3463,6 +3453,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sableye, .iconSprite = gMonIcon_Sableye, .iconPalIndex = 2, + FOOTPRINT(Sableye) + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, + .formChangeTable = sSableyeFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -3496,11 +3491,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "Bathed in the energy of Mega Evolution,\n" "the gemstone on its chest expands, rips\n" "through its skin, and falls out."), - FOOTPRINT(Sableye) - .levelUpLearnset = sSableyeLevelUpLearnset, - .teachableLearnset = sSableyeTeachableLearnset, - .formSpeciesIdTable = sSableyeFormSpeciesIdTable, - .formChangeTable = sSableyeFormChangeTable, .pokemonScale = 451, .pokemonOffset = 17, .trainerScale = 256, @@ -3518,7 +3508,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SableyeMega, .iconSprite = gMonIcon_SableyeMega, .iconPalIndex = 2, + FOOTPRINT(Sableye) .isMegaEvolution = TRUE, + .levelUpLearnset = sSableyeLevelUpLearnset, + .teachableLearnset = sSableyeTeachableLearnset, + .formSpeciesIdTable = sSableyeFormSpeciesIdTable, + .formChangeTable = sSableyeFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE @@ -3568,11 +3563,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Mawile, .frontPicSize = MON_COORDS_SIZE(64, 48), - FOOTPRINT(Mawile) - .levelUpLearnset = sMawileLevelUpLearnset, - .teachableLearnset = sMawileTeachableLearnset, - .formSpeciesIdTable = sMawileFormSpeciesIdTable, - .formChangeTable = sMawileFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Mawile, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3584,6 +3574,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Mawile, .iconSprite = gMonIcon_Mawile, .iconPalIndex = 2, + FOOTPRINT(Mawile) + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, + .formSpeciesIdTable = sMawileFormSpeciesIdTable, + .formChangeTable = sMawileFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -3624,11 +3619,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_MawileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Mawile) - .levelUpLearnset = sMawileLevelUpLearnset, - .teachableLearnset = sMawileTeachableLearnset, - .formSpeciesIdTable = sMawileFormSpeciesIdTable, - .formChangeTable = sMawileFormChangeTable, .frontPicYOffset = 5, .frontAnimFrames = sAnims_MawileMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3640,7 +3630,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MawileMega, .iconSprite = gMonIcon_MawileMega, .iconPalIndex = 0, + FOOTPRINT(Mawile) .isMegaEvolution = TRUE, + .levelUpLearnset = sMawileLevelUpLearnset, + .teachableLearnset = sMawileTeachableLearnset, + .formSpeciesIdTable = sMawileFormSpeciesIdTable, + .formChangeTable = sMawileFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE @@ -3764,6 +3759,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 60, .types = MON_TYPES(TYPE_STEEL, TYPE_ROCK), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 265, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 239, + #else + .expYield = 205, + #endif .evYield_Defense = 3, .itemRare = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), @@ -3771,24 +3773,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER), + .abilities = { ABILITY_STURDY, ABILITY_ROCK_HEAD, ABILITY_HEAVY_METAL }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Aggron"), + .cryId = CRY_AGGRON, .natDexNum = NATIONAL_DEX_AGGRON, .categoryName = _("Iron Armor"), - FOOTPRINT(Aggron) - .levelUpLearnset = sAggronLevelUpLearnset, - .teachableLearnset = sAggronTeachableLearnset, - .formSpeciesIdTable = sAggronFormSpeciesIdTable, - .formChangeTable = sAggronFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 265, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 239, - #else - .expYield = 205, - #endif - .abilities = { ABILITY_STURDY, ABILITY_ROCK_HEAD, ABILITY_HEAVY_METAL }, - .cryId = CRY_AGGRON, .height = 21, .weight = 3600, .description = COMPOUND_STRING( @@ -3813,6 +3803,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Aggron, .iconSprite = gMonIcon_Aggron, .iconPalIndex = 2, + FOOTPRINT(Aggron) + .levelUpLearnset = sAggronLevelUpLearnset, + .teachableLearnset = sAggronTeachableLearnset, + .formSpeciesIdTable = sAggronFormSpeciesIdTable, + .formChangeTable = sAggronFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -3853,11 +3848,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 6, .frontPic = gMonFrontPic_AggronMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Aggron) - .levelUpLearnset = sAggronLevelUpLearnset, - .teachableLearnset = sAggronTeachableLearnset, - .formSpeciesIdTable = sAggronFormSpeciesIdTable, - .formChangeTable = sAggronFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AggronMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3869,7 +3859,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AggronMega, .iconSprite = gMonIcon_AggronMega, .iconPalIndex = 2, + FOOTPRINT(Aggron) .isMegaEvolution = TRUE, + .levelUpLearnset = sAggronLevelUpLearnset, + .teachableLearnset = sAggronTeachableLearnset, + .formSpeciesIdTable = sAggronFormSpeciesIdTable, + .formChangeTable = sAggronFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON @@ -3910,15 +3905,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Meditite, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_MedititeF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Meditite, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Meditite, - .backPicSize = MON_COORDS_SIZE(48, 48), .backPicFemale = gMonBackPic_MedititeF, + .backPicSize = MON_COORDS_SIZE(48, 48), .backPicSizeFemale = MON_COORDS_SIZE(48, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -3967,20 +3962,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Medicham, - .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicFemale = gMonFrontPic_MedichamF, + .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicSizeFemale = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Medicham, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Medicham, - .backPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Medicham) - .levelUpLearnset = sMedichamLevelUpLearnset, - .teachableLearnset = sMedichamTeachableLearnset, - .formSpeciesIdTable = sMedichamFormSpeciesIdTable, - .formChangeTable = sMedichamFormChangeTable, .backPicFemale = gMonBackPic_MedichamF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -3988,6 +3978,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Medicham, .iconSprite = gMonIcon_Medicham, .iconPalIndex = 0, + FOOTPRINT(Medicham) + .levelUpLearnset = sMedichamLevelUpLearnset, + .teachableLearnset = sMedichamTeachableLearnset, + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, + .formChangeTable = sMedichamFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -4027,11 +4022,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_MedichamMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Medicham) - .levelUpLearnset = sMedichamLevelUpLearnset, - .teachableLearnset = sMedichamTeachableLearnset, - .formSpeciesIdTable = sMedichamFormSpeciesIdTable, - .formChangeTable = sMedichamFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_MedichamMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4043,7 +4033,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MedichamMega, .iconSprite = gMonIcon_MedichamMega, .iconPalIndex = 0, + FOOTPRINT(Medicham) .isMegaEvolution = TRUE, + .levelUpLearnset = sMedichamLevelUpLearnset, + .teachableLearnset = sMedichamTeachableLearnset, + .formSpeciesIdTable = sMedichamFormSpeciesIdTable, + .formChangeTable = sMedichamFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE @@ -4138,11 +4133,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Manectric, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Manectric) - .levelUpLearnset = sManectricLevelUpLearnset, - .teachableLearnset = sManectricTeachableLearnset, - .formSpeciesIdTable = sManectricFormSpeciesIdTable, - .formChangeTable = sManectricFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Manectric, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4154,6 +4144,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Manectric, .iconSprite = gMonIcon_Manectric, .iconPalIndex = 0, + FOOTPRINT(Manectric) + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, + .formSpeciesIdTable = sManectricFormSpeciesIdTable, + .formChangeTable = sManectricFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -4186,11 +4181,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "Too much electricity has built up in its\n" "body, irritating Manectric. Its explosive\n" "speed is equal to that of a lightning bolt."), - FOOTPRINT(Manectric) - .levelUpLearnset = sManectricLevelUpLearnset, - .teachableLearnset = sManectricTeachableLearnset, - .formSpeciesIdTable = sManectricFormSpeciesIdTable, - .formChangeTable = sManectricFormChangeTable, .pokemonScale = 256, .pokemonOffset = 3, .trainerScale = 257, @@ -4208,7 +4198,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_ManectricMega, .iconSprite = gMonIcon_ManectricMega, .iconPalIndex = 0, + FOOTPRINT(Manectric) .isMegaEvolution = TRUE, + .levelUpLearnset = sManectricLevelUpLearnset, + .teachableLearnset = sManectricTeachableLearnset, + .formSpeciesIdTable = sManectricFormSpeciesIdTable, + .formChangeTable = sManectricFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE @@ -4328,15 +4323,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = { .baseHP = 65, .baseAttack = 73, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 75 : 55, .baseSpeed = 85, .baseSpAttack = 47, - #if P_UPDATED_STATS >= GEN_7 - .baseDefense = 75, - .baseSpDefense = 85, - #else - .baseDefense = 55, - .baseSpDefense = 75, - #endif + .baseSpDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, .types = MON_TYPES(TYPE_BUG), .catchRate = 150, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -4392,15 +4382,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = { .baseHP = 65, .baseAttack = 47, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 75 : 55, .baseSpeed = 85, .baseSpAttack = 73, - #if P_UPDATED_STATS >= GEN_7 - .baseDefense = 75, - .baseSpDefense = 85, - #else - .baseDefense = 55, - .baseSpDefense = 75, - #endif + .baseSpDefense = P_UPDATED_STATS >= GEN_7 ? 85 : 75, .types = MON_TYPES(TYPE_BUG), .catchRate = 150, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -4548,15 +4533,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Roselia, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_RoseliaF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Roselia, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Roselia, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_RoseliaF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, @@ -4616,15 +4601,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Roserade, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_RoseradeF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Roserade, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Roserade, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_RoseradeF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -4677,15 +4662,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gulpin, - .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicFemale = gMonFrontPic_GulpinF, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Gulpin, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gulpin, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_GulpinF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_STRETCH, @@ -4736,15 +4721,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 345, .trainerOffset = 3, .frontPic = gMonFrontPic_Swalot, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_SwalotF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Swalot, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Swalot, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_SwalotF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_STRETCH, @@ -4850,11 +4835,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 3, .frontPic = gMonFrontPic_Sharpedo, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Sharpedo) - .levelUpLearnset = sSharpedoLevelUpLearnset, - .teachableLearnset = sSharpedoTeachableLearnset, - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, - .formChangeTable = sSharpedoFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Sharpedo, .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, @@ -4866,6 +4846,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sharpedo, .iconSprite = gMonIcon_Sharpedo, .iconPalIndex = 0, + FOOTPRINT(Sharpedo) + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, + .formChangeTable = sSharpedoFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -4906,11 +4891,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 3, .frontPic = gMonFrontPic_SharpedoMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Sharpedo) - .levelUpLearnset = sSharpedoLevelUpLearnset, - .teachableLearnset = sSharpedoTeachableLearnset, - .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, - .formChangeTable = sSharpedoFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SharpedoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4923,7 +4903,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SharpedoMega, .iconSprite = gMonIcon_SharpedoMega, .iconPalIndex = 0, + FOOTPRINT(Sharpedo) .isMegaEvolution = TRUE, + .levelUpLearnset = sSharpedoLevelUpLearnset, + .teachableLearnset = sSharpedoTeachableLearnset, + .formSpeciesIdTable = sSharpedoFormSpeciesIdTable, + .formChangeTable = sSharpedoFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA @@ -5072,15 +5057,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Numel, - .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicFemale = gMonFrontPic_NumelF, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Numel, .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Numel, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_NumelF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, @@ -5130,20 +5115,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 345, .trainerOffset = 6, .frontPic = gMonFrontPic_Camerupt, - .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicFemale = gMonFrontPic_CameruptF, + .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Camerupt, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Camerupt, - .backPicSize = MON_COORDS_SIZE(64, 40), - FOOTPRINT(Camerupt) - .levelUpLearnset = sCameruptLevelUpLearnset, - .teachableLearnset = sCameruptTeachableLearnset, - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, - .formChangeTable = sCameruptFormChangeTable, .backPicFemale = gMonBackPic_CameruptF, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, @@ -5151,6 +5131,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Camerupt, .iconSprite = gMonIcon_Camerupt, .iconPalIndex = 0, + FOOTPRINT(Camerupt) + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, + .formChangeTable = sCameruptFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -5191,11 +5176,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 6, .frontPic = gMonFrontPic_CameruptMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Camerupt) - .levelUpLearnset = sCameruptLevelUpLearnset, - .teachableLearnset = sCameruptTeachableLearnset, - .formSpeciesIdTable = sCameruptFormSpeciesIdTable, - .formChangeTable = sCameruptFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_CameruptMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5207,7 +5187,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CameruptMega, .iconSprite = gMonIcon_CameruptMega, .iconPalIndex = 0, + FOOTPRINT(Camerupt) .isMegaEvolution = TRUE, + .levelUpLearnset = sCameruptLevelUpLearnset, + .teachableLearnset = sCameruptTeachableLearnset, + .formSpeciesIdTable = sCameruptFormSpeciesIdTable, + .formChangeTable = sCameruptFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL @@ -5448,11 +5433,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + #endif .abilities = { ABILITY_HYPER_CUTTER, ABILITY_ARENA_TRAP, ABILITY_SHEER_FORCE }, .bodyColor = BODY_COLOR_BROWN, .speciesName = _("Trapinch"), @@ -5506,11 +5491,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + #endif .abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Vibrava"), @@ -5570,11 +5555,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG, EGG_GROUP_DRAGON), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), + #endif .abilities = { ABILITY_LEVITATE, ABILITY_LEVITATE, ABILITY_LEVITATE }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Flygon"), @@ -5704,8 +5689,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Cacturne, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_CacturneF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cacturne, @@ -5814,11 +5799,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Altaria, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Altaria) - .levelUpLearnset = sAltariaLevelUpLearnset, - .teachableLearnset = sAltariaTeachableLearnset, - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, - .formChangeTable = sAltariaFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Altaria, .frontAnimId = ANIM_V_STRETCH, @@ -5830,6 +5810,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Altaria, .iconSprite = gMonIcon_Altaria, .iconPalIndex = 0, + FOOTPRINT(Altaria) + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, + .formChangeTable = sAltariaFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -5869,11 +5854,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AltariaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Altaria) - .levelUpLearnset = sAltariaLevelUpLearnset, - .teachableLearnset = sAltariaTeachableLearnset, - .formSpeciesIdTable = sAltariaFormSpeciesIdTable, - .formChangeTable = sAltariaFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AltariaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5886,9 +5866,14 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AltariaMega, .iconSprite = gMonIcon_AltariaMega, .iconPalIndex = 0, + FOOTPRINT(Altaria) .isMegaEvolution = TRUE, - }, -#endif //P_MEGA_EVOLUTIONS + .levelUpLearnset = sAltariaLevelUpLearnset, + .teachableLearnset = sAltariaTeachableLearnset, + .formSpeciesIdTable = sAltariaFormSpeciesIdTable, + .formChangeTable = sAltariaFormChangeTable, + }, +#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU #if P_FAMILY_ZANGOOSE @@ -6787,16 +6772,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 360, .trainerOffset = 7, .frontPic = gMonFrontPic_Milotic, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_MiloticF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Milotic, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .frontAnimDelay = 45, .backPic = gMonBackPic_Milotic, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_MiloticF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, @@ -6849,11 +6834,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CastformNormal, .frontPicSize = MON_COORDS_SIZE(24, 32), - FOOTPRINT(Castform) - .levelUpLearnset = sCastformLevelUpLearnset, - .teachableLearnset = sCastformTeachableLearnset, - .formSpeciesIdTable = sCastformFormSpeciesIdTable, - .formChangeTable = sCastformFormChangeTable, .frontPicYOffset = 17, .frontAnimFrames = sAnims_CastformNormal, .frontAnimId = ANIM_H_SLIDE_WOBBLE, @@ -6866,6 +6846,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformNormal, .iconSprite = gMonIcon_CastformNormal, .iconPalIndex = 0, + FOOTPRINT(Castform) + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, + .formSpeciesIdTable = sCastformFormSpeciesIdTable, + .formChangeTable = sCastformFormChangeTable, }, [SPECIES_CASTFORM_SUNNY] = @@ -6906,11 +6891,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CastformSunny, .frontPicSize = MON_COORDS_SIZE(40, 48), - FOOTPRINT(Castform) - .levelUpLearnset = sCastformLevelUpLearnset, - .teachableLearnset = sCastformTeachableLearnset, - .formSpeciesIdTable = sCastformFormSpeciesIdTable, - .formChangeTable = sCastformFormChangeTable, .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformSunny, .frontAnimId = ANIM_GROW_VIBRATE, @@ -6923,6 +6903,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformSunny, .iconSprite = gMonIcon_CastformSunny, .iconPalIndex = 0, + FOOTPRINT(Castform) + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, + .formSpeciesIdTable = sCastformFormSpeciesIdTable, + .formChangeTable = sCastformFormChangeTable, }, [SPECIES_CASTFORM_RAINY] = @@ -6963,11 +6948,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CastformRainy, .frontPicSize = MON_COORDS_SIZE(32, 48), - FOOTPRINT(Castform) - .levelUpLearnset = sCastformLevelUpLearnset, - .teachableLearnset = sCastformTeachableLearnset, - .formSpeciesIdTable = sCastformFormSpeciesIdTable, - .formChangeTable = sCastformFormChangeTable, .frontPicYOffset = 9, .frontAnimFrames = sAnims_CastformRainy, .frontAnimId = ANIM_SWING_CONVEX_FAST, @@ -6980,6 +6960,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformRainy, .iconSprite = gMonIcon_CastformRainy, .iconPalIndex = 0, + FOOTPRINT(Castform) + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, + .formSpeciesIdTable = sCastformFormSpeciesIdTable, + .formChangeTable = sCastformFormChangeTable, }, [SPECIES_CASTFORM_SNOWY] = @@ -7020,11 +7005,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CastformSnowy, .frontPicSize = MON_COORDS_SIZE(40, 56), - FOOTPRINT(Castform) - .levelUpLearnset = sCastformLevelUpLearnset, - .teachableLearnset = sCastformTeachableLearnset, - .formSpeciesIdTable = sCastformFormSpeciesIdTable, - .formChangeTable = sCastformFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_CastformSnowy, .frontAnimId = ANIM_V_STRETCH, @@ -7037,6 +7017,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformSnowy, .iconSprite = gMonIcon_CastformSnowy, .iconPalIndex = 0, + FOOTPRINT(Castform) + .levelUpLearnset = sCastformLevelUpLearnset, + .teachableLearnset = sCastformTeachableLearnset, + .formSpeciesIdTable = sCastformFormSpeciesIdTable, + .formChangeTable = sCastformFormChangeTable, }, #endif //P_FAMILY_CASTFORM @@ -7188,11 +7173,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Banette, .frontPicSize = MON_COORDS_SIZE(56, 56), - FOOTPRINT(Banette) - .levelUpLearnset = sBanetteLevelUpLearnset, - .teachableLearnset = sBanetteTeachableLearnset, - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, - .formChangeTable = sBanetteFormChangeTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_Banette, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, @@ -7204,6 +7184,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Banette, .iconSprite = gMonIcon_Banette, .iconPalIndex = 0, + FOOTPRINT(Banette) + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, + .formChangeTable = sBanetteFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -7237,11 +7222,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "Extraordinary energy amplifies its\n" "cursing power to such an extent that it\n" "can't help but curse its own Trainer."), - FOOTPRINT(Banette) - .levelUpLearnset = sBanetteLevelUpLearnset, - .teachableLearnset = sBanetteTeachableLearnset, - .formSpeciesIdTable = sBanetteFormSpeciesIdTable, - .formChangeTable = sBanetteFormChangeTable, .pokemonScale = 262, .pokemonOffset = 9, .trainerScale = 256, @@ -7260,7 +7240,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_BanetteMega, .iconSprite = gMonIcon_BanetteMega, .iconPalIndex = 0, + FOOTPRINT(Banette) .isMegaEvolution = TRUE, + .levelUpLearnset = sBanetteLevelUpLearnset, + .teachableLearnset = sBanetteTeachableLearnset, + .formSpeciesIdTable = sBanetteFormSpeciesIdTable, + .formChangeTable = sBanetteFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET @@ -7556,18 +7541,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = [SPECIES_CHIMECHO] = { + .baseHP = P_UPDATED_STATS >= GEN_7 ? 75 : 65, .baseAttack = 50, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 80 : 70, .baseSpeed = 65, .baseSpAttack = 95, - #if P_UPDATED_STATS >= GEN_7 - .baseHP = 75, - .baseDefense = 80, - .baseSpDefense = 90, - #else - .baseHP = 65, - .baseDefense = 70, - .baseSpDefense = 80, - #endif + .baseSpDefense = P_UPDATED_STATS >= GEN_7 ? 90 : 80, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -7660,11 +7639,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Absol, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Absol) - .levelUpLearnset = sAbsolLevelUpLearnset, - .teachableLearnset = sAbsolTeachableLearnset, - .formSpeciesIdTable = sAbsolFormSpeciesIdTable, - .formChangeTable = sAbsolFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Absol, .frontAnimId = ANIM_CIRCULAR_VIBRATE, @@ -7677,6 +7651,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Absol, .iconSprite = gMonIcon_Absol, .iconPalIndex = 0, + FOOTPRINT(Absol) + .levelUpLearnset = sAbsolLevelUpLearnset, + .teachableLearnset = sAbsolTeachableLearnset, + .formSpeciesIdTable = sAbsolFormSpeciesIdTable, + .formChangeTable = sAbsolFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -7717,11 +7696,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AbsolMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Absol) - .levelUpLearnset = sAbsolLevelUpLearnset, - .teachableLearnset = sAbsolTeachableLearnset, - .formSpeciesIdTable = sAbsolFormSpeciesIdTable, - .formChangeTable = sAbsolFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_AbsolMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -7733,7 +7707,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AbsolMega, .iconSprite = gMonIcon_AbsolMega, .iconPalIndex = 0, + FOOTPRINT(Absol) .isMegaEvolution = TRUE, + .levelUpLearnset = sAbsolLevelUpLearnset, + .teachableLearnset = sAbsolTeachableLearnset, + .formSpeciesIdTable = sAbsolFormSpeciesIdTable, + .formChangeTable = sAbsolFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL @@ -7831,11 +7810,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Glalie, .frontPicSize = MON_COORDS_SIZE(56, 56), - FOOTPRINT(Glalie) - .levelUpLearnset = sGlalieLevelUpLearnset, - .teachableLearnset = sGlalieTeachableLearnset, - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, - .formChangeTable = sGlalieFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Glalie, .frontAnimId = ANIM_ZIGZAG_FAST, @@ -7848,6 +7822,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Glalie, .iconSprite = gMonIcon_Glalie, .iconPalIndex = 0, + FOOTPRINT(Glalie) + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, + .formChangeTable = sGlalieFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -7880,11 +7859,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "The power of Mega Evolution was so strong\n" "that it smashed Glalie's jaw. Its inability\n" "to eat very well leaves Glalie irritated."), - FOOTPRINT(Glalie) - .levelUpLearnset = sGlalieLevelUpLearnset, - .teachableLearnset = sGlalieTeachableLearnset, - .formSpeciesIdTable = sGlalieFormSpeciesIdTable, - .formChangeTable = sGlalieFormChangeTable, .pokemonScale = 256, .pokemonOffset = 3, .trainerScale = 344, @@ -7903,7 +7877,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GlalieMega, .iconSprite = gMonIcon_GlalieMega, .iconPalIndex = 0, + FOOTPRINT(Glalie) .isMegaEvolution = TRUE, + .levelUpLearnset = sGlalieLevelUpLearnset, + .teachableLearnset = sGlalieTeachableLearnset, + .formSpeciesIdTable = sGlalieFormSpeciesIdTable, + .formChangeTable = sGlalieFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS @@ -8335,15 +8314,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Relicanth, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_RelicanthF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Relicanth, .frontAnimId = ANIM_TIP_MOVE_FORWARD, .backPic = gMonBackPic_Relicanth, - .backPicSize = MON_COORDS_SIZE(64, 40), .backPicFemale = gMonBackPic_RelicanthF, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_H_SLIDE, @@ -8531,6 +8510,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 80, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 300, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 270, + #else + .expYield = 218, + #endif .evYield_Attack = 3, .itemRare = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), @@ -8538,24 +8524,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_DRAGON), + .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE, ABILITY_MOXIE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Salamence"), + .cryId = CRY_SALAMENCE, .natDexNum = NATIONAL_DEX_SALAMENCE, .categoryName = _("Dragon"), - FOOTPRINT(Salamence) - .levelUpLearnset = sSalamenceLevelUpLearnset, - .teachableLearnset = sSalamenceTeachableLearnset, - .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, - .formChangeTable = sSalamenceFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 300, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 270, - #else - .expYield = 218, - #endif - .abilities = { ABILITY_INTIMIDATE, ABILITY_NONE, ABILITY_MOXIE }, - .cryId = CRY_SALAMENCE, .height = 15, .weight = 1026, .description = COMPOUND_STRING( @@ -8581,6 +8555,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Salamence, .iconSprite = gMonIcon_Salamence, .iconPalIndex = 0, + FOOTPRINT(Salamence) + .levelUpLearnset = sSalamenceLevelUpLearnset, + .teachableLearnset = sSalamenceTeachableLearnset, + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, + .formChangeTable = sSalamenceFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -8621,11 +8600,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SalamenceMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Salamence) - .levelUpLearnset = sSalamenceLevelUpLearnset, - .teachableLearnset = sSalamenceTeachableLearnset, - .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, - .formChangeTable = sSalamenceFormChangeTable, .frontPicYOffset = 3, .frontAnimFrames = sAnims_SalamenceMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8637,7 +8611,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SalamenceMega, .iconSprite = gMonIcon_SalamenceMega, .iconPalIndex = 0, + FOOTPRINT(Salamence) .isMegaEvolution = TRUE, + .levelUpLearnset = sSalamenceLevelUpLearnset, + .teachableLearnset = sSalamenceTeachableLearnset, + .formSpeciesIdTable = sSalamenceFormSpeciesIdTable, + .formChangeTable = sSalamenceFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON @@ -8693,9 +8672,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Beldum, .iconPalIndex = 0, FOOTPRINT(Beldum) + .tmIlliterate = TRUE, .levelUpLearnset = sBeldumLevelUpLearnset, .teachableLearnset = sBeldumTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_METANG}), }, @@ -8763,6 +8742,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_STEEL, TYPE_PSYCHIC), .catchRate = 3, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 300, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 270, + #else + .expYield = 210, + #endif .evYield_Defense = 3, .itemRare = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, @@ -8770,24 +8756,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MINERAL), + .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_LIGHT_METAL }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Metagross"), + .cryId = CRY_METAGROSS, .natDexNum = NATIONAL_DEX_METAGROSS, .categoryName = _("Iron Leg"), - FOOTPRINT(Metagross) - .levelUpLearnset = sMetagrossLevelUpLearnset, - .teachableLearnset = sMetagrossTeachableLearnset, - .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, - .formChangeTable = sMetagrossFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 300, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 270, - #else - .expYield = 210, - #endif - .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_LIGHT_METAL }, - .cryId = CRY_METAGROSS, .height = 16, .weight = 5500, .description = COMPOUND_STRING( @@ -8812,6 +8786,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Metagross, .iconSprite = gMonIcon_Metagross, .iconPalIndex = 0, + FOOTPRINT(Metagross) + .levelUpLearnset = sMetagrossLevelUpLearnset, + .teachableLearnset = sMetagrossTeachableLearnset, + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, + .formChangeTable = sMetagrossFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -8845,11 +8824,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "When it knows it can't win, it digs the\n" "claws on its legs into its opponent and\n" "starts the countdown to a big explosion."), - FOOTPRINT(Metagross) - .levelUpLearnset = sMetagrossLevelUpLearnset, - .teachableLearnset = sMetagrossTeachableLearnset, - .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, - .formChangeTable = sMetagrossFormChangeTable, .pokemonScale = 256, .pokemonOffset = 4, .trainerScale = 447, @@ -8868,7 +8842,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MetagrossMega, .iconSprite = gMonIcon_MetagrossMega, .iconPalIndex = 0, + FOOTPRINT(Metagross) .isMegaEvolution = TRUE, + .levelUpLearnset = sMetagrossLevelUpLearnset, + .teachableLearnset = sMetagrossTeachableLearnset, + .formSpeciesIdTable = sMetagrossFormSpeciesIdTable, + .formChangeTable = sMetagrossFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM @@ -8900,7 +8879,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_STURDY }, .bodyColor = BODY_COLOR_BROWN, .noFlip = TRUE, - .isLegendary = TRUE, .speciesName = _("Regirock"), .cryId = CRY_REGIROCK, .natDexNum = NATIONAL_DEX_REGIROCK, @@ -8930,6 +8908,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Regirock, .iconPalIndex = 2, FOOTPRINT(Regirock) + .isLegendary = TRUE, .levelUpLearnset = sRegirockLevelUpLearnset, .teachableLearnset = sRegirockTeachableLearnset, }, @@ -8961,7 +8940,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_ICE_BODY }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Regice"), .cryId = CRY_REGICE, .natDexNum = NATIONAL_DEX_REGICE, @@ -8991,6 +8969,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Regice, .iconPalIndex = 0, FOOTPRINT(Regice) + .isLegendary = TRUE, .levelUpLearnset = sRegiceLevelUpLearnset, .teachableLearnset = sRegiceTeachableLearnset, }, @@ -9023,7 +9002,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_CLEAR_BODY, ABILITY_NONE, ABILITY_LIGHT_METAL }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Registeel"), .cryId = CRY_REGISTEEL, .natDexNum = NATIONAL_DEX_REGISTEEL, @@ -9053,6 +9031,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Registeel, .iconPalIndex = 2, FOOTPRINT(Registeel) + .isLegendary = TRUE, .levelUpLearnset = sRegisteelLevelUpLearnset, .teachableLearnset = sRegisteelTeachableLearnset, }, @@ -9069,21 +9048,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 130, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, - .evYield_SpDefense = 3, - .genderRatio = MON_FEMALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .speciesName = _("Latias"), - .natDexNum = NATIONAL_DEX_LATIAS, - .categoryName = _("Eon"), - FOOTPRINT(Latias) - .levelUpLearnset = sLatiasLevelUpLearnset, - .teachableLearnset = sLatiasTeachableLearnset, - .formSpeciesIdTable = sLatiasFormSpeciesIdTable, - .formChangeTable = sLatiasFormChangeTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9091,9 +9055,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #else .expYield = 211, #endif + .evYield_SpDefense = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, + .speciesName = _("Latias"), .cryId = CRY_LATIAS, + .natDexNum = NATIONAL_DEX_LATIAS, + .categoryName = _("Eon"), .height = 14, .weight = 400, .description = COMPOUND_STRING( @@ -9119,6 +9092,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Latias, .iconSprite = gMonIcon_Latias, .iconPalIndex = 0, + FOOTPRINT(Latias) + .isLegendary = TRUE, + .levelUpLearnset = sLatiasLevelUpLearnset, + .teachableLearnset = sLatiasTeachableLearnset, + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, + .formChangeTable = sLatiasFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -9158,12 +9137,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LatiasMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Latias) - .levelUpLearnset = sLatiasLevelUpLearnset, - .teachableLearnset = sLatiasTeachableLearnset, - .formSpeciesIdTable = sLatiasFormSpeciesIdTable, - .formChangeTable = sLatiasFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiasMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9176,7 +9149,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LatiasMega, .iconSprite = gMonIcon_LatiasMega, .iconPalIndex = 2, + FOOTPRINT(Latias) + .isLegendary = TRUE, .isMegaEvolution = TRUE, + .levelUpLearnset = sLatiasLevelUpLearnset, + .teachableLearnset = sLatiasTeachableLearnset, + .formSpeciesIdTable = sLatiasFormSpeciesIdTable, + .formChangeTable = sLatiasFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS @@ -9192,21 +9171,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 110, .types = MON_TYPES(TYPE_DRAGON, TYPE_PSYCHIC), .catchRate = 3, - .evYield_SpAttack = 3, - .genderRatio = MON_MALE, - .eggCycles = 120, - .friendship = 90, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .isLegendary = TRUE, - .speciesName = _("Latios"), - .natDexNum = NATIONAL_DEX_LATIOS, - .categoryName = _("Eon"), - FOOTPRINT(Latios) - .levelUpLearnset = sLatiosLevelUpLearnset, - .teachableLearnset = sLatiosTeachableLearnset, - .formSpeciesIdTable = sLatiosFormSpeciesIdTable, - .formChangeTable = sLatiosFormChangeTable, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 300, #elif P_UPDATED_EXP_YIELDS >= GEN_5 @@ -9214,9 +9178,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = #else .expYield = 211, #endif + .evYield_SpAttack = 3, + .genderRatio = MON_MALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, + .speciesName = _("Latios"), .cryId = CRY_LATIOS, + .natDexNum = NATIONAL_DEX_LATIOS, + .categoryName = _("Eon"), .height = 20, .weight = 600, .description = COMPOUND_STRING( @@ -9242,6 +9215,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Latios, .iconSprite = gMonIcon_Latios, .iconPalIndex = 0, + FOOTPRINT(Latios) + .isLegendary = TRUE, + .levelUpLearnset = sLatiosLevelUpLearnset, + .teachableLearnset = sLatiosTeachableLearnset, + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, + .formChangeTable = sLatiosFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -9283,12 +9262,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_LatiosMega, - .isLegendary = TRUE, - FOOTPRINT(Latios) - .levelUpLearnset = sLatiosLevelUpLearnset, - .teachableLearnset = sLatiosTeachableLearnset, - .formSpeciesIdTable = sLatiosFormSpeciesIdTable, - .formChangeTable = sLatiosFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_LatiosMega, @@ -9299,7 +9272,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LatiosMega, .iconSprite = gMonIcon_LatiosMega, .iconPalIndex = 2, + FOOTPRINT(Latios) + .isLegendary = TRUE, .isMegaEvolution = TRUE, + .levelUpLearnset = sLatiosLevelUpLearnset, + .teachableLearnset = sLatiosTeachableLearnset, + .formSpeciesIdTable = sLatiosFormSpeciesIdTable, + .formChangeTable = sLatiosFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS @@ -9315,31 +9294,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 140, .types = MON_TYPES(TYPE_WATER), .catchRate = 3, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 335, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 302, + #else + .expYield = 218, + #endif .evYield_SpAttack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DRIZZLE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Kyogre"), + .cryId = CRY_KYOGRE, .natDexNum = NATIONAL_DEX_KYOGRE, .categoryName = _("Sea Basin"), - FOOTPRINT(Kyogre) - .levelUpLearnset = sKyogreLevelUpLearnset, - .teachableLearnset = sKyogreTeachableLearnset, - .formSpeciesIdTable = sKyogreFormSpeciesIdTable, - .formChangeTable = sKyogreFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 335, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 302, - #else - .expYield = 218, - #endif - .abilities = { ABILITY_DRIZZLE, ABILITY_NONE }, - .cryId = CRY_KYOGRE, .height = 45, .weight = 3520, .description = COMPOUND_STRING( @@ -9365,6 +9338,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Kyogre, .iconSprite = gMonIcon_Kyogre, .iconPalIndex = 2, + FOOTPRINT(Kyogre) + .isLegendary = TRUE, + .levelUpLearnset = sKyogreLevelUpLearnset, + .teachableLearnset = sKyogreTeachableLearnset, + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, + .formChangeTable = sKyogreFormChangeTable, }, #if P_PRIMAL_REVERSIONS [SPECIES_KYOGRE_PRIMAL] = @@ -9405,12 +9384,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_KyogrePrimal, - .isLegendary = TRUE, - FOOTPRINT(Kyogre) - .levelUpLearnset = sKyogreLevelUpLearnset, - .teachableLearnset = sKyogreTeachableLearnset, - .formSpeciesIdTable = sKyogreFormSpeciesIdTable, - .formChangeTable = sKyogreFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KyogrePrimal, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -9420,7 +9393,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_KyogrePrimal, .iconSprite = gMonIcon_KyogrePrimal, .iconPalIndex = 0, + FOOTPRINT(Kyogre) + .isLegendary = TRUE, .isPrimalReversion = TRUE, + .levelUpLearnset = sKyogreLevelUpLearnset, + .teachableLearnset = sKyogreTeachableLearnset, + .formSpeciesIdTable = sKyogreFormSpeciesIdTable, + .formChangeTable = sKyogreFormChangeTable, }, #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE @@ -9434,33 +9413,27 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpeed = 90, .baseSpAttack = 100, .baseSpDefense = 90, + .types = MON_TYPES(TYPE_GROUND), .catchRate = 3, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 335, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 302, + #else + .expYield = 218, + #endif .evYield_Attack = 3, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_DROUGHT, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Groudon"), .cryId = CRY_GROUDON, .natDexNum = NATIONAL_DEX_GROUDON, .categoryName = _("Continent"), - FOOTPRINT(Groudon) - .levelUpLearnset = sGroudonLevelUpLearnset, - .teachableLearnset = sGroudonTeachableLearnset, - .formSpeciesIdTable = sGroudonFormSpeciesIdTable, - .formChangeTable = sGroudonFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 335, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 302, - #else - .expYield = 218, - #endif - .types = MON_TYPES(TYPE_GROUND), - .abilities = { ABILITY_DROUGHT, ABILITY_NONE }, .height = 35, .weight = 9500, .description = COMPOUND_STRING( @@ -9485,6 +9458,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Groudon, .iconSprite = gMonIcon_Groudon, .iconPalIndex = 0, + FOOTPRINT(Groudon) + .isLegendary = TRUE, + .levelUpLearnset = sGroudonLevelUpLearnset, + .teachableLearnset = sGroudonTeachableLearnset, + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, + .formChangeTable = sGroudonFormChangeTable, }, #if P_PRIMAL_REVERSIONS @@ -9526,12 +9505,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_GroudonPrimal, - .isLegendary = TRUE, - FOOTPRINT(Groudon) - .levelUpLearnset = sGroudonLevelUpLearnset, - .teachableLearnset = sGroudonTeachableLearnset, - .formSpeciesIdTable = sGroudonFormSpeciesIdTable, - .formChangeTable = sGroudonFormChangeTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GroudonPrimal, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9541,7 +9514,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GroudonPrimal, .iconSprite = gMonIcon_GroudonPrimal, .iconPalIndex = 0, + FOOTPRINT(Groudon) + .isLegendary = TRUE, .isPrimalReversion = TRUE, + .levelUpLearnset = sGroudonLevelUpLearnset, + .teachableLearnset = sGroudonTeachableLearnset, + .formSpeciesIdTable = sGroudonFormSpeciesIdTable, + .formChangeTable = sGroudonFormChangeTable, }, #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON @@ -9557,6 +9536,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_DRAGON, TYPE_FLYING), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 340, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 306, + #else + .expYield = 220, + #endif .evYield_Attack = 2, .evYield_SpAttack = 1, .genderRatio = MON_GENDERLESS, @@ -9564,25 +9550,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .friendship = 0, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_AIR_LOCK, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Rayquaza"), .cryId = CRY_RAYQUAZA, .natDexNum = NATIONAL_DEX_RAYQUAZA, .categoryName = _("Sky High"), - FOOTPRINT(Rayquaza) - .levelUpLearnset = sRayquazaLevelUpLearnset, - .teachableLearnset = sRayquazaTeachableLearnset, - .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, - .formChangeTable = sRayquazaFormChangeTable, - .isLegendary = TRUE, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 340, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 306, - #else - .expYield = 220, - #endif - .abilities = { ABILITY_AIR_LOCK, ABILITY_NONE }, .height = 70, .weight = 2065, .description = COMPOUND_STRING( @@ -9609,6 +9582,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Rayquaza, .iconSprite = gMonIcon_Rayquaza, .iconPalIndex = 1, + FOOTPRINT(Rayquaza) + .isLegendary = TRUE, + .levelUpLearnset = sRayquazaLevelUpLearnset, + .teachableLearnset = sRayquazaTeachableLearnset, + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, + .formChangeTable = sRayquazaFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -9649,12 +9628,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 12, .frontPic = gMonFrontPic_RayquazaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Rayquaza) - .levelUpLearnset = sRayquazaLevelUpLearnset, - .teachableLearnset = sRayquazaTeachableLearnset, - .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, - .formChangeTable = sRayquazaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_RayquazaMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9667,7 +9640,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_RayquazaMega, .iconSprite = gMonIcon_RayquazaMega, .iconPalIndex = 1, + FOOTPRINT(Rayquaza) + .isLegendary = TRUE, .isMegaEvolution = TRUE, + .levelUpLearnset = sRayquazaLevelUpLearnset, + .teachableLearnset = sRayquazaTeachableLearnset, + .formSpeciesIdTable = sRayquazaFormSpeciesIdTable, + .formChangeTable = sRayquazaFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA @@ -9700,7 +9679,6 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isMythical = TRUE, .speciesName = _("Jirachi"), .cryId = CRY_JIRACHI, .natDexNum = NATIONAL_DEX_JIRACHI, @@ -9731,6 +9709,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Jirachi, .iconPalIndex = 0, FOOTPRINT(Jirachi) + .isMythical = TRUE, .levelUpLearnset = sJirachiLevelUpLearnset, .teachableLearnset = sJirachiTeachableLearnset, }, @@ -9772,14 +9751,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("DNA"), .height = 17, .weight = 608, - .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 2, - FOOTPRINT(Deoxys) - .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .frontPic = gMonFrontPic_DeoxysNormal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -9793,8 +9769,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysNormal, .iconSprite = gMonIcon_DeoxysNormal, .iconPalIndex = 0, + FOOTPRINT(Deoxys) + .isMythical = TRUE, .levelUpLearnset = sDeoxysNormalLevelUpLearnset, .teachableLearnset = sDeoxysNormalTeachableLearnset, + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .formChangeTable = sDeoxysNormalFormChangeTable, }, @@ -9824,14 +9803,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("DNA"), .height = 17, .weight = 608, - .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 2, - FOOTPRINT(Deoxys) - .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .frontPic = gMonFrontPic_DeoxysAttack, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -9845,8 +9821,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysAttack, .iconSprite = gMonIcon_DeoxysAttack, .iconPalIndex = 0, + FOOTPRINT(Deoxys) + .isMythical = TRUE, .levelUpLearnset = sDeoxysAttackLevelUpLearnset, .teachableLearnset = sDeoxysAttackTeachableLearnset, + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .formChangeTable = sDeoxysAttackFormChangeTable, }, @@ -9876,14 +9855,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("DNA"), .height = 17, .weight = 608, - .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 2, - FOOTPRINT(Deoxys) - .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .frontPic = gMonFrontPic_DeoxysDefense, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, @@ -9897,8 +9873,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysDefense, .iconSprite = gMonIcon_DeoxysDefense, .iconPalIndex = 0, + FOOTPRINT(Deoxys) + .isMythical = TRUE, .levelUpLearnset = sDeoxysDefenseLevelUpLearnset, .teachableLearnset = sDeoxysDefenseTeachableLearnset, + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .formChangeTable = sDeoxysDefenseFormChangeTable, }, @@ -9928,14 +9907,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .categoryName = _("DNA"), .height = 17, .weight = 608, - .isMythical = TRUE, .description = gDeoxysNormalPokedexText, .pokemonScale = 256, .pokemonOffset = 0, .trainerScale = 290, .trainerOffset = 2, - FOOTPRINT(Deoxys) - .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .frontPic = gMonFrontPic_DeoxysSpeed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -9949,8 +9925,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysSpeed, .iconSprite = gMonIcon_DeoxysSpeed, .iconPalIndex = 0, + FOOTPRINT(Deoxys) + .isMythical = TRUE, .levelUpLearnset = sDeoxysSpeedLevelUpLearnset, .teachableLearnset = sDeoxysSpeedTeachableLearnset, + .formSpeciesIdTable = sDeoxysFormSpeciesIdTable, .formChangeTable = sDeoxysSpeedFormChangeTable, }, #endif //P_FAMILY_DEOXYS From 11ef5d9fc331ca8a6b1abda81ec10ab20c072552 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:02:56 -0300 Subject: [PATCH 18/23] Gen 4 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_4.h | 494 +++++++++++++------------- 1 file changed, 247 insertions(+), 247 deletions(-) diff --git a/src/data/pokemon/species_info/gen_4.h b/src/data/pokemon/species_info/gen_4.h index 887986e1a87c..ca4283c78ba1 100644 --- a/src/data/pokemon/species_info/gen_4.h +++ b/src/data/pokemon/species_info/gen_4.h @@ -361,11 +361,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), - #if P_UPDATED_ABILITIES >= GEN_9 - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, - #else - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, - #endif + #if P_UPDATED_ABILITIES >= GEN_9 + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, + #else + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, + #endif .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Piplup"), .cryId = CRY_PIPLUP, @@ -418,11 +418,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), - #if P_UPDATED_ABILITIES >= GEN_9 - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, - #else - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, - #endif + #if P_UPDATED_ABILITIES >= GEN_9 + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, + #else + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, + #endif .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Prinplup"), .cryId = CRY_PRINPLUP, @@ -481,11 +481,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FIELD), - #if P_UPDATED_ABILITIES >= GEN_9 - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, - #else - .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, - #endif + #if P_UPDATED_ABILITIES >= GEN_9 + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_COMPETITIVE }, + #else + .abilities = { ABILITY_TORRENT, ABILITY_NONE, ABILITY_DEFIANT }, + #endif .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Empoleon"), .cryId = CRY_EMPOLEON, @@ -557,15 +557,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Starly, - .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicFemale = gMonFrontPic_StarlyF, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Starly, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Starly, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_StarlyF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, @@ -614,15 +614,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Staravia, - .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicFemale = gMonFrontPic_StaraviaF, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Staravia, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Staravia, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_StaraviaF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, @@ -679,8 +679,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Staraptor, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_StaraptorF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Staraptor, @@ -735,15 +735,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Bidoof, - .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicFemale = gMonFrontPic_BidoofF, + .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Bidoof, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Bidoof, - .backPicSize = MON_COORDS_SIZE(64, 40), .backPicFemale = gMonBackPic_BidoofF, + .backPicSize = MON_COORDS_SIZE(64, 40), .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, @@ -792,8 +792,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Bibarel, - .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicFemale = gMonFrontPic_BibarelF, + .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Bibarel, @@ -849,15 +849,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Kricketot, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_KricketotF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Kricketot, .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Kricketot, - .backPicSize = MON_COORDS_SIZE(48, 56), .backPicFemale = gMonBackPic_KricketotF, + .backPicSize = MON_COORDS_SIZE(48, 56), .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -866,9 +866,9 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Kricketot, .iconPalIndex = 2, FOOTPRINT(Kricketot) + .tmIlliterate = TRUE, .levelUpLearnset = sKricketotLevelUpLearnset, .teachableLearnset = sKricketotTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_KRICKETUNE}), }, @@ -908,15 +908,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Kricketune, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_KricketuneF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Kricketune, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Kricketune, - .backPicSize = MON_COORDS_SIZE(56, 64), .backPicFemale = gMonBackPic_KricketuneF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_VIBRATE, @@ -966,15 +966,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Shinx, - .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicFemale = gMonFrontPic_ShinxF, + .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shinx, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Shinx, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_ShinxF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, @@ -1023,15 +1023,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Luxio, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_LuxioF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Luxio, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Luxio, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_LuxioF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, @@ -1086,15 +1086,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 262, .trainerOffset = 0, .frontPic = gMonFrontPic_Luxray, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_LuxrayF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Luxray, .frontAnimId = ANIM_GLOW_YELLOW, .backPic = gMonBackPic_Luxray, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_LuxrayF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, @@ -1365,18 +1365,18 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backPic = gMonBackPic_BurmyPlantCloak, .backPicSize = MON_COORDS_SIZE(40, 56), - .backPicYOffset = 6, + .backPicYOffset = 6, .backAnimId = BACK_ANIM_H_SHAKE, + .palette = gMonPalette_BurmyPlantCloak, + .shinyPalette = gMonShinyPalette_BurmyPlantCloak, + .iconSprite = gMonIcon_BurmyPlantCloak, + .iconPalIndex = 1, FOOTPRINT(Burmy) + .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, .teachableLearnset = sBurmyTeachableLearnset, - .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .palette = gMonPalette_BurmyPlantCloak, - .shinyPalette = gMonShinyPalette_BurmyPlantCloak, - .iconSprite = gMonIcon_BurmyPlantCloak, - .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_PLANT_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1423,18 +1423,18 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backPic = gMonBackPic_BurmySandyCloak, .backPicSize = MON_COORDS_SIZE(32, 56), - .backPicYOffset = 7, + .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, + .palette = gMonPalette_BurmySandyCloak, + .shinyPalette = gMonShinyPalette_BurmySandyCloak, + .iconSprite = gMonIcon_BurmySandyCloak, + .iconPalIndex = 1, FOOTPRINT(Burmy) + .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, .teachableLearnset = sBurmyTeachableLearnset, - .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .palette = gMonPalette_BurmySandyCloak, - .shinyPalette = gMonShinyPalette_BurmySandyCloak, - .iconSprite = gMonIcon_BurmySandyCloak, - .iconPalIndex = 1, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_SANDY_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1481,18 +1481,18 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .enemyMonElevation = 10, .backPic = gMonBackPic_BurmyTrashCloak, .backPicSize = MON_COORDS_SIZE(40, 64), - .backPicYOffset = 0, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_SHAKE, + .palette = gMonPalette_BurmyTrashCloak, + .shinyPalette = gMonShinyPalette_BurmyTrashCloak, + .iconSprite = gMonIcon_BurmyTrashCloak, + .iconPalIndex = 0, FOOTPRINT(Burmy) + .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, .teachableLearnset = sBurmyTeachableLearnset, - .tmIlliterate = TRUE, .formSpeciesIdTable = sBurmyFormSpeciesIdTable, .formChangeTable = sBurmyFormChangeTable, - .palette = gMonPalette_BurmyTrashCloak, - .shinyPalette = gMonShinyPalette_BurmyTrashCloak, - .iconSprite = gMonIcon_BurmyTrashCloak, - .iconPalIndex = 0, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 20, SPECIES_WORMADAM_TRASH_CLOAK}, {EVO_LEVEL_MALE, 20, SPECIES_MOTHIM}), }, @@ -1542,14 +1542,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - FOOTPRINT(Wormadam) - .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .palette = gMonPalette_WormadamPlantCloak, .shinyPalette = gMonShinyPalette_WormadamPlantCloak, .iconSprite = gMonIcon_WormadamPlantCloak, .iconPalIndex = 1, + FOOTPRINT(Wormadam) .levelUpLearnset = sWormadamPlantCloakLevelUpLearnset, .teachableLearnset = sWormadamPlantCloakTeachableLearnset, + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, }, [SPECIES_WORMADAM_SANDY_CLOAK] = @@ -1597,14 +1597,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - FOOTPRINT(Wormadam) - .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .palette = gMonPalette_WormadamSandyCloak, .shinyPalette = gMonShinyPalette_WormadamSandyCloak, .iconSprite = gMonIcon_WormadamSandyCloak, .iconPalIndex = 1, + FOOTPRINT(Wormadam) .levelUpLearnset = sWormadamSandyCloakLevelUpLearnset, .teachableLearnset = sWormadamSandyCloakTeachableLearnset, + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, }, [SPECIES_WORMADAM_TRASH_CLOAK] = @@ -1653,14 +1653,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - FOOTPRINT(Wormadam) - .formSpeciesIdTable = sWormadamFormSpeciesIdTable, .palette = gMonPalette_WormadamTrashCloak, .shinyPalette = gMonShinyPalette_WormadamTrashCloak, .iconSprite = gMonIcon_WormadamTrashCloak, .iconPalIndex = 0, + FOOTPRINT(Wormadam) .levelUpLearnset = sWormadamTrashCloakLevelUpLearnset, .teachableLearnset = sWormadamTrashCloakTeachableLearnset, + .formSpeciesIdTable = sWormadamFormSpeciesIdTable, }, [SPECIES_MOTHIM] = @@ -1766,15 +1766,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 22, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Combee, - .shinyPalette = gMonShinyPalette_Combee, .paletteFemale = gMonPalette_CombeeF, + .shinyPalette = gMonShinyPalette_Combee, .shinyPaletteFemale = gMonShinyPalette_CombeeF, .iconSprite = gMonIcon_Combee, .iconPalIndex = 0, FOOTPRINT(Combee) + .tmIlliterate = TRUE, .levelUpLearnset = sCombeeLevelUpLearnset, .teachableLearnset = sCombeeTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_FEMALE, 21, SPECIES_VESPIQUEN}), }, @@ -1870,8 +1870,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Pachirisu, - .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicFemale = gMonFrontPic_PachirisuF, + .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pachirisu, @@ -1931,8 +1931,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimFrames = sAnims_Buizel, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Buizel, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_BuizelF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, @@ -1986,8 +1986,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimFrames = sAnims_Floatzel, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Floatzel, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_FloatzelF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, @@ -2093,11 +2093,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CherrimOvercast, .frontPicSize = MON_COORDS_SIZE(32, 48), - FOOTPRINT(Cherrim) - .levelUpLearnset = sCherrimLevelUpLearnset, - .teachableLearnset = sCherrimTeachableLearnset, - .formSpeciesIdTable = sCherrimFormSpeciesIdTable, - .formChangeTable = sCherrimFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_CherrimOvercast, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -2109,6 +2104,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_CherrimOvercast, .iconSprite = gMonIcon_CherrimOvercast, .iconPalIndex = 0, + FOOTPRINT(Cherrim) + .levelUpLearnset = sCherrimLevelUpLearnset, + .teachableLearnset = sCherrimTeachableLearnset, + .formSpeciesIdTable = sCherrimFormSpeciesIdTable, + .formChangeTable = sCherrimFormChangeTable, }, [SPECIES_CHERRIM_SUNSHINE] = @@ -2148,11 +2148,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CherrimSunshine, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Cherrim) - .levelUpLearnset = sCherrimLevelUpLearnset, - .teachableLearnset = sCherrimTeachableLearnset, - .formSpeciesIdTable = sCherrimFormSpeciesIdTable, - .formChangeTable = sCherrimFormChangeTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_CherrimSunshine, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, @@ -2164,6 +2159,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_CherrimSunshine, .iconSprite = gMonIcon_CherrimSunshine, .iconPalIndex = 1, + FOOTPRINT(Cherrim) + .levelUpLearnset = sCherrimLevelUpLearnset, + .teachableLearnset = sCherrimTeachableLearnset, + .formSpeciesIdTable = sCherrimFormSpeciesIdTable, + .formChangeTable = sCherrimFormChangeTable, }, #endif //P_FAMILY_CHERUBI @@ -2211,14 +2211,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(40, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, - FOOTPRINT(Shellos) - .levelUpLearnset = sShellosLevelUpLearnset, - .teachableLearnset = sShellosTeachableLearnset, - .formSpeciesIdTable = sShellosFormSpeciesIdTable, .palette = gMonPalette_ShellosWestSea, .shinyPalette = gMonShinyPalette_ShellosWestSea, .iconSprite = gMonIcon_ShellosWestSea, .iconPalIndex = 0, + FOOTPRINT(Shellos) + .levelUpLearnset = sShellosLevelUpLearnset, + .teachableLearnset = sShellosTeachableLearnset, + .formSpeciesIdTable = sShellosFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_WEST_SEA}), }, @@ -2265,14 +2265,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, - FOOTPRINT(Shellos) - .levelUpLearnset = sShellosLevelUpLearnset, - .teachableLearnset = sShellosTeachableLearnset, - .formSpeciesIdTable = sShellosFormSpeciesIdTable, .palette = gMonPalette_ShellosEastSea, .shinyPalette = gMonShinyPalette_ShellosEastSea, .iconSprite = gMonIcon_ShellosEastSea, .iconPalIndex = 0, + FOOTPRINT(Shellos) + .levelUpLearnset = sShellosLevelUpLearnset, + .teachableLearnset = sShellosTeachableLearnset, + .formSpeciesIdTable = sShellosFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GASTRODON_EAST_SEA}), }, @@ -2319,14 +2319,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - FOOTPRINT(Gastrodon) - .levelUpLearnset = sGastrodonLevelUpLearnset, - .teachableLearnset = sGastrodonTeachableLearnset, - .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .palette = gMonPalette_GastrodonWestSea, .shinyPalette = gMonShinyPalette_GastrodonWestSea, .iconSprite = gMonIcon_GastrodonWestSea, .iconPalIndex = 0, + FOOTPRINT(Gastrodon) + .levelUpLearnset = sGastrodonLevelUpLearnset, + .teachableLearnset = sGastrodonTeachableLearnset, + .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, }, [SPECIES_GASTRODON_EAST_SEA] = @@ -2372,14 +2372,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - FOOTPRINT(Gastrodon) - .levelUpLearnset = sGastrodonLevelUpLearnset, - .teachableLearnset = sGastrodonTeachableLearnset, - .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, .palette = gMonPalette_GastrodonEastSea, .shinyPalette = gMonShinyPalette_GastrodonEastSea, .iconSprite = gMonIcon_GastrodonEastSea, .iconPalIndex = 0, + FOOTPRINT(Gastrodon) + .levelUpLearnset = sGastrodonLevelUpLearnset, + .teachableLearnset = sGastrodonTeachableLearnset, + .formSpeciesIdTable = sGastrodonFormSpeciesIdTable, }, #endif //P_FAMILY_SHELLOS @@ -2582,11 +2582,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lopunny, .frontPicSize = MON_COORDS_SIZE(56, 56), - FOOTPRINT(Lopunny) - .levelUpLearnset = sLopunnyLevelUpLearnset, - .teachableLearnset = sLopunnyTeachableLearnset, - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, - .formChangeTable = sLopunnyFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Lopunny, .frontAnimId = ANIM_SHRINK_GROW, @@ -2598,6 +2593,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Lopunny, .iconSprite = gMonIcon_Lopunny, .iconPalIndex = 2, + FOOTPRINT(Lopunny) + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, + .formChangeTable = sLopunnyFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -2637,11 +2637,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LopunnyMega, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Lopunny) - .levelUpLearnset = sLopunnyLevelUpLearnset, - .teachableLearnset = sLopunnyTeachableLearnset, - .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, - .formChangeTable = sLopunnyFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_LopunnyMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2653,7 +2648,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_LopunnyMega, .iconSprite = gMonIcon_LopunnyMega, .iconPalIndex = 2, + FOOTPRINT(Lopunny) .isMegaEvolution = TRUE, + .levelUpLearnset = sLopunnyLevelUpLearnset, + .teachableLearnset = sLopunnyTeachableLearnset, + .formSpeciesIdTable = sLopunnyFormSpeciesIdTable, + .formChangeTable = sLopunnyFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY @@ -3130,15 +3130,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gible, - .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicFemale = gMonFrontPic_GibleF, + .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Gible, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gible, - .backPicSize = MON_COORDS_SIZE(56, 48), .backPicFemale = gMonBackPic_GibleF, + .backPicSize = MON_COORDS_SIZE(56, 48), .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SHAKE, @@ -3187,15 +3187,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 262, .trainerOffset = 0, .frontPic = gMonFrontPic_Gabite, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_GabiteF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gabite, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Gabite, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_GabiteF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE, @@ -3219,44 +3219,39 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .baseSpDefense = 85, .types = MON_TYPES(TYPE_DRAGON, TYPE_GROUND), .catchRate = 45, + #if P_UPDATED_EXP_YIELDS >= GEN_8 + .expYield = 300, + #elif P_UPDATED_EXP_YIELDS >= GEN_5 + .expYield = 270, + #else + .expYield = 218, + #endif .evYield_Attack = 3, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_MONSTER, EGG_GROUP_DRAGON), + .abilities = { ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_ROUGH_SKIN }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Garchomp"), + .cryId = CRY_GARCHOMP, .natDexNum = NATIONAL_DEX_GARCHOMP, .categoryName = _("Mach"), .height = 19, .weight = 950, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, - FOOTPRINT(Garchomp) - .levelUpLearnset = sGarchompLevelUpLearnset, - .teachableLearnset = sGarchompTeachableLearnset, - .formSpeciesIdTable = sGarchompFormSpeciesIdTable, - .formChangeTable = sGarchompFormChangeTable, - #if P_UPDATED_EXP_YIELDS >= GEN_8 - .expYield = 300, - #elif P_UPDATED_EXP_YIELDS >= GEN_5 - .expYield = 270, - #else - .expYield = 218, - #endif - .abilities = { ABILITY_SAND_VEIL, ABILITY_NONE, ABILITY_ROUGH_SKIN }, - .cryId = CRY_GARCHOMP, .description = COMPOUND_STRING( "When it folds up its body and extends its\n" "wings, it looks like a jet plane. It is\n" "covered in fine scales that reduce drag,\n" "enabling it to fly at high speeds."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_Garchomp, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_GarchompF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Garchomp, @@ -3269,6 +3264,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Garchomp, .iconSprite = gMonIcon_Garchomp, .iconPalIndex = 0, + FOOTPRINT(Garchomp) + .levelUpLearnset = sGarchompLevelUpLearnset, + .teachableLearnset = sGarchompTeachableLearnset, + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, + .formChangeTable = sGarchompFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -3308,11 +3308,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 4, .frontPic = gMonFrontPic_GarchompMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Garchomp) - .levelUpLearnset = sGarchompLevelUpLearnset, - .teachableLearnset = sGarchompTeachableLearnset, - .formSpeciesIdTable = sGarchompFormSpeciesIdTable, - .formChangeTable = sGarchompFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GarchompMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3324,7 +3319,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GarchompMega, .iconSprite = gMonIcon_GarchompMega, .iconPalIndex = 0, + FOOTPRINT(Garchomp) .isMegaEvolution = TRUE, + .levelUpLearnset = sGarchompLevelUpLearnset, + .teachableLearnset = sGarchompTeachableLearnset, + .formSpeciesIdTable = sGarchompFormSpeciesIdTable, + .formChangeTable = sGarchompFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE @@ -3420,11 +3420,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lucario, .frontPicSize = MON_COORDS_SIZE(48, 56), - FOOTPRINT(Lucario) - .levelUpLearnset = sLucarioLevelUpLearnset, - .teachableLearnset = sLucarioTeachableLearnset, - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, - .formChangeTable = sLucarioFormChangeTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_Lucario, .frontAnimId = ANIM_V_STRETCH, @@ -3436,6 +3431,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Lucario, .iconSprite = gMonIcon_Lucario, .iconPalIndex = 2, + FOOTPRINT(Lucario) + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, + .formChangeTable = sLucarioFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -3476,11 +3476,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LucarioMega, .frontPicSize = MON_COORDS_SIZE(48, 64), - FOOTPRINT(Lucario) - .levelUpLearnset = sLucarioLevelUpLearnset, - .teachableLearnset = sLucarioTeachableLearnset, - .formSpeciesIdTable = sLucarioFormSpeciesIdTable, - .formChangeTable = sLucarioFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_LucarioMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3492,7 +3487,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_LucarioMega, .iconSprite = gMonIcon_LucarioMega, .iconPalIndex = 2, + FOOTPRINT(Lucario) .isMegaEvolution = TRUE, + .levelUpLearnset = sLucarioLevelUpLearnset, + .teachableLearnset = sLucarioTeachableLearnset, + .formSpeciesIdTable = sLucarioFormSpeciesIdTable, + .formChangeTable = sLucarioFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU @@ -3542,8 +3542,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 14, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Hippopotas, - .shinyPalette = gMonShinyPalette_Hippopotas, .paletteFemale = gMonPalette_HippopotasF, + .shinyPalette = gMonShinyPalette_Hippopotas, .shinyPaletteFemale = gMonShinyPalette_HippopotasF, .iconSprite = gMonIcon_Hippopotas, .iconPalIndex = 1, @@ -3601,8 +3601,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Hippowdon, - .shinyPalette = gMonShinyPalette_Hippowdon, .paletteFemale = gMonPalette_HippowdonF, + .shinyPalette = gMonShinyPalette_Hippowdon, .shinyPaletteFemale = gMonShinyPalette_HippowdonF, .iconSprite = gMonIcon_Hippowdon, .iconPalIndex = 1, @@ -3762,15 +3762,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Croagunk, - .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicFemale = gMonFrontPic_CroagunkF, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Croagunk, .frontAnimId = ANIM_RAPID_H_HOPS, .backPic = gMonBackPic_Croagunk, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_CroagunkF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW, @@ -3820,15 +3820,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Toxicroak, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_ToxicroakF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Toxicroak, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toxicroak, - .backPicSize = MON_COORDS_SIZE(56, 56), .backPicFemale = gMonBackPic_ToxicroakF, + .backPicSize = MON_COORDS_SIZE(56, 56), .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, @@ -3933,15 +3933,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Finneon, - .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicFemale = gMonFrontPic_FinneonF, + .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicSizeFemale = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Finneon, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .backPic = gMonBackPic_Finneon, - .backPicSize = MON_COORDS_SIZE(56, 40), .backPicFemale = gMonBackPic_FinneonF, + .backPicSize = MON_COORDS_SIZE(56, 40), .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -3990,15 +3990,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Lumineon, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_LumineonF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Lumineon, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Lumineon, - .backPicSize = MON_COORDS_SIZE(56, 64), .backPicFemale = gMonBackPic_LumineonF, + .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, @@ -4049,15 +4049,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Snover, - .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicFemale = gMonFrontPic_SnoverF, + .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Snover, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Snover, - .backPicSize = MON_COORDS_SIZE(64, 56), .backPicFemale = gMonBackPic_SnoverF, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, @@ -4108,25 +4108,25 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 348, .trainerOffset = 6, .frontPic = gMonFrontPic_Abomasnow, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_AbomasnowF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Abomasnow, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Abomasnow, .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Abomasnow) - .levelUpLearnset = sAbomasnowLevelUpLearnset, - .teachableLearnset = sAbomasnowTeachableLearnset, - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, - .formChangeTable = sAbomasnowFormChangeTable, .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Abomasnow, .shinyPalette = gMonShinyPalette_Abomasnow, .iconSprite = gMonIcon_Abomasnow, .iconPalIndex = 1, + FOOTPRINT(Abomasnow) + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, + .formChangeTable = sAbomasnowFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -4168,11 +4168,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 6, .frontPic = gMonFrontPic_AbomasnowMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Abomasnow) - .levelUpLearnset = sAbomasnowLevelUpLearnset, - .teachableLearnset = sAbomasnowTeachableLearnset, - .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, - .formChangeTable = sAbomasnowFormChangeTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_AbomasnowMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4184,7 +4179,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_AbomasnowMega, .iconSprite = gMonIcon_AbomasnowMega, .iconPalIndex = 1, + FOOTPRINT(Abomasnow) .isMegaEvolution = TRUE, + .levelUpLearnset = sAbomasnowLevelUpLearnset, + .teachableLearnset = sAbomasnowTeachableLearnset, + .formSpeciesIdTable = sAbomasnowFormSpeciesIdTable, + .formChangeTable = sAbomasnowFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER @@ -4227,11 +4227,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Rotom, .frontPicSize = MON_COORDS_SIZE(56, 48), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 11, .frontAnimFrames = sAnims_Rotom, .frontAnimId = ANIM_GLOW_YELLOW, @@ -4244,6 +4239,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Rotom, .iconSprite = gMonIcon_Rotom, .iconPalIndex = 0, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -4291,11 +4291,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_RotomHeat, .frontPicSize = MON_COORDS_SIZE(56, 48), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 10, .frontAnimFrames = sAnims_RotomHeat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4308,6 +4303,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomHeat, .iconSprite = gMonIcon_RotomHeat, .iconPalIndex = 0, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, [SPECIES_ROTOM_WASH] = @@ -4348,11 +4348,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_RotomWash, .frontPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_RotomWash, .frontAnimId = ANIM_V_JUMPS_SMALL, @@ -4365,6 +4360,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomWash, .iconSprite = gMonIcon_RotomWash, .iconPalIndex = 0, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, [SPECIES_ROTOM_FROST] = @@ -4404,11 +4404,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_RotomFrost, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_RotomFrost, .frontAnimId = ANIM_H_STRETCH, @@ -4421,6 +4416,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomFrost, .iconSprite = gMonIcon_RotomFrost, .iconPalIndex = 5, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, [SPECIES_ROTOM_FAN] = @@ -4460,11 +4460,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_RotomFan, .frontPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_RotomFan, .frontAnimId = ANIM_H_SLIDE_WOBBLE, @@ -4478,6 +4473,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomFan, .iconSprite = gMonIcon_RotomFan, .iconPalIndex = 0, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, [SPECIES_ROTOM_MOW] = @@ -4517,11 +4517,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_RotomMow, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Rotom) - .levelUpLearnset = sRotomLevelUpLearnset, - .teachableLearnset = sRotomTeachableLearnset, - .formSpeciesIdTable = sRotomFormSpeciesIdTable, - .formChangeTable = sRotomFormChangeTable, .frontPicYOffset = 3, .frontAnimFrames = sAnims_RotomMow, .frontAnimId = ANIM_TIP_MOVE_FORWARD, @@ -4534,6 +4529,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomMow, .iconSprite = gMonIcon_RotomMow, .iconPalIndex = 0, + FOOTPRINT(Rotom) + .levelUpLearnset = sRotomLevelUpLearnset, + .teachableLearnset = sRotomTeachableLearnset, + .formSpeciesIdTable = sRotomFormSpeciesIdTable, + .formChangeTable = sRotomFormChangeTable, }, #endif //P_FAMILY_ROTOM @@ -4564,7 +4564,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isLegendary = TRUE, .speciesName = _("Uxie"), .cryId = CRY_UXIE, .natDexNum = NATIONAL_DEX_UXIE, @@ -4595,6 +4594,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Uxie, .iconPalIndex = 0, FOOTPRINT(Uxie) + .isLegendary = TRUE, .levelUpLearnset = sUxieLevelUpLearnset, .teachableLearnset = sUxieTeachableLearnset, }, @@ -4628,7 +4628,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PINK, - .isLegendary = TRUE, .speciesName = _("Mesprit"), .cryId = CRY_MESPRIT, .natDexNum = NATIONAL_DEX_MESPRIT, @@ -4659,6 +4658,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Mesprit, .iconPalIndex = 0, FOOTPRINT(Mesprit) + .isLegendary = TRUE, .levelUpLearnset = sMespritLevelUpLearnset, .teachableLearnset = sMespritTeachableLearnset, }, @@ -4691,7 +4691,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Azelf"), .cryId = CRY_AZELF, .natDexNum = NATIONAL_DEX_AZELF, @@ -4722,6 +4721,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Azelf, .iconPalIndex = 0, FOOTPRINT(Azelf) + .isLegendary = TRUE, .levelUpLearnset = sAzelfLevelUpLearnset, .teachableLearnset = sAzelfTeachableLearnset, }, @@ -4772,12 +4772,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 19, .frontPic = gMonFrontPic_Dialga, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Dialga) - .levelUpLearnset = sDialgaLevelUpLearnset, - .teachableLearnset = sDialgaTeachableLearnset, - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, - .formChangeTable = sDialgaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dialga, .frontAnimId = ANIM_H_SHAKE, @@ -4789,6 +4783,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Dialga, .iconSprite = gMonIcon_Dialga, .iconPalIndex = 2, + FOOTPRINT(Dialga) + .isLegendary = TRUE, + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, }, [SPECIES_DIALGA_ORIGIN] = @@ -4827,12 +4827,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 19, .frontPic = gMonFrontPic_DialgaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Dialga) - .levelUpLearnset = sDialgaLevelUpLearnset, - .teachableLearnset = sDialgaTeachableLearnset, - .formSpeciesIdTable = sDialgaFormSpeciesIdTable, - .formChangeTable = sDialgaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DialgaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4844,6 +4838,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_DialgaOrigin, .iconSprite = gMonIcon_DialgaOrigin, .iconPalIndex = 0, + FOOTPRINT(Dialga) + .isLegendary = TRUE, + .levelUpLearnset = sDialgaLevelUpLearnset, + .teachableLearnset = sDialgaTeachableLearnset, + .formSpeciesIdTable = sDialgaFormSpeciesIdTable, + .formChangeTable = sDialgaFormChangeTable, }, #endif //P_FAMILY_DIALGA @@ -4892,12 +4892,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 16, .frontPic = gMonFrontPic_Palkia, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Palkia) - .levelUpLearnset = sPalkiaLevelUpLearnset, - .teachableLearnset = sPalkiaTeachableLearnset, - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, - .formChangeTable = sPalkiaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Palkia, .frontAnimId = ANIM_V_SHAKE, @@ -4909,6 +4903,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Palkia, .iconSprite = gMonIcon_Palkia, .iconPalIndex = 2, + FOOTPRINT(Palkia) + .isLegendary = TRUE, + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, }, [SPECIES_PALKIA_ORIGIN] = @@ -4947,12 +4947,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 16, .frontPic = gMonFrontPic_PalkiaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Palkia) - .levelUpLearnset = sPalkiaLevelUpLearnset, - .teachableLearnset = sPalkiaTeachableLearnset, - .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, - .formChangeTable = sPalkiaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_PalkiaOrigin, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4964,6 +4958,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_PalkiaOrigin, .iconSprite = gMonIcon_PalkiaOrigin, .iconPalIndex = 2, + FOOTPRINT(Palkia) + .isLegendary = TRUE, + .levelUpLearnset = sPalkiaLevelUpLearnset, + .teachableLearnset = sPalkiaTeachableLearnset, + .formSpeciesIdTable = sPalkiaFormSpeciesIdTable, + .formChangeTable = sPalkiaFormChangeTable, }, #endif //P_FAMILY_PALKIA @@ -4993,7 +4993,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_FLASH_FIRE, ABILITY_NONE, ABILITY_FLAME_BODY }, .bodyColor = BODY_COLOR_BROWN, - .isLegendary = TRUE, .speciesName = _("Heatran"), .cryId = CRY_HEATRAN, .natDexNum = NATIONAL_DEX_HEATRAN, @@ -5023,6 +5022,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Heatran, .iconPalIndex = 0, FOOTPRINT(Heatran) + .isLegendary = TRUE, .levelUpLearnset = sHeatranLevelUpLearnset, .teachableLearnset = sHeatranTeachableLearnset, }, @@ -5054,7 +5054,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_SLOW_START, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Regigigas"), .cryId = CRY_REGIGIGAS, .natDexNum = NATIONAL_DEX_REGIGIGAS, @@ -5084,6 +5083,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Regigigas, .iconPalIndex = 0, FOOTPRINT(Regigigas) + .isLegendary = TRUE, .levelUpLearnset = sRegigigasLevelUpLearnset, .teachableLearnset = sRegigigasTeachableLearnset, }, @@ -5134,12 +5134,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 13, .frontPic = gMonFrontPic_GiratinaAltered, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Giratina) - .levelUpLearnset = sGiratinaLevelUpLearnset, - .teachableLearnset = sGiratinaTeachableLearnset, - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, - .formChangeTable = sGiratinaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaAltered, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5151,6 +5145,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GiratinaAltered, .iconSprite = gMonIcon_GiratinaAltered, .iconPalIndex = 0, + FOOTPRINT(Giratina) + .isLegendary = TRUE, + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, }, [SPECIES_GIRATINA_ORIGIN] = @@ -5189,12 +5189,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 13, .frontPic = gMonFrontPic_GiratinaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Giratina) - .levelUpLearnset = sGiratinaLevelUpLearnset, - .teachableLearnset = sGiratinaTeachableLearnset, - .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, - .formChangeTable = sGiratinaFormChangeTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GiratinaOrigin, .frontAnimId = ANIM_LUNGE_GROW, @@ -5207,6 +5201,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GiratinaOrigin, .iconSprite = gMonIcon_GiratinaOrigin, .iconPalIndex = 0, + FOOTPRINT(Giratina) + .isLegendary = TRUE, + .levelUpLearnset = sGiratinaLevelUpLearnset, + .teachableLearnset = sGiratinaTeachableLearnset, + .formSpeciesIdTable = sGiratinaFormSpeciesIdTable, + .formChangeTable = sGiratinaFormChangeTable, }, #endif //P_FAMILY_GIRATINA @@ -5236,7 +5236,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEVITATE, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, - .isLegendary = TRUE, .speciesName = _("Cresselia"), .cryId = CRY_CRESSELIA, .natDexNum = NATIONAL_DEX_CRESSELIA, @@ -5267,6 +5266,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Cresselia, .iconPalIndex = 0, FOOTPRINT(Cresselia) + .isLegendary = TRUE, .levelUpLearnset = sCresseliaLevelUpLearnset, .teachableLearnset = sCresseliaTeachableLearnset, }, @@ -5298,7 +5298,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FAIRY), .abilities = { ABILITY_HYDRATION, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isMythical = TRUE, .speciesName = _("Phione"), .cryId = CRY_PHIONE, .natDexNum = NATIONAL_DEX_PHIONE, @@ -5329,6 +5328,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Phione, .iconPalIndex = 0, FOOTPRINT(Phione) + .isMythical = TRUE, .levelUpLearnset = sPhioneLevelUpLearnset, .teachableLearnset = sPhioneTeachableLearnset, }, @@ -5358,7 +5358,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_WATER_1, EGG_GROUP_FAIRY), .abilities = { ABILITY_HYDRATION, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isMythical = TRUE, .speciesName = _("Manaphy"), .cryId = CRY_MANAPHY, .natDexNum = NATIONAL_DEX_MANAPHY, @@ -5389,6 +5388,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Manaphy, .iconPalIndex = 0, FOOTPRINT(Manaphy) + .isMythical = TRUE, .levelUpLearnset = sManaphyLevelUpLearnset, .teachableLearnset = sManaphyTeachableLearnset, }, @@ -5421,7 +5421,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_BAD_DREAMS, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, - .isMythical = TRUE, .speciesName = _("Darkrai"), .cryId = CRY_DARKRAI, .natDexNum = NATIONAL_DEX_DARKRAI, @@ -5452,6 +5451,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Darkrai, .iconPalIndex = 0, FOOTPRINT(Darkrai) + .isMythical = TRUE, .levelUpLearnset = sDarkraiLevelUpLearnset, .teachableLearnset = sDarkraiTeachableLearnset, }, @@ -5504,10 +5504,6 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerOffset = 0, .frontPic = gMonFrontPic_ShayminLand, .frontPicSize = MON_COORDS_SIZE(40, 32), - FOOTPRINT(Shaymin) - .formSpeciesIdTable = sShayminFormSpeciesIdTable, - .formChangeTable = sShayminFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 16, .frontAnimFrames = sAnims_ShayminLand, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5519,8 +5515,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShayminLand, .iconSprite = gMonIcon_ShayminLand, .iconPalIndex = 1, + FOOTPRINT(Shaymin) + .isMythical = TRUE, .levelUpLearnset = sShayminLandLevelUpLearnset, .teachableLearnset = sShayminLandTeachableLearnset, + .formSpeciesIdTable = sShayminFormSpeciesIdTable, + .formChangeTable = sShayminFormChangeTable, }, [SPECIES_SHAYMIN_SKY] = @@ -5531,6 +5531,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .baseSpeed = 127, .baseSpAttack = 120, .baseSpDefense = 75, + .types = MON_TYPES(TYPE_GRASS, TYPE_FLYING), .catchRate = 45, .expYield = SHAYMIN_EXP_YIELD, #if P_UPDATED_EVS >= GEN_5 @@ -5545,18 +5546,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .friendship = 100, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, .speciesName = _("Shaymin"), + .cryId = CRY_SHAYMIN_SKY, .natDexNum = NATIONAL_DEX_SHAYMIN, .categoryName = _("Gratitude"), - FOOTPRINT(Shaymin) - .formSpeciesIdTable = sShayminFormSpeciesIdTable, - .formChangeTable = sShayminFormChangeTable, - .isMythical = TRUE, - .types = MON_TYPES(TYPE_GRASS, TYPE_FLYING), - .abilities = { ABILITY_SERENE_GRACE, ABILITY_NONE }, - .noFlip = TRUE, - .cryId = CRY_SHAYMIN_SKY, .height = 4, .weight = 52, .description = COMPOUND_STRING( @@ -5581,8 +5577,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShayminSky, .iconSprite = gMonIcon_ShayminSky, .iconPalIndex = 1, + FOOTPRINT(Shaymin) + .isMythical = TRUE, .levelUpLearnset = sShayminSkyLevelUpLearnset, .teachableLearnset = sShayminSkyTeachableLearnset, + .formSpeciesIdTable = sShayminFormSpeciesIdTable, + .formChangeTable = sShayminFormChangeTable, }, #endif //P_FAMILY_SHAYMIN From 2a705f734ef07ea144da7e5eda16accf3a481b84 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:12:52 -0300 Subject: [PATCH 19/23] Gen 5 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_5.h | 599 +++++++++++++------------- 1 file changed, 297 insertions(+), 302 deletions(-) diff --git a/src/data/pokemon/species_info/gen_5.h b/src/data/pokemon/species_info/gen_5.h index 6df37aa45502..a00c691c17e1 100644 --- a/src/data/pokemon/species_info/gen_5.h +++ b/src/data/pokemon/species_info/gen_5.h @@ -45,14 +45,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Victini, .backPicSize = MON_COORDS_SIZE(40, 64), - .backPicYOffset = 7, - .isMythical = TRUE, + .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Victini, .shinyPalette = gMonShinyPalette_Victini, .iconSprite = gMonIcon_Victini, .iconPalIndex = 0, FOOTPRINT(Victini) + .isMythical = TRUE, .levelUpLearnset = sVictiniLevelUpLearnset, .teachableLearnset = sVictiniTeachableLearnset, }, @@ -523,8 +523,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Samurott, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Samurott) - .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Samurott, .frontAnimId = ANIM_V_SHAKE, @@ -536,8 +534,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Samurott, .iconSprite = gMonIcon_Samurott, .iconPalIndex = 2, + FOOTPRINT(Samurott) .levelUpLearnset = sSamurottLevelUpLearnset, .teachableLearnset = sSamurottTeachableLearnset, + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -577,8 +577,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SamurottHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Samurott) - .formSpeciesIdTable = sSamurottFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_SamurottHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -590,9 +588,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SamurottHisuian, .iconSprite = gMonIcon_SamurottHisuian, .iconPalIndex = 0, + FOOTPRINT(Samurott) + .isHisuianForm = TRUE, .levelUpLearnset = sSamurottHisuianLevelUpLearnset, .teachableLearnset = sSamurottHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sSamurottFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT @@ -1557,25 +1557,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Unfezant, - .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicFemale = gMonFrontPic_UnfezantF, + .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Unfezant, .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Unfezant, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_UnfezantF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Unfezant, - .shinyPalette = gMonShinyPalette_Unfezant, .paletteFemale = gMonPalette_UnfezantF, + .shinyPalette = gMonShinyPalette_Unfezant, .shinyPaletteFemale = gMonShinyPalette_UnfezantF, .iconSprite = gMonIcon_Unfezant, - .iconPalIndex = 1, .iconSpriteFemale = gMonIcon_UnfezantF, + .iconPalIndex = 1, .iconPalIndexFemale = 1, FOOTPRINT(Unfezant) .levelUpLearnset = sUnfezantLevelUpLearnset, @@ -2121,11 +2121,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Audino, .frontPicSize = MON_COORDS_SIZE(40, 48), - FOOTPRINT(Audino) - .levelUpLearnset = sAudinoLevelUpLearnset, - .teachableLearnset = sAudinoTeachableLearnset, - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, - .formChangeTable = sAudinoFormChangeTable, .frontPicYOffset = 8, .frontAnimFrames = sAnims_Audino, .frontAnimId = ANIM_V_STRETCH, @@ -2137,6 +2132,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Audino, .iconSprite = gMonIcon_Audino, .iconPalIndex = 1, + FOOTPRINT(Audino) + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, + .formChangeTable = sAudinoFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -2178,11 +2178,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_AudinoMega, .frontPicSize = MON_COORDS_SIZE(48, 64), - FOOTPRINT(Audino) - .levelUpLearnset = sAudinoLevelUpLearnset, - .teachableLearnset = sAudinoTeachableLearnset, - .formSpeciesIdTable = sAudinoFormSpeciesIdTable, - .formChangeTable = sAudinoFormChangeTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_AudinoMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2194,7 +2189,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_AudinoMega, .iconSprite = gMonIcon_AudinoMega, .iconPalIndex = 1, + FOOTPRINT(Audino) .isMegaEvolution = TRUE, + .levelUpLearnset = sAudinoLevelUpLearnset, + .teachableLearnset = sAudinoTeachableLearnset, + .formSpeciesIdTable = sAudinoFormSpeciesIdTable, + .formChangeTable = sAudinoFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO @@ -2825,11 +2825,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, - #else - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, + #else + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, + #endif .bodyColor = BODY_COLOR_RED, .speciesName = _("Venipede"), .cryId = CRY_VENIPEDE, @@ -2883,11 +2883,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, - #else - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, + #else + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, + #endif .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Whirlipede"), .cryId = CRY_WHIRLIPEDE, @@ -2947,11 +2947,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_BUG), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, - #else - .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_SPEED_BOOST }, + #else + .abilities = { ABILITY_POISON_POINT, ABILITY_SWARM, ABILITY_QUICK_FEET }, + #endif .bodyColor = BODY_COLOR_RED, .speciesName = _("Scolipede"), .cryId = CRY_SCOLIPEDE, @@ -3197,8 +3197,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Lilligant, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Lilligant) - .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Lilligant, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3210,8 +3208,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Lilligant, .iconSprite = gMonIcon_Lilligant, .iconPalIndex = 1, + FOOTPRINT(Lilligant) .levelUpLearnset = sLilligantLevelUpLearnset, .teachableLearnset = sLilligantTeachableLearnset, + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -3254,8 +3254,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_LilligantHisuian, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Lilligant) - .formSpeciesIdTable = sLilligantFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_LilligantHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3267,9 +3265,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_LilligantHisuian, .iconSprite = gMonIcon_LilligantHisuian, .iconPalIndex = 1, + FOOTPRINT(Lilligant) + .isHisuianForm = TRUE, .levelUpLearnset = sLilligantHisuianLevelUpLearnset, .teachableLearnset = sLilligantHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sLilligantFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL @@ -3318,16 +3318,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinRedStriped, .backPicSize = MON_COORDS_SIZE(64, 48), - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinRedStriped, .shinyPalette = gMonShinyPalette_BasculinRedStriped, .iconSprite = gMonIcon_BasculinRedStriped, .iconPalIndex = 1, + FOOTPRINT(Basculin) .levelUpLearnset = sBasculinLevelUpLearnset, .teachableLearnset = sBasculinTeachableLearnset, + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, }, [SPECIES_BASCULIN_BLUE_STRIPED] = @@ -3373,16 +3373,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinBlueStriped, .backPicSize = MON_COORDS_SIZE(64, 48), - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinBlueStriped, .shinyPalette = gMonShinyPalette_BasculinBlueStriped, .iconSprite = gMonIcon_BasculinBlueStriped, .iconPalIndex = 0, + FOOTPRINT(Basculin) .levelUpLearnset = sBasculinLevelUpLearnset, .teachableLearnset = sBasculinTeachableLearnset, + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -3429,16 +3429,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 6, .backPic = gMonBackPic_BasculinWhiteStriped, .backPicSize = MON_COORDS_SIZE(64, 40), - FOOTPRINT(Basculin) - .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .backPicYOffset = 16, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_BasculinWhiteStriped, .shinyPalette = gMonShinyPalette_BasculinWhiteStriped, .iconSprite = gMonIcon_BasculinWhiteStriped, .iconPalIndex = 0, + FOOTPRINT(Basculin) .levelUpLearnset = sBasculinWhiteStripedLevelUpLearnset, .teachableLearnset = sBasculinWhiteStripedTeachableLearnset, + .formSpeciesIdTable = sBasculinFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_RECOIL_DAMAGE_MALE, 294, SPECIES_BASCULEGION_MALE}, {EVO_LEVEL_RECOIL_DAMAGE_FEMALE, 294, SPECIES_BASCULEGION_FEMALE}), }, @@ -3481,20 +3481,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Basculegion, - .enemyMonElevation = 5, - .backPicYOffset = 8, - .levelUpLearnset = sBasculegionLevelUpLearnset, - .teachableLearnset = sBasculegionTeachableLearnset, - .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Basculegion), + .enemyMonElevation = 5, .backPic = gMonBackPic_BasculegionMale, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 8, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_BasculegionMale, .shinyPalette = gMonShinyPalette_BasculegionMale, .iconSprite = gMonIcon_BasculegionMale, .iconPalIndex = 1, + //FOOTPRINT(Basculegion), + .levelUpLearnset = sBasculegionLevelUpLearnset, + .teachableLearnset = sBasculegionTeachableLearnset, + .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, }, [SPECIES_BASCULEGION_FEMALE] = @@ -3534,20 +3534,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Basculegion, - .enemyMonElevation = 5, - .backPicYOffset = 8, - .levelUpLearnset = sBasculegionLevelUpLearnset, - .teachableLearnset = sBasculegionTeachableLearnset, - .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Basculegion), + .enemyMonElevation = 5, .backPic = gMonBackPic_BasculegionFemale, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 8, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_BasculegionFemale, .shinyPalette = gMonShinyPalette_BasculegionFemale, .iconSprite = gMonIcon_BasculegionFemale, .iconPalIndex = 0, + //FOOTPRINT(Basculegion), + .levelUpLearnset = sBasculegionLevelUpLearnset, + .teachableLearnset = sBasculegionTeachableLearnset, + .formSpeciesIdTable = sBasculegionFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN @@ -3758,8 +3758,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Darumaka, .frontPicSize = MON_COORDS_SIZE(40, 40), - FOOTPRINT(Darumaka) - .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_Darumaka, .frontAnimId = ANIM_SWING_CONCAVE, @@ -3771,8 +3769,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Darumaka, .iconSprite = gMonIcon_Darumaka, .iconPalIndex = 0, + FOOTPRINT(Darumaka) .levelUpLearnset = sDarumakaLevelUpLearnset, .teachableLearnset = sDarumakaTeachableLearnset, + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}), }, @@ -3812,11 +3812,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_DarmanitanStandardMode, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .levelUpLearnset = sDarmanitanLevelUpLearnset, - .teachableLearnset = sDarmanitanTeachableLearnset, - .formChangeTable = sDarmanitanFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanStandardMode, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, @@ -3828,6 +3823,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanStandardMode, .iconSprite = gMonIcon_DarmanitanStandardMode, .iconPalIndex = 0, + FOOTPRINT(Darmanitan) + .levelUpLearnset = sDarmanitanLevelUpLearnset, + .teachableLearnset = sDarmanitanTeachableLearnset, + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .formChangeTable = sDarmanitanFormChangeTable, }, [SPECIES_DARMANITAN_ZEN_MODE] = @@ -3859,15 +3859,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "When wounded, it stops moving. It\n" "goes as still as stone to meditate,\n" "sharpening its mind and spirit."), - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, .pokemonScale = 272, .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .levelUpLearnset = sDarmanitanLevelUpLearnset, - .teachableLearnset = sDarmanitanTeachableLearnset, - .formChangeTable = sDarmanitanFormChangeTable, .frontPic = gMonFrontPic_DarmanitanZenMode, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, @@ -3881,6 +3876,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanZenMode, .iconSprite = gMonIcon_DarmanitanZenMode, .iconPalIndex = 0, + FOOTPRINT(Darmanitan) + .levelUpLearnset = sDarmanitanLevelUpLearnset, + .teachableLearnset = sDarmanitanTeachableLearnset, + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .formChangeTable = sDarmanitanFormChangeTable, }, #if P_GALARIAN_FORMS @@ -3920,8 +3920,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_DarumakaGalarian, .frontPicSize = MON_COORDS_SIZE(40, 40), - FOOTPRINT(Darumaka) - .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .frontPicYOffset = 15, .frontAnimFrames = sAnims_DarumakaGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3933,9 +3931,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarumakaGalarian, .iconSprite = gMonIcon_DarumakaGalarian, .iconPalIndex = 0, + FOOTPRINT(Darumaka) + .isGalarianForm = TRUE, .levelUpLearnset = sDarumakaGalarianLevelUpLearnset, .teachableLearnset = sDarumakaGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALARIAN_STANDARD_MODE}), }, @@ -3977,12 +3977,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_DarmanitanGalarianStandardMode, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, - .formChangeTable = sDarmanitanGalarianFormChangeTable, - .isGalarianForm = TRUE, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarianStandardMode, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3992,6 +3986,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanGalarianStandardMode, .iconSprite = gMonIcon_DarmanitanGalarianStandardMode, .iconPalIndex = 0, + FOOTPRINT(Darmanitan) + .isGalarianForm = TRUE, + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .formChangeTable = sDarmanitanGalarianFormChangeTable, }, [SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] = @@ -4032,12 +4032,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_DarmanitanGalarianZenMode, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, - .formChangeTable = sDarmanitanGalarianFormChangeTable, - .isGalarianForm = TRUE, - FOOTPRINT(Darmanitan) - .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarianZenMode, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4047,6 +4041,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanGalarianZenMode, .iconSprite = gMonIcon_DarmanitanGalarianZenMode, .iconPalIndex = 0, + FOOTPRINT(Darmanitan) + .isGalarianForm = TRUE, + .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, + .formChangeTable = sDarmanitanGalarianFormChangeTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -4418,8 +4418,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Yamask, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Yamask) - .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .frontPicYOffset = 15, .frontAnimFrames = sAnims_Yamask, .frontAnimId = ANIM_V_SLIDE_WOBBLE, @@ -4432,8 +4430,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Yamask, .iconSprite = gMonIcon_Yamask, .iconPalIndex = 0, + FOOTPRINT(Yamask) .levelUpLearnset = sYamaskLevelUpLearnset, .teachableLearnset = sYamaskTeachableLearnset, + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_COFAGRIGUS}), }, @@ -4527,8 +4527,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_YamaskGalarian, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Yamask) - .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .frontPicYOffset = 13, .frontAnimFrames = sAnims_YamaskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4541,9 +4539,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_YamaskGalarian, .iconSprite = gMonIcon_YamaskGalarian, .iconPalIndex = 2, + FOOTPRINT(Yamask) + .isGalarianForm = TRUE, .levelUpLearnset = sYamaskGalarianLevelUpLearnset, .teachableLearnset = sYamaskGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}), }, @@ -4910,11 +4910,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 4, .frontPic = gMonFrontPic_Garbodor, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Garbodor) - .levelUpLearnset = sGarbodorLevelUpLearnset, - .teachableLearnset = sGarbodorTeachableLearnset, - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, - .formChangeTable = sGarbodorFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Garbodor, .frontAnimId = ANIM_V_STRETCH, @@ -4926,6 +4921,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Garbodor, .iconSprite = gMonIcon_Garbodor, .iconPalIndex = 1, + FOOTPRINT(Garbodor) + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, + .formChangeTable = sGarbodorFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -4968,11 +4968,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 4, .frontPic = gMonFrontPic_GarbodorGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Garbodor) - .levelUpLearnset = sGarbodorLevelUpLearnset, - .teachableLearnset = sGarbodorTeachableLearnset, - .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, - .formChangeTable = sGarbodorFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_GarbodorGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4984,7 +4979,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_GarbodorGigantamax, .iconSprite = gMonIcon_GarbodorGigantamax, .iconPalIndex = 0, + FOOTPRINT(Garbodor) .isGigantamax = TRUE, + .levelUpLearnset = sGarbodorLevelUpLearnset, + .teachableLearnset = sGarbodorTeachableLearnset, + .formSpeciesIdTable = sGarbodorFormSpeciesIdTable, + .formChangeTable = sGarbodorFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH @@ -5026,8 +5026,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Zorua, .frontPicSize = MON_COORDS_SIZE(40, 48), - FOOTPRINT(Zorua) - .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .frontPicYOffset = 11, .frontAnimFrames = sAnims_Zorua, .frontAnimId = ANIM_CIRCULAR_VIBRATE, @@ -5039,8 +5037,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zorua, .iconSprite = gMonIcon_Zorua, .iconPalIndex = 0, + FOOTPRINT(Zorua) .levelUpLearnset = sZoruaLevelUpLearnset, .teachableLearnset = sZoruaTeachableLearnset, + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK}), }, @@ -5080,8 +5080,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 1, .frontPic = gMonFrontPic_Zoroark, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Zoroark) - .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zoroark, .frontAnimId = ANIM_FLICKER_INCREASING, @@ -5093,8 +5091,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zoroark, .iconSprite = gMonIcon_Zoroark, .iconPalIndex = 0, + FOOTPRINT(Zoroark) .levelUpLearnset = sZoroarkLevelUpLearnset, .teachableLearnset = sZoroarkTeachableLearnset, + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -5134,8 +5134,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_ZoruaHisuian, .frontPicSize = MON_COORDS_SIZE(48, 64), - FOOTPRINT(Zorua) - .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_ZoruaHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5147,9 +5145,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ZoruaHisuian, .iconSprite = gMonIcon_ZoruaHisuian, .iconPalIndex = 0, + FOOTPRINT(Zorua) + .isHisuianForm = TRUE, .levelUpLearnset = sZoruaHisuianLevelUpLearnset, .teachableLearnset = sZoruaHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK_HISUIAN}), }, @@ -5189,8 +5189,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 1, .frontPic = gMonFrontPic_ZoroarkHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Zoroark) - .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZoroarkHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5202,9 +5200,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ZoroarkHisuian, .iconSprite = gMonIcon_ZoroarkHisuian, .iconPalIndex = 0, + FOOTPRINT(Zoroark) + .isHisuianForm = TRUE, .levelUpLearnset = sZoroarkHisuianLevelUpLearnset, .teachableLearnset = sZoroarkHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA @@ -5955,14 +5955,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - FOOTPRINT(Deerling) - .levelUpLearnset = sDeerlingLevelUpLearnset, - .teachableLearnset = sDeerlingTeachableLearnset, - .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .palette = gMonPalette_DeerlingSpring, .shinyPalette = gMonShinyPalette_DeerlingSpring, .iconSprite = gMonIcon_DeerlingSpring, .iconPalIndex = 1, + FOOTPRINT(Deerling) + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SPRING}), }, @@ -6009,14 +6009,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - FOOTPRINT(Deerling) - .levelUpLearnset = sDeerlingLevelUpLearnset, - .teachableLearnset = sDeerlingTeachableLearnset, - .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .palette = gMonPalette_DeerlingSummer, .shinyPalette = gMonShinyPalette_DeerlingSummer, .iconSprite = gMonIcon_DeerlingSummer, .iconPalIndex = 1, + FOOTPRINT(Deerling) + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER}), }, @@ -6063,14 +6063,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - FOOTPRINT(Deerling) - .levelUpLearnset = sDeerlingLevelUpLearnset, - .teachableLearnset = sDeerlingTeachableLearnset, - .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .palette = gMonPalette_DeerlingAutumn, .shinyPalette = gMonShinyPalette_DeerlingAutumn, .iconSprite = gMonIcon_DeerlingAutumn, .iconPalIndex = 0, + FOOTPRINT(Deerling) + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN}), }, @@ -6117,14 +6117,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 56), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, - FOOTPRINT(Deerling) - .levelUpLearnset = sDeerlingLevelUpLearnset, - .teachableLearnset = sDeerlingTeachableLearnset, - .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .palette = gMonPalette_DeerlingWinter, .shinyPalette = gMonShinyPalette_DeerlingWinter, .iconSprite = gMonIcon_DeerlingWinter, .iconPalIndex = 2, + FOOTPRINT(Deerling) + .levelUpLearnset = sDeerlingLevelUpLearnset, + .teachableLearnset = sDeerlingTeachableLearnset, + .formSpeciesIdTable = sDeerlingFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER}), }, @@ -6171,14 +6171,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - FOOTPRINT(Sawsbuck) - .levelUpLearnset = sSawsbuckLevelUpLearnset, - .teachableLearnset = sSawsbuckTeachableLearnset, - .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .palette = gMonPalette_SawsbuckSpring, .shinyPalette = gMonShinyPalette_SawsbuckSpring, .iconSprite = gMonIcon_SawsbuckSpring, .iconPalIndex = 1, + FOOTPRINT(Sawsbuck) + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, }, [SPECIES_SAWSBUCK_SUMMER] = @@ -6224,14 +6224,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - FOOTPRINT(Sawsbuck) - .levelUpLearnset = sSawsbuckLevelUpLearnset, - .teachableLearnset = sSawsbuckTeachableLearnset, - .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .palette = gMonPalette_SawsbuckSummer, .shinyPalette = gMonShinyPalette_SawsbuckSummer, .iconSprite = gMonIcon_SawsbuckSummer, .iconPalIndex = 1, + FOOTPRINT(Sawsbuck) + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, }, [SPECIES_SAWSBUCK_AUTUMN] = @@ -6277,17 +6277,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - FOOTPRINT(Sawsbuck) - .levelUpLearnset = sSawsbuckLevelUpLearnset, - .teachableLearnset = sSawsbuckTeachableLearnset, - .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .palette = gMonPalette_SawsbuckAutumn, .shinyPalette = gMonShinyPalette_SawsbuckAutumn, .iconSprite = gMonIcon_SawsbuckAutumn, .iconPalIndex = 1, - }, - - [SPECIES_SAWSBUCK_WINTER] = + FOOTPRINT(Sawsbuck) + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, + }, + + [SPECIES_SAWSBUCK_WINTER] = { .baseHP = 80, .baseAttack = 100, @@ -6330,14 +6330,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 5, .backAnimId = BACK_ANIM_DIP_RIGHT_SIDE, - FOOTPRINT(Sawsbuck) - .levelUpLearnset = sSawsbuckLevelUpLearnset, - .teachableLearnset = sSawsbuckTeachableLearnset, - .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, .palette = gMonPalette_SawsbuckWinter, .shinyPalette = gMonShinyPalette_SawsbuckWinter, .iconSprite = gMonIcon_SawsbuckWinter, .iconPalIndex = 1, + FOOTPRINT(Sawsbuck) + .levelUpLearnset = sSawsbuckLevelUpLearnset, + .teachableLearnset = sSawsbuckTeachableLearnset, + .formSpeciesIdTable = sSawsbuckFormSpeciesIdTable, }, #endif //P_FAMILY_DEERLING @@ -6652,25 +6652,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Frillish, - .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicFemale = gMonFrontPic_FrillishF, + .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Frillish, .frontAnimId = ANIM_RISING_WOBBLE, .backPic = gMonBackPic_Frillish, - .backPicSize = MON_COORDS_SIZE(40, 56), .backPicFemale = gMonBackPic_FrillishF, + .backPicSize = MON_COORDS_SIZE(40, 56), .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Frillish, - .shinyPalette = gMonShinyPalette_Frillish, .paletteFemale = gMonPalette_FrillishF, + .shinyPalette = gMonShinyPalette_Frillish, .shinyPaletteFemale = gMonShinyPalette_FrillishF, .iconSprite = gMonIcon_Frillish, - .iconPalIndex = 0, .iconSpriteFemale = gMonIcon_FrillishF, + .iconPalIndex = 0, .iconPalIndexFemale = 1, FOOTPRINT(Frillish) .levelUpLearnset = sFrillishLevelUpLearnset, @@ -6713,25 +6713,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 348, .trainerOffset = 6, .frontPic = gMonFrontPic_Jellicent, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_JellicentF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Jellicent, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Jellicent, - .backPicSize = MON_COORDS_SIZE(64, 48), .backPicFemale = gMonBackPic_JellicentF, + .backPicSize = MON_COORDS_SIZE(64, 48), .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_Jellicent, - .shinyPalette = gMonShinyPalette_Jellicent, .paletteFemale = gMonPalette_JellicentF, + .shinyPalette = gMonShinyPalette_Jellicent, .shinyPaletteFemale = gMonShinyPalette_JellicentF, .iconSprite = gMonIcon_Jellicent, - .iconPalIndex = 0, .iconSpriteFemale = gMonIcon_JellicentF, + .iconPalIndex = 0, .iconPalIndexFemale = 1, FOOTPRINT(Jellicent) .levelUpLearnset = sJellicentLevelUpLearnset, @@ -7226,9 +7226,9 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tynamo, .iconPalIndex = 0, FOOTPRINT(Tynamo) + .tmIlliterate = TRUE, .levelUpLearnset = sTynamoLevelUpLearnset, .teachableLearnset = sTynamoTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 39, SPECIES_EELEKTRIK}), }, @@ -7465,11 +7465,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, - #else - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, + #else + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, + #endif .bodyColor = BODY_COLOR_WHITE, .noFlip = TRUE, .speciesName = _("Litwick"), @@ -7523,11 +7523,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, - #else - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, + #else + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, + #endif .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Lampent"), .cryId = CRY_LAMPENT, @@ -7581,11 +7581,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_AMORPHOUS), - #if P_UPDATED_ABILITIES >= GEN_6 - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, - #else - .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, - #endif + #if P_UPDATED_ABILITIES >= GEN_6 + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_INFILTRATOR }, + #else + .abilities = { ABILITY_FLASH_FIRE, ABILITY_FLAME_BODY, ABILITY_SHADOW_TAG }, + #endif .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Chandelure"), .cryId = CRY_CHANDELURE, @@ -7892,17 +7892,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = #if P_FAMILY_CRYOGONAL [SPECIES_CRYOGONAL] = { + .baseHP = P_UPDATED_STATS >= GEN_7 ? 80 : 70, .baseAttack = 50, + .baseDefense = P_UPDATED_STATS >= GEN_7 ? 50 : 30, .baseSpeed = 105, .baseSpAttack = 95, .baseSpDefense = 135, - #if P_UPDATED_STATS >= GEN_7 - .baseHP = 80, - .baseDefense = 50, - #else - .baseHP = 70, - .baseDefense = 30, - #endif .types = MON_TYPES(TYPE_ICE), .catchRate = 25, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_7) ? 180 : 170, @@ -8095,8 +8090,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Stunfisk, .frontPicSize = MON_COORDS_SIZE(56, 48), - FOOTPRINT(Stunfisk) - .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .frontPicYOffset = 14, .frontAnimFrames = sAnims_Stunfisk, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8108,8 +8101,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Stunfisk, .iconSprite = gMonIcon_Stunfisk, .iconPalIndex = 2, + FOOTPRINT(Stunfisk) .levelUpLearnset = sStunfiskLevelUpLearnset, .teachableLearnset = sStunfiskTeachableLearnset, + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, }, #if P_GALARIAN_FORMS @@ -8149,8 +8144,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_StunfiskGalarian, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Stunfisk) - .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, .frontPicYOffset = 14, .frontAnimFrames = sAnims_StunfiskGalarian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8162,9 +8155,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_StunfiskGalarian, .iconSprite = gMonIcon_StunfiskGalarian, .iconPalIndex = 1, + FOOTPRINT(Stunfisk) + .isGalarianForm = TRUE, .levelUpLearnset = sStunfiskGalarianLevelUpLearnset, .teachableLearnset = sStunfiskGalarianTeachableLearnset, - .isGalarianForm = TRUE, + .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK @@ -8749,8 +8744,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Braviary, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Braviary) - .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Braviary, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -8763,8 +8756,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Braviary, .iconSprite = gMonIcon_Braviary, .iconPalIndex = 0, + FOOTPRINT(Braviary) .levelUpLearnset = sBraviaryLevelUpLearnset, .teachableLearnset = sBraviaryTeachableLearnset, + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -8797,8 +8792,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "Screaming a bloodcurdling battle\n" "cry, this huge and ferocious bird\n" "Pokémon goes out on the hunt."), - FOOTPRINT(Braviary) - .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, .pokemonScale = 268, .pokemonOffset = 2, .trainerScale = 271, @@ -8817,9 +8810,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BraviaryHisuian, .iconSprite = gMonIcon_BraviaryHisuian, .iconPalIndex = 2, + FOOTPRINT(Braviary) + .isHisuianForm = TRUE, .levelUpLearnset = sBraviaryHisuianLevelUpLearnset, .teachableLearnset = sBraviaryHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET @@ -9352,14 +9347,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Cobalion, .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 6, - .isLegendary = TRUE, + .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Cobalion, .shinyPalette = gMonShinyPalette_Cobalion, .iconSprite = gMonIcon_Cobalion, .iconPalIndex = 0, FOOTPRINT(Cobalion) + .isLegendary = TRUE, .levelUpLearnset = sCobalionLevelUpLearnset, .teachableLearnset = sCobalionTeachableLearnset, }, @@ -9407,14 +9402,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Terrakion, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 8, - .isLegendary = TRUE, + .backPicYOffset = 8, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Terrakion, .shinyPalette = gMonShinyPalette_Terrakion, .iconSprite = gMonIcon_Terrakion, .iconPalIndex = 2, FOOTPRINT(Terrakion) + .isLegendary = TRUE, .levelUpLearnset = sTerrakionLevelUpLearnset, .teachableLearnset = sTerrakionTeachableLearnset, }, @@ -9462,14 +9457,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Virizion, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 8, - .isLegendary = TRUE, + .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Virizion, .shinyPalette = gMonShinyPalette_Virizion, .iconSprite = gMonIcon_Virizion, .iconPalIndex = 1, FOOTPRINT(Virizion) + .isLegendary = TRUE, .levelUpLearnset = sVirizionLevelUpLearnset, .teachableLearnset = sVirizionTeachableLearnset, }, @@ -9518,18 +9513,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_TornadusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .isLegendary = TRUE, - FOOTPRINT(Tornadus) - .levelUpLearnset = sTornadusLevelUpLearnset, - .teachableLearnset = sTornadusTeachableLearnset, - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, - .formChangeTable = sTornadusFormChangeTable, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_TornadusIncarnate, .shinyPalette = gMonShinyPalette_TornadusIncarnate, .iconSprite = gMonIcon_TornadusIncarnate, .iconPalIndex = 1, + FOOTPRINT(Tornadus) + .isLegendary = TRUE, + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, + .formChangeTable = sTornadusFormChangeTable, }, [SPECIES_TORNADUS_THERIAN] = @@ -9573,18 +9568,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_TornadusTherian, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 0, - .isLegendary = TRUE, - FOOTPRINT(Tornadus) - .levelUpLearnset = sTornadusLevelUpLearnset, - .teachableLearnset = sTornadusTeachableLearnset, - .formSpeciesIdTable = sTornadusFormSpeciesIdTable, - .formChangeTable = sTornadusFormChangeTable, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_TornadusTherian, .shinyPalette = gMonShinyPalette_TornadusTherian, .iconSprite = gMonIcon_TornadusTherian, .iconPalIndex = 1, + FOOTPRINT(Tornadus) + .isLegendary = TRUE, + .levelUpLearnset = sTornadusLevelUpLearnset, + .teachableLearnset = sTornadusTeachableLearnset, + .formSpeciesIdTable = sTornadusFormSpeciesIdTable, + .formChangeTable = sTornadusFormChangeTable, }, #endif //P_FAMILY_TORNADUS @@ -9631,18 +9626,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .isLegendary = TRUE, - FOOTPRINT(Thundurus) - .levelUpLearnset = sThundurusLevelUpLearnset, - .teachableLearnset = sThundurusTeachableLearnset, - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, - .formChangeTable = sThundurusFormChangeTable, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_ThundurusIncarnate, .shinyPalette = gMonShinyPalette_ThundurusIncarnate, .iconSprite = gMonIcon_ThundurusIncarnate, .iconPalIndex = 0, + FOOTPRINT(Thundurus) + .isLegendary = TRUE, + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, + .formChangeTable = sThundurusFormChangeTable, }, [SPECIES_THUNDURUS_THERIAN] = @@ -9687,18 +9682,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusTherian, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 5, - .isLegendary = TRUE, - FOOTPRINT(Thundurus) - .levelUpLearnset = sThundurusLevelUpLearnset, - .teachableLearnset = sThundurusTeachableLearnset, - .formSpeciesIdTable = sThundurusFormSpeciesIdTable, - .formChangeTable = sThundurusFormChangeTable, + .backPicYOffset = 5, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_ThundurusTherian, .shinyPalette = gMonShinyPalette_ThundurusTherian, .iconSprite = gMonIcon_ThundurusTherian, .iconPalIndex = 0, + FOOTPRINT(Thundurus) + .isLegendary = TRUE, + .levelUpLearnset = sThundurusLevelUpLearnset, + .teachableLearnset = sThundurusTeachableLearnset, + .formSpeciesIdTable = sThundurusFormSpeciesIdTable, + .formChangeTable = sThundurusFormChangeTable, }, #endif //P_FAMILY_THUNDURUS @@ -9744,14 +9739,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Reshiram, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 7, - .isLegendary = TRUE, + .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Reshiram, .shinyPalette = gMonShinyPalette_Reshiram, .iconSprite = gMonIcon_Reshiram, .iconPalIndex = 0, FOOTPRINT(Reshiram) + .isLegendary = TRUE, .levelUpLearnset = sReshiramLevelUpLearnset, .teachableLearnset = sReshiramTeachableLearnset, }, @@ -9799,14 +9794,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Zekrom, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, - .isLegendary = TRUE, + .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, .palette = gMonPalette_Zekrom, .shinyPalette = gMonShinyPalette_Zekrom, .iconSprite = gMonIcon_Zekrom, .iconPalIndex = 2, FOOTPRINT(Zekrom) + .isLegendary = TRUE, .levelUpLearnset = sZekromLevelUpLearnset, .teachableLearnset = sZekromTeachableLearnset, }, @@ -9855,18 +9850,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 7, .backPic = gMonBackPic_LandorusIncarnate, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .isLegendary = TRUE, - FOOTPRINT(Landorus) - .levelUpLearnset = sLandorusLevelUpLearnset, - .teachableLearnset = sLandorusTeachableLearnset, - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, - .formChangeTable = sLandorusFormChangeTable, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LandorusIncarnate, .shinyPalette = gMonShinyPalette_LandorusIncarnate, .iconSprite = gMonIcon_LandorusIncarnate, .iconPalIndex = 0, + FOOTPRINT(Landorus) + .isLegendary = TRUE, + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, + .formChangeTable = sLandorusFormChangeTable, }, [SPECIES_LANDORUS_THERIAN] = @@ -9910,18 +9905,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_CIRCULAR_VIBRATE, .backPic = gMonBackPic_LandorusTherian, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 7, - .isLegendary = TRUE, - FOOTPRINT(Landorus) - .levelUpLearnset = sLandorusLevelUpLearnset, - .teachableLearnset = sLandorusTeachableLearnset, - .formSpeciesIdTable = sLandorusFormSpeciesIdTable, - .formChangeTable = sLandorusFormChangeTable, + .backPicYOffset = 7, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_LandorusTherian, .shinyPalette = gMonShinyPalette_LandorusTherian, .iconSprite = gMonIcon_LandorusTherian, .iconPalIndex = 0, + FOOTPRINT(Landorus) + .isLegendary = TRUE, + .levelUpLearnset = sLandorusLevelUpLearnset, + .teachableLearnset = sLandorusTeachableLearnset, + .formSpeciesIdTable = sLandorusFormSpeciesIdTable, + .formChangeTable = sLandorusFormChangeTable, }, #endif //P_FAMILY_LANDORUS @@ -9965,9 +9960,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Kyurem, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Kyurem) - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 6, .frontAnimFrames = sAnims_Kyurem, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -9979,8 +9971,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Kyurem, .iconSprite = gMonIcon_Kyurem, .iconPalIndex = 0, + FOOTPRINT(Kyurem) + .isLegendary = TRUE, .levelUpLearnset = sKyuremLevelUpLearnset, .teachableLearnset = sKyuremTeachableLearnset, + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, }, #if P_FUSION_FORMS @@ -9994,20 +9989,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpDefense = 100, .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .bodyColor = BODY_COLOR_GRAY, - .noFlip = TRUE, - .speciesName = _("Kyurem"), - .natDexNum = NATIONAL_DEX_KYUREM, - .categoryName = _("Boundary"), - .weight = 3250, - FOOTPRINT(Kyurem) - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 350, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -10016,9 +9997,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .expYield = 297, #endif .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TURBOBLAZE, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), .cryId = CRY_KYUREM_WHITE, + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), .height = 36, + .weight = 3250, .description = COMPOUND_STRING( "The sameness of Reshiram's and\n" "Kyurem's genes allowed Kyurem to\n" @@ -10041,9 +10033,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KyuremWhite, .iconSprite = gMonIcon_KyuremWhite, .iconPalIndex = 0, + FOOTPRINT(Kyurem) + .isLegendary = TRUE, + .cannotBeTraded = TRUE, .levelUpLearnset = sKyuremWhiteLevelUpLearnset, .teachableLearnset = sKyuremTeachableLearnset, - .cannotBeTraded = TRUE, + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, }, [SPECIES_KYUREM_BLACK] = @@ -10056,20 +10051,6 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .baseSpDefense = 90, .types = MON_TYPES(TYPE_DRAGON, TYPE_ICE), .catchRate = 3, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), - .bodyColor = BODY_COLOR_GRAY, - .noFlip = TRUE, - .speciesName = _("Kyurem"), - .natDexNum = NATIONAL_DEX_KYUREM, - .categoryName = _("Boundary"), - .weight = 3250, - FOOTPRINT(Kyurem) - .formSpeciesIdTable = sKyuremFormSpeciesIdTable, - .isLegendary = TRUE, #if P_UPDATED_EXP_YIELDS >= GEN_8 .expYield = 350, #elif P_UPDATED_EXP_YIELDS >= GEN_7 @@ -10078,9 +10059,20 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .expYield = 297, #endif .evYield_Attack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_TERAVOLT, ABILITY_NONE }, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = TRUE, + .speciesName = _("Kyurem"), .cryId = CRY_KYUREM_BLACK, + .natDexNum = NATIONAL_DEX_KYUREM, + .categoryName = _("Boundary"), .height = 33, + .weight = 3250, .description = COMPOUND_STRING( "The sameness of Zekrom's and\n" "Kyurem's genes allowed Kyurem to absorb\n" @@ -10103,9 +10095,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KyuremBlack, .iconSprite = gMonIcon_KyuremBlack, .iconPalIndex = 0, + FOOTPRINT(Kyurem) + .isLegendary = TRUE, + .cannotBeTraded = TRUE, .levelUpLearnset = sKyuremBlackLevelUpLearnset, .teachableLearnset = sKyuremTeachableLearnset, - .cannotBeTraded = TRUE, + .formSpeciesIdTable = sKyuremFormSpeciesIdTable, }, #endif //P_FUSION_FORMS #endif //P_FAMILY_KYUREM @@ -10152,18 +10147,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KeldeoOrdinary, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 4, - .isMythical = TRUE, - FOOTPRINT(Keldeo) - .levelUpLearnset = sKeldeoLevelUpLearnset, - .teachableLearnset = sKeldeoTeachableLearnset, - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, - .formChangeTable = sKeldeoFormChangeTable, + .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_KeldeoOrdinary, .shinyPalette = gMonShinyPalette_KeldeoOrdinary, .iconSprite = gMonIcon_KeldeoOrdinary, .iconPalIndex = 0, + FOOTPRINT(Keldeo) + .isMythical = TRUE, + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, + .formChangeTable = sKeldeoFormChangeTable, }, [SPECIES_KELDEO_RESOLUTE] = @@ -10208,18 +10203,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_KeldeoResolute, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, - .isMythical = TRUE, - FOOTPRINT(Keldeo) - .levelUpLearnset = sKeldeoLevelUpLearnset, - .teachableLearnset = sKeldeoTeachableLearnset, - .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, - .formChangeTable = sKeldeoFormChangeTable, + .backPicYOffset = 3, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_KeldeoResolute, .shinyPalette = gMonShinyPalette_KeldeoResolute, .iconSprite = gMonIcon_KeldeoResolute, .iconPalIndex = 0, + FOOTPRINT(Keldeo) + .isMythical = TRUE, + .levelUpLearnset = sKeldeoLevelUpLearnset, + .teachableLearnset = sKeldeoTeachableLearnset, + .formSpeciesIdTable = sKeldeoFormSpeciesIdTable, + .formChangeTable = sKeldeoFormChangeTable, }, #endif //P_FAMILY_KELDEO @@ -10271,18 +10266,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 8, .backPic = gMonBackPic_MeloettaAria, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 7, - .isMythical = TRUE, - FOOTPRINT(Meloetta) - .levelUpLearnset = sMeloettaLevelUpLearnset, - .teachableLearnset = sMeloettaTeachableLearnset, - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, - .formChangeTable = sMeloettaFormChangeTable, + .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_MeloettaAria, .shinyPalette = gMonShinyPalette_MeloettaAria, .iconSprite = gMonIcon_MeloettaAria, .iconPalIndex = 4, + FOOTPRINT(Meloetta) + .isMythical = TRUE, + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, + .formChangeTable = sMeloettaFormChangeTable, }, [SPECIES_MELOETTA_PIROUETTE] = @@ -10331,18 +10326,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .enemyMonElevation = 5, .backPic = gMonBackPic_MeloettaPirouette, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 4, - .isMythical = TRUE, - FOOTPRINT(Meloetta) - .levelUpLearnset = sMeloettaLevelUpLearnset, - .teachableLearnset = sMeloettaTeachableLearnset, - .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, - .formChangeTable = sMeloettaFormChangeTable, + .backPicYOffset = 4, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_MeloettaPirouette, .shinyPalette = gMonShinyPalette_MeloettaPirouette, .iconSprite = gMonIcon_MeloettaPirouette, .iconPalIndex = 0, + FOOTPRINT(Meloetta) + .isMythical = TRUE, + .levelUpLearnset = sMeloettaLevelUpLearnset, + .teachableLearnset = sMeloettaTeachableLearnset, + .formSpeciesIdTable = sMeloettaFormSpeciesIdTable, + .formChangeTable = sMeloettaFormChangeTable, }, #endif //P_FAMILY_MELOETTA From 28859117125d70fa9b7a2ff8854facf4b5e0486e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:19:27 -0300 Subject: [PATCH 20/23] Gen 6 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_6.h | 248 +++++++++++++------------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h index e0a278d723eb..7b0cf9e9d5d3 100644 --- a/src/data/pokemon/species_info/gen_6.h +++ b/src/data/pokemon/species_info/gen_6.h @@ -456,28 +456,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .categoryName = _("Ninja"), .height = 15, .weight = 400, + .description = gGreninjaPokedexText, .pokemonScale = 268, .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FOOTPRINT(Greninja) - .levelUpLearnset = sGreninjaLevelUpLearnset, - .teachableLearnset = sGreninjaTeachableLearnset, - .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .description = gGreninjaPokedexText, .frontPic = gMonFrontPic_Greninja, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Greninja, + .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Greninja, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, + .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Greninja, .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, - .frontAnimId = ANIM_V_STRETCH, - .backAnimId = BACK_ANIM_JOLT_RIGHT, + FOOTPRINT(Greninja) + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, }, [SPECIES_GRENINJA_BATTLE_BOND] = @@ -506,28 +506,28 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .categoryName = _("Ninja"), .height = 15, .weight = 400, + .description = gGreninjaPokedexText, .pokemonScale = 268, .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - FOOTPRINT(Greninja) - .levelUpLearnset = sGreninjaLevelUpLearnset, - .teachableLearnset = sGreninjaTeachableLearnset, - .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, - .description = gGreninjaPokedexText, .frontPic = gMonFrontPic_Greninja, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Greninja, + .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Greninja, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, + .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Greninja, .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, - .frontAnimId = ANIM_V_STRETCH, - .backAnimId = BACK_ANIM_JOLT_RIGHT, + FOOTPRINT(Greninja) + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .formChangeTable = sGreninjaBattleBondFormChangeTable, }, @@ -568,21 +568,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_GreninjaAsh, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Greninja) - .levelUpLearnset = sGreninjaLevelUpLearnset, - .teachableLearnset = sGreninjaTeachableLearnset, - .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_GreninjaAsh, + .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_GreninjaAsh, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 11, + .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, .palette = gMonPalette_GreninjaAsh, .shinyPalette = gMonShinyPalette_GreninjaAsh, .iconSprite = gMonIcon_GreninjaAsh, .iconPalIndex = 0, - .frontAnimId = ANIM_V_STRETCH, - .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, + FOOTPRINT(Greninja) + .levelUpLearnset = sGreninjaLevelUpLearnset, + .teachableLearnset = sGreninjaTeachableLearnset, + .formSpeciesIdTable = sGreninjaFormSpeciesIdTable, .formChangeTable = sGreninjaBattleBondFormChangeTable, }, #endif //P_FAMILY_FROAKIE @@ -905,9 +905,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Scatterbug, .iconPalIndex = 1, FOOTPRINT(Scatterbug) + .tmIlliterate = TRUE, .levelUpLearnset = sScatterbugLevelUpLearnset, .teachableLearnset = sScatterbugTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 9, SPECIES_SPEWPA}), }, @@ -959,9 +959,9 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Spewpa, .iconPalIndex = 1, FOOTPRINT(Spewpa) + .tmIlliterate = TRUE, .levelUpLearnset = sSpewpaLevelUpLearnset, .teachableLearnset = sSpewpaTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 12, SPECIES_VIVILLON_ICY_SNOW}), }, @@ -1285,23 +1285,23 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 271, .trainerOffset = 0, .frontPic = gMonFrontPic_Pyroar, - .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicFemale = gMonFrontPic_PyroarF, + .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Pyroar, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Pyroar, - .backPicSize = MON_COORDS_SIZE(64, 64), .backPicFemale = gMonBackPic_PyroarF, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_STRETCH, .palette = gMonPalette_Pyroar, .shinyPalette = gMonShinyPalette_Pyroar, .iconSprite = gMonIcon_Pyroar, - .iconPalIndex = 2, .iconSpriteFemale = gMonIcon_PyroarF, + .iconPalIndex = 2, .iconPalIndexFemale = 2, FOOTPRINT(Pyroar) .levelUpLearnset = sPyroarLevelUpLearnset, @@ -1502,21 +1502,21 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = }, [SPECIES_FLOETTE_ETERNAL_FLOWER] = { + FLOETTE_MISC_INFO(Eternal, ETERNAL, 0), .baseHP = 74, .baseAttack = 65, .baseDefense = 67, .baseSpeed = 92, .baseSpAttack = 125, .baseSpDefense = 128, - FLOETTE_MISC_INFO(Eternal, ETERNAL, 0), .expYield = 243, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .cryId = CRY_FLOETTE_ETERNAL_FLOWER, .description = COMPOUND_STRING( "The flower it's holding can no\n" "longer be found blooming anywhere. It's\n" "also thought to contain terrifying\n" "power."), - .cryId = CRY_FLOETTE_ETERNAL_FLOWER, .frontPic = gMonFrontPic_FloetteEternalFlower, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -1997,14 +1997,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - FOOTPRINT(Meowstic) - .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .palette = gMonPalette_MeowsticMale, .shinyPalette = gMonShinyPalette_MeowsticMale, .iconSprite = gMonIcon_MeowsticMale, .iconPalIndex = 0, + FOOTPRINT(Meowstic) .levelUpLearnset = sMeowsticMaleLevelUpLearnset, .teachableLearnset = sMeowsticMaleTeachableLearnset, + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, }, [SPECIES_MEOWSTIC_FEMALE] = @@ -2050,14 +2050,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - FOOTPRINT(Meowstic) - .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, .palette = gMonPalette_MeowsticFemale, .shinyPalette = gMonShinyPalette_MeowsticFemale, .iconSprite = gMonIcon_MeowsticFemale, .iconPalIndex = 0, + FOOTPRINT(Meowstic) .levelUpLearnset = sMeowsticFemaleLevelUpLearnset, .teachableLearnset = sMeowsticFemaleTeachableLearnset, + .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, }, #endif //P_FAMILY_ESPURR @@ -2209,11 +2209,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 1, .frontPic = gMonFrontPic_AegislashShield, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Aegislash) - .levelUpLearnset = sAegislashLevelUpLearnset, - .teachableLearnset = sAegislashTeachableLearnset, - .formSpeciesIdTable = sAegislashFormSpeciesIdTable, - .formChangeTable = sAegislashFormChangeTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_AegislashShield, .frontAnimId = ANIM_H_VIBRATE, @@ -2226,6 +2221,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AegislashShield, .iconSprite = gMonIcon_AegislashShield, .iconPalIndex = 2, + FOOTPRINT(Aegislash) + .levelUpLearnset = sAegislashLevelUpLearnset, + .teachableLearnset = sAegislashTeachableLearnset, + .formSpeciesIdTable = sAegislashFormSpeciesIdTable, + .formChangeTable = sAegislashFormChangeTable, }, [SPECIES_AEGISLASH_BLADE] = @@ -2259,20 +2259,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .categoryName = _("Royal Sword"), .height = 17, .weight = 530, - .pokemonScale = 259, - .pokemonOffset = 0, - .trainerScale = 290, - .trainerOffset = 1, - FOOTPRINT(Aegislash) - .levelUpLearnset = sAegislashLevelUpLearnset, - .teachableLearnset = sAegislashTeachableLearnset, - .formSpeciesIdTable = sAegislashFormSpeciesIdTable, - .formChangeTable = sAegislashFormChangeTable, .description = COMPOUND_STRING( "Once upon a time, a king with an\n" "Aegislash reigned over the land. His\n" "Pokémon eventually drained him of\n" "life, and his kingdom fell with him."), + .pokemonScale = 259, + .pokemonOffset = 0, + .trainerScale = 290, + .trainerOffset = 1, .frontPic = gMonFrontPic_AegislashBlade, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -2287,6 +2282,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AegislashBlade, .iconSprite = gMonIcon_AegislashBlade, .iconPalIndex = 2, + FOOTPRINT(Aegislash) + .levelUpLearnset = sAegislashLevelUpLearnset, + .teachableLearnset = sAegislashTeachableLearnset, + .formSpeciesIdTable = sAegislashFormSpeciesIdTable, + .formChangeTable = sAegislashFormChangeTable, }, #endif //P_FAMILY_HONEDGE @@ -3279,11 +3279,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_HUMAN_LIKE), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_HUMAN_LIKE), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + #endif .abilities = { ABILITY_LIMBER, ABILITY_UNBURDEN, ABILITY_MOLD_BREAKER }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Hawlucha"), @@ -3523,8 +3523,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Sliggoo, .frontPicSize = MON_COORDS_SIZE(32, 64), - FOOTPRINT(Sliggoo) - .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .frontPicYOffset = 6, .frontAnimFrames = sAnims_Sliggoo, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3536,8 +3534,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Sliggoo, .iconSprite = gMonIcon_Sliggoo, .iconPalIndex = 5, + FOOTPRINT(Sliggoo) .levelUpLearnset = sSliggooLevelUpLearnset, .teachableLearnset = sSliggooTeachableLearnset, + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA}, {EVO_LEVEL_FOG, 50, SPECIES_GOODRA}), }, @@ -3578,8 +3578,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 4, .frontPic = gMonFrontPic_Goodra, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Goodra) - .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Goodra, .frontAnimId = ANIM_V_SHAKE, @@ -3591,8 +3589,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Goodra, .iconSprite = gMonIcon_Goodra, .iconPalIndex = 5, + FOOTPRINT(Goodra) .levelUpLearnset = sGoodraLevelUpLearnset, .teachableLearnset = sGoodraTeachableLearnset, + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -3633,8 +3633,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_SliggooHisuian, .frontPicSize = MON_COORDS_SIZE(48, 56), - FOOTPRINT(Sliggoo) - .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .frontPicYOffset = 7, .frontAnimFrames = sAnims_SliggooHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3646,9 +3644,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_SliggooHisuian, .iconSprite = gMonIcon_SliggooHisuian, .iconPalIndex = 2, + FOOTPRINT(Sliggoo) + .isHisuianForm = TRUE, .levelUpLearnset = sSliggooHisuianLevelUpLearnset, .teachableLearnset = sSliggooHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA_HISUIAN}, {EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUIAN}), }, @@ -3689,8 +3689,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 4, .frontPic = gMonFrontPic_GoodraHisuian, .frontPicSize = MON_COORDS_SIZE(56, 64), - FOOTPRINT(Goodra) - .formSpeciesIdTable = sGoodraFormSpeciesIdTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_GoodraHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -3702,9 +3700,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_GoodraHisuian, .iconSprite = gMonIcon_GoodraHisuian, .iconPalIndex = 2, + FOOTPRINT(Goodra) + .isHisuianForm = TRUE, .levelUpLearnset = sGoodraHisuianLevelUpLearnset, .teachableLearnset = sGoodraHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sGoodraFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY @@ -3916,7 +3916,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooAverage, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 13, + .backPicYOffset = 13, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Pumpkaboo, .shinyPalette = gMonShinyPalette_Pumpkaboo, @@ -3970,7 +3970,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooSmall, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 14, + .backPicYOffset = 14, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Pumpkaboo, .shinyPalette = gMonShinyPalette_Pumpkaboo, @@ -4024,7 +4024,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooLarge, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 13, + .backPicYOffset = 13, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Pumpkaboo, .shinyPalette = gMonShinyPalette_Pumpkaboo, @@ -4080,7 +4080,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_PumpkabooSuper, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicYOffset = 12, + .backPicYOffset = 12, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Pumpkaboo, .shinyPalette = gMonShinyPalette_Pumpkaboo, @@ -4135,7 +4135,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistAverage, .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 3, + .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gourgeist, .shinyPalette = gMonShinyPalette_Gourgeist, @@ -4188,7 +4188,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistSmall, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 4, + .backPicYOffset = 4, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gourgeist, .shinyPalette = gMonShinyPalette_Gourgeist, @@ -4241,7 +4241,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistLarge, .backPicSize = MON_COORDS_SIZE(48, 64), - .backPicYOffset = 2, + .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gourgeist, .shinyPalette = gMonShinyPalette_Gourgeist, @@ -4296,7 +4296,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_GourgeistSuper, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 1, + .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gourgeist, .shinyPalette = gMonShinyPalette_Gourgeist, @@ -4406,8 +4406,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 4, .frontPic = gMonFrontPic_Avalugg, .frontPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Avalugg) - .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Avalugg, .frontAnimId = ANIM_V_SHAKE, @@ -4419,8 +4417,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Avalugg, .iconSprite = gMonIcon_Avalugg, .iconPalIndex = 0, + FOOTPRINT(Avalugg) .levelUpLearnset = sAvaluggLevelUpLearnset, .teachableLearnset = sAvaluggTeachableLearnset, + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -4453,8 +4453,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "The armor of ice covering its lower\n" "jaw puts steel to shame and can\n" "shatter rocks with ease."), - FOOTPRINT(Avalugg) - .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, .pokemonScale = 261, .pokemonOffset = 1, .trainerScale = 334, @@ -4472,9 +4470,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AvaluggHisuian, .iconSprite = gMonIcon_AvaluggHisuian, .iconPalIndex = 5, + FOOTPRINT(Avalugg) + .isHisuianForm = TRUE, .levelUpLearnset = sAvaluggHisuianLevelUpLearnset, .teachableLearnset = sAvaluggHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE @@ -4496,11 +4496,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + #endif .abilities = { ABILITY_FRISK, ABILITY_INFILTRATOR, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Noibat"), @@ -4554,11 +4554,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_FAST, - #if P_UPDATED_EGG_GROUPS >= GEN_8 - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), - #else - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), - #endif + #if P_UPDATED_EGG_GROUPS >= GEN_8 + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING, EGG_GROUP_DRAGON), + #else + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FLYING), + #endif .abilities = { ABILITY_FRISK, ABILITY_INFILTRATOR, ABILITY_TELEPATHY }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Noivern"), @@ -4640,11 +4640,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_XerneasNeutral, .iconPalIndex = 0, FOOTPRINT(Xerneas) + .isLegendary = TRUE, .levelUpLearnset = sXerneasLevelUpLearnset, .teachableLearnset = sXerneasTeachableLearnset, .formSpeciesIdTable = sXerneasFormSpeciesIdTable, .formChangeTable = sXerneasFormChangeTable, - .isLegendary = TRUE, }, [SPECIES_XERNEAS_ACTIVE] = @@ -4691,11 +4691,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_XerneasActive, .iconPalIndex = 0, FOOTPRINT(Xerneas) + .isLegendary = TRUE, .levelUpLearnset = sXerneasLevelUpLearnset, .teachableLearnset = sXerneasTeachableLearnset, .formSpeciesIdTable = sXerneasFormSpeciesIdTable, .formChangeTable = sXerneasFormChangeTable, - .isLegendary = TRUE, }, #endif //P_FAMILY_XERNEAS @@ -4742,14 +4742,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .enemyMonElevation = 5, .backPic = gMonBackPic_Yveltal, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 10, - .isLegendary = TRUE, + .backPicYOffset = 10, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Yveltal, .shinyPalette = gMonShinyPalette_Yveltal, .iconSprite = gMonIcon_Yveltal, .iconPalIndex = 0, FOOTPRINT(Yveltal) + .isLegendary = TRUE, .levelUpLearnset = sYveltalLevelUpLearnset, .teachableLearnset = sYveltalTeachableLearnset, }, @@ -4800,12 +4800,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde50, .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, - .formChangeTable = sZygarde50AuraBreakFormChangeTable, FOOTPRINT(Zygarde) + .isLegendary = TRUE, .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, + .formChangeTable = sZygarde50AuraBreakFormChangeTable, }, [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = { @@ -4851,12 +4851,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde50, .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, - .formChangeTable = sZygarde50PowerConstructFormChangeTable, FOOTPRINT(Zygarde) + .isLegendary = TRUE, .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, + .formChangeTable = sZygarde50PowerConstructFormChangeTable, }, [SPECIES_ZYGARDE_10_AURA_BREAK] = { @@ -4893,6 +4893,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zygarde10, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, .backPic = gMonBackPic_Zygarde10, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, @@ -4901,13 +4902,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde10, .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, - .formChangeTable = sZygarde10AuraBreakFormChangeTable, FOOTPRINT(Zygarde) + .isLegendary = TRUE, .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, + .formChangeTable = sZygarde10AuraBreakFormChangeTable, }, [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = @@ -4945,6 +4945,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Zygarde10, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, .backPic = gMonBackPic_Zygarde10, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, @@ -4953,13 +4954,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde10, .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, - .formChangeTable = sZygarde10PowerConstructFormChangeTable, FOOTPRINT(Zygarde) + .isLegendary = TRUE, .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, - //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,, + .formChangeTable = sZygarde10PowerConstructFormChangeTable, }, [SPECIES_ZYGARDE_COMPLETE] = @@ -4999,11 +4999,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 19, .frontPic = gMonFrontPic_ZygardeComplete, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Zygarde) - .levelUpLearnset = sZygardeLevelUpLearnset, - .teachableLearnset = sZygardeTeachableLearnset, - .formSpeciesIdTable = sZygardeFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_ZygardeComplete, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5015,6 +5010,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_ZygardeComplete, .iconSprite = gMonIcon_ZygardeComplete, .iconPalIndex = 1, + FOOTPRINT(Zygarde) + .isLegendary = TRUE, + .levelUpLearnset = sZygardeLevelUpLearnset, + .teachableLearnset = sZygardeTeachableLearnset, + .formSpeciesIdTable = sZygardeFormSpeciesIdTable, .formChangeTable = sZygardeCompleteFormChangeTable, }, #endif //P_FAMILY_ZYGARDE @@ -5057,12 +5057,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Diancie, .frontPicSize = MON_COORDS_SIZE(40, 64), - FOOTPRINT(Diancie) - .levelUpLearnset = sDiancieLevelUpLearnset, - .teachableLearnset = sDiancieTeachableLearnset, - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, - .formChangeTable = sDiancieFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 1, .frontAnimFrames = sAnims_Diancie, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5074,6 +5068,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Diancie, .iconSprite = gMonIcon_Diancie, .iconPalIndex = 1, + FOOTPRINT(Diancie) + .isMythical = TRUE, + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, }, #if P_MEGA_EVOLUTIONS @@ -5114,12 +5114,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_DiancieMega, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Diancie) - .levelUpLearnset = sDiancieLevelUpLearnset, - .teachableLearnset = sDiancieTeachableLearnset, - .formSpeciesIdTable = sDiancieFormSpeciesIdTable, - .formChangeTable = sDiancieFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DiancieMega, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5131,7 +5125,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_DiancieMega, .iconSprite = gMonIcon_DiancieMega, .iconPalIndex = 0, + FOOTPRINT(Diancie) + .isMythical = TRUE, .isMegaEvolution = TRUE, + .levelUpLearnset = sDiancieLevelUpLearnset, + .teachableLearnset = sDiancieTeachableLearnset, + .formSpeciesIdTable = sDiancieFormSpeciesIdTable, + .formChangeTable = sDiancieFormChangeTable, }, #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE @@ -5173,10 +5173,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HoopaConfined, .frontPicSize = MON_COORDS_SIZE(48, 48), - FOOTPRINT(Hoopa) - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, - .formChangeTable = sHoopaFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 11, .frontAnimFrames = sAnims_HoopaConfined, .frontAnimId = ANIM_ZIGZAG_SLOW, @@ -5189,8 +5185,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_HoopaConfined, .iconSprite = gMonIcon_HoopaConfined, .iconPalIndex = 0, + FOOTPRINT(Hoopa) + .isMythical = TRUE, .levelUpLearnset = sHoopaConfinedLevelUpLearnset, .teachableLearnset = sHoopaConfinedTeachableLearnset, + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, }, [SPECIES_HOOPA_UNBOUND] = @@ -5229,10 +5229,6 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerOffset = 0, .frontPic = gMonFrontPic_HoopaUnbound, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Hoopa) - .formSpeciesIdTable = sHoopaFormSpeciesIdTable, - .formChangeTable = sHoopaFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_HoopaUnbound, .frontAnimId = ANIM_GROW_IN_STAGES, @@ -5245,8 +5241,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_HoopaUnbound, .iconSprite = gMonIcon_HoopaUnbound, .iconPalIndex = 0, + FOOTPRINT(Hoopa) + .isMythical = TRUE, .levelUpLearnset = sHoopaUnboundLevelUpLearnset, .teachableLearnset = sHoopaUnboundTeachableLearnset, + .formSpeciesIdTable = sHoopaFormSpeciesIdTable, + .formChangeTable = sHoopaFormChangeTable, }, #endif //P_FAMILY_HOOPA @@ -5292,14 +5292,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Volcanion, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, - .isMythical = TRUE, + .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Volcanion, .shinyPalette = gMonShinyPalette_Volcanion, .iconSprite = gMonIcon_Volcanion, .iconPalIndex = 0, FOOTPRINT(Volcanion) + .isMythical = TRUE, .levelUpLearnset = sVolcanionLevelUpLearnset, .teachableLearnset = sVolcanionTeachableLearnset, }, From 23ed3b50b5350fdcf832e3d325c8e9893691587c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:23:20 -0300 Subject: [PATCH 21/23] Gen 7 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_7.h | 298 +++++++++++++------------- 1 file changed, 147 insertions(+), 151 deletions(-) diff --git a/src/data/pokemon/species_info/gen_7.h b/src/data/pokemon/species_info/gen_7.h index e91a16ae1aa9..f6a12fc0eb5f 100644 --- a/src/data/pokemon/species_info/gen_7.h +++ b/src/data/pokemon/species_info/gen_7.h @@ -148,8 +148,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 1, .frontPic = gMonFrontPic_Decidueye, .frontPicSize = MON_COORDS_SIZE(45, 64), - FOOTPRINT(Decidueye) - .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Decidueye, .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, @@ -161,8 +159,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Decidueye, .iconSprite = gMonIcon_Decidueye, .iconPalIndex = 1, + FOOTPRINT(Decidueye) .levelUpLearnset = sDecidueyeLevelUpLearnset, .teachableLearnset = sDecidueyeTeachableLearnset, + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, }, #if P_HISUIAN_FORMS @@ -202,8 +202,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 1, .frontPic = gMonFrontPic_DecidueyeHisuian, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Decidueye) - .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, .frontPicYOffset = 0, .frontAnimFrames = sAnims_DecidueyeHisuian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -215,9 +213,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_DecidueyeHisuian, .iconSprite = gMonIcon_DecidueyeHisuian, .iconPalIndex = 0, + FOOTPRINT(Decidueye) + .isHisuianForm = TRUE, .levelUpLearnset = sDecidueyeHisuianLevelUpLearnset, .teachableLearnset = sDecidueyeHisuianTeachableLearnset, - .isHisuianForm = TRUE, + .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET @@ -1131,17 +1131,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .backPic = gMonBackPic_OricorioBaile, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, - FOOTPRINT(Oricorio) - .levelUpLearnset = sOricorioLevelUpLearnset, - .teachableLearnset = sOricorioTeachableLearnset, - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, - .formChangeTable = sOricorioFormChangeTable, - //.backAnimId = BACK_ANIM_NONE, \, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_OricorioBaile, .shinyPalette = gMonShinyPalette_OricorioBaile, .iconSprite = gMonIcon_OricorioBaile, .iconPalIndex = 0, + FOOTPRINT(Oricorio) + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, + .formChangeTable = sOricorioFormChangeTable, }, [SPECIES_ORICORIO_POM_POM] = @@ -1183,21 +1182,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Oricorio, - .backPicYOffset = 0, - FOOTPRINT(Oricorio) - .levelUpLearnset = sOricorioLevelUpLearnset, - .teachableLearnset = sOricorioTeachableLearnset, - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, - .formChangeTable = sOricorioFormChangeTable, - //.backAnimId = BACK_ANIM_NONE, \, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioPomPom, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_OricorioPomPom, .shinyPalette = gMonShinyPalette_OricorioPomPom, .iconSprite = gMonIcon_OricorioPomPom, .iconPalIndex = 1, + FOOTPRINT(Oricorio) + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, + .formChangeTable = sOricorioFormChangeTable, }, [SPECIES_ORICORIO_PAU] = @@ -1239,21 +1237,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Oricorio, - .backPicYOffset = 0, - FOOTPRINT(Oricorio) - .levelUpLearnset = sOricorioLevelUpLearnset, - .teachableLearnset = sOricorioTeachableLearnset, - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, - .formChangeTable = sOricorioFormChangeTable, - //.backAnimId = BACK_ANIM_NONE, \, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioPau, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_OricorioPau, .shinyPalette = gMonShinyPalette_OricorioPau, .iconSprite = gMonIcon_OricorioPau, .iconPalIndex = 1, + FOOTPRINT(Oricorio) + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, + .formChangeTable = sOricorioFormChangeTable, }, [SPECIES_ORICORIO_SENSU] = @@ -1295,21 +1292,20 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Oricorio, - .backPicYOffset = 0, - FOOTPRINT(Oricorio) - .levelUpLearnset = sOricorioLevelUpLearnset, - .teachableLearnset = sOricorioTeachableLearnset, - .formSpeciesIdTable = sOricorioFormSpeciesIdTable, - .formChangeTable = sOricorioFormChangeTable, - //.backAnimId = BACK_ANIM_NONE, \, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OricorioSensu, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_OricorioSensu, .shinyPalette = gMonShinyPalette_OricorioSensu, .iconSprite = gMonIcon_OricorioSensu, .iconPalIndex = 0, + FOOTPRINT(Oricorio) + .levelUpLearnset = sOricorioLevelUpLearnset, + .teachableLearnset = sOricorioTeachableLearnset, + .formSpeciesIdTable = sOricorioFormSpeciesIdTable, + .formChangeTable = sOricorioFormChangeTable, }, #endif //P_FAMILY_ORICORIO @@ -1455,10 +1451,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_Rockruff, + .frontPicSize = MON_COORDS_SIZE(37, 39), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Rockruff, .frontAnimId = ANIM_V_STRETCH, + .backPic = gMonBackPic_Rockruff, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, + .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Rockruff, .shinyPalette = gMonShinyPalette_Rockruff, .iconSprite = gMonIcon_Rockruff, @@ -1467,11 +1468,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, - .frontPic = gMonFrontPic_Rockruff, - .frontPicSize = MON_COORDS_SIZE(37, 39), - .backPic = gMonBackPic_Rockruff, - .backPicSize = MON_COORDS_SIZE(64, 56), - .backAnimId = BACK_ANIM_V_STRETCH, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 25, SPECIES_LYCANROC_MIDDAY}, {EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_MIDNIGHT}), }, @@ -1506,10 +1502,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, + .frontPic = gMonFrontPic_Rockruff, + .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Rockruff, .frontAnimId = ANIM_V_STRETCH, + .backPic = gMonBackPic_Rockruff, + .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Rockruff, .shinyPalette = gMonShinyPalette_Rockruff, .iconSprite = gMonIcon_Rockruff, @@ -1518,11 +1519,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, .formSpeciesIdTable = sRockruffFormSpeciesIdTable, - .frontPic = gMonFrontPic_Rockruff, - .frontPicSize = MON_COORDS_SIZE(40, 48), - .backPic = gMonBackPic_Rockruff, - .backPicSize = MON_COORDS_SIZE(64, 56), - //.backAnimId = BACK_ANIM_NONE, .evolutions = EVOLUTION({EVO_LEVEL_DUSK, 25, SPECIES_LYCANROC_DUSK}), }, @@ -1567,16 +1563,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_LycanrocMidday, .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Lycanroc) - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .backPicYOffset = 7, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LycanrocMidday, .shinyPalette = gMonShinyPalette_LycanrocMidday, .iconSprite = gMonIcon_LycanrocMidday, .iconPalIndex = 2, + FOOTPRINT(Lycanroc) .levelUpLearnset = sLycanrocMiddayLevelUpLearnset, .teachableLearnset = sLycanrocMiddayTeachableLearnset, + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, }, [SPECIES_LYCANROC_MIDNIGHT] = @@ -1620,16 +1616,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_SLOW, .backPic = gMonBackPic_LycanrocMidday, .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Lycanroc) - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .backPicYOffset = 7, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_LycanrocMidnight, .shinyPalette = gMonShinyPalette_LycanrocMidnight, .iconSprite = gMonIcon_LycanrocMidnight, .iconPalIndex = 0, + FOOTPRINT(Lycanroc) .levelUpLearnset = sLycanrocMidnightLevelUpLearnset, .teachableLearnset = sLycanrocMidnightTeachableLearnset, + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, }, [SPECIES_LYCANROC_DUSK] = @@ -1673,16 +1669,16 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_LycanrocMidday, .backPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Lycanroc) - .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, .backPicYOffset = 5, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_LycanrocDusk, .shinyPalette = gMonShinyPalette_LycanrocDusk, .iconSprite = gMonIcon_LycanrocDusk, .iconPalIndex = 0, + FOOTPRINT(Lycanroc) .levelUpLearnset = sLycanrocDuskLevelUpLearnset, .teachableLearnset = sLycanrocDuskTeachableLearnset, + .formSpeciesIdTable = sLycanrocFormSpeciesIdTable, }, #endif //P_FAMILY_ROCKRUFF @@ -1723,11 +1719,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, .frontPic = gMonFrontPic_WishiwashiSolo, .frontPicSize = MON_COORDS_SIZE(40, 24), - FOOTPRINT(Wishiwashi) - .levelUpLearnset = sWishiwashiLevelUpLearnset, - .teachableLearnset = sWishiwashiTeachableLearnset, - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, - .formChangeTable = sWishiwashiFormChangeTable, .frontPicYOffset = 20, .frontAnimFrames = sAnims_WishiwashiSolo, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, @@ -1740,6 +1731,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_WishiwashiSolo, .iconSprite = gMonIcon_WishiwashiSolo, .iconPalIndex = 2, + FOOTPRINT(Wishiwashi) + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, + .formChangeTable = sWishiwashiFormChangeTable, }, [SPECIES_WISHIWASHI_SCHOOL] = @@ -1778,11 +1774,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, .frontPic = gMonFrontPic_WishiwashiSchool, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Wishiwashi) - .levelUpLearnset = sWishiwashiLevelUpLearnset, - .teachableLearnset = sWishiwashiTeachableLearnset, - .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, - .formChangeTable = sWishiwashiFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_WishiwashiSchool, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //Todo @@ -1794,6 +1785,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_WishiwashiSchool, .iconSprite = gMonIcon_WishiwashiSchool, .iconPalIndex = 0, + FOOTPRINT(Wishiwashi) + .levelUpLearnset = sWishiwashiLevelUpLearnset, + .teachableLearnset = sWishiwashiTeachableLearnset, + .formSpeciesIdTable = sWishiwashiFormSpeciesIdTable, + .formChangeTable = sWishiwashiFormChangeTable, }, #endif //P_FAMILY_WISHIWASHI @@ -3202,14 +3198,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_TypeNull, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicYOffset = 1, - .isLegendary = TRUE, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TypeNull, .shinyPalette = gMonShinyPalette_TypeNull, .iconSprite = gMonIcon_TypeNull, .iconPalIndex = 0, FOOTPRINT(Type_Null) + .isLegendary = TRUE, .levelUpLearnset = sTypeNullLevelUpLearnset, .teachableLearnset = sTypeNullTeachableLearnset, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_SILVALLY_NORMAL}), @@ -3591,11 +3587,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, .frontPic = gMonFrontPic_MimikyuDisguised, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Mimikyu) - .levelUpLearnset = sMimikyuLevelUpLearnset, - .teachableLearnset = sMimikyuTeachableLearnset, - .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, - .formChangeTable = sMimikyuFormChangeTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuDisguised, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -3607,6 +3598,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuDisguised, .iconSprite = gMonIcon_MimikyuDisguised, .iconPalIndex = 1, + FOOTPRINT(Mimikyu) + .levelUpLearnset = sMimikyuLevelUpLearnset, + .teachableLearnset = sMimikyuTeachableLearnset, + .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, + .formChangeTable = sMimikyuFormChangeTable, }, [SPECIES_MIMIKYU_BUSTED] = @@ -3646,11 +3642,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 0, .frontPic = gMonFrontPic_MimikyuBusted, .frontPicSize = MON_COORDS_SIZE(48, 40), - FOOTPRINT(Mimikyu) - .levelUpLearnset = sMimikyuLevelUpLearnset, - .teachableLearnset = sMimikyuTeachableLearnset, - .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, - .formChangeTable = sMimikyuFormChangeTable, .frontPicYOffset = 12, .frontAnimFrames = sAnims_MimikyuBusted, .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, @@ -3662,6 +3653,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuBusted, .iconSprite = gMonIcon_MimikyuBusted, .iconPalIndex = 1, + FOOTPRINT(Mimikyu) + .levelUpLearnset = sMimikyuLevelUpLearnset, + .teachableLearnset = sMimikyuTeachableLearnset, + .formSpeciesIdTable = sMimikyuFormSpeciesIdTable, + .formChangeTable = sMimikyuFormChangeTable, }, #endif //P_FAMILY_MIMIKYU @@ -4037,14 +4033,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 9, .backPic = gMonBackPic_TapuKoko, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, - .isLegendary = TRUE, + .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuKoko, .shinyPalette = gMonShinyPalette_TapuKoko, .iconSprite = gMonIcon_TapuKoko, .iconPalIndex = 0, FOOTPRINT(Tapu_Koko) + .isLegendary = TRUE, .levelUpLearnset = sTapuKokoLevelUpLearnset, .teachableLearnset = sTapuKokoTeachableLearnset, }, @@ -4093,14 +4089,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 8, .backPic = gMonBackPic_TapuLele, .backPicSize = MON_COORDS_SIZE(56, 56), - .backPicYOffset = 6, - .isLegendary = TRUE, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuLele, .shinyPalette = gMonShinyPalette_TapuLele, .iconSprite = gMonIcon_TapuLele, .iconPalIndex = 0, FOOTPRINT(Tapu_Lele) + .isLegendary = TRUE, .levelUpLearnset = sTapuLeleLevelUpLearnset, .teachableLearnset = sTapuLeleTeachableLearnset, }, @@ -4149,14 +4145,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 5, .backPic = gMonBackPic_TapuBulu, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 1, - .isLegendary = TRUE, + .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuBulu, .shinyPalette = gMonShinyPalette_TapuBulu, .iconSprite = gMonIcon_TapuBulu, .iconPalIndex = 2, FOOTPRINT(Tapu_Bulu) + .isLegendary = TRUE, .levelUpLearnset = sTapuBuluLevelUpLearnset, .teachableLearnset = sTapuBuluTeachableLearnset, }, @@ -4206,14 +4202,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_TapuFini, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 4, - .isLegendary = TRUE, + .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_TapuFini, .shinyPalette = gMonShinyPalette_TapuFini, .iconSprite = gMonIcon_TapuFini, .iconPalIndex = 0, FOOTPRINT(Tapu_Fini) + .isLegendary = TRUE, .levelUpLearnset = sTapuFiniLevelUpLearnset, .teachableLearnset = sTapuFiniTeachableLearnset, }, @@ -4262,17 +4258,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 7, .backPic = gMonBackPic_Cosmog, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 10, - .isLegendary = TRUE, + .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Cosmog, .shinyPalette = gMonShinyPalette_Cosmog, .iconSprite = gMonIcon_Cosmog, .iconPalIndex = 2, FOOTPRINT(Cosmog) + .isLegendary = TRUE, + .tmIlliterate = TRUE, .levelUpLearnset = sCosmogLevelUpLearnset, .teachableLearnset = sCosmogTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 43, SPECIES_COSMOEM}), }, @@ -4319,17 +4315,17 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 3, .backPic = gMonBackPic_Cosmoem, .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicYOffset = 17, - .isLegendary = TRUE, + .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Cosmoem, .shinyPalette = gMonShinyPalette_Cosmoem, .iconSprite = gMonIcon_Cosmoem, .iconPalIndex = 0, FOOTPRINT(Cosmoem) + .isLegendary = TRUE, + .tmIlliterate = TRUE, .levelUpLearnset = sCosmoemLevelUpLearnset, .teachableLearnset = sCosmoemTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO}, {EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA}), }, @@ -4375,14 +4371,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Solgaleo, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 3, - .isLegendary = TRUE, + .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Solgaleo, .shinyPalette = gMonShinyPalette_Solgaleo, .iconSprite = gMonIcon_Solgaleo, .iconPalIndex = 0, FOOTPRINT(Solgaleo) + .isLegendary = TRUE, .levelUpLearnset = sSolgaleoLevelUpLearnset, .teachableLearnset = sSolgaleoTeachableLearnset, }, @@ -4429,14 +4425,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_Lunala, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, - .isLegendary = TRUE, + .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Lunala, .shinyPalette = gMonShinyPalette_Lunala, .iconSprite = gMonIcon_Lunala, .iconPalIndex = 2, FOOTPRINT(Lunala) + .isLegendary = TRUE, .levelUpLearnset = sLunalaLevelUpLearnset, .teachableLearnset = sLunalaTeachableLearnset, }, @@ -4485,14 +4481,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 6, .backPic = gMonBackPic_Nihilego, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 9, - .isUltraBeast = TRUE, + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Nihilego, .shinyPalette = gMonShinyPalette_Nihilego, .iconSprite = gMonIcon_Nihilego, .iconPalIndex = 0, FOOTPRINT(Nihilego) + .isUltraBeast = TRUE, .levelUpLearnset = sNihilegoLevelUpLearnset, .teachableLearnset = sNihilegoTeachableLearnset, }, @@ -4541,14 +4537,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, .backPic = gMonBackPic_Buzzwole, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 14, - .isUltraBeast = TRUE, + .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Buzzwole, .shinyPalette = gMonShinyPalette_Buzzwole, .iconSprite = gMonIcon_Buzzwole, .iconPalIndex = 0, FOOTPRINT(Buzzwole) + .isUltraBeast = TRUE, .levelUpLearnset = sBuzzwoleLevelUpLearnset, .teachableLearnset = sBuzzwoleTeachableLearnset, }, @@ -4596,14 +4592,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Pheromosa, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, - .isUltraBeast = TRUE, + .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Pheromosa, .shinyPalette = gMonShinyPalette_Pheromosa, .iconSprite = gMonIcon_Pheromosa, .iconPalIndex = 2, FOOTPRINT(Pheromosa) + .isUltraBeast = TRUE, .levelUpLearnset = sPheromosaLevelUpLearnset, .teachableLearnset = sPheromosaTeachableLearnset, }, @@ -4651,14 +4647,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST, .backPic = gMonBackPic_Xurkitree, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, - .isUltraBeast = TRUE, + .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Xurkitree, .shinyPalette = gMonShinyPalette_Xurkitree, .iconSprite = gMonIcon_Xurkitree, .iconPalIndex = 0, FOOTPRINT(Xurkitree) + .isUltraBeast = TRUE, .levelUpLearnset = sXurkitreeLevelUpLearnset, .teachableLearnset = sXurkitreeTeachableLearnset, }, @@ -4708,14 +4704,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_STUTTER_SLOW, .backPic = gMonBackPic_Celesteela, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .isUltraBeast = TRUE, + .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Celesteela, .shinyPalette = gMonShinyPalette_Celesteela, .iconSprite = gMonIcon_Celesteela, .iconPalIndex = 0, FOOTPRINT(Celesteela) + .isUltraBeast = TRUE, .levelUpLearnset = sCelesteelaLevelUpLearnset, .teachableLearnset = sCelesteelaTeachableLearnset, }, @@ -4764,14 +4760,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 3, .backPic = gMonBackPic_Kartana, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 11, - .isUltraBeast = TRUE, + .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Kartana, .shinyPalette = gMonShinyPalette_Kartana, .iconSprite = gMonIcon_Kartana, .iconPalIndex = 0, FOOTPRINT(Kartana) + .isUltraBeast = TRUE, .levelUpLearnset = sKartanaLevelUpLearnset, .teachableLearnset = sKartanaTeachableLearnset, }, @@ -4819,14 +4815,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST, .backPic = gMonBackPic_Guzzlord, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 10, - .isUltraBeast = TRUE, + .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Guzzlord, .shinyPalette = gMonShinyPalette_Guzzlord, .iconSprite = gMonIcon_Guzzlord, .iconPalIndex = 0, FOOTPRINT(Guzzlord) + .isUltraBeast = TRUE, .levelUpLearnset = sGuzzlordLevelUpLearnset, .teachableLearnset = sGuzzlordTeachableLearnset, }, @@ -4871,11 +4867,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 7, .frontPic = gMonFrontPic_Necrozma, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 2, .frontAnimFrames = sAnims_Necrozma, .frontAnimId = ANIM_GROW_VIBRATE, @@ -4888,6 +4879,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Necrozma, .iconSprite = gMonIcon_Necrozma, .iconPalIndex = 0, + FOOTPRINT(Necrozma) + .isLegendary = TRUE, + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, }, #if P_FUSION_FORMS @@ -4928,11 +4924,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaDuskMane, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -4944,7 +4935,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaDuskMane, .iconSprite = gMonIcon_NecrozmaDuskMane, .iconPalIndex = 0, + FOOTPRINT(Necrozma) + .isLegendary = TRUE, .cannotBeTraded = TRUE, + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .formChangeTable = sNecrozmaDuskManeFormChangeTable, }, @@ -4985,11 +4981,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaDawnWings, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5002,7 +4993,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaDawnWings, .iconSprite = gMonIcon_NecrozmaDawnWings, .iconPalIndex = 0, + FOOTPRINT(Necrozma) + .isLegendary = TRUE, .cannotBeTraded = TRUE, + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, .formChangeTable = sNecrozmaDawnWingsFormChangeTable, }, @@ -5046,11 +5042,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 7, .frontPic = gMonFrontPic_NecrozmaUltra, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Necrozma) - .levelUpLearnset = sNecrozmaLevelUpLearnset, - .teachableLearnset = sNecrozmaTeachableLearnset, - .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, - .isLegendary = TRUE, .frontPicYOffset = 0, .frontAnimFrames = sAnims_Necrozma, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5063,8 +5054,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaUltra, .iconSprite = gMonIcon_NecrozmaUltra, .iconPalIndex = 2, - .cannotBeTraded = TRUE, + FOOTPRINT(Necrozma) + .isLegendary = TRUE, .isUltraBurst = TRUE, + .cannotBeTraded = TRUE, + .levelUpLearnset = sNecrozmaLevelUpLearnset, + .teachableLearnset = sNecrozmaTeachableLearnset, + .formSpeciesIdTable = sNecrozmaFormSpeciesIdTable, }, #endif //P_ULTRA_BURST_FORMS #endif //P_FUSION_FORMS @@ -5119,10 +5115,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Magearna, .iconPalIndex = 0, FOOTPRINT(Magearna) + .isMythical = TRUE, .levelUpLearnset = sMagearnaLevelUpLearnset, .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, - .isMythical = TRUE, }, [SPECIES_MAGEARNA_ORIGINAL_COLOR] = { @@ -5172,10 +5168,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_MagearnaOriginalColor, .iconPalIndex = 0, FOOTPRINT(Magearna) + .isMythical = TRUE, .levelUpLearnset = sMagearnaLevelUpLearnset, .teachableLearnset = sMagearnaTeachableLearnset, .formSpeciesIdTable = sMagearnaFormSpeciesIdTable, - .isMythical = TRUE, }, #endif //P_FAMILY_MAGEARNA @@ -5230,9 +5226,9 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Marshadow, .iconPalIndex = 0, FOOTPRINT(Marshadow) + .isMythical = TRUE, .levelUpLearnset = sMarshadowLevelUpLearnset, .teachableLearnset = sMarshadowTeachableLearnset, - .isMythical = TRUE, }, #endif //P_FAMILY_MARSHADOW @@ -5278,14 +5274,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 9, .backPic = gMonBackPic_Poipole, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicYOffset = 6, - .isUltraBeast = TRUE, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Poipole, .shinyPalette = gMonShinyPalette_Poipole, .iconSprite = gMonIcon_Poipole, .iconPalIndex = 0, FOOTPRINT(Poipole) + .isUltraBeast = TRUE, .levelUpLearnset = sPoipoleLevelUpLearnset, .teachableLearnset = sPoipoleTeachableLearnset, .evolutions = EVOLUTION({EVO_MOVE, MOVE_DRAGON_PULSE, SPECIES_NAGANADEL}), @@ -5332,14 +5328,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .enemyMonElevation = 7, .backPic = gMonBackPic_Naganadel, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 6, - .isUltraBeast = TRUE, + .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Naganadel, .shinyPalette = gMonShinyPalette_Naganadel, .iconSprite = gMonIcon_Naganadel, .iconPalIndex = 0, FOOTPRINT(Naganadel) + .isUltraBeast = TRUE, .levelUpLearnset = sNaganadelLevelUpLearnset, .teachableLearnset = sNaganadelTeachableLearnset, }, @@ -5387,14 +5383,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Stakataka, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 12, - .isUltraBeast = TRUE, + .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Stakataka, .shinyPalette = gMonShinyPalette_Stakataka, .iconSprite = gMonIcon_Stakataka, .iconPalIndex = 0, FOOTPRINT(Stakataka) + .isUltraBeast = TRUE, .levelUpLearnset = sStakatakaLevelUpLearnset, .teachableLearnset = sStakatakaTeachableLearnset, }, @@ -5442,14 +5438,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_SHAKE_GLOW_RED, .backPic = gMonBackPic_Blacephalon, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicYOffset = 9, - .isUltraBeast = TRUE, + .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Blacephalon, .shinyPalette = gMonShinyPalette_Blacephalon, .iconSprite = gMonIcon_Blacephalon, .iconPalIndex = 0, FOOTPRINT(Blacephalon) + .isUltraBeast = TRUE, .levelUpLearnset = sBlacephalonLevelUpLearnset, .teachableLearnset = sBlacephalonTeachableLearnset, }, @@ -5496,14 +5492,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Zeraora, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 11, - .isMythical = TRUE, + .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Zeraora, .shinyPalette = gMonShinyPalette_Zeraora, .iconSprite = gMonIcon_Zeraora, .iconPalIndex = 0, FOOTPRINT(Zeraora) + .isMythical = TRUE, .levelUpLearnset = sZeraoraLevelUpLearnset, .teachableLearnset = sZeraoraTeachableLearnset, }, @@ -5550,14 +5546,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .frontAnimId = ANIM_GROW_STUTTER_SLOW, .backPic = gMonBackPic_Meltan, .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .isMythical = TRUE, + .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_Meltan, .shinyPalette = gMonShinyPalette_Meltan, .iconSprite = gMonIcon_Meltan, .iconPalIndex = 2, FOOTPRINT(Meltan) + .isMythical = TRUE, .levelUpLearnset = sMeltanLevelUpLearnset, .teachableLearnset = sMeltanTeachableLearnset, }, @@ -5597,12 +5593,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 8, .frontPic = gMonFrontPic_Melmetal, .frontPicSize = MON_COORDS_SIZE(64, 56), - FOOTPRINT(Melmetal) - .levelUpLearnset = sMelmetalLevelUpLearnset, - .teachableLearnset = sMelmetalTeachableLearnset, - .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, - .formChangeTable = sMelmetalFormChangeTable, - .isMythical = TRUE, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Melmetal, .frontAnimId = ANIM_GROW_VIBRATE, @@ -5614,6 +5604,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Melmetal, .iconSprite = gMonIcon_Melmetal, .iconPalIndex = 2, + FOOTPRINT(Melmetal) + .isMythical = TRUE, + .levelUpLearnset = sMelmetalLevelUpLearnset, + .teachableLearnset = sMelmetalTeachableLearnset, + .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, + .formChangeTable = sMelmetalFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -5653,13 +5649,6 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .trainerOffset = 8, .frontPic = gMonFrontPic_MelmetalGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Melmetal) - .levelUpLearnset = sMelmetalLevelUpLearnset, - .teachableLearnset = sMelmetalTeachableLearnset, - .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, - .formChangeTable = sMelmetalFormChangeTable, - .isMythical = TRUE, - .isGigantamax = TRUE, .frontPicYOffset = 1, .frontAnimFrames = sAnims_MelmetalGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5671,6 +5660,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MelmetalGigantamax, .iconSprite = gMonIcon_MelmetalGigantamax, .iconPalIndex = 0, + FOOTPRINT(Melmetal) + .isMythical = TRUE, + .isGigantamax = TRUE, + .levelUpLearnset = sMelmetalLevelUpLearnset, + .teachableLearnset = sMelmetalTeachableLearnset, + .formSpeciesIdTable = sMelmetalFormSpeciesIdTable, + .formChangeTable = sMelmetalFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN From d94202c2e0a54f39ff6625632e343fd79372af22 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:28:25 -0300 Subject: [PATCH 22/23] Gen 8 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_8.h | 909 +++++++++++++------------- 1 file changed, 454 insertions(+), 455 deletions(-) diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index f4d3c0ebfd7a..f7146d4142f0 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -132,21 +132,16 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_RILLABOOM, .natDexNum = NATIONAL_DEX_RILLABOOM, .categoryName = _("Drummer"), - FOOTPRINT(Rillaboom) - .levelUpLearnset = sRillaboomLevelUpLearnset, - .teachableLearnset = sRillaboomTeachableLearnset, - .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, - .formChangeTable = sRillaboomFormChangeTable, .height = 21, .weight = 900, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 365, - .trainerOffset = 7, .description = COMPOUND_STRING( "By drumming, it taps into the power of\n" "its special tree stump. The roots of the\n" "stump follow its direction in battle."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, .frontPic = gMonFrontPic_Rillaboom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -160,6 +155,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Rillaboom, .iconSprite = gMonIcon_Rillaboom, .iconPalIndex = 1, + FOOTPRINT(Rillaboom) + .levelUpLearnset = sRillaboomLevelUpLearnset, + .teachableLearnset = sRillaboomTeachableLearnset, + .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, + .formChangeTable = sRillaboomFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -186,21 +186,16 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_RILLABOOM, .natDexNum = NATIONAL_DEX_RILLABOOM, .categoryName = _("Drummer"), - FOOTPRINT(Rillaboom) - .levelUpLearnset = sRillaboomLevelUpLearnset, - .teachableLearnset = sRillaboomTeachableLearnset, - .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, - .formChangeTable = sRillaboomFormChangeTable, .height = 280, .weight = 0, - .pokemonScale = 256, - .pokemonOffset = 0, - .trainerScale = 365, - .trainerOffset = 7, .description = COMPOUND_STRING( "Rillaboom has become one with its\n" "forest of drums and continues to lay\n" "down beats that shake all of Galar."), + .pokemonScale = 256, + .pokemonOffset = 0, + .trainerScale = 365, + .trainerOffset = 7, .frontPic = gMonFrontPic_RillaboomGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -214,7 +209,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_RillaboomGigantamax, .iconSprite = gMonIcon_RillaboomGigantamax, .iconPalIndex = 1, + FOOTPRINT(Rillaboom) .isGigantamax = TRUE, + .levelUpLearnset = sRillaboomLevelUpLearnset, + .teachableLearnset = sRillaboomTeachableLearnset, + .formSpeciesIdTable = sRillaboomFormSpeciesIdTable, + .formChangeTable = sRillaboomFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY @@ -348,11 +348,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CINDERACE, .natDexNum = NATIONAL_DEX_CINDERACE, .categoryName = _("Striker"), - FOOTPRINT(Cinderace) - .levelUpLearnset = sCinderaceLevelUpLearnset, - .teachableLearnset = sCinderaceTeachableLearnset, - .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, - .formChangeTable = sCinderaceFormChangeTable, .height = 14, .weight = 330, .description = COMPOUND_STRING( @@ -377,6 +372,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Cinderace, .iconSprite = gMonIcon_Cinderace, .iconPalIndex = 0, + FOOTPRINT(Cinderace) + .levelUpLearnset = sCinderaceLevelUpLearnset, + .teachableLearnset = sCinderaceTeachableLearnset, + .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, + .formChangeTable = sCinderaceFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -403,11 +403,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CINDERACE, .natDexNum = NATIONAL_DEX_CINDERACE, .categoryName = _("Striker"), - FOOTPRINT(Cinderace) - .levelUpLearnset = sCinderaceLevelUpLearnset, - .teachableLearnset = sCinderaceTeachableLearnset, - .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, - .formChangeTable = sCinderaceFormChangeTable, .height = 270, .weight = 0, .description = COMPOUND_STRING( @@ -432,7 +427,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CinderaceGigantamax, .iconSprite = gMonIcon_CinderaceGigantamax, .iconPalIndex = 0, + FOOTPRINT(Cinderace) .isGigantamax = TRUE, + .levelUpLearnset = sCinderaceLevelUpLearnset, + .teachableLearnset = sCinderaceTeachableLearnset, + .formSpeciesIdTable = sCinderaceFormSpeciesIdTable, + .formChangeTable = sCinderaceFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY @@ -567,11 +567,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_INTELEON, .natDexNum = NATIONAL_DEX_INTELEON, .categoryName = _("Secret Agent"), - FOOTPRINT(Inteleon) - .levelUpLearnset = sInteleonLevelUpLearnset, - .teachableLearnset = sInteleonTeachableLearnset, - .formSpeciesIdTable = sInteleonFormSpeciesIdTable, - .formChangeTable = sInteleonFormChangeTable, .height = 19, .weight = 452, .description = COMPOUND_STRING( @@ -596,6 +591,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Inteleon, .iconSprite = gMonIcon_Inteleon, .iconPalIndex = 0, + FOOTPRINT(Inteleon) + .levelUpLearnset = sInteleonLevelUpLearnset, + .teachableLearnset = sInteleonTeachableLearnset, + .formSpeciesIdTable = sInteleonFormSpeciesIdTable, + .formChangeTable = sInteleonFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -622,11 +622,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_INTELEON, .natDexNum = NATIONAL_DEX_INTELEON, .categoryName = _("Secret Agent"), - FOOTPRINT(Inteleon) - .levelUpLearnset = sInteleonLevelUpLearnset, - .teachableLearnset = sInteleonTeachableLearnset, - .formSpeciesIdTable = sInteleonFormSpeciesIdTable, - .formChangeTable = sInteleonFormChangeTable, .height = 400, .weight = 0, .description = COMPOUND_STRING( @@ -651,7 +646,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_InteleonGigantamax, .iconSprite = gMonIcon_InteleonGigantamax, .iconPalIndex = 0, + FOOTPRINT(Inteleon) .isGigantamax = TRUE, + .levelUpLearnset = sInteleonLevelUpLearnset, + .teachableLearnset = sInteleonTeachableLearnset, + .formSpeciesIdTable = sInteleonFormSpeciesIdTable, + .formChangeTable = sInteleonFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE @@ -895,11 +895,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CORVIKNIGHT, .natDexNum = NATIONAL_DEX_CORVIKNIGHT, .categoryName = _("Raven"), - FOOTPRINT(Corviknight) - .levelUpLearnset = sCorviknightLevelUpLearnset, - .teachableLearnset = sCorviknightTeachableLearnset, - .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, - .formChangeTable = sCorviknightFormChangeTable, .height = 22, .weight = 750, .description = COMPOUND_STRING( @@ -924,6 +919,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Corviknight, .iconSprite = gMonIcon_Corviknight, .iconPalIndex = 0, + FOOTPRINT(Corviknight) + .levelUpLearnset = sCorviknightLevelUpLearnset, + .teachableLearnset = sCorviknightTeachableLearnset, + .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, + .formChangeTable = sCorviknightFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -950,11 +950,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CORVIKNIGHT, .natDexNum = NATIONAL_DEX_CORVIKNIGHT, .categoryName = _("Raven"), - FOOTPRINT(Corviknight) - .levelUpLearnset = sCorviknightLevelUpLearnset, - .teachableLearnset = sCorviknightTeachableLearnset, - .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, - .formChangeTable = sCorviknightFormChangeTable, .height = 140, .weight = 0, .description = COMPOUND_STRING( @@ -979,7 +974,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CorviknightGigantamax, .iconSprite = gMonIcon_CorviknightGigantamax, .iconPalIndex = 0, + FOOTPRINT(Corviknight) .isGigantamax = TRUE, + .levelUpLearnset = sCorviknightLevelUpLearnset, + .teachableLearnset = sCorviknightTeachableLearnset, + .formSpeciesIdTable = sCorviknightFormSpeciesIdTable, + .formChangeTable = sCorviknightFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE @@ -1032,9 +1032,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Blipbug, .iconPalIndex = 0, FOOTPRINT(Blipbug) + .tmIlliterate = TRUE, .levelUpLearnset = sBlipbugLevelUpLearnset, .teachableLearnset = sBlipbugTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_LEVEL, 10, SPECIES_DOTTLER}), }, @@ -1129,11 +1129,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_Orbeetle, .frontPicSize = MON_COORDS_SIZE(48, 56), - FOOTPRINT(Orbeetle) - .levelUpLearnset = sOrbeetleLevelUpLearnset, - .teachableLearnset = sOrbeetleTeachableLearnset, - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, - .formChangeTable = sOrbeetleFormChangeTable, .frontPicYOffset = 4, .frontAnimFrames = sAnims_Orbeetle, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1146,6 +1141,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Orbeetle, .iconSprite = gMonIcon_Orbeetle, .iconPalIndex = 0, + FOOTPRINT(Orbeetle) + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, + .formChangeTable = sOrbeetleFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -1186,11 +1186,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_OrbeetleGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Orbeetle) - .levelUpLearnset = sOrbeetleLevelUpLearnset, - .teachableLearnset = sOrbeetleTeachableLearnset, - .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, - .formChangeTable = sOrbeetleFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_OrbeetleGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -1202,7 +1197,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_OrbeetleGigantamax, .iconSprite = gMonIcon_OrbeetleGigantamax, .iconPalIndex = 0, + FOOTPRINT(Orbeetle) .isGigantamax = TRUE, + .levelUpLearnset = sOrbeetleLevelUpLearnset, + .teachableLearnset = sOrbeetleTeachableLearnset, + .formSpeciesIdTable = sOrbeetleFormSpeciesIdTable, + .formChangeTable = sOrbeetleFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG @@ -1604,11 +1604,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DREDNAW, .natDexNum = NATIONAL_DEX_DREDNAW, .categoryName = _("Bite"), - FOOTPRINT(Drednaw) - .levelUpLearnset = sDrednawLevelUpLearnset, - .teachableLearnset = sDrednawTeachableLearnset, - .formSpeciesIdTable = sDrednawFormSpeciesIdTable, - .formChangeTable = sDrednawFormChangeTable, .height = 10, .weight = 1155, .description = COMPOUND_STRING( @@ -1632,6 +1627,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Drednaw, .iconSprite = gMonIcon_Drednaw, .iconPalIndex = 0, + FOOTPRINT(Drednaw) + .levelUpLearnset = sDrednawLevelUpLearnset, + .teachableLearnset = sDrednawTeachableLearnset, + .formSpeciesIdTable = sDrednawFormSpeciesIdTable, + .formChangeTable = sDrednawFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -1658,11 +1658,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DREDNAW, .natDexNum = NATIONAL_DEX_DREDNAW, .categoryName = _("Bite"), - FOOTPRINT(Drednaw) - .levelUpLearnset = sDrednawLevelUpLearnset, - .teachableLearnset = sDrednawTeachableLearnset, - .formSpeciesIdTable = sDrednawFormSpeciesIdTable, - .formChangeTable = sDrednawFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -1687,7 +1682,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_DrednawGigantamax, .iconSprite = gMonIcon_DrednawGigantamax, .iconPalIndex = 0, + FOOTPRINT(Drednaw) .isGigantamax = TRUE, + .levelUpLearnset = sDrednawLevelUpLearnset, + .teachableLearnset = sDrednawTeachableLearnset, + .formSpeciesIdTable = sDrednawFormSpeciesIdTable, + .formChangeTable = sDrednawFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE @@ -1928,11 +1928,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COALOSSAL, .natDexNum = NATIONAL_DEX_COALOSSAL, .categoryName = _("Coal"), - FOOTPRINT(Coalossal) - .levelUpLearnset = sCoalossalLevelUpLearnset, - .teachableLearnset = sCoalossalTeachableLearnset, - .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, - .formChangeTable = sCoalossalFormChangeTable, .height = 28, .weight = 3105, .description = COMPOUND_STRING( @@ -1957,6 +1952,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Coalossal, .iconSprite = gMonIcon_Coalossal, .iconPalIndex = 0, + FOOTPRINT(Coalossal) + .levelUpLearnset = sCoalossalLevelUpLearnset, + .teachableLearnset = sCoalossalTeachableLearnset, + .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, + .formChangeTable = sCoalossalFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -1983,11 +1983,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_COALOSSAL, .natDexNum = NATIONAL_DEX_COALOSSAL, .categoryName = _("Coal"), - FOOTPRINT(Coalossal) - .levelUpLearnset = sCoalossalLevelUpLearnset, - .teachableLearnset = sCoalossalTeachableLearnset, - .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, - .formChangeTable = sCoalossalFormChangeTable, .height = 420, .weight = 0, .description = COMPOUND_STRING( @@ -2012,7 +2007,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CoalossalGigantamax, .iconSprite = gMonIcon_CoalossalGigantamax, .iconPalIndex = 0, + FOOTPRINT(Coalossal) .isGigantamax = TRUE, + .levelUpLearnset = sCoalossalLevelUpLearnset, + .teachableLearnset = sCoalossalTeachableLearnset, + .formSpeciesIdTable = sCoalossalFormSpeciesIdTable, + .formChangeTable = sCoalossalFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY @@ -2066,9 +2066,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Applin, .iconPalIndex = 1, FOOTPRINT(Applin) + .tmIlliterate = TRUE, .levelUpLearnset = sApplinLevelUpLearnset, .teachableLearnset = sApplinTeachableLearnset, - .tmIlliterate = TRUE, .evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}, {EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}), @@ -2097,11 +2097,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_FLAPPLE, .natDexNum = NATIONAL_DEX_FLAPPLE, .categoryName = _("Apple Wing"), - FOOTPRINT(Flapple) - .levelUpLearnset = sFlappleLevelUpLearnset, - .teachableLearnset = sFlappleTeachableLearnset, - .formSpeciesIdTable = sFlappleFormSpeciesIdTable, - .formChangeTable = sFlappleFormChangeTable, .height = 3, .weight = 10, .description = COMPOUND_STRING( @@ -2126,6 +2121,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Flapple, .iconSprite = gMonIcon_Flapple, .iconPalIndex = 1, + FOOTPRINT(Flapple) + .levelUpLearnset = sFlappleLevelUpLearnset, + .teachableLearnset = sFlappleTeachableLearnset, + .formSpeciesIdTable = sFlappleFormSpeciesIdTable, + .formChangeTable = sFlappleFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -2152,11 +2152,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_FLAPPLE, .natDexNum = NATIONAL_DEX_FLAPPLE, .categoryName = _("Apple Wing"), - FOOTPRINT(Flapple) - .levelUpLearnset = sFlappleLevelUpLearnset, - .teachableLearnset = sFlappleTeachableLearnset, - .formSpeciesIdTable = sFlappleFormSpeciesIdTable, - .formChangeTable = sFlappleFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -2181,7 +2176,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_FlappleGigantamax, .iconSprite = gMonIcon_FlappleGigantamax, .iconPalIndex = 1, + FOOTPRINT(Flapple) .isGigantamax = TRUE, + .levelUpLearnset = sFlappleLevelUpLearnset, + .teachableLearnset = sFlappleTeachableLearnset, + .formSpeciesIdTable = sFlappleFormSpeciesIdTable, + .formChangeTable = sFlappleFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -2208,11 +2208,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_APPLETUN, .natDexNum = NATIONAL_DEX_APPLETUN, .categoryName = _("Apple Nectar"), - FOOTPRINT(Appletun) - .levelUpLearnset = sAppletunLevelUpLearnset, - .teachableLearnset = sAppletunTeachableLearnset, - .formSpeciesIdTable = sAppletunFormSpeciesIdTable, - .formChangeTable = sAppletunFormChangeTable, .height = 4, .weight = 130, .description = COMPOUND_STRING( @@ -2236,6 +2231,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Appletun, .iconSprite = gMonIcon_Appletun, .iconPalIndex = 1, + FOOTPRINT(Appletun) + .levelUpLearnset = sAppletunLevelUpLearnset, + .teachableLearnset = sAppletunTeachableLearnset, + .formSpeciesIdTable = sAppletunFormSpeciesIdTable, + .formChangeTable = sAppletunFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -2262,11 +2262,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_APPLETUN, .natDexNum = NATIONAL_DEX_APPLETUN, .categoryName = _("Apple Nectar"), - FOOTPRINT(Appletun) - .levelUpLearnset = sAppletunLevelUpLearnset, - .teachableLearnset = sAppletunTeachableLearnset, - .formSpeciesIdTable = sAppletunFormSpeciesIdTable, - .formChangeTable = sAppletunFormChangeTable, .height = 240, .weight = 0, .description = COMPOUND_STRING( @@ -2291,7 +2286,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_AppletunGigantamax, .iconSprite = gMonIcon_AppletunGigantamax, .iconPalIndex = 1, + FOOTPRINT(Appletun) .isGigantamax = TRUE, + .levelUpLearnset = sAppletunLevelUpLearnset, + .teachableLearnset = sAppletunTeachableLearnset, + .formSpeciesIdTable = sAppletunFormSpeciesIdTable, + .formChangeTable = sAppletunFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -2478,11 +2478,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_SANDACONDA, .natDexNum = NATIONAL_DEX_SANDACONDA, .categoryName = _("Sand Snake"), - FOOTPRINT(Sandaconda) - .levelUpLearnset = sSandacondaLevelUpLearnset, - .teachableLearnset = sSandacondaTeachableLearnset, - .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, - .formChangeTable = sSandacondaFormChangeTable, .height = 38, .weight = 655, .description = COMPOUND_STRING( @@ -2507,6 +2502,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sandaconda, .iconSprite = gMonIcon_Sandaconda, .iconPalIndex = 1, + FOOTPRINT(Sandaconda) + .levelUpLearnset = sSandacondaLevelUpLearnset, + .teachableLearnset = sSandacondaTeachableLearnset, + .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, + .formChangeTable = sSandacondaFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -2533,11 +2533,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_SANDACONDA, .natDexNum = NATIONAL_DEX_SANDACONDA, .categoryName = _("Sand Snake"), - FOOTPRINT(Sandaconda) - .levelUpLearnset = sSandacondaLevelUpLearnset, - .teachableLearnset = sSandacondaTeachableLearnset, - .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, - .formChangeTable = sSandacondaFormChangeTable, .height = 220, .weight = 0, .description = COMPOUND_STRING( @@ -2562,7 +2557,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_SandacondaGigantamax, .iconSprite = gMonIcon_SandacondaGigantamax, .iconPalIndex = 1, + FOOTPRINT(Sandaconda) .isGigantamax = TRUE, + .levelUpLearnset = sSandacondaLevelUpLearnset, + .teachableLearnset = sSandacondaTeachableLearnset, + .formSpeciesIdTable = sSandacondaFormSpeciesIdTable, + .formChangeTable = sSandacondaFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA @@ -2593,19 +2593,14 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Gulp"), .height = 8, .weight = 180, - .pokemonScale = 366, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - FOOTPRINT(Cramorant) - .levelUpLearnset = sCramorantLevelUpLearnset, - .teachableLearnset = sCramorantTeachableLearnset, - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, - .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "It's so strong that it can knock out some\n" "opponents in a single hit, but it also may\n" "forget what it's battling midfight."), + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_Cramorant, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -2619,6 +2614,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Cramorant, .iconSprite = gMonIcon_Cramorant, .iconPalIndex = 0, + FOOTPRINT(Cramorant) + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, + .formChangeTable = sCramorantFormChangeTable, }, [SPECIES_CRAMORANT_GULPING] = @@ -2646,20 +2646,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Gulp"), .height = 8, .weight = 180, - .pokemonScale = 366, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - FOOTPRINT(Cramorant) - .levelUpLearnset = sCramorantLevelUpLearnset, - .teachableLearnset = sCramorantTeachableLearnset, - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, - .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "Cramorant's gluttony led it to try\n" "to swallow an Arrokuda whole, which\n" "in turn led to Cramorant getting an\n" "Arrokuda stuck in its throat."), + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_CramorantGulping, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -2673,6 +2668,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CramorantGulping, .iconSprite = gMonIcon_CramorantGulping, .iconPalIndex = 0, + FOOTPRINT(Cramorant) + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, + .formChangeTable = sCramorantFormChangeTable, }, [SPECIES_CRAMORANT_GORGING] = @@ -2700,20 +2700,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Gulp"), .height = 8, .weight = 180, - .pokemonScale = 366, - .pokemonOffset = 7, - .trainerScale = 257, - .trainerOffset = 0, - FOOTPRINT(Cramorant) - .levelUpLearnset = sCramorantLevelUpLearnset, - .teachableLearnset = sCramorantTeachableLearnset, - .formSpeciesIdTable = sCramorantFormSpeciesIdTable, - .formChangeTable = sCramorantFormChangeTable, .description = COMPOUND_STRING( "This Cramorant has accidentally\n" "gotten a Pikachu lodged in its gullet.\n" "Cramorant is choking a little, but it\n" "isn't really bothered."), + .pokemonScale = 366, + .pokemonOffset = 7, + .trainerScale = 257, + .trainerOffset = 0, .frontPic = gMonFrontPic_CramorantGorging, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -2727,6 +2722,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CramorantGorging, .iconSprite = gMonIcon_CramorantGorging, .iconPalIndex = 0, + FOOTPRINT(Cramorant) + .levelUpLearnset = sCramorantLevelUpLearnset, + .teachableLearnset = sCramorantTeachableLearnset, + .formSpeciesIdTable = sCramorantFormSpeciesIdTable, + .formChangeTable = sCramorantFormChangeTable, }, #endif //P_FAMILY_CRAMORANT @@ -2909,14 +2909,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Toxtricity"), + .cryId = CRY_TOXTRICITY_AMPED, .natDexNum = NATIONAL_DEX_TOXTRICITY, .categoryName = _("Punk"), - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, - .formChangeTable = sToxtricityAmpedFormChangeTable, - .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, - .cryId = CRY_TOXTRICITY_AMPED, .height = 16, .weight = 400, .description = COMPOUND_STRING( @@ -2944,7 +2942,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Toxtricity) .levelUpLearnset = sToxtricityAmpedLevelUpLearnset, .teachableLearnset = sToxtricityAmpedTeachableLearnset, - + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, + .formChangeTable = sToxtricityAmpedFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -2965,14 +2964,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Toxtricity"), + .cryId = CRY_TOXTRICITY_AMPED, .natDexNum = NATIONAL_DEX_TOXTRICITY, .categoryName = _("Punk"), - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, - .formChangeTable = sToxtricityAmpedFormChangeTable, - .abilities = { ABILITY_PUNK_ROCK, ABILITY_PLUS, ABILITY_TECHNICIAN }, - .cryId = CRY_TOXTRICITY_AMPED, .height = 240, .weight = 0, .description = gToxtricityGigantamaxPokedexText, @@ -2994,9 +2991,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ToxtricityGigantamax, .iconPalIndex = 0, FOOTPRINT(Toxtricity) + .isGigantamax = TRUE, .levelUpLearnset = sToxtricityAmpedLevelUpLearnset, .teachableLearnset = sToxtricityAmpedTeachableLearnset, - .isGigantamax = TRUE, + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, + .formChangeTable = sToxtricityAmpedFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -3017,14 +3016,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Toxtricity"), + .cryId = CRY_TOXTRICITY_LOW_KEY, .natDexNum = NATIONAL_DEX_TOXTRICITY, .categoryName = _("Punk"), - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, - .formChangeTable = sToxtricityAmpedFormChangeTable, - .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, - .cryId = CRY_TOXTRICITY_LOW_KEY, .height = 16, .weight = 400, .description = COMPOUND_STRING( @@ -3051,6 +3048,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = FOOTPRINT(Toxtricity) .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, .teachableLearnset = sToxtricityLowKeyTeachableLearnset, + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, + .formChangeTable = sToxtricityAmpedFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -3071,14 +3070,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_MEDIUM_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_HUMAN_LIKE), + .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Toxtricity"), + .cryId = CRY_TOXTRICITY_LOW_KEY, .natDexNum = NATIONAL_DEX_TOXTRICITY, .categoryName = _("Punk"), - .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, - .formChangeTable = sToxtricityAmpedFormChangeTable, - .abilities = { ABILITY_PUNK_ROCK, ABILITY_MINUS, ABILITY_TECHNICIAN }, - .cryId = CRY_TOXTRICITY_LOW_KEY, .height = 240, .weight = 0, .description = gToxtricityGigantamaxPokedexText, @@ -3100,9 +3097,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ToxtricityGigantamax, .iconPalIndex = 0, FOOTPRINT(Toxtricity) + .isGigantamax = TRUE, .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, .teachableLearnset = sToxtricityLowKeyTeachableLearnset, - .isGigantamax = TRUE, + .formSpeciesIdTable = sToxtricityFormSpeciesIdTable, + .formChangeTable = sToxtricityAmpedFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL @@ -3183,11 +3182,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CENTISKORCH, .natDexNum = NATIONAL_DEX_CENTISKORCH, .categoryName = _("Radiator"), - FOOTPRINT(Centiskorch) - .levelUpLearnset = sCentiskorchLevelUpLearnset, - .teachableLearnset = sCentiskorchTeachableLearnset, - .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, - .formChangeTable = sCentiskorchFormChangeTable, .height = 30, .weight = 1200, .description = COMPOUND_STRING( @@ -3212,6 +3206,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Centiskorch, .iconSprite = gMonIcon_Centiskorch, .iconPalIndex = 0, + FOOTPRINT(Centiskorch) + .levelUpLearnset = sCentiskorchLevelUpLearnset, + .teachableLearnset = sCentiskorchTeachableLearnset, + .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, + .formChangeTable = sCentiskorchFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -3238,11 +3237,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_CENTISKORCH, .natDexNum = NATIONAL_DEX_CENTISKORCH, .categoryName = _("Radiator"), - FOOTPRINT(Centiskorch) - .levelUpLearnset = sCentiskorchLevelUpLearnset, - .teachableLearnset = sCentiskorchTeachableLearnset, - .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, - .formChangeTable = sCentiskorchFormChangeTable, .height = 750, .weight = 0, .description = COMPOUND_STRING( @@ -3267,7 +3261,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CentiskorchGigantamax, .iconSprite = gMonIcon_CentiskorchGigantamax, .iconPalIndex = 0, + FOOTPRINT(Centiskorch) .isGigantamax = TRUE, + .levelUpLearnset = sCentiskorchLevelUpLearnset, + .teachableLearnset = sCentiskorchTeachableLearnset, + .formSpeciesIdTable = sCentiskorchFormSpeciesIdTable, + .formChangeTable = sCentiskorchFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE @@ -3404,6 +3403,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Black Tea"), .height = 1, .weight = 2, + .description = COMPOUND_STRING( + "This Pokémon is said to have been born\n" + "when a lonely spirit possessed a cold,\n" + "leftover cup of tea."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, @@ -3413,6 +3416,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 9, .backPic = gMonBackPic_Sinistea, .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, @@ -3425,11 +3429,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sSinisteaLevelUpLearnset, .teachableLearnset = sSinisteaTeachableLearnset, .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, - .description = COMPOUND_STRING( - "This Pokémon is said to have been born\n" - "when a lonely spirit possessed a cold,\n" - "leftover cup of tea."), - .enemyMonElevation = 9, .evolutions = EVOLUTION({EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST_PHONY}), }, @@ -3458,6 +3457,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Black Tea"), .height = 1, .weight = 2, + .description = COMPOUND_STRING( + "The swirl pattern in this Pokémon's\n" + "body is its weakness. If it gets\n" + "stirred, the swirl loses its shape, and\n" + "Sinistea gets dizzy."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, @@ -3467,6 +3471,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPicYOffset = 17, .frontAnimFrames = sAnims_Sinistea, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistea, .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 16, @@ -3479,12 +3484,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sSinisteaLevelUpLearnset, .teachableLearnset = sSinisteaTeachableLearnset, .formSpeciesIdTable = sSinisteaFormSpeciesIdTable, - .description = COMPOUND_STRING( - "The swirl pattern in this Pokémon's\n" - "body is its weakness. If it gets\n" - "stirred, the swirl loses its shape, and\n" - "Sinistea gets dizzy."), - .enemyMonElevation = 10, .evolutions = EVOLUTION({EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_ANTIQUE}), }, @@ -3513,6 +3512,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Black Tea"), .height = 2, .weight = 4, + .description = COMPOUND_STRING( + "This species lives in antique teapots.\n" + "Most pots are forgeries, but on rare\n" + "occasions, an authentic work is found."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, @@ -3522,6 +3525,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPicYOffset = 11, .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 12, .backPic = gMonBackPic_Polteageist, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, @@ -3534,11 +3538,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sPolteageistLevelUpLearnset, .teachableLearnset = sPolteageistTeachableLearnset, .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, - .description = COMPOUND_STRING( - "This species lives in antique teapots.\n" - "Most pots are forgeries, but on rare\n" - "occasions, an authentic work is found."), - .enemyMonElevation = 12, }, [SPECIES_POLTEAGEIST_ANTIQUE] = @@ -3566,6 +3565,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .categoryName = _("Black Tea"), .height = 2, .weight = 4, + .description = COMPOUND_STRING( + "Trainers Polteageist trusts will be\n" + "allowed to experience its\n" + "distinctive flavor and aroma firsthand by\n" + "sampling just a tiny bit of its tea."), .pokemonScale = 682, .pokemonOffset = 24, .trainerScale = 256, @@ -3575,6 +3579,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPicYOffset = 11, .frontAnimFrames = sAnims_Polteageist, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + .enemyMonElevation = 11, .backPic = gMonBackPic_Polteageist, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, @@ -3587,12 +3592,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .levelUpLearnset = sPolteageistLevelUpLearnset, .teachableLearnset = sPolteageistTeachableLearnset, .formSpeciesIdTable = sPolteageistFormSpeciesIdTable, - .description = COMPOUND_STRING( - "Trainers Polteageist trusts will be\n" - "allowed to experience its\n" - "distinctive flavor and aroma firsthand by\n" - "sampling just a tiny bit of its tea."), - .enemyMonElevation = 11, }, #endif //P_FAMILY_SINISTEA @@ -3725,11 +3724,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_HATTERENE, .natDexNum = NATIONAL_DEX_HATTERENE, .categoryName = _("Silent"), - FOOTPRINT(Hatterene) - .levelUpLearnset = sHattereneLevelUpLearnset, - .teachableLearnset = sHattereneTeachableLearnset, - .formSpeciesIdTable = sHattereneFormSpeciesIdTable, - .formChangeTable = sHattereneFormChangeTable, .height = 21, .weight = 51, .description = COMPOUND_STRING( @@ -3753,6 +3747,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Hatterene, .iconSprite = gMonIcon_Hatterene, .iconPalIndex = 0, + FOOTPRINT(Hatterene) + .levelUpLearnset = sHattereneLevelUpLearnset, + .teachableLearnset = sHattereneTeachableLearnset, + .formSpeciesIdTable = sHattereneFormSpeciesIdTable, + .formChangeTable = sHattereneFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -3779,11 +3778,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_HATTERENE, .natDexNum = NATIONAL_DEX_HATTERENE, .categoryName = _("Silent"), - FOOTPRINT(Hatterene) - .levelUpLearnset = sHattereneLevelUpLearnset, - .teachableLearnset = sHattereneTeachableLearnset, - .formSpeciesIdTable = sHattereneFormSpeciesIdTable, - .formChangeTable = sHattereneFormChangeTable, .height = 260, .weight = 0, .description = COMPOUND_STRING( @@ -3808,7 +3802,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_HattereneGigantamax, .iconSprite = gMonIcon_HattereneGigantamax, .iconPalIndex = 0, + FOOTPRINT(Hatterene) .isGigantamax = TRUE, + .levelUpLearnset = sHattereneLevelUpLearnset, + .teachableLearnset = sHattereneTeachableLearnset, + .formSpeciesIdTable = sHattereneFormSpeciesIdTable, + .formChangeTable = sHattereneFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA @@ -3944,11 +3943,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_GRIMMSNARL, .natDexNum = NATIONAL_DEX_GRIMMSNARL, .categoryName = _("Bulk Up"), - FOOTPRINT(Grimmsnarl) - .levelUpLearnset = sGrimmsnarlLevelUpLearnset, - .teachableLearnset = sGrimmsnarlTeachableLearnset, - .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, - .formChangeTable = sGrimmsnarlFormChangeTable, .height = 15, .weight = 610, .description = COMPOUND_STRING( @@ -3972,6 +3966,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Grimmsnarl, .iconSprite = gMonIcon_Grimmsnarl, .iconPalIndex = 0, + FOOTPRINT(Grimmsnarl) + .levelUpLearnset = sGrimmsnarlLevelUpLearnset, + .teachableLearnset = sGrimmsnarlTeachableLearnset, + .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, + .formChangeTable = sGrimmsnarlFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -3998,11 +3997,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_GRIMMSNARL, .natDexNum = NATIONAL_DEX_GRIMMSNARL, .categoryName = _("Bulk Up"), - FOOTPRINT(Grimmsnarl) - .levelUpLearnset = sGrimmsnarlLevelUpLearnset, - .teachableLearnset = sGrimmsnarlTeachableLearnset, - .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, - .formChangeTable = sGrimmsnarlFormChangeTable, .height = 320, .weight = 0, .description = COMPOUND_STRING( @@ -4027,7 +4021,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_GrimmsnarlGigantamax, .iconSprite = gMonIcon_GrimmsnarlGigantamax, .iconPalIndex = 0, + FOOTPRINT(Grimmsnarl) .isGigantamax = TRUE, + .levelUpLearnset = sGrimmsnarlLevelUpLearnset, + .teachableLearnset = sGrimmsnarlTeachableLearnset, + .formSpeciesIdTable = sGrimmsnarlFormSpeciesIdTable, + .formChangeTable = sGrimmsnarlFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP @@ -4214,7 +4213,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = [SPECIES_ALCREMIE_GIGANTAMAX] = { ALCREMIE_MISC_INFO(BODY_COLOR_YELLOW), - .isGigantamax = TRUE, .speciesName = _("Alcremie"), .cryId = CRY_ALCREMIE, .natDexNum = NATIONAL_DEX_ALCREMIE, @@ -4244,6 +4242,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_AlcremieGigantamax, .iconPalIndex = 1, FOOTPRINT(Alcremie) + .isGigantamax = TRUE, .levelUpLearnset = sAlcremieLevelUpLearnset, .teachableLearnset = sAlcremieTeachableLearnset, .formSpeciesIdTable = sAlcremieFormSpeciesIdTable, @@ -4542,25 +4541,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Eiscue"), + .cryId = CRY_EISCUE_ICE_FACE, .natDexNum = NATIONAL_DEX_EISCUE, .categoryName = _("Penguin"), .height = 14, .weight = 890, - .pokemonScale = 265, - .pokemonOffset = 2, - .trainerScale = 262, - .trainerOffset = 0, - FOOTPRINT(Eiscue) - .levelUpLearnset = sEiscueLevelUpLearnset, - .teachableLearnset = sEiscueTeachableLearnset, - .formSpeciesIdTable = sEiscueFormSpeciesIdTable, - .formChangeTable = sEiscueFormChangeTable, - .cryId = CRY_EISCUE_ICE_FACE, .description = COMPOUND_STRING( "It drifted in on the flow of ocean waters\n" "from a frigid place. It keeps its head\n" "iced constantly to make sure it stays\n" "nice and cold."), + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, .frontPic = gMonFrontPic_EiscueIceFace, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, @@ -4574,6 +4568,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EiscueIceFace, .iconSprite = gMonIcon_EiscueIceFace, .iconPalIndex = 0, + FOOTPRINT(Eiscue) + .levelUpLearnset = sEiscueLevelUpLearnset, + .teachableLearnset = sEiscueTeachableLearnset, + .formSpeciesIdTable = sEiscueFormSpeciesIdTable, + .formChangeTable = sEiscueFormChangeTable, }, [SPECIES_EISCUE_NOICE_FACE] = @@ -4596,25 +4595,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_ICE_FACE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Eiscue"), + .cryId = CRY_EISCUE_NOICE_FACE, .natDexNum = NATIONAL_DEX_EISCUE, .categoryName = _("Penguin"), .height = 14, .weight = 890, - .pokemonScale = 265, - .pokemonOffset = 2, - .trainerScale = 262, - .trainerOffset = 0, - FOOTPRINT(Eiscue) - .levelUpLearnset = sEiscueLevelUpLearnset, - .teachableLearnset = sEiscueTeachableLearnset, - .formSpeciesIdTable = sEiscueFormSpeciesIdTable, - .formChangeTable = sEiscueFormChangeTable, - .cryId = CRY_EISCUE_NOICE_FACE, .description = COMPOUND_STRING( "The hair on its head connects to\n" "the surface of its brain. When this\n" "Pokémon has something on its mind,\n" "its hair chills the air around it."), + .pokemonScale = 265, + .pokemonOffset = 2, + .trainerScale = 262, + .trainerOffset = 0, .frontPic = gMonFrontPic_EiscueNoiceFace, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, @@ -4628,6 +4622,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EiscueNoiceFace, .iconSprite = gMonIcon_EiscueNoiceFace, .iconPalIndex = 0, + FOOTPRINT(Eiscue) + .levelUpLearnset = sEiscueLevelUpLearnset, + .teachableLearnset = sEiscueTeachableLearnset, + .formSpeciesIdTable = sEiscueFormSpeciesIdTable, + .formChangeTable = sEiscueFormChangeTable, }, #endif //P_FAMILY_EISCUE @@ -4644,30 +4643,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 30, .expYield = 166, .evYield_SpAttack = 2, + .genderRatio = MON_MALE, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .abilities = { ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Indeedee"), + .cryId = CRY_INDEEDEE_MALE, .natDexNum = NATIONAL_DEX_INDEEDEE, .categoryName = _("Emotion"), .height = 9, .weight = 280, - .pokemonScale = 338, - .pokemonOffset = 8, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Indeedee) - .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, - .genderRatio = MON_MALE, - .abilities = { ABILITY_INNER_FOCUS, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, - .cryId = CRY_INDEEDEE_MALE, .description = COMPOUND_STRING( "It uses the horns on its head to sense the\n" "emotions of others. Males will act as\n" "valets for those they serve, looking\n" "after their every need."), + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_IndeedeeMale, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 9, @@ -4681,8 +4678,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_IndeedeeMale, .iconSprite = gMonIcon_IndeedeeMale, .iconPalIndex = 2, + FOOTPRINT(Indeedee) .levelUpLearnset = sIndeedeeMaleLevelUpLearnset, .teachableLearnset = sIndeedeeMaleTeachableLearnset, + .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, }, [SPECIES_INDEEDEE_FEMALE] = @@ -4697,30 +4696,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 30, .expYield = 166, .evYield_SpDefense = 2, + .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FAIRY), + .abilities = { ABILITY_OWN_TEMPO, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, .bodyColor = BODY_COLOR_PURPLE, .speciesName = _("Indeedee"), + .cryId = CRY_INDEEDEE_FEMALE, .natDexNum = NATIONAL_DEX_INDEEDEE, .categoryName = _("Emotion"), .height = 9, .weight = 280, - .pokemonScale = 338, - .pokemonOffset = 8, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Indeedee) - .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, - .genderRatio = MON_FEMALE, - .abilities = { ABILITY_OWN_TEMPO, ABILITY_SYNCHRONIZE, ABILITY_PSYCHIC_SURGE }, - .cryId = CRY_INDEEDEE_FEMALE, .description = COMPOUND_STRING( "They diligently serve people and\n" "Pokémon so they can gather feelings\n" "of gratitude. The females are\n" "particularly good at babysitting."), + .pokemonScale = 338, + .pokemonOffset = 8, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_IndeedeeFemale, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, @@ -4734,8 +4731,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_IndeedeeFemale, .iconSprite = gMonIcon_IndeedeeFemale, .iconPalIndex = 2, + FOOTPRINT(Indeedee) .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, .teachableLearnset = sIndeedeeFemaleTeachableLearnset, + .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, }, #endif //P_FAMILY_INDEEDEE @@ -4760,25 +4759,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Morpeko"), + .cryId = CRY_MORPEKO_FULL_BELLY, .natDexNum = NATIONAL_DEX_MORPEKO, .categoryName = _("Two-Sided"), .height = 3, .weight = 30, - .pokemonScale = 530, - .pokemonOffset = 13, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Morpeko) - .levelUpLearnset = sMorpekoLevelUpLearnset, - .teachableLearnset = sMorpekoTeachableLearnset, - .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, - .formChangeTable = sMorpekoFormChangeTable, - .cryId = CRY_MORPEKO_FULL_BELLY, .description = COMPOUND_STRING( "As it eats the seeds stored up in its\n" "pocket-like pouches, this Pokémon is not\n" "just satisfying its constant hunger. It's\n" "also generating electricity."), + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MorpekoFullBelly, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, @@ -4792,10 +4786,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_MorpekoFullBelly, .iconSprite = gMonIcon_MorpekoFullBelly, .iconPalIndex = 2, - }, - - [SPECIES_MORPEKO_HANGRY] = - { + FOOTPRINT(Morpeko) + .levelUpLearnset = sMorpekoLevelUpLearnset, + .teachableLearnset = sMorpekoTeachableLearnset, + .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, + .formChangeTable = sMorpekoFormChangeTable, + }, + + [SPECIES_MORPEKO_HANGRY] = + { .baseHP = 58, .baseAttack = 95, .baseDefense = 58, @@ -4814,25 +4813,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_HUNGER_SWITCH, ABILITY_NONE }, .bodyColor = BODY_COLOR_YELLOW, .speciesName = _("Morpeko"), + .cryId = CRY_MORPEKO_HANGRY, .natDexNum = NATIONAL_DEX_MORPEKO, .categoryName = _("Two-Sided"), .height = 3, .weight = 30, - .pokemonScale = 530, - .pokemonOffset = 13, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Morpeko) - .levelUpLearnset = sMorpekoLevelUpLearnset, - .teachableLearnset = sMorpekoTeachableLearnset, - .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, - .formChangeTable = sMorpekoFormChangeTable, - .cryId = CRY_MORPEKO_HANGRY, .description = COMPOUND_STRING( "Intense hunger drives it to\n" "extremes of violence, and the electricity\n" "in its cheek sacs has converted into\n" "a Dark-type energy."), + .pokemonScale = 530, + .pokemonOffset = 13, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_MorpekoHangry, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, @@ -4846,6 +4840,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_MorpekoHangry, .iconSprite = gMonIcon_MorpekoHangry, .iconPalIndex = 2, + FOOTPRINT(Morpeko) + .levelUpLearnset = sMorpekoLevelUpLearnset, + .teachableLearnset = sMorpekoTeachableLearnset, + .formSpeciesIdTable = sMorpekoFormSpeciesIdTable, + .formChangeTable = sMorpekoFormChangeTable, }, #endif //P_FAMILY_MORPEKO @@ -4934,11 +4933,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "They came over from another region long\n" "ago and worked together with humans.\n" "Their green skin is resistant to water."), - FOOTPRINT(Copperajah) - .levelUpLearnset = sCopperajahLevelUpLearnset, - .teachableLearnset = sCopperajahTeachableLearnset, - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, - .formChangeTable = sCopperajahFormChangeTable, .pokemonScale = 275, .pokemonOffset = 7, .trainerScale = 256, @@ -4956,6 +4950,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Copperajah, .iconSprite = gMonIcon_Copperajah, .iconPalIndex = 0, + FOOTPRINT(Copperajah) + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, + .formChangeTable = sCopperajahFormChangeTable, }, #if P_GIGANTAMAX_FORMS @@ -4996,11 +4995,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CopperajahGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), - FOOTPRINT(Copperajah) - .levelUpLearnset = sCopperajahLevelUpLearnset, - .teachableLearnset = sCopperajahTeachableLearnset, - .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, - .formChangeTable = sCopperajahFormChangeTable, .frontPicYOffset = 2, .frontAnimFrames = sAnims_CopperajahGigantamax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -5012,7 +5006,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CopperajahGigantamax, .iconSprite = gMonIcon_CopperajahGigantamax, .iconPalIndex = 0, + FOOTPRINT(Copperajah) .isGigantamax = TRUE, + .levelUpLearnset = sCopperajahLevelUpLearnset, + .teachableLearnset = sCopperajahTeachableLearnset, + .formSpeciesIdTable = sCopperajahFormSpeciesIdTable, + .formChangeTable = sCopperajahFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT @@ -5256,11 +5255,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DURALUDON, .natDexNum = NATIONAL_DEX_DURALUDON, .categoryName = _("Alloy"), - FOOTPRINT(Duraludon) - .levelUpLearnset = sDuraludonLevelUpLearnset, - .teachableLearnset = sDuraludonTeachableLearnset, - .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, - .formChangeTable = sDuraludonFormChangeTable, .height = 18, .weight = 400, .description = COMPOUND_STRING( @@ -5284,6 +5278,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Duraludon, .iconSprite = gMonIcon_Duraludon, .iconPalIndex = 0, + FOOTPRINT(Duraludon) + .levelUpLearnset = sDuraludonLevelUpLearnset, + .teachableLearnset = sDuraludonTeachableLearnset, + .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, + .formChangeTable = sDuraludonFormChangeTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}), }, @@ -5311,11 +5310,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .cryId = CRY_DURALUDON, .natDexNum = NATIONAL_DEX_DURALUDON, .categoryName = _("Alloy"), - FOOTPRINT(Duraludon) - .levelUpLearnset = sDuraludonLevelUpLearnset, - .teachableLearnset = sDuraludonTeachableLearnset, - .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, - .formChangeTable = sDuraludonFormChangeTable, .height = 430, .weight = 0, .description = COMPOUND_STRING( @@ -5340,7 +5334,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_DuraludonGigantamax, .iconSprite = gMonIcon_DuraludonGigantamax, .iconPalIndex = 0, + FOOTPRINT(Duraludon) .isGigantamax = TRUE, + .levelUpLearnset = sDuraludonLevelUpLearnset, + .teachableLearnset = sDuraludonTeachableLearnset, + .formSpeciesIdTable = sDuraludonFormSpeciesIdTable, + .formChangeTable = sDuraludonFormChangeTable, }, #endif //P_GIGANTAMAX_FORMS @@ -5581,26 +5580,20 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Zacian"), + .cryId = CRY_ZACIAN_HERO_OF_MANY_BATTLES, .natDexNum = NATIONAL_DEX_ZACIAN, .categoryName = _("Warrior"), .height = 28, - .pokemonScale = 275, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zacian) - .levelUpLearnset = sZacianLevelUpLearnset, - .teachableLearnset = sZacianTeachableLearnset, - .formSpeciesIdTable = sZacianFormSpeciesIdTable, - .formChangeTable = sZacianFormChangeTable, - .cryId = CRY_ZACIAN_HERO_OF_MANY_BATTLES, .weight = 1100, .description = COMPOUND_STRING( "Known as a legendary hero, this Pokémon\n" "absorbs metal particles, transforming them\n" "into a weapon it uses to battle."), + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZacianHeroOfManyBattles, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -5614,6 +5607,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZacianHeroOfManyBattles, .iconSprite = gMonIcon_ZacianHeroOfManyBattles, .iconPalIndex = 2, + FOOTPRINT(Zacian) + .isLegendary = TRUE, + .levelUpLearnset = sZacianLevelUpLearnset, + .teachableLearnset = sZacianTeachableLearnset, + .formSpeciesIdTable = sZacianFormSpeciesIdTable, + .formChangeTable = sZacianFormChangeTable, }, [SPECIES_ZACIAN_CROWNED_SWORD] = @@ -5635,27 +5634,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, - .isLegendary = TRUE, .speciesName = _("Zacian"), + .cryId = CRY_ZACIAN_CROWNED_SWORD, .natDexNum = NATIONAL_DEX_ZACIAN, .categoryName = _("Warrior"), .height = 28, - .pokemonScale = 275, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zacian) - .levelUpLearnset = sZacianLevelUpLearnset, - .teachableLearnset = sZacianTeachableLearnset, - .formSpeciesIdTable = sZacianFormSpeciesIdTable, - .formChangeTable = sZacianFormChangeTable, - .cryId = CRY_ZACIAN_CROWNED_SWORD, .weight = 3550, .description = COMPOUND_STRING( "Able to cut down anything with a\n" "single strike, it became known as the\n" "Fairy King's Sword, and it inspired\n" "awe in friend and foe alike."), + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZacianCrownedSword, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -5669,6 +5662,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZacianCrownedSword, .iconSprite = gMonIcon_ZacianCrownedSword, .iconPalIndex = 2, + FOOTPRINT(Zacian) + .isLegendary = TRUE, + .levelUpLearnset = sZacianLevelUpLearnset, + .teachableLearnset = sZacianTeachableLearnset, + .formSpeciesIdTable = sZacianFormSpeciesIdTable, + .formChangeTable = sZacianFormChangeTable, }, #endif //P_FAMILY_ZACIAN @@ -5692,27 +5691,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Zamazenta"), + .cryId = CRY_ZAMAZENTA_HERO_OF_MANY_BATTLES, .natDexNum = NATIONAL_DEX_ZAMAZENTA, .categoryName = _("Warrior"), .height = 29, - .pokemonScale = 275, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zamazenta) - .levelUpLearnset = sZamazentaLevelUpLearnset, - .teachableLearnset = sZamazentaTeachableLearnset, - .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, - .formChangeTable = sZamazentaFormChangeTable, - .cryId = CRY_ZAMAZENTA_HERO_OF_MANY_BATTLES, .weight = 2100, .description = COMPOUND_STRING( "In times past, it worked together with a\n" "king of the people to save the Galar\n" "region. It absorbs metal that it then\n" "uses in battle."), + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZamazentaHeroOfManyBattles, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -5726,6 +5719,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZamazentaHeroOfManyBattles, .iconSprite = gMonIcon_ZamazentaHeroOfManyBattles, .iconPalIndex = 2, + FOOTPRINT(Zamazenta) + .isLegendary = TRUE, + .levelUpLearnset = sZamazentaLevelUpLearnset, + .teachableLearnset = sZamazentaTeachableLearnset, + .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, + .formChangeTable = sZamazentaFormChangeTable, }, [SPECIES_ZAMAZENTA_CROWNED_SHIELD] = @@ -5747,27 +5746,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, - .isLegendary = TRUE, .speciesName = _("Zamazenta"), + .cryId = CRY_ZAMAZENTA_CROWNED_SHIELD, .natDexNum = NATIONAL_DEX_ZAMAZENTA, .categoryName = _("Warrior"), .height = 29, - .pokemonScale = 275, - .pokemonOffset = 7, - .trainerScale = 256, - .trainerOffset = 0, - FOOTPRINT(Zamazenta) - .levelUpLearnset = sZamazentaLevelUpLearnset, - .teachableLearnset = sZamazentaTeachableLearnset, - .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, - .formChangeTable = sZamazentaFormChangeTable, - .cryId = CRY_ZAMAZENTA_CROWNED_SHIELD, .weight = 7850, .description = COMPOUND_STRING( "Its ability to deflect any attack\n" "led to it being known as the Fighting\n" "Master's Shield. It was feared and\n" "respected by all."), + .pokemonScale = 275, + .pokemonOffset = 7, + .trainerScale = 256, + .trainerOffset = 0, .frontPic = gMonFrontPic_ZamazentaCrownedShield, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, @@ -5781,6 +5774,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZamazentaCrownedShield, .iconSprite = gMonIcon_ZamazentaCrownedShield, .iconPalIndex = 2, + FOOTPRINT(Zamazenta) + .isLegendary = TRUE, + .levelUpLearnset = sZamazentaLevelUpLearnset, + .teachableLearnset = sZamazentaTeachableLearnset, + .formSpeciesIdTable = sZamazentaFormSpeciesIdTable, + .formChangeTable = sZamazentaFormChangeTable, }, #endif //P_FAMILY_ZAMAZENTA @@ -5804,26 +5803,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isLegendary = TRUE, .speciesName = _("Eternatus"), + .cryId = CRY_ETERNATUS, .natDexNum = NATIONAL_DEX_ETERNATUS, .categoryName = _("Gigantic"), - FOOTPRINT(Eternatus) - .levelUpLearnset = sEternatusLevelUpLearnset, - .teachableLearnset = sEternatusTeachableLearnset, - .formSpeciesIdTable = sEternatusFormSpeciesIdTable, - .cryId = CRY_ETERNATUS, .height = 200, .weight = 9500, - .pokemonScale = 230, - .pokemonOffset = 0, - .trainerScale = 4852, - .trainerOffset = 20, .description = COMPOUND_STRING( "The core on its chest absorbs energy\n" "emanating from the lands of the Galar\n" "region. This energy is what allows\n" "Eternatus to stay active."), + .pokemonScale = 230, + .pokemonOffset = 0, + .trainerScale = 4852, + .trainerOffset = 20, .frontPic = gMonFrontPic_Eternatus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -5838,6 +5832,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Eternatus, .iconSprite = gMonIcon_Eternatus, .iconPalIndex = 0, + FOOTPRINT(Eternatus) + .isLegendary = TRUE, + .levelUpLearnset = sEternatusLevelUpLearnset, + .teachableLearnset = sEternatusTeachableLearnset, + .formSpeciesIdTable = sEternatusFormSpeciesIdTable, }, [SPECIES_ETERNATUS_ETERNAMAX] = @@ -5859,26 +5858,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_PRESSURE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PURPLE, - .isLegendary = TRUE, .speciesName = _("Eternatus"), + .cryId = CRY_ETERNATUS_ETERNAMAX, .natDexNum = NATIONAL_DEX_ETERNATUS, .categoryName = _("Gigantic"), - FOOTPRINT(Eternatus) - .levelUpLearnset = sEternatusLevelUpLearnset, - .teachableLearnset = sEternatusTeachableLearnset, - .formSpeciesIdTable = sEternatusFormSpeciesIdTable, - .cryId = CRY_ETERNATUS_ETERNAMAX, .height = 1000, .weight = 0, - .pokemonScale = 230, - .pokemonOffset = 0, - .trainerScale = 4852, - .trainerOffset = 20, .description = COMPOUND_STRING( "As a result of Rose's meddling,\n" "Eternatus absorbed all the energy in\n" "the Galar region. It's now in a state\n" "of power overload."), + .pokemonScale = 230, + .pokemonOffset = 0, + .trainerScale = 4852, + .trainerOffset = 20, .frontPic = gMonFrontPic_EternatusEternamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -5893,6 +5887,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EternatusEternamax, .iconSprite = gMonIcon_EternatusEternamax, .iconPalIndex = 0, + FOOTPRINT(Eternatus) + .isLegendary = TRUE, + .levelUpLearnset = sEternatusLevelUpLearnset, + .teachableLearnset = sEternatusTeachableLearnset, + .formSpeciesIdTable = sEternatusFormSpeciesIdTable, }, #endif //P_FAMILY_ETERNATUS @@ -5916,7 +5915,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_INNER_FOCUS, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Kubfu"), .cryId = CRY_KUBFU, .natDexNum = NATIONAL_DEX_KUBFU, @@ -5945,6 +5943,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Kubfu, .iconPalIndex = 1, FOOTPRINT(Kubfu) + .isLegendary = TRUE, .levelUpLearnset = sKubfuLevelUpLearnset, .teachableLearnset = sKubfuTeachableLearnset, .evolutions = EVOLUTION({EVO_DARK_SCROLL, 0, SPECIES_URSHIFU_SINGLE_STRIKE_STYLE}, @@ -5965,9 +5964,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 275, .evYield_Attack = 3, - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -5975,23 +5971,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Urshifu"), + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), - FOOTPRINT(Urshifu) - .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, .description = COMPOUND_STRING( "This form of Urshifu is a strong believer\n" "in the one-hit KO. Its strategy is to leap\n" "in close to foes and land a devastating\n" "blow with a hardened fist."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_UrshifuSingleStrikeStyle, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, @@ -6005,6 +5999,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyle, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, + FOOTPRINT(Urshifu) + .isLegendary = TRUE, + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .formChangeTable = sUrshifuSingleStrikeFormChangeTable, }, @@ -6021,9 +6020,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 275, .evYield_Attack = 3, - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6031,23 +6027,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Urshifu"), + .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), - FOOTPRINT(Urshifu) - .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 290, .weight = 0, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, .description = COMPOUND_STRING( "People call it the embodiment of\n" "rage. It's said that this Pokémon's\n" "terrifying expression and shout will\n" "rid the world of malevolence."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_UrshifuSingleStrikeStyleGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6061,7 +6055,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax, .iconSprite = gMonIcon_UrshifuSingleStrikeStyleGigantamax, .iconPalIndex = 0, + FOOTPRINT(Urshifu) + .isLegendary = TRUE, .isGigantamax = TRUE, + .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, }, #endif //P_GIGANTAMAX_FORMS @@ -6077,9 +6076,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 275, .evYield_Attack = 3, - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6087,23 +6083,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Urshifu"), + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), - FOOTPRINT(Urshifu) - .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 19, .weight = 1050, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, .description = COMPOUND_STRING( "This form of Urshifu is a strong\n" "believer in defeating foes by raining\n" "many blows down on them. Its\n" "strikes are nonstop, flowing like a river."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_UrshifuRapidStrikeStyle, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, @@ -6117,6 +6111,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyle, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, + FOOTPRINT(Urshifu) + .isLegendary = TRUE, + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .formChangeTable = sUrshifuRapidStrikeFormChangeTable, }, @@ -6133,9 +6132,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 275, .evYield_Attack = 3, - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 120, .friendship = STANDARD_FRIENDSHIP, @@ -6143,23 +6139,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, - .isLegendary = TRUE, .speciesName = _("Urshifu"), + .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), - FOOTPRINT(Urshifu) - .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .height = 260, .weight = 0, - .pokemonScale = 256, - .pokemonOffset = 1, - .trainerScale = 326, - .trainerOffset = 4, .description = COMPOUND_STRING( "As it waits for the right moment to\n" "unleash its Gigantamax power, this\n" "Pokémon maintains a perfect one-\n" "legged stance. It won't even twitch."), + .pokemonScale = 256, + .pokemonOffset = 1, + .trainerScale = 326, + .trainerOffset = 4, .frontPic = gMonFrontPic_UrshifuRapidStrikeStyleGigantamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6173,7 +6167,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax, .iconSprite = gMonIcon_UrshifuRapidStrikeStyleGigantamax, .iconPalIndex = 0, + FOOTPRINT(Urshifu) + .isLegendary = TRUE, .isGigantamax = TRUE, + .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, + .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, }, #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU @@ -6199,26 +6198,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isMythical = TRUE, .speciesName = _("Zarude"), .cryId = CRY_ZARUDE, .natDexNum = NATIONAL_DEX_ZARUDE, .categoryName = _("Rogue Monkey"), .height = 18, .weight = 700, - .pokemonScale = 267, - .pokemonOffset = 2, - .trainerScale = 286, - .trainerOffset = 1, - FOOTPRINT(Zarude) - .levelUpLearnset = sZarudeLevelUpLearnset, - .teachableLearnset = sZarudeTeachableLearnset, - .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "Within dense forests, this Pokémon lives\n" "in a pack with others of its kind. It's\n" "incredibly aggressive, and the other\n" "Pokémon of the forest fear it."), + .pokemonScale = 267, + .pokemonOffset = 2, + .trainerScale = 286, + .trainerOffset = 1, .frontPic = gMonFrontPic_Zarude, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -6232,6 +6226,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Zarude, .iconSprite = gMonIcon_Zarude, .iconPalIndex = 1, + FOOTPRINT(Zarude) + .isMythical = TRUE, + .levelUpLearnset = sZarudeLevelUpLearnset, + .teachableLearnset = sZarudeTeachableLearnset, + .formSpeciesIdTable = sZarudeFormSpeciesIdTable, }, [SPECIES_ZARUDE_DADA] = { @@ -6252,26 +6251,21 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_LEAF_GUARD, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isMythical = TRUE, .speciesName = _("Zarude"), .cryId = CRY_ZARUDE, .natDexNum = NATIONAL_DEX_ZARUDE, .categoryName = _("Rogue Monkey"), .height = 18, .weight = 700, - .pokemonScale = 267, - .pokemonOffset = 2, - .trainerScale = 286, - .trainerOffset = 1, - FOOTPRINT(Zarude) - .levelUpLearnset = sZarudeLevelUpLearnset, - .teachableLearnset = sZarudeTeachableLearnset, - .formSpeciesIdTable = sZarudeFormSpeciesIdTable, .description = COMPOUND_STRING( "This Zarude's special strength\n" "stems from its love and care for an\n" "orphaned human child that the Pokémon\n" "has raised."), + .pokemonScale = 267, + .pokemonOffset = 2, + .trainerScale = 286, + .trainerOffset = 1, .frontPic = gMonFrontPic_ZarudeDada, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, @@ -6285,6 +6279,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZarudeDada, .iconSprite = gMonIcon_ZarudeDada, .iconPalIndex = 1, + FOOTPRINT(Zarude) + .isMythical = TRUE, + .levelUpLearnset = sZarudeLevelUpLearnset, + .teachableLearnset = sZarudeTeachableLearnset, + .formSpeciesIdTable = sZarudeFormSpeciesIdTable, }, #endif //P_FAMILY_ZARUDE @@ -6338,9 +6337,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Regieleki, .iconPalIndex = 0, FOOTPRINT(Regieleki) + .isLegendary = TRUE, .levelUpLearnset = sRegielekiLevelUpLearnset, .teachableLearnset = sRegielekiTeachableLearnset, - .isLegendary = TRUE, }, #endif //P_FAMILY_REGIELEKI @@ -6364,7 +6363,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_DRAGONS_MAW, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, - .isLegendary = TRUE, .speciesName = _("Regidrago"), .cryId = CRY_REGIDRAGO, .natDexNum = NATIONAL_DEX_REGIDRAGO, @@ -6395,6 +6393,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Regidrago, .iconPalIndex = 0, FOOTPRINT(Regidrago) + .isLegendary = TRUE, .levelUpLearnset = sRegidragoLevelUpLearnset, .teachableLearnset = sRegidragoTeachableLearnset, }, @@ -6420,7 +6419,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_CHILLING_NEIGH, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, - .isLegendary = TRUE, .speciesName = _("Glastrier"), .cryId = CRY_GLASTRIER, .natDexNum = NATIONAL_DEX_GLASTRIER, @@ -6449,6 +6447,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Glastrier, .iconPalIndex = 0, FOOTPRINT(Glastrier) + .isLegendary = TRUE, .levelUpLearnset = sGlastrierLevelUpLearnset, .teachableLearnset = sGlastrierTeachableLearnset, }, @@ -6474,7 +6473,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_GRIM_NEIGH, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, - .isLegendary = TRUE, .speciesName = _("Spectrier"), .cryId = CRY_SPECTRIER, .natDexNum = NATIONAL_DEX_SPECTRIER, @@ -6504,6 +6502,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Spectrier, .iconPalIndex = 0, FOOTPRINT(Spectrier) + .isLegendary = TRUE, .levelUpLearnset = sSpectrierLevelUpLearnset, .teachableLearnset = sSpectrierTeachableLearnset, }, @@ -6522,11 +6521,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 250, .evYield_HP = 3, - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6534,7 +6528,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_UNNERVE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GREEN, + .speciesName = _("Calyrex"), .cryId = CRY_CALYREX, + .natDexNum = NATIONAL_DEX_CALYREX, .categoryName = _("King"), .height = 11, .weight = 77, @@ -6560,8 +6556,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Calyrex, .iconSprite = gMonIcon_Calyrex, .iconPalIndex = 0, + FOOTPRINT(Calyrex) + .isLegendary = TRUE, .levelUpLearnset = sCalyrexLevelUpLearnset, .teachableLearnset = sCalyrexTeachableLearnset, + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, }, #if P_FUSION_FORMS @@ -6577,11 +6576,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 340, .evYield_Attack = 3, - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6589,7 +6583,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_AS_ONE_ICE_RIDER, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, + .speciesName = _("Calyrex"), .cryId = CRY_CALYREX_ICE_RIDER, + .natDexNum = NATIONAL_DEX_CALYREX, .categoryName = _("High King"), .height = 24, .weight = 8091, @@ -6615,9 +6611,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CalyrexIceRider, .iconSprite = gMonIcon_CalyrexIceRider, .iconPalIndex = 0, + FOOTPRINT(Calyrex) + .isLegendary = TRUE, + .cannotBeTraded = TRUE, .levelUpLearnset = sCalyrexIceRiderLevelUpLearnset, .teachableLearnset = sCalyrexIceRiderTeachableLearnset, - .cannotBeTraded = TRUE, + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, }, [SPECIES_CALYREX_SHADOW_RIDER] = @@ -6632,11 +6631,6 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .catchRate = 3, .expYield = 340, .evYield_SpAttack = 3, - .speciesName = _("Calyrex"), - .natDexNum = NATIONAL_DEX_CALYREX, - FOOTPRINT(Calyrex) - .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, - .isLegendary = TRUE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6644,7 +6638,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_AS_ONE_SHADOW_RIDER, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, + .speciesName = _("Calyrex"), .cryId = CRY_CALYREX_SHADOW_RIDER, + .natDexNum = NATIONAL_DEX_CALYREX, .categoryName = _("High King"), .height = 24, .weight = 536, @@ -6670,9 +6666,12 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CalyrexShadowRider, .iconSprite = gMonIcon_CalyrexShadowRider, .iconPalIndex = 0, + FOOTPRINT(Calyrex) + .isLegendary = TRUE, + .cannotBeTraded = TRUE, .levelUpLearnset = sCalyrexShadowRiderLevelUpLearnset, .teachableLearnset = sCalyrexShadowRiderTeachableLearnset, - .cannotBeTraded = TRUE, + .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, }, #endif //P_FUSION_FORMS #endif //P_FAMILY_CALYREX @@ -6695,27 +6694,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_CUTE_CHARM, ABILITY_NONE, ABILITY_CONTRARY }, .bodyColor = BODY_COLOR_PINK, - .isLegendary = TRUE, .speciesName = _("Enamorus"), + .cryId = CRY_ENAMORUS_INCARNATE, .natDexNum = NATIONAL_DEX_ENAMORUS, .categoryName = _("Love-Hate"), .height = 16, .weight = 480, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - .levelUpLearnset = sEnamorusLevelUpLearnset, - .teachableLearnset = sEnamorusTeachableLearnset, - .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, - .abilities = { ABILITY_CUTE_CHARM, ABILITY_NONE, ABILITY_CONTRARY }, - .cryId = CRY_ENAMORUS_INCARNATE, .description = COMPOUND_STRING( "Its arrival brings an end to the winter.\n" "According to legend, this Pokémon's love\n" "gives rise to the budding of fresh life\n" "across the land."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_EnamorusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, @@ -6731,6 +6726,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_EnamorusIncarnate, .iconPalIndex = 1, //FOOTPRINT(EnamorusIncarnate) + .isLegendary = TRUE, + .levelUpLearnset = sEnamorusLevelUpLearnset, + .teachableLearnset = sEnamorusTeachableLearnset, + .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, }, [SPECIES_ENAMORUS_THERIAN] = @@ -6750,27 +6749,23 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .friendship = STANDARD_FRIENDSHIP, .growthRate = GROWTH_SLOW, .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), + .abilities = { ABILITY_OVERCOAT, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_PINK, - .isLegendary = TRUE, .speciesName = _("Enamorus"), + .cryId = CRY_ENAMORUS_THERIAN, .natDexNum = NATIONAL_DEX_ENAMORUS, .categoryName = _("Love-Hate"), .height = 16, .weight = 480, - .pokemonScale = 259, - .pokemonOffset = 1, - .trainerScale = 296, - .trainerOffset = 1, - .levelUpLearnset = sEnamorusLevelUpLearnset, - .teachableLearnset = sEnamorusTeachableLearnset, - .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, - .abilities = { ABILITY_OVERCOAT, ABILITY_NONE, ABILITY_NONE }, - .cryId = CRY_ENAMORUS_THERIAN, .description = COMPOUND_STRING( "From the clouds, it descends upon\n" "those who treat any form of life\n" "with disrespect and metes out\n" "wrathful, ruthless punishment."), + .pokemonScale = 259, + .pokemonOffset = 1, + .trainerScale = 296, + .trainerOffset = 1, .frontPic = gMonFrontPic_EnamorusTherian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, @@ -6785,6 +6780,10 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_EnamorusTherian, .iconPalIndex = 1, //FOOTPRINT(Enamorus) + .isLegendary = TRUE, + .levelUpLearnset = sEnamorusLevelUpLearnset, + .teachableLearnset = sEnamorusTeachableLearnset, + .formSpeciesIdTable = sEnamorusFormSpeciesIdTable, }, #endif //P_FAMILY_ENAMORUS From 80df65f953c9c45454be88ed61d4716837128ba4 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 14 Mar 2024 15:30:50 -0300 Subject: [PATCH 23/23] Gen 9 fully reordered (thanks Alex!) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/species_info/gen_9.h | 244 +++++++++++++------------- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index b63659f3a365..3971b47482cc 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -575,8 +575,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, - .teachableLearnset = sOinkologneTeachableLearnset, - .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneMale, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -588,6 +586,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconPalIndex = 1, //FOOTPRINT(Oinkologne) .levelUpLearnset = sOinkologneMaleLevelUpLearnset, + .teachableLearnset = sOinkologneTeachableLearnset, + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, }, [SPECIES_OINKOLOGNE_FEMALE] = @@ -628,8 +628,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, - .teachableLearnset = sOinkologneTeachableLearnset, - .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneFemale, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -641,6 +639,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconPalIndex = 2, //FOOTPRINT(Oinkologne) .levelUpLearnset = sOinkologneFemaleLevelUpLearnset, + .teachableLearnset = sOinkologneTeachableLearnset, + .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, }, #endif //P_FAMILY_LECHONK @@ -1112,18 +1112,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPic = gMonBackPic_MausholdFamilyOfThree, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, + .iconSprite = gMonIcon_MausholdFamilyOfThree, + .iconPalIndex = 0, /*FOOTPRINT(Maushold)*/ .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, - .backPic = gMonBackPic_MausholdFamilyOfThree, - .backPicSize = MON_COORDS_SIZE(64, 64), - .iconSprite = gMonIcon_MausholdFamilyOfThree, - .iconPalIndex = 0, }, [SPECIES_MAUSHOLD_FAMILY_OF_FOUR] = { @@ -1164,18 +1164,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ + .backPic = gMonBackPic_MausholdFamilyOfFour, + .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, + .iconSprite = gMonIcon_MausholdFamilyOfFour, + .iconPalIndex = 0, /*FOOTPRINT(Maushold)*/ .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, .formSpeciesIdTable = sMausholdFormSpeciesIdTable, - .backPic = gMonBackPic_MausholdFamilyOfFour, - .backPicSize = MON_COORDS_SIZE(64, 64), - .iconSprite = gMonIcon_MausholdFamilyOfFour, - .iconPalIndex = 0, }, #endif //P_FAMILY_TANDEMAUS @@ -1490,14 +1490,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Squawkabilly)*/ - .levelUpLearnset = sSquawkabillyLevelUpLearnset, - .teachableLearnset = sSquawkabillyTeachableLearnset, - .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .palette = gMonPalette_SquawkabillyGreenPlumage, .shinyPalette = gMonShinyPalette_SquawkabillyGreenPlumage, .iconSprite = gMonIcon_SquawkabillyGreenPlumage, .iconPalIndex = 1, + /*FOOTPRINT(Squawkabilly)*/ + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, }, [SPECIES_SQUAWKABILLY_BLUE_PLUMAGE] = @@ -1543,14 +1543,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Squawkabilly)*/ - .levelUpLearnset = sSquawkabillyLevelUpLearnset, - .teachableLearnset = sSquawkabillyTeachableLearnset, - .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .palette = gMonPalette_SquawkabillyBluePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyBluePlumage, .iconSprite = gMonIcon_SquawkabillyBluePlumage, .iconPalIndex = 2, + /*FOOTPRINT(Squawkabilly)*/ + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, }, [SPECIES_SQUAWKABILLY_YELLOW_PLUMAGE] = @@ -1596,14 +1596,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Squawkabilly)*/ - .levelUpLearnset = sSquawkabillyLevelUpLearnset, - .teachableLearnset = sSquawkabillyTeachableLearnset, - .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .palette = gMonPalette_SquawkabillyYellowPlumage, .shinyPalette = gMonShinyPalette_SquawkabillyYellowPlumage, .iconSprite = gMonIcon_SquawkabillyYellowPlumage, .iconPalIndex = 1, + /*FOOTPRINT(Squawkabilly)*/ + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, }, [SPECIES_SQUAWKABILLY_WHITE_PLUMAGE] = @@ -1649,14 +1649,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Squawkabilly)*/ - .levelUpLearnset = sSquawkabillyLevelUpLearnset, - .teachableLearnset = sSquawkabillyTeachableLearnset, - .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, .palette = gMonPalette_SquawkabillyWhitePlumage, .shinyPalette = gMonShinyPalette_SquawkabillyWhitePlumage, .iconSprite = gMonIcon_SquawkabillyWhitePlumage, .iconPalIndex = 1, + /*FOOTPRINT(Squawkabilly)*/ + .levelUpLearnset = sSquawkabillyLevelUpLearnset, + .teachableLearnset = sSquawkabillyTeachableLearnset, + .formSpeciesIdTable = sSquawkabillyFormSpeciesIdTable, }, #endif //P_FAMILY_SQUAWKABILLY @@ -3410,11 +3410,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 7, .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - /*FOOTPRINT(Palafin)*/ - .levelUpLearnset = sPalafinLevelUpLearnset, - .teachableLearnset = sPalafinTeachableLearnset, - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, - .formChangeTable = sPalafinZeroFormChangeTable, .backPic = gMonBackPic_PalafinZero, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, @@ -3423,6 +3418,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_PalafinZero, .iconSprite = gMonIcon_PalafinZero, .iconPalIndex = 0, + /*FOOTPRINT(Palafin)*/ + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, + .formChangeTable = sPalafinZeroFormChangeTable, }, [SPECIES_PALAFIN_HERO] = @@ -3464,11 +3464,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 0, .frontAnimFrames = sAnims_Palafin, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - /*FOOTPRINT(Palafin)*/ - .levelUpLearnset = sPalafinLevelUpLearnset, - .teachableLearnset = sPalafinTeachableLearnset, - .formSpeciesIdTable = sPalafinFormSpeciesIdTable, - .formChangeTable = sPalafinZeroFormChangeTable, .backPic = gMonBackPic_PalafinHero, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, @@ -3477,6 +3472,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_PalafinHero, .iconSprite = gMonIcon_PalafinHero, .iconPalIndex = 0, + /*FOOTPRINT(Palafin)*/ + .levelUpLearnset = sPalafinLevelUpLearnset, + .teachableLearnset = sPalafinTeachableLearnset, + .formSpeciesIdTable = sPalafinFormSpeciesIdTable, + .formChangeTable = sPalafinZeroFormChangeTable, }, #endif //P_FAMILY_FINIZEN @@ -4222,18 +4222,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, - /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Tatsugiri)*/ - .levelUpLearnset = sTatsugiriLevelUpLearnset, - .teachableLearnset = sTatsugiriTeachableLearnset, - .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .backPic = gMonBackPic_TatsugiriCurly, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 17, + /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_TatsugiriCurly, .shinyPalette = gMonShinyPalette_TatsugiriCurly, .iconSprite = gMonIcon_TatsugiriCurly, .iconPalIndex = 0, + /*FOOTPRINT(Tatsugiri)*/ + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, }, [SPECIES_TATSUGIRI_DROOPY] = @@ -4274,18 +4274,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, - /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Tatsugiri)*/ - .levelUpLearnset = sTatsugiriLevelUpLearnset, - .teachableLearnset = sTatsugiriTeachableLearnset, - .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .backPic = gMonBackPic_TatsugiriDroopy, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 17, + /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_TatsugiriDroopy, .shinyPalette = gMonShinyPalette_TatsugiriDroopy, .iconSprite = gMonIcon_TatsugiriDroopy, .iconPalIndex = 0, + /*FOOTPRINT(Tatsugiri)*/ + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, }, [SPECIES_TATSUGIRI_STRETCHY] = @@ -4326,18 +4326,18 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 14, .frontAnimFrames = sAnims_Tatsugiri, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPicYOffset = 17, - /*.backAnimId = BACK_ANIM_NONE,*/ - /*FOOTPRINT(Tatsugiri)*/ - .levelUpLearnset = sTatsugiriLevelUpLearnset, - .teachableLearnset = sTatsugiriTeachableLearnset, - .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, .backPic = gMonBackPic_TatsugiriStretchy, .backPicSize = MON_COORDS_SIZE(64, 64), + .backPicYOffset = 17, + /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_TatsugiriStretchy, .shinyPalette = gMonShinyPalette_TatsugiriStretchy, .iconSprite = gMonIcon_TatsugiriStretchy, .iconPalIndex = 0, + /*FOOTPRINT(Tatsugiri)*/ + .levelUpLearnset = sTatsugiriLevelUpLearnset, + .teachableLearnset = sTatsugiriTeachableLearnset, + .formSpeciesIdTable = sTatsugiriFormSpeciesIdTable, }, #endif //P_FAMILY_TATSUGIRI @@ -4380,7 +4380,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_GreatTusk, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GreatTusk, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4391,6 +4390,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_GreatTusk, .iconPalIndex = 0, //FOOTPRINT(GreatTusk) + .isParadoxForm = TRUE, .levelUpLearnset = sGreatTuskLevelUpLearnset, .teachableLearnset = sGreatTuskTeachableLearnset, }, @@ -4435,7 +4435,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ScreamTail, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ScreamTail, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4446,6 +4445,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_ScreamTail, .iconPalIndex = 0, //FOOTPRINT(ScreamTail) + .isParadoxForm = TRUE, .levelUpLearnset = sScreamTailLevelUpLearnset, .teachableLearnset = sScreamTailTeachableLearnset, }, @@ -4490,7 +4490,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_BruteBonnet, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BruteBonnet, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4501,6 +4500,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_BruteBonnet, .iconPalIndex = 1, //FOOTPRINT(BruteBonnet) + .isParadoxForm = TRUE, .levelUpLearnset = sBruteBonnetLevelUpLearnset, .teachableLearnset = sBruteBonnetTeachableLearnset, }, @@ -4547,7 +4547,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_FlutterMane, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 18, .backPic = gMonBackPic_FlutterMane, @@ -4559,6 +4558,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_FlutterMane, .iconPalIndex = 4, //FOOTPRINT(FlutterMane) + .isParadoxForm = TRUE, .levelUpLearnset = sFlutterManeLevelUpLearnset, .teachableLearnset = sFlutterManeTeachableLearnset, }, @@ -4602,7 +4602,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SlitherWing, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlitherWing, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4613,6 +4612,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_SlitherWing, .iconPalIndex = 3, //FOOTPRINT(SlitherWing) + .isParadoxForm = TRUE, .levelUpLearnset = sSlitherWingLevelUpLearnset, .teachableLearnset = sSlitherWingTeachableLearnset, }, @@ -4657,7 +4657,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_SandyShocks, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandyShocks, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4668,6 +4667,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_SandyShocks, .iconPalIndex = 0, //FOOTPRINT(SandyShocks) + .isParadoxForm = TRUE, .levelUpLearnset = sSandyShocksLevelUpLearnset, .teachableLearnset = sSandyShocksTeachableLearnset, }, @@ -4712,7 +4712,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_IronTreads, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronTreads, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4723,6 +4722,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronTreads, .iconPalIndex = 0, //FOOTPRINT(IronTreads) + .isParadoxForm = TRUE, .levelUpLearnset = sIronTreadsLevelUpLearnset, .teachableLearnset = sIronTreadsTeachableLearnset, }, @@ -4767,7 +4767,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, .frontAnimFrames = sAnims_IronBundle, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBundle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4778,6 +4777,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronBundle, .iconPalIndex = 0, //FOOTPRINT(IronBundle) + .isParadoxForm = TRUE, .levelUpLearnset = sIronBundleLevelUpLearnset, .teachableLearnset = sIronBundleTeachableLearnset, }, @@ -4822,7 +4822,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_IronHands, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronHands, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4833,6 +4832,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronHands, .iconPalIndex = 0, //FOOTPRINT(IronHands) + .isParadoxForm = TRUE, .levelUpLearnset = sIronHandsLevelUpLearnset, .teachableLearnset = sIronHandsTeachableLearnset, }, @@ -4877,7 +4877,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_IronJugulis, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_IronJugulis, @@ -4889,6 +4888,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronJugulis, .iconPalIndex = 2, //FOOTPRINT(IronJugulis) + .isParadoxForm = TRUE, .levelUpLearnset = sIronJugulisLevelUpLearnset, .teachableLearnset = sIronJugulisTeachableLearnset, }, @@ -4933,7 +4933,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, .frontAnimFrames = sAnims_IronMoth, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_IronMoth, @@ -4945,6 +4944,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronMoth, .iconPalIndex = 3, //FOOTPRINT(IronMoth) + .isParadoxForm = TRUE, .levelUpLearnset = sIronMothLevelUpLearnset, .teachableLearnset = sIronMothTeachableLearnset, }, @@ -4989,7 +4989,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronThorns, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronThorns, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5000,6 +4999,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronThorns, .iconPalIndex = 1, //FOOTPRINT(IronThorns) + .isParadoxForm = TRUE, .levelUpLearnset = sIronThornsLevelUpLearnset, .teachableLearnset = sIronThornsTeachableLearnset, }, @@ -5205,19 +5205,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Gimmighoul) - .levelUpLearnset = sGimmighoulLevelUpLearnset, - .teachableLearnset = sGimmighoulTeachableLearnset, - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, - .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .backPic = gMonBackPic_GimmighoulChest, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GimmighoulChest, .shinyPalette = gMonShinyPalette_GimmighoulChest, .iconSprite = gMonIcon_GimmighoulChest, .iconPalIndex = 0, + //FOOTPRINT(Gimmighoul) + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), }, [SPECIES_GIMMIGHOUL_ROAMING] = @@ -5259,19 +5259,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicYOffset = 11, .frontAnimFrames = sAnims_Gimmighoul, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - //.backAnimId = BACK_ANIM_NONE, - //FOOTPRINT(Gimmighoul) - .levelUpLearnset = sGimmighoulLevelUpLearnset, - .teachableLearnset = sGimmighoulTeachableLearnset, - .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, - .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), .backPic = gMonBackPic_GimmighoulRoaming, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, + //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GimmighoulRoaming, .shinyPalette = gMonShinyPalette_GimmighoulRoaming, .iconSprite = gMonIcon_GimmighoulRoaming, .iconPalIndex = 0, + //FOOTPRINT(Gimmighoul) + .levelUpLearnset = sGimmighoulLevelUpLearnset, + .teachableLearnset = sGimmighoulTeachableLearnset, + .formSpeciesIdTable = sGimmighoulFormSpeciesIdTable, + .evolutions = EVOLUTION({EVO_NONE, 0, SPECIES_GHOLDENGO}), }, [SPECIES_GHOLDENGO] = @@ -5366,7 +5366,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WoChien, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WoChien, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5377,6 +5376,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_WoChien, .iconPalIndex = 5, //FOOTPRINT(WoChien) + .isLegendary = TRUE, .levelUpLearnset = sWoChienLevelUpLearnset, .teachableLearnset = sWoChienTeachableLearnset, }, @@ -5421,7 +5421,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_ChienPao, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ChienPao, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5432,6 +5431,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_ChienPao, .iconPalIndex = 0, //FOOTPRINT(ChienPao) + .isLegendary = TRUE, .levelUpLearnset = sChienPaoLevelUpLearnset, .teachableLearnset = sChienPaoTeachableLearnset, }, @@ -5476,7 +5476,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_TingLu, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_TingLu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5487,6 +5486,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_TingLu, .iconPalIndex = 0, //FOOTPRINT(TingLu) + .isLegendary = TRUE, .levelUpLearnset = sTingLuLevelUpLearnset, .teachableLearnset = sTingLuTeachableLearnset, }, @@ -5531,7 +5531,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, .frontAnimFrames = sAnims_ChiYu, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 15, .backPic = gMonBackPic_ChiYu, @@ -5543,6 +5542,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_ChiYu, .iconPalIndex = 0, //FOOTPRINT(ChiYu) + .isLegendary = TRUE, .levelUpLearnset = sChiYuLevelUpLearnset, .teachableLearnset = sChiYuTeachableLearnset, }, @@ -5587,7 +5587,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_RoaringMoon, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_RoaringMoon, @@ -5599,6 +5598,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_RoaringMoon, .iconPalIndex = 3, //FOOTPRINT(RoaringMoon) + .isParadoxForm = TRUE, .levelUpLearnset = sRoaringMoonLevelUpLearnset, .teachableLearnset = sRoaringMoonTeachableLearnset, }, @@ -5642,7 +5642,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronValiant, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronValiant, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5653,6 +5652,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronValiant, .iconPalIndex = 4, //FOOTPRINT(IronValiant) + .isParadoxForm = TRUE, .levelUpLearnset = sIronValiantLevelUpLearnset, .teachableLearnset = sIronValiantTeachableLearnset, }, @@ -5697,8 +5697,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Koraidon, - .isLegendary = TRUE, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Koraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5709,6 +5707,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Koraidon, .iconPalIndex = 0, //FOOTPRINT(Koraidon) + .isLegendary = TRUE, + .isParadoxForm = TRUE, .levelUpLearnset = sKoraidonLevelUpLearnset, .teachableLearnset = sKoraidonTeachableLearnset, }, @@ -5753,8 +5753,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Miraidon, - .isLegendary = TRUE, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Miraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5765,6 +5763,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Miraidon, .iconPalIndex = 2, //FOOTPRINT(Miraidon) + .isLegendary = TRUE, + .isParadoxForm = TRUE, .levelUpLearnset = sMiraidonLevelUpLearnset, .teachableLearnset = sMiraidonTeachableLearnset, }, @@ -5808,7 +5808,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_WalkingWake, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WalkingWake, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5819,6 +5818,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_WalkingWake, .iconPalIndex = 2, //FOOTPRINT(WalkingWake) + .isParadoxForm = TRUE, .levelUpLearnset = sWalkingWakeLevelUpLearnset, .teachableLearnset = sWalkingWakeTeachableLearnset, }, @@ -5862,7 +5862,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_IronLeaves, - .isParadoxForm = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronLeaves, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5873,6 +5872,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_IronLeaves, .iconPalIndex = 1, //FOOTPRINT(IronLeaves) + .isParadoxForm = TRUE, .levelUpLearnset = sIronLeavesLevelUpLearnset, .teachableLearnset = sIronLeavesTeachableLearnset, }, @@ -6141,9 +6141,9 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Okidogi, .iconPalIndex = 1, //FOOTPRINT(Okidogi) + .isLegendary = TRUE, .levelUpLearnset = sOkidogiLevelUpLearnset, .teachableLearnset = sOkidogiTeachableLearnset, - .isLegendary = TRUE, }, #endif //P_FAMILY_OKIDOGI @@ -6186,7 +6186,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Munkidori, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Munkidori, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6197,6 +6196,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Munkidori, .iconPalIndex = 0, //FOOTPRINT(Munkidori) + .isLegendary = TRUE, .levelUpLearnset = sMunkidoriLevelUpLearnset, .teachableLearnset = sMunkidoriTeachableLearnset, }, @@ -6241,7 +6241,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Fezandipiti, - .isLegendary = TRUE, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fezandipiti, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6252,6 +6251,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .iconSprite = gMonIcon_Fezandipiti, .iconPalIndex = 0, //FOOTPRINT(Fezandipiti) + .isLegendary = TRUE, .levelUpLearnset = sFezandipitiLevelUpLearnset, .teachableLearnset = sFezandipitiTeachableLearnset, }, @@ -6364,14 +6364,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GougingFire, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 6, - .isParadoxForm = TRUE, + .backPicYOffset = 6, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_GougingFire, .shinyPalette = gMonShinyPalette_GougingFire, //.iconSprite = gMonIcon_GougingFire, //.iconPalIndex = 0, //FOOTPRINT(GougingFire) + .isParadoxForm = TRUE, .levelUpLearnset = sGougingFireLevelUpLearnset, .teachableLearnset = sGougingFireTeachableLearnset, }, @@ -6419,14 +6419,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RagingBolt, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .isParadoxForm = TRUE, + .backPicYOffset = 0, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_RagingBolt, .shinyPalette = gMonShinyPalette_RagingBolt, //.iconSprite = gMonIcon_RagingBolt, //.iconPalIndex = 0, //FOOTPRINT(RagingBolt) + .isParadoxForm = TRUE, .levelUpLearnset = sRagingBoltLevelUpLearnset, .teachableLearnset = sRagingBoltTeachableLearnset, }, @@ -6473,14 +6473,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBoulder, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 12, - .isParadoxForm = TRUE, + .backPicYOffset = 12, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronBoulder, .shinyPalette = gMonShinyPalette_IronBoulder, //.iconSprite = gMonIcon_IronBoulder, //.iconPalIndex = 0, //FOOTPRINT(IronBoulder) + .isParadoxForm = TRUE, .levelUpLearnset = sIronBoulderLevelUpLearnset, .teachableLearnset = sIronBoulderTeachableLearnset, }, @@ -6528,14 +6528,14 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronCrown, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 2, - .isParadoxForm = TRUE, + .backPicYOffset = 2, .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_IronCrown, .shinyPalette = gMonShinyPalette_IronCrown, //.iconSprite = gMonIcon_IronCrown, //.iconPalIndex = 0, //FOOTPRINT(IronCrown) + .isParadoxForm = TRUE, .levelUpLearnset = sIronCrownLevelUpLearnset, .teachableLearnset = sIronCrownTeachableLearnset, }, @@ -6576,12 +6576,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosNormal, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6595,6 +6589,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.shinyPalette = gMonShinyPalette_TerapagosNormal, //.iconSprite = gMonIcon_TerapagosNormal, //.iconPalIndex = 0, + //FOOTPRINT(Terapagos) + .isLegendary = TRUE, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, }, [SPECIES_TERAPAGOS_TERASTAL] = @@ -6632,12 +6632,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosTerastal, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6651,6 +6645,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.shinyPalette = gMonShinyPalette_TerapagosTerastal, //.iconSprite = gMonIcon_TerapagosTerastal, //.iconPalIndex = 0, + //FOOTPRINT(Terapagos) + .isLegendary = TRUE, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, }, [SPECIES_TERAPAGOS_STELLAR] = @@ -6687,12 +6687,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .levelUpLearnset = sTerapagosLevelUpLearnset, - .teachableLearnset = sTerapagosTeachableLearnset, - //FOOTPRINT(Terapagos) - .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, - .formChangeTable = sTerapagosFormChangeTable, - .isLegendary = TRUE, //.frontPic = gMonFrontPic_TerapagosStellar, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6706,6 +6700,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.shinyPalette = gMonShinyPalette_TerapagosStellar, //.iconSprite = gMonIcon_TerapagosStellar, //.iconPalIndex = 0, + //FOOTPRINT(Terapagos) + .isLegendary = TRUE, + .levelUpLearnset = sTerapagosLevelUpLearnset, + .teachableLearnset = sTerapagosTeachableLearnset, + .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, + .formChangeTable = sTerapagosFormChangeTable, }, #endif //P_FAMILY_TERAPAGOS @@ -6744,7 +6744,6 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .isMythical = TRUE, //.frontPic = gMonFrontPic_Pecharunt, //.frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, @@ -6759,6 +6758,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = //.iconSprite = gMonIcon_Pecharunt, //.iconPalIndex = 0, //FOOTPRINT(Pecharunt) + .isMythical = TRUE, .levelUpLearnset = sPecharuntLevelUpLearnset, .teachableLearnset = sPecharuntTeachableLearnset, },