From abac8874d82f1626e73ca5d0cb3056256b957215 Mon Sep 17 00:00:00 2001
From: luuma <31407427+luuma@users.noreply.github.com>
Date: Sun, 8 Mar 2026 08:51:24 +0000
Subject: [PATCH] Adds Cherrim Overworld sprite (#9442)

---
 .../pokemon/cherrim/sunshine/overworld.png    | Bin 0 -> 1148 bytes
 .../cherrim/sunshine/overworld_normal.pal     |  19 ++++++++++++++++++
 .../cherrim/sunshine/overworld_shiny.pal      |  19 ++++++++++++++++++
 spritesheet_rules.mk                          |   3 +++
 src/data/graphics/pokemon.h                   |   6 +++---
 .../object_event_pic_tables_followers.h       |   4 ++--
 .../pokemon/species_info/gen_4_families.h     |   9 +++++++++
 7 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 graphics/pokemon/cherrim/sunshine/overworld.png
 create mode 100644 graphics/pokemon/cherrim/sunshine/overworld_normal.pal
 create mode 100644 graphics/pokemon/cherrim/sunshine/overworld_shiny.pal

diff --git a/graphics/pokemon/cherrim/sunshine/overworld.png b/graphics/pokemon/cherrim/sunshine/overworld.png
new file mode 100644
index 0000000000000000000000000000000000000000..269b0b2369a922b3c2f9f1ea4ba1a61d513186e9
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq006)M001Be0{{R3b4G`^0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tk-ba9P!z>aQ?(*hhjtKg$WWc^q9Tr^ibb$c+6t{Yn7s50nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|A0SSOE>hxsNufoI7as4&dG{RNyAKeWRi>IfF+kNU
zBb|tgx%{dac!eK*7=jNWiJ5vbvzUcvece+Z)m@ZldH4NUgG#|<fKMcjG2O6;H;899
zEuHf|ahR1Qh4`F!(x3|xKXP4m`HgeQVS#6cjcj_JI7}>-x>)XFRyI`P8RCedYLqYJ
zTvj-5aaOB!*1jiyVX&aBWVlXi3<)eDi4;W0sH1`^EJSJ7NHLM7^SFn9)bXdtC6lWH
zMvev4ph9x|;D7LYwq|j9%1sK!f!-I}{ul=WyFja9+uz5w-8upM&%l+|@z<Kb+$ZUc
zjutrrhPQ!>>y9Sx0hc?#$dfJ^k|X(P3B@Aten#Jv2ST^Nz?wU^_Bl=;fGo{w`35*R
z1SU$9z3%bu{_eT`+tZ%k4=z7)i`%|Q5&!@IFi=cXMVQc_kRU+FIB595;1CcH;DD(3
zpvd@OfcW6>m}n5#uvqxua42vvFrYZdIB0laC<_MI-v9sr0b)x>L;#2d9Y_EG0%=J^
zK~z}7?U?IsgD?z*aj>I8TJ8PccD~WI!*NR2{ln5kxAT#nIK~N^rZdhs<BT)T*aH3M
zec%HgB;J&9X0c{>kAM%@zg%Vxd`HGvqb3s^0Dt!{{%Y;zcqE&@c{G78Ad5R%{}d2|
zn?F1(yT3YGfi8eVGtNZ)`-i|~8$GPlfjnVVd&va40GM2f$YnSPY#DNc48jo^++e-i
ziwyLE3iu==)aUz$faR49YME7nJ&?&VzBCveUy#T^7Xbe&*4CPR;D7^wC%6zY&=3js
zKqA}tqCZ^s2Ks>Lgau^yHW#Gd-#!G?VJSs{h7bUmtOiBrOXF*3AOU=3nvefbXs-hH
zj2Ci(0w9xhMAdnX`AVUIK46a6;Id%be%VhT0gP%bnLsAvV}3Y8@dOgUJuUb2?$S2`
z%we_hR|;1sk+rs6r<MD4WFQ0VvAp}+Z&pJ<9hS`@As&;ZGq?_GbY2<&sJ(^PNHyH=
zRYTyRM%Fb1QW>p6<T+)Xg7r%Q$tv$rBn^^&Hmd`G_Zc(z6#|)T52+fAZyx|q?`_6Q
z{P#vU0^H)t@ulP2*7vGx8v}{H23>RmN(WGtvrCp_s$m<>0FT?1c=RsNm3^nAa=qTT
zNH8`aJBa`kY^0nJb7v0s=YS!gDZZIJ#Xu&@ityy<CQZJ?21H?ildwN($ZWK<wbp~9
z8a(UaS#Gkgu=0fPG%G+Tg998zsw*;pP&@<i_`Jc3MS|XO8%PO){tJPYXZO5~avbQ(
z)50^59@T#zS)~OpJ^9u9lQ)`G?oV_D1}~-Ws~@-@M+D+O|5M?NgYgaVj3wbPX#CRv
O0000<MNUMnLSTYFGZnD_

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/cherrim/sunshine/overworld_normal.pal b/graphics/pokemon/cherrim/sunshine/overworld_normal.pal
new file mode 100644
index 0000000000..a90df82107
--- /dev/null
+++ b/graphics/pokemon/cherrim/sunshine/overworld_normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+144 32 64
+200 56 104
+248 192 224
+16 16 16
+224 128 168
+248 160 200
+248 96 128
+248 224 240
+152 104 16
+216 176 88
+248 224 112
+40 112 48
+48 160 56
+200 56 104
+120 96 40
diff --git a/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal b/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal
new file mode 100644
index 0000000000..636edb2602
--- /dev/null
+++ b/graphics/pokemon/cherrim/sunshine/overworld_shiny.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+112 40 56
+192 88 120
+248 232 232
+16 16 16
+224 128 184
+240 176 216
+224 136 176
+248 224 240
+160 88 32
+248 168 56
+248 208 120
+0 96 16
+24 144 56
+192 88 120
+160 88 32
diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index 2088feb763..827e11cea3 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -2888,6 +2888,9 @@ $(POKEMONGFXDIR)/cherubi/overworld.4bpp: %.4bpp: %.png
 $(POKEMONGFXDIR)/cherrim/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(POKEMONGFXDIR)/cherrim/sunshine/overworld.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(POKEMONGFXDIR)/shellos/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 2cdbeb2681..b2506c56f6 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -14942,12 +14942,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
 
 #if OW_POKEMON_OBJECT_EVENTS
     const u32 gObjectEventPic_CherrimOvercast[] = INCBIN_COMP("graphics/pokemon/cherrim/overworld.4bpp");
-    // const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/overworld.4bpp");
+    const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/overworld.4bpp");
 #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE
     const u16 gOverworldPalette_CherrimOvercast[] = INCBIN_U16("graphics/pokemon/cherrim/overworld_normal.gbapal");
-    // const u16 gOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_normal.gbapal");
+    const u16 gOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_normal.gbapal");
     const u16 gShinyOverworldPalette_CherrimOvercast[] = INCBIN_U16("graphics/pokemon/cherrim/overworld_shiny.gbapal");
-    // const u16 gShinyOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_shiny.gbapal");
+    const u16 gShinyOverworldPalette_CherrimSunshine[] = INCBIN_U16("graphics/pokemon/cherrim/sunshine/overworld_shiny.gbapal");
 #endif //OW_PKMN_OBJECTS_SHARE_PALETTES
 #endif //OW_POKEMON_OBJECT_EVENTS
 #endif //P_FAMILY_CHERUBI
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 4339d4c683..e859946a8e 100644
--- a/src/data/object_events/object_event_pic_tables_followers.h
+++ b/src/data/object_events/object_event_pic_tables_followers.h
@@ -3294,9 +3294,9 @@ static const struct SpriteFrameImage sPicTable_Cherubi[] = {
 static const struct SpriteFrameImage sPicTable_CherrimOvercast[] = {
     overworld_ascending_frames(gObjectEventPic_CherrimOvercast, 4, 4),
 };
-/*static const struct SpriteFrameImage sPicTable_CherrimSunshine[] = {
+static const struct SpriteFrameImage sPicTable_CherrimSunshine[] = {
     overworld_ascending_frames(gObjectEventPic_CherrimSunshine, 4, 4),
-};*/
+};
 #endif //P_FAMILY_CHERUBI
 
 #if P_FAMILY_SHELLOS
diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h
index 9122bda366..eddf9ad144 100644
--- a/src/data/pokemon/species_info/gen_4_families.h
+++ b/src/data/pokemon/species_info/gen_4_families.h
@@ -2973,6 +2973,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] =
         .pokemonJumpType = PKMN_JUMP_TYPE_FAST,
         SHADOW(1, 2, SHADOW_SIZE_S)
         FOOTPRINT(Cherrim)
+        OVERWORLD(
+            sPicTable_CherrimSunshine,
+            SIZE_32x32,
+            SHADOW_SIZE_M,
+            TRACKS_FOOT,
+            sAnimTable_Following,
+            gOverworldPalette_CherrimSunshine,
+            gShinyOverworldPalette_CherrimSunshine
+        )
         .levelUpLearnset = sCherrimLevelUpLearnset,
         .teachableLearnset = sCherrimTeachableLearnset,
         .formSpeciesIdTable = sCherrimFormSpeciesIdTable,