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

Make return

Browse source
This commit is contained in:
PokeCodec 2020-09-10 09:32:36 -04:00
parent eb25b951c3
commit 029db24adb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/battle_script_commands.c
View file

@ -4650,8 +4650,7 @@ static void Cmd_switchinanim(void)
static void Cmd_jumpifcantswitch(void) static void Cmd_jumpifcantswitch(void)
{ {
s32 i; s32 i, lastMonId;
s32 lastMonId;
struct Pokemon *party; struct Pokemon *party;
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION)); gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION));
@ -4661,8 +4660,10 @@ static void Cmd_jumpifcantswitch(void)
|| (gStatuses3[gActiveBattler] & STATUS3_ROOTED))) || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
{ {
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
return;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{ {
#ifndef NONMATCHING #ifndef NONMATCHING
asm("":::"r5"); asm("":::"r5");