Add Banette event object.

graphics/pokemon/banette/normal.pal

@@ -10,8 +10,8 @@ JASC-PAL
 222 123 49
 189 90 16
 131 65 41
-255 255 49
-255 255 49
+96 104 128
+128 128 160
 189 189 205
 148 148 172
 115 115 139

spritesheet_rules.mk

@@ -483,6 +483,9 @@ $(OBJEVENTGFXDIR)/pokemon/togetic.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/pokemon/charizard.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
+$(OBJEVENTGFXDIR)/pokemon/banette.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
 $(OBJEVENTGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 

src/data/object_events/object_event_graphics.h

@@ -365,4 +365,5 @@ const u32 gObjectEventPic_Marshtomp[] = INCBIN_U32("graphics/object_events/pics/
 const u32 gObjectEventPic_Altaria[] = INCBIN_U32("graphics/object_events/pics/pokemon/altaria.4bpp");
 const u32 gObjectEventPic_Togetic[] = INCBIN_U32("graphics/object_events/pics/pokemon/togetic.4bpp");
 const u32 gObjectEventPic_Charizard[] = INCBIN_U32("graphics/object_events/pics/pokemon/charizard.4bpp");
+const u32 gObjectEventPic_Banette[] = INCBIN_U32("graphics/object_events/pics/pokemon/banette.4bpp");
 const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/31.gbapal");

src/data/object_events/object_event_graphics_info.h

@@ -249,3 +249,4 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Altaria = {0xFFFF,
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Togetic = {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_Togetic, gDummySpriteAffineAnimTable};
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Charizard = {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_Charizard, gDummySpriteAffineAnimTable};
 const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Follower = {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_Togetic, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_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};

src/data/object_events/object_event_pic_tables.h

@@ -2197,6 +2197,15 @@ const struct SpriteFrameImage gObjectEventPicTable_Charizard[] = {
     overworld_frame(gObjectEventPic_Charizard, 4, 4, 5),
 };
 
+const struct SpriteFrameImage gObjectEventPicTable_Banette[] = {
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 0),
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 1),
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 2),
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 3),
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 4),
+    overworld_frame(gObjectEventPic_Banette, 4, 4, 5),
+};
+
 const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = {
     overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0),
     overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1),

src/event_object_movement.c

@@ -1632,6 +1632,9 @@ static const struct ObjectEventGraphicsInfo * SpeciesToGraphicsInfo(u16 species)
     case SPECIES_CHARIZARD :
       return &gObjectEventGraphicsInfo_Charizard;
       break;
+    case SPECIES_BANETTE :
+      return &gObjectEventGraphicsInfo_Banette;
+      break;
     default:
       return &gObjectEventGraphicsInfo_Dusclops;
   }