diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 9d09f0960..346714904 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata index 809a5b4ef..f93248543 100644 Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ diff --git a/Data/Map362.rxdata b/Data/Map362.rxdata index 6f24fa617..be94d74fb 100644 Binary files a/Data/Map362.rxdata and b/Data/Map362.rxdata differ diff --git a/Data/Map788.rxdata b/Data/Map788.rxdata index f7d8e01f7..fa6a5aa70 100644 Binary files a/Data/Map788.rxdata and b/Data/Map788.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 3953893a2..717f07975 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 c59aab1c3..6331ee168 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb @@ -103,8 +103,9 @@ class ClothesShopPresenter < PokemonMartScreen item = @scene.pbChooseBuyItem if !item break if @adapter.isShop? - quit_menu_choice = quitMenuPrompt() - break if quit_menu_choice + #quit_menu_choice = quitMenuPrompt() + #break if quit_menu_choice + break next end diff --git a/Data/System.rxdata b/Data/System.rxdata index 62122efdd..419869cf6 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index b9e1e393a..b94b74c4a 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -661,3 +661,19 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/223/223.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/199/199.png Graphics/CustomBattlers/spritesheets/spritesheets_base/207.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/207/207.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/419/419.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/336.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/383.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/70.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/486.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/200/200b.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/49.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/290.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/290/290.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/53/53.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/401/401.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/26/26a.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/441.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/6/6b.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/443.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/443/443.png