diff --git a/Data/Scripts/050_Outfits/UI/TrainerClothesPreview.rb b/Data/Scripts/050_Outfits/UI/TrainerClothesPreview.rb index 8ee7c1448..faed0c608 100644 --- a/Data/Scripts/050_Outfits/UI/TrainerClothesPreview.rb +++ b/Data/Scripts/050_Outfits/UI/TrainerClothesPreview.rb @@ -12,6 +12,22 @@ class TrainerClothesPreview resetOutfits() end + def set_hat(value,is_secondaryHat=false) + if is_secondaryHat + @hat2 = value + else + @hat = value + end + end + + def set_hat_color(value,is_secondaryHat=false) + if is_secondaryHat + @hat2_color = value + else + @hat_color = value + end + end + def resetOutfits() @clothes = $Trainer.clothes @hat = $Trainer.hat diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb index b832158bb..ce41154fc 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb @@ -1,10 +1,12 @@ class OutfitsMartAdapter < PokemonMartAdapter attr_accessor :worn_clothes + attr_accessor :is_secondary_hat WORN_ITEM_BASE_COLOR = MessageConfig::BLUE_TEXT_MAIN_COLOR WORN_ITEM_SHADOW_COLOR = MessageConfig::BLUE_TEXT_SHADOW_COLOR - def initialize(stock = [], isShop = true) + def initialize(stock = [], isShop = true, isSecondaryHat = false) + @is_secondary_hat = isSecondaryHat @items = stock @worn_clothes = get_current_clothes() @isShop = isShop diff --git a/Graphics/Fogs/caustic1.png b/Graphics/Fogs/caustic1.png deleted file mode 100644 index 97b34882e..000000000 Binary files a/Graphics/Fogs/caustic1.png and /dev/null differ