From a14b6543746ae468a85590b1ecfc0eb7352b37d6 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 22 Nov 2015 02:55:46 -0800 Subject: [PATCH] the unknown Brendan/May image was for base decorating --- data/graphics/field_objects/field_object_graphics.s | 8 ++++---- .../field_objects/field_object_graphics_info.s | 8 ++++---- .../field_object_graphics_info_pointers.s | 4 ++-- .../field_objects/field_object_pic_tables.s | 8 ++++---- .../people/brendan/{unknown.png => decorating.png} | Bin .../pics/people/may/{unknown.png => decorating.png} | Bin 6 files changed, 14 insertions(+), 14 deletions(-) rename data/graphics/field_objects/pics/people/brendan/{unknown.png => decorating.png} (100%) rename data/graphics/field_objects/pics/people/may/{unknown.png => decorating.png} (100%) diff --git a/data/graphics/field_objects/field_object_graphics.s b/data/graphics/field_objects/field_object_graphics.s index aff57e46f..495880e4b 100644 --- a/data/graphics/field_objects/field_object_graphics.s +++ b/data/graphics/field_objects/field_object_graphics.s @@ -527,13 +527,13 @@ gFieldObjectPic_BrendanWatering_5: ; 84A1C58 .align 2, 0 -gFieldObjectPic_BrendanUnknown: ; 84A1E58 - .incbin "data/graphics/field_objects/pics/people/brendan/unknown.4bpp" +gFieldObjectPic_BrendanDecorating: ; 84A1E58 + .incbin "data/graphics/field_objects/pics/people/brendan/decorating.4bpp" .align 2, 0 -gFieldObjectPic_MayUnknown: ; 84A1F58 - .incbin "data/graphics/field_objects/pics/people/may/unknown.4bpp" +gFieldObjectPic_MayDecorating: ; 84A1F58 + .incbin "data/graphics/field_objects/pics/people/may/decorating.4bpp" .align 2, 0 diff --git a/data/graphics/field_objects/field_object_graphics_info.s b/data/graphics/field_objects/field_object_graphics_info.s index 3f83dbc62..4dcfad3dd 100644 --- a/data/graphics/field_objects/field_object_graphics_info.s +++ b/data/graphics/field_objects/field_object_graphics_info.s @@ -3492,7 +3492,7 @@ gFieldObjectGraphicsInfo_MayWatering: ; 850B478 .align 2, 0 -gFieldObjectGraphicsInfo_BrendanUnknown: ; 850B49C +gFieldObjectGraphicsInfo_BrendanDecorating: ; 850B49C .2byte 0xFFFF ; tiles tag .2byte 0x1100 ; palette tag .2byte 0x1102 ; palette tag 2 @@ -3505,12 +3505,12 @@ gFieldObjectGraphicsInfo_BrendanUnknown: ; 850B49C .4byte gFieldObjectBaseOam_16x32 .4byte gFieldObjectSpriteOamTables_16x32 .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BrendanUnknown + .4byte gFieldObjectPicTable_BrendanDecorating .4byte gDummyObjectRotScalAnimTable .align 2, 0 -gFieldObjectGraphicsInfo_MayUnknown: ; 850B4C0 +gFieldObjectGraphicsInfo_MayDecorating: ; 850B4C0 .2byte 0xFFFF ; tiles tag .2byte 0x1110 ; palette tag .2byte 0x1102 ; palette tag 2 @@ -3523,7 +3523,7 @@ gFieldObjectGraphicsInfo_MayUnknown: ; 850B4C0 .4byte gFieldObjectBaseOam_16x32 .4byte gFieldObjectSpriteOamTables_16x32 .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MayUnknown + .4byte gFieldObjectPicTable_MayDecorating .4byte gDummyObjectRotScalAnimTable .align 2, 0 diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.s b/data/graphics/field_objects/field_object_graphics_info_pointers.s index d445dfa6b..07922ab4e 100644 --- a/data/graphics/field_objects/field_object_graphics_info_pointers.s +++ b/data/graphics/field_objects/field_object_graphics_info_pointers.s @@ -194,8 +194,8 @@ gFieldObjectGraphicsInfoPointers: ; 8505620 .4byte gFieldObjectGraphicsInfo_ContestOldMan .4byte gFieldObjectGraphicsInfo_BrendanWatering .4byte gFieldObjectGraphicsInfo_MayWatering - .4byte gFieldObjectGraphicsInfo_BrendanUnknown - .4byte gFieldObjectGraphicsInfo_MayUnknown + .4byte gFieldObjectGraphicsInfo_BrendanDecorating + .4byte gFieldObjectGraphicsInfo_MayDecorating .4byte gFieldObjectGraphicsInfo_Archie .4byte gFieldObjectGraphicsInfo_Maxie .4byte gFieldObjectGraphicsInfo_Kyogre1 diff --git a/data/graphics/field_objects/field_object_pic_tables.s b/data/graphics/field_objects/field_object_pic_tables.s index 1cbec3647..181eb59d8 100644 --- a/data/graphics/field_objects/field_object_pic_tables.s +++ b/data/graphics/field_objects/field_object_pic_tables.s @@ -1853,13 +1853,13 @@ gFieldObjectPicTable_MayWatering: ; 8507E6C .align 2, 0 -gFieldObjectPicTable_BrendanUnknown: ; 8507EB4 - obj_tiles gFieldObjectPic_BrendanUnknown, 0x100 +gFieldObjectPicTable_BrendanDecorating: ; 8507EB4 + obj_tiles gFieldObjectPic_BrendanDecorating, 0x100 .align 2, 0 -gFieldObjectPicTable_MayUnknown: ; 8507EBC - obj_tiles gFieldObjectPic_MayUnknown, 0x100 +gFieldObjectPicTable_MayDecorating: ; 8507EBC + obj_tiles gFieldObjectPic_MayDecorating, 0x100 .align 2, 0 diff --git a/data/graphics/field_objects/pics/people/brendan/unknown.png b/data/graphics/field_objects/pics/people/brendan/decorating.png similarity index 100% rename from data/graphics/field_objects/pics/people/brendan/unknown.png rename to data/graphics/field_objects/pics/people/brendan/decorating.png diff --git a/data/graphics/field_objects/pics/people/may/unknown.png b/data/graphics/field_objects/pics/people/may/decorating.png similarity index 100% rename from data/graphics/field_objects/pics/people/may/unknown.png rename to data/graphics/field_objects/pics/people/may/decorating.png