diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 8af865203..3a99093c5 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata
index 92abc3449..a79bab6af 100644
Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 31f328eb7..537968d03 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/credits - Copie.csv b/Data/SPRITE_CREDS
similarity index 99%
rename from Data/credits - Copie.csv
rename to Data/SPRITE_CREDS
index bb3f84cd6..9a98bfaaf 100644
--- a/Data/credits - Copie.csv	
+++ b/Data/SPRITE_CREDS
@@ -6254,6 +6254,7 @@
 48.95,IanDig#0294
 48.96,Seath#8173
 48.97,CoramSun#0274
+48.99,HubblePie#0787
 48.100,Aquatic#7954
 48.102,xigzagoon#9354
 48.103,Gorky#1761
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb
index 26c3a7185..0b99f45cd 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb	
@@ -371,7 +371,7 @@ class HallOfFame_Scene
     if $game_switches[SWITCH_RANDOMIZED_AT_LEAST_ONCE]
       gameMode = "Randomized mode"
     end
-    if $PokemonBag.pbQuantity(:MAGICBOOTS)>=1 || $DEBUG
+    if $game_switches[ENABLED_DEBUG_MODE_AT_LEAST_ONCE] || $DEBUG
       gameMode = "Debug mode"
     end
 
diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
index f3ea8140f..8d2cf8af6 100644
--- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
+++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
@@ -422,7 +422,7 @@ def getCustomSpeciesList(allowOnline = true, redownload_file=false)
       path = filesList[i]
       file = File.basename(path, ".*")
       fused = getDexNumFromFilename(file)
-      if fused <= maxDexNumber && fused > 0
+      if fused && (fused <= maxDexNumber && fused > 0)
         speciesList << fused
       end
 
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index fbfca2c49..82ea7af75 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -48,6 +48,8 @@ SWITCH_GOT_BADGE_16 = 50
 #Randomizer Switches
 SWITCH_RANDOM_WILD_TO_FUSION=953
 SWITCH_RANDOMIZED_AT_LEAST_ONCE = 855
+ENABLED_DEBUG_MODE_AT_LEAST_ONCE = 842
+
 SWITCH_RANDOM_WILD = 778
 SWITCH_RANDOM_WILD_AREA = 777
 
diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
index 5c971f1cd..4bd0cbc59 100644
--- a/Data/Scripts/050_AddOns/GeneralUtils.rb
+++ b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -385,7 +385,7 @@ def obtainPokemonSpritePath(bodyId, headId, include_customs = true)
   download_pokemon_sprite_if_missing(bodyId,headId)
   picturePath = _INTL("Graphics/Battlers/{1}/{1}.{2}.png", headId, bodyId)
 
-  if include_customs && customSpriteExists(bodyId,headId)
+  if include_customs && customSpriteExistsBodyHead(bodyId,headId)
     pathCustom = getCustomSpritePath(bodyId,headId)
     if (pbResolveBitmap(pathCustom))
       picturePath = pathCustom
@@ -410,7 +410,7 @@ end
 
 
 
-def customSpriteExists(body, head)
+def customSpriteExistsBodyHead(body, head)
   pathCustom = getCustomSpritePath(body,head)
 
   return true if pbResolveBitmap(pathCustom) != nil
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 9a707bb69..40985df6a 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -407,7 +407,7 @@ ItemHandlers::UseFromBag.add(:MAGICBOOTS, proc { |item|
   else
     if Kernel.pbConfirmMessageSerious(_INTL("Put on the Magic Boots?"))
       Kernel.pbMessage(_INTL("Debug mode is now active."))
-      $game_switches[842] = true #got debug mode (for compatibility)
+      $game_switches[ENABLED_DEBUG_MODE_AT_LEAST_ONCE] = true #got debug mode (for compatibility)
       $DEBUG = true
     end
   end
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index a100d15d4..f0c2e4eb4 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index c84114c9c..a2ad9367f 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ