Standardize EVENT_OBJECT to OBJECT_EVENT

2 files changed, 35 insertions, 35 deletions

diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 9c0d41709..a4dfa5b2d 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -31,7 +31,7 @@
   ],
   "object_events": [
     {
-      "graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
+      "graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
       "x": 22,
       "y": 34,
       "elevation": 3,
@@ -44,7 +44,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
       "x": 19,
       "y": 13,
       "elevation": 3,
@@ -57,7 +57,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
       "x": 25,
       "y": 37,
       "elevation": 3,
@@ -70,7 +70,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_TWIN",
+      "graphics_id": "OBJ_EVENT_GFX_TWIN",
       "x": 21,
       "y": 46,
       "elevation": 3,
@@ -83,7 +83,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_BOY_2",
+      "graphics_id": "OBJ_EVENT_GFX_BOY_2",
       "x": 12,
       "y": 45,
       "elevation": 3,
@@ -96,7 +96,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_MAN_3",
+      "graphics_id": "OBJ_EVENT_GFX_MAN_3",
       "x": 26,
       "y": 23,
       "elevation": 3,
@@ -109,7 +109,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
       "x": 24,
       "y": 51,
       "elevation": 3,
@@ -122,7 +122,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
+      "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
       "x": 25,
       "y": 51,
       "elevation": 3,
@@ -135,7 +135,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_MAN_2",
+      "graphics_id": "OBJ_EVENT_GFX_MAN_2",
       "x": 30,
       "y": 10,
       "elevation": 3,
@@ -148,7 +148,7 @@
       "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+      "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
       "x": 13,
       "y": 21,
       "elevation": 3,
@@ -161,7 +161,7 @@
       "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE",
+      "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE",
       "x": 13,
       "y": 34,
       "elevation": 3,
@@ -174,7 +174,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 36,
       "y": 51,
       "elevation": 3,
@@ -187,7 +187,7 @@
       "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+      "graphics_id": "OBJ_EVENT_GFX_MAN_4",
       "x": 19,
       "y": 27,
       "elevation": 3,
@@ -200,7 +200,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 16,
       "y": 50,
       "elevation": 3,
@@ -213,7 +213,7 @@
       "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
+      "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
       "x": 11,
       "y": 15,
       "elevation": 0,
@@ -226,7 +226,7 @@
       "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_BOY_1",
+      "graphics_id": "OBJ_EVENT_GFX_BOY_1",
       "x": 31,
       "y": 36,
       "elevation": 3,
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 04c7ea505..58c87bc05 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -34,7 +34,7 @@ RustboroCity_OnFrame: @ 81E070B
 RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	lockall
 	setvar VAR_ROUTE104_STATE, 1
-	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
+	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
 	waitmovement 0
 	playse SE_KAIDAN
 	delay 10
@@ -46,7 +46,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	waitmovement 0
 	applymovement 15, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown
 	waitmovement 0
@@ -353,7 +353,7 @@ RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E
 RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
 	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -523,7 +523,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -535,7 +535,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceRight
 	waitmovement 0
 	return
 
@@ -547,7 +547,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -561,7 +561,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -631,7 +631,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -643,7 +643,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceLeft
 	waitmovement 0
 	return
 
@@ -655,7 +655,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
 	waitmovement 0
 	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -669,7 +669,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -718,7 +718,7 @@ RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer0
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -734,7 +734,7 @@ RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer1
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -750,7 +750,7 @@ RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer2
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -766,7 +766,7 @@ RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer3
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -782,7 +782,7 @@ RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer4
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -798,7 +798,7 @@ RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer5
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -814,7 +814,7 @@ RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer6
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
@@ -830,7 +830,7 @@ RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
 	waitmovement 0
 	applymovement 14, RustboroCity_Movement_RivalApproachPlayer7
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter