diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-10 19:36:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 19:36:21 -0400 |
| commit | c0987169ddc1a8cea52f4d07dfc7673c7684ec1a (patch) | |
| tree | be9ddf153e1b4dbcffff33e3cb318bec52c9b4e7 /src/battle_script_commands.c | |
| parent | d260943249387a5d25cbb60886b6c8aa72e3f24f (diff) | |
| parent | c1286c2fe2e40dc1070076ef2c69b67d07c8b867 (diff) | |
Merge pull request #1183 from PokeCodec/PokemonLogicFix
Match Dewford
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e3405bc0c..fca2b3879 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4661,8 +4661,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"); |