From ee628de82fe606bc9377886fa16af6ca21ab184c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 13 Sep 2022 21:42:53 -0300 Subject: [PATCH] Config to turn off Hippopotas' and Hippowdon's female icons --- include/constants/pokemon_config.h | 21 +++++++++++---------- include/graphics.h | 4 +++- src/data/graphics/pokemon.h | 4 +++- src/pokemon_icon.c | 5 +++++ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 40acd8c80..c57394d45 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -1,17 +1,18 @@ #ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H #define GUARD_CONSTANTS_POKEMON_CONFIG_H -#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type. -#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation. -#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have their abilities changed. -#define P_UPDATED_EGG_GROUPS GEN_LATEST // Since Gen 8, certain Pokémon have gained new egg groups. -#define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. -#define P_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs. -#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. -#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat. +#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type. +#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation. +#define P_UPDATED_ABILITIES GEN_LATEST // Since Gen 6, certain Pokémon have their abilities changed. +#define P_UPDATED_EGG_GROUPS GEN_LATEST // Since Gen 8, certain Pokémon have gained new egg groups. +#define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. +#define P_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs. +#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. +#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat. +#define P_HIPPO_GENDER_DIFF_ICONS TRUE // If TRUE, will give Hippopotas and Hippowdon custom icons for their female forms. -#define P_NEW_POKEMON TRUE // Turning this to FALSE will remove all newly added Pokémon and Forms. Only Unown, Castform and Deoxys forms will remain. +#define P_NEW_POKEMON TRUE // Turning this to FALSE will remove all newly added Pokémon and Forms. Only Unown, Castform and Deoxys forms will remain. -#define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. +#define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. #endif // GUARD_CONSTANTS_POKEMON_CONFIG_H diff --git a/include/graphics.h b/include/graphics.h index 3320dcf27..137591464 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5279,9 +5279,11 @@ extern const u8 gMonIcon_Munchlax[]; extern const u8 gMonIcon_Riolu[]; extern const u8 gMonIcon_Lucario[]; extern const u8 gMonIcon_Hippopotas[]; -extern const u8 gMonIcon_HippopotasF[]; extern const u8 gMonIcon_Hippowdon[]; +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE +extern const u8 gMonIcon_HippopotasF[]; extern const u8 gMonIcon_HippowdonF[]; +#endif extern const u8 gMonIcon_Skorupi[]; extern const u8 gMonIcon_Drapion[]; extern const u8 gMonIcon_Croagunk[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 38f8934b7..06e4be859 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -5212,9 +5212,11 @@ const u8 gMonIcon_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/icon.4bpp"); const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp"); const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp"); const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon_m.4bpp"); -const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/icon_f.4bpp"); const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon_m.4bpp"); +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE +const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/icon_f.4bpp"); const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/icon_f.4bpp"); +#endif const u8 gMonIcon_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/icon.4bpp"); const u8 gMonIcon_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/icon.4bpp"); const u8 gMonIcon_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/icon.4bpp"); diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 60aec8101..d69d201a2 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1279,8 +1279,13 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_KRICKETUNE] = gMonIcon_Kricketune, [SPECIES_SHINX] = gMonIcon_Shinx, [SPECIES_COMBEE] = gMonIcon_Combee, +#if P_HIPPO_GENDER_DIFF_ICONS == TRUE [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF, [SPECIES_HIPPOWDON] = gMonIcon_HippowdonF, +#else + [SPECIES_HIPPOPOTAS] = gMonIcon_Hippopotas, + [SPECIES_HIPPOWDON] = gMonIcon_Hippowdon, +#endif [SPECIES_UNFEZANT] = gMonIcon_UnfezantF, [SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_JELLICENT] = gMonIcon_JellicentF,