From bd01b80c1d266585d304bf9a0d76c3fa9cc6c84a Mon Sep 17 00:00:00 2001
From: Ariel Antonitis <arant@mit.edu>
Date: Wed, 24 Jun 2020 18:57:48 -0400
Subject: [PATCH] Added Castform.

---
 graphics/object_events/pics/pokemon/castform.png | Bin 0 -> 2895 bytes
 spritesheet_rules.mk                             |   3 +++
 src/data/object_events/object_event_graphics.h   |   1 +
 .../object_events/object_event_graphics_info.h   |   1 +
 src/data/object_events/object_event_pic_tables.h |   8 ++++++++
 5 files changed, 13 insertions(+)
 create mode 100644 graphics/object_events/pics/pokemon/castform.png

diff --git a/graphics/object_events/pics/pokemon/castform.png b/graphics/object_events/pics/pokemon/castform.png
new file mode 100644
index 0000000000000000000000000000000000000000..c87314166e428638eb154da9a01dfb311256a533
GIT binary patch
literal 2895
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

literal 0
HcmV?d00001

diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index e32afb2a8e..ffca91213c 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -1800,6 +1800,9 @@ $(OBJEVENTGFXDIR)/pokemon/feebas.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/pokemon/milotic.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(OBJEVENTGFXDIR)/pokemon/castform.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 588bae7521..08072275df 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -729,6 +729,7 @@ const u32 gObjectEventPic_Anorith[] = INCBIN_U32("graphics/object_events/pics/po
 const u32 gObjectEventPic_Armaldo[] = INCBIN_U32("graphics/object_events/pics/pokemon/armaldo.4bpp");
 const u32 gObjectEventPic_Feebas[] = INCBIN_U32("graphics/object_events/pics/pokemon/feebas.4bpp");
 const u32 gObjectEventPic_Milotic[] = INCBIN_U32("graphics/object_events/pics/pokemon/milotic.4bpp");
+const u32 gObjectEventPic_Castform[] = INCBIN_U32("graphics/object_events/pics/pokemon/castform.4bpp");
 const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon.4bpp");
 const u32 gObjectEventPic_Shuppet[] = INCBIN_U32("graphics/object_events/pics/pokemon/shuppet.4bpp");
 const u32 gObjectEventPic_Banette[] = INCBIN_U32("graphics/object_events/pics/pokemon/banette.4bpp");
diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h
index 5666bd8370..54011c970d 100755
--- a/src/data/object_events/object_event_graphics_info.h
+++ b/src/data/object_events/object_event_graphics_info.h
@@ -623,6 +623,7 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = {
   [SPECIES_ARMALDO] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Armaldo, gDummySpriteAffineAnimTable},
   [SPECIES_FEEBAS] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Feebas, gDummySpriteAffineAnimTable},
   [SPECIES_MILOTIC] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Milotic, gDummySpriteAffineAnimTable},
+  [SPECIES_CASTFORM] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Castform, gDummySpriteAffineAnimTable},
   [SPECIES_KECLEON] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable},
   [SPECIES_SHUPPET] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Shuppet, gDummySpriteAffineAnimTable},
   [SPECIES_BANETTE] = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Banette, gDummySpriteAffineAnimTable},
diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h
index 5c6093e371..211e166993 100755
--- a/src/data/object_events/object_event_pic_tables.h
+++ b/src/data/object_events/object_event_pic_tables.h
@@ -4990,6 +4990,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Milotic[] = {
     overworld_frame(gObjectEventPic_Milotic, 4, 4, 4),
     overworld_frame(gObjectEventPic_Milotic, 4, 4, 5),
 };
+const struct SpriteFrameImage gObjectEventPicTable_Castform[] = {
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 0),
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 1),
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 2),
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 3),
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 4),
+    overworld_frame(gObjectEventPic_Castform, 4, 4, 5),
+};
 const struct SpriteFrameImage gObjectEventPicTable_Kecleon[] = {
     overworld_frame(gObjectEventPic_Kecleon, 4, 4, 0),
     overworld_frame(gObjectEventPic_Kecleon, 4, 4, 1),