From 174ad11535e9ebc4f9caa93d2aab5af5135aac63 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 23 Oct 2023 12:09:44 -0300 Subject: [PATCH] SPECIES_GIMMIGHOUL_CHEST --- include/constants/species.h | 3 +- include/graphics.h | 10 ++-- src/data/graphics/pokemon.h | 11 ++-- src/data/pokemon/evolution.h | 3 +- .../pokemon/form_species_table_pointers.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 7 +-- src/data/pokemon/species_info.h | 56 +++++++++---------- .../pokemon/teachable_learnset_pointers.h | 7 +-- .../pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/footprint_table.h | 3 +- src/data/pokemon_graphics/front_pic_anims.h | 6 +- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- .../pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 7 +-- src/pokemon.c | 17 +++--- src/pokemon_icon.c | 6 +- 20 files changed, 71 insertions(+), 81 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index 3d22a8c28f..ed8e516110 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1538,7 +1538,8 @@ #define SPECIES_FRIGIBAX GEN9_START + 91 #define SPECIES_ARCTIBAX GEN9_START + 92 #define SPECIES_BAXCALIBUR GEN9_START + 93 -#define SPECIES_GIMMIGHOUL GEN9_START + 94 +#define SPECIES_GIMMIGHOUL SPECIES_GIMMIGHOUL_CHEST +#define SPECIES_GIMMIGHOUL_CHEST GEN9_START + 94 #define SPECIES_GHOLDENGO GEN9_START + 95 #define SPECIES_WO_CHIEN GEN9_START + 96 #define SPECIES_CHIEN_PAO GEN9_START + 97 diff --git a/include/graphics.h b/include/graphics.h index 1d647773ed..0ed86d48c0 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -8031,11 +8031,11 @@ extern const u32 gMonBackPic_Baxcalibur[]; extern const u32 gMonShinyPalette_Baxcalibur[]; extern const u8 gMonIcon_Baxcalibur[]; extern const u8 gMonFootprint_Baxcalibur[]; -extern const u32 gMonFrontPic_Gimmighoul[]; -extern const u32 gMonPalette_Gimmighoul[]; -extern const u32 gMonBackPic_Gimmighoul[]; -extern const u32 gMonShinyPalette_Gimmighoul[]; -extern const u8 gMonIcon_Gimmighoul[]; +extern const u32 gMonFrontPic_GimmighoulChest[]; +extern const u32 gMonPalette_GimmighoulChest[]; +extern const u32 gMonBackPic_GimmighoulChest[]; +extern const u32 gMonShinyPalette_GimmighoulChest[]; +extern const u8 gMonIcon_GimmighoulChest[]; extern const u8 gMonFootprint_Gimmighoul[]; extern const u32 gMonFrontPic_GimmighoulRoaming[]; extern const u32 gMonPalette_GimmighoulRoaming[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 31cba54b59..1f5a83d4fe 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -8067,11 +8067,11 @@ const u32 gMonShinyPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibu const u8 gMonIcon_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/icon.4bpp"); // const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp"); -const u32 gMonFrontPic_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/front.4bpp.lz"); -const u32 gMonPalette_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/normal.gbapal.lz"); -const u32 gMonBackPic_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz"); -const u32 gMonShinyPalette_Gimmighoul[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz"); -const u8 gMonIcon_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); +const u32 gMonFrontPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/front.4bpp.lz"); +const u32 gMonPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/normal.gbapal.lz"); +const u32 gMonBackPic_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/back.4bpp.lz"); +const u32 gMonShinyPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/shiny.gbapal.lz"); +const u8 gMonIcon_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); // const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/front.4bpp.lz"); @@ -8079,7 +8079,6 @@ const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmigh const u32 gMonBackPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/back.4bpp.lz"); const u32 gMonShinyPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/shiny.gbapal.lz"); // const u8 gMonIcon_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/icon.4bpp"); -// const u8 gMonFootprint_Gimmighoul[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 80ce5d4594..d9490413a3 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -581,7 +581,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_CETODDLE] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_CETITAN}}, [SPECIES_FRIGIBAX] = {{EVO_LEVEL, 35, SPECIES_ARCTIBAX}}, [SPECIES_ARCTIBAX] = {{EVO_LEVEL, 54, SPECIES_BAXCALIBUR}}, - [SPECIES_GIMMIGHOUL] = {{EVO_NONE, 0, SPECIES_GHOLDENGO}}, + [SPECIES_GIMMIGHOUL_CHEST] = {{EVO_NONE, 0, SPECIES_GHOLDENGO}}, + [SPECIES_GIMMIGHOUL_ROAMING] = {{EVO_NONE, 0, SPECIES_GHOLDENGO}}, #endif [SPECIES_RATTATA_ALOLAN] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLAN}}, [SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 6dac49fc97..acda1aeeab 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -191,7 +191,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TATSUGIRI_STRETCHY] = sTatsugiriFormSpeciesIdTable, [SPECIES_DUDUNSPARCE_TWO_SEGMENT] = sDudunsparceFormSpeciesIdTable, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceFormSpeciesIdTable, - [SPECIES_GIMMIGHOUL] = sGimmighoulFormSpeciesIdTable, + [SPECIES_GIMMIGHOUL_CHEST] = sGimmighoulFormSpeciesIdTable, #endif // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index adf55ec37d..b52b427290 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1356,7 +1356,7 @@ static const u16 sDudunsparceFormSpeciesIdTable[] = { }; static const u16 sGimmighoulFormSpeciesIdTable[] = { - SPECIES_GIMMIGHOUL, + SPECIES_GIMMIGHOUL_CHEST, SPECIES_GIMMIGHOUL_ROAMING, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index eede59a54c..a6eaf8c9b4 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1019,7 +1019,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_FRIGIBAX] = sFrigibaxLevelUpLearnset, [SPECIES_ARCTIBAX] = sArctibaxLevelUpLearnset, [SPECIES_BAXCALIBUR] = sBaxcaliburLevelUpLearnset, - [SPECIES_GIMMIGHOUL] = sGimmighoulLevelUpLearnset, + [SPECIES_GIMMIGHOUL_CHEST] = sGimmighoulLevelUpLearnset, + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset, [SPECIES_GHOLDENGO] = sGholdengoLevelUpLearnset, [SPECIES_WO_CHIEN] = sWoChienLevelUpLearnset, [SPECIES_CHIEN_PAO] = sChienPaoLevelUpLearnset, @@ -1489,10 +1490,6 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonLevelUpLearnset, [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleLevelUpLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleLevelUpLearnset, -#endif -#if P_GEN_9_POKEMON == TRUE - // Gimmighoul - [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset, #endif // Tauros-Paldea [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset, diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 3672a0d0aa..448506dbf7 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -27184,42 +27184,42 @@ const struct SpeciesInfo gSpeciesInfo[] = .noFlip = FALSE, }, -#define GIMMIGHOUL_MISC_INFO \ - .types = { TYPE_GHOST, TYPE_GHOST }, \ - .catchRate = 45, \ - .expYield = 60, \ - .evYield_SpAttack = 1, \ - .genderRatio = MON_GENDERLESS, \ - .eggCycles = 50, \ - .friendship = 50, \ - .growthRate = GROWTH_SLOW, \ +#define GIMMIGHOUL_MISC_INFO \ + .types = { TYPE_GHOST, TYPE_GHOST }, \ + .catchRate = 45, \ + .expYield = 60, \ + .evYield_SpAttack = 1, \ + .genderRatio = MON_GENDERLESS, \ + .eggCycles = 50, \ + .friendship = 50, \ + .growthRate = GROWTH_SLOW, \ .eggGroups = { EGG_GROUP_UNDISCOVERED, EGG_GROUP_UNDISCOVERED}, \ .noFlip = FALSE - [SPECIES_GIMMIGHOUL] = + [SPECIES_GIMMIGHOUL_CHEST] = { - .baseHP = 45, \ - .baseAttack = 30, \ - .baseDefense = 70, \ - .baseSpeed = 10, \ - .baseSpAttack = 75, \ - .baseSpDefense = 70, \ - .abilities = {ABILITY_RATTLED, ABILITY_NONE}, \ - .bodyColor = BODY_COLOR_BROWN, \ - GIMMIGHOUL_MISC_INFO + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 70, + .baseSpeed = 10, + .baseSpAttack = 75, + .baseSpDefense = 70, + .abilities = {ABILITY_RATTLED, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BROWN, + GIMMIGHOUL_MISC_INFO, }, [SPECIES_GIMMIGHOUL_ROAMING] = { - .baseHP = 45, \ - .baseAttack = 30, \ - .baseDefense = 25, \ - .baseSpeed = 80, \ - .baseSpAttack = 75, \ - .baseSpDefense = 45, \ - .abilities = {ABILITY_RUN_AWAY, ABILITY_NONE}, \ - .bodyColor = BODY_COLOR_BLUE, \ - GIMMIGHOUL_MISC_INFO + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 25, + .baseSpeed = 80, + .baseSpAttack = 75, + .baseSpDefense = 45, + .abilities = {ABILITY_RUN_AWAY, ABILITY_NONE}, + .bodyColor = BODY_COLOR_BLUE, + GIMMIGHOUL_MISC_INFO, }, [SPECIES_GHOLDENGO] = diff --git a/src/data/pokemon/teachable_learnset_pointers.h b/src/data/pokemon/teachable_learnset_pointers.h index 57dd2bc3d7..71ce5dcaeb 100644 --- a/src/data/pokemon/teachable_learnset_pointers.h +++ b/src/data/pokemon/teachable_learnset_pointers.h @@ -1019,7 +1019,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_FRIGIBAX] = sFrigibaxTeachableLearnset, [SPECIES_ARCTIBAX] = sArctibaxTeachableLearnset, [SPECIES_BAXCALIBUR] = sBaxcaliburTeachableLearnset, - [SPECIES_GIMMIGHOUL] = sGimmighoulTeachableLearnset, + [SPECIES_GIMMIGHOUL_CHEST] = sGimmighoulTeachableLearnset, + [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset, [SPECIES_GHOLDENGO] = sGholdengoTeachableLearnset, [SPECIES_WO_CHIEN] = sWoChienTeachableLearnset, [SPECIES_CHIEN_PAO] = sChienPaoTeachableLearnset, @@ -1489,10 +1490,6 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] = [SPECIES_DURALUDON_GIGANTAMAX] = sDuraludonTeachableLearnset, [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = sUrshifuSingleStrikeStyleTeachableLearnset, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = sUrshifuRapidStrikeStyleTeachableLearnset, -#endif -#if P_GEN_9_POKEMON == TRUE - // Gimmighoul - [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset, #endif // Tauros-Paldea [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 2423ace3a6..a6dcecb9eb 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1045,7 +1045,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] = [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 }, [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 }, [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, - [SPECIES_GIMMIGHOUL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, + [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 }, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index f2b76a65eb..9ba5f3257e 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1479,7 +1479,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(FRIGIBAX, gMonBackPic_Frigibax), SPECIES_SPRITE(ARCTIBAX, gMonBackPic_Arctibax), SPECIES_SPRITE(BAXCALIBUR, gMonBackPic_Baxcalibur), - SPECIES_SPRITE(GIMMIGHOUL, gMonBackPic_Gimmighoul), + SPECIES_SPRITE(GIMMIGHOUL_CHEST, gMonBackPic_GimmighoulChest), SPECIES_SPRITE(GIMMIGHOUL_ROAMING, gMonBackPic_GimmighoulRoaming), SPECIES_SPRITE(GHOLDENGO, gMonBackPic_Gholdengo), SPECIES_SPRITE(WO_CHIEN, gMonBackPic_WoChien), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index 660e37c746..725962e06f 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -1012,7 +1012,8 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] = //[SPECIES_FRIGIBAX] = gMonFootprint_Frigibax, //[SPECIES_ARCTIBAX] = gMonFootprint_Arctibax, //[SPECIES_BAXCALIBUR] = gMonFootprint_Baxcalibur, - //[SPECIES_GIMMIGHOUL] = gMonFootprint_Gimmighoul, + //[SPECIES_GIMMIGHOUL_CHEST] = gMonFootprint_Gimmighoul, + //[SPECIES_GIMMIGHOUL_ROAMING] = gMonFootprint_Gimmighoul, //[SPECIES_GHOLDENGO] = gMonFootprint_Gholdengo, //[SPECIES_WO_CHIEN] = gMonFootprint_WoChien, //[SPECIES_CHIEN_PAO] = gMonFootprint_ChienPao, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index b834083cb3..c99cd446b3 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -13128,7 +13128,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_FRIGIBAX] = sAnims_Frigibax, [SPECIES_ARCTIBAX] = sAnims_Arctibax, [SPECIES_BAXCALIBUR] = sAnims_Baxcalibur, - [SPECIES_GIMMIGHOUL] = sAnims_Gimmighoul, + [SPECIES_GIMMIGHOUL_CHEST] = sAnims_Gimmighoul, + [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul, [SPECIES_GHOLDENGO] = sAnims_Gholdengo, [SPECIES_WO_CHIEN] = sAnims_WoChien, [SPECIES_CHIEN_PAO] = sAnims_ChienPao, @@ -13500,9 +13501,6 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] = [SPECIES_CALYREX_SHADOW_RIDER] = sAnims_Calyrex, [SPECIES_ENAMORUS_THERIAN] = sAnims_EnamorusTherian, [SPECIES_BASCULEGION_FEMALE] = sAnims_Basculegion, -#endif -#if P_GEN_9_POKEMON == TRUE - [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul, #endif [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean, diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 500bb5cc55..f1b260508b 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1023,7 +1023,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] = [SPECIES_FRIGIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 5 }, [SPECIES_ARCTIBAX] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_BAXCALIBUR] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, - [SPECIES_GIMMIGHOUL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, + [SPECIES_GIMMIGHOUL_CHEST] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 3 }, [SPECIES_GIMMIGHOUL_ROAMING] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 }, [SPECIES_GHOLDENGO] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, [SPECIES_WO_CHIEN] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 }, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 9dfc4989c9..3216a91c8f 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1477,7 +1477,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] = SPECIES_SPRITE(FRIGIBAX, gMonFrontPic_Frigibax), SPECIES_SPRITE(ARCTIBAX, gMonFrontPic_Arctibax), SPECIES_SPRITE(BAXCALIBUR, gMonFrontPic_Baxcalibur), - SPECIES_SPRITE(GIMMIGHOUL, gMonFrontPic_Gimmighoul), + SPECIES_SPRITE(GIMMIGHOUL_CHEST, gMonFrontPic_GimmighoulChest), SPECIES_SPRITE(GIMMIGHOUL_ROAMING, gMonFrontPic_GimmighoulRoaming), SPECIES_SPRITE(GHOLDENGO, gMonFrontPic_Gholdengo), SPECIES_SPRITE(WO_CHIEN, gMonFrontPic_WoChien), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 8744948c95..95e76ec596 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1477,7 +1477,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] = SPECIES_PAL(FRIGIBAX, gMonPalette_Frigibax), SPECIES_PAL(ARCTIBAX, gMonPalette_Arctibax), SPECIES_PAL(BAXCALIBUR, gMonPalette_Baxcalibur), - SPECIES_PAL(GIMMIGHOUL, gMonPalette_Gimmighoul), + SPECIES_PAL(GIMMIGHOUL_CHEST, gMonPalette_GimmighoulChest), SPECIES_PAL(GIMMIGHOUL_ROAMING, gMonPalette_GimmighoulRoaming), SPECIES_PAL(GHOLDENGO, gMonPalette_Gholdengo), SPECIES_PAL(WO_CHIEN, gMonPalette_WoChien), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 6fa1c2fd83..51578c1c55 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1476,7 +1476,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] = SPECIES_SHINY_PAL(FRIGIBAX, gMonShinyPalette_Frigibax), SPECIES_SHINY_PAL(ARCTIBAX, gMonShinyPalette_Arctibax), SPECIES_SHINY_PAL(BAXCALIBUR, gMonShinyPalette_Baxcalibur), - SPECIES_SHINY_PAL(GIMMIGHOUL, gMonShinyPalette_Gimmighoul), + SPECIES_SHINY_PAL(GIMMIGHOUL_CHEST, gMonShinyPalette_GimmighoulChest), SPECIES_SHINY_PAL(GIMMIGHOUL_ROAMING, gMonShinyPalette_GimmighoulRoaming), SPECIES_SHINY_PAL(GHOLDENGO, gMonShinyPalette_Gholdengo), SPECIES_SHINY_PAL(WO_CHIEN, gMonShinyPalette_WoChien), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index b3e18bcc48..c3dbbcebe1 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1018,7 +1018,8 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_FRIGIBAX] = _("Frigibax"), [SPECIES_ARCTIBAX] = _("Arctibax"), [SPECIES_BAXCALIBUR] = _("Baxcalibur"), - [SPECIES_GIMMIGHOUL] = _("Gimmighoul"), + [SPECIES_GIMMIGHOUL_CHEST] = _("Gimmighoul"), + [SPECIES_GIMMIGHOUL_ROAMING] = _("Gimmighoul"), [SPECIES_GHOLDENGO] = _("Gholdengo"), [SPECIES_WO_CHIEN] = _("Wo-Chien"), [SPECIES_CHIEN_PAO] = _("Chien-Pao"), @@ -1491,10 +1492,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DURALUDON_GIGANTAMAX] = _("Duraludon"), [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX] = _("Urshifu"), -#endif -#if P_GEN_9_POKEMON == TRUE - // Gimmighoul - [SPECIES_GIMMIGHOUL_ROAMING] = _("Gimmighoul"), #endif // Tauros-Paldea [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = _("Tauros"), diff --git a/src/pokemon.c b/src/pokemon.c index 7cc00ad47b..7e3c671ef4 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -481,6 +481,9 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(MAGMAR), SPECIES_TO_NATIONAL(PINSIR), SPECIES_TO_NATIONAL(TAUROS), + [SPECIES_TAUROS_PALDEAN_COMBAT_BREED - 1] = NATIONAL_DEX_TAUROS, + [SPECIES_TAUROS_PALDEAN_BLAZE_BREED - 1] = NATIONAL_DEX_TAUROS, + [SPECIES_TAUROS_PALDEAN_AQUA_BREED - 1] = NATIONAL_DEX_TAUROS, SPECIES_TO_NATIONAL(MAGIKARP), SPECIES_TO_NATIONAL(GYARADOS), SPECIES_TO_NATIONAL(LAPRAS), @@ -547,6 +550,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(SUNFLORA), SPECIES_TO_NATIONAL(YANMA), SPECIES_TO_NATIONAL(WOOPER), + [SPECIES_WOOPER_PALDEAN - 1] = NATIONAL_DEX_WOOPER, SPECIES_TO_NATIONAL(QUAGSIRE), SPECIES_TO_NATIONAL(ESPEON), SPECIES_TO_NATIONAL(UMBREON), @@ -1372,6 +1376,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(ARCTIBAX), SPECIES_TO_NATIONAL(BAXCALIBUR), SPECIES_TO_NATIONAL(GIMMIGHOUL), + [SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL, SPECIES_TO_NATIONAL(GHOLDENGO), SPECIES_TO_NATIONAL(WO_CHIEN), SPECIES_TO_NATIONAL(CHIEN_PAO), @@ -1507,8 +1512,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = #if P_GEN_7_POKEMON == TRUE [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, #endif - [SPECIES_WOOPER_PALDEAN - 1] = NATIONAL_DEX_WOOPER, - [SPECIES_TAUROS_PALDEAN_COMBAT_BREED - 1] = NATIONAL_DEX_TAUROS, // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, @@ -1841,13 +1844,6 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_URSHIFU_SINGLE_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, [SPECIES_URSHIFU_RAPID_STRIKE_STYLE_GIGANTAMAX - 1] = NATIONAL_DEX_URSHIFU, #endif -#if P_GEN_9_POKEMON == TRUE - // Gimmighoul - [SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL, -#endif - // Tauros-Paldea - [SPECIES_TAUROS_PALDEAN_BLAZE_BREED - 1] = NATIONAL_DEX_TAUROS, - [SPECIES_TAUROS_PALDEAN_AQUA_BREED - 1] = NATIONAL_DEX_TAUROS, }; // Assigns all Hoenn Dex Indexes to a National Dex Index @@ -3162,7 +3158,8 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_FRIGIBAX - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_ARCTIBAX - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_BAXCALIBUR - 1] = ANIM_V_SQUISH_AND_BOUNCE, - [SPECIES_GIMMIGHOUL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_GIMMIGHOUL_CHEST - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_GIMMIGHOUL_ROAMING - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_GHOLDENGO - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_WO_CHIEN - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CHIEN_PAO - 1] = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 8ce24764f0..0f26175536 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1436,7 +1436,8 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] = [SPECIES_FRIGIBAX] = gMonIcon_Frigibax, [SPECIES_ARCTIBAX] = gMonIcon_Arctibax, [SPECIES_BAXCALIBUR] = gMonIcon_Baxcalibur, - [SPECIES_GIMMIGHOUL] = gMonIcon_Gimmighoul, + [SPECIES_GIMMIGHOUL_CHEST] = gMonIcon_GimmighoulChest, + //[SPECIES_GIMMIGHOUL_ROAMING] = gMonIcon_GimmighoulRoaming, [SPECIES_GHOLDENGO] = gMonIcon_Gholdengo, [SPECIES_WO_CHIEN] = gMonIcon_WoChien, [SPECIES_CHIEN_PAO] = gMonIcon_ChienPao, @@ -2820,7 +2821,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_FRIGIBAX] = 3, [SPECIES_ARCTIBAX] = 0, [SPECIES_BAXCALIBUR] = 0, - [SPECIES_GIMMIGHOUL] = 1, // TODO: Overworld Form + [SPECIES_GIMMIGHOUL_CHEST] = 1, + [SPECIES_GIMMIGHOUL_ROAMING] = 1, [SPECIES_GHOLDENGO] = 0, [SPECIES_WO_CHIEN] = 5, [SPECIES_CHIEN_PAO] = 0,