Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -3178,8 +3178,8 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
        ClearWindowTilemap(tWindowId);
        RemoveWindow(tWindowId);
        DestroyTask(taskId);
-        EnableBothScriptContexts();
-        ScriptContext2_Disable();
+        ScriptContext_Enable();
+        UnlockPlayerFieldControls();
        tState = 0;
        return;
    }
@@ -3190,7 +3190,7 @@ void ShowBerryCrushRankings(void)
 {
    u8 taskId;

-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
    taskId = CreateTask(Task_ShowBerryCrushRankings, 0);
    gTasks[taskId].tPressingSpeeds(0) = gSaveBlock2Ptr->berryCrush.pressingSpeeds[0];
    gTasks[taskId].tPressingSpeeds(1) = gSaveBlock2Ptr->berryCrush.pressingSpeeds[1];