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

Added Castform.

Browse source
This commit is contained in:
Ariel Antonitis 2020-06-24 18:57:48 -04:00
parent c9834ba967
commit bd01b80c1d
5 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

3
spritesheet_rules.mk
View file

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

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

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

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

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

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

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