From 8d0061bf3d3f40fdc212966abb1cd731c3dfb468 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Fri, 28 Feb 2025 21:55:11 +0000
Subject: [PATCH] Bug fixes

---
 .../016b_UI redesign/017_UI_PokemonStorage.rb   |  7 ++++---
 Data/Scripts/021_Compiler/001_Compiler.rb       | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Data/Scripts/016b_UI redesign/017_UI_PokemonStorage.rb b/Data/Scripts/016b_UI redesign/017_UI_PokemonStorage.rb
index 5158558be..6be8b607f 100644
--- a/Data/Scripts/016b_UI redesign/017_UI_PokemonStorage.rb	
+++ b/Data/Scripts/016b_UI redesign/017_UI_PokemonStorage.rb	
@@ -737,6 +737,7 @@ class UI::PokemonStorageVisuals < UI::BaseVisuals
     ret = UI::PokemonStorageVisualsBox.new(@storage, box_index, @viewport)
     ret.x = 184
     ret.y = 18
+    ret.set_visible_proc(@visible_proc)
     ret.refresh
     return ret
   end
@@ -832,7 +833,7 @@ class UI::PokemonStorageVisuals < UI::BaseVisuals
     @sprites[:cursor].quick_swap_mode = (@sub_mode != :none)
     @visible_proc = nil
     if @sub_mode == :rearrange_items
-      @visible_proc = proc { |pkmn| pkmn.hasItem? }
+      @visible_proc = proc { |pkmn| pkmn&.hasItem? }
     end
     @sprites[:box].set_visible_proc(@visible_proc)
     @sprites[:party_panel].set_visible_proc(@visible_proc)
@@ -2070,8 +2071,8 @@ UIActionHandlers.add(UI::PokemonStorage::SCREEN_ID, :interact_box_name_menu, {
 UIActionHandlers.add(UI::PokemonStorage::SCREEN_ID, :jump_to_box, {
   :effect => proc { |screen|
     new_box = screen.choose_box(_INTL("Jump to which Box?"))
-    next if !new_box || new_box == box
-    (new_box > box) ? screen.visuals.go_to_next_box(new_box) : screen.visuals.go_to_previous_box(new_box)
+    next if !new_box || new_box == screen.box
+    (new_box > screen.box) ? screen.visuals.go_to_next_box(new_box) : screen.visuals.go_to_previous_box(new_box)
   }
 })
 
diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index 36f2245c8..fec8da8fb 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -487,8 +487,13 @@ module Compiler
           when Array
             file.write(enumer[value])
           when Symbol, String
-            mod = Object.const_get(enumer.to_sym)
-            file.write(getConstantName(mod, value))
+            mod = GameData.const_get(enumer.to_sym)
+            if mod
+              file.write(mod.get(value).id.to_s)
+            else
+              mod = Object.const_get(enumer.to_sym)
+              file.write(getConstantName(mod, value))
+            end
           when Module
             file.write(getConstantName(enumer, value))
           when Hash
@@ -504,8 +509,12 @@ module Compiler
           when Array
             file.write((enumer[value].nil?) ? value : enumer[value])
           when Symbol, String
-            mod = Object.const_get(enumer.to_sym)
-            file.write(getConstantNameOrValue(mod, value))
+            if mod
+              file.write(mod.get(value).id.to_s)
+            else
+              mod = Object.const_get(enumer.to_sym)
+              file.write(getConstantNameOrValue(mod, value))
+            end
           when Module
             file.write(getConstantNameOrValue(enumer, value))
           when Hash