From f9a43eff45520627e85516332f98b9453d3b9d71 Mon Sep 17 00:00:00 2001
From: mshirt <mshirt@ualberta.ca>
Date: Mon, 12 Dec 2016 17:44:48 -0600
Subject: [PATCH] Reordering the trigger on custom message boxes

With frame perfect inputs, you could close these on the same frame as
they open, which in some cases leads to a soft lock of the game.
---
 scripts/Desktop_Message.rb | 13 +++++++------
 scripts/Doc_Message.rb     | 13 +++++++------
 scripts/Ed_Message.rb      | 13 +++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/scripts/Desktop_Message.rb b/scripts/Desktop_Message.rb
index 5adaedb..a5cda1f 100644
--- a/scripts/Desktop_Message.rb
+++ b/scripts/Desktop_Message.rb
@@ -176,6 +176,13 @@ class Desktop_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_desktop_text == nil
       @fade_out = true if @viewport.visible
@@ -189,12 +196,6 @@ class Desktop_Message
       end
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables
diff --git a/scripts/Doc_Message.rb b/scripts/Doc_Message.rb
index 0dd8ff9..61284c6 100644
--- a/scripts/Doc_Message.rb
+++ b/scripts/Doc_Message.rb
@@ -191,6 +191,13 @@ class Doc_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_doc_text == nil
       @fade_out = true if @viewport.visible
@@ -204,12 +211,6 @@ class Doc_Message
       end
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables
diff --git a/scripts/Ed_Message.rb b/scripts/Ed_Message.rb
index ba26f5d..24baf4d 100644
--- a/scripts/Ed_Message.rb
+++ b/scripts/Ed_Message.rb
@@ -179,6 +179,13 @@ class Ed_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out_text = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_ed_text == nil
       @fade_out = true if @viewport.visible
@@ -213,12 +220,6 @@ class Ed_Message
       return
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out_text = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables