summaryrefslogtreecommitdiff
path: root/data/graphics/field_objects
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-30 22:13:05 -0800
committerYamaArashi <shadow962@live.com>2016-01-30 22:13:05 -0800
commit179ebd2dbc75c65b41c9ccd634f356266649d13a (patch)
treed8303b12a4f41c3d3898be1cfbad272c44fe2a1c /data/graphics/field_objects
parent185d9d809e6222ec302d46b940ce3bf74a2d70c8 (diff)
rename CONTEST_OLD_MAN to CONTEST_JUDGE
Diffstat (limited to 'data/graphics/field_objects')
-rw-r--r--data/graphics/field_objects/map_object_graphics.s36
-rw-r--r--data/graphics/field_objects/map_object_graphics_info.s4
-rw-r--r--data/graphics/field_objects/map_object_graphics_info_pointers.s2
-rw-r--r--data/graphics/field_objects/map_object_pic_tables.s20
4 files changed, 31 insertions, 31 deletions
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