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 0aaf9edfa..7989f71f4 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/Map755.rxdata b/Data/Map755.rxdata index c1a954a6b..f76553dae 100644 Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index ccb56030f..12a65f0e0 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb index 79ea4d2f9..d618d954e 100644 --- a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb +++ b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb @@ -103,6 +103,10 @@ module PokeBattle_BattleCommon @scene.pbThrowAndDeflect(ball,1) pbDisplay(_INTL("The Trainer blocked your Poké Ball! Don't be a thief!")) return + elsif $game_switches[SWITCH_CANNOT_CATCH_POKEMON] + @scene.pbThrowAndDeflect(ball,1) + pbDisplay(_INTL("The Pokémon is impossible to catch!")) + return end # Calculate the number of shakes (4=capture) pkmn = battler.pokemon diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 6ee7874b7..3432ae548 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -94,6 +94,7 @@ SWITCH_FIRST_RIVAL_BATTLE=46 SWITCH_BATTLE_FACTORY_INCLUDE_ALL = 775 SWITCH_SUPER_SLOW_SPEED=649 SWITCH_LOUNGE_BATTLE_LEVEL = 240 +SWITCH_CANNOT_CATCH_POKEMON = 75 ############# # VARIABLES # 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 943ee850d..272789408 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index acaa59516..ec292660a 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 diff --git a/Graphics/Pictures/EQI/quest_arrow.png b/Graphics/Pictures/EQI/quest_arrow.png new file mode 100644 index 000000000..f5ae0d11b Binary files /dev/null and b/Graphics/Pictures/EQI/quest_arrow.png differ diff --git a/Graphics/Pictures/EQI/quest_button.png b/Graphics/Pictures/EQI/quest_button.png new file mode 100644 index 000000000..24b938ce4 Binary files /dev/null and b/Graphics/Pictures/EQI/quest_button.png differ diff --git a/Graphics/Pictures/EQI/quest_page1.png b/Graphics/Pictures/EQI/quest_page1.png new file mode 100644 index 000000000..cc539c524 Binary files /dev/null and b/Graphics/Pictures/EQI/quest_page1.png differ diff --git a/Graphics/Pictures/EQI/quest_pager.png b/Graphics/Pictures/EQI/quest_pager.png new file mode 100644 index 000000000..0c3c68265 Binary files /dev/null and b/Graphics/Pictures/EQI/quest_pager.png differ