diff options
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e3405bc0c..c9e32b8d2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4650,8 +4650,7 @@ static void Cmd_switchinanim(void) static void Cmd_jumpifcantswitch(void) { - s32 i; - s32 lastMonId; + s32 i, lastMonId; struct Pokemon *party; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION)); @@ -4661,8 +4660,10 @@ static void Cmd_jumpifcantswitch(void) || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); + return; } - else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) + + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { #ifndef NONMATCHING asm("":::"r5"); |