diff --git a/graphics/object_events/pics/pokemon/nidoran_f.png b/graphics/object_events/pics/pokemon/nidoran_f.png new file mode 100644 index 0000000000..ed77773cef Binary files /dev/null and b/graphics/object_events/pics/pokemon/nidoran_f.png differ diff --git a/graphics/object_events/pics/pokemon/nidoran_m.png b/graphics/object_events/pics/pokemon/nidoran_m.png new file mode 100644 index 0000000000..48d6c1af5f Binary files /dev/null and b/graphics/object_events/pics/pokemon/nidoran_m.png differ diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 248d14cc1b..70dae1aca7 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -759,12 +759,18 @@ $(OBJEVENTGFXDIR)/pokemon/sandshrew.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/pokemon/sandslash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(OBJEVENTGFXDIR)/pokemon/nidoran_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(OBJEVENTGFXDIR)/pokemon/nidorina.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/nidoqueen.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 +$(OBJEVENTGFXDIR)/pokemon/nidoran_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + $(OBJEVENTGFXDIR)/pokemon/nidorino.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 89b334a311..b6627c8b0e 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -382,8 +382,10 @@ const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/po const u32 gObjectEventPic_Raichu[] = INCBIN_U32("graphics/object_events/pics/pokemon/raichu.4bpp"); const u32 gObjectEventPic_Sandshrew[] = INCBIN_U32("graphics/object_events/pics/pokemon/sandshrew.4bpp"); const u32 gObjectEventPic_Sandslash[] = INCBIN_U32("graphics/object_events/pics/pokemon/sandslash.4bpp"); +const u32 gObjectEventPic_Nidoran_f[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_f.4bpp"); const u32 gObjectEventPic_Nidorina[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorina.4bpp"); const u32 gObjectEventPic_Nidoqueen[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoqueen.4bpp"); +const u32 gObjectEventPic_Nidoran_m[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_m.4bpp"); const u32 gObjectEventPic_Nidorino[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorino.4bpp"); const u32 gObjectEventPic_Nidoking[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoking.4bpp"); const u32 gObjectEventPic_Clefairy[] = INCBIN_U32("graphics/object_events/pics/pokemon/clefairy.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 02534ca023..4789e18e34 100755 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -276,8 +276,10 @@ const struct ObjectEventGraphicsInfo gPokemonObjectGraphics[] = { [SPECIES_RAICHU] = {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_Raichu, gDummySpriteAffineAnimTable}, [SPECIES_SANDSHREW] = {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_Sandshrew, gDummySpriteAffineAnimTable}, [SPECIES_SANDSLASH] = {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_Sandslash, gDummySpriteAffineAnimTable}, + [SPECIES_NIDORAN_F] = {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_Nidoran_f, gDummySpriteAffineAnimTable}, [SPECIES_NIDORINA] = {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_Nidorina, gDummySpriteAffineAnimTable}, [SPECIES_NIDOQUEEN] = {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_Nidoqueen, gDummySpriteAffineAnimTable}, + [SPECIES_NIDORAN_M] = {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_Nidoran_m, gDummySpriteAffineAnimTable}, [SPECIES_NIDORINO] = {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_Nidorino, gDummySpriteAffineAnimTable}, [SPECIES_NIDOKING] = {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_Nidoking, gDummySpriteAffineAnimTable}, [SPECIES_CLEFAIRY] = {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_Clefairy, gDummySpriteAffineAnimTable}, diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 3d3583896e..9a158bff4c 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -2214,6 +2214,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Sandslash[] = { overworld_frame(gObjectEventPic_Sandslash, 4, 4, 4), overworld_frame(gObjectEventPic_Sandslash, 4, 4, 5), }; +const struct SpriteFrameImage gObjectEventPicTable_Nidoran_f[] = { + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 0), + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 1), + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 2), + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 3), + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 4), + overworld_frame(gObjectEventPic_Nidoran_f, 4, 4, 5), +}; const struct SpriteFrameImage gObjectEventPicTable_Nidorina[] = { overworld_frame(gObjectEventPic_Nidorina, 4, 4, 0), overworld_frame(gObjectEventPic_Nidorina, 4, 4, 1), @@ -2230,6 +2238,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Nidoqueen[] = { overworld_frame(gObjectEventPic_Nidoqueen, 4, 4, 4), overworld_frame(gObjectEventPic_Nidoqueen, 4, 4, 5), }; +const struct SpriteFrameImage gObjectEventPicTable_Nidoran_m[] = { + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 0), + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 1), + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 2), + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 3), + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 4), + overworld_frame(gObjectEventPic_Nidoran_m, 4, 4, 5), +}; const struct SpriteFrameImage gObjectEventPicTable_Nidorino[] = { overworld_frame(gObjectEventPic_Nidorino, 4, 4, 0), overworld_frame(gObjectEventPic_Nidorino, 4, 4, 1),