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 826e1e8a6..8e67182ba 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 907609ba6..b48f96eaf 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/Map040.rxdata b/Data/Map040.rxdata index 13036cf8e..5a4cb1155 100644 Binary files a/Data/Map040.rxdata and b/Data/Map040.rxdata differ diff --git a/Data/Map106.rxdata b/Data/Map106.rxdata index 554ea3972..fd811a572 100644 Binary files a/Data/Map106.rxdata and b/Data/Map106.rxdata differ diff --git a/Data/Map376.rxdata b/Data/Map376.rxdata index 56f1f9334..2a4f5b32a 100644 Binary files a/Data/Map376.rxdata and b/Data/Map376.rxdata differ diff --git a/Data/Map562.rxdata b/Data/Map562.rxdata index f55803362..c0d8182f1 100644 Binary files a/Data/Map562.rxdata and b/Data/Map562.rxdata differ diff --git a/Data/Map586.rxdata b/Data/Map586.rxdata index 23183d124..6c20da8d4 100644 Binary files a/Data/Map586.rxdata and b/Data/Map586.rxdata differ diff --git a/Data/Map694.rxdata b/Data/Map694.rxdata index 4a2341fd4..65898924c 100644 Binary files a/Data/Map694.rxdata and b/Data/Map694.rxdata differ diff --git a/Data/Map707.rxdata b/Data/Map707.rxdata new file mode 100644 index 000000000..d90c5a72c Binary files /dev/null and b/Data/Map707.rxdata differ diff --git a/Data/Map708.rxdata b/Data/Map708.rxdata new file mode 100644 index 000000000..527589d81 Binary files /dev/null and b/Data/Map708.rxdata differ diff --git a/Data/Map783.rxdata b/Data/Map783.rxdata index 90c646c03..6682cd1db 100644 Binary files a/Data/Map783.rxdata and b/Data/Map783.rxdata differ diff --git a/Data/Map797.rxdata b/Data/Map797.rxdata new file mode 100644 index 000000000..0eb6985f9 Binary files /dev/null and b/Data/Map797.rxdata differ diff --git a/Data/Map798.rxdata b/Data/Map798.rxdata new file mode 100644 index 000000000..b84356072 Binary files /dev/null and b/Data/Map798.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1accf0216..e1a3846b6 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/013_Items/003_Item_BattleEffects.rb b/Data/Scripts/013_Items/003_Item_BattleEffects.rb index 903caefab..43fc6d83c 100644 --- a/Data/Scripts/013_Items/003_Item_BattleEffects.rb +++ b/Data/Scripts/013_Items/003_Item_BattleEffects.rb @@ -42,7 +42,14 @@ ItemHandlers::CanUseInBattle.addIf(proc { |item| GameData::Item.get(item).is_pok scene.pbDisplay(_INTL("It's no good! It's impossible to aim at a Pokémon that's not in sight!")) if showMessages next false end - # NOTE: The code below stops you from throwing a Poké Ball if there is more + + if $game_switches[SWITCH_SILVERBOSS_BATTLE] + scene.pbDisplay(_INTL("It's no good! It's too agitated to aim!")) if showMessages + next false + end + + + # NOTE: The code below stops you from throwing a Poké Ball if there is more # than one unfainted opposing Pokémon. (Snag Balls can be thrown in # this case, but only in trainer battles, and the trainer will deflect # them if they are trying to catch a non-Shadow Pokémon.) 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 bf80ee58b..92f251c7b 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index b5372acec..0ce401add 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