diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 88a9d168a..100a8ded2 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 34746f982..2ff2d0c28 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/013_Items/005_Item_PokeRadar.rb b/Data/Scripts/013_Items/005_Item_PokeRadar.rb
index a485fc819..cdb8db1a6 100644
--- a/Data/Scripts/013_Items/005_Item_PokeRadar.rb
+++ b/Data/Scripts/013_Items/005_Item_PokeRadar.rb
@@ -49,6 +49,7 @@ def pbUsePokeRadar
   $PokemonGlobal.pokeradarBattery = Settings::POKERADAR_BATTERY_STEPS
   unseenPokemon = listPokemonInCurrentRoute($PokemonEncounters.encounter_type, false, true)
   seenPokemon = listPokemonInCurrentRoute($PokemonEncounters.encounter_type, true, false)
+
   rareAllowed = canEncounterRarePokemon(unseenPokemon)
   displayPokeradarBanner(seenPokemon, unseenPokemon, rareAllowed)
   playPokeradarLightAnimation(rareAllowed)
@@ -115,7 +116,8 @@ def listPokemonInCurrentRoute(encounterType, onlySeen = false, onlyUnseen = fals
   seen = []
   unseen = []
   for encounter in $PokemonEncounters.listPossibleEncounters(encounterType)
-    species = $game_switches[SWITCH_RANDOM_WILD] ? getRandomizedTo(encounter[1]) : encounter[1]
+    species = $game_switches[SWITCH_RANDOM_WILD] && !$game_switches[SWITCH_RANDOM_WILD_AREA] ? getRandomizedTo(encounter[1]) : encounter[1]
+
     if !processed.include?(species)
       if $Trainer.seen?(species)
         seen << species
@@ -273,7 +275,7 @@ EncounterModifier.register(proc { |encounter|
     end
   else
     # Encounter triggered by stepping in non-rustling grass
-    pbPokeRadarCancel if encounter && $PokemonGlobal.repel <= 0
+    pbPokeRadarCancel if encounter  && $PokemonGlobal.repel <= 0
   end
   next encounter
 })
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 5e6834783..9aaf3360c 100644
--- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
+++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb	
@@ -137,6 +137,7 @@ class Player < Trainer
     end
 
     def seen?(species)
+      return false if !species
       num = getDexNumberForSpecies(species)
       if isTripleFusion(num)
         return seen_triple?(species)
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index be3048a34..8c7d319b0 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 846799fe9..21025322b 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ