port HasNoMonsToSwitch fakematch fix (from #1181)
This commit is contained in:
parent
193e601c2c
commit
077a2c23dc
1 changed files with 1 additions and 9 deletions
|
@ -1634,16 +1634,8 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2)
|
||||||
}
|
}
|
||||||
else
|
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;
|
party = gEnemyParty;
|
||||||
var = battler ^ BIT_SIDE;
|
if (battler == 1)
|
||||||
if (var == 0)
|
|
||||||
id1 = 0;
|
id1 = 0;
|
||||||
else
|
else
|
||||||
id1 = 1;
|
id1 = 1;
|
||||||
|
|
Loading…
Reference in a new issue