From eaaa31ceaff90e689fbae29c3ff03a4e47fc4f7b Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Wed, 7 Oct 2015 16:40:32 -0700
Subject: [PATCH] Fix (and added hooks) for disabling pause menu

Fixes bug where start menu may open during intro cutscene.
---
 Source/FullScreenPokemon.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Source/FullScreenPokemon.ts b/Source/FullScreenPokemon.ts
index cc7c022c..5e5f9823 100644
--- a/Source/FullScreenPokemon.ts
+++ b/Source/FullScreenPokemon.ts
@@ -384,7 +384,9 @@ module FullScreenPokemon {
          */
         gameStartIntro(FSP: FullScreenPokemon): void {
             FSP.ItemsHolder.clear();
-            FSP.ScenePlayer.startCutscene("Intro");
+            FSP.ScenePlayer.startCutscene("Intro", {
+                "disablePauseMenu": true
+            });
 
             FSP.ModAttacher.fireEvent("onGameStartIntro");
         }
@@ -3214,11 +3216,17 @@ module FullScreenPokemon {
         togglePauseMenu(thing: IThing): void {
             if (thing.FSP.MenuGrapher.getActiveMenu()) {
                 thing.FSP.MenuGrapher.registerStart();
-            } else if (thing.FSP.MenuGrapher.getActiveMenu()) {
-                thing.FSP.closePauseMenu();
-            } else {
-                thing.FSP.openPauseMenu();
+                return;
             }
+
+            var cutsceneSettings: any = thing.FSP.ScenePlayer.getCutsceneSettings();
+            if (cutsceneSettings && cutsceneSettings.disablePauseMenu) {
+                return;
+            }
+
+            thing.FSP.MenuGrapher.getMenu("Pause")
+                ? thing.FSP.closePauseMenu()
+                : thing.FSP.openPauseMenu();
         }
 
         /**