diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 9eddde0b13..70e3a87bef 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -728,7 +728,7 @@ const u32 gObjectEventPic_Anorith[] = INCBIN_COMP("graphics/object_events/pics/p
 const u32 gObjectEventPic_Armaldo[] = INCBIN_COMP("graphics/object_events/pics/pokemon/armaldo.4bpp");
 const u32 gObjectEventPic_Feebas[] = INCBIN_COMP("graphics/object_events/pics/pokemon/feebas.4bpp");
 const u32 gObjectEventPic_Milotic[] = INCBIN_COMP("graphics/object_events/pics/pokemon/milotic.4bpp");
-const u32 gObjectEventPic_Castform[] = INCBIN_U32("graphics/object_events/pics/pokemon/castform.4bpp");
+const u32 gObjectEventPic_Castform[] = INCBIN_COMP("graphics/object_events/pics/pokemon/castform.4bpp");
 const u32 gObjectEventPic_CastformSunny[] = INCBIN_COMP("graphics/object_events/pics/pokemon/castform_sunny.4bpp");
 const u16 gObjectEventPal_CastformSunny[] = INCBIN_U16("graphics/pokemon/castform/sunny/normal.gbapal");
 const u32 gObjectEventPic_CastformRainy[] = INCBIN_COMP("graphics/object_events/pics/pokemon/castform_rainy.4bpp");
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 7ca6f71dc1..e463a4e8af 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1966,7 +1966,10 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) {
         spritePalette.data = gFollowerPalettes[species][shiny & 1];
 
     // Check if pal data must be decompressed
+    /* // There goes Castform making this harder than it needs to be...
     if (IsLZ77Data(spritePalette.data, PLTT_SIZE_4BPP, PLTT_SIZE_4BPP)) {
+    */
+    if (IsLZ77Data(spritePalette.data, PLTT_SIZE_4BPP, PLTT_SIZE_4BPP * NUM_CASTFORM_FORMS)) {
         // IsLZ77Data guarantees word-alignment, so casting this is safe
         LZ77UnCompWram((u32*)spritePalette.data, gDecompressionBuffer);
         spritePalette.data = (void*)gDecompressionBuffer;