From 701ea9ab11a4b17e13fca65f59581099e588c93b Mon Sep 17 00:00:00 2001
From: chardub <pkmninfinitefusion@gmail.com>
Date: Mon, 10 Mar 2025 13:35:04 -0400
Subject: [PATCH] clothes menu crash fix

---
 Data/MapInfos.rxdata                          | Bin 42773 -> 42773 bytes
 .../UI/clothesShop/ClothesShopPresenter.rb    |   5 +++--
 .../ClothesShopPresenter_HatsMenu.rb          |  10 +++++++---
 Data/System.rxdata                            | Bin 31696 -> 31696 bytes
 Data/sprites/sprites_rate_limit.log           |   5 +++--
 Data/sprites/updated_spritesheets_cache       |  15 +++++++++++++++
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 946361cbbe45054fb69721fdb4819d7600e10c98..a2b2c3898e1a583052e9c4739c12bb11307bffe2 100644
GIT binary patch
delta 28
kcmbPwj%n&SrVUMoOib*Pt$n1}%B;CEnTj?qF)S<v0FK-Vc>n+a

delta 28
kcmbPwj%n&SrVUMoOz&AHTl+|{m05FTG9B2w#IUdw0HG%eu>b%7

diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
index 7c1200b98..4c0ef6efe 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
@@ -8,9 +8,9 @@ class ClothesShopPresenter < PokemonMartScreen
     @use_versions = versions
   end
 
-  def putOnClothes(item)
+  def putOnClothes(item,end_scene=true)
     @adapter.putOnOutfit(item) if item
-    @scene.pbEndBuyScene
+    @scene.pbEndBuyScene if end_scene
   end
 
 
@@ -73,6 +73,7 @@ class ClothesShopPresenter < PokemonMartScreen
   end
 
   def quitMenuPrompt(item)
+    return true if !@adapter.is_a?(HatsMartAdapter)
     boolean_changes_detected = @adapter.player_changed_clothes?
     return true if !boolean_changes_detected
     pbPlayCancelSE
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
index 30ea70981..0d34f6ef1 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
@@ -115,9 +115,13 @@ class ClothesShopPresenter < PokemonMartScreen
   end
 
   def confirmPutClothes(item)
-    putOnHats()
-    $Trainer.hat_color = @adapter.get_dye_color($Trainer.hat)
-    $Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2)
+    if @adapter.is_a?(HatsMartAdapter)
+      putOnHats()
+      $Trainer.hat_color = @adapter.get_dye_color($Trainer.hat)
+      $Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2)
+    else
+      putOnClothes(item,false)
+    end
   end
 
   def playerHatActionsMenu(item)
diff --git a/Data/System.rxdata b/Data/System.rxdata
index e882bfb6ac4062e342a1fd60b0ec7ae9bc4cb141..a4a1c738328cdcc1232334cda6c873478e1fca77 100644
GIT binary patch
delta 26
icmccco$<nV#tmAsET5QzST^g)9*$<z-~6fK9uokaS_>cm

delta 26
icmccco$<nV#tmAsEW6r{F>Th9Jsi!bx%pGYJthFBp$pdl

diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log
index 4e3b95485..a725a5a49 100644
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1,2 +1,3 @@
-1741625839
-1741625839
\ No newline at end of file
+1741628045
+1741628045
+1741628046
\ No newline at end of file
diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache
index 99dbb4d98..221779f14 100644
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -362,3 +362,18 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/496/496.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/166.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/31.png
 Graphics/CustomBattlers/spritesheets/spritesheets_custom/179/179.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/359.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/359/359.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/349.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/349/349.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/282.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/282/282.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/373.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/188/188a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/207.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/397.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/397/397.png
+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