Standardize EVENT_OBJECT to OBJECT_EVENT

2 files changed, 23 insertions, 23 deletions

diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
index 1e461f09f..a82fc2d54 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
@@ -15,7 +15,7 @@
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "EVENT_OBJ_GFX_TEALA",
+      "graphics_id": "OBJ_EVENT_GFX_TEALA",
       "x": 11,
       "y": 2,
       "elevation": 3,
@@ -28,7 +28,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_0",
       "x": 2,
       "y": 10,
       "elevation": 3,
@@ -41,7 +41,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
       "x": 17,
       "y": 11,
       "elevation": 3,
@@ -54,7 +54,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
       "x": 6,
       "y": 9,
       "elevation": 3,
@@ -67,7 +67,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
       "x": 8,
       "y": 13,
       "elevation": 3,
@@ -80,7 +80,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_4",
       "x": 10,
       "y": 11,
       "elevation": 3,
@@ -93,7 +93,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_5",
       "x": 13,
       "y": 10,
       "elevation": 3,
@@ -106,7 +106,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_6",
       "x": 15,
       "y": 13,
       "elevation": 3,
@@ -119,7 +119,7 @@
       "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
     },
     {
-      "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+      "graphics_id": "OBJ_EVENT_GFX_VAR_7",
       "x": 4,
       "y": 12,
       "elevation": 3,
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index 9da5e6a14..4692264e7 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
-	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1
-	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1
+	setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_3, 1
 	setobjectxyperm 1, 10, 2
@@ -43,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
 	.2byte 0
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
-	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
@@ -59,12 +59,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
 	waitmovement 0
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
 	waitmovement 0
 	copyobjectxytoperm 1
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
 	special HealPlayerParty
@@ -118,19 +118,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
 	waitmovement 0
 	return
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
 	waitmovement 0
 	return
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08
 	applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
 	waitmovement 0
 	return