atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Nidoran M & Nidoran F sprites.

Browse source
This commit is contained in:
Ariel Antonitis 2020-06-24 00:02:21 -04:00
parent aacc17e15c
commit 6969f3d6f7
6 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/object_events/pics/pokemon/nidoran_f.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 444 B

BIN
graphics/object_events/pics/pokemon/nidoran_m.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 464 B

6
spritesheet_rules.mk
View file

@ -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

2
src/data/object_events/object_event_graphics.h
View file

@ -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");

2
src/data/object_events/object_event_graphics_info.h
View file

@ -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},

16
src/data/object_events/object_event_pic_tables.h
View file

@ -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),