1 files changed, 33 insertions, 34 deletions

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 292152b11..ea9429ce8 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -5,6 +5,7 @@
 #include "field_camera.h"
 #include "field_door.h"
 #include "field_effect.h"
+#include "event_object_lock.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
@@ -17,7 +18,6 @@
 #include "main.h"
 #include "menu.h"
 #include "mirage_tower.h"
-#include "event_obj_lock.h"
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "overworld.h"
@@ -27,12 +27,11 @@
 #include "start_menu.h"
 #include "task.h"
 #include "text.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
 #include "trainer_hill.h"
-#include "event_obj_lock.h"
 #include "fldeff.h"
 
 extern const u16 gOrbEffectBackgroundLayerFlags[];
@@ -328,7 +327,7 @@ static void Task_ExitDoor(u8 taskId)
     {
     case 0:
         SetPlayerVisibility(FALSE);
-        FreezeEventObjects();
+        FreezeObjectEvents();
         PlayerGetDestCoords(x, y);
         FieldSetDoorOpened(*x, *y);
         task->data[0] = 1;
@@ -336,27 +335,27 @@ static void Task_ExitDoor(u8 taskId)
     case 1:
         if (WaitForWeatherFadeIn())
         {
-            u8 eventObjId;
+            u8 objEventId;
             SetPlayerVisibility(TRUE);
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
             task->data[0] = 2;
         }
         break;
     case 2:
         if (IsPlayerStandingStill())
         {
-            u8 eventObjId;
+            u8 objEventId;
             task->data[1] = FieldAnimateDoorClose(*x, *y);
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]);
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
             task->data[0] = 3;
         }
         break;
     case 3:
         if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
         {
-            UnfreezeEventObjects();
+            UnfreezeObjectEvents();
             task->data[0] = 4;
         }
         break;
@@ -377,24 +376,24 @@ static void Task_ExitNonAnimDoor(u8 taskId)
     {
     case 0:
         SetPlayerVisibility(FALSE);
-        FreezeEventObjects();
+        FreezeObjectEvents();
         PlayerGetDestCoords(x, y);
         task->data[0] = 1;
         break;
     case 1:
         if (WaitForWeatherFadeIn())
         {
-            u8 eventObjId;
+            u8 objEventId;
             SetPlayerVisibility(TRUE);
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
             task->data[0] = 2;
         }
         break;
     case 2:
         if (IsPlayerStandingStill())
         {
-            UnfreezeEventObjects();
+            UnfreezeObjectEvents();
             task->data[0] = 3;
         }
         break;
@@ -410,14 +409,14 @@ static void Task_ExitNonDoor(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         ScriptContext2_Enable();
         gTasks[taskId].data[0]++;
         break;
     case 1:
         if (WaitForWeatherFadeIn())
         {
-            UnfreezeEventObjects();
+            UnfreezeObjectEvents();
             ScriptContext2_Disable();
             DestroyTask(taskId);
         }
@@ -453,7 +452,7 @@ static void task_mpl_807E3C8(u8 taskId)
     {
         ScriptContext2_Disable();
         DestroyTask(taskId);
-        ScriptUnfreezeEventObjects();
+        ScriptUnfreezeObjectEvents();
     }
 }
 
@@ -561,7 +560,7 @@ void DoMossdeepGymWarp(void)
 {
     sub_8085540(1);
     ScriptContext2_Enable();
-    SaveEventObjects();
+    SaveObjectEvents();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlaySE(SE_TK_WARPIN);
@@ -651,7 +650,7 @@ static void Task_WarpAndLoadMap(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         ScriptContext2_Enable();
         task->data[0]++;
         break;
@@ -684,7 +683,7 @@ static void Task_DoDoorWarp(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         PlayerGetDestCoords(x, y);
         PlaySE(GetDoorSoundEffect(*x, *y - 1));
         task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
@@ -693,21 +692,21 @@ static void Task_DoDoorWarp(u8 taskId)
     case 1:
         if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
         {
-            u8 eventObjId;
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]);
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP);
+            u8 objEventId;
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]);
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP);
             task->data[0] = 2;
         }
         break;
     case 2:
         if (IsPlayerStandingStill())
         {
-            u8 eventObjId;
+            u8 objEventId;
             task->data[1] = FieldAnimateDoorClose(*x, *y - 1);
-            eventObjId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
-            EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]);
+            objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
+            ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]);
             SetPlayerVisibility(FALSE);
             task->data[0] = 3;
         }
@@ -735,7 +734,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         ScriptContext2_Enable();
         task->data[0]++;
         break;
@@ -1002,7 +1001,7 @@ static void task0A_mpl_807E31C(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         ScriptContext2_Enable();
         sub_808D194();
         gTasks[taskId].data[0]++;
@@ -1010,7 +1009,7 @@ static void task0A_mpl_807E31C(u8 taskId)
     case 1:
         if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE)
         {
-            UnfreezeEventObjects();
+            UnfreezeObjectEvents();
             ScriptContext2_Disable();
             DestroyTask(taskId);
         }
@@ -1025,7 +1024,7 @@ static void sub_80B01BC(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeEventObjects();
+        FreezeObjectEvents();
         ScriptContext2_Enable();
         PlaySE(SE_TK_WARPIN);
         sub_808D1C8();