diff --git a/Data/Scripts/005_Sprites/007_Spriteset_Map.rb b/Data/Scripts/005_Sprites/007_Spriteset_Map.rb
index fcc5dcb46..7adc39a42 100644
--- a/Data/Scripts/005_Sprites/007_Spriteset_Map.rb
+++ b/Data/Scripts/005_Sprites/007_Spriteset_Map.rb
@@ -62,8 +62,10 @@ class Spriteset_Map
   end
 
   def dispose
-    $scene.map_renderer.remove_tileset(@map.tileset_name)
-    @map.autotile_names.each { |filename| $scene.map_renderer.remove_autotile(filename) }
+    if $scene.is_a?(Scene_Map)
+      $scene.map_renderer.remove_tileset(@map.tileset_name)
+      @map.autotile_names.each { |filename| $scene.map_renderer.remove_autotile(filename) }
+    end
     @panorama.dispose
     @fog.dispose
     for sprite in @character_sprites
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
index 157366040..80880ecb2 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
@@ -262,6 +262,8 @@ _END_
     #-------------------------------
     # Make background and text sprites
     #-------------------------------
+    viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
+    viewport.z = 99999
     text_viewport = Viewport.new(0, @trim, Graphics.width, Graphics.height - (@trim * 2))
     text_viewport.z = 99999
     @background_sprite = IconSprite.new(0, 0)
@@ -326,10 +328,12 @@ _END_
     end
     pbBGMFade(2.0)
     Graphics.freeze
+    viewport.color = Color.new(0, 0, 0, 255)   # Ensure screen is black
     Graphics.transition(20, "fadetoblack")
     @background_sprite.dispose
     @credit_sprites.each { |s| s.dispose if s }
     text_viewport.dispose
+    viewport.dispose
     $PokemonGlobal.creditsPlayed = true
     pbBGMPlay(previousBGM)
   end
@@ -357,13 +361,15 @@ _END_
   def update
     delta = Graphics.delta_s
     @counter += delta
-    # Go to next slide
-    if @counter >= SECONDS_PER_BACKGROUND
-      @counter -= SECONDS_PER_BACKGROUND
-      @bg_index += 1
-      @bg_index = 0 if @bg_index >= BACKGROUNDS_LIST.length
-      @background_sprite.setBitmap("Graphics/Titles/" + BACKGROUNDS_LIST[@bg_index])
-    end
+    @background_sprite.setBitmap("Graphics/Titles/" + BACKGROUNDS_LIST[@bg_index])
+
+    # # Go to next slide
+    # if @counter >= SECONDS_PER_BACKGROUND
+    #   @counter -= SECONDS_PER_BACKGROUND
+    #   @bg_index += 1
+    #   @bg_index = 0 if @bg_index >= BACKGROUNDS_LIST.length
+    #   @background_sprite.setBitmap("Graphics/Titles/" + BACKGROUNDS_LIST[@bg_index])
+    # end
     return if cancel?
     return if last?
     @realOY += SCROLL_SPEED * delta
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 7e5c1e1ef..1f91fbfb2 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ