Trying to resolve only one roamer moving on pokedex

Definitive-Pokemon · May 2, 2024 · 24bbb82 · 24bbb82
1 parent 69567c4
commit 24bbb82
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/src/roamer.c b/src/roamer.c
@@ -129,30 +129,35 @@ void UpdateLocationHistoryForRoamer(void)
     }
 }
 
-void RoamerMoveToOtherLocationSet(void)
+void SlotRoamerMoveToOtherLocationSet(u8 slot)
 {
     u8 mapNum = 0;
-    u32 i;
-
     // Choose a location set that starts with a map
     // different from the roamer's current map
-    for (i = 0; i < MAX_ROAMERS; i++)
+    if (GetRoamer(slot)->active)
     {
-        if (GetRoamer(i)->active)
+        while (1)
         {
-            while (1)
+            mapNum = sRoamerLocations[Random() % NUM_LOCATION_SETS][0];
+            if (sRoamerLocation[slot][MAP_NUM] != mapNum)
             {
-                mapNum = sRoamerLocations[Random() % NUM_LOCATION_SETS][0];
-                if (sRoamerLocation[i][MAP_NUM] != mapNum)
-                {
-                    sRoamerLocation[i][MAP_NUM] = mapNum;
-                    return;
-                }
+                sRoamerLocation[slot][MAP_NUM] = mapNum;
+                return;
             }
         }
     }
 }
 
+
+void RoamerMoveToOtherLocationSet(void)
+{
+    u32 i;
+    for (i = 0; i < MAX_ROAMERS; i++)
+    {
+        SlotRoamerMoveToOtherLocationSet(i);
+    }
+}
+
 void RoamerMove(void)
 {
     u32 i; //roamer slot
@@ -163,7 +168,7 @@ void RoamerMove(void)
             continue;
         if ((Random() % 16) == 0)
         {
-            RoamerMoveToOtherLocationSet();
+            SlotRoamerMoveToOtherLocationSet(i);
         }
         else
         {