Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add custom female icon sprites for Pikachu and Wobbuffet #3506

Merged
merged 9 commits into from
Nov 1, 2023
Merged

Add custom female icon sprites for Pikachu and Wobbuffet #3506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a863ae
Pikachu gender difference icon
kittenchilly Oct 10, 2023
827c9d5
Delete pokeemerald-0.png
kittenchilly Oct 10, 2023
23ba364
Create iconf.png
kittenchilly Oct 10, 2023
53dc7a7
Merge branch 'upcoming' into formicons
kittenchilly Oct 31, 2023
3c8f405
Wobbuffet
kittenchilly Oct 31, 2023
2905257
Apply changes from review
kittenchilly Nov 1, 2023
0257f97
Update pokemon.h
kittenchilly Nov 1, 2023
0fe8d42
Alignment
AsparagusEduardo Nov 1, 2023
54a421b
Merge branch 'upcoming' into formicons
AsparagusEduardo Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added graphics/pokemon/pikachu/iconf.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/wobbuffet/iconf.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion include/config/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
// Species-specific settings
#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_HIPPO_GENDER_DIFF_ICONS TRUE // If TRUE, will give Hippopotas and Hippowdon custom icons for their female forms.
#define P_SHUCKLE_BERRY_JUICE TRUE // In Gen 2, Shuckle had a 1/16 chance of converting Berry that it's holding into Berry Juice. Setting this to TRUE will allow to do this with an Oran Berry, which is the spiritual succesor of the Berry item.

// Other 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_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs.
#define P_EV_CAP GEN_LATEST // Since Gen 6, the max EVs per stat is 252 instead of 255.

Expand Down
8 changes: 7 additions & 1 deletion include/graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5197,6 +5197,9 @@ extern const u8 gMonIcon_Fearow[];
extern const u8 gMonIcon_Ekans[];
extern const u8 gMonIcon_Arbok[];
extern const u8 gMonIcon_Pikachu[];
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
extern const u8 gMonIcon_PikachuF[];
#endif
extern const u8 gMonIcon_Raichu[];
extern const u8 gMonIcon_Sandshrew[];
extern const u8 gMonIcon_Sandslash[];
Expand Down Expand Up @@ -5374,6 +5377,9 @@ extern const u8 gMonIcon_Slowking[];
extern const u8 gMonIcon_Misdreavus[];
extern const u8 gMonIcon_Unown[];
extern const u8 gMonIcon_Wobbuffet[];
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
extern const u8 gMonIcon_WobbuffetF[];
#endif
extern const u8 gMonIcon_Girafarig[];
extern const u8 gMonIcon_Pineco[];
extern const u8 gMonIcon_Forretress[];
Expand Down Expand Up @@ -5623,7 +5629,7 @@ extern const u8 gMonIcon_Riolu[];
extern const u8 gMonIcon_Lucario[];
extern const u8 gMonIcon_Hippopotas[];
extern const u8 gMonIcon_Hippowdon[];
#if P_HIPPO_GENDER_DIFF_ICONS == TRUE
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
extern const u8 gMonIcon_HippopotasF[];
extern const u8 gMonIcon_HippowdonF[];
#endif
Expand Down
8 changes: 7 additions & 1 deletion src/data/graphics/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5161,6 +5161,9 @@ const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp");
const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp");
const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp");
const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp");
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
const u8 gMonIcon_PikachuF[] = INCBIN_U8("graphics/pokemon/pikachu/iconf.4bpp");
#endif
const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp");
const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp");
const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp");
Expand Down Expand Up @@ -5338,6 +5341,9 @@ const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp");
const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp");
const u8 gMonIcon_Unown[] = INCBIN_U8("graphics/pokemon/unown/icon.4bpp");
const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp");
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
const u8 gMonIcon_WobbuffetF[] = INCBIN_U8("graphics/pokemon/wobbuffet/iconf.4bpp");
#endif
const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp");
const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp");
const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp");
Expand Down Expand Up @@ -5587,7 +5593,7 @@ const u8 gMonIcon_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/icon.4bpp");
const u8 gMonIcon_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/icon.4bpp");
const u8 gMonIcon_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/icon.4bpp");
const u8 gMonIcon_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/icon.4bpp");
#if P_HIPPO_GENDER_DIFF_ICONS == TRUE
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/iconf.4bpp");
const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/iconf.4bpp");
#endif
Expand Down
8 changes: 7 additions & 1 deletion src/pokemon_icon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,11 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
// Female icon palette indexes still need to be defined in gMonIconPaletteIndicesFemale, even if they are the same as males.
const u8 *const gMonIconTableFemale[NUM_SPECIES + 1] =
{
#if P_GEN_4_POKEMON == TRUE && P_HIPPO_GENDER_DIFF_ICONS == TRUE
#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
[SPECIES_PIKACHU] = gMonIcon_PikachuF,
[SPECIES_WOBBUFFET] = gMonIcon_WobbuffetF,
#endif
#if P_GEN_4_POKEMON == TRUE && P_CUSTOM_GENDER_DIFF_ICONS == TRUE
[SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF,
[SPECIES_HIPPOWDON] = gMonIcon_HippowdonF,
#endif
Expand Down Expand Up @@ -2711,6 +2715,8 @@ const u8 gMonIconPaletteIndices[] =

const u8 gMonIconPaletteIndicesFemale[] =
{
[SPECIES_PIKACHU] = 2,
[SPECIES_WOBBUFFET] = 0,
#if P_GEN_4_POKEMON == TRUE
[SPECIES_HIPPOPOTAS] = 1,
[SPECIES_HIPPOWDON] = 1,
Expand Down
Loading