From 179ebd2dbc75c65b41c9ccd634f356266649d13a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 30 Jan 2016 22:13:05 -0800 Subject: rename CONTEST_OLD_MAN to CONTEST_JUDGE --- constants/map_object_constants.s | 2 +- data/graphics/field_objects/map_object_graphics.s | 36 ++++++++++----------- .../field_objects/map_object_graphics_info.s | 4 +-- .../map_object_graphics_info_pointers.s | 2 +- .../graphics/field_objects/map_object_pic_tables.s | 20 ++++++------ .../map_objects/pics/people/contest_judge/0.png | Bin 0 -> 297 bytes .../map_objects/pics/people/contest_judge/1.png | Bin 0 -> 277 bytes .../map_objects/pics/people/contest_judge/2.png | Bin 0 -> 256 bytes .../map_objects/pics/people/contest_judge/3.png | Bin 0 -> 284 bytes .../map_objects/pics/people/contest_judge/4.png | Bin 0 -> 284 bytes .../map_objects/pics/people/contest_judge/5.png | Bin 0 -> 277 bytes .../map_objects/pics/people/contest_judge/6.png | Bin 0 -> 273 bytes .../map_objects/pics/people/contest_judge/7.png | Bin 0 -> 268 bytes .../map_objects/pics/people/contest_judge/8.png | Bin 0 -> 265 bytes .../map_objects/pics/people/contest_old_man/0.png | Bin 297 -> 0 bytes .../map_objects/pics/people/contest_old_man/1.png | Bin 277 -> 0 bytes .../map_objects/pics/people/contest_old_man/2.png | Bin 256 -> 0 bytes .../map_objects/pics/people/contest_old_man/3.png | Bin 284 -> 0 bytes .../map_objects/pics/people/contest_old_man/4.png | Bin 284 -> 0 bytes .../map_objects/pics/people/contest_old_man/5.png | Bin 277 -> 0 bytes .../map_objects/pics/people/contest_old_man/6.png | Bin 273 -> 0 bytes .../map_objects/pics/people/contest_old_man/7.png | Bin 268 -> 0 bytes .../map_objects/pics/people/contest_old_man/8.png | Bin 265 -> 0 bytes 23 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 graphics/map_objects/pics/people/contest_judge/0.png create mode 100644 graphics/map_objects/pics/people/contest_judge/1.png create mode 100644 graphics/map_objects/pics/people/contest_judge/2.png create mode 100644 graphics/map_objects/pics/people/contest_judge/3.png create mode 100644 graphics/map_objects/pics/people/contest_judge/4.png create mode 100644 graphics/map_objects/pics/people/contest_judge/5.png create mode 100644 graphics/map_objects/pics/people/contest_judge/6.png create mode 100644 graphics/map_objects/pics/people/contest_judge/7.png create mode 100644 graphics/map_objects/pics/people/contest_judge/8.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/0.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/1.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/2.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/3.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/4.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/5.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/6.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/7.png delete mode 100644 graphics/map_objects/pics/people/contest_old_man/8.png diff --git a/constants/map_object_constants.s b/constants/map_object_constants.s index 55b7fc05f..e0843914f 100644 --- a/constants/map_object_constants.s +++ b/constants/map_object_constants.s @@ -188,7 +188,7 @@ .set MAP_OBJ_GFX_LATIAS, 187 .set MAP_OBJ_GFX_LATIOS, 188 .set MAP_OBJ_GFX_BOY_5, 189 - .set MAP_OBJ_GFX_CONTEST_OLD_MAN, 190 + .set MAP_OBJ_GFX_CONTEST_JUDGE, 190 .set MAP_OBJ_GFX_BRENDAN_WATERING, 191 .set MAP_OBJ_GFX_MAY_WATERING, 192 .set MAP_OBJ_GFX_BRENDAN_DECORATING, 193 diff --git a/data/graphics/field_objects/map_object_graphics.s b/data/graphics/field_objects/map_object_graphics.s index cb87c2ff9..70e40d03c 100644 --- a/data/graphics/field_objects/map_object_graphics.s +++ b/data/graphics/field_objects/map_object_graphics.s @@ -4579,48 +4579,48 @@ gMapObjectPic_Boy5_2: ; 8350A28 .align 2 -gMapObjectPic_ContestOldMan_0: ; 8350B28 - .incbin "graphics/map_objects/pics/people/contest_old_man/0.4bpp" +gMapObjectPic_ContestJudge_0: ; 8350B28 + .incbin "graphics/map_objects/pics/people/contest_judge/0.4bpp" .align 2 -gMapObjectPic_ContestOldMan_1: ; 8350C28 - .incbin "graphics/map_objects/pics/people/contest_old_man/1.4bpp" +gMapObjectPic_ContestJudge_1: ; 8350C28 + .incbin "graphics/map_objects/pics/people/contest_judge/1.4bpp" .align 2 -gMapObjectPic_ContestOldMan_2: ; 8350D28 - .incbin "graphics/map_objects/pics/people/contest_old_man/2.4bpp" +gMapObjectPic_ContestJudge_2: ; 8350D28 + .incbin "graphics/map_objects/pics/people/contest_judge/2.4bpp" .align 2 -gMapObjectPic_ContestOldMan_3: ; 8350E28 - .incbin "graphics/map_objects/pics/people/contest_old_man/3.4bpp" +gMapObjectPic_ContestJudge_3: ; 8350E28 + .incbin "graphics/map_objects/pics/people/contest_judge/3.4bpp" .align 2 -gMapObjectPic_ContestOldMan_4: ; 8350F28 - .incbin "graphics/map_objects/pics/people/contest_old_man/4.4bpp" +gMapObjectPic_ContestJudge_4: ; 8350F28 + .incbin "graphics/map_objects/pics/people/contest_judge/4.4bpp" .align 2 -gMapObjectPic_ContestOldMan_5: ; 8351028 - .incbin "graphics/map_objects/pics/people/contest_old_man/5.4bpp" +gMapObjectPic_ContestJudge_5: ; 8351028 + .incbin "graphics/map_objects/pics/people/contest_judge/5.4bpp" .align 2 -gMapObjectPic_ContestOldMan_6: ; 8351128 - .incbin "graphics/map_objects/pics/people/contest_old_man/6.4bpp" +gMapObjectPic_ContestJudge_6: ; 8351128 + .incbin "graphics/map_objects/pics/people/contest_judge/6.4bpp" .align 2 -gMapObjectPic_ContestOldMan_7: ; 8351228 - .incbin "graphics/map_objects/pics/people/contest_old_man/7.4bpp" +gMapObjectPic_ContestJudge_7: ; 8351228 + .incbin "graphics/map_objects/pics/people/contest_judge/7.4bpp" .align 2 -gMapObjectPic_ContestOldMan_8: ; 8351328 - .incbin "graphics/map_objects/pics/people/contest_old_man/8.4bpp" +gMapObjectPic_ContestJudge_8: ; 8351328 + .incbin "graphics/map_objects/pics/people/contest_judge/8.4bpp" .align 2 diff --git a/data/graphics/field_objects/map_object_graphics_info.s b/data/graphics/field_objects/map_object_graphics_info.s index 2486cea0c..48596d73c 100644 --- a/data/graphics/field_objects/map_object_graphics_info.s +++ b/data/graphics/field_objects/map_object_graphics_info.s @@ -3420,7 +3420,7 @@ gMapObjectGraphicsInfo_Boy5: ; 8373368 .align 2 -gMapObjectGraphicsInfo_ContestOldMan: ; 837338C +gMapObjectGraphicsInfo_ContestJudge: ; 837338C .2byte 0xFFFF ; tiles tag .2byte 0x1105 ; palette tag .2byte 0x11FF ; palette tag 2 @@ -3433,7 +3433,7 @@ gMapObjectGraphicsInfo_ContestOldMan: ; 837338C .4byte gFieldObjectBaseOam_16x32 .4byte gMapObjectSubspriteTables_16x32 .4byte gMapObjectImageAnimTable_Standard - .4byte gMapObjectPicTable_ContestOldMan + .4byte gMapObjectPicTable_ContestJudge .4byte gDummyObjectRotScalAnimTable .align 2 diff --git a/data/graphics/field_objects/map_object_graphics_info_pointers.s b/data/graphics/field_objects/map_object_graphics_info_pointers.s index 2f85358a5..f73fcafb9 100644 --- a/data/graphics/field_objects/map_object_graphics_info_pointers.s +++ b/data/graphics/field_objects/map_object_graphics_info_pointers.s @@ -191,7 +191,7 @@ gMapObjectGraphicsInfoPointers: ; 836DC58 .4byte gMapObjectGraphicsInfo_Latias .4byte gMapObjectGraphicsInfo_Latios .4byte gMapObjectGraphicsInfo_Boy5 - .4byte gMapObjectGraphicsInfo_ContestOldMan + .4byte gMapObjectGraphicsInfo_ContestJudge .4byte gMapObjectGraphicsInfo_BrendanWatering .4byte gMapObjectGraphicsInfo_MayWatering .4byte gMapObjectGraphicsInfo_BrendanDecorating diff --git a/data/graphics/field_objects/map_object_pic_tables.s b/data/graphics/field_objects/map_object_pic_tables.s index 7e515d69d..90dbca303 100644 --- a/data/graphics/field_objects/map_object_pic_tables.s +++ b/data/graphics/field_objects/map_object_pic_tables.s @@ -1814,16 +1814,16 @@ gMapObjectPicTable_Boy5: ; 8370358 .align 2 -gMapObjectPicTable_ContestOldMan: ; 83703A0 - obj_frame_tiles gMapObjectPic_ContestOldMan_0, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_1, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_2, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_3, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_4, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_5, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_6, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_7, 0x100 - obj_frame_tiles gMapObjectPic_ContestOldMan_8, 0x100 +gMapObjectPicTable_ContestJudge: ; 83703A0 + obj_frame_tiles gMapObjectPic_ContestJudge_0, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_1, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_2, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_3, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_4, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_5, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_6, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_7, 0x100 + obj_frame_tiles gMapObjectPic_ContestJudge_8, 0x100 .align 2 diff --git a/graphics/map_objects/pics/people/contest_judge/0.png b/graphics/map_objects/pics/people/contest_judge/0.png new file mode 100644 index 000000000..118a34463 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/0.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/1.png b/graphics/map_objects/pics/people/contest_judge/1.png new file mode 100644 index 000000000..75f9010dd Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/1.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/2.png b/graphics/map_objects/pics/people/contest_judge/2.png new file mode 100644 index 000000000..8ca543cef Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/2.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/3.png b/graphics/map_objects/pics/people/contest_judge/3.png new file mode 100644 index 000000000..16015e53c Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/3.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/4.png b/graphics/map_objects/pics/people/contest_judge/4.png new file mode 100644 index 000000000..e4fdfcc13 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/4.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/5.png b/graphics/map_objects/pics/people/contest_judge/5.png new file mode 100644 index 000000000..5de4a6b80 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/5.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/6.png b/graphics/map_objects/pics/people/contest_judge/6.png new file mode 100644 index 000000000..ebcb577d4 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/6.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/7.png b/graphics/map_objects/pics/people/contest_judge/7.png new file mode 100644 index 000000000..d01f156c1 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/7.png differ diff --git a/graphics/map_objects/pics/people/contest_judge/8.png b/graphics/map_objects/pics/people/contest_judge/8.png new file mode 100644 index 000000000..84e5690b7 Binary files /dev/null and b/graphics/map_objects/pics/people/contest_judge/8.png differ diff --git a/graphics/map_objects/pics/people/contest_old_man/0.png b/graphics/map_objects/pics/people/contest_old_man/0.png deleted file mode 100644 index 118a34463..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/0.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/1.png b/graphics/map_objects/pics/people/contest_old_man/1.png deleted file mode 100644 index 75f9010dd..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/1.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/2.png b/graphics/map_objects/pics/people/contest_old_man/2.png deleted file mode 100644 index 8ca543cef..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/2.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/3.png b/graphics/map_objects/pics/people/contest_old_man/3.png deleted file mode 100644 index 16015e53c..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/3.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/4.png b/graphics/map_objects/pics/people/contest_old_man/4.png deleted file mode 100644 index e4fdfcc13..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/4.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/5.png b/graphics/map_objects/pics/people/contest_old_man/5.png deleted file mode 100644 index 5de4a6b80..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/5.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/6.png b/graphics/map_objects/pics/people/contest_old_man/6.png deleted file mode 100644 index ebcb577d4..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/6.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/7.png b/graphics/map_objects/pics/people/contest_old_man/7.png deleted file mode 100644 index d01f156c1..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/7.png and /dev/null differ diff --git a/graphics/map_objects/pics/people/contest_old_man/8.png b/graphics/map_objects/pics/people/contest_old_man/8.png deleted file mode 100644 index 84e5690b7..000000000 Binary files a/graphics/map_objects/pics/people/contest_old_man/8.png and /dev/null differ -- cgit v1.2.3