From ad48a874dfe286332c6b3231ed310e8673443f40 Mon Sep 17 00:00:00 2001
From: Michael Shirt <girakacheezer@gmail.com>
Date: Thu, 13 Oct 2016 00:36:01 -0600
Subject: [PATCH] 2 changes to basic text boxes

-If niko's character graphic is one of the gasmask graphics, change all
his facepics to the gasmask facepic
-User can now prompt text to show instantly by pressing action or cancel
while text is scrolling
---
 scripts/Window_Message.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/scripts/Window_Message.rb b/scripts/Window_Message.rb
index cc22346..02266db 100644
--- a/scripts/Window_Message.rb
+++ b/scripts/Window_Message.rb
@@ -28,6 +28,7 @@ class Window_Message < Window_Selectable
     @text = nil
     @text_y = @text_x = 0
     @drawing_text = false # set to true when message text is drawing
+    @skip_text = false
 
     # Number/Choices
     self.active = false
@@ -157,6 +158,11 @@ class Window_Message < Window_Selectable
 
     # Blit face graphic
     if $game_temp.message_face != nil
+      if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask"
+        if $game_temp.message_face.start_with?("niko")
+          $game_temp.message_face = "niko_gasmask"
+        end
+      end
       face = RPG::Cache.face($game_temp.message_face)
       self.contents.blt(self.contents.width - 96, 0, face, Rect.new(0, 0, 96, 96))
     end
@@ -229,20 +235,29 @@ class Window_Message < Window_Selectable
         end
         self.contents.fill_rect(self.contents.width - 96, 0, 96, 96, Color.new(0,0,0,0))
         $game_temp.message_face = face_name
+        if $game_player.character_name == "niko_gasmask" || $game_player.character_name == "niko_bulb_gasmask"
+          if $game_temp.message_face.start_with?("niko")
+            $game_temp.message_face = "niko_gasmask"
+          end
+        end
         face = RPG::Cache.face($game_temp.message_face)
         self.contents.blt(self.contents.width - 96, 0, face, Rect.new(0, 0, 96, 96))
         return
       end
       if c == "\004"
         @drawing_text = false
+        @skip_text = false
         return
       end
       # Draw text
       self.contents.draw_text(4 + @text_x, 24 * @text_y, 40, 24, c)
       # Add x to drawn text width
       @text_x += self.contents.text_size(c).width
-      break
+      if !@skip_text
+        break
+      end
     end
+    @skip_text = false
 
     # If text is empty, set up choices/numbers and indicate that we're done
     if @text.empty?
@@ -362,6 +377,9 @@ class Window_Message < Window_Selectable
         end
         tick
       end
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        @skip_text = true
+      end
     else
       # Handle user input
       if @choice_start >= 0