From a40fcbbcd056084c60ed4aa77ca9e2d64c36d935 Mon Sep 17 00:00:00 2001
From: Viet Nguyen <vietnguyen@Viets-MacBook-Air.local>
Date: Tue, 23 Apr 2024 23:26:31 -0400
Subject: [PATCH] Fix: Return to title works for screens other than battle
 screen

---
 src/ui/menu-ui-handler.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 8b2c5646903..8ffa0fc3be9 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -246,6 +246,13 @@ export default class MenuUiHandler extends MessageUiHandler {
     let success = false;
     let error = false;
 
+    const returnToTitle = () => {
+      ui.setOverlayMode(Mode.CONFIRM, () => this.scene.reset(true), () => {
+        ui.revertMode();
+        ui.showText(null, 0);
+      }, false, -98);
+    }
+
     if (button === Button.ACTION) {
       let adjustedCursor = this.cursor;
       for (let imo of this.ignoredMenuOptions) {
@@ -295,14 +302,10 @@ export default class MenuUiHandler extends MessageUiHandler {
         case MenuOptions.RETURN_TO_TITLE:
           if (this.scene.currentBattle) {
             success = true;
-            ui.showText('You will lose any progress since the beginning of the battle. Proceed?', null, () => {
-              ui.setOverlayMode(Mode.CONFIRM, () => this.scene.reset(true), () => {
-                ui.revertMode();
-                ui.showText(null, 0);
-              }, false, -98);
-            });
-          } else
-            error = true;
+            ui.showText('You will lose any progress since the beginning of the battle. Proceed?', null, returnToTitle);
+          } else {
+            returnToTitle();
+          }
           break;
         case MenuOptions.LOG_OUT:
           success = true;