DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

clothes menu crash fix

Browse Source
This commit is contained in:
chardub
2025-03-10 13:35:04 -04:00
parent 36851c7bb7
commit 701ea9ab11
6 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/MapInfos.rxdata
View File

Binary file not shown.

5
Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
View File

@@ -8,9 +8,9 @@ class ClothesShopPresenter < PokemonMartScreen
@use_versions = versions @use_versions = versions
end end
def putOnClothes(item) def putOnClothes(item,end_scene=true)
@adapter.putOnOutfit(item) if item @adapter.putOnOutfit(item) if item
@scene.pbEndBuyScene @scene.pbEndBuyScene if end_scene
end end
@@ -73,6 +73,7 @@ class ClothesShopPresenter < PokemonMartScreen
end end
def quitMenuPrompt(item) def quitMenuPrompt(item)
return true if !@adapter.is_a?(HatsMartAdapter)
boolean_changes_detected = @adapter.player_changed_clothes? boolean_changes_detected = @adapter.player_changed_clothes?
return true if !boolean_changes_detected return true if !boolean_changes_detected
pbPlayCancelSE pbPlayCancelSE

10
Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
View File

@@ -115,9 +115,13 @@ class ClothesShopPresenter < PokemonMartScreen
end end
def confirmPutClothes(item) def confirmPutClothes(item)
putOnHats() if @adapter.is_a?(HatsMartAdapter)
$Trainer.hat_color = @adapter.get_dye_color($Trainer.hat) putOnHats()
$Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2) $Trainer.hat_color = @adapter.get_dye_color($Trainer.hat)
$Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2)
else
putOnClothes(item,false)
end
end end
def playerHatActionsMenu(item) def playerHatActionsMenu(item)

BIN
Data/System.rxdata
View File

Binary file not shown.

5
Data/sprites/sprites_rate_limit.log
View File

@@ -1,2 +1,3 @@
1741625839 1741628045
1741625839 1741628045
1741628046

15
Data/sprites/updated_spritesheets_cache
View File

@@ -362,3 +362,18 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/496/496.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/166.png Graphics/CustomBattlers/spritesheets/spritesheets_base/166.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/31.png Graphics/CustomBattlers/spritesheets/spritesheets_base/31.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/179/179.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