From eba97fb3e1d0c5a144fc397f3c96bee31a780aa8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 15 Jun 2019 14:31:43 +0200
Subject: [PATCH] Add Cherrim form in a better way

---
 .../{anim_front.png => anim_front_normal.png} | Bin
 .../cherrim/{back.png => back_normal.png}     | Bin
 graphics/pokemon/cherrim/back_sun.png         | Bin 0 -> 656 bytes
 .../cherrim/{front.png => front_normal.png}   | Bin
 graphics/pokemon/cherrim/front_sun.png        | Bin 0 -> 608 bytes
 .../cherrim/{normal.pal => normal_normal.pal} |   0
 graphics/pokemon/cherrim/normal_sun.pal       |  19 +++++++++++++++
 .../cherrim/{shiny.pal => shiny_normal.pal}   |   0
 graphics/pokemon/cherrim/shiny_sun.pal        |  19 +++++++++++++++
 graphics_file_rules.mk                        |  22 ++++++++++++++++++
 src/data/pokemon_graphics/front_pic_anims.h   |   7 ++++++
 11 files changed, 67 insertions(+)
 rename graphics/pokemon/cherrim/{anim_front.png => anim_front_normal.png} (100%)
 rename graphics/pokemon/cherrim/{back.png => back_normal.png} (100%)
 create mode 100644 graphics/pokemon/cherrim/back_sun.png
 rename graphics/pokemon/cherrim/{front.png => front_normal.png} (100%)
 create mode 100644 graphics/pokemon/cherrim/front_sun.png
 rename graphics/pokemon/cherrim/{normal.pal => normal_normal.pal} (100%)
 create mode 100644 graphics/pokemon/cherrim/normal_sun.pal
 rename graphics/pokemon/cherrim/{shiny.pal => shiny_normal.pal} (100%)
 create mode 100644 graphics/pokemon/cherrim/shiny_sun.pal

diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front_normal.png
similarity index 100%
rename from graphics/pokemon/cherrim/anim_front.png
rename to graphics/pokemon/cherrim/anim_front_normal.png
diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/cherrim/back_normal.png
similarity index 100%
rename from graphics/pokemon/cherrim/back.png
rename to graphics/pokemon/cherrim/back_normal.png
diff --git a/graphics/pokemon/cherrim/back_sun.png b/graphics/pokemon/cherrim/back_sun.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/front.png b/graphics/pokemon/cherrim/front_normal.png
similarity index 100%
rename from graphics/pokemon/cherrim/front.png
rename to graphics/pokemon/cherrim/front_normal.png
diff --git a/graphics/pokemon/cherrim/front_sun.png b/graphics/pokemon/cherrim/front_sun.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/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/normal_sun.pal b/graphics/pokemon/cherrim/normal_sun.pal
new file mode 100644
index 0000000000..434b8ec780
--- /dev/null
+++ b/graphics/pokemon/cherrim/normal_sun.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/shiny.pal b/graphics/pokemon/cherrim/shiny_normal.pal
similarity index 100%
rename from graphics/pokemon/cherrim/shiny.pal
rename to graphics/pokemon/cherrim/shiny_normal.pal
diff --git a/graphics/pokemon/cherrim/shiny_sun.pal b/graphics/pokemon/cherrim/shiny_sun.pal
new file mode 100644
index 0000000000..636edb2602
--- /dev/null
+++ b/graphics/pokemon/cherrim/shiny_sun.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/graphics_file_rules.mk b/graphics_file_rules.mk
index bc51b1e1fb..8da806fdda 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,4 +1,5 @@
 CASTFORMGFXDIR := graphics/pokemon/castform
+CHERRIMGFXDIR := graphics/pokemon/cherrim
 TILESETGFXDIR := data/tilesets
 FONTGFXDIR := data/graphics/fonts
 INTERFACEGFXDIR := graphics/interface
@@ -56,6 +57,27 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
 	@cat $^ >$@
 
 
+### Cherrim ###
+
+$(CHERRIMGFXDIR)/front.4bpp: $(CHERRIMGFXDIR)/front_normal.4bpp \
+							  $(CHERRIMGFXDIR)/front_sun.4bpp
+	@cat $^ >$@
+	
+$(CHERRIMGFXDIR)/anim_front.4bpp: $(CHERRIMGFXDIR)/anim_front_normal.4bpp \
+							  $(CHERRIMGFXDIR)/front_sun.4bpp
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/back.4bpp: $(CHERRIMGFXDIR)/back_normal.4bpp \
+							 $(CHERRIMGFXDIR)/back_sun.4bpp
+	@cat $^ >$@
+	
+$(CHERRIMGFXDIR)/normal.gbapal: $(CHERRIMGFXDIR)/normal_normal.gbapal \
+								 $(CHERRIMGFXDIR)/normal_sun.gbapal
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/shiny.gbapal: $(CHERRIMGFXDIR)/shiny_normal.gbapal \
+								$(CHERRIMGFXDIR)/shiny_sun.gbapal
+	@cat $^ >$@
 
 ### Tilesets ###
 
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index e7e130bc35..4348aa0c6f 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(2, 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[] ={