diff --git a/Data/Map105.rxdata b/Data/Map105.rxdata index 448f21c19..9369de31d 100644 Binary files a/Data/Map105.rxdata and b/Data/Map105.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index be69ad67d..630692201 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index f1c8689d2..ccb56030f 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index bab475192..6ab463236 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -378,6 +378,7 @@ module Settings [261, 50, :BELLOSSOM,45,50], #Rt. 31 [262, 50, :BIBAREL,45,50], #Rt. 30 [265, 50, :KIRLIA,25,30], #Rt. 34 + [254, 50, :SMEARGLE,25,30], #Rt. 35 [267, 50, :SUDOWOODO,25,30], #Rt. 36 [500, 50, :ROSELIA,30,30], #National Park [266, 50, :BRELOOM,30,30], #Ilex Forest diff --git a/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb b/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb index de8514535..c6054a624 100644 --- a/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb +++ b/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb @@ -37,6 +37,7 @@ class PokemonGlobalMetadata # Affecting the map attr_accessor :bridge attr_accessor :repel + attr_accessor :tempRepel attr_accessor :flashUsed attr_accessor :encounter_version # Map transfers @@ -95,6 +96,7 @@ class PokemonGlobalMetadata # Affecting the map @bridge = 0 @repel = 0 + @tempRepel = false @flashused = false @encounter_version = 0 # Map transfers diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index 570b80d40..2aca4ebac 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -119,7 +119,7 @@ ItemHandlers::UseInField.add(:MAXREPEL, proc { |item| Events.onStepTaken += proc { if $PokemonGlobal.repel > 0 && !$game_player.terrain_tag.ice # Shouldn't count down if on ice $PokemonGlobal.repel -= 1 - if $PokemonGlobal.repel <= 0 + if $PokemonGlobal.repel <= 0 && ! $PokemonGlobal.tempRepel isIncense = $game_switches[SWITCH_USED_AN_INCENSE] $game_switches[SWITCH_FORCE_ALL_WILD_FUSIONS] = false $game_switches[SWITCH_USED_AN_INCENSE] = false diff --git a/Data/Scripts/013_Items/005_Item_PokeRadar.rb b/Data/Scripts/013_Items/005_Item_PokeRadar.rb index 23a3ce9a2..7bf91f6eb 100644 --- a/Data/Scripts/013_Items/005_Item_PokeRadar.rb +++ b/Data/Scripts/013_Items/005_Item_PokeRadar.rb @@ -55,6 +55,10 @@ def pbUsePokeRadar playPokeradarLightAnimation(rareAllowed) pbWait(20) pbPokeRadarHighlightGrass + if $PokemonGlobal.repel <= 0 + $PokemonGlobal.repel=10 + $PokemonGlobal.tempRepel=true + end return true end @@ -101,6 +105,11 @@ def displayPokeradarBanner(seenPokemon = [], unseenPokemon = [], includeRare = f end def pbPokeRadarCancel + if $PokemonGlobal.tempRepel + $PokemonGlobal.repel=0 + end + $PokemonGlobal.tempRepel=false + if $PokemonTemp.pokeradar_ui != nil $PokemonTemp.pokeradar_ui.dispose $PokemonTemp.pokeradar_ui = nil diff --git a/Data/System.rxdata b/Data/System.rxdata index 7be5c586d..5f1d997e8 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ