From dfa3690d74b441ca3b3059599797d4a453e7eab1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 29 Oct 2024 11:38:26 -0300 Subject: [PATCH] Added config to disable gender differences (#5595) --- include/config/pokemon.h | 5 +- include/pokemon.h | 226 +++++++------- src/battle_anim_mons.c | 8 + src/data/graphics/pokemon.h | 210 ++++++++++++- .../object_event_pic_tables_followers.h | 197 +++++++++++- src/data/pokemon/species_info.h | 26 +- .../pokemon/species_info/gen_1_families.h | 286 +++++++++++------- .../pokemon/species_info/gen_2_families.h | 222 ++++++++------ .../pokemon/species_info/gen_3_families.h | 182 ++++++----- .../pokemon/species_info/gen_4_families.h | 210 ++++++++----- .../pokemon/species_info/gen_5_families.h | 48 +-- .../pokemon/species_info/gen_6_families.h | 12 +- src/decompress.c | 10 +- src/event_object_movement.c | 4 + src/pokemon.c | 12 +- src/pokemon_icon.c | 9 +- src/pokemon_storage_system.c | 6 +- 17 files changed, 1164 insertions(+), 509 deletions(-) diff --git a/include/config/pokemon.h b/include/config/pokemon.h index 311e7c7fe9..23015614c0 100644 --- a/include/config/pokemon.h +++ b/include/config/pokemon.h @@ -37,10 +37,11 @@ #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_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone. #define P_SHUCKLE_BERRY_JUICE GEN_LATEST // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Enabling this will allow Shuckle to do this with an Oran Berry, which is the spiritual succesor of the Berry item. -#define P_ARCEUS_UNIQUE_FORM_ICONS GEN_LATEST // Since Gen 9, Arceus additionally changes its icon to reflect its current form. // Species graphic settings -#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon +#define P_GENDER_DIFFERENCES TRUE // If TRUE, Pokémon will have graphical-only differences when they're female. Female *forms* such as Meowstic are not affected by this. +#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female differences, i.e. Hippopotas and Hippowdon +#define P_ARCEUS_UNIQUE_FORM_ICONS GEN_LATEST // Since Gen 9, Arceus additionally changes its icon to reflect its current form. #define P_FOOTPRINTS TRUE // If TRUE, Pokémon will have footprints (as was the case up to Gen 5 and in BDSP). Disabling this saves some ROM space. #define P_TWO_FRAME_FRONT_SPRITES TRUE // In Pokémon Emerald, Pokémon front sprites always consist of two frames. This config can revert it to only use the first frame, as is the case in the other Gen 3 games. #define P_GBA_STYLE_SPECIES_GFX FALSE // By default, Pokémon sprites use Gen 4/5's style. This config can revert them back to GBA-style. NOTE: B_ENEMY_MON_SHADOW_STYLE is disabled when using these sprites for now. diff --git a/include/pokemon.h b/include/pokemon.h index bb51fcce1c..700fad7a1b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -351,118 +351,130 @@ struct Evolution struct SpeciesInfo /*0xC4*/ { - /* 0x00 */ u8 baseHP; - /* 0x01 */ u8 baseAttack; - /* 0x02 */ u8 baseDefense; - /* 0x03 */ u8 baseSpeed; - /* 0x04 */ u8 baseSpAttack; - /* 0x05 */ u8 baseSpDefense; - /* 0x06 */ u8 types[2]; - /* 0x08 */ u8 catchRate; - /* 0x09 */ u8 forceTeraType; - /* 0x0A */ u16 expYield; // expYield was changed from u8 to u16 for the new Exp System. - /* 0x0C */ u16 evYield_HP:2; - u16 evYield_Attack:2; - u16 evYield_Defense:2; - u16 evYield_Speed:2; - /* 0x0D */ u16 evYield_SpAttack:2; - u16 evYield_SpDefense:2; - u16 padding2:4; - /* 0x0E */ u16 itemCommon; - /* 0x10 */ u16 itemRare; - /* 0x12 */ u8 genderRatio; - /* 0x13 */ u8 eggCycles; - /* 0x14 */ u8 friendship; - /* 0x15 */ u8 growthRate; - /* 0x16 */ u8 eggGroups[2]; - /* 0x18 */ u16 abilities[NUM_ABILITY_SLOTS]; // 3 abilities, no longer u8 because we have over 255 abilities now. - /* 0x1E */ u8 safariZoneFleeRate; + u8 baseHP; + u8 baseAttack; + u8 baseDefense; + u8 baseSpeed; + u8 baseSpAttack; + u8 baseSpDefense; + u8 types[2]; + u8 catchRate; + u8 forceTeraType; + u16 expYield; // expYield was changed from u8 to u16 for the new Exp System. + u16 evYield_HP:2; + u16 evYield_Attack:2; + u16 evYield_Defense:2; + u16 evYield_Speed:2; + u16 evYield_SpAttack:2; + u16 evYield_SpDefense:2; + u16 padding2:4; + u16 itemCommon; + u16 itemRare; + u8 genderRatio; + u8 eggCycles; + u8 friendship; + u8 growthRate; + u8 eggGroups[2]; + u16 abilities[NUM_ABILITY_SLOTS]; // 3 abilities, no longer u8 because we have over 255 abilities now. + u8 safariZoneFleeRate; - // Pokédex data - /* 0x1F */ u8 categoryName[13]; - /* 0x1F */ u8 speciesName[POKEMON_NAME_LENGTH + 1]; - /* 0x2C */ u16 cryId; - /* 0x2E */ u16 natDexNum; - /* 0x30 */ u16 height; //in decimeters - /* 0x32 */ u16 weight; //in hectograms - /* 0x34 */ u16 pokemonScale; - /* 0x36 */ u16 pokemonOffset; - /* 0x38 */ u16 trainerScale; - /* 0x3A */ u16 trainerOffset; - /* 0x3C */ const u8 *description; - /* 0x40 */ u8 bodyColor:7; - // Graphical Data - u8 noFlip:1; - /* 0x41 */ u8 frontAnimDelay; - /* 0x42 */ u8 frontAnimId; - /* 0x43 */ u8 backAnimId; - /* 0x44 */ const union AnimCmd *const *frontAnimFrames; - /* 0x48 */ const u32 *frontPic; - /* 0x4C */ const u32 *frontPicFemale; - /* 0x50 */ const u32 *backPic; - /* 0x54 */ const u32 *backPicFemale; - /* 0x58 */ const u32 *palette; - /* 0x5C */ const u32 *paletteFemale; - /* 0x60 */ const u32 *shinyPalette; - /* 0x64 */ const u32 *shinyPaletteFemale; - /* 0x68 */ const u8 *iconSprite; - /* 0x6C */ const u8 *iconSpriteFemale; + // Pokédex data + u8 categoryName[13]; + u8 speciesName[POKEMON_NAME_LENGTH + 1]; + u16 cryId; + u16 natDexNum; + u16 height; //in decimeters + u16 weight; //in hectograms + u16 pokemonScale; + u16 pokemonOffset; + u16 trainerScale; + u16 trainerOffset; + const u8 *description; + u8 bodyColor:7; + // Graphical Data + u8 noFlip:1; + u8 frontAnimDelay; + u8 frontAnimId; + u8 backAnimId; + const union AnimCmd *const *frontAnimFrames; + const u32 *frontPic; + const u32 *backPic; + const u32 *palette; + const u32 *shinyPalette; + const u8 *iconSprite; +#if P_GENDER_DIFFERENCES + const u32 *frontPicFemale; + const u32 *backPicFemale; + const u32 *paletteFemale; + const u32 *shinyPaletteFemale; + const u8 *iconSpriteFemale; +#endif //P_GENDER_DIFFERENCES #if P_FOOTPRINTS - /* 0x70 */ const u8 *footprint; + const u8 *footprint; #endif - // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame the sprite's non-transparent pixels actually are. - /* 0x74 */ u8 frontPicSize; // The dimensions of this drawn pixel area. - /* 0x74 */ u8 frontPicSizeFemale; // The dimensions of this drawn pixel area. - /* 0x75 */ u8 frontPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge. - /* 0x76 */ u8 backPicSize; // The dimensions of this drawn pixel area. - /* 0x76 */ u8 backPicSizeFemale; // The dimensions of this drawn pixel area. - /* 0x77 */ u8 backPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge. - /* 0x78 */ u8 iconPalIndex:3; - u8 iconPalIndexFemale:3; - u8 padding3:2; - /* 0x79 */ u8 enemyMonElevation; // This determines how much higher above the usual position the enemy Pokémon is during battle. Species that float or fly have nonzero values. - // Flags - /* 0x7A */ u32 isLegendary:1; - u32 isMythical:1; - u32 isUltraBeast:1; - u32 isParadox:1; - u32 isTotem:1; - u32 isMegaEvolution:1; - u32 isPrimalReversion:1; - u32 isUltraBurst:1; - u32 isGigantamax:1; - u32 isTeraForm:1; - u32 isAlolanForm:1; - u32 isGalarianForm:1; - u32 isHisuianForm:1; - u32 isPaldeanForm:1; - u32 cannotBeTraded:1; - u32 perfectIVCount:3; // This species will always generate with the specified amount of perfect IVs. - u32 dexForceRequired:1; // This species will be taken into account for Pokédex ratings even if they have the "isMythical" flag set. - u32 tmIlliterate:1; // This species will be unable to learn the universal moves. - u32 isFrontierBanned:1; // This species is not allowed to participate in Battle Frontier facilities. - u32 padding4:11; - // Shadow settings - s8 enemyShadowXOffset; // This determines the X-offset for an enemy Pokémon's shadow during battle; negative values point left, positive values point right. - s8 enemyShadowYOffset; // This determines the Y-offset for an enemy Pokémon's shadow during battle; negative values point up, positive values point down. - u16 enemyShadowSize:3; // This determines the size of the shadow sprite used for an enemy Pokémon's front sprite during battle. - u16 suppressEnemyShadow:1; // If set to true, then a shadow will not be drawn beneath an enemy Pokémon's front sprite during battle. - u16 padding5:12; - // Move Data - /* 0x80 */ const struct LevelUpMove *levelUpLearnset; - /* 0x84 */ const u16 *teachableLearnset; - /* 0x88 */ const u16 *eggMoveLearnset; - /* 0x8C */ const struct Evolution *evolutions; - /* 0x90 */ const u16 *formSpeciesIdTable; - /* 0x94 */ const struct FormChange *formChangeTable; + // All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame the sprite's non-transparent pixels actually are. + u8 frontPicSize; // The dimensions of this drawn pixel area. + u8 frontPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge. + u8 backPicSize; // The dimensions of this drawn pixel area. + u8 backPicYOffset; // The number of pixels between the drawn pixel area and the bottom edge. +#if P_GENDER_DIFFERENCES + u8 frontPicSizeFemale; // The dimensions of this drawn pixel area. + u8 backPicSizeFemale; // The dimensions of this drawn pixel area. +#endif //P_GENDER_DIFFERENCES + u8 iconPalIndex:3; +#if P_GENDER_DIFFERENCES + u8 iconPalIndexFemale:3; +#else + u8 paddingF:3; +#endif //P_GENDER_DIFFERENCES + u8 padding3:2; + u8 enemyMonElevation; // This determines how much higher above the usual position the enemy Pokémon is during battle. Species that float or fly have nonzero values. + // Flags + u32 isLegendary:1; + u32 isMythical:1; + u32 isUltraBeast:1; + u32 isParadox:1; + u32 isTotem:1; + u32 isMegaEvolution:1; + u32 isPrimalReversion:1; + u32 isUltraBurst:1; + u32 isGigantamax:1; + u32 isTeraForm:1; + u32 isAlolanForm:1; + u32 isGalarianForm:1; + u32 isHisuianForm:1; + u32 isPaldeanForm:1; + u32 cannotBeTraded:1; + u32 perfectIVCount:3; // This species will always generate with the specified amount of perfect IVs. + u32 dexForceRequired:1; // This species will be taken into account for Pokédex ratings even if they have the "isMythical" flag set. + u32 tmIlliterate:1; // This species will be unable to learn the universal moves. + u32 isFrontierBanned:1; // This species is not allowed to participate in Battle Frontier facilities. + u32 padding4:11; + // Shadow settings + s8 enemyShadowXOffset; // This determines the X-offset for an enemy Pokémon's shadow during battle; negative values point left, positive values point right. + s8 enemyShadowYOffset; // This determines the Y-offset for an enemy Pokémon's shadow during battle; negative values point up, positive values point down. + u16 enemyShadowSize:3; // This determines the size of the shadow sprite used for an enemy Pokémon's front sprite during battle. + u16 suppressEnemyShadow:1; // If set to true, then a shadow will not be drawn beneath an enemy Pokémon's front sprite during battle. + u16 padding5:12; + // Move Data + const struct LevelUpMove *levelUpLearnset; + const u16 *teachableLearnset; + const u16 *eggMoveLearnset; + const struct Evolution *evolutions; + const u16 *formSpeciesIdTable; + const struct FormChange *formChangeTable; #if OW_POKEMON_OBJECT_EVENTS - /* 0x98 */ struct ObjectEventGraphicsInfo overworldData; - struct ObjectEventGraphicsInfo overworldDataFemale; + struct ObjectEventGraphicsInfo overworldData; +#if P_GENDER_DIFFERENCES + struct ObjectEventGraphicsInfo overworldDataFemale; +#endif //P_GENDER_DIFFERENCES #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - /* 0xBC */ const void* overworldPalette; - const void* overworldPaletteFemale; - /* 0xC0 */ const void* overworldShinyPalette; - const void* overworldShinyPaletteFemale; + const void* overworldPalette; + const void* overworldShinyPalette; +#if P_GENDER_DIFFERENCES + const void* overworldPaletteFemale; + const void* overworldShinyPaletteFemale; +#endif //P_GENDER_DIFFERENCES #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS }; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index dec12e0dc6..928f050822 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -2134,10 +2134,14 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) species = SanitizeSpeciesId(species); if (species == SPECIES_UNOWN) species = GetUnownSpeciesId(personality); + + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].backPicFemale != NULL && IsPersonalityFemale(species, personality)) size = gSpeciesInfo[species].backPicSizeFemale; else + #endif size = gSpeciesInfo[species].backPicSize; + y_offset = gSpeciesInfo[species].backPicYOffset; } else @@ -2157,10 +2161,14 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) species = SanitizeSpeciesId(species); if (species == SPECIES_UNOWN) species = GetUnownSpeciesId(personality); + + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].frontPicFemale != NULL && IsPersonalityFemale(species, personality)) size = gSpeciesInfo[species].frontPicSizeFemale; else + #endif size = gSpeciesInfo[species].frontPicSize; + y_offset = gSpeciesInfo[species].frontPicYOffset; } } diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 1bee8c537f..39b11560d4 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -100,11 +100,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_VenusaurF[] = INCBIN_COMP("graphics/pokemon/venusaur/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/front.4bpp.lz"); @@ -454,11 +456,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ButterfreeF[] = INCBIN_COMP("graphics/pokemon/butterfree/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/front.4bpp.lz"); @@ -700,11 +704,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RattataF[] = INCBIN_COMP("graphics/pokemon/rattata/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz"); @@ -733,11 +739,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RaticateF[] = INCBIN_COMP("graphics/pokemon/raticate/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_ALOLAN_FORMS const u32 gMonFrontPic_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/front.4bpp.lz"); @@ -950,6 +958,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/backf.4bpp.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS @@ -958,6 +967,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PikachuF[] = INCBIN_COMP("graphics/pokemon/pikachu/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_COSPLAY_PIKACHU_FORMS const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz"); @@ -1083,9 +1093,9 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_GIGANTAMAX_FORMS const u8 gMonIcon_PikachuStarter[] = INCBIN_U8("graphics/pokemon/pikachu/starter/icon.4bpp"); - #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_PikachuStarterF[] = INCBIN_U8("graphics/pokemon/pikachu/starter/iconf.4bpp"); - #endif +#if P_GENDER_DIFFERENCES && P_CUSTOM_GENDER_DIFF_ICONS + const u8 gMonIcon_PikachuStarterF[] = INCBIN_U8("graphics/pokemon/pikachu/starter/iconf.4bpp"); +#endif //P_GENDER_DIFFERENCES && P_CUSTOM_GENDER_DIFF_ICONS #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz"); @@ -1114,10 +1124,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RaichuF[] = INCBIN_COMP("graphics/pokemon/raichu/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_ALOLAN_FORMS const u32 gMonFrontPic_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/front.4bpp.lz"); @@ -1665,11 +1677,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ZubatF[] = INCBIN_COMP("graphics/pokemon/zubat/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz"); @@ -1698,11 +1712,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GolbatF[] = INCBIN_COMP("graphics/pokemon/golbat/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS #if !P_GBA_STYLE_SPECIES_GFX @@ -1789,11 +1805,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GloomF[] = INCBIN_COMP("graphics/pokemon/gloom/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz"); @@ -1822,11 +1840,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_VileplumeF[] = INCBIN_COMP("graphics/pokemon/vileplume/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS #if !P_GBA_STYLE_SPECIES_GFX @@ -2508,11 +2528,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PolitoedF[] = INCBIN_COMP("graphics/pokemon/politoed/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_POLIWAG @@ -2571,11 +2593,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_KadabraF[] = INCBIN_COMP("graphics/pokemon/kadabra/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz"); @@ -2604,11 +2628,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_AlakazamF[] = INCBIN_COMP("graphics/pokemon/alakazam/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/front.4bpp.lz"); @@ -3380,11 +3406,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_DoduoF[] = INCBIN_COMP("graphics/pokemon/doduo/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz"); @@ -3413,11 +3441,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_DodrioF[] = INCBIN_COMP("graphics/pokemon/dodrio/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_DODUO #if P_FAMILY_SEEL @@ -3785,11 +3815,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SteelixF[] = INCBIN_COMP("graphics/pokemon/steelix/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/front.4bpp.lz"); @@ -3863,11 +3895,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_HypnoF[] = INCBIN_COMP("graphics/pokemon/hypno/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_DROWZEE #if P_FAMILY_KRABBY @@ -4427,11 +4461,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RhyhornF[] = INCBIN_COMP("graphics/pokemon/rhyhorn/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz"); @@ -4460,11 +4496,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RhydonF[] = INCBIN_COMP("graphics/pokemon/rhydon/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_front.4bpp.lz"); @@ -4483,11 +4521,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RhyperiorF[] = INCBIN_COMP("graphics/pokemon/rhyperior/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RHYHORN @@ -4612,10 +4652,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_TangrowthF[] = INCBIN_COMP("graphics/pokemon/tangrowth/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TANGELA @@ -4776,11 +4818,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GoldeenF[] = INCBIN_COMP("graphics/pokemon/goldeen/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); @@ -4809,11 +4853,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SeakingF[] = INCBIN_COMP("graphics/pokemon/seaking/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_GOLDEEN #if P_FAMILY_STARYU @@ -4978,10 +5024,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ScytherF[] = INCBIN_COMP("graphics/pokemon/scyther/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS #if !P_GBA_STYLE_SPECIES_GFX @@ -5011,10 +5059,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ScizorF[] = INCBIN_COMP("graphics/pokemon/scizor/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/front.4bpp.lz"); @@ -5396,11 +5446,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MagikarpF[] = INCBIN_COMP("graphics/pokemon/magikarp/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz"); @@ -5429,11 +5481,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GyaradosF[] = INCBIN_COMP("graphics/pokemon/gyarados/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/front.4bpp.lz"); @@ -5552,11 +5606,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/anim_frontf.4bpp.lz"); const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_EeveeF[] = INCBIN_COMP("graphics/pokemon/eevee/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/front.4bpp.lz"); @@ -5574,9 +5630,9 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_GIGANTAMAX_FORMS const u8 gMonIcon_EeveePartner[] = INCBIN_U8("graphics/pokemon/eevee/partner/icon.4bpp"); - #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_EeveePartnerF[] = INCBIN_U8("graphics/pokemon/eevee/partner/iconf.4bpp"); - #endif +#if P_GENDER_DIFFERENCES && P_CUSTOM_GENDER_DIFF_ICONS + const u8 gMonIcon_EeveePartnerF[] = INCBIN_U8("graphics/pokemon/eevee/partner/iconf.4bpp"); +#endif //P_GENDER_DIFFERENCES && P_CUSTOM_GENDER_DIFF_ICONS #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz"); @@ -6445,11 +6501,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MeganiumF[] = INCBIN_COMP("graphics/pokemon/meganium/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CHIKORITA #if P_FAMILY_CYNDAQUIL @@ -6773,11 +6831,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LedybaF[] = INCBIN_COMP("graphics/pokemon/ledyba/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz"); @@ -6806,11 +6866,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LedianF[] = INCBIN_COMP("graphics/pokemon/ledian/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LEDYBA #if P_FAMILY_SPINARAK @@ -7054,10 +7116,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_XatuF[] = INCBIN_COMP("graphics/pokemon/xatu/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_NATU #if P_FAMILY_MAREEP @@ -7289,11 +7353,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SudowoodoF[] = INCBIN_COMP("graphics/pokemon/sudowoodo/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SUDOWOODO #if P_FAMILY_HOPPIP @@ -7407,11 +7473,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_AipomF[] = INCBIN_COMP("graphics/pokemon/aipom/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz"); @@ -7430,11 +7498,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_AmbipomF[] = INCBIN_COMP("graphics/pokemon/ambipom/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_AIPOM @@ -7569,11 +7639,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_WooperF[] = INCBIN_COMP("graphics/pokemon/wooper/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz"); @@ -7602,11 +7674,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_QuagsireF[] = INCBIN_COMP("graphics/pokemon/quagsire/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_PALDEAN_FORMS const u32 gMonFrontPic_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/front.4bpp.lz"); @@ -7668,11 +7742,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MurkrowF[] = INCBIN_COMP("graphics/pokemon/murkrow/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/anim_front.4bpp.lz"); @@ -7952,6 +8028,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/backf.4bpp.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS @@ -7960,6 +8037,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_WobbuffetF[] = INCBIN_COMP("graphics/pokemon/wobbuffet/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_WOBBUFFET #if P_FAMILY_GIRAFARIG @@ -7990,11 +8068,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GirafarigF[] = INCBIN_COMP("graphics/pokemon/girafarig/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_9_CROSS_EVOS const u32 gMonFrontPic_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/front.4bpp.lz"); @@ -8153,11 +8233,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GligarF[] = INCBIN_COMP("graphics/pokemon/gligar/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/anim_front.4bpp.lz"); @@ -8351,11 +8433,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_HeracrossF[] = INCBIN_COMP("graphics/pokemon/heracross/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/front.4bpp.lz"); @@ -8401,11 +8485,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SneaselF[] = INCBIN_COMP("graphics/pokemon/sneasel/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/anim_front.4bpp.lz"); @@ -8424,11 +8510,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_WeavileF[] = INCBIN_COMP("graphics/pokemon/weavile/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS @@ -8445,11 +8533,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SneaselHisuiF[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/frontf.4bpp.lz"); const u32 gMonBackPic_SneaselHisuiF[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SneaselHisuiF[] = INCBIN_COMP("graphics/pokemon/sneasel/hisui/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); @@ -8524,11 +8614,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/anim_frontf.4bpp.lz"); const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_UrsaringF[] = INCBIN_COMP("graphics/pokemon/ursaring/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_8_CROSS_EVOS const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); @@ -8673,11 +8765,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PiloswineF[] = INCBIN_COMP("graphics/pokemon/piloswine/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_front.4bpp.lz"); @@ -8696,10 +8790,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MamoswineF[] = INCBIN_COMP("graphics/pokemon/mamoswine/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SWINUB @@ -8818,11 +8914,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/anim_frontf.4bpp.lz"); const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_OctilleryF[] = INCBIN_COMP("graphics/pokemon/octillery/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_REMORAID #if P_FAMILY_DELIBIRD @@ -8985,11 +9083,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_HoundoomF[] = INCBIN_COMP("graphics/pokemon/houndoom/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/front.4bpp.lz"); @@ -9062,11 +9162,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_DonphanF[] = INCBIN_COMP("graphics/pokemon/donphan/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PHANPY #if P_FAMILY_STANTLER @@ -9572,10 +9674,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_TorchicF[] = INCBIN_COMP("graphics/pokemon/torchic/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz"); @@ -9604,11 +9708,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CombuskenF[] = INCBIN_COMP("graphics/pokemon/combusken/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz"); @@ -9637,11 +9743,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BlazikenF[] = INCBIN_COMP("graphics/pokemon/blaziken/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/front.4bpp.lz"); @@ -9995,11 +10103,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BeautiflyF[] = INCBIN_COMP("graphics/pokemon/beautifly/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz"); @@ -10055,11 +10165,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_DustoxF[] = INCBIN_COMP("graphics/pokemon/dustox/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_WURMPLE #if P_FAMILY_LOTAD @@ -10148,11 +10260,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LudicoloF[] = INCBIN_COMP("graphics/pokemon/ludicolo/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LOTAD #if P_FAMILY_SEEDOT @@ -10210,11 +10324,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_NuzleafF[] = INCBIN_COMP("graphics/pokemon/nuzleaf/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz"); @@ -10243,11 +10359,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ShiftryF[] = INCBIN_COMP("graphics/pokemon/shiftry/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SEEDOT #if P_FAMILY_TAILLOW @@ -11235,11 +11353,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MedititeF[] = INCBIN_COMP("graphics/pokemon/meditite/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz"); @@ -11268,11 +11388,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MedichamF[] = INCBIN_COMP("graphics/pokemon/medicham/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/front.4bpp.lz"); @@ -11521,11 +11643,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RoseliaF[] = INCBIN_COMP("graphics/pokemon/roselia/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/anim_front.4bpp.lz"); @@ -11544,11 +11668,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RoseradeF[] = INCBIN_COMP("graphics/pokemon/roserade/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ROSELIA @@ -11580,11 +11706,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GulpinF[] = INCBIN_COMP("graphics/pokemon/gulpin/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz"); @@ -11613,11 +11741,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SwalotF[] = INCBIN_COMP("graphics/pokemon/swalot/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_GULPIN #if P_FAMILY_CARVANHA @@ -11775,11 +11905,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_NumelF[] = INCBIN_COMP("graphics/pokemon/numel/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz"); @@ -11808,11 +11940,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CameruptF[] = INCBIN_COMP("graphics/pokemon/camerupt/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/front.4bpp.lz"); @@ -12071,10 +12205,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CacturneF[] = INCBIN_COMP("graphics/pokemon/cacturne/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CACNEA #if P_FAMILY_SWABLU @@ -12599,11 +12735,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_MiloticF[] = INCBIN_COMP("graphics/pokemon/milotic/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FEEBAS #if P_FAMILY_CASTFORM @@ -13229,11 +13367,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_RelicanthF[] = INCBIN_COMP("graphics/pokemon/relicanth/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_RELICANTH #if P_FAMILY_LUVDISC @@ -14021,11 +14161,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_StarlyF[] = INCBIN_COMP("graphics/pokemon/starly/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/anim_front.4bpp.lz"); const u32 gMonPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/normal.gbapal.lz"); @@ -14043,11 +14185,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_StaraviaF[] = INCBIN_COMP("graphics/pokemon/staravia/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/anim_front.4bpp.lz"); const u32 gMonPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/normal.gbapal.lz"); @@ -14065,10 +14209,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_StaraptorF[] = INCBIN_COMP("graphics/pokemon/staraptor/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_STARLY #if P_FAMILY_BIDOOF @@ -14088,11 +14234,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BidoofF[] = INCBIN_COMP("graphics/pokemon/bidoof/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/anim_front.4bpp.lz"); const u32 gMonPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/normal.gbapal.lz"); @@ -14110,10 +14258,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BibarelF[] = INCBIN_COMP("graphics/pokemon/bibarel/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_BIDOOF #if P_FAMILY_KRICKETOT @@ -14133,11 +14283,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_KricketotF[] = INCBIN_COMP("graphics/pokemon/kricketot/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/anim_front.4bpp.lz"); const u32 gMonPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/normal.gbapal.lz"); @@ -14155,11 +14307,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_KricketuneF[] = INCBIN_COMP("graphics/pokemon/kricketune/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_KRICKETOT #if P_FAMILY_SHINX @@ -14179,11 +14333,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ShinxF[] = INCBIN_COMP("graphics/pokemon/shinx/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/anim_front.4bpp.lz"); const u32 gMonPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/normal.gbapal.lz"); @@ -14201,11 +14357,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LuxioF[] = INCBIN_COMP("graphics/pokemon/luxio/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/anim_front.4bpp.lz"); const u32 gMonPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/normal.gbapal.lz"); @@ -14223,11 +14381,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LuxrayF[] = INCBIN_COMP("graphics/pokemon/luxray/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SHINX #if P_FAMILY_CRANIDOS @@ -14403,11 +14563,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CombeeF[] = INCBIN_COMP("graphics/pokemon/combee/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz"); @@ -14443,10 +14605,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PachirisuF[] = INCBIN_COMP("graphics/pokemon/pachirisu/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PACHIRISU #if P_FAMILY_BUIZEL @@ -14466,10 +14630,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BuizelF[] = INCBIN_COMP("graphics/pokemon/buizel/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz"); const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/normal.gbapal.lz"); @@ -14487,10 +14653,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_FloatzelF[] = INCBIN_COMP("graphics/pokemon/floatzel/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_BUIZEL #if P_FAMILY_CHERUBI @@ -14828,11 +14996,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GibleF[] = INCBIN_COMP("graphics/pokemon/gible/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/anim_front.4bpp.lz"); const u32 gMonPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/normal.gbapal.lz"); @@ -14850,11 +15020,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GabiteF[] = INCBIN_COMP("graphics/pokemon/gabite/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/anim_front.4bpp.lz"); const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/normal.gbapal.lz"); @@ -14872,10 +15044,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GarchompF[] = INCBIN_COMP("graphics/pokemon/garchomp/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/front.4bpp.lz"); @@ -14959,6 +15133,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS @@ -14967,6 +15142,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_HippopotasF[] = INCBIN_COMP("graphics/pokemon/hippopotas/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz"); const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz"); @@ -14984,6 +15160,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS @@ -14995,6 +15172,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gShinyOverworldPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/overworld_shinyf.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_HIPPOPOTAS #if P_FAMILY_SKORUPI @@ -15048,11 +15226,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CroagunkF[] = INCBIN_COMP("graphics/pokemon/croagunk/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_front.4bpp.lz"); const u32 gMonPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/normal.gbapal.lz"); @@ -15070,11 +15250,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ToxicroakF[] = INCBIN_COMP("graphics/pokemon/toxicroak/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CROAGUNK #if P_FAMILY_CARNIVINE @@ -15112,11 +15294,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_FinneonF[] = INCBIN_COMP("graphics/pokemon/finneon/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/anim_front.4bpp.lz"); const u32 gMonPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/normal.gbapal.lz"); @@ -15134,11 +15318,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_LumineonF[] = INCBIN_COMP("graphics/pokemon/lumineon/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FINNEON #if P_FAMILY_SNOVER @@ -15158,11 +15344,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_SnoverF[] = INCBIN_COMP("graphics/pokemon/snover/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_front.4bpp.lz"); const u32 gMonPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/normal.gbapal.lz"); @@ -15180,10 +15368,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_AbomasnowF[] = INCBIN_COMP("graphics/pokemon/abomasnow/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/front.4bpp.lz"); @@ -16179,6 +16369,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz"); const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz"); const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/backf.4bpp.lz"); @@ -16191,6 +16382,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gShinyOverworldPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/overworld_shinyf.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PIDOVE #if P_FAMILY_BLITZLE @@ -17659,6 +17851,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz"); const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz"); const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/backf.4bpp.lz"); @@ -17671,6 +17864,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gShinyOverworldPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/overworld_shinyf.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/anim_front.4bpp.lz"); const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/normal.gbapal.lz"); @@ -17688,6 +17882,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz"); const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz"); const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/backf.4bpp.lz"); @@ -17700,6 +17895,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gShinyOverworldPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/overworld_shinyf.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FRILLISH #if P_FAMILY_ALOMOMOLA @@ -19354,12 +19550,14 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS +#if P_GENDER_DIFFERENCES const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PyroarF[] = INCBIN_COMP("graphics/pokemon/pyroar/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LITLEO #if P_FAMILY_FLABEBE diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h index ed53b34dde..276e8fcf65 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -13,9 +13,11 @@ static const struct SpriteFrameImage sPicTable_Ivysaur[] = { static const struct SpriteFrameImage sPicTable_Venusaur[] = { overworld_ascending_frames(gObjectEventPic_Venusaur, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_VenusaurF[] = { overworld_ascending_frames(gObjectEventPic_VenusaurF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_VenusaurMega[] = { overworld_ascending_frames(gObjectEventPic_VenusaurMega, 4, 4), @@ -85,9 +87,11 @@ static const struct SpriteFrameImage sPicTable_Metapod[] = { static const struct SpriteFrameImage sPicTable_Butterfree[] = { overworld_ascending_frames(gObjectEventPic_Butterfree, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ButterfreeF[] = { overworld_ascending_frames(gObjectEventPic_ButterfreeF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GIGANTAMAX_FORMS /*static const struct SpriteFrameImage sPicTable_ButterfreeGmax[] = { overworld_ascending_frames(gObjectEventPic_ButterfreeGmax, 4, 4), @@ -133,15 +137,19 @@ static const struct SpriteFrameImage sPicTable_Pidgeot[] = { static const struct SpriteFrameImage sPicTable_Rattata[] = { overworld_ascending_frames(gObjectEventPic_Rattata, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RattataF[] = { overworld_ascending_frames(gObjectEventPic_RattataF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Raticate[] = { overworld_ascending_frames(gObjectEventPic_Raticate, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RaticateF[] = { overworld_ascending_frames(gObjectEventPic_RaticateF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_ALOLAN_FORMS static const struct SpriteFrameImage sPicTable_RattataAlola[] = { overworld_ascending_frames(gObjectEventPic_RattataAlola, 4, 4), @@ -182,9 +190,11 @@ static const struct SpriteFrameImage sPicTable_PichuSpikyEared[] = { static const struct SpriteFrameImage sPicTable_Pikachu[] = { overworld_ascending_frames(gObjectEventPic_Pikachu, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_PikachuF[] = { overworld_ascending_frames(gObjectEventPic_PikachuF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_COSPLAY_PIKACHU_FORMS /*static const struct SpriteFrameImage sPicTable_PikachuCosplay[] = { overworld_ascending_frames(gObjectEventPic_PikachuCosplay, 4, 4), @@ -242,9 +252,11 @@ static const struct SpriteFrameImage sPicTable_PikachuWorld[] = { static const struct SpriteFrameImage sPicTable_Raichu[] = { overworld_ascending_frames(gObjectEventPic_Raichu, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RaichuF[] = { overworld_ascending_frames(gObjectEventPic_RaichuF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_ALOLAN_FORMS static const struct SpriteFrameImage sPicTable_RaichuAlola[] = { overworld_ascending_frames(gObjectEventPic_RaichuAlola, 4, 4), @@ -339,15 +351,19 @@ static const struct SpriteFrameImage sPicTable_Wigglytuff[] = { static const struct SpriteFrameImage sPicTable_Zubat[] = { overworld_ascending_frames(gObjectEventPic_Zubat, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ZubatF[] = { overworld_ascending_frames(gObjectEventPic_ZubatF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Golbat[] = { overworld_ascending_frames(gObjectEventPic_Golbat, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GolbatF[] = { overworld_ascending_frames(gObjectEventPic_GolbatF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Crobat[] = { overworld_ascending_frames(gObjectEventPic_Crobat, 4, 4), @@ -362,15 +378,19 @@ static const struct SpriteFrameImage sPicTable_Oddish[] = { static const struct SpriteFrameImage sPicTable_Gloom[] = { overworld_ascending_frames(gObjectEventPic_Gloom, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GloomF[] = { overworld_ascending_frames(gObjectEventPic_GloomF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Vileplume[] = { overworld_ascending_frames(gObjectEventPic_Vileplume, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_VileplumeF[] = { overworld_ascending_frames(gObjectEventPic_VileplumeF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Bellossom[] = { overworld_ascending_frames(gObjectEventPic_Bellossom, 4, 4), @@ -499,9 +519,11 @@ static const struct SpriteFrameImage sPicTable_Poliwrath[] = { static const struct SpriteFrameImage sPicTable_Politoed[] = { overworld_ascending_frames(gObjectEventPic_Politoed, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_PolitoedF[] = { overworld_ascending_frames(gObjectEventPic_PolitoedF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_POLIWAG @@ -512,15 +534,19 @@ static const struct SpriteFrameImage sPicTable_Abra[] = { static const struct SpriteFrameImage sPicTable_Kadabra[] = { overworld_ascending_frames(gObjectEventPic_Kadabra, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_KadabraF[] = { overworld_ascending_frames(gObjectEventPic_KadabraF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Alakazam[] = { overworld_ascending_frames(gObjectEventPic_Alakazam, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_AlakazamF[] = { overworld_ascending_frames(gObjectEventPic_AlakazamF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_AlakazamMega[] = { overworld_ascending_frames(gObjectEventPic_AlakazamMega, 4, 4), @@ -672,15 +698,19 @@ static const struct SpriteFrameImage sPicTable_Sirfetchd[] = { static const struct SpriteFrameImage sPicTable_Doduo[] = { overworld_ascending_frames(gObjectEventPic_Doduo, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_DoduoF[] = { overworld_ascending_frames(gObjectEventPic_DoduoF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Dodrio[] = { overworld_ascending_frames(gObjectEventPic_Dodrio, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_DodrioF[] = { overworld_ascending_frames(gObjectEventPic_DodrioF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_DODUO #if P_FAMILY_SEEL @@ -748,9 +778,11 @@ static const struct SpriteFrameImage sPicTable_Onix[] = { static const struct SpriteFrameImage sPicTable_Steelix[] = { overworld_ascending_frames(gObjectEventPic_Steelix, 8, 8), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SteelixF[] = { overworld_ascending_frames(gObjectEventPic_SteelixF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_SteelixMega[] = { overworld_ascending_frames(gObjectEventPic_SteelixMega, 4, 4), @@ -766,9 +798,11 @@ static const struct SpriteFrameImage sPicTable_Drowzee[] = { static const struct SpriteFrameImage sPicTable_Hypno[] = { overworld_ascending_frames(gObjectEventPic_Hypno, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_HypnoF[] = { overworld_ascending_frames(gObjectEventPic_HypnoF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_DROWZEE #if P_FAMILY_KRABBY @@ -878,22 +912,28 @@ static const struct SpriteFrameImage sPicTable_WeezingGalar[] = { static const struct SpriteFrameImage sPicTable_Rhyhorn[] = { overworld_ascending_frames(gObjectEventPic_Rhyhorn, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RhyhornF[] = { overworld_ascending_frames(gObjectEventPic_RhyhornF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Rhydon[] = { overworld_ascending_frames(gObjectEventPic_Rhydon, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RhydonF[] = { overworld_ascending_frames(gObjectEventPic_RhydonF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Rhyperior[] = { overworld_ascending_frames(gObjectEventPic_Rhyperior, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RhyperiorF[] = { overworld_ascending_frames(gObjectEventPic_RhyperiorF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RHYHORN @@ -921,9 +961,11 @@ static const struct SpriteFrameImage sPicTable_Tangela[] = { static const struct SpriteFrameImage sPicTable_Tangrowth[] = { overworld_ascending_frames(gObjectEventPic_Tangrowth, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_TangrowthF[] = { overworld_ascending_frames(gObjectEventPic_TangrowthF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TANGELA @@ -956,15 +998,19 @@ static const struct SpriteFrameImage sPicTable_Kingdra[] = { static const struct SpriteFrameImage sPicTable_Goldeen[] = { overworld_ascending_frames(gObjectEventPic_Goldeen, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GoldeenF[] = { overworld_ascending_frames(gObjectEventPic_GoldeenF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Seaking[] = { overworld_ascending_frames(gObjectEventPic_Seaking, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SeakingF[] = { overworld_ascending_frames(gObjectEventPic_SeakingF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_GOLDEEN #if P_FAMILY_STARYU @@ -999,16 +1045,20 @@ static const struct SpriteFrameImage sPicTable_MrRime[] = { static const struct SpriteFrameImage sPicTable_Scyther[] = { overworld_ascending_frames(gObjectEventPic_Scyther, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ScytherF[] = { overworld_ascending_frames(gObjectEventPic_ScytherF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_2_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Scizor[] = { overworld_ascending_frames(gObjectEventPic_Scizor, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ScizorF[] = { overworld_ascending_frames(gObjectEventPic_ScizorF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_ScizorMega[] = { overworld_ascending_frames(gObjectEventPic_ScizorMega, 4, 4), @@ -1098,15 +1148,19 @@ static const struct SpriteFrameImage sPicTable_TaurosPaldeaAqua[] = { static const struct SpriteFrameImage sPicTable_Magikarp[] = { overworld_ascending_frames(gObjectEventPic_Magikarp, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MagikarpF[] = { overworld_ascending_frames(gObjectEventPic_MagikarpF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Gyarados[] = { overworld_ascending_frames(gObjectEventPic_Gyarados, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GyaradosF[] = { overworld_ascending_frames(gObjectEventPic_GyaradosF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_GyaradosMega[] = { overworld_ascending_frames(gObjectEventPic_GyaradosMega, 4, 4), @@ -1135,9 +1189,11 @@ static const struct SpriteFrameImage sPicTable_Ditto[] = { static const struct SpriteFrameImage sPicTable_Eevee[] = { overworld_ascending_frames(gObjectEventPic_Eevee, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_EeveeF[] = { overworld_ascending_frames(gObjectEventPic_EeveeF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GIGANTAMAX_FORMS /*static const struct SpriteFrameImage sPicTable_EeveeGmax[] = { overworld_ascending_frames(gObjectEventPic_EeveeGmax, 4, 4), @@ -1314,9 +1370,11 @@ static const struct SpriteFrameImage sPicTable_Bayleef[] = { static const struct SpriteFrameImage sPicTable_Meganium[] = { overworld_ascending_frames(gObjectEventPic_Meganium, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MeganiumF[] = { overworld_ascending_frames(gObjectEventPic_MeganiumF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CHIKORITA #if P_FAMILY_CYNDAQUIL @@ -1370,15 +1428,19 @@ static const struct SpriteFrameImage sPicTable_Noctowl[] = { static const struct SpriteFrameImage sPicTable_Ledyba[] = { overworld_ascending_frames(gObjectEventPic_Ledyba, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LedybaF[] = { overworld_ascending_frames(gObjectEventPic_LedybaF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Ledian[] = { overworld_ascending_frames(gObjectEventPic_Ledian, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LedianF[] = { overworld_ascending_frames(gObjectEventPic_LedianF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LEDYBA #if P_FAMILY_SPINARAK @@ -1420,9 +1482,11 @@ static const struct SpriteFrameImage sPicTable_Natu[] = { static const struct SpriteFrameImage sPicTable_Xatu[] = { overworld_ascending_frames(gObjectEventPic_Xatu, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_XatuF[] = { overworld_ascending_frames(gObjectEventPic_XatuF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_NATU #if P_FAMILY_MAREEP @@ -1465,9 +1529,11 @@ static const struct SpriteFrameImage sPicTable_Bonsly[] = { static const struct SpriteFrameImage sPicTable_Sudowoodo[] = { overworld_ascending_frames(gObjectEventPic_Sudowoodo, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SudowoodoF[] = { overworld_ascending_frames(gObjectEventPic_SudowoodoF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SUDOWOODO #if P_FAMILY_HOPPIP @@ -1486,16 +1552,20 @@ static const struct SpriteFrameImage sPicTable_Jumpluff[] = { static const struct SpriteFrameImage sPicTable_Aipom[] = { overworld_ascending_frames(gObjectEventPic_Aipom, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_AipomF[] = { overworld_ascending_frames(gObjectEventPic_AipomF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Ambipom[] = { overworld_ascending_frames(gObjectEventPic_Ambipom, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_AmbipomF[] = { overworld_ascending_frames(gObjectEventPic_AmbipomF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_AIPOM @@ -1523,15 +1593,19 @@ static const struct SpriteFrameImage sPicTable_Yanmega[] = { static const struct SpriteFrameImage sPicTable_Wooper[] = { overworld_ascending_frames(gObjectEventPic_Wooper, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_WooperF[] = { overworld_ascending_frames(gObjectEventPic_WooperF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Quagsire[] = { overworld_ascending_frames(gObjectEventPic_Quagsire, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_QuagsireF[] = { overworld_ascending_frames(gObjectEventPic_QuagsireF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_PALDEAN_FORMS static const struct SpriteFrameImage sPicTable_WooperPaldea[] = { overworld_ascending_frames(gObjectEventPic_WooperPaldea, 4, 4), @@ -1546,9 +1620,11 @@ static const struct SpriteFrameImage sPicTable_Clodsire[] = { static const struct SpriteFrameImage sPicTable_Murkrow[] = { overworld_ascending_frames(gObjectEventPic_Murkrow, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MurkrowF[] = { overworld_ascending_frames(gObjectEventPic_MurkrowF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Honchkrow[] = { overworld_ascending_frames(gObjectEventPic_Honchkrow, 4, 4), @@ -1663,18 +1739,22 @@ static const struct SpriteFrameImage sPicTable_Wynaut[] = { static const struct SpriteFrameImage sPicTable_Wobbuffet[] = { overworld_ascending_frames(gObjectEventPic_Wobbuffet, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_WobbuffetF[] = { overworld_ascending_frames(gObjectEventPic_WobbuffetF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_WOBBUFFET #if P_FAMILY_GIRAFARIG static const struct SpriteFrameImage sPicTable_Girafarig[] = { overworld_ascending_frames(gObjectEventPic_Girafarig, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GirafarigF[] = { overworld_ascending_frames(gObjectEventPic_GirafarigF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_9_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Farigiraf[] = { overworld_ascending_frames(gObjectEventPic_Farigiraf, 4, 4), @@ -1711,9 +1791,11 @@ static const struct SpriteFrameImage sPicTable_DudunsparceThreeSegment[] = { static const struct SpriteFrameImage sPicTable_Gligar[] = { overworld_ascending_frames(gObjectEventPic_Gligar, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GligarF[] = { overworld_ascending_frames(gObjectEventPic_GligarF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Gliscor[] = { overworld_ascending_frames(gObjectEventPic_Gliscor, 4, 4), @@ -1754,9 +1836,11 @@ static const struct SpriteFrameImage sPicTable_Shuckle[] = { static const struct SpriteFrameImage sPicTable_Heracross[] = { overworld_ascending_frames(gObjectEventPic_Heracross, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_HeracrossF[] = { overworld_ascending_frames(gObjectEventPic_HeracrossF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_HeracrossMega[] = { overworld_ascending_frames(gObjectEventPic_HeracrossMega, 4, 4), @@ -1768,25 +1852,31 @@ static const struct SpriteFrameImage sPicTable_HeracrossF[] = { static const struct SpriteFrameImage sPicTable_Sneasel[] = { overworld_ascending_frames(gObjectEventPic_Sneasel, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SneaselF[] = { overworld_ascending_frames(gObjectEventPic_SneaselF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Weavile[] = { overworld_ascending_frames(gObjectEventPic_Weavile, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_WeavileF[] = { overworld_ascending_frames(gObjectEventPic_WeavileF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS static const struct SpriteFrameImage sPicTable_SneaselHisui[] = { overworld_ascending_frames(gObjectEventPic_SneaselHisui, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SneaselHisuiF[] = { overworld_ascending_frames(gObjectEventPic_SneaselHisuiF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Sneasler[] = { overworld_ascending_frames(gObjectEventPic_Sneasler, 4, 4), }; @@ -1800,9 +1890,11 @@ static const struct SpriteFrameImage sPicTable_Teddiursa[] = { static const struct SpriteFrameImage sPicTable_Ursaring[] = { overworld_ascending_frames(gObjectEventPic_Ursaring, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_UrsaringF[] = { overworld_ascending_frames(gObjectEventPic_UrsaringF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_8_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Ursaluna[] = { overworld_ascending_frames(gObjectEventPic_Ursaluna, 4, 4), @@ -1829,16 +1921,20 @@ static const struct SpriteFrameImage sPicTable_Swinub[] = { static const struct SpriteFrameImage sPicTable_Piloswine[] = { overworld_ascending_frames(gObjectEventPic_Piloswine, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_PiloswineF[] = { overworld_ascending_frames(gObjectEventPic_PiloswineF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Mamoswine[] = { overworld_ascending_frames(gObjectEventPic_Mamoswine, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MamoswineF[] = { overworld_ascending_frames(gObjectEventPic_MamoswineF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SWINUB @@ -1863,9 +1959,11 @@ static const struct SpriteFrameImage sPicTable_Remoraid[] = { static const struct SpriteFrameImage sPicTable_Octillery[] = { overworld_ascending_frames(gObjectEventPic_Octillery, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_OctilleryF[] = { overworld_ascending_frames(gObjectEventPic_OctilleryF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_REMORAID #if P_FAMILY_DELIBIRD @@ -1898,9 +1996,11 @@ static const struct SpriteFrameImage sPicTable_Houndour[] = { static const struct SpriteFrameImage sPicTable_Houndoom[] = { overworld_ascending_frames(gObjectEventPic_Houndoom, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_HoundoomF[] = { overworld_ascending_frames(gObjectEventPic_HoundoomF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_HoundoomMega[] = { overworld_ascending_frames(gObjectEventPic_HoundoomMega, 4, 4), @@ -1915,9 +2015,11 @@ static const struct SpriteFrameImage sPicTable_Phanpy[] = { static const struct SpriteFrameImage sPicTable_Donphan[] = { overworld_ascending_frames(gObjectEventPic_Donphan, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_DonphanF[] = { overworld_ascending_frames(gObjectEventPic_DonphanF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PHANPY #if P_FAMILY_STANTLER @@ -2017,21 +2119,27 @@ static const struct SpriteFrameImage sPicTable_Sceptile[] = { static const struct SpriteFrameImage sPicTable_Torchic[] = { overworld_ascending_frames(gObjectEventPic_Torchic, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_TorchicF[] = { overworld_ascending_frames(gObjectEventPic_TorchicF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Combusken[] = { overworld_ascending_frames(gObjectEventPic_Combusken, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_CombuskenF[] = { overworld_ascending_frames(gObjectEventPic_CombuskenF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Blaziken[] = { overworld_ascending_frames(gObjectEventPic_Blaziken, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_BlazikenF[] = { overworld_ascending_frames(gObjectEventPic_BlazikenF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_BlazikenMega[] = { overworld_ascending_frames(gObjectEventPic_BlazikenMega, 4, 4), @@ -2095,18 +2203,22 @@ static const struct SpriteFrameImage sPicTable_Silcoon[] = { static const struct SpriteFrameImage sPicTable_Beautifly[] = { overworld_ascending_frames(gObjectEventPic_Beautifly, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_BeautiflyF[] = { overworld_ascending_frames(gObjectEventPic_BeautiflyF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Cascoon[] = { overworld_ascending_frames(gObjectEventPic_Cascoon, 4, 4), }; static const struct SpriteFrameImage sPicTable_Dustox[] = { overworld_ascending_frames(gObjectEventPic_Dustox, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_DustoxF[] = { overworld_ascending_frames(gObjectEventPic_DustoxF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_WURMPLE #if P_FAMILY_LOTAD @@ -2119,9 +2231,11 @@ static const struct SpriteFrameImage sPicTable_Lombre[] = { static const struct SpriteFrameImage sPicTable_Ludicolo[] = { overworld_ascending_frames(gObjectEventPic_Ludicolo, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LudicoloF[] = { overworld_ascending_frames(gObjectEventPic_LudicoloF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LOTAD #if P_FAMILY_SEEDOT @@ -2131,15 +2245,19 @@ static const struct SpriteFrameImage sPicTable_Seedot[] = { static const struct SpriteFrameImage sPicTable_Nuzleaf[] = { overworld_ascending_frames(gObjectEventPic_Nuzleaf, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_NuzleafF[] = { overworld_ascending_frames(gObjectEventPic_NuzleafF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Shiftry[] = { overworld_ascending_frames(gObjectEventPic_Shiftry, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ShiftryF[] = { overworld_ascending_frames(gObjectEventPic_ShiftryF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SEEDOT #if P_FAMILY_TAILLOW @@ -2314,15 +2432,19 @@ static const struct SpriteFrameImage sPicTable_Aggron[] = { static const struct SpriteFrameImage sPicTable_Meditite[] = { overworld_ascending_frames(gObjectEventPic_Meditite, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MedititeF[] = { overworld_ascending_frames(gObjectEventPic_MedititeF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Medicham[] = { overworld_ascending_frames(gObjectEventPic_Medicham, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MedichamF[] = { overworld_ascending_frames(gObjectEventPic_MedichamF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_MedichamMega[] = { overworld_ascending_frames(gObjectEventPic_MedichamMega, 4, 4), @@ -2374,17 +2496,20 @@ static const struct SpriteFrameImage sPicTable_Budew[] = { static const struct SpriteFrameImage sPicTable_Roselia[] = { overworld_ascending_frames(gObjectEventPic_Roselia, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RoseliaF[] = { overworld_ascending_frames(gObjectEventPic_RoseliaF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_GEN_4_CROSS_EVOS static const struct SpriteFrameImage sPicTable_Roserade[] = { overworld_ascending_frames(gObjectEventPic_Roserade, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RoseradeF[] = { overworld_ascending_frames(gObjectEventPic_RoseradeF, 4, 4), }; - +#endif //P_GENDER_DIFFERENCES #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ROSELIA @@ -2392,15 +2517,19 @@ static const struct SpriteFrameImage sPicTable_RoseradeF[] = { static const struct SpriteFrameImage sPicTable_Gulpin[] = { overworld_ascending_frames(gObjectEventPic_Gulpin, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GulpinF[] = { overworld_ascending_frames(gObjectEventPic_GulpinF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Swalot[] = { overworld_ascending_frames(gObjectEventPic_Swalot, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SwalotF[] = { overworld_ascending_frames(gObjectEventPic_SwalotF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_GULPIN #if P_FAMILY_CARVANHA @@ -2430,15 +2559,19 @@ static const struct SpriteFrameImage sPicTable_Wailord[] = { static const struct SpriteFrameImage sPicTable_Numel[] = { overworld_ascending_frames(gObjectEventPic_Numel, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_NumelF[] = { overworld_ascending_frames(gObjectEventPic_NumelF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Camerupt[] = { overworld_ascending_frames(gObjectEventPic_Camerupt, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_CameruptF[] = { overworld_ascending_frames(gObjectEventPic_CameruptF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_CameruptMega[] = { overworld_ascending_frames(gObjectEventPic_CameruptMega, 4, 4), @@ -2486,9 +2619,11 @@ static const struct SpriteFrameImage sPicTable_Cacnea[] = { static const struct SpriteFrameImage sPicTable_Cacturne[] = { overworld_ascending_frames(gObjectEventPic_Cacturne, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_CacturneF[] = { overworld_ascending_frames(gObjectEventPic_CacturneF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CACNEA #if P_FAMILY_SWABLU @@ -2581,9 +2716,11 @@ static const struct SpriteFrameImage sPicTable_Feebas[] = { static const struct SpriteFrameImage sPicTable_Milotic[] = { overworld_ascending_frames(gObjectEventPic_Milotic, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_MiloticF[] = { overworld_ascending_frames(gObjectEventPic_MiloticF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FEEBAS #if P_FAMILY_CASTFORM @@ -2711,9 +2848,11 @@ static const struct SpriteFrameImage sPicTable_Gorebyss[] = { static const struct SpriteFrameImage sPicTable_Relicanth[] = { overworld_ascending_frames(gObjectEventPic_Relicanth, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_RelicanthF[] = { overworld_ascending_frames(gObjectEventPic_RelicanthF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_RELICANTH #if P_FAMILY_LUVDISC @@ -2890,72 +3029,92 @@ static const struct SpriteFrameImage sPicTable_Empoleon[] = { static const struct SpriteFrameImage sPicTable_Starly[] = { overworld_ascending_frames(gObjectEventPic_Starly, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_StarlyF[] = { overworld_ascending_frames(gObjectEventPic_StarlyF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Staravia[] = { overworld_ascending_frames(gObjectEventPic_Staravia, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_StaraviaF[] = { overworld_ascending_frames(gObjectEventPic_StaraviaF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Staraptor[] = { overworld_ascending_frames(gObjectEventPic_Staraptor, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_StaraptorF[] = { overworld_ascending_frames(gObjectEventPic_StaraptorF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_STARLY #if P_FAMILY_BIDOOF static const struct SpriteFrameImage sPicTable_Bidoof[] = { overworld_ascending_frames(gObjectEventPic_Bidoof, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_BidoofF[] = { overworld_ascending_frames(gObjectEventPic_BidoofF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Bibarel[] = { overworld_ascending_frames(gObjectEventPic_Bibarel, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_BibarelF[] = { overworld_ascending_frames(gObjectEventPic_BibarelF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_BIDOOF #if P_FAMILY_KRICKETOT static const struct SpriteFrameImage sPicTable_Kricketot[] = { overworld_ascending_frames(gObjectEventPic_Kricketot, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_KricketotF[] = { overworld_ascending_frames(gObjectEventPic_KricketotF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Kricketune[] = { overworld_ascending_frames(gObjectEventPic_Kricketune, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_KricketuneF[] = { overworld_ascending_frames(gObjectEventPic_KricketuneF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_KRICKETOT #if P_FAMILY_SHINX static const struct SpriteFrameImage sPicTable_Shinx[] = { overworld_ascending_frames(gObjectEventPic_Shinx, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ShinxF[] = { overworld_ascending_frames(gObjectEventPic_ShinxF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Luxio[] = { overworld_ascending_frames(gObjectEventPic_Luxio, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LuxioF[] = { overworld_ascending_frames(gObjectEventPic_LuxioF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Luxray[] = { overworld_ascending_frames(gObjectEventPic_Luxray, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LuxrayF[] = { overworld_ascending_frames(gObjectEventPic_LuxrayF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_SHINX #if P_FAMILY_CRANIDOS @@ -3004,9 +3163,11 @@ static const struct SpriteFrameImage sPicTable_Mothim[] = { static const struct SpriteFrameImage sPicTable_Combee[] = { overworld_ascending_frames(gObjectEventPic_Combee, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_CombeeF[] = { overworld_ascending_frames(gObjectEventPic_CombeeF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Vespiquen[] = { overworld_ascending_frames(gObjectEventPic_Vespiquen, 4, 4), }; @@ -3016,24 +3177,30 @@ static const struct SpriteFrameImage sPicTable_Vespiquen[] = { static const struct SpriteFrameImage sPicTable_Pachirisu[] = { overworld_ascending_frames(gObjectEventPic_Pachirisu, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_PachirisuF[] = { overworld_ascending_frames(gObjectEventPic_PachirisuF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PACHIRISU #if P_FAMILY_BUIZEL static const struct SpriteFrameImage sPicTable_Buizel[] = { overworld_ascending_frames(gObjectEventPic_Buizel, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_BuizelF[] = { overworld_ascending_frames(gObjectEventPic_BuizelF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Floatzel[] = { overworld_ascending_frames(gObjectEventPic_Floatzel, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_FloatzelF[] = { overworld_ascending_frames(gObjectEventPic_FloatzelF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_BUIZEL #if P_FAMILY_CHERUBI @@ -3129,21 +3296,27 @@ static const struct SpriteFrameImage sPicTable_Spiritomb[] = { static const struct SpriteFrameImage sPicTable_Gible[] = { overworld_ascending_frames(gObjectEventPic_Gible, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GibleF[] = { overworld_ascending_frames(gObjectEventPic_GibleF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Gabite[] = { overworld_ascending_frames(gObjectEventPic_Gabite, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GabiteF[] = { overworld_ascending_frames(gObjectEventPic_GabiteF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Garchomp[] = { overworld_ascending_frames(gObjectEventPic_Garchomp, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_GarchompF[] = { overworld_ascending_frames(gObjectEventPic_GarchompF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_GarchompMega[] = { overworld_ascending_frames(gObjectEventPic_GarchompMega, 4, 4), @@ -3169,9 +3342,11 @@ static const struct SpriteFrameImage sPicTable_Lucario[] = { static const struct SpriteFrameImage sPicTable_Hippopotas[] = { overworld_ascending_frames(gObjectEventPic_Hippopotas, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_HippopotasF[] = { overworld_ascending_frames(gObjectEventPic_HippopotasF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Hippowdon[] = { overworld_ascending_frames(gObjectEventPic_Hippowdon, 4, 4), }; @@ -3190,15 +3365,19 @@ static const struct SpriteFrameImage sPicTable_Drapion[] = { static const struct SpriteFrameImage sPicTable_Croagunk[] = { overworld_ascending_frames(gObjectEventPic_Croagunk, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_CroagunkF[] = { overworld_ascending_frames(gObjectEventPic_CroagunkF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Toxicroak[] = { overworld_ascending_frames(gObjectEventPic_Toxicroak, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_ToxicroakF[] = { overworld_ascending_frames(gObjectEventPic_ToxicroakF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_CROAGUNK #if P_FAMILY_CARNIVINE @@ -3211,30 +3390,38 @@ static const struct SpriteFrameImage sPicTable_Carnivine[] = { static const struct SpriteFrameImage sPicTable_Finneon[] = { overworld_ascending_frames(gObjectEventPic_Finneon, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_FinneonF[] = { overworld_ascending_frames(gObjectEventPic_FinneonF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Lumineon[] = { overworld_ascending_frames(gObjectEventPic_Lumineon, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_LumineonF[] = { overworld_ascending_frames(gObjectEventPic_LumineonF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FINNEON #if P_FAMILY_SNOVER static const struct SpriteFrameImage sPicTable_Snover[] = { overworld_ascending_frames(gObjectEventPic_Snover, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_SnoverF[] = { overworld_ascending_frames(gObjectEventPic_SnoverF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Abomasnow[] = { overworld_ascending_frames(gObjectEventPic_Abomasnow, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_AbomasnowF[] = { overworld_ascending_frames(gObjectEventPic_AbomasnowF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #if P_MEGA_EVOLUTIONS /*static const struct SpriteFrameImage sPicTable_AbomasnowMega[] = { overworld_ascending_frames(gObjectEventPic_AbomasnowMega, 4, 4), @@ -3532,9 +3719,11 @@ static const struct SpriteFrameImage sPicTable_Tranquill[] = { static const struct SpriteFrameImage sPicTable_Unfezant[] = { overworld_ascending_frames(gObjectEventPic_Unfezant, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_UnfezantF[] = { overworld_ascending_frames(gObjectEventPic_UnfezantF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_PIDOVE #if P_FAMILY_BLITZLE @@ -3931,15 +4120,19 @@ static const struct SpriteFrameImage sPicTable_Amoonguss[] = { static const struct SpriteFrameImage sPicTable_Frillish[] = { overworld_ascending_frames(gObjectEventPic_Frillish, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_FrillishF[] = { overworld_ascending_frames(gObjectEventPic_FrillishF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_Jellicent[] = { overworld_ascending_frames(gObjectEventPic_Jellicent, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_JellicentF[] = { overworld_ascending_frames(gObjectEventPic_JellicentF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_FRILLISH #if P_FAMILY_ALOMOMOLA @@ -4405,9 +4598,11 @@ static const struct SpriteFrameImage sPicTable_Litleo[] = { static const struct SpriteFrameImage sPicTable_Pyroar[] = { overworld_ascending_frames(gObjectEventPic_Pyroar, 4, 4), }; +#if P_GENDER_DIFFERENCES static const struct SpriteFrameImage sPicTable_PyroarF[] = { overworld_ascending_frames(gObjectEventPic_PyroarF, 4, 4), }; +#endif //P_GENDER_DIFFERENCES #endif //P_FAMILY_LITLEO #if P_FAMILY_FLABEBE diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 4c4b8d4b72..864fdc5297 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -30,10 +30,14 @@ #define OVERWORLD_PAL(...) \ .overworldPalette = DEFAULT(NULL, __VA_ARGS__), \ .overworldShinyPalette = DEFAULT_2(NULL, __VA_ARGS__), +#if P_GENDER_DIFFERENCES #define OVERWORLD_PAL_FEMALE(...) \ .overworldPaletteFemale = DEFAULT(NULL, __VA_ARGS__), \ .overworldShinyPaletteFemale = DEFAULT_2(NULL, __VA_ARGS__), #else +#define OVERWORLD_PAL_FEMALE(...) +#endif //P_GENDER_DIFFERENCES +#else #define OVERWORLD_PAL(...) #define OVERWORLD_PAL_FEMALE(...) #endif //OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE @@ -80,6 +84,7 @@ }, \ OVERWORLD_PAL(__VA_ARGS__) +#if P_GENDER_DIFFERENCES #define OVERWORLD_FEMALE(picTable, _size, shadow, _tracks, ...) \ .overworldDataFemale = { \ .tileTag = TAG_NONE, \ @@ -100,6 +105,9 @@ .affineAnims = gDummySpriteAffineAnimTable, \ }, \ OVERWORLD_PAL_FEMALE(__VA_ARGS__) +#else +#define OVERWORLD_FEMALE(picTable, _size, shadow, _tracks, ...) +#endif //P_GENDER_DIFFERENCES #else #define OVERWORLD(picTable, _size, shadow, _tracks, ...) @@ -238,25 +246,27 @@ const struct SpeciesInfo gSpeciesInfo[] = .trainerOffset = 0, .frontPic = gMonFrontPic_CircledQuestionMark, .frontPicSize = MON_COORDS_SIZE(64, 64), - //.frontPicFemale = gMonFrontPic_CircledQuestionMark, - //.frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_None, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CircledQuestionMark, .backPicSize = MON_COORDS_SIZE(64, 64), - //.backPicFemale = gMonBackPic_CircledQuestionMarkF, - //.backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_CircledQuestionMark, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_CircledQuestionMarkF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), + .paletteFemale = gMonPalette_CircledQuestionMarkF, + .shinyPaletteFemale = gMonShinyPalette_CircledQuestionMarkF, + .iconSpriteFemale = gMonIcon_QuestionMarkF, + .iconPalIndexFemale = 1, +#endif //P_GENDER_DIFFERENCES .backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_CircledQuestionMark, .shinyPalette = gMonShinyPalette_CircledQuestionMark, - //.paletteFemale = gMonPalette_CircledQuestionMarkF, - .shinyPaletteFemale = gMonShinyPalette_CircledQuestionMarkF, .iconSprite = gMonIcon_QuestionMark, .iconPalIndex = 0, - //.iconSpriteFemale = gMonIcon_QuestionMarkF, - //.iconPalIndexFemale = 1, FOOTPRINT(QuestionMark) .levelUpLearnset = sNoneLevelUpLearnset, .teachableLearnset = sNoneTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 289346d7ab..fa8c8d9fde 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -172,22 +172,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 388, .trainerOffset = 6, .frontPic = gMonFrontPic_Venusaur, - .frontPicFemale = gMonFrontPic_VenusaurF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Venusaur, .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Venusaur, - .backPicFemale = gMonBackPic_VenusaurF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 10, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Venusaur, .shinyPalette = gMonShinyPalette_Venusaur, .iconSprite = gMonIcon_Venusaur, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_VenusaurF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_VenusaurF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Venusaur) OVERWORLD( @@ -1184,23 +1186,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Butterfree, - .frontPicFemale = gMonFrontPic_ButterfreeF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, .frontAnimFrames = sAnims_Butterfree, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 12, .backPic = gMonBackPic_Butterfree, - .backPicFemale = gMonBackPic_ButterfreeF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Butterfree, .shinyPalette = gMonShinyPalette_Butterfree, .iconSprite = gMonIcon_Butterfree, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ButterfreeF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_ButterfreeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Butterfree) OVERWORLD( @@ -1861,22 +1865,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Rattata, - .frontPicFemale = gMonFrontPic_RattataF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 32) : MON_COORDS_SIZE(40, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 13, .frontAnimFrames = sAnims_Rattata, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_RAPID_H_HOPS : ANIM_H_JUMPS, .backPic = gMonBackPic_Rattata, - .backPicFemale = gMonBackPic_RattataF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 7, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, .palette = gMonPalette_Rattata, .shinyPalette = gMonShinyPalette_Rattata, .iconSprite = gMonIcon_Rattata, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RattataF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), + .backPicFemale = gMonBackPic_RattataF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(1, -3, SHADOW_SIZE_S) FOOTPRINT(Rattata) OVERWORLD( @@ -1935,22 +1941,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Raticate, - .frontPicFemale = gMonFrontPic_RaticateF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, .frontAnimFrames = sAnims_Raticate, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FIGURE_8 : ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Raticate, - .backPicFemale = gMonBackPic_RaticateF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 10, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, .palette = gMonPalette_Raticate, .shinyPalette = gMonShinyPalette_Raticate, .iconSprite = gMonIcon_Raticate, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RaticateF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RaticateF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 8, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( @@ -2591,27 +2599,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Pikachu, - .frontPicFemale = gMonFrontPic_PikachuF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Pikachu, .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 0 : 25, .backPic = gMonBackPic_Pikachu, - .backPicFemale = gMonBackPic_PikachuF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 4, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_Pikachu, .shinyPalette = gMonShinyPalette_Pikachu, .iconSprite = gMonIcon_Pikachu, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PikachuF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_PikachuF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_PikachuF, .iconPalIndexFemale = 2, - #endif + #endif //P_CUSTOM_GENDER_DIFF_ICONS +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 5, SHADOW_SIZE_M) OVERWORLD( sPicTable_Pikachu, @@ -3483,27 +3493,29 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Pikachu, - .frontPicFemale = gMonFrontPic_PikachuF, .frontPicSize = MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Pikachu, .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 25, .backPic = gMonBackPic_Pikachu, - .backPicFemale = gMonBackPic_PikachuF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_Pikachu, .shinyPalette = gMonShinyPalette_Pikachu, .iconSprite = gMonIcon_PikachuStarter, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PikachuF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_PikachuF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_PikachuStarterF, .iconPalIndexFemale = 2, #endif +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) OVERWORLD( @@ -3568,9 +3580,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Raichu, - .frontPicFemale = gMonFrontPic_RaichuF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, .frontAnimFrames = sAnims_Raichu, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, @@ -3582,6 +3592,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Raichu, .iconSprite = gMonIcon_Raichu, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RaichuF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 10, SHADOW_SIZE_M) FOOTPRINT(Raichu) OVERWORLD( @@ -5091,23 +5105,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Zubat, - .frontPicFemale = gMonFrontPic_ZubatF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 16, .frontAnimFrames = sAnims_Zubat, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 16, .backPic = gMonBackPic_Zubat, - .backPicFemale = gMonBackPic_ZubatF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Zubat, .shinyPalette = gMonShinyPalette_Zubat, .iconSprite = gMonIcon_Zubat, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ZubatF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_ZubatF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-4, 11, SHADOW_SIZE_S) FOOTPRINT(Zubat) OVERWORLD( @@ -5165,23 +5181,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Golbat, - .frontPicFemale = gMonFrontPic_GolbatF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 7, .frontAnimFrames = sAnims_Golbat, .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Golbat, - .backPicFemale = gMonBackPic_GolbatF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 40), - .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 13, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Golbat, .shinyPalette = gMonShinyPalette_Golbat, .iconSprite = gMonIcon_Golbat, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GolbatF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_GolbatF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 14, SHADOW_SIZE_M) FOOTPRINT(Golbat) OVERWORLD( @@ -5375,22 +5393,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gloom, - .frontPicFemale = gMonFrontPic_GloomF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, .frontAnimFrames = sAnims_Gloom, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Gloom, - .backPicFemale = gMonBackPic_GloomF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Gloom, .shinyPalette = gMonShinyPalette_Gloom, .iconSprite = gMonIcon_Gloom, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GloomF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_GloomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 3, SHADOW_SIZE_M) FOOTPRINT(Gloom) OVERWORLD( @@ -5457,22 +5477,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Vileplume, - .frontPicFemale = gMonFrontPic_VileplumeF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 7, .frontAnimFrames = sAnims_Vileplume, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW : ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Vileplume, - .backPicFemale = gMonBackPic_VileplumeF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Vileplume, .shinyPalette = gMonShinyPalette_Vileplume, .iconSprite = gMonIcon_Vileplume, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_VileplumeF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_VileplumeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 7, SHADOW_SIZE_L) FOOTPRINT(Vileplume) OVERWORLD( @@ -7412,23 +7434,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Politoed, - .frontPicFemale = gMonFrontPic_PolitoedF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, .frontAnimFrames = sAnims_Politoed, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 40, .backPic = gMonBackPic_Politoed, - .backPicFemale = gMonBackPic_PolitoedF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 5, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Politoed, .shinyPalette = gMonShinyPalette_Politoed, .iconSprite = gMonIcon_Politoed, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PolitoedF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_PolitoedF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Politoed) OVERWORLD( @@ -7559,22 +7583,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Kadabra, - .frontPicFemale = gMonFrontPic_KadabraF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Kadabra, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Kadabra, - .backPicFemale = gMonBackPic_KadabraF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Kadabra, .shinyPalette = gMonShinyPalette_Kadabra, .iconSprite = gMonIcon_Kadabra, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_KadabraF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_KadabraF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 6, SHADOW_SIZE_L) FOOTPRINT(Kadabra) OVERWORLD( @@ -7643,22 +7669,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Alakazam, - .frontPicFemale = gMonFrontPic_AlakazamF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, .frontAnimFrames = sAnims_Alakazam, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Alakazam, - .backPicFemale = gMonBackPic_AlakazamF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 6, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_Alakazam, .shinyPalette = gMonShinyPalette_Alakazam, .iconSprite = gMonIcon_Alakazam, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_AlakazamF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_AlakazamF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Alakazam) OVERWORLD( @@ -9926,22 +9954,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 257, .trainerOffset = -1, .frontPic = gMonFrontPic_Doduo, - .frontPicFemale = gMonFrontPic_DoduoF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 56) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 7, .frontAnimFrames = sAnims_Doduo, .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Doduo, - .backPicFemale = gMonBackPic_DoduoF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Doduo, .shinyPalette = gMonShinyPalette_Doduo, .iconSprite = gMonIcon_Doduo, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_DoduoF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_DoduoF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(6, 5, SHADOW_SIZE_M) FOOTPRINT(Doduo) OVERWORLD( @@ -10006,22 +10036,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 268, .trainerOffset = 0, .frontPic = gMonFrontPic_Dodrio, - .frontPicFemale = gMonFrontPic_DodrioF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Dodrio, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_LUNGE_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Dodrio, - .backPicFemale = gMonBackPic_DodrioF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 3, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Dodrio, .shinyPalette = gMonShinyPalette_Dodrio, .iconSprite = gMonIcon_Dodrio, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_DodrioF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_DodrioF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Dodrio) OVERWORLD( @@ -11006,23 +11038,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 516, .trainerOffset = 13, .frontPic = gMonFrontPic_Steelix, - .frontPicFemale = gMonFrontPic_SteelixF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Steelix, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SHAKE : ANIM_V_SHAKE, .frontAnimDelay = 45, .backPic = gMonBackPic_Steelix, - .backPicFemale = gMonBackPic_SteelixF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Steelix, .shinyPalette = gMonShinyPalette_Steelix, .iconSprite = gMonIcon_Steelix, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SteelixF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_SteelixF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Steelix) OVERWORLD( @@ -11214,23 +11248,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Hypno, - .frontPicFemale = gMonFrontPic_HypnoF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, .frontAnimFrames = sAnims_Hypno, .frontAnimId = ANIM_GROW_VIBRATE, .frontAnimDelay = 40, .backPic = gMonBackPic_Hypno, - .backPicFemale = gMonBackPic_HypnoF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 5, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Hypno, .shinyPalette = gMonShinyPalette_Hypno, .iconSprite = gMonIcon_Hypno, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_HypnoF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_HypnoF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 9, SHADOW_SIZE_L) FOOTPRINT(Hypno) OVERWORLD( @@ -12812,22 +12848,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Rhyhorn, - .frontPicFemale = gMonFrontPic_RhyhornF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 12, .frontAnimFrames = sAnims_Rhyhorn, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Rhyhorn, - .backPicFemale = gMonBackPic_RhyhornF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 11, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Rhyhorn, .shinyPalette = gMonShinyPalette_Rhyhorn, .iconSprite = gMonIcon_Rhyhorn, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RhyhornF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 40), + .backPicFemale = gMonBackPic_RhyhornF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 0, SHADOW_SIZE_L) FOOTPRINT(Rhyhorn) OVERWORLD( @@ -12885,22 +12923,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 299, .trainerOffset = 2, .frontPic = gMonFrontPic_Rhydon, - .frontPicFemale = gMonFrontPic_RhydonF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 3, .frontAnimFrames = sAnims_Rhydon, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SHRINK_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Rhydon, - .backPicFemale = gMonBackPic_RhydonF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 5, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Rhydon, .shinyPalette = gMonShinyPalette_Rhydon, .iconSprite = gMonIcon_Rhydon, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RhydonF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_RhydonF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rhydon) OVERWORLD( @@ -12965,22 +13005,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 369, .trainerOffset = 7, .frontPic = gMonFrontPic_Rhyperior, - .frontPicFemale = gMonFrontPic_RhyperiorF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Rhyperior, .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Rhyperior, - .backPicFemale = gMonBackPic_RhyperiorF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Rhyperior, .shinyPalette = gMonShinyPalette_Rhyperior, .iconSprite = gMonIcon_Rhyperior, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RhyperiorF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_RhyperiorF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rhyperior) OVERWORLD( @@ -13304,9 +13346,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 334, .trainerOffset = 4, .frontPic = gMonFrontPic_Tangrowth, - .frontPicFemale = gMonFrontPic_TangrowthF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Tangrowth, .frontAnimId = ANIM_H_STRETCH, @@ -13318,6 +13358,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tangrowth, .iconSprite = gMonIcon_Tangrowth, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_TangrowthF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tangrowth) OVERWORLD( @@ -13717,22 +13761,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Goldeen, - .frontPicFemale = gMonFrontPic_GoldeenF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 13, .frontAnimFrames = sAnims_Goldeen, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Goldeen, - .backPicFemale = gMonBackPic_GoldeenF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Goldeen, .shinyPalette = gMonShinyPalette_Goldeen, .iconSprite = gMonIcon_Goldeen, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GoldeenF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 40), + .backPicFemale = gMonBackPic_GoldeenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-6, 0, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Goldeen) OVERWORLD( @@ -13791,22 +13837,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Seaking, - .frontPicFemale = gMonFrontPic_SeakingF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, .frontAnimFrames = sAnims_Seaking, .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_Seaking, - .backPicFemale = gMonBackPic_SeakingF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Seaking, .shinyPalette = gMonShinyPalette_Seaking, .iconSprite = gMonIcon_Seaking, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SeakingF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_SeakingF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Seaking) OVERWORLD( @@ -14268,9 +14316,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 293, .trainerOffset = 2, .frontPic = gMonFrontPic_Scyther, - .frontPicFemale = gMonFrontPic_ScytherF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, .frontAnimFrames = sAnims_Scyther, .frontAnimId = ANIM_H_VIBRATE, @@ -14283,6 +14329,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Scyther, .iconSprite = gMonIcon_Scyther, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ScytherF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Scyther) OVERWORLD( @@ -14347,9 +14397,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Scizor, - .frontPicFemale = gMonFrontPic_ScizorF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, .frontAnimFrames = sAnims_Scizor, .frontAnimId = ANIM_H_VIBRATE, @@ -14362,6 +14410,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Scizor, .iconSprite = gMonIcon_Scizor, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ScizorF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Scizor) OVERWORLD( @@ -15482,22 +15534,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Magikarp, - .frontPicFemale = gMonFrontPic_MagikarpF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, .frontAnimFrames = sAnims_Magikarp, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Magikarp, - .backPicFemale = gMonBackPic_MagikarpF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Magikarp, .shinyPalette = gMonShinyPalette_Magikarp, .iconSprite = gMonIcon_Magikarp, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MagikarpF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_MagikarpF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 7, SHADOW_SIZE_M) FOOTPRINT(Magikarp) OVERWORLD( @@ -15555,22 +15609,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 481, .trainerOffset = 13, .frontPic = gMonFrontPic_Gyarados, - .frontPicFemale = gMonFrontPic_GyaradosF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 2, .frontAnimFrames = sAnims_Gyarados, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Gyarados, - .backPicFemale = gMonBackPic_GyaradosF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 5, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Gyarados, .shinyPalette = gMonShinyPalette_Gyarados, .iconSprite = gMonIcon_Gyarados, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GyaradosF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GyaradosF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(5, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gyarados) OVERWORLD( @@ -15884,22 +15940,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Eevee, - .frontPicFemale = gMonFrontPic_EeveeF, .frontPicSize = MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11, .frontAnimFrames = sAnims_Eevee, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Eevee, - .backPicFemale = gMonBackPic_EeveeF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Eevee, .shinyPalette = gMonShinyPalette_Eevee, .iconSprite = gMonIcon_Eevee, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_EeveeF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_EeveeF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Eevee) OVERWORLD( @@ -16023,26 +16081,28 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Eevee, - .frontPicFemale = gMonFrontPic_EeveeF, .frontPicSize = MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Eevee, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Eevee, - .backPicFemale = gMonBackPic_EeveeF, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Eevee, .shinyPalette = gMonShinyPalette_Eevee, .iconSprite = gMonIcon_EeveePartner, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_EeveeF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_EeveeF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_EeveePartnerF, .iconPalIndexFemale = 2, #endif +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Eevee) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index ca74ee28de..b3bd0da95a 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -172,22 +172,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 277, .trainerOffset = 1, .frontPic = gMonFrontPic_Meganium, - .frontPicFemale = gMonFrontPic_MeganiumF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(48, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Meganium, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Meganium, - .backPicFemale = gMonBackPic_MeganiumF, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Meganium, .shinyPalette = gMonShinyPalette_Meganium, .iconSprite = gMonIcon_Meganium, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MeganiumF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), + .backPicFemale = gMonBackPic_MeganiumF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Meganium) OVERWORLD( @@ -966,22 +968,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ledyba, - .frontPicFemale = gMonFrontPic_LedybaF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, .frontAnimFrames = sAnims_Ledyba, .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Ledyba, - .backPicFemale = gMonBackPic_LedybaF, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, .palette = gMonPalette_Ledyba, .shinyPalette = gMonShinyPalette_Ledyba, .iconSprite = gMonIcon_Ledyba, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LedybaF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_LedybaF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Ledyba) OVERWORLD( @@ -1039,23 +1043,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ledian, - .frontPicFemale = gMonFrontPic_LedianF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 6, .frontAnimFrames = sAnims_Ledian, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Ledian, - .backPicFemale = gMonBackPic_LedianF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 3, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Ledian, .shinyPalette = gMonShinyPalette_Ledian, .iconSprite = gMonIcon_Ledian, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LedianF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_LedianF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Ledian) OVERWORLD( @@ -1639,9 +1645,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 318, .trainerOffset = 4, .frontPic = gMonFrontPic_Xatu, - .frontPicFemale = gMonFrontPic_XatuF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 56) : MON_COORDS_SIZE(40, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 5, .frontAnimFrames = sAnims_Xatu, .frontAnimId = ANIM_GROW_VIBRATE, @@ -1653,6 +1657,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Xatu, .iconSprite = gMonIcon_Xatu, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_XatuF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Xatu) OVERWORLD( @@ -2246,22 +2254,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Sudowoodo, - .frontPicFemale = gMonFrontPic_SudowoodoF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 7, .frontAnimFrames = sAnims_Sudowoodo, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Sudowoodo, - .backPicFemale = gMonBackPic_SudowoodoF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), - .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 5, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Sudowoodo, .shinyPalette = gMonShinyPalette_Sudowoodo, .iconSprite = gMonIcon_Sudowoodo, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SudowoodoF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_SudowoodoF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Sudowoodo) OVERWORLD( @@ -2531,22 +2541,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Aipom, - .frontPicFemale = gMonFrontPic_AipomF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 64) : MON_COORDS_SIZE(32, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(32, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 1, .frontAnimFrames = sAnims_Aipom, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Aipom, - .backPicFemale = gMonBackPic_AipomF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Aipom, .shinyPalette = gMonShinyPalette_Aipom, .iconSprite = gMonIcon_Aipom, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_AipomF, + .frontPicSizeFemale = MON_COORDS_SIZE(32, 64), + .backPicFemale = gMonBackPic_AipomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Aipom) OVERWORLD( @@ -2605,22 +2617,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ambipom, - .frontPicFemale = gMonFrontPic_AmbipomF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, .frontAnimFrames = sAnims_Ambipom, .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Ambipom, - .backPicFemale = gMonBackPic_AmbipomF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Ambipom, .shinyPalette = gMonShinyPalette_Ambipom, .iconSprite = gMonIcon_Ambipom, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_AmbipomF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_AmbipomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Ambipom) OVERWORLD( @@ -2945,22 +2959,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Wooper, - .frontPicFemale = gMonFrontPic_WooperF, .frontPicSize = MON_COORDS_SIZE(40, 32), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, .frontAnimFrames = sAnims_Wooper, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wooper, - .backPicFemale = gMonBackPic_WooperF, .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Wooper, .shinyPalette = gMonShinyPalette_Wooper, .iconSprite = gMonIcon_Wooper, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_WooperF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 32), + .backPicFemale = gMonBackPic_WooperF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(1, -2, SHADOW_SIZE_S) FOOTPRINT(Wooper) OVERWORLD( @@ -3019,22 +3035,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Quagsire, - .frontPicFemale = gMonFrontPic_QuagsireF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 5, .frontAnimFrames = sAnims_Quagsire, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Quagsire, - .backPicFemale = gMonBackPic_QuagsireF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 5, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Quagsire, .shinyPalette = gMonShinyPalette_Quagsire, .iconSprite = gMonIcon_Quagsire, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_QuagsireF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_QuagsireF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 8, SHADOW_SIZE_M) FOOTPRINT(Quagsire) OVERWORLD( @@ -3224,23 +3242,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 1, .frontPic = gMonFrontPic_Murkrow, - .frontPicFemale = gMonFrontPic_MurkrowF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 15, .frontAnimFrames = sAnims_Murkrow, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 0 : 12, .backPic = gMonBackPic_Murkrow, - .backPicFemale = gMonBackPic_MurkrowF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 56), - .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Murkrow, .shinyPalette = gMonShinyPalette_Murkrow, .iconSprite = gMonIcon_Murkrow, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MurkrowF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), + .backPicFemale = gMonBackPic_MurkrowF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 8, SHADOW_SIZE_S) FOOTPRINT(Murkrow) OVERWORLD( @@ -3654,26 +3674,28 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Wobbuffet, - .frontPicFemale = gMonFrontPic_WobbuffetF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, .frontAnimFrames = sAnims_Wobbuffet, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_DEEP_V_SQUISH_AND_BOUNCE : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Wobbuffet, - .backPicFemale = gMonBackPic_WobbuffetF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Wobbuffet, .shinyPalette = gMonShinyPalette_Wobbuffet, .iconSprite = gMonIcon_Wobbuffet, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_WobbuffetF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_WobbuffetF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_WobbuffetF, .iconPalIndexFemale = 0, #endif +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 8, SHADOW_SIZE_M) FOOTPRINT(Wobbuffet) OVERWORLD( @@ -3732,22 +3754,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Girafarig, - .frontPicFemale = gMonFrontPic_GirafarigF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 0, .frontAnimFrames = sAnims_Girafarig, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_BIG : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Girafarig, - .backPicFemale = gMonBackPic_GirafarigF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 1, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Girafarig, .shinyPalette = gMonShinyPalette_Girafarig, .iconSprite = gMonIcon_Girafarig, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GirafarigF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_GirafarigF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Girafarig) OVERWORLD( @@ -4195,23 +4219,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gligar, - .frontPicFemale = gMonFrontPic_GligarF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 4, .frontAnimFrames = sAnims_Gligar, .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 8, .backPic = gMonBackPic_Gligar, - .backPicFemale = gMonBackPic_GligarF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 2, .backAnimId = BACK_ANIM_SHRINK_GROW, .palette = gMonPalette_Gligar, .shinyPalette = gMonShinyPalette_Gligar, .iconSprite = gMonIcon_Gligar, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GligarF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_GligarF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Gligar) OVERWORLD( @@ -4750,22 +4776,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Heracross, - .frontPicFemale = gMonFrontPic_HeracrossF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 1, .frontAnimFrames = sAnims_Heracross, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_LUNGE_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Heracross, - .backPicFemale = gMonBackPic_HeracrossF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 64), - .backPicSizeFemale = MON_COORDS_SIZE(48, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Heracross, .shinyPalette = gMonShinyPalette_Heracross, .iconSprite = gMonIcon_Heracross, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_HeracrossF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_HeracrossF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 10, SHADOW_SIZE_M) FOOTPRINT(Heracross) OVERWORLD( @@ -4887,22 +4915,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Sneasel, - .frontPicFemale = gMonFrontPic_SneaselF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 8, .frontAnimFrames = sAnims_Sneasel, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_H_JUMPS, .backPic = gMonBackPic_Sneasel, - .backPicFemale = gMonBackPic_SneaselF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 3, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Sneasel, .shinyPalette = gMonShinyPalette_Sneasel, .iconSprite = gMonIcon_Sneasel, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SneaselF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_SneaselF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Sneasel) OVERWORLD( @@ -4965,22 +4995,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Weavile, - .frontPicFemale = gMonFrontPic_WeavileF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Weavile, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Weavile, - .backPicFemale = gMonBackPic_WeavileF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Weavile, .shinyPalette = gMonShinyPalette_Weavile, .iconSprite = gMonIcon_Weavile, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_WeavileF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_WeavileF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-4, 10, SHADOW_SIZE_M) FOOTPRINT(Weavile) OVERWORLD( @@ -5040,22 +5072,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_SneaselHisui, - .frontPicFemale = gMonFrontPic_SneaselHisuiF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_SneaselHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SneaselHisui, - .backPicFemale = gMonBackPic_SneaselHisuiF, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, .palette = gMonPalette_SneaselHisui, .shinyPalette = gMonShinyPalette_SneaselHisui, .iconSprite = gMonIcon_SneaselHisui, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SneaselHisuiF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_SneaselHisuiF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Sneasel) OVERWORLD( @@ -5252,22 +5286,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Ursaring, - .frontPicFemale = gMonFrontPic_UrsaringF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, .frontAnimFrames = sAnims_Ursaring, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_H_SHAKE, .backPic = gMonBackPic_Ursaring, - .backPicFemale = gMonBackPic_UrsaringF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Ursaring, .shinyPalette = gMonShinyPalette_Ursaring, .iconSprite = gMonIcon_Ursaring, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_UrsaringF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_UrsaringF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 14, SHADOW_SIZE_L) FOOTPRINT(Ursaring) OVERWORLD( @@ -5649,22 +5685,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Piloswine, - .frontPicFemale = gMonFrontPic_PiloswineF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Piloswine, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Piloswine, - .backPicFemale = gMonBackPic_PiloswineF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 8, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Piloswine, .shinyPalette = gMonShinyPalette_Piloswine, .iconSprite = gMonIcon_Piloswine, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PiloswineF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_PiloswineF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 3, SHADOW_SIZE_M) FOOTPRINT(Piloswine) OVERWORLD( @@ -5728,9 +5766,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 423, .trainerOffset = 8, .frontPic = gMonFrontPic_Mamoswine, - .frontPicFemale = gMonFrontPic_MamoswineF, .frontPicSize = MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, .frontAnimFrames = sAnims_Mamoswine, .frontAnimId = ANIM_BACK_AND_LUNGE, @@ -5742,6 +5778,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Mamoswine, .iconSprite = gMonIcon_Mamoswine, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MamoswineF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(7, 7, SHADOW_SIZE_L) FOOTPRINT(Mamoswine) OVERWORLD( @@ -6077,23 +6117,25 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Octillery, - .frontPicFemale = gMonFrontPic_OctilleryF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, .frontAnimFrames = sAnims_Octillery, .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, .backPic = gMonBackPic_Octillery, - .backPicFemale = gMonBackPic_OctilleryF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, .backAnimId = BACK_ANIM_SHRINK_GROW, .palette = gMonPalette_Octillery, .shinyPalette = gMonShinyPalette_Octillery, .iconSprite = gMonIcon_Octillery, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_OctilleryF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_OctilleryF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Octillery) OVERWORLD( @@ -6479,22 +6521,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Houndoom, - .frontPicFemale = gMonFrontPic_HoundoomF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 0, .frontAnimFrames = sAnims_Houndoom, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Houndoom, - .backPicFemale = gMonBackPic_HoundoomF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 6, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Houndoom, .shinyPalette = gMonShinyPalette_Houndoom, .iconSprite = gMonIcon_Houndoom, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_HoundoomF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_HoundoomF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-5, 13, SHADOW_SIZE_L) FOOTPRINT(Houndoom) OVERWORLD( @@ -6675,22 +6719,24 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Donphan, - .frontPicFemale = gMonFrontPic_DonphanF, .frontPicSize = MON_COORDS_SIZE(64, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, .frontAnimFrames = sAnims_Donphan, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE_TWICE : ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Donphan, - .backPicFemale = gMonBackPic_DonphanF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Donphan, .shinyPalette = gMonShinyPalette_Donphan, .iconSprite = gMonIcon_Donphan, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_DonphanF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_DonphanF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(7, 2, SHADOW_SIZE_L) FOOTPRINT(Donphan) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index b52c2d8024..af1b4476d8 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -298,15 +298,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontAnimFrames = sAnims_Torchic, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Torchic, - .backPicFemale = gMonBackPic_TorchicF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(40, 48), - .backPicSizeFemale = MON_COORDS_SIZE(40, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 10, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Torchic, .shinyPalette = gMonShinyPalette_Torchic, .iconSprite = gMonIcon_Torchic, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .backPicFemale = gMonBackPic_TorchicF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Torchic) OVERWORLD( @@ -365,22 +367,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Combusken, - .frontPicFemale = gMonFrontPic_CombuskenF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(48, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 3, .frontAnimFrames = sAnims_Combusken, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Combusken, - .backPicFemale = gMonBackPic_CombuskenF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Combusken, .shinyPalette = gMonShinyPalette_Combusken, .iconSprite = gMonIcon_Combusken, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_CombuskenF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 64), + .backPicFemale = gMonBackPic_CombuskenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Combusken) OVERWORLD( @@ -443,22 +447,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 301, .trainerOffset = 4, .frontPic = gMonFrontPic_Blaziken, - .frontPicFemale = gMonFrontPic_BlazikenF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Blaziken, .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Blaziken, - .backPicFemale = gMonBackPic_BlazikenF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Blaziken, .shinyPalette = gMonShinyPalette_Blaziken, .iconSprite = gMonIcon_Blaziken, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_BlazikenF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_BlazikenF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(4, 8, SHADOW_SIZE_M) FOOTPRINT(Blaziken) OVERWORLD( @@ -1454,23 +1460,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Beautifly, - .frontPicFemale = gMonFrontPic_BeautiflyF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Beautifly, .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Beautifly, - .backPicFemale = gMonBackPic_BeautiflyF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Beautifly, .shinyPalette = gMonShinyPalette_Beautifly, .iconSprite = gMonIcon_Beautifly, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_BeautiflyF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_BeautiflyF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-5, 12, SHADOW_SIZE_S) FOOTPRINT(Beautifly) OVERWORLD( @@ -1606,23 +1614,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Dustox, - .frontPicFemale = gMonFrontPic_DustoxF, .frontPicSize = MON_COORDS_SIZE(64, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, .frontAnimFrames = sAnims_Dustox, .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, .backPic = gMonBackPic_Dustox, - .backPicFemale = gMonBackPic_DustoxF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 1, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Dustox, .shinyPalette = gMonShinyPalette_Dustox, .iconSprite = gMonIcon_Dustox, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 5, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_DustoxF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_DustoxF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Dustox) OVERWORLD( @@ -1814,22 +1824,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 268, .trainerOffset = -1, .frontPic = gMonFrontPic_Ludicolo, - .frontPicFemale = gMonFrontPic_LudicoloF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Ludicolo, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Ludicolo, - .backPicFemale = gMonBackPic_LudicoloF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 6, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, .palette = gMonPalette_Ludicolo, .shinyPalette = gMonShinyPalette_Ludicolo, .iconSprite = gMonIcon_Ludicolo, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LudicoloF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_LudicoloF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 14, SHADOW_SIZE_M) FOOTPRINT(Ludicolo) OVERWORLD( @@ -1952,22 +1964,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Nuzleaf, - .frontPicFemale = gMonFrontPic_NuzleafF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, .frontAnimFrames = sAnims_Nuzleaf, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nuzleaf, - .backPicFemale = gMonBackPic_NuzleafF, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 9, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Nuzleaf, .shinyPalette = gMonShinyPalette_Nuzleaf, .iconSprite = gMonIcon_Nuzleaf, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_NuzleafF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), + .backPicFemale = gMonBackPic_NuzleafF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 5, SHADOW_SIZE_S) FOOTPRINT(Nuzleaf) OVERWORLD( @@ -2035,22 +2049,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Shiftry, - .frontPicFemale = gMonFrontPic_ShiftryF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 7, .frontAnimFrames = sAnims_Shiftry, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Shiftry, - .backPicFemale = gMonBackPic_ShiftryF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Shiftry, .shinyPalette = gMonShinyPalette_Shiftry, .iconSprite = gMonIcon_Shiftry, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 5, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ShiftryF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_ShiftryF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Shiftry) OVERWORLD( @@ -4560,22 +4576,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Meditite, - .frontPicFemale = gMonFrontPic_MedititeF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, .frontAnimFrames = sAnims_Meditite, .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Meditite, - .backPicFemale = gMonBackPic_MedititeF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 48), - .backPicSizeFemale = MON_COORDS_SIZE(48, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 9, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Meditite, .shinyPalette = gMonShinyPalette_Meditite, .iconSprite = gMonIcon_Meditite, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MedititeF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_MedititeF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Meditite) OVERWORLD( @@ -4633,22 +4651,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Medicham, - .frontPicFemale = gMonFrontPic_MedichamF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(40, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, .frontAnimFrames = sAnims_Medicham, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Medicham, - .backPicFemale = gMonBackPic_MedichamF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Medicham, .shinyPalette = gMonShinyPalette_Medicham, .iconSprite = gMonIcon_Medicham, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MedichamF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 64), + .backPicFemale = gMonBackPic_MedichamF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 13, SHADOW_SIZE_S) FOOTPRINT(Medicham) OVERWORLD( @@ -5302,22 +5322,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Roselia, - .frontPicFemale = gMonFrontPic_RoseliaF, .frontPicSize = MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 11, .frontAnimFrames = sAnims_Roselia, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Roselia, - .backPicFemale = gMonBackPic_RoseliaF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, .backAnimId = BACK_ANIM_SHAKE_GLOW_GREEN, .palette = gMonPalette_Roselia, .shinyPalette = gMonShinyPalette_Roselia, .iconSprite = gMonIcon_Roselia, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 4, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RoseliaF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), + .backPicFemale = gMonBackPic_RoseliaF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Roselia) OVERWORLD( @@ -5386,22 +5408,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Roserade, - .frontPicFemale = gMonFrontPic_RoseradeF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Roserade, .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Roserade, - .backPicFemale = gMonBackPic_RoseradeF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Roserade, .shinyPalette = gMonShinyPalette_Roserade, .iconSprite = gMonIcon_Roserade, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RoseradeF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), + .backPicFemale = gMonBackPic_RoseradeF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Roserade) OVERWORLD( @@ -5462,22 +5486,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gulpin, - .frontPicFemale = gMonFrontPic_GulpinF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 15, .frontAnimFrames = sAnims_Gulpin, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gulpin, - .backPicFemale = gMonBackPic_GulpinF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 9, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Gulpin, .shinyPalette = gMonShinyPalette_Gulpin, .iconSprite = gMonIcon_Gulpin, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GulpinF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_GulpinF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(1, -2, SHADOW_SIZE_S) FOOTPRINT(Gulpin) OVERWORLD( @@ -5537,22 +5563,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 345, .trainerOffset = 3, .frontPic = gMonFrontPic_Swalot, - .frontPicFemale = gMonFrontPic_SwalotF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 5, .frontAnimFrames = sAnims_Swalot, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Swalot, - .backPicFemale = gMonBackPic_SwalotF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 2, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Swalot, .shinyPalette = gMonShinyPalette_Swalot, .iconSprite = gMonIcon_Swalot, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SwalotF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_SwalotF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(4, 3, SHADOW_SIZE_L) FOOTPRINT(Swalot) OVERWORLD( @@ -5931,22 +5959,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Numel, - .frontPicFemale = gMonFrontPic_NumelF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 9, .frontAnimFrames = sAnims_Numel, .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Numel, - .backPicFemale = gMonBackPic_NumelF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Numel, .shinyPalette = gMonShinyPalette_Numel, .iconSprite = gMonIcon_Numel, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_NumelF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_NumelF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(4, 2, SHADOW_SIZE_S) FOOTPRINT(Numel) OVERWORLD( @@ -6009,22 +6039,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 345, .trainerOffset = 6, .frontPic = gMonFrontPic_Camerupt, - .frontPicFemale = gMonFrontPic_CameruptF, .frontPicSize = MON_COORDS_SIZE(64, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 6, .frontAnimFrames = sAnims_Camerupt, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Camerupt, - .backPicFemale = gMonBackPic_CameruptF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 40), - .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 13, .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_Camerupt, .shinyPalette = gMonShinyPalette_Camerupt, .iconSprite = gMonIcon_Camerupt, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_CameruptF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), + .backPicFemale = gMonBackPic_CameruptF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 4, SHADOW_SIZE_L) FOOTPRINT(Camerupt) OVERWORLD( @@ -6684,9 +6716,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Cacturne, - .frontPicFemale = gMonFrontPic_CacturneF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Cacturne, .frontAnimId = ANIM_V_SLIDE, @@ -6698,6 +6728,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Cacturne, .iconSprite = gMonIcon_Cacturne, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_CacturneF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 14, SHADOW_SIZE_M) FOOTPRINT(Cacturne) OVERWORLD( @@ -7962,23 +7996,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 360, .trainerOffset = 7, .frontPic = gMonFrontPic_Milotic, - .frontPicFemale = gMonFrontPic_MiloticF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, .frontAnimFrames = sAnims_Milotic, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_GLOW_BLUE : ANIM_CIRCULAR_STRETCH_TWICE, .frontAnimDelay = 45, .backPic = gMonBackPic_Milotic, - .backPicFemale = gMonBackPic_MiloticF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 0, .backAnimId = BACK_ANIM_SHAKE_GLOW_BLUE, .palette = gMonPalette_Milotic, .shinyPalette = gMonShinyPalette_Milotic, .iconSprite = gMonIcon_Milotic, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_MiloticF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_MiloticF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Milotic) OVERWORLD( @@ -9797,22 +9833,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Relicanth, - .frontPicFemale = gMonFrontPic_RelicanthF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, .frontAnimFrames = sAnims_Relicanth, .frontAnimId = ANIM_TIP_MOVE_FORWARD, .backPic = gMonBackPic_Relicanth, - .backPicFemale = gMonBackPic_RelicanthF, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 40), - .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Relicanth, .shinyPalette = gMonShinyPalette_Relicanth, .iconSprite = gMonIcon_Relicanth, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_RelicanthF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_RelicanthF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Relicanth) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index 302c182cd5..b84284de29 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -645,22 +645,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Starly, - .frontPicFemale = gMonFrontPic_StarlyF, .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Starly, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Starly, - .backPicFemale = gMonBackPic_StarlyF, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_CONCAVE_ARC_SMALL, .palette = gMonPalette_Starly, .shinyPalette = gMonShinyPalette_Starly, .iconSprite = gMonIcon_Starly, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_StarlyF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), + .backPicFemale = gMonBackPic_StarlyF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Starly) OVERWORLD( @@ -718,22 +720,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Staravia, - .frontPicFemale = gMonFrontPic_StaraviaF, .frontPicSize = MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Staravia, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Staravia, - .backPicFemale = gMonBackPic_StaraviaF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Staravia, .shinyPalette = gMonShinyPalette_Staravia, .iconSprite = gMonIcon_Staravia, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_StaraviaF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_StaraviaF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Staravia) OVERWORLD( @@ -798,9 +802,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Staraptor, - .frontPicFemale = gMonFrontPic_StaraptorF, .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Staraptor, .frontAnimId = ANIM_V_SHAKE, @@ -812,6 +814,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Staraptor, .iconSprite = gMonIcon_Staraptor, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_StaraptorF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 10, SHADOW_SIZE_M) FOOTPRINT(Staraptor) OVERWORLD( @@ -869,22 +875,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Bidoof, - .frontPicFemale = gMonFrontPic_BidoofF, .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Bidoof, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Bidoof, - .backPicFemale = gMonBackPic_BidoofF, .backPicSize = MON_COORDS_SIZE(64, 40), - .backPicSizeFemale = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, .palette = gMonPalette_Bidoof, .shinyPalette = gMonShinyPalette_Bidoof, .iconSprite = gMonIcon_Bidoof, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_BidoofF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 40), + .backPicFemale = gMonBackPic_BidoofF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 1, SHADOW_SIZE_M) FOOTPRINT(Bidoof) OVERWORLD( @@ -942,9 +950,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Bibarel, - .frontPicFemale = gMonFrontPic_BibarelF, .frontPicSize = MON_COORDS_SIZE(56, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Bibarel, .frontAnimId = ANIM_GROW_VIBRATE, @@ -956,6 +962,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Bibarel, .iconSprite = gMonIcon_Bibarel, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_BibarelF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Bibarel) OVERWORLD( @@ -1014,22 +1024,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Kricketot, - .frontPicFemale = gMonFrontPic_KricketotF, .frontPicSize = MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, .frontAnimFrames = sAnims_Kricketot, .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Kricketot, - .backPicFemale = gMonBackPic_KricketotF, .backPicSize = MON_COORDS_SIZE(48, 56), - .backPicSizeFemale = MON_COORDS_SIZE(48, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Kricketot, .shinyPalette = gMonShinyPalette_Kricketot, .iconSprite = gMonIcon_Kricketot, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_KricketotF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_KricketotF, + .backPicSizeFemale = MON_COORDS_SIZE(48, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-5, 2, SHADOW_SIZE_S) FOOTPRINT(Kricketot) OVERWORLD( @@ -1088,22 +1100,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Kricketune, - .frontPicFemale = gMonFrontPic_KricketuneF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, .frontAnimFrames = sAnims_Kricketune, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Kricketune, - .backPicFemale = gMonBackPic_KricketuneF, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_VIBRATE, .palette = gMonPalette_Kricketune, .shinyPalette = gMonShinyPalette_Kricketune, .iconSprite = gMonIcon_Kricketune, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_KricketuneF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_KricketuneF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-3, 6, SHADOW_SIZE_S) FOOTPRINT(Kricketune) OVERWORLD( @@ -1161,22 +1175,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Shinx, - .frontPicFemale = gMonFrontPic_ShinxF, .frontPicSize = MON_COORDS_SIZE(48, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, .frontAnimFrames = sAnims_Shinx, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Shinx, - .backPicFemale = gMonBackPic_ShinxF, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Shinx, .shinyPalette = gMonShinyPalette_Shinx, .iconSprite = gMonIcon_Shinx, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ShinxF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 40), + .backPicFemale = gMonBackPic_ShinxF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Shinx) OVERWORLD( @@ -1234,22 +1250,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Luxio, - .frontPicFemale = gMonFrontPic_LuxioF, .frontPicSize = MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Luxio, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Luxio, - .backPicFemale = gMonBackPic_LuxioF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, .backAnimId = BACK_ANIM_JOLT_RIGHT, .palette = gMonPalette_Luxio, .shinyPalette = gMonShinyPalette_Luxio, .iconSprite = gMonIcon_Luxio, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LuxioF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_LuxioF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-4, 2, SHADOW_SIZE_M) FOOTPRINT(Luxio) OVERWORLD( @@ -1312,22 +1330,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 262, .trainerOffset = 0, .frontPic = gMonFrontPic_Luxray, - .frontPicFemale = gMonFrontPic_LuxrayF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Luxray, .frontAnimId = ANIM_GLOW_YELLOW, .backPic = gMonBackPic_Luxray, - .backPicFemale = gMonBackPic_LuxrayF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_Luxray, .shinyPalette = gMonShinyPalette_Luxray, .iconSprite = gMonIcon_Luxray, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LuxrayF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_LuxrayF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 10, SHADOW_SIZE_L) FOOTPRINT(Luxray) OVERWORLD( @@ -2109,11 +2129,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 22, .backAnimId = BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_Combee, - .paletteFemale = gMonPalette_CombeeF, .shinyPalette = gMonShinyPalette_Combee, - .shinyPaletteFemale = gMonShinyPalette_CombeeF, .iconSprite = gMonIcon_Combee, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .paletteFemale = gMonPalette_CombeeF, + .shinyPaletteFemale = gMonShinyPalette_CombeeF, +#endif //P_GENDER_DIFFERENCES SHADOW(-4, 10, SHADOW_SIZE_S) FOOTPRINT(Combee) OVERWORLD( @@ -2237,9 +2259,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Pachirisu, - .frontPicFemale = gMonFrontPic_PachirisuF, .frontPicSize = MON_COORDS_SIZE(48, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Pachirisu, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, @@ -2251,6 +2271,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Pachirisu, .iconSprite = gMonIcon_Pachirisu, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PachirisuF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Pachirisu) OVERWORLD( @@ -2314,15 +2338,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimFrames = sAnims_Buizel, .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Buizel, - .backPicFemale = gMonBackPic_BuizelF, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Buizel, .shinyPalette = gMonShinyPalette_Buizel, .iconSprite = gMonIcon_Buizel, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .backPicFemale = gMonBackPic_BuizelF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 4, SHADOW_SIZE_S) FOOTPRINT(Buizel) OVERWORLD( @@ -2385,15 +2411,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontAnimFrames = sAnims_Floatzel, .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Floatzel, - .backPicFemale = gMonBackPic_FloatzelF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Floatzel, .shinyPalette = gMonShinyPalette_Floatzel, .iconSprite = gMonIcon_Floatzel, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .backPicFemale = gMonBackPic_FloatzelF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-4, 10, SHADOW_SIZE_M) FOOTPRINT(Floatzel) OVERWORLD( @@ -3717,22 +3745,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Gible, - .frontPicFemale = gMonFrontPic_GibleF, .frontPicSize = MON_COORDS_SIZE(48, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Gible, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gible, - .backPicFemale = gMonBackPic_GibleF, .backPicSize = MON_COORDS_SIZE(56, 48), - .backPicSizeFemale = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_H_SHAKE, .palette = gMonPalette_Gible, .shinyPalette = gMonShinyPalette_Gible, .iconSprite = gMonIcon_Gible, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GibleF, + .frontPicSizeFemale = MON_COORDS_SIZE(48, 48), + .backPicFemale = gMonBackPic_GibleF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 48), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 5, SHADOW_SIZE_M) FOOTPRINT(Gible) OVERWORLD( @@ -3790,22 +3820,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 262, .trainerOffset = 0, .frontPic = gMonFrontPic_Gabite, - .frontPicFemale = gMonFrontPic_GabiteF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Gabite, .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Gabite, - .backPicFemale = gMonBackPic_GabiteF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_V_SHAKE, .palette = gMonPalette_Gabite, .shinyPalette = gMonShinyPalette_Gabite, .iconSprite = gMonIcon_Gabite, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GabiteF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_GabiteF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(3, 8, SHADOW_SIZE_M) FOOTPRINT(Gabite) OVERWORLD( @@ -3868,9 +3900,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 326, .trainerOffset = 4, .frontPic = gMonFrontPic_Garchomp, - .frontPicFemale = gMonFrontPic_GarchompF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Garchomp, .frontAnimId = ANIM_V_SHAKE_TWICE, @@ -3882,6 +3912,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Garchomp, .iconSprite = gMonIcon_Garchomp, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_GarchompF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(5, 11, SHADOW_SIZE_L) FOOTPRINT(Garchomp) OVERWORLD( @@ -4196,15 +4230,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 14, .backAnimId = BACK_ANIM_H_SLIDE, .palette = gMonPalette_Hippopotas, - .paletteFemale = gMonPalette_HippopotasF, .shinyPalette = gMonShinyPalette_Hippopotas, - .shinyPaletteFemale = gMonShinyPalette_HippopotasF, .iconSprite = gMonIcon_Hippopotas, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .paletteFemale = gMonPalette_HippopotasF, + .shinyPaletteFemale = gMonShinyPalette_HippopotasF, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_HippopotasF, .iconPalIndexFemale = 1, #endif +#endif //P_GENDER_DIFFERENCES SHADOW(2, -1, SHADOW_SIZE_L) FOOTPRINT(Hippopotas) OVERWORLD( @@ -4271,15 +4307,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_LOW, .palette = gMonPalette_Hippowdon, - .paletteFemale = gMonPalette_HippowdonF, .shinyPalette = gMonShinyPalette_Hippowdon, - .shinyPaletteFemale = gMonShinyPalette_HippowdonF, .iconSprite = gMonIcon_Hippowdon, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .paletteFemale = gMonPalette_HippowdonF, + .shinyPaletteFemale = gMonShinyPalette_HippowdonF, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE .iconSpriteFemale = gMonIcon_HippowdonF, .iconPalIndexFemale = 1, #endif +#endif //P_GENDER_DIFFERENCES NO_SHADOW FOOTPRINT(Hippowdon) OVERWORLD( @@ -4464,22 +4502,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Croagunk, - .frontPicFemale = gMonFrontPic_CroagunkF, .frontPicSize = MON_COORDS_SIZE(40, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Croagunk, .frontAnimId = ANIM_RAPID_H_HOPS, .backPic = gMonBackPic_Croagunk, - .backPicFemale = gMonBackPic_CroagunkF, .backPicSize = MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_GROW, .palette = gMonPalette_Croagunk, .shinyPalette = gMonShinyPalette_Croagunk, .iconSprite = gMonIcon_Croagunk, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_CroagunkF, + .frontPicSizeFemale = MON_COORDS_SIZE(40, 48), + .backPicFemale = gMonBackPic_CroagunkF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Croagunk) OVERWORLD( @@ -4538,22 +4578,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Toxicroak, - .frontPicFemale = gMonFrontPic_ToxicroakF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Toxicroak, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toxicroak, - .backPicFemale = gMonBackPic_ToxicroakF, .backPicSize = MON_COORDS_SIZE(56, 56), - .backPicSizeFemale = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, .palette = gMonPalette_Toxicroak, .shinyPalette = gMonShinyPalette_Toxicroak, .iconSprite = gMonIcon_Toxicroak, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_ToxicroakF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_ToxicroakF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(3, 7, SHADOW_SIZE_M) FOOTPRINT(Toxicroak) OVERWORLD( @@ -4676,22 +4718,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Finneon, - .frontPicFemale = gMonFrontPic_FinneonF, .frontPicSize = MON_COORDS_SIZE(32, 40), - .frontPicSizeFemale = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Finneon, .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .backPic = gMonBackPic_Finneon, - .backPicFemale = gMonBackPic_FinneonF, .backPicSize = MON_COORDS_SIZE(56, 40), - .backPicSizeFemale = MON_COORDS_SIZE(56, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Finneon, .shinyPalette = gMonShinyPalette_Finneon, .iconSprite = gMonIcon_Finneon, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_FinneonF, + .frontPicSizeFemale = MON_COORDS_SIZE(32, 40), + .backPicFemale = gMonBackPic_FinneonF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 40), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Finneon) OVERWORLD( @@ -4749,22 +4793,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Lumineon, - .frontPicFemale = gMonFrontPic_LumineonF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Lumineon, .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Lumineon, - .backPicFemale = gMonBackPic_LumineonF, .backPicSize = MON_COORDS_SIZE(56, 64), - .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Lumineon, .shinyPalette = gMonShinyPalette_Lumineon, .iconSprite = gMonIcon_Lumineon, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_LumineonF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_LumineonF, + .backPicSizeFemale = MON_COORDS_SIZE(56, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Lumineon) OVERWORLD( @@ -4823,22 +4869,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 257, .trainerOffset = 0, .frontPic = gMonFrontPic_Snover, - .frontPicFemale = gMonFrontPic_SnoverF, .frontPicSize = MON_COORDS_SIZE(64, 48), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Snover, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Snover, - .backPicFemale = gMonBackPic_SnoverF, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicSizeFemale = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Snover, .shinyPalette = gMonShinyPalette_Snover, .iconSprite = gMonIcon_Snover, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_SnoverF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 48), + .backPicFemale = gMonBackPic_SnoverF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 56), +#endif //P_GENDER_DIFFERENCES SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Snover) OVERWORLD( @@ -4898,9 +4946,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .trainerScale = 348, .trainerOffset = 6, .frontPic = gMonFrontPic_Abomasnow, - .frontPicFemale = gMonFrontPic_AbomasnowF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Abomasnow, .frontAnimId = ANIM_H_SHAKE, @@ -4912,6 +4958,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Abomasnow, .iconSprite = gMonIcon_Abomasnow, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_AbomasnowF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), +#endif //P_GENDER_DIFFERENCES SHADOW(0, 11, SHADOW_SIZE_L) FOOTPRINT(Abomasnow) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 7fe2a5008f..052b0f40c5 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -1822,26 +1822,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Unfezant, - .frontPicFemale = gMonFrontPic_UnfezantF, .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Unfezant, .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Unfezant, - .backPicFemale = gMonBackPic_UnfezantF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, .backAnimId = BACK_ANIM_V_STRETCH, .palette = gMonPalette_Unfezant, - .paletteFemale = gMonPalette_UnfezantF, .shinyPalette = gMonShinyPalette_Unfezant, - .shinyPaletteFemale = gMonShinyPalette_UnfezantF, .iconSprite = gMonIcon_Unfezant, - .iconSpriteFemale = gMonIcon_UnfezantF, .iconPalIndex = 1, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_UnfezantF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), + .backPicFemale = gMonBackPic_UnfezantF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), + .paletteFemale = gMonPalette_UnfezantF, + .shinyPaletteFemale = gMonShinyPalette_UnfezantF, + .iconSpriteFemale = gMonIcon_UnfezantF, .iconPalIndexFemale = 1, +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Unfezant) OVERWORLD( @@ -7796,26 +7798,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 256, .trainerOffset = 0, .frontPic = gMonFrontPic_Frillish, - .frontPicFemale = gMonFrontPic_FrillishF, .frontPicSize = MON_COORDS_SIZE(56, 56), - .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, .frontAnimFrames = sAnims_Frillish, .frontAnimId = ANIM_RISING_WOBBLE, .backPic = gMonBackPic_Frillish, - .backPicFemale = gMonBackPic_FrillishF, .backPicSize = MON_COORDS_SIZE(40, 56), - .backPicSizeFemale = MON_COORDS_SIZE(40, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .palette = gMonPalette_Frillish, - .paletteFemale = gMonPalette_FrillishF, .shinyPalette = gMonShinyPalette_Frillish, - .shinyPaletteFemale = gMonShinyPalette_FrillishF, .iconSprite = gMonIcon_Frillish, - .iconSpriteFemale = gMonIcon_FrillishF, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_FrillishF, + .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), + .backPicFemale = gMonBackPic_FrillishF, + .backPicSizeFemale = MON_COORDS_SIZE(40, 56), + .paletteFemale = gMonPalette_FrillishF, + .shinyPaletteFemale = gMonShinyPalette_FrillishF, + .iconSpriteFemale = gMonIcon_FrillishF, .iconPalIndexFemale = 1, +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Frillish) OVERWORLD( @@ -7875,26 +7879,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .trainerScale = 348, .trainerOffset = 6, .frontPic = gMonFrontPic_Jellicent, - .frontPicFemale = gMonFrontPic_JellicentF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Jellicent, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Jellicent, - .backPicFemale = gMonBackPic_JellicentF, .backPicSize = MON_COORDS_SIZE(64, 48), - .backPicSizeFemale = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, .backAnimId = BACK_ANIM_GROW_STUTTER, .palette = gMonPalette_Jellicent, - .paletteFemale = gMonPalette_JellicentF, .shinyPalette = gMonShinyPalette_Jellicent, - .shinyPaletteFemale = gMonShinyPalette_JellicentF, .iconSprite = gMonIcon_Jellicent, - .iconSpriteFemale = gMonIcon_JellicentF, .iconPalIndex = 0, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_JellicentF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_JellicentF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 48), + .paletteFemale = gMonPalette_JellicentF, + .shinyPaletteFemale = gMonShinyPalette_JellicentF, + .iconSpriteFemale = gMonIcon_JellicentF, .iconPalIndexFemale = 1, +#endif //P_GENDER_DIFFERENCES SHADOW(-1, 11, SHADOW_SIZE_M) FOOTPRINT(Jellicent) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 36ea31e75e..147fadbaf8 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -1496,24 +1496,26 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .trainerScale = 271, .trainerOffset = 0, .frontPic = gMonFrontPic_Pyroar, - .frontPicFemale = gMonFrontPic_PyroarF, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Pyroar, .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Pyroar, - .backPicFemale = gMonBackPic_PyroarF, .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicSizeFemale = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_H_STRETCH, .palette = gMonPalette_Pyroar, .shinyPalette = gMonShinyPalette_Pyroar, .iconSprite = gMonIcon_Pyroar, - .iconSpriteFemale = gMonIcon_PyroarF, .iconPalIndex = 2, +#if P_GENDER_DIFFERENCES + .frontPicFemale = gMonFrontPic_PyroarF, + .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), + .backPicFemale = gMonBackPic_PyroarF, + .backPicSizeFemale = MON_COORDS_SIZE(64, 64), + .iconSpriteFemale = gMonIcon_PyroarF, .iconPalIndexFemale = 2, +#endif //P_GENDER_DIFFERENCES SHADOW(-2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Pyroar) OVERWORLD( diff --git a/src/decompress.c b/src/decompress.c index 30337f5a8d..284bce48d3 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -130,18 +130,24 @@ void LoadSpecialPokePic(void *dest, s32 species, u32 personality, bool8 isFrontP if (isFrontPic) { + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].frontPicFemale != NULL && IsPersonalityFemale(species, personality)) LZ77UnCompWram(gSpeciesInfo[species].frontPicFemale, dest); - else if (gSpeciesInfo[species].frontPic != NULL) + else + #endif + if (gSpeciesInfo[species].frontPic != NULL) LZ77UnCompWram(gSpeciesInfo[species].frontPic, dest); else LZ77UnCompWram(gSpeciesInfo[SPECIES_NONE].frontPic, dest); } else { + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].backPicFemale != NULL && IsPersonalityFemale(species, personality)) LZ77UnCompWram(gSpeciesInfo[species].backPicFemale, dest); - else if (gSpeciesInfo[species].backPic != NULL) + else + #endif + if (gSpeciesInfo[species].backPic != NULL) LZ77UnCompWram(gSpeciesInfo[species].backPic, dest); else LZ77UnCompWram(gSpeciesInfo[SPECIES_NONE].backPic, dest); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index f1aefbb046..47640b8f4e 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1999,11 +1999,13 @@ static const struct ObjectEventGraphicsInfo *SpeciesToGraphicsInfo(u16 species, graphicsInfo = &gSpeciesInfo[form ? SPECIES_UNOWN_B + form - 1 : species].overworldData; break; default: + #if P_GENDER_DIFFERENCES if (form == 1 && gSpeciesInfo[species].overworldDataFemale.paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) { graphicsInfo = &gSpeciesInfo[species].overworldDataFemale; } else + #endif { graphicsInfo = &gSpeciesInfo[species].overworldData; } @@ -2037,6 +2039,7 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) if ((paletteNum = IndexOfSpritePaletteTag(palTag)) < 16) return paletteNum; spritePalette.tag = palTag; + #if P_GENDER_DIFFERENCES if (female && gSpeciesInfo[species].overworldPaletteFemale != NULL) { if (shiny) @@ -2045,6 +2048,7 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) spritePalette.data = gSpeciesInfo[species].overworldPaletteFemale; } else + #endif { if (shiny) spritePalette.data = gSpeciesInfo[species].overworldShinyPalette; diff --git a/src/pokemon.c b/src/pokemon.c index 242d28d664..c8ebdb7fff 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5811,18 +5811,24 @@ const u32 *GetMonSpritePalFromSpecies(u16 species, bool32 isShiny, bool32 isFema if (isShiny) { + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].shinyPaletteFemale != NULL && isFemale) return gSpeciesInfo[species].shinyPaletteFemale; - else if (gSpeciesInfo[species].shinyPalette != NULL) + else + #endif + if (gSpeciesInfo[species].shinyPalette != NULL) return gSpeciesInfo[species].shinyPalette; else return gSpeciesInfo[SPECIES_NONE].shinyPalette; } else { + #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].paletteFemale != NULL && isFemale) return gSpeciesInfo[species].paletteFemale; - else if (gSpeciesInfo[species].palette != NULL) + else + #endif + if (gSpeciesInfo[species].palette != NULL) return gSpeciesInfo[species].palette; else return gSpeciesInfo[SPECIES_NONE].palette; @@ -6676,12 +6682,14 @@ void TrySpecialOverworldEvo(void) bool32 SpeciesHasGenderDifferences(u16 species) { +#if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].frontPicFemale != NULL || gSpeciesInfo[species].backPicFemale != NULL || gSpeciesInfo[species].paletteFemale != NULL || gSpeciesInfo[species].shinyPaletteFemale != NULL || gSpeciesInfo[species].iconSpriteFemale != NULL) return TRUE; +#endif return FALSE; } diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 639f24327a..00aa93ffc7 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -150,8 +150,10 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u if (species > NUM_SPECIES) iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG; +#if P_GENDER_DIFFERENCES else if (gSpeciesInfo[species].iconSpriteFemale != NULL && IsPersonalityFemale(species, personality)) iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG + gSpeciesInfo[species].iconPalIndexFemale; +#endif spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority); @@ -244,9 +246,11 @@ void LoadMonIconPalettePersonality(u16 species, u32 personality) { u8 palIndex; species = SanitizeSpeciesId(species); +#if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].iconSpriteFemale != NULL && IsPersonalityFemale(species, personality)) palIndex = gSpeciesInfo[species].iconPalIndexFemale; else +#endif palIndex = gSpeciesInfo[species].iconPalIndex; if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); @@ -286,9 +290,12 @@ const u8 *GetMonIconTiles(u16 species, u32 personality) if (species > NUM_SPECIES) species = SPECIES_NONE; +#if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].iconSpriteFemale != NULL && IsPersonalityFemale(species, personality)) iconSprite = gSpeciesInfo[species].iconSpriteFemale; - else if (gSpeciesInfo[species].iconSprite != NULL) + else +#endif + if (gSpeciesInfo[species].iconSprite != NULL) iconSprite = gSpeciesInfo[species].iconSprite; else iconSprite = gSpeciesInfo[SPECIES_NONE].iconSprite; diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 05ac5816da..e34c4d8e37 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -5140,9 +5140,11 @@ static u16 TryLoadMonIconTiles(u16 species, u32 personality) { u16 i, offset; +#if P_GENDER_DIFFERENCES // Treat female mons as a seperate species as they may have a different icon than males if (gSpeciesInfo[species].iconSpriteFemale != NULL && IsPersonalityFemale(species, personality)) - species |= 0x8000; // 1 << 15 + species |= (1 << 15); +#endif // Search icon list for this species for (i = 0; i < MAX_MON_ICONS; i++) @@ -5208,11 +5210,13 @@ static struct Sprite *CreateMonIconSprite(u16 species, u32 personality, s16 x, s struct SpriteTemplate template = sSpriteTemplate_MonIcon; species = GetIconSpecies(species, personality); +#if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].iconSpriteFemale != NULL && IsPersonalityFemale(species, personality)) { template.paletteTag = PALTAG_MON_ICON_0 + gSpeciesInfo[species].iconPalIndexFemale; } else +#endif { template.paletteTag = PALTAG_MON_ICON_0 + gSpeciesInfo[species].iconPalIndex; }