diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index a84a55db2..ae2339fe7 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata
index ddf0c0398..672f9d409 100644
Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ
diff --git a/Data/Map379.rxdata b/Data/Map379.rxdata
index 4947fa85f..400f459b1 100644
Binary files a/Data/Map379.rxdata and b/Data/Map379.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 5562facb8..1a777ed95 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
index 578b80a96..6a8cfebd8 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
@@ -331,7 +331,11 @@ end
 #===============================================================================
 # Used when walking in tall grass, hence the additional code.
 def pbWildBattle(species, level, outcomeVar=1, canRun=true, canLose=false)
-  species = GameData::Species.get(species).id
+  if $game_switches[SWITCH_RANDOM_STATIC_ENCOUNTERS]
+    species = $PokemonGlobal.psuedoBSTHash[dexNum(species)]
+  else
+    species = GameData::Species.get(species).id
+  end
   # Potentially call a different pbWildBattle-type method instead (for roaming
   # Pokémon, Safari battles, Bug Contest battles)
   handled = [nil]
diff --git a/Data/Scripts/025-Randomizer/RandomizerSettings.rb b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
index 10b737270..e1ac2a803 100644
--- a/Data/Scripts/025-Randomizer/RandomizerSettings.rb
+++ b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
@@ -195,7 +195,7 @@ class RandomizerWildPokemonOptionsScene < PokemonOption_Scene
 
   def pbGetOptions(inloadscreen = false)
     options = [
-        EnumOption.new(_INTL("Type"), [_INTL("Global"), _INTL("Area")],
+        EnumOption.new(_INTL("Type"), [_INTL("Global")],#, _INTL("Area")],
                        proc {
                          if $game_switches[RANDOM_WILD_AREA]
                            1
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index 98531623e..fdbd0d0a6 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -56,7 +56,6 @@ SWITCH_RANDOM_GYM_CUSTOMS=662
 SWITCH_RANDOMIZE_GYMS_SEPARATELY = 667
 SWITCH_RANDOMIZED_GYM_TYPES=921
 SWITCH_RANDOM_GIFT_POKEMON = 780
-
 #Other switches
 SWITCH_RACE_BIKE = 984
 SWITCH_IS_REMATCH=200
diff --git a/Data/System.rxdata b/Data/System.rxdata
index f35e02f6a..132d89d22 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ