Merge branch 'master' into sync-text

2022-11-26 18:08:49 -05:00
parent f0974b6fe6 f24fee8e57
commit 673c86c56f
67 changed files with 3835 additions and 3431 deletions
@@ -481,7 +481,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId)
            TrySetUpQuestLogScenes_ElseContinueFromSave(taskId);
            break;
        case MAIN_MENU_MYSTERYGIFT:
-            SetMainCallback2(c2_mystery_gift);
+            SetMainCallback2(CB2_InitMysteryGift);
            HelpSystem_Disable();
            FreeAllWindowBuffers();
            DestroyTask(taskId);