From 077a2c23dc499bdb6a0a0ca8dd4fd5d5022dfa6b Mon Sep 17 00:00:00 2001
From: Kurausukun <lord.uber1@gmail.com>
Date: Sun, 25 Oct 2020 23:45:42 -0400
Subject: [PATCH] port HasNoMonsToSwitch fakematch fix (from #1181)

---
 src/battle_util.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 699fd05bc8..aeae8b58b7 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1634,16 +1634,8 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
             }
             else
             {
-                // FIXME: Compiler insists on moving r4 into r1 before doing the eor.
-                #ifndef NONMATCHING
-                    register u32 var asm("r1");
-                #else
-                    u32 var;
-                #endif // NONMATCHING
-
                 party = gEnemyParty;
-                var = battler ^ BIT_SIDE;
-                if (var == 0)
+                if (battler == 1)
                     id1 = 0;
                 else
                     id1 = 1;