Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -80,7 +80,7 @@ static void QL_GfxTransition_Fish(void)
    if (gQuestLogPlaybackState == 1 || gQuestLogPlaybackState == 3)
    {
        u8 taskId;
-        ScriptContext2_Enable();
+        LockPlayerFieldControls();
        gPlayerAvatar.preventStep = TRUE;
        taskId = CreateTask(Task_QLFishMovement, 0xFF);
        gTasks[taskId].data[0] = 0;
@@ -129,7 +129,7 @@ static void Task_QLFishMovement(u8 taskId)
                ObjectEventTurn(objectEvent, objectEvent->movementDirection);
                sprite->x2 = 0;
                sprite->y2 = 0;
-                ScriptContext2_Disable();
+                UnlockPlayerFieldControls();
                DestroyTask(taskId);
            }
            break;
@@ -166,7 +166,7 @@ static void Task_QLVSSeekerMovement(u8 taskId)
    if (!FieldEffectActiveListContains(FLDEFF_USE_VS_SEEKER))
    {
        UnfreezeObjectEvents();
-        ScriptContext2_Disable();
+        UnlockPlayerFieldControls();
        DestroyTask(taskId);
    }
 }