From 6dd88e49e156bd1a6303f9de18f6bb0980d39f40 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 3 Jul 2022 15:58:37 +0100
Subject: [PATCH] Fixed the "See ya!" option in the PC menu not working
 properly, fixed mispositioning of text in Debug features that edit Game
 Switches/Variables

---
 .../004_Overworld_EncounterModifiers.rb             |  2 +-
 Data/Scripts/016_UI/019_UI_PC.rb                    | 13 ++++++++-----
 .../003_Debug menus/003_Debug_MenuExtraCode.rb      |  9 +++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb b/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb
index d1c3d6b1b..007192b57 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb	
@@ -32,7 +32,7 @@ EventHandlers.add(:on_wild_pokemon_created, :level_depends_on_party,
 # Note that you can only modify a partner trainer's Pokémon, and not the trainer
 # themselves nor their items this way, as those are generated from scratch
 # before each battle.
-#EventHandlers.trigger(:on_trainer_load, :put_a_name_here,
+#EventHandlers.add(:on_trainer_load, :put_a_name_here,
 #  proc { |trainer|
 #    if trainer   # An NPCTrainer object containing party/items/lose text, etc.
 #      YOUR CODE HERE
diff --git a/Data/Scripts/016_UI/019_UI_PC.rb b/Data/Scripts/016_UI/019_UI_PC.rb
index 3505caf34..598b6eda4 100644
--- a/Data/Scripts/016_UI/019_UI_PC.rb
+++ b/Data/Scripts/016_UI/019_UI_PC.rb
@@ -180,6 +180,12 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
           _INTL("Return to the previous menu.")], -1, command)
       break if command < 0
       case command
+      when 0   # Organize
+        pbFadeOutIn {
+          scene = PokemonStorageScene.new
+          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
+          screen.pbStartScreen(command)
+        }
       when 1   # Withdraw
         if $PokemonStorage.party_full?
           pbMessage(_INTL("Your party is full!"))
@@ -194,12 +200,9 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
           pbMessage(_INTL("Can't deposit the last Pokémon!"))
           next
         end
+      else
+        break
       end
-      pbFadeOutIn {
-        scene = PokemonStorageScene.new
-        screen = PokemonStorageScreen.new(scene, $PokemonStorage)
-        screen.pbStartScreen(command)
-      }
     end
     next false
   }
diff --git a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
index 504c87d71..c96bdce37 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
@@ -62,16 +62,17 @@ class SpriteWindow_DebugVariables < Window_DrawableCommand
   def shadowtext(x, y, w, h, t, align = 0, colors = 0)
     width = self.contents.text_size(t).width
     case align
-    when 1 # Right aligned
+    when 1   # Right aligned
       x += (w - width)
-    when 2 # Centre aligned
+    when 2   # Centre aligned
       x += (w / 2) - (width / 2)
     end
+    y += 8   # TEXT OFFSET
     base = Color.new(12 * 8, 12 * 8, 12 * 8)
     case colors
-    when 1 # Red
+    when 1   # Red
       base = Color.new(168, 48, 56)
-    when 2 # Green
+    when 2   # Green
       base = Color.new(0, 144, 0)
     end
     pbDrawShadowText(self.contents, x, y, [width, w].max, h, t, base, Color.new(26 * 8, 26 * 8, 25 * 8))