diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 63ab5a5f6..2db385fc9 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -62,25 +62,16 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
 $(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 $^ >$@
-	
-### NOTE: Because Cherrim uses a two-frame sprite, the pals and back entry need to be duplicated.
 
 $(CHERRIMGFXDIR)/back.4bpp: $(CHERRIMGFXDIR)/back_normal.4bpp \
-							$(CHERRIMGFXDIR)/back_normal.4bpp \
 							 $(CHERRIMGFXDIR)/back_sun.4bpp
 	@cat $^ >$@
 	
 $(CHERRIMGFXDIR)/normal.gbapal: $(CHERRIMGFXDIR)/normal_normal.gbapal \
-								$(CHERRIMGFXDIR)/normal_normal.gbapal \
 								 $(CHERRIMGFXDIR)/normal_sun.gbapal
 	@cat $^ >$@
 
 $(CHERRIMGFXDIR)/shiny.gbapal: $(CHERRIMGFXDIR)/shiny_normal.gbapal \
-							   $(CHERRIMGFXDIR)/shiny_normal.gbapal \
 								$(CHERRIMGFXDIR)/shiny_sun.gbapal
 	@cat $^ >$@
 
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 08e1547da..d3fe523e4 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -452,7 +452,7 @@ 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_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/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");
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 4348aa0c6..eeb204df4 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -5101,17 +5101,15 @@ static const union AnimCmd sAnim_CHERUBI_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHERRIM_1[] =
+static const union AnimCmd sAnim_CHERRIM_NORMAL[] =
 {
-    ANIMCMD_FRAME(0, 30),
-    ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
 static const union AnimCmd sAnim_CHERRIM_SUN[] =
 {
-    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
@@ -10501,8 +10499,7 @@ static const union AnimCmd *const sAnims_CHERUBI[] ={
 };
 
 static const union AnimCmd *const sAnims_CHERRIM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHERRIM_1,
+    sAnim_CHERRIM_NORMAL,
     sAnim_CHERRIM_SUN,
 };
 
diff --git a/src/pokemon.c b/src/pokemon.c
index 93e1cc511..844d9028f 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -7123,7 +7123,8 @@ bool8 HasTwoFramesAnimation(u16 species)
     return (species != SPECIES_CASTFORM
             && species != SPECIES_DEOXYS
             && species != SPECIES_SPINDA
-            && species != SPECIES_UNOWN);
+            && species != SPECIES_UNOWN
+            && species != SPECIES_CHERRIM);
 }
 
 bool8 sub_806F104(void)