summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleArenaLobby
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-20 23:12:51 -0500
committerGriffinR <griffin.richards@comcast.net>2019-11-20 23:12:51 -0500
commit82cb741d8b2b2d88c1e23d2d5ccf5443892538fa (patch)
treec05b6424006d1d46a3d38c0205c1dfce986c6fdc /data/maps/BattleFrontier_BattleArenaLobby
parentec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff)
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'data/maps/BattleFrontier_BattleArenaLobby')
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/map.json10
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/scripts.inc10
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json
index be03b2704..e1b3a8355 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/map.json
+++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
- "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+ "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 7,
"y": 7,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 2,
"y": 10,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_MAN_5",
+ "graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 14,
"y": 11,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_CAMPER",
+ "graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 14,
"y": 12,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
+ "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 10,
"elevation": 3,
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index 34feceb39..cf21c3c13 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
setvar VAR_TEMP_1, 1
- turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+ turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
@@ -259,12 +259,12 @@ BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003
BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041
waitmovement 0
opendoor 2, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
waitmovement 0
closedoor 2, 2
waitdooranim
@@ -308,12 +308,12 @@ BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088
waitmovement 0
opendoor 11, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
- applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
+ applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
waitmovement 0
closedoor 11, 2
waitdooranim