summaryrefslogtreecommitdiff
path: root/data/maps/LinkContestRoom1
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/LinkContestRoom1')
-rw-r--r--data/maps/LinkContestRoom1/map.json32
-rw-r--r--data/maps/LinkContestRoom1/scripts.inc4
2 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json
index 4527b75c2..ba40fea8f 100644
--- a/data/maps/LinkContestRoom1/map.json
+++ b/data/maps/LinkContestRoom1/map.json
@@ -12,7 +12,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 6,
"y": 4,
"elevation": 3,
@@ -25,7 +25,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE",
+ "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE",
"x": 7,
"y": 4,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 4,
"y": 7,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 6,
"y": 7,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_2",
"x": 8,
"y": 7,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_4",
"x": 2,
"y": 6,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_6",
"x": 4,
"y": 2,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_7",
"x": 5,
"y": 2,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_8",
"x": 9,
"y": 2,
"elevation": 3,
@@ -129,7 +129,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_9",
"x": 10,
"y": 2,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_A",
"x": 12,
"y": 5,
"elevation": 3,
@@ -155,7 +155,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_5",
"x": 2,
"y": 5,
"elevation": 3,
@@ -168,7 +168,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 7,
"y": 5,
"elevation": 3,
@@ -181,7 +181,7 @@
"flag": "FLAG_LINK_CONTEST_ROOM_POKEBALL"
},
{
- "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+ "graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 10,
"y": 7,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ARTIST",
+ "graphics_id": "OBJ_EVENT_GFX_ARTIST",
"x": 12,
"y": 6,
"elevation": 3,
@@ -210,4 +210,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
-} \ No newline at end of file
+}
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
index b5b6a92ce..870eeb331 100644
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
@@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
return
FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
- setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+ setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
- setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+ setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return