Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -1515,7 +1515,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
        ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
        RemoveWindow(gTasks[taskId].tWindowId);
        DestroyTask(taskId);
-        EnableBothScriptContexts();
+        ScriptContext_Enable();
    }
    else if (gMain.newKeys & B_BUTTON)
    {
@@ -1524,7 +1524,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
        ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
        RemoveWindow(gTasks[taskId].tWindowId);
        DestroyTask(taskId);
-        EnableBothScriptContexts();
+        ScriptContext_Enable();
    }
 }

@@ -1756,7 +1756,7 @@ static void VBlankCB_EggHatch(void)

 void EggHatch(void)
 {
-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
    CreateTask(Task_EggHatch, 10);
    BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
    HelpSystem_Disable();