diff --git a/Data/Map079.rxdata b/Data/Map079.rxdata
index 5b7187262..0dd9f980f 100644
Binary files a/Data/Map079.rxdata and b/Data/Map079.rxdata differ
diff --git a/Data/Map314.rxdata b/Data/Map314.rxdata
index 68f92ab52..8b36f8ed2 100644
Binary files a/Data/Map314.rxdata and b/Data/Map314.rxdata differ
diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata
index b4861c7c5..473b77ffd 100644
Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 9b7acc3b2..113e993ea 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb
index 485281e26..0bdb10d1b 100644
--- a/Data/Scripts/012_Overworld/001_Overworld.rb
+++ b/Data/Scripts/012_Overworld/001_Overworld.rb
@@ -271,6 +271,18 @@ Events.onMapChanging += proc { |_sender, e|
   end
   $game_screen.weather(:None, 0, 0)
 }
+Events.onMapChange += proc { |_sender, e|
+  next if !Settings::SEVII_ROAMING.include?($game_map.map_id)
+  new_map_ID = e[0]
+  new_map_metadata = GameData::MapMetadata.try_get(new_map_ID)
+  next if new_map_metadata && new_map_metadata.weather
+  feebas_map = $PokemonGlobal.roamPosition[4]
+  if $game_map.map_id == feebas_map
+    $game_screen.weather(:Rain, 4, 0)
+  else
+    $game_screen.weather(:None, 0, 0)
+  end
+}
 
 # Set up various data related to the new map
 Events.onMapChange += proc { |_sender, e|
@@ -293,6 +305,9 @@ Events.onMapChange += proc { |_sender, e|
   $game_screen.weather(new_weather[0], 9, 0) if rand(100) < new_weather[1]
 }
 
+
+
+
 Events.onMapSceneChange += proc { |_sender, e|
   scene = e[0]
   mapChanged = e[1]
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb
index 27f818810..34348f052 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb	
@@ -121,7 +121,7 @@ end
 # Returns whether the given category of encounter contains the actual encounter
 # method that will occur in the player's current position.
 def pbRoamingMethodAllowed(roamer_method)
-  enc_type = $PokemonEncounters.encounter_type
+  enc_type = $PokemonTemp.encounterType #$PokemonEncounters.encounter_type
   type = GameData::EncounterType.get(enc_type).type
   case roamer_method
   when 0   # Any step-triggered method (except Bug Contest)
@@ -145,7 +145,7 @@ EncounterModifier.register(proc { |encounter|
   next encounter if $PokemonGlobal.roamedAlready
   next encounter if $PokemonGlobal.partner
   next encounter if $PokemonTemp.pokeradar
-  next encounter if rand(100) < 75   # 25% chance of encountering a roaming Pokémon
+  #next encounter if rand(100) < 75   # 25% chance of encountering a roaming Pokémon
   # Look at each roaming Pokémon in turn and decide whether it's possible to
   # encounter it
   currentRegion = pbGetCurrentRegion
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 6512e33b1..56845cedc 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/PBS/trainers.txt b/PBS/trainers.txt
index 560856276..c87ceefd9 100644
--- a/PBS/trainers.txt
+++ b/PBS/trainers.txt
@@ -1941,6 +1941,13 @@ Items = MAXPOTION
 Pokemon = B95H24,32 #Arbix,
 Pokemon = B131H111,32 #Rhyras,
 Pokemon = B115H93,35 #Hauntkan,
+[ROCKETBOSS,Giovanni,4]		#Silph co
+Items = MAXPOTION
+Pokemon = B33H57,45 #nidorino + primeape
+Pokemon = B131H112,45 #rhydon + lapras
+Pokemon = B115H94,47 #gengar + kangaskhan
+Pokemon = B31H28,51 #nidoqueen + Sandslash
+
 ##############################
 
 ##################
@@ -3487,7 +3494,7 @@ Pokemon = B145H150,45 #Mewdos
 
 [ROCKETBOSS,Giovanni,3]
 Items = FULLHEAL
-Pokemon = BIRDBOSS,50 #
+Pokemon = BIRDBOSS,60 #
 	Moves = TRIATTACK2,DRILLPECK,SKYATTACK,HAZE
 	Ball = MASTERBALL
 	AbilityIndex = 2