dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA

Browse Source
This commit is contained in:
GriffinR
2024-10-14 22:48:30 -04:00
parent a2e408cf4e
commit 4dc5c47799
75 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_lock.c
+2 -2
View File
@@ -86,7 +86,7 @@ void FreezeObjects_WaitForPlayerAndSelected(void)
void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void)
{
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
@@ -97,7 +97,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void)
u8 objectEventId;
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();