diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 71336e1f0..a900929a9 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 346714904..c0f66baff 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map017.rxdata b/Data/Map017.rxdata index 615d4d3c2..45f3d5e12 100644 Binary files a/Data/Map017.rxdata and b/Data/Map017.rxdata differ diff --git a/Data/Map025.rxdata b/Data/Map025.rxdata index 777b87293..970e3c9c3 100644 Binary files a/Data/Map025.rxdata and b/Data/Map025.rxdata differ diff --git a/Data/Map029.rxdata b/Data/Map029.rxdata index 0efe0e60d..d7fdcb30b 100644 Binary files a/Data/Map029.rxdata and b/Data/Map029.rxdata differ diff --git a/Data/Map078.rxdata b/Data/Map078.rxdata index 66ac2782f..8dd5d0e4f 100644 Binary files a/Data/Map078.rxdata and b/Data/Map078.rxdata differ diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata index f93248543..b5bba9137 100644 Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ diff --git a/Data/Map241.rxdata b/Data/Map241.rxdata index 5fbccabee..89212fc73 100644 Binary files a/Data/Map241.rxdata and b/Data/Map241.rxdata differ diff --git a/Data/Map242.rxdata b/Data/Map242.rxdata index 946c62295..c944ad747 100644 Binary files a/Data/Map242.rxdata and b/Data/Map242.rxdata differ diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata index 2e0028ed1..d9af76564 100644 Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ diff --git a/Data/Map377.rxdata b/Data/Map377.rxdata index fd3b3910f..35e1009c7 100644 Binary files a/Data/Map377.rxdata and b/Data/Map377.rxdata differ diff --git a/Data/Map418.rxdata b/Data/Map418.rxdata index 549cb60cb..de7059da1 100644 Binary files a/Data/Map418.rxdata and b/Data/Map418.rxdata differ diff --git a/Data/Map435.rxdata b/Data/Map435.rxdata index a7bbc4131..d36309347 100644 Binary files a/Data/Map435.rxdata and b/Data/Map435.rxdata differ diff --git a/Data/Map514.rxdata b/Data/Map514.rxdata index 94ebae2b6..332361b9c 100644 Binary files a/Data/Map514.rxdata and b/Data/Map514.rxdata differ diff --git a/Data/Map647.rxdata b/Data/Map647.rxdata index f1c79ec8c..ec47ef806 100644 Binary files a/Data/Map647.rxdata and b/Data/Map647.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 58610fafc..a8c89d20c 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb index 2533869c2..1baf52909 100644 --- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb +++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb @@ -363,6 +363,12 @@ def pbPlayCry(pkmn, volume = 90, pitch = nil) GameData::Species.play_cry(pkmn, volume, pitch) end + +def play_cry(species, volume = 90, pitch = 100) + echoln species + GameData::Species.play_cry_from_species(species,0,volume, pitch) +end + # @deprecated This alias is slated to be removed in v20. def pbPlayCrySpecies(species, form = 0, volume = 90, pitch = nil) Deprecation.warn_method('pbPlayCrySpecies', 'v20', 'Pokemon.play_cry(species, form)') diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb index 6331ee168..2956bdde5 100644 --- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb +++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb @@ -116,7 +116,9 @@ class ClothesShopPresenter < PokemonMartScreen next if stay_in_menu return elsif @adapter.is_a?(HatsMartAdapter) + echoln pbGet(1) stay_in_menu = playerHatActionsMenu(item) + echoln pbGet(1) next if stay_in_menu return else diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 323a283f3..fa3841a71 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index b1437bcd4..60338d995 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ