From 54836ccd4a077098059c0306260980cff7f4cc83 Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Wed, 3 Sep 2025 20:54:45 -0400
Subject: [PATCH] Marked starter select test as TODO to avoid corruption

---
 src/phases/title-phase.ts                 | 1 +
 test/test-utils/helpers/prompt-handler.ts | 4 ++--
 test/ui/starter-select.test.ts            | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 11a2ccc482c..dcc8557a65f 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -168,6 +168,7 @@ export class TitlePhase extends Phase {
     globalScene.ui.setMode(UiMode.TITLE, config);
   }
 
+  // TODO: Make callers actually wait for the damn save slot to load
   async loadSaveSlot(slotId: number): Promise<void> {
     globalScene.sessionSlotId = slotId > -1 || !loggedInUser ? slotId : loggedInUser.lastSessionSlot;
     globalScene.ui.setMode(UiMode.MESSAGE);
diff --git a/test/test-utils/helpers/prompt-handler.ts b/test/test-utils/helpers/prompt-handler.ts
index 41255b8360b..4b16636f4db 100644
--- a/test/test-utils/helpers/prompt-handler.ts
+++ b/test/test-utils/helpers/prompt-handler.ts
@@ -78,13 +78,13 @@ export class PromptHandler extends GameManagerHelper {
    * @param args - Arguments being passed to the original method
    * @returns The original return value.
    */
-  private setMode(args: Parameters<typeof this.originalSetModeInternal>) {
+  private async setMode(args: Parameters<typeof this.originalSetModeInternal>) {
     const mode = args[0];
 
     this.doLog(
       `UI mode changed from ${getEnumStr(UiMode, this.game.scene.ui.getMode())} to ${getEnumStr(UiMode, mode)}!`,
     );
-    const ret = this.originalSetModeInternal.apply(this.game.scene.ui, args);
+    const ret = await this.originalSetModeInternal.apply(this.game.scene.ui, args);
 
     const currentPhase = this.game.scene.phaseManager.getCurrentPhase()?.phaseName!;
     if (endBySetMode.includes(currentPhase)) {
diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts
index 397f3d6086f..73c49037750 100644
--- a/test/ui/starter-select.test.ts
+++ b/test/ui/starter-select.test.ts
@@ -16,7 +16,8 @@ import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
-describe("UI - Starter select", () => {
+// TODO: Resolve issues with UI test state corruption
+describe.todo("UI - Starter select", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;