diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 71336e1f0..a900929a9 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 2c3a12d33..a505dc4f9 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index a2b2c3898..6eb8a15c1 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb b/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb
index 0be24450b..b7d5a46e9 100644
--- a/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb
+++ b/Data/Scripts/048_Fusion/Sprites/CustomSpriteExtracter.rb
@@ -12,9 +12,14 @@ class CustomSpriteExtracter < PIFSpriteExtracter
   def load_bitmap_from_spritesheet(pif_sprite)
     body_id = pif_sprite.body_id
     spritesheet_file = getSpritesheetPath(pif_sprite)
+
+    echoln spritesheet_file
     spritesheet_bitmap = AnimatedBitmap.new(spritesheet_file).bitmap
 
     sprite_x_position,sprite_y_position  =get_sprite_position_on_spritesheet(body_id,SPRITE_SIZE,COLUMNS)
+    echoln sprite_x_position
+    echoln sprite_y_position
+
     src_rect = Rect.new(sprite_x_position, sprite_y_position, SPRITE_SIZE, SPRITE_SIZE)
 
     sprite_bitmap = Bitmap.new(SPRITE_SIZE, SPRITE_SIZE)
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
index 64a86db9a..243ea6ee5 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
@@ -12,6 +12,8 @@ class OutfitsMartAdapter < PokemonMartAdapter
     @worn_clothes = get_current_clothes()
     @isShop = isShop
     @version = nil
+    $Trainer.dyed_hats = {} if !$Trainer.dyed_hats
+    $Trainer.dyed_clothes = {} if !$Trainer.dyed_clothes
   end
 
   def getDisplayName(item)
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
index 0d34f6ef1..6ef657f5e 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
@@ -138,10 +138,8 @@ class ClothesShopPresenter < PokemonMartScreen
       return true
     elsif options[choice] == cmd_confirm
       confirmPutClothes(nil)
-      @scene.pbEndBuyScene
-      return false
+      return true
     elsif options[choice] == cmd_dye
-      #removeDye(item)  selectHatColor
       dyeOptions(@adapter.is_secondary_hat,item)
       return true
     elsif options[choice] == cmd_swap
diff --git a/Data/Scripts/052_AddOns/New Items effects.rb b/Data/Scripts/052_AddOns/New Items effects.rb
index 48fc6359e..7d25633d2 100644
--- a/Data/Scripts/052_AddOns/New Items effects.rb	
+++ b/Data/Scripts/052_AddOns/New Items effects.rb	
@@ -416,6 +416,8 @@ def switchToFavoriteOutfit()
 
   else
     if (Kernel.pbConfirmMessage("Put on your favorite outfit?"))
+      echoln "favorite clothes: #{$Trainer.favorite_clothes}, favorite hat: #{$Trainer.favorite_hat}, favorite hat2: #{$Trainer.favorite_hat2}"
+
       playOutfitChangeAnimation()
       putOnClothes($Trainer.favorite_clothes, true) if $Trainer.favorite_clothes
       putOnHat($Trainer.favorite_hat, true, false) if $Trainer.favorite_hat
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index a4a1c7383..351d7e605 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index b1437bcd4..f568868cc 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log
index a725a5a49..d9cd09374 100644
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1,3 +1,8 @@
-1741628045
-1741628045
-1741628046
\ No newline at end of file
+1741716194
+1741716198
+1741716201
+1741716206
+1741716225
+1741716229
+1741716244
+1741716248
\ No newline at end of file
diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache
index 221779f14..be5bed7ef 100644
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -377,3 +377,152 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/442/442.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/309.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/103.png
 Graphics/CustomBattlers/spritesheets/spritesheets_custom/103/103.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/305/305.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/392.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/333.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/333/333.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/372.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/34.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/34/34.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/343.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/247.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/247/247.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/474.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/474/474.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/151.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/151/151.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/108.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/108/108.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/365.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/400.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/400/400.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/270.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/106/106.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/324.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/45.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/45/45b.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/301.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/13.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/13/13.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/376.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/166/166.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/107/107.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/315.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/408.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/408/408.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/338.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/355/355.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/41.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/77/77.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/285/285.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/54.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/163.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/343/343.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/304.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/324/324.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/63.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/269.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/269/269.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/306.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/306/306.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/99.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/157/157.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/48.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/378.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/378/378.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/127.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/234.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/234/234.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/423.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/450/450.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/116.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/411/411.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/341.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/370/370.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/347.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/347/347.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/83.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/218.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/218/218.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/150.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/345.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/345/345c.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/223.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/223/223.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/110/110.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/265/265.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/123.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/123/123.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/407.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/372/372.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/273.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/273/273.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/164.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/286.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/286/286.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/221.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/42.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/42/42b.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/391.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/391/391.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/308.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/360.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/360/360.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/351.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/351/351.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/501/501.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/501.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/287.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/253.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/253/253.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/224.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/342.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/342/342.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/417.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/257/257.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/250.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/302.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/302/302.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/459.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/327.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/327/327a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/395.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/116/116.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/284.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/284/284.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/145.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/26/26a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/387.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/387/387.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/289.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/289/289.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/184.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/184/184.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/456.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/456/456.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/272.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/19/19a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/499.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/499/499.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/20.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/49/49.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/149.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/365/365.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/304/304.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/12.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/12/12.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/466.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/50/50.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/346.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/346/346a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/47.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/441.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/441/441.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/94.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/324/324a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/239.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/239/239.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/187/187.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/460.png