diff --git a/Data/Map155.rxdata b/Data/Map155.rxdata index f575a1752..9f1333e74 100644 Binary files a/Data/Map155.rxdata and b/Data/Map155.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6d939a83c..108de2fbb 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb index ce49fd928..1eab50319 100644 --- a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb +++ b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb @@ -31,14 +31,14 @@ def pbStorePokemon(pkmn) if creator pbMessage(_INTL("Box \"{1}\" on {2}'s PC was full.\1", curboxname, creator)) else - pbMessage(_INTL("Box \"{1}\" on someone's PC was full.\1", curboxname)) + pbMessage(_INTL("Box \"{1}\" on the PC was full.\1", curboxname)) end pbMessage(_INTL("{1} was transferred to box \"{2}.\"", pkmn.name, boxname)) else if creator pbMessage(_INTL("{1} was transferred to {2}'s PC.\1", pkmn.name, creator)) else - pbMessage(_INTL("{1} was transferred to someone's PC.\1", pkmn.name)) + pbMessage(_INTL("{1} was transferred to the PC.\1", pkmn.name)) end pbMessage(_INTL("It was stored in box \"{1}.\"", boxname)) end diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb index b08c8d102..050d77d15 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb @@ -78,8 +78,8 @@ class ClothesMartAdapter < OutfitsMartAdapter end def putOnOutfit(item) - putOnClothes(item.id) - @worn_clothes = item.id + putOnClothes(item.id) if item + @worn_clothes = item.id if item end def reset_player_clothes() diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb index 91a5396ad..adc20649c 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb @@ -9,7 +9,7 @@ class ClothesShopPresenter < PokemonMartScreen end def putOnClothes(item) - @adapter.putOnOutfit(item) + @adapter.putOnOutfit(item) if item @scene.pbEndBuyScene end diff --git a/Data/System.rxdata b/Data/System.rxdata index e53147665..729f92023 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 a558c275a..f52628ffa 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,3 +1,3 @@ -1741570082 -1741570082 -1741570083 \ No newline at end of file +1741573772 +1741573773 +1741573773 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index c917c9719..445b9deef 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -2,3 +2,6 @@ Graphics/CustomBattlers/spritesheets/spritesheets_base/4.png Graphics/CustomBattlers/spritesheets/spritesheets_base/72.png Graphics/CustomBattlers/spritesheets/spritesheets_base/192.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/192/192.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/157.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/170.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/170/170.png