Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -151,7 +151,7 @@ static void Task_NoResponse_CleanUp(u8 taskId)
 {
    ClearDialogWindowAndFrame(0, TRUE);
    ClearPlayerHeldMovementAndUnfreezeObjectEvents();
-    ScriptContext2_Disable();
+    UnlockPlayerFieldControls();
    DestroyTask(taskId);
 }

@@ -487,7 +487,7 @@ static void Task_ItemfinderResponseCleanUp(u8 taskId)
    DestroyArrowAndStarTiles();
    ClearDialogWindowAndFrame(0, TRUE);
    ClearPlayerHeldMovementAndUnfreezeObjectEvents();
-    ScriptContext2_Disable();
+    UnlockPlayerFieldControls();
    DestroyTask(taskId);
 }

@@ -500,8 +500,8 @@ static void Task_ItemfinderUnderfootDigUpItem(u8 taskId)
 {
    DestroyArrowAndStarTiles();
    DestroyTask(taskId);
-    ScriptContext1_SetupScript(EventScript_ItemfinderDigUpUnderfootItem);
-    ScriptContext2_Enable();
+    ScriptContext_SetupScript(EventScript_ItemfinderDigUpUnderfootItem);
+    LockPlayerFieldControls();
 }

 #undef tStartSpriteId