diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front.png
deleted file mode 100644
index 8f6fb3d30f..0000000000
Binary files a/graphics/pokemon/cherrim/anim_front.png and /dev/null differ
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 0000000000..5b10c48d1d
Binary files /dev/null and b/graphics/pokemon/cherrim/normal/front.png differ
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 0000000000..42c7893893
Binary files /dev/null and b/graphics/pokemon/cherrim/sunshine/anim_front.png differ
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 ###