Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match battle_script commands

This commit is contained in:
PokeCodec 2020-09-09 11:18:04 -04:00
parent 3af118b0a7
commit a3a8c23e00
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_script_commands.c
View File

@ -7248,16 +7248,18 @@ static void Cmd_forcerandomswitch(void)
{ {
if (TryDoForceSwitchOut()) if (TryDoForceSwitchOut())
{ {
do{
do do
{ {
i = Random() % monsCount; i = Random() % monsCount;
i += firstMonId; i += firstMonId;
} }
while (i == battler2PartyId while (i == battler2PartyId
|| i == battler1PartyId || i == battler1PartyId);
|| GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE
}while(GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE
|| GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
|| GetMonData(&party[i], MON_DATA_HP) == 0); || GetMonData(&party[i], MON_DATA_HP) == 0); // Should be one while loop, conjoined by an ||, but that doesn't match. Equivalent logic though
} }
*(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i; *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;