Fix merge conflicts

1 files changed, 6 insertions, 5 deletions

diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c
index 8c324ea82..566b4931d 100644
--- a/src/event_obj_lock.c
+++ b/src/event_obj_lock.c
@@ -6,6 +6,7 @@
 #include "script_movement.h"
 #include "task.h"
 #include "trainer_see.h"
+#include "constants/event_objects.h"
 
 bool8 walkrun_is_standing_still(void)
 {
@@ -89,20 +90,20 @@ void LockSelectedEventObject(void)
 
 void ScriptUnfreezeEventObjects(void)
 {
-    u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
+    u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
     sub_80D338C();
     UnfreezeEventObjects();
 }
 
 void sub_8098524(void)
 {
-    u8 objectId;
+    u8 playerObjectId;
 
     if (gEventObjects[gSelectedEventObject].active)
         EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
-    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
+    playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
     sub_80D338C();
     UnfreezeEventObjects();
 }