From 47876255e9a72a865ff31383d449268a34ab7440 Mon Sep 17 00:00:00 2001 From: chardub Date: Fri, 14 Mar 2025 11:32:15 -0400 Subject: [PATCH] Removes some debugging logs --- .../UI/clothesShop/ClothesShopPresenter.rb | 2 +- .../050_Outfits/UI/clothesShop/HatShopView.rb | 5 ---- .../UI/clothesShop/HatsMartAdapter.rb | 4 +++ Data/System.rxdata | Bin 31695 -> 31696 bytes Data/sprites/updated_spritesheets_cache | 28 ++++++++++++++++++ 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb index 85dd658aa..c59aab1c3 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb @@ -80,7 +80,7 @@ class ClothesShopPresenter < PokemonMartScreen cmd_confirm = "Set outfit" cmd_discard = "Discard changes" cmd_cancel = "Cancel" - options = [cmd_confirm,cmd_discard,cmd_cancel] + options = [cmd_discard,cmd_confirm,cmd_cancel] choice = pbMessage("You have unsaved changes!",options,3) case options[choice] when cmd_confirm diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/HatShopView.rb b/Data/Scripts/050_Outfits/UI/clothesShop/HatShopView.rb index 07979c5f3..4f18be497 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/HatShopView.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/HatShopView.rb @@ -57,7 +57,6 @@ class HatShopView < ClothesShopView end def displayLayerIcons(selected_item=nil) - echoln selected_item handleHatlessLayerIcons(selected_item) hat1Filename = getOverworldHatFilename($Trainer.hat) @@ -78,10 +77,6 @@ class HatShopView < ClothesShopView @sprites["wornHat_layer1"].src_rect.set(0, 0, frame_width, frame_height) if hatBitmapWrapper @sprites["wornHat_layer2"].src_rect.set(0, 0, frame_width, frame_height) if hat2BitmapWrapper - - echoln hatBitmapWrapper - echoln hat2BitmapWrapper - end diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb index d778f29c9..3919715ce 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb @@ -158,11 +158,15 @@ class HatsMartAdapter < OutfitsMartAdapter end def putOnSelectedOutfit() + putOnHat($Trainer.hat,true,false) if $Trainer.hat putOnHat($Trainer.hat2,true,true) if $Trainer.hat2 @worn_clothes = $Trainer.hat @worn_clothes2 = $Trainer.hat2 + + playOutfitChangeAnimation() + pbMessage(_INTL("You put on the hat(s)!\\wtnp[30]")) end def putOnOutfit(item) diff --git a/Data/System.rxdata b/Data/System.rxdata index 17be776134e9f69bb565c74e391863496b11940c..b5db753a9a584895f4df269100b1527b4cc059eb 100644 GIT binary patch delta 32 ocmX^Ao$s4#tn~Uc$nj)*IDs9q!uS97ED&GmfFlEdn^tB*eeWC diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index 9a25bdf81..f9bdd7b7f 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -627,3 +627,31 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/303/303.png Graphics/CustomBattlers/spritesheets/spritesheets_base/35.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/162/162.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/372/372.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/398.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/291.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/291/291.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/266.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/60.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/60/60.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/321.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/160.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/160/160.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/490/490b.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/314.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/448.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/448/448.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/242/242.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/260.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/260/260.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/264.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/264/264.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/498.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/68.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/489.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/489/489.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/492.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/492/492.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/218/218.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/453.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/407.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/433/433a.png