From 09bace2b26b82b546da554f364a381f5751c4e27 Mon Sep 17 00:00:00 2001
From: sneed <devilduke1995@gmail.com>
Date: Wed, 18 May 2022 23:15:52 +0300
Subject: [PATCH] fix cherrim sprite

---
 graphics/pokemon/cherrim/anim_front.png       | Bin 862 -> 0 bytes
 .../{front.png => normal/anim_front.png}      | Bin
 .../pokemon/cherrim/{ => normal}/back.png     | Bin
 graphics/pokemon/cherrim/normal/front.png     | Bin 0 -> 544 bytes
 .../pokemon/cherrim/{ => normal}/normal.pal   |   0
 .../pokemon/cherrim/{ => normal}/shiny.pal    |   0
 .../pokemon/cherrim/sunshine/anim_front.png   | Bin 0 -> 608 bytes
 graphics_file_rules.mk                        |  21 ++++++++++++++++++
 8 files changed, 21 insertions(+)
 delete mode 100644 graphics/pokemon/cherrim/anim_front.png
 rename graphics/pokemon/cherrim/{front.png => normal/anim_front.png} (100%)
 rename graphics/pokemon/cherrim/{ => normal}/back.png (100%)
 create mode 100644 graphics/pokemon/cherrim/normal/front.png
 rename graphics/pokemon/cherrim/{ => normal}/normal.pal (100%)
 rename graphics/pokemon/cherrim/{ => normal}/shiny.pal (100%)
 create mode 100644 graphics/pokemon/cherrim/sunshine/anim_front.png

diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front.png
deleted file mode 100644
index 8f6fb3d30f6a2f7904d3386d32cf72a3fbf3ccab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq002M$004jl0{{R3Nw0EQ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U@$<)Sa8^gh!7AEm_SevP!KS9FgU0<
zV8CEtIB=MFuy|OQI3P#>000000I^3B9RL6T32;bRa{vGi!vFvd!vV){sAK>D0=G#-
zK~z}7?U%7?<3JFGbs*ds&c3`r<m3e|FCfgUV?-(=^(jKm4`7h5H?i^rckWd!N_U;E
zG*=`Fq!!M*<e!!85Hh=h1g`QFYW`0%vx|1;mv@K{M6cJP2Z59L5+J@hfc^l$i39j{
z_B{wrLwkim3*ZN5(398!AYuSMUCO|O3#gcWq_b<0P$)nuK2H%NF-4M4ri`AZLY2;x
z=ytWpGS+88f@yZULS%*z7Talb2A1dKiNH_jzZsZGyVapl)+9g;c{``sF49XoaKj~*
z(jw3V>sNTpQ!8*2=`j*4#U=n;MOx=mWRSbOBK^10nkcmZby1epy^es8xQb0#mPmmz
zQ7-A-Vh`l{NdhVZ+#4Vifd}+p03FFdg#>PZqZN3BuEkY&8w0FA0n`Sl8Mt!*+@rWp
zI2XmPM;+RMbsG@10P6<Gt$>OhK!gNI;;3;^tyOY*#6&IvL~3#zBr#cZ&)h=&AV|o5
zkqwUs_l*4>^LnvINn%gn`OuUj!5%uqA^ul<+F}ea-(BCVI)g)SS&Sh&2q(ZM#Z_Y%
zv;YbYLb(8VjJWSy22nT+TF&P1v;}BA{SDw>+H~LCFLWN-0gP3Wr#n<=u`xkng3k4H
zwfZ$?lQWZ4mbV^d;V?msiIIjotjB8Wg5W`<9?;;J^~D$#L@I)D@sHn*^3i-g7uw{Z
zhb1iT*@Q^<`3Cj?PU!+JMc2Z}=@xJYe;7cDT9};1UzD_90{|BiT7c@J4KQH=9@xS(
zKrI19wM$Ut;#}NR`;dY96}S@(ME4blY?F5vbqlc8EkGoW|1K4;3Ero8ey;a=<Aa`T
z4U%GiP*jg^34cqhX+i{m{m|PKKJnY6`uvj-@ov6b2);A?qa4FOz+;Ht9Q?%zA53NU
o2R(E2mHo19oWa2#d>}mU1%3Vlo1*fD#sB~S07*qoM6N<$g3ai0I{*Lx

diff --git a/graphics/pokemon/cherrim/front.png b/graphics/pokemon/cherrim/normal/anim_front.png
similarity index 100%
rename from graphics/pokemon/cherrim/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/normal/front.png b/graphics/pokemon/cherrim/normal/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b10c48d1d9c7ff8b77e683a77978f47e5b59e5f
GIT binary patch
literal 544
zcmV+*0^j|KP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_U@$<)Sa8^gh!7AEm_SevP!KS9FgU0<
zV8CEtIB=MFuy|OQI3P#>000000I^3B9RL6T32;bRa{vGi!vFvd!vV){sAK>D0eMM8
zK~zY`?bN|)0x=K<;1tALp;}*{vA#fk0VxwLp(jc19>neg2x;#{;~Uibo`QXX?Qu_b
z3q6Yu(@8`RWs-&V>Kyj+f6Pn*8+NWgRI62!bDk6z9P26p+Fb;<32@!N<GeSBPw3Ww
z2Jd68RRUls1Pz$bVC)A71y5!^BZa^LAk@fU4apW-gB2k+hM3aK09NZ)YkfW^8f130
z#<D>Whix8m50)cfBzVF6&4W30TTK|+Lj#;aUuR~IWhQa3@FSMgA#e$wPx13?qF^E2
z12$NaOCXp^=kg3Y&|6NyeN@f?m<ZTyilW*&i3G?~?2Dqn7C1)cRDQWRf!uvlpbB6c
zz<>mwxI+L=(xAcyY2d3Cd|~d$Q?Pvi<v+kKfSm{L3E+1m?+O2l&2dLJh=Z~Y$Qn={
zKpq7`C4j^RS|?^aR;AFrju$xz0L1u)YXy;<g;%J}xrX>dcHaSfXX5V|Ybgd=#~ZK)
iW+KtxgwFM=82bU?D*C+q(feos0000<MNUMnLSTXbzShG4

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/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/sunshine/anim_front.png b/graphics/pokemon/cherrim/sunshine/anim_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_file_rules.mk b/graphics_file_rules.mk
index db9a5b1fe6..4135f9bc9c 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -25,6 +25,27 @@ STARTERGFXDIR := graphics/starter_choose
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
 contest_types := cool beauty cute smart tough
 
+### Cherrim ###
+
+$(CHERRIMGFXDIR)/front.4bpp: $(CHERRIMGFXDIR)/normal/front.4bpp \
+                              $(CHERRIMGFXDIR)/sunshine/front.4bpp
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/back.4bpp: $(CHERRIMGFXDIR)/normal/back.4bpp \
+                              $(CHERRIMGFXDIR)/sunshine/back.4bpp
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/anim_front.4bpp: $(CHERRIMGFXDIR)/normal/anim_front.4bpp \
+                              $(CHERRIMGFXDIR)/sunshine/anim_front.4bpp
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/normal.gbapal: $(CHERRIMGFXDIR)/normal/normal.gbapal \
+                              $(CHERRIMGFXDIR)/sunshine/normal.gbapal
+	@cat $^ >$@
+
+$(CHERRIMGFXDIR)/shiny.gbapal: $(CHERRIMGFXDIR)/normal/shiny.gbapal \
+                              $(CHERRIMGFXDIR)/sunshine/shiny.gbapal
+	@cat $^ >$@
 
 
 ### Tilesets ###