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

address review

Browse Source
This commit is contained in:
leo60228 2023-10-26 18:57:06 -04:00
parent 1762b28696
commit a505afac1d
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
20 changed files with 452 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/constants/species.h
View File

@ -1568,28 +1568,28 @@
#define SPECIES_WALKING_WAKE GEN9_START + 118
#define SPECIES_IRON_LEAVES GEN9_START + 119
// Teal Mask
#define SPECIES_DIPPLIN GEN9_START + 120
#define SPECIES_POLTCHAGEIST SPECIES_POLTCHAGEIST_COUNTERFEIT
#define SPECIES_POLTCHAGEIST_COUNTERFEIT GEN9_START + 121
#define SPECIES_POLTCHAGEIST_ARTISAN GEN9_START + 122
#define SPECIES_SINISTCHA SPECIES_SINISTCHA_UNREMARKABLE
#define SPECIES_SINISTCHA_UNREMARKABLE GEN9_START + 123
#define SPECIES_SINISTCHA_MASTERPIECE GEN9_START + 124
#define SPECIES_OKIDOGI GEN9_START + 125
#define SPECIES_MUNKIDORI GEN9_START + 126
#define SPECIES_FEZANDIPITI GEN9_START + 127
#define SPECIES_OGERPON SPECIES_OGERPON_TEAL
#define SPECIES_OGERPON_TEAL GEN9_START + 128
#define SPECIES_OGERPON_WELLSPRING GEN9_START + 129
#define SPECIES_OGERPON_HEARTHFLAME GEN9_START + 130
#define SPECIES_OGERPON_CORNERSTONE GEN9_START + 131
#define SPECIES_OGERPON_TEAL_TERA GEN9_START + 132
#define SPECIES_OGERPON_WELLSPRING_TERA GEN9_START + 133
#define SPECIES_OGERPON_HEARTHFLAME_TERA GEN9_START + 134
#define SPECIES_OGERPON_CORNERSTONE_TERA GEN9_START + 135
#define SPECIES_URSALUNA_BLOODMOON GEN9_START + 136
#define SPECIES_DIPPLIN GEN9_START + 120
#define SPECIES_POLTCHAGEIST SPECIES_POLTCHAGEIST_COUNTERFEIT
#define SPECIES_POLTCHAGEIST_COUNTERFEIT GEN9_START + 121
#define SPECIES_POLTCHAGEIST_ARTISAN GEN9_START + 122
#define SPECIES_SINISTCHA SPECIES_SINISTCHA_UNREMARKABLE
#define SPECIES_SINISTCHA_UNREMARKABLE GEN9_START + 123
#define SPECIES_SINISTCHA_MASTERPIECE GEN9_START + 124
#define SPECIES_OKIDOGI GEN9_START + 125
#define SPECIES_MUNKIDORI GEN9_START + 126
#define SPECIES_FEZANDIPITI GEN9_START + 127
#define SPECIES_OGERPON SPECIES_OGERPON_TEAL_MASK
#define SPECIES_OGERPON_TEAL_MASK GEN9_START + 128
#define SPECIES_OGERPON_WELLSPRING_MASK GEN9_START + 129
#define SPECIES_OGERPON_HEARTHFLAME_MASK GEN9_START + 130
#define SPECIES_OGERPON_CORNERSTONE_MASK GEN9_START + 131
#define SPECIES_OGERPON_TEAL_MASK_TERA GEN9_START + 132
#define SPECIES_OGERPON_WELLSPRING_MASK_TERA GEN9_START + 133
#define SPECIES_OGERPON_HEARTHFLAME_MASK_TERA GEN9_START + 134
#define SPECIES_OGERPON_CORNERSTONE_MASK_TERA GEN9_START + 135
#define SPECIES_URSALUNA_BLOODMOON GEN9_START + 136
#define GIGANTAMAX_START SPECIES_URSALUNA_BLOODMOON
#define GIGANTAMAX_START SPECIES_URSALUNA_BLOODMOON
// Gigantamax Forms
#define SPECIES_VENUSAUR_GIGANTAMAX GIGANTAMAX_START + 1

72
include/graphics.h
View File

@ -8150,42 +8150,42 @@ extern const u32 gMonBackPic_Fezandipiti[];
extern const u32 gMonShinyPalette_Fezandipiti[];
extern const u8 gMonIcon_Fezandipiti[];
extern const u8 gMonFootprint_Fezandipiti[];
extern const u32 gMonFrontPic_OgerponTeal[];
extern const u32 gMonPalette_OgerponTeal[];
extern const u32 gMonBackPic_OgerponTeal[];
extern const u32 gMonShinyPalette_OgerponTeal[];
extern const u8 gMonIcon_OgerponTeal[];
extern const u32 gMonFrontPic_OgerponWellspring[];
extern const u32 gMonPalette_OgerponWellspring[];
extern const u32 gMonBackPic_OgerponWellspring[];
extern const u32 gMonShinyPalette_OgerponWellspring[];
extern const u8 gMonIcon_OgerponWellspring[];
extern const u32 gMonFrontPic_OgerponHearthflame[];
extern const u32 gMonPalette_OgerponHearthflame[];
extern const u32 gMonBackPic_OgerponHearthflame[];
extern const u32 gMonShinyPalette_OgerponHearthflame[];
extern const u8 gMonIcon_OgerponHearthflame[];
extern const u32 gMonFrontPic_OgerponCornerstone[];
extern const u32 gMonPalette_OgerponCornerstone[];
extern const u32 gMonBackPic_OgerponCornerstone[];
extern const u32 gMonShinyPalette_OgerponCornerstone[];
extern const u8 gMonIcon_OgerponCornerstone[];
extern const u32 gMonFrontPic_OgerponTealTera[];
extern const u32 gMonPalette_OgerponTealTera[];
extern const u32 gMonBackPic_OgerponTealTera[];
extern const u32 gMonShinyPalette_OgerponTealTera[];
extern const u32 gMonFrontPic_OgerponWellspringTera[];
extern const u32 gMonPalette_OgerponWellspringTera[];
extern const u32 gMonBackPic_OgerponWellspringTera[];
extern const u32 gMonShinyPalette_OgerponWellspringTera[];
extern const u32 gMonFrontPic_OgerponHearthflameTera[];
extern const u32 gMonPalette_OgerponHearthflameTera[];
extern const u32 gMonBackPic_OgerponHearthflameTera[];
extern const u32 gMonShinyPalette_OgerponHearthflameTera[];
extern const u32 gMonFrontPic_OgerponCornerstoneTera[];
extern const u32 gMonPalette_OgerponCornerstoneTera[];
extern const u32 gMonBackPic_OgerponCornerstoneTera[];
extern const u32 gMonShinyPalette_OgerponCornerstoneTera[];
extern const u32 gMonFrontPic_OgerponTealMask[];
extern const u32 gMonPalette_OgerponTealMask[];
extern const u32 gMonBackPic_OgerponTealMask[];
extern const u32 gMonShinyPalette_OgerponTealMask[];
extern const u8 gMonIcon_OgerponTealMask[];
extern const u32 gMonFrontPic_OgerponWellspringMask[];
extern const u32 gMonPalette_OgerponWellspringMask[];
extern const u32 gMonBackPic_OgerponWellspringMask[];
extern const u32 gMonShinyPalette_OgerponWellspringMask[];
extern const u8 gMonIcon_OgerponWellspringMask[];
extern const u32 gMonFrontPic_OgerponHearthflameMask[];
extern const u32 gMonPalette_OgerponHearthflameMask[];
extern const u32 gMonBackPic_OgerponHearthflameMask[];
extern const u32 gMonShinyPalette_OgerponHearthflameMask[];
extern const u8 gMonIcon_OgerponHearthflameMask[];
extern const u32 gMonFrontPic_OgerponCornerstoneMask[];
extern const u32 gMonPalette_OgerponCornerstoneMask[];
extern const u32 gMonBackPic_OgerponCornerstoneMask[];
extern const u32 gMonShinyPalette_OgerponCornerstoneMask[];
extern const u8 gMonIcon_OgerponCornerstoneMask[];
extern const u32 gMonFrontPic_OgerponTealMaskTera[];
extern const u32 gMonPalette_OgerponTealMaskTera[];
extern const u32 gMonBackPic_OgerponTealMaskTera[];
extern const u32 gMonShinyPalette_OgerponTealMaskTera[];
extern const u32 gMonFrontPic_OgerponWellspringMaskTera[];
extern const u32 gMonPalette_OgerponWellspringMaskTera[];
extern const u32 gMonBackPic_OgerponWellspringMaskTera[];
extern const u32 gMonShinyPalette_OgerponWellspringMaskTera[];
extern const u32 gMonFrontPic_OgerponHearthflameMaskTera[];
extern const u32 gMonPalette_OgerponHearthflameMaskTera[];
extern const u32 gMonBackPic_OgerponHearthflameMaskTera[];
extern const u32 gMonShinyPalette_OgerponHearthflameMaskTera[];
extern const u32 gMonFrontPic_OgerponCornerstoneMaskTera[];
extern const u32 gMonPalette_OgerponCornerstoneMaskTera[];
extern const u32 gMonBackPic_OgerponCornerstoneMaskTera[];
extern const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[];
extern const u8 gMonFootprint_Ogerpon[];
#endif

72
src/data/graphics/pokemon.h
View File

@ -8207,49 +8207,49 @@ const u32 gMonShinyPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandip
const u8 gMonIcon_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/icon.4bpp");
// const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp");
const u32 gMonFrontPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
const u32 gMonPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
const u32 gMonBackPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
const u8 gMonIcon_OgerponTeal[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz");
const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz");
const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz");
const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp");
const u32 gMonFrontPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
const u32 gMonPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
const u32 gMonBackPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponWellspring[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp");
const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz");
const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz");
const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp");
const u32 gMonFrontPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
const u32 gMonPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
const u32 gMonBackPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponHearthflame[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp");
const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz");
const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz");
const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp");
const u32 gMonFrontPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
const u32 gMonPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
const u32 gMonBackPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponCornerstone[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp");
const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz");
const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz");
const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz");
// const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp");
// const u32 gMonFrontPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTealTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponTealMaskTera[]] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
// const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz");
// const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz");
// const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz");
// const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz");
// const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp");

440
src/data/pokemon/egg_moves.h
View File

@ -4418,31 +4418,31 @@ const u16 gEggMoves[] = {
MOVE_REFLECT_TYPE),
#endif
egg_moves(WOOPER_PALDEAN,
MOVE_ACID_SPRAY,
MOVE_AFTER_YOU,
MOVE_ANCIENT_POWER,
MOVE_COUNTER,
MOVE_CURSE,
MOVE_DOUBLE_KICK,
MOVE_HAZE,
MOVE_MIST,
MOVE_RECOVER,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_SWALLOW),
egg_moves(WOOPER_PALDEAN,
MOVE_ACID_SPRAY,
MOVE_AFTER_YOU,
MOVE_ANCIENT_POWER,
MOVE_COUNTER,
MOVE_CURSE,
MOVE_DOUBLE_KICK,
MOVE_HAZE,
MOVE_MIST,
MOVE_RECOVER,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_SWALLOW),
egg_moves(TAUROS_PALDEAN_COMBAT_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(TAUROS_PALDEAN_COMBAT_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(TAUROS_PALDEAN_BLAZE_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(TAUROS_PALDEAN_BLAZE_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(TAUROS_PALDEAN_AQUA_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(TAUROS_PALDEAN_AQUA_BREED,
MOVE_CURSE,
MOVE_ENDEAVOR),
egg_moves(INDEEDEE_FEMALE,
MOVE_PSYCH_UP,
@ -4451,241 +4451,241 @@ const u16 gEggMoves[] = {
MOVE_HEAL_PULSE),
#if P_GEN_9_POKEMON == TRUE
egg_moves(SPRIGATITO,
MOVE_ALLY_SWITCH,
MOVE_COPYCAT,
MOVE_LEECH_SEED,
MOVE_PETAL_BLIZZARD,
MOVE_SUCKER_PUNCH),
egg_moves(SPRIGATITO,
MOVE_ALLY_SWITCH,
MOVE_COPYCAT,
MOVE_LEECH_SEED,
MOVE_PETAL_BLIZZARD,
MOVE_SUCKER_PUNCH),
egg_moves(FUECOCO,
MOVE_BELCH,
MOVE_CURSE,
MOVE_ENCORE,
MOVE_SLACK_OFF),
egg_moves(FUECOCO,
MOVE_BELCH,
MOVE_CURSE,
MOVE_ENCORE,
MOVE_SLACK_OFF),
egg_moves(QUAXLY,
MOVE_DETECT,
MOVE_LAST_RESORT,
MOVE_RAPID_SPIN,
MOVE_ROOST),
egg_moves(QUAXLY,
MOVE_DETECT,
MOVE_LAST_RESORT,
MOVE_RAPID_SPIN,
MOVE_ROOST),
egg_moves(LECHONK,
MOVE_ENDEAVOR,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_STUFF_CHEEKS,
MOVE_SWALLOW),
egg_moves(LECHONK,
MOVE_ENDEAVOR,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_STUFF_CHEEKS,
MOVE_SWALLOW),
egg_moves(TAROUNTULA,
MOVE_FIRST_IMPRESSION,
MOVE_LUNGE,
MOVE_MEMENTO,
MOVE_SUCKER_PUNCH),
egg_moves(TAROUNTULA,
MOVE_FIRST_IMPRESSION,
MOVE_LUNGE,
MOVE_MEMENTO,
MOVE_SUCKER_PUNCH),
egg_moves(NYMBLE,
MOVE_COUNTER,
MOVE_SKITTER_SMACK),
egg_moves(NYMBLE,
MOVE_COUNTER,
MOVE_SKITTER_SMACK),
egg_moves(PAWMI,
MOVE_FAKE_OUT,
MOVE_MACH_PUNCH,
MOVE_SWEET_KISS,
MOVE_WISH),
egg_moves(PAWMI,
MOVE_FAKE_OUT,
MOVE_MACH_PUNCH,
MOVE_SWEET_KISS,
MOVE_WISH),
egg_moves(TANDEMAUS,
MOVE_AFTER_YOU,
MOVE_BATON_PASS,
MOVE_BITE,
MOVE_FEINT,
MOVE_SWITCHEROO,
MOVE_TICKLE),
egg_moves(TANDEMAUS,
MOVE_AFTER_YOU,
MOVE_BATON_PASS,
MOVE_BITE,
MOVE_FEINT,
MOVE_SWITCHEROO,
MOVE_TICKLE),
egg_moves(FIDOUGH,
MOVE_COPYCAT,
MOVE_HOWL,
MOVE_SWEET_SCENT,
MOVE_WISH,
MOVE_YAWN),
egg_moves(FIDOUGH,
MOVE_COPYCAT,
MOVE_HOWL,
MOVE_SWEET_SCENT,
MOVE_WISH,
MOVE_YAWN),
egg_moves(SMOLIV,
MOVE_MEMENTO,
MOVE_STRENGTH_SAP,
MOVE_SYNTHESIS,
MOVE_WEATHER_BALL),
egg_moves(SMOLIV,
MOVE_MEMENTO,
MOVE_STRENGTH_SAP,
MOVE_SYNTHESIS,
MOVE_WEATHER_BALL),
egg_moves(SQUAWKABILLY,
MOVE_DOUBLE_EDGE,
MOVE_FINAL_GAMBIT,
MOVE_FLATTER,
MOVE_PARTING_SHOT),
egg_moves(SQUAWKABILLY,
MOVE_DOUBLE_EDGE,
MOVE_FINAL_GAMBIT,
MOVE_FLATTER,
MOVE_PARTING_SHOT),
egg_moves(NACLI,
MOVE_ANCIENT_POWER,
MOVE_CURSE,
MOVE_FISSURE,
MOVE_POWER_GEM),
egg_moves(NACLI,
MOVE_ANCIENT_POWER,
MOVE_CURSE,
MOVE_FISSURE,
MOVE_POWER_GEM),
egg_moves(CHARCADET,
MOVE_DESTINY_BOND,
MOVE_DISABLE,
MOVE_SPITE),
egg_moves(CHARCADET,
MOVE_DESTINY_BOND,
MOVE_DISABLE,
MOVE_SPITE),
egg_moves(TADBULB,
MOVE_MUDDY_WATER,
MOVE_PARABOLIC_CHARGE,
MOVE_SOAK),
egg_moves(TADBULB,
MOVE_MUDDY_WATER,
MOVE_PARABOLIC_CHARGE,
MOVE_SOAK),
egg_moves(WATTREL,
MOVE_ENDEAVOR,
MOVE_FEATHER_DANCE,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_SWALLOW,
MOVE_WEATHER_BALL),
egg_moves(WATTREL,
MOVE_ENDEAVOR,
MOVE_FEATHER_DANCE,
MOVE_SPIT_UP,
MOVE_STOCKPILE,
MOVE_SWALLOW,
MOVE_WEATHER_BALL),
egg_moves(MASCHIFF,
MOVE_DESTINY_BOND,
MOVE_ENDEAVOR,
MOVE_PLAY_ROUGH,
MOVE_RETALIATE),
egg_moves(MASCHIFF,
MOVE_DESTINY_BOND,
MOVE_ENDEAVOR,
MOVE_PLAY_ROUGH,
MOVE_RETALIATE),
egg_moves(SHROODLE,
MOVE_COPYCAT,
MOVE_CROSS_POISON,
MOVE_PARTING_SHOT,
MOVE_SUPER_FANG,
MOVE_SWAGGER,
MOVE_TOXIC),
egg_moves(SHROODLE,
MOVE_COPYCAT,
MOVE_CROSS_POISON,
MOVE_PARTING_SHOT,
MOVE_SUPER_FANG,
MOVE_SWAGGER,
MOVE_TOXIC),
egg_moves(BRAMBLIN,
MOVE_BEAT_UP,
MOVE_BLOCK,
MOVE_LEECH_SEED,
MOVE_SHADOW_SNEAK,
MOVE_STRENGTH_SAP),
egg_moves(BRAMBLIN,
MOVE_BEAT_UP,
MOVE_BLOCK,
MOVE_LEECH_SEED,
MOVE_SHADOW_SNEAK,
MOVE_STRENGTH_SAP),
egg_moves(TOEDSCOOL,
MOVE_ACUPRESSURE,
MOVE_KNOCK_OFF,
MOVE_LEECH_SEED,
MOVE_MIRROR_COAT,
MOVE_RAGE_POWDER,
MOVE_RAPID_SPIN,
MOVE_TICKLE,
MOVE_TOXIC),
egg_moves(TOEDSCOOL,
MOVE_ACUPRESSURE,
MOVE_KNOCK_OFF,
MOVE_LEECH_SEED,
MOVE_MIRROR_COAT,
MOVE_RAGE_POWDER,
MOVE_RAPID_SPIN,
MOVE_TICKLE,
MOVE_TOXIC),
egg_moves(KLAWF,
MOVE_ANCIENT_POWER,
MOVE_CRABHAMMER,
MOVE_ENDEAVOR,
MOVE_KNOCK_OFF),
egg_moves(KLAWF,
MOVE_ANCIENT_POWER,
MOVE_CRABHAMMER,
MOVE_ENDEAVOR,
MOVE_KNOCK_OFF),
egg_moves(CAPSAKID,
MOVE_INGRAIN,
MOVE_LEECH_SEED,
MOVE_RAGE_POWDER,
MOVE_ROLLOUT,
MOVE_WORRY_SEED),
egg_moves(CAPSAKID,
MOVE_INGRAIN,
MOVE_LEECH_SEED,
MOVE_RAGE_POWDER,
MOVE_ROLLOUT,
MOVE_WORRY_SEED),
egg_moves(RELLOR,
MOVE_COSMIC_POWER,
MOVE_MEMENTO,
MOVE_RECOVER,
MOVE_WEATHER_BALL),
egg_moves(RELLOR,
MOVE_COSMIC_POWER,
MOVE_MEMENTO,
MOVE_RECOVER,
MOVE_WEATHER_BALL),
egg_moves(FLITTLE,
MOVE_ALLY_SWITCH,
MOVE_HYPNOSIS,
MOVE_ROOST),
egg_moves(FLITTLE,
MOVE_ALLY_SWITCH,
MOVE_HYPNOSIS,
MOVE_ROOST),
egg_moves(TINKATINK,
MOVE_FEINT,
MOVE_ICE_HAMMER,
MOVE_QUASH),
egg_moves(TINKATINK,
MOVE_FEINT,
MOVE_ICE_HAMMER,
MOVE_QUASH),
egg_moves(WIGLETT,
MOVE_FINAL_GAMBIT,
MOVE_MEMENTO),
egg_moves(WIGLETT,
MOVE_FINAL_GAMBIT,
MOVE_MEMENTO),
egg_moves(BOMBIRDIER,
MOVE_FEATHER_DANCE,
MOVE_POWER_TRIP,
MOVE_ROOST,
MOVE_SKY_ATTACK,
MOVE_SUCKER_PUNCH),
egg_moves(BOMBIRDIER,
MOVE_FEATHER_DANCE,
MOVE_POWER_TRIP,
MOVE_ROOST,
MOVE_SKY_ATTACK,
MOVE_SUCKER_PUNCH),
egg_moves(FINIZEN,
MOVE_BOOMBURST,
MOVE_BOUNCE,
MOVE_COUNTER,
MOVE_HAZE,
MOVE_TICKLE),
egg_moves(FINIZEN,
MOVE_BOOMBURST,
MOVE_BOUNCE,
MOVE_COUNTER,
MOVE_HAZE,
MOVE_TICKLE),
egg_moves(VAROOM,
MOVE_HAZE,
MOVE_PARTING_SHOT,
MOVE_SELF_DESTRUCT,
MOVE_TORMENT,
MOVE_TOXIC),
egg_moves(VAROOM,
MOVE_HAZE,
MOVE_PARTING_SHOT,
MOVE_SELF_DESTRUCT,
MOVE_TORMENT,
MOVE_TOXIC),
egg_moves(CYCLIZAR,
MOVE_AQUA_TAIL,
MOVE_IRON_TAIL,
MOVE_KNOCK_OFF,
MOVE_POWER_WHIP),
egg_moves(CYCLIZAR,
MOVE_AQUA_TAIL,
MOVE_IRON_TAIL,
MOVE_KNOCK_OFF,
MOVE_POWER_WHIP),
egg_moves(ORTHWORM,
MOVE_COIL,
MOVE_CURSE,
MOVE_METAL_BURST),
egg_moves(ORTHWORM,
MOVE_COIL,
MOVE_CURSE,
MOVE_METAL_BURST),
egg_moves(GLIMMET,
MOVE_EXPLOSION,
MOVE_MEMENTO,
MOVE_TOXIC),
egg_moves(GLIMMET,
MOVE_EXPLOSION,
MOVE_MEMENTO,
MOVE_TOXIC),
egg_moves(GREAVARD,
MOVE_ALLY_SWITCH,
MOVE_DESTINY_BOND,
MOVE_DISABLE,
MOVE_HOWL,
MOVE_MEMENTO,
MOVE_SHADOW_SNEAK,
MOVE_YAWN),
egg_moves(GREAVARD,
MOVE_ALLY_SWITCH,
MOVE_DESTINY_BOND,
MOVE_DISABLE,
MOVE_HOWL,
MOVE_MEMENTO,
MOVE_SHADOW_SNEAK,
MOVE_YAWN),
egg_moves(FLAMIGO,
MOVE_DOUBLE_TEAM,
MOVE_QUICK_GUARD,
MOVE_SKY_ATTACK),
egg_moves(FLAMIGO,
MOVE_DOUBLE_TEAM,
MOVE_QUICK_GUARD,
MOVE_SKY_ATTACK),
egg_moves(CETODDLE,
MOVE_BELLY_DRUM,
MOVE_ENTRAINMENT,
MOVE_ICICLE_CRASH,
MOVE_SUPERPOWER,
MOVE_YAWN),
egg_moves(CETODDLE,
MOVE_BELLY_DRUM,
MOVE_ENTRAINMENT,
MOVE_ICICLE_CRASH,
MOVE_SUPERPOWER,
MOVE_YAWN),
egg_moves(VELUZA,
MOVE_RECOVER,
MOVE_THRASH),
egg_moves(VELUZA,
MOVE_RECOVER,
MOVE_THRASH),
egg_moves(DONDOZO,
MOVE_CURSE,
MOVE_FISSURE,
MOVE_THRASH,
MOVE_YAWN),
egg_moves(DONDOZO,
MOVE_CURSE,
MOVE_FISSURE,
MOVE_THRASH,
MOVE_YAWN),
egg_moves(TATSUGIRI,
MOVE_BATON_PASS,
MOVE_COUNTER,
MOVE_RAPID_SPIN),
egg_moves(TATSUGIRI,
MOVE_BATON_PASS,
MOVE_COUNTER,
MOVE_RAPID_SPIN),
egg_moves(FRIGIBAX,
MOVE_AQUA_TAIL,
MOVE_DRAGON_RUSH,
MOVE_FREEZE_DRY,
MOVE_ICICLE_SPEAR),
egg_moves(FRIGIBAX,
MOVE_AQUA_TAIL,
MOVE_DRAGON_RUSH,
MOVE_FREEZE_DRY,
MOVE_ICICLE_SPEAR),
#endif

16
src/data/pokemon/form_change_table_pointers.h
View File

@ -293,13 +293,13 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
[SPECIES_ENAMORUS_THERIAN] = sEnamorusFormChangeTable,
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_OGERPON_TEAL] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE] = sOgerponFormChangeTable,
[SPECIES_OGERPON_TEAL_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_TEAL_MASK] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING_MASK] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME_MASK] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE_MASK] = sOgerponFormChangeTable,
[SPECIES_OGERPON_TEAL_MASK_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = sOgerponFormChangeTable,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = sOgerponFormChangeTable,
#endif
};

8
src/data/pokemon/form_change_tables.h
View File

@ -609,10 +609,10 @@ static const struct FormChange sEnamorusFormChangeTable[] = {
#if P_GEN_9_POKEMON == TRUE
static const struct FormChange sOgerponFormChangeTable[] = {
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING, ITEM_WELLSPRING_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME, ITEM_HEARTHFLAME_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE, ITEM_CORNERSTONE_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_TEAL_MASK, ITEM_NONE},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_WELLSPRING_MASK, ITEM_WELLSPRING_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_HEARTHFLAME_MASK, ITEM_HEARTHFLAME_MASK},
{FORM_CHANGE_ITEM_HOLD, SPECIES_OGERPON_CORNERSTONE_MASK, ITEM_CORNERSTONE_MASK},
{FORM_CHANGE_TERMINATOR},
};
#endif

16
src/data/pokemon/level_up_learnset_pointers.h
View File

@ -1045,14 +1045,14 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_OKIDOGI] = sOkidogiLevelUpLearnset,
[SPECIES_MUNKIDORI] = sMunkidoriLevelUpLearnset,
[SPECIES_FEZANDIPITI] = sFezandipitiLevelUpLearnset,
[SPECIES_OGERPON_TEAL] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_WELLSPRING] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_HEARTHFLAME] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_CORNERSTONE] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_TEAL_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_WELLSPRING_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_CORNERSTONE_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_TEAL_MASK] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_WELLSPRING_MASK] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_HEARTHFLAME_MASK] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_CORNERSTONE_MASK] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_TEAL_MASK_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = sOgerponLevelUpLearnset,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = sOgerponLevelUpLearnset,
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset,

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

@ -27661,13 +27661,13 @@ const struct SpeciesInfo gSpeciesInfo[] =
.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),
[SPECIES_OGERPON_TEAL_MASK] = OGERPON_SPECIES_INFO(TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING_MASK] = OGERPON_SPECIES_INFO(TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = OGERPON_SPECIES_INFO(TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE_MASK] = OGERPON_SPECIES_INFO(TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY),
[SPECIES_OGERPON_TEAL_MASK_TERA] = OGERPON_SPECIES_INFO(TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL, BODY_COLOR_GREEN),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = OGERPON_SPECIES_INFO(TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING, BODY_COLOR_BLUE),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = OGERPON_SPECIES_INFO(TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME, BODY_COLOR_RED),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = OGERPON_SPECIES_INFO(TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE, BODY_COLOR_GRAY),
#endif
};

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

@ -1045,15 +1045,14 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[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,
[SPECIES_OGERPON_TEAL_MASK] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_WELLSPRING_MASK] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_HEARTHFLAME_MASK] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_CORNERSTONE_MASK] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_TEAL_MASK_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = sOgerponTeachableLearnset,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = sOgerponTeachableLearnset,
#endif
// Megas
[SPECIES_VENUSAUR_MEGA] = sVenusaurTeachableLearnset,

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

@ -1068,14 +1068,14 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_OKIDOGI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_MUNKIDORI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_FEZANDIPITI] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 4 },
[SPECIES_OGERPON_TEAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_WELLSPRING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_HEARTHFLAME] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_CORNERSTONE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[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 },
[SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 16 },
[SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
#endif
#if P_GEN_5_POKEMON == TRUE

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

@ -1501,14 +1501,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
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),
SPECIES_SPRITE(OGERPON_TEAL_MASK, gMonBackPic_OgerponTealMask),
SPECIES_SPRITE(OGERPON_WELLSPRING_MASK, gMonBackPic_OgerponWellspringMask),
SPECIES_SPRITE(OGERPON_HEARTHFLAME_MASK, gMonBackPic_OgerponHearthflameMask),
SPECIES_SPRITE(OGERPON_CORNERSTONE_MASK, gMonBackPic_OgerponCornerstoneMask),
// SPECIES_SPRITE(OGERPON_TEAL_MASK_TERA, gMonBackPic_OgerponTealMaskTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_MASK_TERA, gMonBackPic_OgerponWellspringMaskTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_MASK_TERA, gMonBackPic_OgerponHearthflameMaskTera),
// SPECIES_SPRITE(OGERPON_CORNERSTONE_MASK_TERA, gMonBackPic_OgerponCornerstoneMaskTera),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};

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

@ -1037,14 +1037,14 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] =
//[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,
//[SPECIES_OGERPON_TEAL_MASK] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_WELLSPRING_MASK] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_HEARTHFLAME_MASK] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_CORNERSTONE_MASK] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_TEAL_MASK_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = gMonFootprint_Ogerpon,
//[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = gMonFootprint_Ogerpon,
#endif
[SPECIES_EGG] = gMonFootprint_Bulbasaur,
};

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

@ -13170,14 +13170,14 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[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,
[SPECIES_OGERPON_TEAL_MASK] = sAnims_Ogerpon,
[SPECIES_OGERPON_WELLSPRING_MASK] = sAnims_Ogerpon,
[SPECIES_OGERPON_HEARTHFLAME_MASK] = sAnims_Ogerpon,
[SPECIES_OGERPON_CORNERSTONE_MASK] = sAnims_Ogerpon,
[SPECIES_OGERPON_TEAL_MASK_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = sAnims_Ogerpon,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = sAnims_Ogerpon,
#endif
// Mega/Primal Forms
[SPECIES_VENUSAUR_MEGA] = sAnims_VenusaurMega,

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

@ -1048,14 +1048,14 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[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 },
[SPECIES_OGERPON_TEAL_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE_MASK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_TEAL_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_OGERPON_CORNERSTONE_MASK_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

@ -1499,14 +1499,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] =
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),
SPECIES_SPRITE(OGERPON_TEAL_MASK, gMonFrontPic_OgerponTealMask),
SPECIES_SPRITE(OGERPON_WELLSPRING_MASK, gMonFrontPic_OgerponWellspringMask),
SPECIES_SPRITE(OGERPON_HEARTHFLAME_MASK, gMonFrontPic_OgerponHearthflameMask),
SPECIES_SPRITE(OGERPON_CORNERSTONE_MASK, gMonFrontPic_OgerponCornerstoneMask),
// SPECIES_SPRITE(OGERPON_TEAL_MASK_TERA, gMonFrontPic_OgerponTealMaskTera),
// SPECIES_SPRITE(OGERPON_WELLSPRING_MASK_TERA, gMonFrontPic_OgerponWellspringMaskTera),
// SPECIES_SPRITE(OGERPON_HEARTHFLAME_MASK_TERA, gMonFrontPic_OgerponHearthflameMaskTera),
// SPECIES_SPRITE(OGERPON_CORNERSTONE_MASK_TERA, gMonFrontPic_OgerponCornerstoneMaskTera),
#endif
SPECIES_SPRITE(EGG, gMonFrontPic_Egg),
};

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

@ -1499,14 +1499,14 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] =
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),
SPECIES_PAL(OGERPON_TEAL_MASK, gMonPalette_OgerponTealMask),
SPECIES_PAL(OGERPON_WELLSPRING_MASK, gMonPalette_OgerponWellspringMask),
SPECIES_PAL(OGERPON_HEARTHFLAME_MASK, gMonPalette_OgerponHearthflameMask),
SPECIES_PAL(OGERPON_CORNERSTONE_MASK, gMonPalette_OgerponCornerstoneMask),
// SPECIES_PAL(OGERPON_TEAL_MASK_TERA, gMonPalette_OgerponTealMaskTera),
// SPECIES_PAL(OGERPON_WELLSPRING_MASK_TERA, gMonPalette_OgerponWellspringMaskTera),
// SPECIES_PAL(OGERPON_HEARTHFLAME_MASK_TERA, gMonPalette_OgerponHearthflameMaskTera),
// SPECIES_PAL(OGERPON_CORNERSTONE_MASK_TERA, gMonPalette_OgerponCornerstoneMaskTera),
#endif
SPECIES_PAL(EGG, gMonPalette_Egg),
};

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

@ -1498,14 +1498,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] =
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),
// SPECIES_SHINY_PAL(OGERPON_TEAL_MASK, gMonShinyPalette_OgerponTealMask),
// SPECIES_SHINY_PAL(OGERPON_WELLSPRING_MASK, gMonShinyPalette_OgerponWellspringMask),
// SPECIES_SHINY_PAL(OGERPON_HEARTHFLAME_MASK, gMonShinyPalette_OgerponHearthflameMask),
// SPECIES_SHINY_PAL(OGERPON_CORNERSTONE_MASK, gMonShinyPalette_OgerponCornerstoneMask),
// SPECIES_SHINY_PAL(OGERPON_TEAL_MASK_TERA, gMonShinyPalette_OgerponTealMaskTera),
// SPECIES_SHINY_PAL(OGERPON_WELLSPRING_MASK_TERA, gMonShinyPalette_OgerponWellspringMaskTera),
// SPECIES_SHINY_PAL(OGERPON_HEARTHFLAME_MASK_TERA, gMonShinyPalette_OgerponHearthflameMaskTera),
// SPECIES_SHINY_PAL(OGERPON_CORNERSTONE_MASK_TERA, gMonShinyPalette_OgerponCornerstoneMaskTera),
#endif
SPECIES_SHINY_PAL(EGG, gMonPalette_Egg),
};

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

@ -1044,14 +1044,14 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_OKIDOGI] = _("Okidogi"),
[SPECIES_MUNKIDORI] = _("Munkidori"),
[SPECIES_FEZANDIPITI] = _("Fezandipit"),
[SPECIES_OGERPON_TEAL] = _("Ogerpon"),
[SPECIES_OGERPON_WELLSPRING] = _("Ogerpon"),
[SPECIES_OGERPON_HEARTHFLAME] = _("Ogerpon"),
[SPECIES_OGERPON_CORNERSTONE] = _("Ogerpon"),
[SPECIES_OGERPON_TEAL_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_WELLSPRING_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_HEARTHFLAME_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_CORNERSTONE_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_TEAL_MASK] = _("Ogerpon"),
[SPECIES_OGERPON_WELLSPRING_MASK] = _("Ogerpon"),
[SPECIES_OGERPON_HEARTHFLAME_MASK] = _("Ogerpon"),
[SPECIES_OGERPON_CORNERSTONE_MASK] = _("Ogerpon"),
[SPECIES_OGERPON_TEAL_MASK_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = _("Ogerpon"),
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = _("Ogerpon"),
#endif
// Megas

30
src/pokemon.c
View File

@ -1398,13 +1398,13 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
SPECIES_TO_NATIONAL(MUNKIDORI),
SPECIES_TO_NATIONAL(FEZANDIPITI),
SPECIES_TO_NATIONAL(OGERPON),
[SPECIES_OGERPON_WELLSPRING - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_HEARTHFLAME - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_CORNERSTONE - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_TEAL_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_WELLSPRING_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_HEARTHFLAME_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_CORNERSTONE_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_WELLSPRING_MASK - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_HEARTHFLAME_MASK - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_CORNERSTONE_MASK - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_TEAL_MASK_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA - 1] = NATIONAL_DEX_OGERPON,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA - 1] = NATIONAL_DEX_OGERPON,
#endif
// Megas
@ -3198,14 +3198,14 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_OKIDOGI - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_MUNKIDORI - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_FEZANDIPITI - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_TEAL - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_WELLSPRING - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_HEARTHFLAME - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_CORNERSTONE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_TEAL_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_WELLSPRING_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_HEARTHFLAME_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_CORNERSTONE_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_TEAL_MASK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_WELLSPRING_MASK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_HEARTHFLAME_MASK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_CORNERSTONE_MASK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_TEAL_MASK_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
// Gen 3 Forms
[SPECIES_CASTFORM_SUNNY - 1] = ANIM_GROW_VIBRATE,

32
src/pokemon_icon.c
View File

@ -1459,14 +1459,14 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_OKIDOGI] = gMonIcon_Okidogi,
[SPECIES_MUNKIDORI] = gMonIcon_Munkidori,
[SPECIES_FEZANDIPITI] = gMonIcon_Fezandipiti,
[SPECIES_OGERPON_TEAL] = gMonIcon_OgerponTeal,
//[SPECIES_OGERPON_WELLSPRING] = gMonIcon_OgerponWellspring, TODO
//[SPECIES_OGERPON_HEARTHFLAME] = gMonIcon_OgerponHearthflame, TODO
//[SPECIES_OGERPON_CORNERSTONE] = gMonIcon_OgerponCornerstone, TODO
[SPECIES_OGERPON_TEAL_TERA] = gMonIcon_OgerponTeal,
//[SPECIES_OGERPON_WELLSPRING_TERA] = gMonIcon_OgerponWellspring, TODO
//[SPECIES_OGERPON_HEARTHFLAME_TERA] = gMonIcon_OgerponHearthflame, TODO
//[SPECIES_OGERPON_CORNERSTONE_TERA] = gMonIcon_OgerponCornerstone, TODO
[SPECIES_OGERPON_TEAL_MASK] = gMonIcon_OgerponTealMask,
//[SPECIES_OGERPON_WELLSPRING_MASK] = gMonIcon_OgerponWellspringMask, TODO
//[SPECIES_OGERPON_HEARTHFLAME_MASK] = gMonIcon_OgerponHearthflameMask, TODO
//[SPECIES_OGERPON_CORNERSTONE_MASK] = gMonIcon_OgerponCornerstoneMask, TODO
[SPECIES_OGERPON_TEAL_MASK_TERA] = gMonIcon_OgerponTealMask,
//[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = gMonIcon_OgerponWellspringMask, TODO
//[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = gMonIcon_OgerponHearthflameMask, TODO
//[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = gMonIcon_OgerponCornerstoneMask, TODO
#endif
[SPECIES_EGG] = gMonIcon_Egg,
};
@ -2862,14 +2862,14 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_OKIDOGI] = 1,
[SPECIES_MUNKIDORI] = 0,
[SPECIES_FEZANDIPITI] = 0,
[SPECIES_OGERPON_TEAL] = 1,
[SPECIES_OGERPON_WELLSPRING] = 0,
[SPECIES_OGERPON_HEARTHFLAME] = 0,
[SPECIES_OGERPON_CORNERSTONE] = 0,
[SPECIES_OGERPON_TEAL_TERA] = 1,
[SPECIES_OGERPON_WELLSPRING_TERA] = 0,
[SPECIES_OGERPON_HEARTHFLAME_TERA] = 0,
[SPECIES_OGERPON_CORNERSTONE_TERA] = 0,
[SPECIES_OGERPON_TEAL_MASK] = 1,
[SPECIES_OGERPON_WELLSPRING_MASK] = 0,
[SPECIES_OGERPON_HEARTHFLAME_MASK] = 0,
[SPECIES_OGERPON_CORNERSTONE_MASK] = 0,
[SPECIES_OGERPON_TEAL_MASK_TERA] = 1,
[SPECIES_OGERPON_WELLSPRING_MASK_TERA] = 0,
[SPECIES_OGERPON_HEARTHFLAME_MASK_TERA] = 0,
[SPECIES_OGERPON_CORNERSTONE_MASK_TERA] = 0,
#endif
[SPECIES_EGG] = 1,
};