From 3a863aecc056f2cd57074ccc692785a7f7d4c984 Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue, 10 Oct 2023 15:37:29 -0500
Subject: [PATCH 1/7] Pikachu gender difference icon

---
 graphics/pokemon/pikachu/iconf.png | Bin 0 -> 347 bytes
 include/config/pokemon.h           |   2 +-
 include/graphics.h                 |   5 ++++-
 pokeemerald-0.png                  | Bin 0 -> 4743 bytes
 src/data/graphics/pokemon.h        |   5 ++++-
 src/pokemon_icon.c                 |   6 +++++-
 6 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 graphics/pokemon/pikachu/iconf.png
 create mode 100644 pokeemerald-0.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/include/config/pokemon.h b/include/config/pokemon.h
index a65eddb73c35..2d71618038e8 100644
--- a/include/config/pokemon.h
+++ b/include/config/pokemon.h
@@ -21,10 +21,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_MORE_GENDER_DIFF_ICONS    TRUE        // If TRUE, will give more Pokemon 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 09d24fc31a2f..8c8665972a74 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -5130,6 +5130,9 @@ extern const u8 gMonIcon_Fearow[];
 extern const u8 gMonIcon_Ekans[];
 extern const u8 gMonIcon_Arbok[];
 extern const u8 gMonIcon_Pikachu[];
+#if P_MORE_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[];
@@ -5556,7 +5559,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_MORE_GENDER_DIFF_ICONS == TRUE
 extern const u8 gMonIcon_HippopotasF[];
 extern const u8 gMonIcon_HippowdonF[];
 #endif
diff --git a/pokeemerald-0.png b/pokeemerald-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a60aa5a5d5d59146eca7e2b8cf01b17991d6eb3
GIT binary patch
literal 4743
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

literal 0
HcmV?d00001

diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 7c8afc0066b5..7428586cc4e3 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -5061,6 +5061,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_MORE_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");
@@ -5487,7 +5490,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_MORE_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 28a96262451b..4e704e6ec7ce 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1301,7 +1301,10 @@ 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_MORE_GENDER_DIFF_ICONS == TRUE
+    [SPECIES_PIKACHU] = gMonIcon_PikachuF,
+#endif
+#if P_GEN_4_POKEMON == TRUE && P_MORE_GENDER_DIFF_ICONS == TRUE
     [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF,
     [SPECIES_HIPPOWDON] = gMonIcon_HippowdonF,
 #endif
@@ -2534,6 +2537,7 @@ const u8 gMonIconPaletteIndices[] =
 
 const u8 gMonIconPaletteIndicesFemale[] =
 {
+    [SPECIES_PIKACHU] = 2,
 #if P_GEN_4_POKEMON == TRUE
     [SPECIES_HIPPOPOTAS] = 1,
     [SPECIES_HIPPOWDON] = 1,

From 827c9d5846d68f952dd8eae808f18bf353b7fb7c Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue, 10 Oct 2023 15:38:08 -0500
Subject: [PATCH 2/7] Delete pokeemerald-0.png

---
 pokeemerald-0.png | Bin 4743 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 pokeemerald-0.png

diff --git a/pokeemerald-0.png b/pokeemerald-0.png
deleted file mode 100644
index 6a60aa5a5d5d59146eca7e2b8cf01b17991d6eb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4743
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


From 23ba364eaab1efcd743aa6c536e3b0b5c92883ba Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue, 10 Oct 2023 15:43:43 -0500
Subject: [PATCH 3/7] Create iconf.png

---
 graphics/pokemon/wobbuffet/iconf.png | Bin 0 -> 336 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 graphics/pokemon/wobbuffet/iconf.png

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


From 3c8f405310923e6b3b17cf388878242137ce0b7f Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Tue, 31 Oct 2023 15:22:03 -0500
Subject: [PATCH 4/7] Wobbuffet

---
 include/graphics.h          | 3 +++
 src/data/graphics/pokemon.h | 3 +++
 src/pokemon_icon.c          | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/include/graphics.h b/include/graphics.h
index 4a26d46c21db..7a46b37479e1 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -5377,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_MORE_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[];
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index f17df31878ea..a9b837ee8720 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -5341,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_MORE_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");
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index e3938ff7346d..aa2f355c960a 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1392,6 +1392,7 @@ const u8 *const gMonIconTableFemale[NUM_SPECIES + 1] =
 {
 #if P_MORE_GENDER_DIFF_ICONS == TRUE
     [SPECIES_PIKACHU] = gMonIcon_PikachuF,
+    [SPECIES_WOBBUFFET] = gMonIcon_WobbuffetF,
 #endif
 #if P_GEN_4_POKEMON == TRUE && P_MORE_GENDER_DIFF_ICONS == TRUE
     [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF,
@@ -2715,6 +2716,7 @@ const u8 gMonIconPaletteIndices[] =
 const u8 gMonIconPaletteIndicesFemale[] =
 {
     [SPECIES_PIKACHU] = 2,
+    [SPECIES_WOBBUFFET] = 0,
 #if P_GEN_4_POKEMON == TRUE
     [SPECIES_HIPPOPOTAS] = 1,
     [SPECIES_HIPPOWDON] = 1,

From 29052574b3a71b3407acf80b1865499eb2130c0d Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Wed, 1 Nov 2023 14:02:42 -0500
Subject: [PATCH 5/7] Apply changes from review

---
 include/config/pokemon.h    | 6 +++---
 include/graphics.h          | 6 +++---
 src/data/graphics/pokemon.h | 6 +++---
 src/pokemon_icon.c          | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/config/pokemon.h b/include/config/pokemon.h
index a57b041e2226..39480e27560e 100644
--- a/include/config/pokemon.h
+++ b/include/config/pokemon.h
@@ -28,9 +28,9 @@
 #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_MORE_GENDER_DIFF_ICONS    TRUE        // If TRUE, will give more Pokemon 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.
+#define P_CUSTOM_GENDER_DIFF_ICONS   TRUE        // If TRUE, will give more Pokemon 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.
 
 // Flag settings
 // To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
diff --git a/include/graphics.h b/include/graphics.h
index 7a46b37479e1..97fb8811f81e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -5197,7 +5197,7 @@ extern const u8 gMonIcon_Fearow[];
 extern const u8 gMonIcon_Ekans[];
 extern const u8 gMonIcon_Arbok[];
 extern const u8 gMonIcon_Pikachu[];
-#if P_MORE_GENDER_DIFF_ICONS == TRUE
+#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
 extern const u8 gMonIcon_PikachuF[];
 #endif
 extern const u8 gMonIcon_Raichu[];
@@ -5377,7 +5377,7 @@ extern const u8 gMonIcon_Slowking[];
 extern const u8 gMonIcon_Misdreavus[];
 extern const u8 gMonIcon_Unown[];
 extern const u8 gMonIcon_Wobbuffet[];
-#if P_MORE_GENDER_DIFF_ICONS == TRUE
+#if P_CUSTOM_GENDER_DIFF_ICONS == TRUE
 extern const u8 gMonIcon_WobbuffetF[];
 #endif
 extern const u8 gMonIcon_Girafarig[];
@@ -5629,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_MORE_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 a9b837ee8720..fcdccc3e797a 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -5161,7 +5161,7 @@ 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_MORE_GENDER_DIFF_ICONS == TRUE
+#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");
@@ -5341,7 +5341,7 @@ 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_MORE_GENDER_DIFF_ICONS == TRUE
+#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");
@@ -5593,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_MORE_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 aa2f355c960a..c3a60db2c291 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1390,11 +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_MORE_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_MORE_GENDER_DIFF_ICONS == TRUE
+#if P_GEN_4_POKEMON == TRUE && P_CUSTOM_GENDER_DIFF_ICONS == TRUE
     [SPECIES_HIPPOPOTAS] = gMonIcon_HippopotasF,
     [SPECIES_HIPPOWDON] = gMonIcon_HippowdonF,
 #endif

From 0257f975eb511b2a9ff6545377c329364e37f2cd Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Wed, 1 Nov 2023 14:05:00 -0500
Subject: [PATCH 6/7] Update pokemon.h

---
 include/config/pokemon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/config/pokemon.h b/include/config/pokemon.h
index 39480e27560e..f935dd92e8d0 100644
--- a/include/config/pokemon.h
+++ b/include/config/pokemon.h
@@ -28,7 +28,7 @@
 #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 Pokemon custom icons for their female forms, i.e. Hippopotas and Hippowdon
+#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.
 

From 0fe8d42c602498ee3d9b599bc482abe49ae7aca8 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date: Wed, 1 Nov 2023 18:30:23 -0300
Subject: [PATCH 7/7] Alignment

---
 include/config/pokemon.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/config/pokemon.h b/include/config/pokemon.h
index f935dd92e8d0..119800029751 100644
--- a/include/config/pokemon.h
+++ b/include/config/pokemon.h
@@ -28,9 +28,9 @@
 #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.
+#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.
 
 // Flag settings
 // To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.