dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize Event Object to Object Event

Browse Source
This commit is contained in:
GriffinR
2019-11-20 22:55:44 -05:00
parent 215bb31d67
commit ec3e86f1d2
606 changed files with 10080 additions and 10080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/match_call.c
View File

@@ -1114,7 +1114,7 @@ static void StartMatchCall(void)
if (!gMatchCallState.triggeredFromScript)
{
ScriptContext2_Enable();
FreezeEventObjects();
FreezeObjectEvents();
sub_808B864();
sub_808BCF4();
}
@@ -1288,10 +1288,10 @@ static bool32 sub_81963F0(u8 taskId)
if (!gMatchCallState.triggeredFromScript)
{
sub_81973A4();
playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]);
ScriptMovement_UnfreezeEventObjects();
UnfreezeEventObjects();
playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
ScriptContext2_Disable();
}