diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 946361cbb..a2b2c3898 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ 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 e882bfb6a..a4a1c7383 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 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