diff --git a/Data/Scripts/010_Data/001_GameData.rb b/Data/Scripts/010_Data/001_GameData.rb
index 5708761d1..19e3e62e1 100644
--- a/Data/Scripts/010_Data/001_GameData.rb
+++ b/Data/Scripts/010_Data/001_GameData.rb
@@ -46,6 +46,12 @@ module GameData
       return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
     end
 
+    # Returns the array of keys for the data.
+    # @return [Array]
+    def keys
+      return self::DATA.keys
+    end
+
     # Yields all data in order of their id_number.
     def each
       keys = self::DATA.keys.sort { |a, b| self::DATA[a].id_number <=> self::DATA[b].id_number }
@@ -102,6 +108,12 @@ module GameData
       return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
     end
 
+    # Returns the array of keys for the data.
+    # @return [Array]
+    def keys
+      return self::DATA.keys
+    end
+
     # Yields all data in alphabetical order.
     def each
       keys = self::DATA.keys.sort { |a, b| self::DATA[a].real_name <=> self::DATA[b].real_name }
@@ -153,6 +165,12 @@ module GameData
       return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
     end
 
+    # Returns the array of keys for the data.
+    # @return [Array]
+    def keys
+      return self::DATA.keys
+    end
+
     # Yields all data in numberical order.
     def each
       keys = self::DATA.keys.sort
diff --git a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
index 909e87d1c..514e6b940 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
@@ -543,6 +543,7 @@ DebugMenuCommands.register("demoparty", {
     for id in species
       party.push(id) if GameData::Species.exists?(id)
     end
+    $Trainer.party.clear
     # Generate Pokémon of each species at level 20
     party.each do |species|
       pkmn = Pokemon.new(species, 20)
diff --git a/Data/Scripts/021_Compiler/005_Compiler_SpriteRenamer.rb b/Data/Scripts/021_Compiler/005_Compiler_SpriteRenamer.rb
index 3985de69d..a86fb8e6c 100644
--- a/Data/Scripts/021_Compiler/005_Compiler_SpriteRenamer.rb
+++ b/Data/Scripts/021_Compiler/005_Compiler_SpriteRenamer.rb
@@ -56,6 +56,8 @@ module Compiler
       else
         prefix = (name[/b/]) ? "Back/" : "Front/"
       end
+    elsif default_prefix == "Icons/"
+      prefix = "Icons shiny/" if name[/s/] && !name[/shadow/]
     end
     if name[/000/]
       species = "000"
@@ -69,7 +71,7 @@ module Compiler
       shadow = "_shadow" if name[/_shadow/]
       if name[/egg/]
         prefix = "Eggs/"
-        crack = "_icon" if default_prefix == "Icons/"
+        crack = "_icon" if default_prefix == "Icons/" || default_prefix == "Icons shiny/"
         crack = "_cracks" if name[/eggCracks/]
       end
     end