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 3753ef5ba..cdae20883 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/Map008.rxdata b/Data/Map008.rxdata index db278ee48..3205e18b9 100644 Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 7e36879b7..6ec6aa4cf 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 b783c404b..6f7c8c9e9 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,7 +6,7 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.0.19 - beta" + GAME_VERSION_NUMBER = "5.0.19.1 - beta" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 @@ -354,7 +354,7 @@ module Settings [485, 30, :DEINO,20,20], #Safari zone 3 [486, 30, :LARVITAR,20,20], #Safari zone 4 [487, 30, :BELDUM,20,20], #Safari zone 5 - [59, 30, :DUNSPARSE,25,30], #Rt. 21 + [59, 30, :DUNSPARCE,25,30], #Rt. 21 [171, 30, :BIDOOF,2,5], #Rt. 22 [143, 30, :RIOLU,25,25], #Rt. 23 [8, 30, :BUNEARY,12,13], #Rt. 24 @@ -365,7 +365,7 @@ module Settings [288, 30, :VIGOROTH,40,45], #Rt. 32 [342, 30, :GOLETT,40,45], #Ruins of Alph [261, 30, :BELLOSSOM,45,50], #Rt. 31 - [261, 30, :BIBAREL,45,50], #Rt. 30 + [262, 30, :BIBAREL,45,50], #Rt. 30 [265, 30, :KIRLIA,25,30], #Rt. 34 [267, 30, :SUDOWOODO,25,30], #Rt. 36 [300, 30, :ROSELIA,30,30], #National Park diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb index 68fac7bfc..002e6c1ab 100644 --- a/Data/Scripts/012_Overworld/001_Overworld.rb +++ b/Data/Scripts/012_Overworld/001_Overworld.rb @@ -174,7 +174,8 @@ def pbOnStepTaken(eventTriggered) $PokemonGlobal.stepcount = 0 if !$PokemonGlobal.stepcount $PokemonGlobal.stepcount += 1 $PokemonGlobal.stepcount &= 0x7FFFFFFF - repel_active = ($PokemonGlobal.repel > 0) + repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar + Events.onStepTaken.trigger(nil) # Events.onStepTakenFieldMovement.trigger(nil,$game_player) handled = [nil] @@ -186,7 +187,7 @@ end # Start wild encounters while turning on the spot Events.onChangeDirection += proc { - repel_active = ($PokemonGlobal.repel > 0) + repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar pbBattleOnStepTaken(repel_active) if !$game_temp.in_menu } diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb index fd18ffb60..990de2160 100644 --- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb +++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb @@ -24,7 +24,6 @@ class Player < Trainer def clear @seen = {} #deprecated @owned = {} #deprecated - @seen_standard = initStandardDexArray() @seen_fusion = initFusionDexArray() @seen_triple = {} @@ -381,7 +380,7 @@ class Player < Trainer # @param dex [Integer] Dex ID (-1 is the National Dex) # @return [Boolean] whether the given Dex is unlocked def unlocked?(dex) - return dex == -1 + return dex == 0 # validate dex => Integer # dex = @unlocked_dexes.length - 1 if dex == -1 # return @unlocked_dexes[dex] == true @@ -400,6 +399,7 @@ class Player < Trainer # if a species in the current region has been seen - doesn't look at other # regions. def refresh_accessible_dexes + @accessible_dexes = [] if self.unlocked?(0) && self.seen_any? @accessible_dexes.push(-1) end 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 b0b951862..9d67d4eea 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 9873e9ae6..8d34a0eef 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