From cd09047c4f6400fa4b150350198efabbc648a6bc Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 10 Jun 2019 11:16:52 +0200
Subject: [PATCH] Cherrim sun form gfx

---
 .../cherrim/{ => normal}/anim_front.png       | Bin
 .../pokemon/cherrim/{ => normal}/back.png     | Bin
 .../pokemon/cherrim/{ => normal}/front.png    | Bin
 .../pokemon/cherrim/{ => normal}/icon.png     | Bin
 .../pokemon/cherrim/{ => normal}/normal.pal   |   0
 .../pokemon/cherrim/{ => normal}/shiny.pal    |   0
 graphics/pokemon/cherrim/sun/back.png         | Bin 0 -> 656 bytes
 graphics/pokemon/cherrim/sun/front.png        | Bin 0 -> 608 bytes
 graphics/pokemon/cherrim/sun/normal.pal       |  19 ++++++++++++++++++
 graphics/pokemon/cherrim/sun/shiny.pal        |  19 ++++++++++++++++++
 include/constants/species.h                   |   3 +++
 include/graphics.h                            |  12 +++++++----
 src/data/graphics/pokemon.h                   |  14 ++++++++-----
 src/data/pokemon_graphics/back_pic_table.h    |   4 +++-
 src/data/pokemon_graphics/front_pic_anims.h   |   7 +++++++
 src/data/pokemon_graphics/front_pic_table.h   |   4 +++-
 src/data/pokemon_graphics/palette_table.h     |   4 +++-
 .../pokemon_graphics/shiny_palette_table.h    |   4 +++-
 18 files changed, 77 insertions(+), 13 deletions(-)
 rename graphics/pokemon/cherrim/{ => normal}/anim_front.png (100%)
 rename graphics/pokemon/cherrim/{ => normal}/back.png (100%)
 rename graphics/pokemon/cherrim/{ => normal}/front.png (100%)
 rename graphics/pokemon/cherrim/{ => normal}/icon.png (100%)
 rename graphics/pokemon/cherrim/{ => normal}/normal.pal (100%)
 rename graphics/pokemon/cherrim/{ => normal}/shiny.pal (100%)
 create mode 100644 graphics/pokemon/cherrim/sun/back.png
 create mode 100644 graphics/pokemon/cherrim/sun/front.png
 create mode 100644 graphics/pokemon/cherrim/sun/normal.pal
 create mode 100644 graphics/pokemon/cherrim/sun/shiny.pal

diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/normal/anim_front.png
similarity index 100%
rename from graphics/pokemon/cherrim/anim_front.png
rename to graphics/pokemon/cherrim/normal/anim_front.png
diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/cherrim/normal/back.png
similarity index 100%
rename from graphics/pokemon/cherrim/back.png
rename to graphics/pokemon/cherrim/normal/back.png
diff --git a/graphics/pokemon/cherrim/front.png b/graphics/pokemon/cherrim/normal/front.png
similarity index 100%
rename from graphics/pokemon/cherrim/front.png
rename to graphics/pokemon/cherrim/normal/front.png
diff --git a/graphics/pokemon/cherrim/icon.png b/graphics/pokemon/cherrim/normal/icon.png
similarity index 100%
rename from graphics/pokemon/cherrim/icon.png
rename to graphics/pokemon/cherrim/normal/icon.png
diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/cherrim/normal/normal.pal
similarity index 100%
rename from graphics/pokemon/cherrim/normal.pal
rename to graphics/pokemon/cherrim/normal/normal.pal
diff --git a/graphics/pokemon/cherrim/shiny.pal b/graphics/pokemon/cherrim/normal/shiny.pal
similarity index 100%
rename from graphics/pokemon/cherrim/shiny.pal
rename to graphics/pokemon/cherrim/normal/shiny.pal
diff --git a/graphics/pokemon/cherrim/sun/back.png b/graphics/pokemon/cherrim/sun/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..5df400429c66738019f826d424dcf6214bb0d560
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_a40yySa|s8=nxPP;DEUBu-M>;u=wEc
zpjaUIs5to0cmQA!7?3!?Sa_gVAWH}JaR2}S32;bRa{vGi!vFvd!vV){sAK>D0qIFZ
zK~zY`?UYT5<1i3~CC~vPuo^n2u|N)tXC-hMdUk<W2bj&AW1xE>?*iGl`UdUGbxCrZ
zaa;Co76VfY2V9?@Uj0PufBdzOj2-s!+%n$m0&q}SfKR%T09$4NaZZE+3s7d933rY{
z3LpoZ4#K%Zv=BnB0ZYJn2G%Z5PCDnx;BgBGabc|51<1ud&}q2^R59OOekH)HfMC(J
zZSyk$>pqAe0G)mIegkMJPw{;m{Tl&N$}cld(gFAwyp>PRNtpxcaYVezRP=%n6M&C=
z8qN~%KICD_7ppUTKX{~hw=sYIQU}0GKjQE^D6K6p<~6*$k01CJfR>s@Td}CLN8JZt
zNN&4sF%n)Fqp?P+@dl5W8_H$dfi>T#MtptbX92EUZ1i&g^qilUKjdBfqDLIGQ7K>O
zy8wNk05JVvj#vZ{YvvMo+?5C%jRAYat0Bwm&kF8`;x#@gZi^nJ{{ji1Og~i10=T<E
ztYDHTGXlkN0vf7i0f_iI<gZbSY%VP@p%oOSp4(jGYV8fZF%RIDyFi$z?|?Kc8>XIs
zreqt$G=|Mfj;m@HpzBHR0pa>;_5eu}ZK4UCzlxv2PE>(8WdZIwDx!hHHm%G7g4UW2
qP}Fs}<V~<%!4DfM-2(pAVC)lG7Xm6reZLz30000<MNUMnLSTY{coqf#

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/cherrim/sun/front.png b/graphics/pokemon/cherrim/sun/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..42c7893893e3dcdac2a6067f83070216977b9fac
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_STH!4P+0iDxDXH!z<7Z8sG#^@fcW6>
zcxWiluu%Bmh$wI{FrYZdIB0laC^2BgJ^%m!32;bRa{vGi!vFvd!vV){sAK>D0l7&;
zK~zY`?Ub=j!!Qtrld20_UByArg*t6PFb0^@$}OUuBIPmwOA$S0IuM?KCt!gM)CFf^
zZ2b%!c^@u8EZAg4LYx#S(*No1^Erz1Uw^jT>bTYjqDmlWhMz!9*c*gAOv;zurClHl
z!oxC0I}n6nctkULhz-{G0U(JQA`0B81`s2g!Y9zH0*<lIMn!&Q#6q|fBW`9LD<BZt
zMepg|^_*KKlwv+T@$L0|2o?njS-$|Xi~vYXL!4$e1hCyqJU|keis|Nk=HqNU5FI7W
zGt$vcFl*y9U&yht?ErC*%{zRmS6Zuu3DgmrLUi=D-fI!S%)1)R5+Np9>vjQfh`$r{
zA;><p*UOv$0EiuvXzd*kp;sk<#*n(4Q2XZ=0YgY>>89z%GG~kw)G$RW;N|+Qd9G+e
zikDIvxeF7$;%C%=4AAmTa!7Lhvac2%2ipXf)K3)+=#N+-Y3#c;BSJoU10N&iqp9E{
zZHIN&?<sY6&76QP(0#7~J;z$Ci4gm60RkF!!o^wQcENTJUqBLZ0=C#s0DWovl*do1
u;xFQkUt?JXICUi*=~Pv9`d`0Tj`IQO2%LTtT3SN@0000<MNUMnLSTaR?EPB+

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/cherrim/sun/normal.pal b/graphics/pokemon/cherrim/sun/normal.pal
new file mode 100644
index 0000000000..434b8ec780
--- /dev/null
+++ b/graphics/pokemon/cherrim/sun/normal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+88 48 56
+152 80 88
+248 192 184
+16 16 16
+192 120 128
+248 168 160
+248 96 128
+248 224 240
+120 104 40
+208 176 80
+248 224 136
+40 112 48
+48 160 56
+200 56 104
+120 96 40
diff --git a/graphics/pokemon/cherrim/sun/shiny.pal b/graphics/pokemon/cherrim/sun/shiny.pal
new file mode 100644
index 0000000000..636edb2602
--- /dev/null
+++ b/graphics/pokemon/cherrim/sun/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/include/constants/species.h b/include/constants/species.h
index cde0daa398..f49e73c639 100644
--- a/include/constants/species.h
+++ b/include/constants/species.h
@@ -911,6 +911,9 @@
 #define SPECIES_UNOWN_EMARK NUM_SPECIES + 27
 #define SPECIES_UNOWN_QMARK NUM_SPECIES + 28
 
+// Cherrim's sun form, not an actual species, just a different sprite.
+#define SPECIES_CHERRIM_SUN NUM_SPECIES + 29
+
 // National Dex Index Defines
 
 #define NATIONAL_DEX_NONE 0
diff --git a/include/graphics.h b/include/graphics.h
index 2fab2911df..cf3c4b4de9 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -489,7 +489,8 @@ extern const u32 gMonFrontPic_Pachirisu[];
 extern const u32 gMonFrontPic_Buizel[];
 extern const u32 gMonFrontPic_Floatzel[];
 extern const u32 gMonFrontPic_Cherubi[];
-extern const u32 gMonFrontPic_Cherrim[];
+extern const u32 gMonFrontPic_CherrimNormal[];
+extern const u32 gMonFrontPic_CherrimSun[];
 extern const u32 gMonFrontPic_ShellosE[];
 extern const u32 gMonFrontPic_GastrodonE[];
 extern const u32 gMonFrontPic_Ambipom[];
@@ -1336,7 +1337,8 @@ extern const u32 gMonBackPic_Pachirisu[];
 extern const u32 gMonBackPic_Buizel[];
 extern const u32 gMonBackPic_Floatzel[];
 extern const u32 gMonBackPic_Cherubi[];
-extern const u32 gMonBackPic_Cherrim[];
+extern const u32 gMonBackPic_CherrimNormal[];
+extern const u32 gMonBackPic_CherrimSun[];
 extern const u32 gMonBackPic_ShellosE[];
 extern const u32 gMonBackPic_GastrodonE[];
 extern const u32 gMonBackPic_Ambipom[];
@@ -2157,7 +2159,8 @@ extern const u32 gMonPalette_Pachirisu[];
 extern const u32 gMonPalette_Buizel[];
 extern const u32 gMonPalette_Floatzel[];
 extern const u32 gMonPalette_Cherubi[];
-extern const u32 gMonPalette_Cherrim[];
+extern const u32 gMonPalette_CherrimNormal[];
+extern const u32 gMonPalette_CherrimSun[];
 extern const u32 gMonPalette_ShellosE[];
 extern const u32 gMonPalette_GastrodonE[];
 extern const u32 gMonPalette_Ambipom[];
@@ -2977,7 +2980,8 @@ extern const u32 gMonShinyPalette_Pachirisu[];
 extern const u32 gMonShinyPalette_Buizel[];
 extern const u32 gMonShinyPalette_Floatzel[];
 extern const u32 gMonShinyPalette_Cherubi[];
-extern const u32 gMonShinyPalette_Cherrim[];
+extern const u32 gMonShinyPalette_CherrimNormal[];
+extern const u32 gMonShinyPalette_CherrimSun[];
 extern const u32 gMonShinyPalette_ShellosE[];
 extern const u32 gMonShinyPalette_GastrodonE[];
 extern const u32 gMonShinyPalette_Ambipom[];
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 08e1547daa..617936fb40 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -452,7 +452,8 @@ const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim
 const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz");
-const u32 gMonFrontPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz");
+const u32 gMonFrontPic_CherrimNormal[] = INCBIN_U32("graphics/pokemon/cherrim/normal/anim_front.4bpp.lz");
+const u32 gMonFrontPic_CherrimSun[] = INCBIN_U32("graphics/pokemon/cherrim/sun/front.4bpp.lz");
 const u32 gMonFrontPic_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/anim_front.4bpp.lz");
 const u32 gMonFrontPic_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz");
@@ -1299,7 +1300,8 @@ const u32 gMonBackPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/back.
 const u32 gMonBackPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/back.4bpp.lz");
 const u32 gMonBackPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/back.4bpp.lz");
 const u32 gMonBackPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/back.4bpp.lz");
-const u32 gMonBackPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/back.4bpp.lz");
+const u32 gMonBackPic_CherrimNormal[] = INCBIN_U32("graphics/pokemon/cherrim/normal/back.4bpp.lz");
+const u32 gMonBackPic_CherrimSun[] = INCBIN_U32("graphics/pokemon/cherrim/sun/back.4bpp.lz");
 const u32 gMonBackPic_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/back.4bpp.lz");
 const u32 gMonBackPic_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/back.4bpp.lz");
 const u32 gMonBackPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/back.4bpp.lz");
@@ -2120,7 +2122,8 @@ const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/norma
 const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz");
 const u32 gMonPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/normal.gbapal.lz");
 const u32 gMonPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/normal.gbapal.lz");
-const u32 gMonPalette_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/normal.gbapal.lz");
+const u32 gMonPalette_CherrimNormal[] = INCBIN_U32("graphics/pokemon/cherrim/normal/normal.gbapal.lz");
+const u32 gMonPalette_CherrimSun[] = INCBIN_U32("graphics/pokemon/cherrim/sun/normal.gbapal.lz");
 const u32 gMonPalette_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/normal.gbapal.lz");
 const u32 gMonPalette_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/normal.gbapal.lz");
 const u32 gMonPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/normal.gbapal.lz");
@@ -2940,7 +2943,8 @@ const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/
 const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CherrimNormal[] = INCBIN_U32("graphics/pokemon/cherrim/normal/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CherrimSun[] = INCBIN_U32("graphics/pokemon/cherrim/sun/shiny.gbapal.lz");
 const u32 gMonShinyPalette_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/shiny.gbapal.lz");
 const u32 gMonShinyPalette_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/shiny.gbapal.lz");
@@ -3988,7 +3992,7 @@ const u8 gMonIcon_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/icon.4bpp"
 const u8 gMonIcon_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/icon.4bpp");
 const u8 gMonIcon_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/icon.4bpp");
 const u8 gMonIcon_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/icon.4bpp");
-const u8 gMonIcon_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/icon.4bpp");
+const u8 gMonIcon_Cherrim[] = INCBIN_U8("graphics/pokemon/cherrim/normal/icon.4bpp");
 const u8 gMonIcon_Shellos[] = INCBIN_U8("graphics/pokemon/shellosE/icon.4bpp");
 const u8 gMonIcon_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodonE/icon.4bpp");
 const u8 gMonIcon_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/icon.4bpp");
diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h
index 03c48d9aa4..9d384b8e05 100644
--- a/src/data/pokemon_graphics/back_pic_table.h
+++ b/src/data/pokemon_graphics/back_pic_table.h
@@ -425,7 +425,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(BUIZEL, gMonBackPic_Buizel),
     SPECIES_SPRITE(FLOATZEL, gMonBackPic_Floatzel),
     SPECIES_SPRITE(CHERUBI, gMonBackPic_Cherubi),
-    SPECIES_SPRITE(CHERRIM, gMonBackPic_Cherrim),
+    SPECIES_SPRITE(CHERRIM, gMonBackPic_CherrimNormal),
     SPECIES_SPRITE(SHELLOS, gMonBackPic_ShellosE),
     SPECIES_SPRITE(GASTRODON, gMonBackPic_GastrodonE),
     SPECIES_SPRITE(AMBIPOM, gMonBackPic_Ambipom),
@@ -899,4 +899,6 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
     SPECIES_SPRITE(UNOWN_Z, gMonBackPic_UnownZ),
     SPECIES_SPRITE(UNOWN_EMARK, gMonBackPic_UnownExclamationMark),
     SPECIES_SPRITE(UNOWN_QMARK, gMonBackPic_UnownQuestionMark),
+
+    SPECIES_SPRITE(CHERRIM_SUN, gMonBackPic_CherrimSun),
 };
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index e7e130bc35..b38b4609f0 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -5109,6 +5109,12 @@ static const union AnimCmd sAnim_CHERRIM_1[] =
     ANIMCMD_END,
 };
 
+static const union AnimCmd sAnim_CHERRIM_SUN[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
 static const union AnimCmd sAnim_SHELLOS_1[] =
 {
     ANIMCMD_FRAME(0, 30),
@@ -10497,6 +10503,7 @@ static const union AnimCmd *const sAnims_CHERUBI[] ={
 static const union AnimCmd *const sAnims_CHERRIM[] ={
     sAnim_GeneralFrame0,
     sAnim_CHERRIM_1,
+    sAnim_CHERRIM_SUN,
 };
 
 static const union AnimCmd *const sAnims_SHELLOS[] ={
diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h
index 86efa56dc3..f514b9397d 100644
--- a/src/data/pokemon_graphics/front_pic_table.h
+++ b/src/data/pokemon_graphics/front_pic_table.h
@@ -425,7 +425,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(BUIZEL, gMonFrontPic_Buizel),
     SPECIES_SPRITE(FLOATZEL, gMonFrontPic_Floatzel),
     SPECIES_SPRITE(CHERUBI, gMonFrontPic_Cherubi),
-    SPECIES_SPRITE(CHERRIM, gMonFrontPic_Cherrim),
+    SPECIES_SPRITE(CHERRIM, gMonFrontPic_CherrimNormal),
     SPECIES_SPRITE(SHELLOS, gMonFrontPic_ShellosE),
     SPECIES_SPRITE(GASTRODON, gMonFrontPic_GastrodonE),
     SPECIES_SPRITE(AMBIPOM, gMonFrontPic_Ambipom),
@@ -899,4 +899,6 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
     SPECIES_SPRITE(UNOWN_Z, gMonFrontPic_UnownZ),
     SPECIES_SPRITE(UNOWN_EMARK, gMonFrontPic_UnownExclamationMark),
     SPECIES_SPRITE(UNOWN_QMARK, gMonFrontPic_UnownQuestionMark),
+
+    SPECIES_SPRITE(CHERRIM_SUN, gMonFrontPic_CherrimSun),
 };
diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h
index 5f6d202f8e..055fc9db0a 100644
--- a/src/data/pokemon_graphics/palette_table.h
+++ b/src/data/pokemon_graphics/palette_table.h
@@ -425,7 +425,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(BUIZEL, gMonPalette_Buizel),
     SPECIES_PAL(FLOATZEL, gMonPalette_Floatzel),
     SPECIES_PAL(CHERUBI, gMonPalette_Cherubi),
-    SPECIES_PAL(CHERRIM, gMonPalette_Cherrim),
+    SPECIES_PAL(CHERRIM, gMonPalette_CherrimNormal),
     SPECIES_PAL(SHELLOS, gMonPalette_ShellosE),
     SPECIES_PAL(GASTRODON, gMonPalette_GastrodonE),
     SPECIES_PAL(AMBIPOM, gMonPalette_Ambipom),
@@ -899,4 +899,6 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(UNOWN_Z, gMonPalette_Unown),
     SPECIES_PAL(UNOWN_EMARK, gMonPalette_Unown),
     SPECIES_PAL(UNOWN_QMARK, gMonPalette_Unown),
+
+    SPECIES_PAL(CHERRIM_SUN, gMonPalette_CherrimSun),
 };
diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h
index 2a9578e620..8145c20807 100644
--- a/src/data/pokemon_graphics/shiny_palette_table.h
+++ b/src/data/pokemon_graphics/shiny_palette_table.h
@@ -425,7 +425,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(BUIZEL, gMonShinyPalette_Buizel),
     SPECIES_SHINY_PAL(FLOATZEL, gMonShinyPalette_Floatzel),
     SPECIES_SHINY_PAL(CHERUBI, gMonShinyPalette_Cherubi),
-    SPECIES_SHINY_PAL(CHERRIM, gMonShinyPalette_Cherrim),
+    SPECIES_SHINY_PAL(CHERRIM, gMonShinyPalette_CherrimNormal),
     SPECIES_SHINY_PAL(SHELLOS, gMonShinyPalette_ShellosE),
     SPECIES_SHINY_PAL(GASTRODON, gMonShinyPalette_GastrodonE),
     SPECIES_SHINY_PAL(AMBIPOM, gMonShinyPalette_Ambipom),
@@ -899,4 +899,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(UNOWN_Z, gMonShinyPalette_Unown),
     SPECIES_SHINY_PAL(UNOWN_EMARK, gMonShinyPalette_Unown),
     SPECIES_SHINY_PAL(UNOWN_QMARK, gMonShinyPalette_Unown),
+
+    SPECIES_SHINY_PAL(CHERRIM_SUN, gMonShinyPalette_CherrimSun),
 };