Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -15,7 +15,7 @@ void ChoosePartyMon(void)
 {
    u8 taskId;

-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
    taskId = CreateTask(sub_80BF97C, 10);
    gTasks[taskId].data[0] = PARTY_MENU_TYPE_CHOOSE_MON;
    BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
@@ -25,7 +25,7 @@ void SelectMoveTutorMon(void)
 {
    u8 taskId;

-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
    taskId = CreateTask(sub_80BF97C, 10);
    gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_RELEARNER;
    BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);