ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Boy4 to RichBoy

Browse Source
This commit is contained in:
Deokishisu 2018-10-14 12:26:48 -04:00
parent 0c1d33da4f
commit 2bd86dad2f
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/event_objects/pics/people/boy_4.png → graphics/event_objects/pics/people/rich_boy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 759 B

After

Width:  |  Height:  |  Size: 759 B

2
spritesheet_rules.mk
View File

@ -171,7 +171,7 @@ $(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4 $(GFX) $< $@ -mwidth 2 -mheight 4
$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4 $(GFX) $< $@ -mwidth 2 -mheight 4
$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png

2
src/data/field_event_obj/event_object_graphics.h
View File

@ -81,7 +81,7 @@ const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics
const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp");
const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp");
const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp");
const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp"); const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp");
const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp");
const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp");
const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");

2
src/data/field_event_obj/event_object_graphics_info.h
View File

@ -17,7 +17,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFF
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};

4
src/data/field_event_obj/event_object_graphics_info_pointers.h
View File

@ -16,7 +16,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan;
const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
@ -265,7 +265,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
&gEventObjectGraphicsInfo_LittleGirl2, &gEventObjectGraphicsInfo_LittleGirl2,
&gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Boy3,
&gEventObjectGraphicsInfo_Girl3, &gEventObjectGraphicsInfo_Girl3,
&gEventObjectGraphicsInfo_Boy4, &gEventObjectGraphicsInfo_RichBoy,
&gEventObjectGraphicsInfo_Woman1, &gEventObjectGraphicsInfo_Woman1,
&gEventObjectGraphicsInfo_FatMan, &gEventObjectGraphicsInfo_FatMan,
&gEventObjectGraphicsInfo_Woman2, &gEventObjectGraphicsInfo_Woman2,

20
src/data/field_event_obj/event_object_pic_tables.h
View File

@ -229,16 +229,16 @@ const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = {
overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), overworld_frame(gEventObjectPic_Girl3, 2, 4, 8),
}; };
const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = {
overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7),
overworld_frame(gEventObjectPic_Boy4, 2, 4, 8), overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8),
}; };
const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = {