From 244ca0be95b730fd1bba87b20009372db58f5f8a Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Wed, 1 Nov 2023 16:49:44 -0500
Subject: [PATCH] Add custom female icon sprites for Pikachu and Wobbuffet
 (#3506)

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
---
 graphics/pokemon/pikachu/iconf.png   | Bin 0 -> 347 bytes
 graphics/pokemon/wobbuffet/iconf.png | Bin 0 -> 336 bytes
 include/config/pokemon.h             |   2 +-
 include/graphics.h                   |   8 +++++++-
 src/data/graphics/pokemon.h          |   8 +++++++-
 src/pokemon_icon.c                   |   8 +++++++-
 6 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 graphics/pokemon/pikachu/iconf.png
 create mode 100644 graphics/pokemon/wobbuffet/iconf.png

diff --git a/graphics/pokemon/pikachu/iconf.png b/graphics/pokemon/pikachu/iconf.png
new file mode 100644
index 0000000000000000000000000000000000000000..22eeed0a464364550c32857d8b830593516671c2
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK00001b5ch_0Itp)
z=>Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex
zVp>5#LFq)aUjP6A*-1n}R7i>Kl)(ywFbqTs3zB%4`TxJ&Hm$Vcq_;f?n}ewHOhdp|
z%D;Y4<n!*9<9bbZMXZ2{9yDWbUvnD|Pk;n8Kt}Ekn#|4XWNa6mdz58)2U?Rlex85g
zgrW$>*Mwh$ZsF(YeM+$d*aaLo#Gct^t2>BBl88+rkOMMrfMblQD-LNVqyS^pX@d@7
zpO*sc^MAdhmOow!Wa=Ri$PEwzS^SasVfsS?i$A0Q7Juk``eP%Q?vF$d(;t#p{Q)VE
t)gK#yoY7(<5DbHC1TtDA|L=SK@CB9~6u^r!S+M{B002ovPDHLkV1nB0l)V4|

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/wobbuffet/iconf.png b/graphics/pokemon/wobbuffet/iconf.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f7f86991b24b0a41f33636a69da67f260133f24
GIT binary patch
literal 336
zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK00001b5ch_0Itp)
z=>Px#Fi=cXMPi(TgM)Luy}kec|GlI^_Vy{&VnOzlDT{mmVoJ^KbDaOQq@>0FYOI`M
zVp>5#L0PGgWB>pF&PhZ;R7i>Kl)(-IAqYgx9t;>W{Qut;&}}y9=w8}O+qv=_g~*ih
z*C%A5UAentiDWql;e_=Y!mtNs)eH_W!aC4eM><eIoInsF$^nt)NS@~aWJ>8IP5=S0
zE`!hn%mFs>094(;YjyxHgdg&{4g=sI7SllCb@op4E5arS-i8j@s*5~tx)?*gau_YX
z!_{aDl-;NN>uvgl^{;p9Uu)g3e-O29*T0<r?eZ=ka{Dj&z=5&<nGZZ3W`OW`C{G~s
ifxRN`$OZqte0Ts$Ul%>gD85(#0000<MNUMnLSTZ<bd!nz

literal 0
HcmV?d00001

diff --git a/include/config/pokemon.h b/include/config/pokemon.h
index 9c233eab0fb7..119800029751 100644
--- a/include/config/pokemon.h
+++ b/include/config/pokemon.h
@@ -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.
 
diff --git a/include/graphics.h b/include/graphics.h
index d189abce0f39..97fb8811f81e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -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[];
@@ -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[];
@@ -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
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 8e539845ea36..fcdccc3e797a 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -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");
@@ -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");
@@ -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
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 6c45c4d15c97..c3a60db2c291 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -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
@@ -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,