Merge pull request #910 from GriffinRichards/fix-eventobj

Standardize Object Event naming

2 files changed, 23 insertions, 23 deletions

diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
index bd292f2c5..89f7be300 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/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_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
index ea32a8275..77b9d1cd0 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
@@ -23,14 +23,14 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
 	end
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 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
@@ -41,7 +41,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp: @ 8243E14
 	.2byte 0
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E
-	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
+	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23
@@ -57,12 +57,12 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: @ 8243E35
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
 	waitmovement 0
 	applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit
 	waitmovement 0
 	copyobjectxytoperm 1
-	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT
 	special HealPlayerParty
@@ -113,21 +113,21 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4
 	applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
 	waitmovement 0
 	return
 
 @ Unused
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6
 	applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
 	waitmovement 0
 	return
 
 @ Unused
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08
 	applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
-	applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
 	waitmovement 0
 	return