Fix Match Call Behavior (#5931) (#6033)

rh-hideout · Jan 17, 2025 · 21d2e40 · 21d2e40
1 parent fd26d3a
commit 21d2e40
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/battle_setup.c b/src/battle_setup.c
@@ -1742,8 +1742,8 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u
 
     for (i = 0; i <= REMATCH_SPECIAL_TRAINER_START; i++)
     {
-        if (DoesCurrentMapMatchRematchTrainerMap(i,table,mapGroup,mapNum) && !IsRematchForbidden(i))
-            continue;
+        if (!DoesCurrentMapMatchRematchTrainerMap(i,table,mapGroup,mapNum) || IsRematchForbidden(i))
+            continue; // Only check permitted trainers within the current map.
 
         if (gSaveBlock1Ptr->trainerRematches[i] != 0)
         {