diff options
author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 20:46:08 -0400 |
---|---|---|
committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-08 20:46:08 -0400 |
commit | 34f54dd43889ba1c879d6e18251542088c175a1e (patch) | |
tree | c4acd1f9acb6f1305fb3bc6aa74cca3c5b54b08e /src | |
parent | 6e3f5a462a0a42422310a11193d15b3065ffd536 (diff) |
Fix Battle util fakematch
Diffstat (limited to 'src')
-rw-r--r-- | src/battle_util.c | 10 |
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; |