Sync script.c

src/field_specials.c

@@ -91,7 +91,7 @@ void ShowDiploma(void)
 {
     QuestLog_CutRecording();
     SetMainCallback2(CB2_ShowDiploma);
-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
 }
 
 void ForcePlayerOntoBike(void)
@@ -497,7 +497,7 @@ static void Task_ShakeScreen(u8 taskId)
 static void Task_EndScreenShake(u8 taskId)
 {
     DestroyTask(taskId);
-    EnableBothScriptContexts();
+    ScriptContext_Enable();
 }
 
 #undef tYtrans
@@ -1083,7 +1083,7 @@ static void Task_ElevatorShake(u8 taskId)
         {
             PlaySE(SE_DING_DONG);
             DestroyTask(taskId);
-            EnableBothScriptContexts();
+            ScriptContext_Enable();
             InstallCameraPanAheadCallback();
         }
     }
@@ -1336,7 +1336,7 @@ static void Task_CreateScriptListMenu(u8 taskId)
     s32 mwidth;
     struct Task *task = &gTasks[taskId];
     u8 windowId;
-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
     if (gSpecialVar_0x8004 == LISTMENU_SILPHCO_FLOORS)
         sListMenuLastScrollPosition = sElevatorScroll;
     else
@@ -1432,7 +1432,7 @@ static void Task_ListMenuHandleInput(u8 taskId)
         {
             Task_ListMenuRemoveScrollIndicatorArrowPair(taskId);
             task->func = Task_SuspendListMenu;
-            EnableBothScriptContexts();
+            ScriptContext_Enable();
         }
         break;
     }
@@ -1450,7 +1450,7 @@ static void Task_DestroyListMenu(u8 taskId)
     CopyWindowToVram(task->data[13], COPYWIN_GFX);
     RemoveWindow(task->data[13]);
     DestroyTask(taskId);
-    EnableBothScriptContexts();
+    ScriptContext_Enable();
 }
 
 static void Task_SuspendListMenu(u8 taskId)
@@ -1470,14 +1470,14 @@ void ReturnToListMenu(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_SuspendListMenu);
     if (taskId == 0xFF)
-        EnableBothScriptContexts();
+        ScriptContext_Enable();
     else
         gTasks[taskId].data[6]++;
 }
 
 static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId)
 {
-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
     Task_CreateMenuRemoveScrollIndicatorArrowPair(taskId);
     gTasks[taskId].func = Task_ListMenuHandleInput;
 }
@@ -2317,7 +2317,7 @@ void CutMoveOpenDottedHoleDoor(void)
     DrawWholeMapView();
     PlaySE(SE_BANG);
     FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE);
-    ScriptContext2_Disable();
+    UnlockPlayerFieldControls();
 }
 
 static const u16 sDeoxysObjectPals[][16] = {
@@ -2373,7 +2373,7 @@ static void Task_DoDeoxysTriangleInteraction(u8 taskId)
     if (FlagGet(FLAG_SYS_DEOXYS_AWAKENED) == TRUE)
     {
         gSpecialVar_Result = 3;
-        EnableBothScriptContexts();
+        ScriptContext_Enable();
         DestroyTask(taskId);
     }
     else
@@ -2392,7 +2392,7 @@ static void Task_DoDeoxysTriangleInteraction(u8 taskId)
         {
             FlagSet(FLAG_SYS_DEOXYS_AWAKENED);
             gSpecialVar_Result = 2;
-            EnableBothScriptContexts();
+            ScriptContext_Enable();
             DestroyTask(taskId);
         }
         else
@@ -2434,7 +2434,7 @@ static void Task_WaitDeoxysFieldEffect(u8 taskId)
 {
     if (!FieldEffectActiveListContains(FLDEFF_MOVE_DEOXYS_ROCK))
     {
-        EnableBothScriptContexts();
+        ScriptContext_Enable();
         DestroyTask(taskId);
     }
 }