Merge pull request #1181 from PokeCodec/trainer-hill

Remove fakematch in trainer_hill.c

1 files changed, 1 insertions, 9 deletions

diff --git a/src/battle_util.c b/src/battle_util.c
index 201e653a5..eb3907157 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2241,16 +2241,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;