mostly standardize to object event to prep for disassembly

1 files changed, 17 insertions, 17 deletions

diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index e28872fd4..385b5d470 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -36,7 +36,7 @@ bool8 sub_8069590(void)
     }
 }
 
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeObjectEvents(void)
 {
     FreezeEventObjects();
     CreateTask(sub_8069570, 80);
@@ -52,9 +52,9 @@ void sub_80695CC(u8 taskId)
         task->data[0] = 1;
     }
 
-    if (task->data[1] == 0 && !gMapObjects[gSelectedEventObject].mapobj_bit_1)
+    if (task->data[1] == 0 && !gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
     {
-        FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+        FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         task->data[1] = 1;
     }
 
@@ -73,44 +73,44 @@ bool8 sub_8069648(void)
     }
 }
 
-void LockSelectedMapObject(void)
+void LockSelectedObjectEvent(void)
 {
     u8 taskId;
 
-    FreezeMapObjectsExceptOne(gSelectedEventObject);
+    FreezeObjectEventsExceptOne(gSelectedObjectEvent);
     taskId = CreateTask(sub_80695CC, 80);
-    if (!gMapObjects[gSelectedEventObject].mapobj_bit_1)
+    if (!gObjectEvents[gSelectedObjectEvent].mapobj_bit_1)
     {
-        FreezeMapObject(&gMapObjects[gSelectedEventObject]);
+        FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
         gTasks[taskId].data[1] = 1;
     }
 }
 
 void sub_80696C0(void)
 {
-    u8 fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+    u8 fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
 }
 
 void sub_80696F0(void)
 {
     u8 fieldObjectId;
-    if (gMapObjects[gSelectedEventObject].active)
-        FieldObjectClearHeldMovementIfFinished(&gMapObjects[gSelectedEventObject]);
-    fieldObjectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearHeldMovementIfFinished(&gMapObjects[fieldObjectId]);
+    if (gObjectEvents[gSelectedObjectEvent].active)
+        ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
+    fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
+    ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
     sub_80974D8();
-    UnfreezeMapObjects();
+    UnfreezeObjectEvents();
 }
 
 void sub_8069740(void)
 {
-    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedEventObject], gSpecialVar_Facing);
+    ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing);
 }
 
 void sub_8069768(void)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedEventObject]);
+    ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]);
 }