diff --git a/Credits.txt b/Credits.txt index ec4157c69..1d531afac 100644 --- a/Credits.txt +++ b/Credits.txt @@ -286,9 +286,8 @@ KleinStudio Water bubble script http://kleinstudio.deviantart.com/art/SCRIPT carmaniac Speech Bubbles script http://www.pokecommunity.com/showthread.php?t=295277 Wootius Turbo Speed https://www.pokecommunity.com/showthread.php?t=306037 Marin Better maps script https://www.pokecommunity.com/showthread.php?t=411299 -barafanatic Safari Zone improvements M3rein Easy Questing System -bo4p5687 Multisave +http404error Multisave https://reliccastle.com/resources/1059/ #### Data sources ### diff --git a/Data/Map105.rxdata b/Data/Map105.rxdata index e7fd41ec5..109964600 100644 Binary files a/Data/Map105.rxdata and b/Data/Map105.rxdata differ diff --git a/Data/Map340.rxdata b/Data/Map340.rxdata index 97ff76943..08155ed67 100644 Binary files a/Data/Map340.rxdata and b/Data/Map340.rxdata differ diff --git a/Data/Map401.rxdata b/Data/Map401.rxdata index f05f8ef8e..6df087a06 100644 Binary files a/Data/Map401.rxdata and b/Data/Map401.rxdata differ diff --git a/Data/Map437.rxdata b/Data/Map437.rxdata index 2580541e7..c4365d5b4 100644 Binary files a/Data/Map437.rxdata and b/Data/Map437.rxdata differ diff --git a/Data/Map665.rxdata b/Data/Map665.rxdata index 38a45c9df..bfb17ab2b 100644 Binary files a/Data/Map665.rxdata and b/Data/Map665.rxdata differ diff --git a/Data/Map750.rxdata b/Data/Map750.rxdata index b5fce2774..9872faade 100644 Binary files a/Data/Map750.rxdata and b/Data/Map750.rxdata differ diff --git a/Data/Map752.rxdata b/Data/Map752.rxdata index d1d63c8cc..e633d9c3e 100644 Binary files a/Data/Map752.rxdata and b/Data/Map752.rxdata differ diff --git a/Data/Map753.rxdata b/Data/Map753.rxdata index 4bab6882d..c662ad8da 100644 Binary files a/Data/Map753.rxdata and b/Data/Map753.rxdata differ diff --git a/Data/Map754.rxdata b/Data/Map754.rxdata index 0b45d7e7e..59bfdf8b4 100644 Binary files a/Data/Map754.rxdata and b/Data/Map754.rxdata differ diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata index 05579effb..02132a9b1 100644 Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ diff --git a/Data/Map756.rxdata b/Data/Map756.rxdata index 3cf04a703..3c61d8848 100644 Binary files a/Data/Map756.rxdata and b/Data/Map756.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 739264120..d72a34c6a 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/003_Game processing/003_Interpreter.rb b/Data/Scripts/003_Game processing/003_Interpreter.rb index 4bb176065..3946f95ee 100644 --- a/Data/Scripts/003_Game processing/003_Interpreter.rb +++ b/Data/Scripts/003_Game processing/003_Interpreter.rb @@ -393,6 +393,7 @@ class Interpreter old_y = event.y # Apply strict version of passable, which treats tiles that are passable # only from certain directions as fully impassible + return if !event.can_move_in_direction?($game_player.direction, true) case $game_player.direction when 2 then event.move_down @@ -400,7 +401,7 @@ class Interpreter when 6 then event.move_right when 8 then event.move_up end - $PokemonMap.addMovedEvent(@event_id) if $PokemonMap + if old_x != event.x || old_y != event.y $game_player.lock loop do diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 4f6936bf5..589be8e7c 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -670,11 +670,11 @@ def pbStrength movefinder = $Trainer.get_pokemon_with_move(move) if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH, false) || (!$DEBUG && !movefinder) if $PokemonBag.pbQuantity(:LEVER)<=0 - pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.")) + pbMessage(_INTL("It looks heavy, but a Pokémon may be able to push it aside.")) return false end end - pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.\1")) + pbMessage(_INTL("It looks heavy, but a Pokémon may be able to push it aside.\1")) if pbConfirmMessage(_INTL("Would you like to use Strength?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 584ca3aa3..0e8ca0fe9 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -93,6 +93,7 @@ SWITCH_USED_AN_INCENSE=798 SWITCH_FIRST_RIVAL_BATTLE=46 SWITCH_BATTLE_FACTORY_INCLUDE_ALL = 775 +SWITCH_LOUNGE_BATTLE_LEVEL = 240 ############# # VARIABLES # diff --git a/Data/System.rxdata b/Data/System.rxdata index 64487ec11..2589f8ea8 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ