Standardize EVENT_OBJECT to OBJECT_EVENT

2 files changed, 18 insertions, 18 deletions

diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index aa5d20e1d..05fdafe64 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/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": 23,
       "y": 5,
       "elevation": 3,
@@ -28,7 +28,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
       "x": 24,
       "y": 5,
       "elevation": 3,
@@ -41,7 +41,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 3,
       "y": 1,
       "elevation": 3,
@@ -54,7 +54,7 @@
       "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 30,
       "y": 2,
       "elevation": 3,
@@ -67,7 +67,7 @@
       "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+      "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -80,7 +80,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
       "x": 14,
       "y": 5,
       "elevation": 3,
@@ -93,7 +93,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+      "graphics_id": "OBJ_EVENT_GFX_WINGULL",
       "x": 14,
       "y": 4,
       "elevation": 3,
@@ -106,7 +106,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
       "x": 24,
       "y": 4,
       "elevation": 3,
@@ -119,7 +119,7 @@
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "graphics_id": "OBJ_EVENT_GFX_HIKER",
       "x": 32,
       "y": 13,
       "elevation": 3,
@@ -132,7 +132,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
       "x": 25,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 9219ba3e4..30ff08c36 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -85,13 +85,13 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
 	end
 
 RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
 	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1
 	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
 	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
@@ -99,7 +99,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
 	return
 
 RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
 	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
@@ -109,7 +109,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
 RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -134,7 +134,7 @@ RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4
 	return
 
 RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
 	applymovement 10, RusturfTunnel_Movement_WandaExit
 	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit
 	waitmovement 0
@@ -319,7 +319,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_GOODS
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
 	applymovement 6, RusturfTunnel_Movement_GruntEscape
 	waitmovement 0
 	removeobject 6
@@ -327,7 +327,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	addobject 5
 	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney
 	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2
 	waitmovement 0
 	msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT
@@ -340,7 +340,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	waitbuttonpress
 	waitmoncry
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit
 	applymovement 5, RusturfTunnel_Movement_BrineyExit
 	applymovement 7, RusturfTunnel_Movement_PeekoExit
 	waitmovement 0