Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Almost done with data

Browse Source
This commit is contained in:
kittenchilly 2023-10-24 15:45:01 -05:00 committed by leo60228
parent 5cbcf60c7e
commit bb855f965c
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
12 changed files with 354 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/pokemon/pokedex_text.h
View File

@ -6045,9 +6045,9 @@ const u8 gMiraidonPokedexText[] = _(
"land to ash with its lightning.");
const u8 gWalkingWakePokedexText[] = _(
"");
"Ecology under research.");
const u8 gIronLeavesPokedexText[] = _(
"");
"Ecology under research.");
#endif

179
src/data/pokemon/species_info.h
View File

@ -21105,13 +21105,13 @@ const struct SpeciesInfo gSpeciesInfo[] =
.types = { TYPE_GROUND, TYPE_NORMAL},
.catchRate = 5,
.expYield = 275,
.evYield_SpAtk = 3,
.genderRatio = MON_MALE
.evYield_SpAttack = 3,
.genderRatio = MON_MALE,
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroups = { EGG_GROUP_FIELD, EGG_GROUP_FIELD},
.abilities = {ABILITY_MINDS_EYE, ABILITY_MINDS_EYE, ABILITY_MINDS_EYE},
.abilities = {ABILITY_MINDS_EYE, ABILITY_NONE},
.bodyColor = BODY_COLOR_BROWN,
.noFlip = FALSE,
},
@ -27496,5 +27496,178 @@ const struct SpeciesInfo gSpeciesInfo[] =
.noFlip = FALSE,
.flags = SPECIES_FLAG_PARADOX,
},
[SPECIES_DIPPLIN] =
{
.baseHP = 80,
.baseAttack = 80,
.baseDefense = 110,
.baseSpeed = 40,
.baseSpAttack = 95,
.baseSpDefense = 80,
.types = { TYPE_GRASS, TYPE_DRAGON },
.catchRate = 45,
.expYield = 170,
.evYield_Defense = 2,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
.friendship = 50,
.growthRate = GROWTH_ERRATIC,
.eggGroups = { EGG_GROUP_GRASS, EGG_GROUP_DRAGON},
.abilities = {ABILITY_SUPERSWEET_SYRUP, ABILITY_GLUTTONY, ABILITY_STICKY_HOLD},
.bodyColor = BODY_COLOR_GREEN,
.noFlip = FALSE,
},
#define POLTCHAGEIST_SPECIES_INFO \
{ \
.baseHP = 40, \
.baseAttack = 45, \
.baseDefense = 45, \
.baseSpeed = 50, \
.baseSpAttack = 74, \
.baseSpDefense = 54, \
.types = { TYPE_GRASS, TYPE_GHOST}, \
.catchRate = 120, \
.expYield = 62, \
.evYield_SpAttack = 1, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 20, \
.friendship = 50, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroups = { EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS}, \
.abilities = {ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF}, \
.bodyColor = BODY_COLOR_GREEN, \
.noFlip = FALSE, \
}
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = POLTCHAGEIST_SPECIES_INFO,
[SPECIES_POLTCHAGEIST_ARTISAN] = POLTCHAGEIST_SPECIES_INFO,
#define SINISTCHA_SPECIES_INFO \
{ \
.baseHP = 71, \
.baseAttack = 60, \
.baseDefense = 106, \
.baseSpeed = 70, \
.baseSpAttack = 121, \
.baseSpDefense = 80, \
.types = { TYPE_GRASS, TYPE_GHOST}, \
.catchRate = 60, \
.expYield = 178, \
.evYield_SpAttack = 2, \
.genderRatio = MON_GENDERLESS, \
.eggCycles = 20, \
.friendship = 50, \
.growthRate = GROWTH_MEDIUM_FAST, \
.eggGroups = { EGG_GROUP_MINERAL, EGG_GROUP_AMORPHOUS}, \
.abilities = {ABILITY_HOSPITALITY, ABILITY_NONE, ABILITY_HEATPROOF}, \
.bodyColor = BODY_COLOR_GREEN, \
.noFlip = FALSE, \
}
[SPECIES_SINISTCHA_UNREMARKABLE] = SINISTCHA_SPECIES_INFO,
[SPECIES_SINISTCHA_MASTERPIECE] = SINISTCHA_SPECIES_INFO,
[SPECIES_OKIDOGI] =
{
.baseHP = 88,
.baseAttack = 128,
.baseDefense = 115,
.baseSpeed = 80,
.baseSpAttack = 58,
.baseSpDefense = 86,
.types = { TYPE_POISON, TYPE_FIGHTING },
.catchRate = 3,
.expYield = 278,
.evYield_Attack = 3,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},
.abilities = {ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_GUARD_DOG},
.bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE,
.flags = SPECIES_FLAG_LEGENDARY,
},
[SPECIES_MUNKIDORI] =
{
.baseHP = 88,
.baseAttack = 75,
.baseDefense = 66,
.baseSpeed = 106,
.baseSpAttack = 130,
.baseSpDefense = 90,
.types = { TYPE_POISON, TYPE_PSYCHIC },
.catchRate = 3,
.expYield = 278,
.evYield_SpAttack = 3,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},
.abilities = {ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_FRISK},
.bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE,
.flags = SPECIES_FLAG_LEGENDARY,
},
[SPECIES_FEZANDIPITI] =
{
.baseHP = 88,
.baseAttack = 91,
.baseDefense = 82,
.baseSpeed = 99,
.baseSpAttack = 70,
.baseSpDefense = 125,
.types = { TYPE_POISON, TYPE_FAIRY },
.catchRate = 3,
.expYield = 278,
.evYield_SpDefense = 3,
.genderRatio = MON_MALE,
.eggCycles = 120,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED},
.abilities = {ABILITY_TOXIC_CHAIN, ABILITY_NONE, ABILITY_TECHNICIAN},
.bodyColor = BODY_COLOR_BLACK,
.noFlip = FALSE,
.flags = SPECIES_FLAG_LEGENDARY,
},
#define OGERPON_SPECIES_INFO(type, ability, color) \
{ \
.baseHP = 80, \
.baseAttack = 120, \
.baseDefense = 84, \
.baseSpeed = 110, \
.baseSpAttack = 60, \
.baseSpDefense = 96, \
.types = { TYPE_GRASS, type }, \
.catchRate = 5, \
.expYield = 275, \
.evYield_Attack = 3, \
.genderRatio = MON_FEMALE, \
.eggCycles = 10, \
.friendship = 50, \
.growthRate = GROWTH_SLOW, \
.eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, \
.abilities = {ability, ABILITY_NONE}, \
.bodyColor = color, \
.noFlip = FALSE, \
.flags = SPECIES_FLAG_LEGENDARY, \
}
[SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY),
[SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY),
#endif
};

18
src/data/pokemon/teachable_learnset_pointers.h
View File

@ -915,6 +915,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_WYRDEER] = sWyrdeerTeachableLearnset,
[SPECIES_KLEAVOR] = sKleavorTeachableLearnset,
[SPECIES_URSALUNA] = sUrsalunaTeachableLearnset,
[SPECIES_URSALUNA_BLOODMOON] = sUrsalunaBloodmoonTeachableLearnset,
[SPECIES_BASCULEGION_MALE] = sBasculegionTeachableLearnset,
[SPECIES_SNEASLER] = sSneaslerTeachableLearnset,
[SPECIES_OVERQWIL] = sOverqwilTeachableLearnset,
@ -1036,6 +1037,23 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_MIRAIDON] = sMiraidonTeachableLearnset,
[SPECIES_WALKING_WAKE] = sWalkingWakeTeachableLearnset,
[SPECIES_IRON_LEAVES] = sIronLeavesTeachableLearnset,
[SPECIES_DIPPLIN] = sDipplinTeachableLearnset,
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = sPoltchageistTeachableLearnset,
[SPECIES_POLTCHAGEIST_ARTISAN] = sPoltchageistTeachableLearnset,
[SPECIES_SINISTCHA_UNREMARKABLE] = sSinistchaTeachableLearnset,
[SPECIES_SINISTCHA_MASTERPIECE] = sSinistchaTeachableLearnset,
[SPECIES_OKIDOGI] = sOkidogiTeachableLearnset,
[SPECIES_MUNKIDORI] = sMunkidoriTeachableLearnset,
[SPECIES_FEZANDIPITI] = sFezandipitiTeachableLearnset,
[SPECIES_OGERPON_TEAL] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_WELLSPRING] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_HEARTHFLAME] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_CORNERSTONE] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_TEAL_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponTeachableLearnset,
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset,

18
src/data/pokemon_graphics/back_pic_coordinates.h
View File

@ -938,6 +938,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_WYRDEER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 4 },
[SPECIES_URSALUNA] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 14 },
[SPECIES_URSALUNA_BLOODMOON] = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 0 },
[SPECIES_BASCULEGION_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SNEASLER] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OVERQWIL] = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 7 },
@ -1059,6 +1060,23 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_MIRAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },
[SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 },
[SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
#if P_GEN_5_POKEMON == TRUE
[SPECIES_AUDINO_MEGA] = { .size = MON_COORDS_SIZE(56, 64), .y_offset = 0 },

16
src/data/pokemon_graphics/back_pic_table.h
View File

@ -1492,6 +1492,22 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(MIRAIDON, gMonBackPic_Miraidon),
SPECIES_SPRITE(WALKING_WAKE, gMonBackPic_WalkingWake),
SPECIES_SPRITE(IRON_LEAVES, gMonBackPic_IronLeaves),
// SPECIES_SPRITE(DIPPLIN, gMonBackPic_Dipplin),
// SPECIES_SPRITE(POLTCHAGEIST_COUNTERFEIT, gMonBackPic_Poltchageist),
// SPECIES_SPRITE(POLTCHAGEIST_ARTISAN, gMonBackPic_Poltchageist),
// SPECIES_SPRITE(SINISTCHA_UNREMARKABLE, gMonBackPic_Sinistcha),
// SPECIES_SPRITE(SINISTCHA_MASTERPIECE, gMonBackPic_Sinistcha),
// SPECIES_SPRITE(OKIDOGI, gMonBackPic_Okidogi),
// SPECIES_SPRITE(MUNKIDORI, gMonBackPic_Munkidori),
// SPECIES_SPRITE(FEZANDIPITI, gMonBackPic_Fezandipiti),
// SPECIES_SPRITE(OGERPON_TEAL, gMonBackPic_OgerponTeal),
// SPECIES_SPRITE(OGERPON_WELLSPRING, gMonBackPic_OgerponWellspring),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonBackPic_OgerponHearthflame),
// SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonBackPic_OgerponCornerstone),
// SPECIES_SPRITE(OGERPON_TEAL_TERA, gMonBackPic_OgerponTealTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_TERA, gMonBackPic_OgerponWellspringTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_TERA, gMonBackPic_OgerponHearthflameTera),
// SPECIES_SPRITE(OGERPON_CORNERSTONE_TERA, gMonBackPic_OgerponCornerstoneTera),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};

16
src/data/pokemon_graphics/footprint_table.h
View File

@ -1029,6 +1029,22 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] =
//[SPECIES_MIRAIDON] = gMonFootprint_Miraidon,
//[SPECIES_WALKING_WAKE] = gMonFootprint_WalkingWake,
//[SPECIES_IRON_LEAVES] = gMonFootprint_IronLeaves,
//[SPECIES_DIPPLIN] = gMonFootprint_Dipplin,
//[SPECIES_POLTCHAGEIST_COUNTERFEIT] = gMonFootprint_Poltchageist,
//[SPECIES_POLTCHAGEIST_ARTISAN] = gMonFootprint_Poltchageist,
//[SPECIES_SINISTCHA_UNREMARKABLE] = gMonFootprint_Sinistcha,
//[SPECIES_SINISTCHA_MASTERPIECE] = gMonFootprint_Sinistcha,
//[SPECIES_OKIDOGI] = gMonFootprint_Okidogi,
//[SPECIES_MUNKIDORI] = gMonFootprint_Munkidori,
//[SPECIES_FEZANDIPITI] = gMonFootprint_Fezandipiti,
//[SPECIES_OGERPON_TEAL] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_WELLSPRING] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_HEARTHFLAME] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_CORNERSTONE] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_TEAL_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_WELLSPRING_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonFootprint_Ogerpon,
#endif
[SPECIES_EGG] = gMonFootprint_Bulbasaur,
};

30
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -10809,6 +10809,13 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Koraidon);
PLACEHOLDER_ANIM_SINGLE_FRAME(Miraidon);
PLACEHOLDER_ANIM_SINGLE_FRAME(WalkingWake);
PLACEHOLDER_ANIM_SINGLE_FRAME(IronLeaves);
PLACEHOLDER_ANIM_SINGLE_FRAME(Dipplin);
PLACEHOLDER_ANIM_SINGLE_FRAME(Sinistcha);
PLACEHOLDER_ANIM_SINGLE_FRAME(Poltchageist);
PLACEHOLDER_ANIM_SINGLE_FRAME(Okidogi);
PLACEHOLDER_ANIM_SINGLE_FRAME(Munkidori);
PLACEHOLDER_ANIM_SINGLE_FRAME(Fezandipiti);
PLACEHOLDER_ANIM_SINGLE_FRAME(Ogerpon);
#endif
#define SINGLE_ANIMATION(name) \
@ -11893,6 +11900,13 @@ SINGLE_ANIMATION(Koraidon);
SINGLE_ANIMATION(Miraidon);
SINGLE_ANIMATION(WalkingWake);
SINGLE_ANIMATION(IronLeaves);
SINGLE_ANIMATION(Dipplin);
SINGLE_ANIMATION(Sinistcha);
SINGLE_ANIMATION(Poltchageist);
SINGLE_ANIMATION(Okidogi);
SINGLE_ANIMATION(Munkidori);
SINGLE_ANIMATION(Fezandipiti);
SINGLE_ANIMATION(Ogerpon);
#endif
SINGLE_ANIMATION(VenusaurMega);
SINGLE_ANIMATION(CHARIZARD_MEGA_X);
@ -13145,6 +13159,22 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[SPECIES_MIRAIDON] = sAnims_Miraidon,
[SPECIES_WALKING_WAKE] = sAnims_WalkingWake,
[SPECIES_IRON_LEAVES] = sAnims_IronLeaves,
[SPECIES_DIPPLIN] = sAnims_Dipplin,
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = sAnims_Poltchageist,
[SPECIES_POLTCHAGEIST_ARTISAN] = sAnims_Poltchageist,
[SPECIES_SINISTCHA_UNREMARKABLE] = sAnims_Sinistcha,
[SPECIES_SINISTCHA_MASTERPIECE] = sAnims_Sinistcha,
[SPECIES_OKIDOGI] = sAnims_Okidogi,
[SPECIES_MUNKIDORI] = sAnims_Munkidori,
[SPECIES_FEZANDIPITI] = sAnims_Fezandipiti,
[SPECIES_OGERPON_TEAL] = sAnims_Ogerpon,
[SPECIES_OGERPON_WELLSPRING] = sAnims_Ogerpon,
[SPECIES_OGERPON_HEARTHFLAME] = sAnims_Ogerpon,
[SPECIES_OGERPON_CORNERSTONE] = sAnims_Ogerpon,
[SPECIES_OGERPON_TEAL_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_WELLSPRING_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_CORNERSTONE_TERA] = sAnims_Ogerpon,
#endif
// Mega/Primal Forms
[SPECIES_VENUSAUR_MEGA] = sAnims_VenusaurMega,

16
src/data/pokemon_graphics/front_pic_coordinates.h
View File

@ -1040,6 +1040,22 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[SPECIES_MIRAIDON] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_WALKING_WAKE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_IRON_LEAVES] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_DIPPLIN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_POLTCHAGEIST_ARTISAN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SINISTCHA_UNREMARKABLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_SINISTCHA_MASTERPIECE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 },

16
src/data/pokemon_graphics/front_pic_table.h
View File

@ -1490,6 +1490,22 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(MIRAIDON, gMonFrontPic_Miraidon),
SPECIES_SPRITE(WALKING_WAKE, gMonFrontPic_WalkingWake),
SPECIES_SPRITE(IRON_LEAVES, gMonFrontPic_IronLeaves),
// SPECIES_SPRITE(DIPPLIN, gMonFrontPic_Dipplin),
// SPECIES_SPRITE(POLTCHAGEIST_COUNTERFEIT, gMonFrontPic_Poltchageist),
// SPECIES_SPRITE(POLTCHAGEIST_ARTISAN, gMonFrontPic_Poltchageist),
// SPECIES_SPRITE(SINISTCHA_UNREMARKABLE, gMonFrontPic_Sinistcha),
// SPECIES_SPRITE(SINISTCHA_MASTERPIECE, gMonFrontPic_Sinistcha),
// SPECIES_SPRITE(OKIDOGI, gMonFrontPic_Okidogi),
// SPECIES_SPRITE(MUNKIDORI, gMonFrontPic_Munkidori),
// SPECIES_SPRITE(FEZANDIPITI, gMonFrontPic_Fezandipiti),
// SPECIES_SPRITE(OGERPON_TEAL, gMonFrontPic_OgerponTeal),
// SPECIES_SPRITE(OGERPON_WELLSPRING, gMonFrontPic_OgerponWellspring),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME, gMonFrontPic_OgerponHearthflame),
// SPECIES_SPRITE(OGERPON_CORNERSTONE, gMonFrontPic_OgerponCornerstone),
// SPECIES_SPRITE(OGERPON_TEAL_TERA, gMonFrontPic_OgerponTealTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_TERA, gMonFrontPic_OgerponWellspringTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_TERA, gMonFrontPic_OgerponHearthflameTera),
// SPECIES_SPRITE(OGERPON_CORNERSTONE_TERA, gMonFrontPic_OgerponCornerstoneTera),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};

16
src/data/pokemon_graphics/palette_table.h
View File

@ -1490,6 +1490,22 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] =
SPECIES_PAL(MIRAIDON, gMonPalette_Miraidon),
SPECIES_PAL(WALKING_WAKE, gMonPalette_WalkingWake),
SPECIES_PAL(IRON_LEAVES, gMonPalette_IronLeaves),
// SPECIES_PAL(DIPPLIN, gMonPalette_Dipplin),
// SPECIES_PAL(POLTCHAGEIST_COUNTERFEIT, gMonPalette_Poltchageist),
// SPECIES_PAL(POLTCHAGEIST_ARTISAN, gMonPalette_Poltchageist),
// SPECIES_PAL(SINISTCHA_UNREMARKABLE, gMonPalette_Sinistcha),
// SPECIES_PAL(SINISTCHA_MASTERPIECE, gMonPalette_Sinistcha),
// SPECIES_PAL(OKIDOGI, gMonPalette_Okidogi),
// SPECIES_PAL(MUNKIDORI, gMonPalette_Munkidori),
// SPECIES_PAL(FEZANDIPITI, gMonPalette_Fezandipiti),
// SPECIES_PAL(OGERPON_TEAL, gMonPalette_OgerponTeal),
// SPECIES_PAL(OGERPON_WELLSPRING, gMonPalette_OgerponWellspring),
// SPECIES_PAL(OGERPON_HEARTHFLAME, gMonPalette_OgerponHearthflame),
// SPECIES_PAL(OGERPON_CORNERSTONE, gMonPalette_OgerponCornerstone),
// SPECIES_PAL(OGERPON_TEAL_TERA, gMonPalette_OgerponTealTera),
// SPECIES_PAL(OGERPON_WELLSPRING_TERA, gMonPalette_OgerponWellspringTera),
// SPECIES_PAL(OGERPON_HEARTHFLAME_TERA, gMonPalette_OgerponHearthflameTera),
// SPECIES_PAL(OGERPON_CORNERSTONE_TERA, gMonPalette_OgerponCornerstoneTera),
#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};

16
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -1489,6 +1489,22 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] =
SPECIES_SHINY_PAL(MIRAIDON, gMonShinyPalette_Miraidon),
SPECIES_SHINY_PAL(WALKING_WAKE, gMonShinyPalette_WalkingWake),
SPECIES_SHINY_PAL(IRON_LEAVES, gMonShinyPalette_IronLeaves),
// SPECIES_SHINY_PAL(DIPPLIN, gMonShinyPalette_Dipplin),
// SPECIES_SHINY_PAL(POLTCHAGEIST_COUNTERFEIT, gMonShinyPalette_Poltchageist),
// SPECIES_SHINY_PAL(POLTCHAGEIST_ARTISAN, gMonShinyPalette_Poltchageist),
// SPECIES_SHINY_PAL(SINISTCHA_UNREMARKABLE, gMonShinyPalette_Sinistcha),
// SPECIES_SHINY_PAL(SINISTCHA_MASTERPIECE, gMonShinyPalette_Sinistcha),
// SPECIES_SHINY_PAL(OKIDOGI, gMonShinyPalette_Okidogi),
// SPECIES_SHINY_PAL(MUNKIDORI, gMonShinyPalette_Munkidori),
// SPECIES_SHINY_PAL(FEZANDIPITI, gMonShinyPalette_Fezandipiti),
// SPECIES_SHINY_PAL(OGERPON_TEAL, gMonShinyPalette_OgerponTeal),
// SPECIES_SHINY_PAL(OGERPON_WELLSPRING, gMonShinyPalette_OgerponWellspring),
// SPECIES_SHINY_PAL(OGERPON_HEARTHFLAME, gMonShinyPalette_OgerponHearthflame),
// SPECIES_SHINY_PAL(OGERPON_CORNERSTONE, gMonShinyPalette_OgerponCornerstone),
// SPECIES_SHINY_PAL(OGERPON_TEAL_TERA, gMonShinyPalette_OgerponTealTera),
// SPECIES_SHINY_PAL(OGERPON_WELLSPRING_TERA, gMonShinyPalette_OgerponWellspringTera),
// SPECIES_SHINY_PAL(OGERPON_HEARTHFLAME_TERA, gMonShinyPalette_OgerponHearthflameTera),
// SPECIES_SHINY_PAL(OGERPON_CORNERSTONE_TERA, gMonShinyPalette_OgerponCornerstoneTera),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};

14
src/data/text/species_names.h
View File

@ -1035,6 +1035,20 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_MIRAIDON] = _("Miraidon"),
[SPECIES_WALKING_WAKE] = _("Walking Wa"),
[SPECIES_IRON_LEAVES] = _("Iron Leave"),
[SPECIES_DIPPLIN] = _("Dipplin"),
[SPECIES_POLTCHAGEIST_COUNTERFEIT] = _("Poltchgeis"),
[SPECIES_POLTCHAGEIST_ARTISAN] = _("Poltchgeis"),
[SPECIES_SINISTCHA_UNREMARKABLE] = _("Sinistcha"),
[SPECIES_SINISTCHA_MASTERPIECE] = _("Sinistcha"),
[SPECIES_OKIDOGI] = _("Okidogi"),
[SPECIES_MUNKIDORI] = _("Munkidori"),
[SPECIES_FEZANDIPITI] = _("Fezandpiti"),
[SPECIES_ROARING_MOON] = _("Roaring Mo"),
[SPECIES_IRON_VALIANT] = _("Iron Valia"),
[SPECIES_KORAIDON] = _("Koraidon"),
[SPECIES_MIRAIDON] = _("Miraidon"),
[SPECIES_WALKING_WAKE] = _("Walking Wa"),
[SPECIES_IRON_LEAVES] = _("Iron Leave"),
#endif
// Megas