Add Cherrim form in a better way

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

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

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 ###
 

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[] ={