From 63e3d6970cfd4df024ccccb276d15e8ad0c26bd0 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Fri, 28 Jun 2024 18:07:27 -0400
Subject: [PATCH] roamer fix

---
 .../002_Battle triggering/005_Overworld_RoamingPokemon.rb     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 8af0f6fc8..17d8ceacc 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	
@@ -74,7 +74,9 @@ def applyRoamWeather()
   return if $game_screen.weather_type != :None
   currently_roaming = $PokemonGlobal.roamPosition.keys
   currently_roaming.each do |roamer_id|
-    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id
+    roamer_switch = Settings::ROAMING_SPECIES[roamer_id][2]
+    roamer_active = $game_switches[roamer_switch]
+    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id && roamer_active
     if roamerOnCurrentMap
       return if $PokemonGlobal.roamPokemonCaught[roamer_id]
       weather = Settings::ROAMING_SPECIES[roamer_id][6]