atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small corrections

Browse source
This commit is contained in:
LOuroboros 2022-05-06 02:34:11 -03:00
parent 43053d2e6c
commit 195a290a98
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/battle_script_commands.c
View file

@ -7720,6 +7720,7 @@ static bool32 CanTeleport(u8 battlerId)
party = gPlayerParty; party = gPlayerParty;
else else
party = gEnemyParty; party = gEnemyParty;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
species = GetMonData(&party[i], MON_DATA_SPECIES2); species = GetMonData(&party[i], MON_DATA_SPECIES2);
@ -7730,16 +7731,16 @@ static bool32 CanTeleport(u8 battlerId)
switch (GetBattlerSide(battlerId)) switch (GetBattlerSide(battlerId))
{ {
case B_SIDE_OPPONENT: case B_SIDE_OPPONENT:
if (WILD_DOUBLE_BATTLE || gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
return FALSE; return FALSE;
case B_SIDE_PLAYER: case B_SIDE_PLAYER:
if (((gBattleTypeFlags & BATTLE_TYPE_DOUBLE && count >= 3) || (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && count >= 2))) if (count <= 2 && gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
return TRUE; return FALSE;
default: default:
break; break;
} }
return FALSE; return TRUE;
} }
static void Cmd_various(void) static void Cmd_various(void)