From a2327c62809f1bc8b910d74e00b7005f2f6440bf Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 3 Jul 2022 16:40:25 +0100
Subject: [PATCH] =?UTF-8?q?Fixed=20playing=20the=20credits/changing=20$sce?=
 =?UTF-8?q?ne=20leaving=20a=20ghost=20image=20of=20the=20old=20map=20behin?=
 =?UTF-8?q?d,=20fixed=20Pok=C3=A9mon=20icons=20sometimes=20disappearing=20?=
 =?UTF-8?q?in=20storage=20screen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/Scripts/003_Game processing/002_Scene_Map.rb      | 10 +++++++++-
 Data/Scripts/006_Map renderer/001_TilemapRenderer.rb   |  4 ++++
 Data/Scripts/016_UI/017_UI_PokemonStorage.rb           |  4 ++--
 Data/Scripts/019_Utilities/001_Utilities.rb            |  2 +-
 .../002_EditorScreens_TerrainTags.rb                   |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index e647450a8..ad8a53737 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -45,6 +45,14 @@ class Scene_Map
     @spritesets = {}
   end
 
+  def dispose
+    disposeSpritesets
+    @map_renderer.dispose
+    @map_renderer = nil
+    @spritesetGlobal.dispose
+    @spritesetGlobal = nil
+  end
+
   def autofade(mapid)
     playingBGM = $game_system.playing_bgm
     playingBGS = $game_system.playing_bgs
@@ -225,7 +233,7 @@ class Scene_Map
       break if $scene != self
     end
     Graphics.freeze
-    disposeSpritesets
+    dispose
     if $game_temp.title_screen_calling
       Graphics.transition
       Graphics.freeze
diff --git a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb
index bcaf77f91..4f5e653bd 100644
--- a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb	
+++ b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb	
@@ -305,10 +305,14 @@ class TilemapRenderer
     @tiles.each do |col|
       col.each do |coord|
         coord.each { |tile| tile.dispose }
+        coord.clear
       end
     end
+    @tiles.clear
     @tilesets.bitmaps.each_value { |bitmap| bitmap.dispose }
+    @tilesets.bitmaps.clear
     @autotiles.bitmaps.each_value { |bitmap| bitmap.dispose }
+    @autotiles.bitmaps.clear
     @self_viewport.dispose
     @self_viewport = nil
     @disposed = true
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 479fa5fb6..2307abc73 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -422,7 +422,7 @@ class PokemonBoxSprite < Sprite
           sprite.viewport = self.viewport
           sprite.x = xval
           sprite.y = yval
-          sprite.z = 0
+          sprite.z = 1
         end
         xval += 48
       end
@@ -547,7 +547,7 @@ class PokemonBoxPartySprite < Sprite
       sprite.viewport = self.viewport
       sprite.x = self.x + xvalues[j]
       sprite.y = self.y + yvalues[j]
-      sprite.z = 0
+      sprite.z = 1
     end
   end
 
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index e7434e2a5..11ea68636 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -556,7 +556,7 @@ def pbLoadRpgxpScene(scene)
   oldscene = $scene
   $scene = scene
   Graphics.freeze
-  oldscene.disposeSpritesets
+  oldscene.dispose
   visibleObjects = pbHideVisibleObjects
   Graphics.transition
   Graphics.freeze
diff --git a/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb b/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb
index f0241fb17..71b53af7d 100644
--- a/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb	
+++ b/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb	
@@ -40,7 +40,7 @@ class PokemonTilesetScene
       $map_factory.setup($game_map.map_id)
       $game_player.center($game_player.x, $game_player.y)
       if $scene.is_a?(Scene_Map)
-        $scene.disposeSpritesets
+        $scene.dispose
         $scene.createSpritesets
       end
     end