From 21d2e40f0aa0aa5bf56b4f78099d8184a7453b14 Mon Sep 17 00:00:00 2001
From: Mercy <98864243+MercedesCL@users.noreply.github.com>
Date: Fri, 17 Jan 2025 00:23:12 -0500
Subject: [PATCH] Fix Match Call Behavior (#5931) (#6033)

---
 src/battle_setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0c13fcdd09ca..37204c1d8d80 100644
--- 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)
         {