diff --git a/Data/Map041.rxdata b/Data/Map041.rxdata
index 02690cbaf..516ceb8af 100644
Binary files a/Data/Map041.rxdata and b/Data/Map041.rxdata differ
diff --git a/Data/Map051.rxdata b/Data/Map051.rxdata
index 3728cf149..651161f31 100644
Binary files a/Data/Map051.rxdata and b/Data/Map051.rxdata differ
diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata
index c5d766b89..92882a94f 100644
Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ
diff --git a/Data/Map306.rxdata b/Data/Map306.rxdata
index 2ed9b670b..6dc0672b3 100644
Binary files a/Data/Map306.rxdata and b/Data/Map306.rxdata differ
diff --git a/Data/Map349.rxdata b/Data/Map349.rxdata
index 53b01e217..1893b11b9 100644
Binary files a/Data/Map349.rxdata and b/Data/Map349.rxdata differ
diff --git a/Data/Map350.rxdata b/Data/Map350.rxdata
index 7c6ce411c..2464e2d00 100644
Binary files a/Data/Map350.rxdata and b/Data/Map350.rxdata differ
diff --git a/Data/Map358.rxdata b/Data/Map358.rxdata
index 86b4ece4a..4f99f8fc6 100644
Binary files a/Data/Map358.rxdata and b/Data/Map358.rxdata differ
diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata
index ab9cccc21..6fd3dc430 100644
Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ
diff --git a/Data/Map609.rxdata b/Data/Map609.rxdata
index 271d9358d..88e17532c 100644
Binary files a/Data/Map609.rxdata and b/Data/Map609.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 1da653df1..574e1ed8e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb b/Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb
index e1b67a77b..af888c67c 100644
--- a/Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb
+++ b/Data/Scripts/050_Outfits/001_OutfitsMain/LayeredClothes.rb
@@ -173,14 +173,19 @@ def generate_front_trainer_sprite_bitmap(allowEasterEgg=true, pokeball = nil, cl
     raise "No temp clothes graphics available"
   end
 
-  outfitBitmap = AnimatedBitmap.new(outfitFilename, clothes_color_shift) # if pbResolveBitmap(outfitFilename) #pb
+  outfitBitmap = AnimatedBitmap.new(outfitFilename, clothes_color_shift) if pbResolveBitmap(outfitFilename) #pb
   hairBitmapWrapper = AnimatedBitmap.new(hairFilename, hair_color_shift) if pbResolveBitmap(hairFilename)
 
   hatBitmap = AnimatedBitmap.new(hatFilename, hat_color_shift) if pbResolveBitmap(hatFilename) #pbLoadOutfitBitmap(hatFilename) if pbResolveBitmap(hatFilename)
 
   baseBitmap.bitmap = baseBitmap.bitmap.clone
-  baseBitmap.bitmap.blt(0, 0, outfitBitmap.bitmap, outfitBitmap.bitmap.rect) if outfitBitmap
-
+  if outfitBitmap
+    baseBitmap.bitmap.blt(0, 0, outfitBitmap.bitmap, outfitBitmap.bitmap.rect)
+  else
+    outfitFilename = getTrainerSpriteOutfitFilename("temp")
+    outfitBitmap = AnimatedBitmap.new(outfitFilename, 0)
+    baseBitmap.bitmap.blt(0, 0, outfitBitmap.bitmap, outfitBitmap.bitmap.rect)
+  end
   baseBitmap.bitmap.blt(0, 0, hairBitmapWrapper.bitmap, hairBitmapWrapper.bitmap.rect) if hairBitmapWrapper
   baseBitmap.bitmap.blt(0, 0, hatBitmap.bitmap, hatBitmap.bitmap.rect) if hatBitmap
   baseBitmap.bitmap.blt(44, 42, ballBitmap, ballBitmap.rect) if ballBitmap
diff --git a/Data/System.rxdata b/Data/System.rxdata
index c0d251785..0e2bb9f65 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log
index cc031790f..8625dd8ad 100644
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1,5 +1,3 @@
-1736142096
-1736142097
-1736142097
-1736142098
-1736142098
\ No newline at end of file
+1736378128
+1736378128
+1736378129
\ No newline at end of file